Skip to content

Commit

Permalink
a) altitude plot; b) cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
tweber-ill committed Jan 2, 2025
1 parent b193338 commit c926e82
Show file tree
Hide file tree
Showing 24 changed files with 270 additions and 62 deletions.
26 changes: 16 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,27 +89,33 @@ set_source_files_properties(


add_executable(tracks
# main gui
src/gui/main.cpp
src/gui/gui.cpp src/gui/gui.h
src/gui/settings.cpp src/gui/settings.h
src/gui/globals.cpp src/gui/globals.h
src/gui/about.cpp src/gui/about.h
src/gui/resources.cpp src/gui/resources.h
src/gui/recent.h src/gui/helpers.h
src/gui/track_browser.cpp src/gui/track_browser.h
src/gui/track_infos.cpp src/gui/track_infos.h
src/gui/conversions.cpp src/gui/conversions.h
src/gui/statistics.cpp src/gui/statistics.h
src/gui/reports.cpp src/gui/reports.h
src/gui/summary.cpp src/gui/summary.h
src/gui/map.cpp src/gui/map.h

src/common/types.h
# dock widgets
src/gui/docks/track_browser.cpp src/gui/docks/track_browser.h
src/gui/docks/track_infos.cpp src/gui/docks/track_infos.h
src/gui/docks/map.cpp src/gui/docks/map.h

# dialogs
src/gui/dialogs/conversions.cpp src/gui/dialogs/conversions.h
src/gui/dialogs/statistics.cpp src/gui/dialogs/statistics.h
src/gui/dialogs/reports.cpp src/gui/dialogs/reports.h
src/gui/dialogs/summary.cpp src/gui/dialogs/summary.h
src/gui/dialogs/about.cpp src/gui/dialogs/about.h
src/gui/dialogs/settings.cpp src/gui/dialogs/settings.h

# libs
src/lib/calc.h src/lib/timepoint.h
src/lib/track.h src/lib/trackdb.h
src/lib/map.h
src/common/types.h

# external libs
ext/qcustomplot.cpp ext/qcustomplot.h
)

Expand Down
17 changes: 17 additions & 0 deletions src/common/version.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/**
* version infos
* @author Tobias Weber (orcid: 0000-0002-7230-1932)
* @date Nov-2024
* @license see 'LICENSE' file
*/

#ifndef __TRACKS_VER_H__
#define __TRACKS_VER_H__


#define TRACKS_IDENT "tracks"
#define TRACKS_TITLE "Tracks"
#define TRACKS_VERSION "0.2"


#endif
3 changes: 2 additions & 1 deletion src/gui/about.cpp → src/gui/dialogs/about.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/

#include "about.h"
#include "common/version.h"

#include <QtCore/QSettings>
#include <QtWidgets/QApplication>
Expand Down Expand Up @@ -76,7 +77,7 @@ About::About(QWidget *parent, const QIcon *progIcon)

// add description items
//AddTitle(QApplication::applicationDisplayName().toStdString().c_str());
AddTitle("Tracks", progIcon);
AddTitle(TRACKS_TITLE, progIcon);

AddSpacer(15);

Expand Down
2 changes: 1 addition & 1 deletion src/gui/about.h → src/gui/dialogs/about.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include <memory>

#include "resources.h"
#include "../resources.h"


class About : public QDialog
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
*/

#include "conversions.h"
#include "helpers.h"
#include "lib/calc.h"
#include "../helpers.h"

#include <QtCore/QSettings>
#include <QtCore/QByteArray>
Expand Down
2 changes: 1 addition & 1 deletion src/gui/conversions.h → src/gui/dialogs/conversions.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include <memory>

#include "globals.h"
#include "../globals.h"


/**
Expand Down
4 changes: 2 additions & 2 deletions src/gui/reports.cpp → src/gui/dialogs/reports.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
*/

#include "reports.h"
#include "helpers.h"
#include "tableitems.h"
#include "lib/calc.h"
#include "../helpers.h"
#include "../tableitems.h"

#include <QtCore/QSettings>
#include <QtCore/QByteArray>
Expand Down
2 changes: 1 addition & 1 deletion src/gui/reports.h → src/gui/dialogs/reports.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
#include <memory>
#include <map>

#include "globals.h"
#include "lib/trackdb.h"
#include "../globals.h"


/**
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/gui/statistics.cpp → src/gui/dialogs/statistics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
*/

#include "statistics.h"
#include "helpers.h"
#include "lib/calc.h"
#include "../helpers.h"

#include <QtCore/QSettings>
#include <QtCore/QByteArray>
Expand Down
2 changes: 1 addition & 1 deletion src/gui/statistics.h → src/gui/dialogs/statistics.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

#include <memory>

#include "globals.h"
#include "lib/trackdb.h"
#include "../globals.h"


/**
Expand Down
4 changes: 2 additions & 2 deletions src/gui/summary.cpp → src/gui/dialogs/summary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
*/

#include "summary.h"
#include "helpers.h"
#include "tableitems.h"
#include "lib/calc.h"
#include "../helpers.h"
#include "../tableitems.h"

#include <QtCore/QSettings>
#include <QtCore/QByteArray>
Expand Down
2 changes: 1 addition & 1 deletion src/gui/summary.h → src/gui/dialogs/summary.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
#include <memory>
#include <map>

#include "globals.h"
#include "lib/trackdb.h"
#include "../globals.h"


/**
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/gui/map.h → src/gui/docks/map.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

#include <QtSvg/QSvgWidget>

#include "globals.h"
#include "lib/map.h"
#include "../globals.h"


// --------------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

#include "track_browser.h"
#include "helpers.h"
#include "../helpers.h"

#include <QtWidgets/QListWidgetItem>
#include <QtWidgets/QGridLayout>
Expand Down
2 changes: 1 addition & 1 deletion src/gui/track_browser.h → src/gui/docks/track_browser.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <memory>
#include <optional>

#include "globals.h"
#include "../globals.h"


/**
Expand Down
Loading

0 comments on commit c926e82

Please sign in to comment.