diff options
author | Tomaz Canabrava <tomaz.canabrava@intel.com> | 2014-08-25 14:52:45 -0300 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2014-08-25 13:55:23 -0700 |
commit | 537b42e3f7922e41cf3851b297033cc1f07fb922 (patch) | |
tree | 6b051de12398560fe6e2a4d254deaa24d1a65da8 | |
parent | b1a92ccedf218f9c894f1d720a890373391bca93 (diff) | |
download | subsurface-537b42e3f7922e41cf3851b297033cc1f07fb922.tar.gz |
Add initial skeleton for the Statistics Redesign
The statistics widget is a beast, one of the parts that I dislike most
on the current subsurface implementation. This is the initial work to
change that to something amazing. This first commit adds the first bunch
of files that I think are needed, and the correct setup for the qmake and
cmake buildsystems.
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r-- | CMakeLists.txt | 11 | ||||
-rw-r--r-- | qt-ui/statistics/monthstatistics.cpp | 0 | ||||
-rw-r--r-- | qt-ui/statistics/monthstatistics.h | 0 | ||||
-rw-r--r-- | qt-ui/statistics/statisticsbar.cpp | 0 | ||||
-rw-r--r-- | qt-ui/statistics/statisticsbar.h | 0 | ||||
-rw-r--r-- | qt-ui/statistics/statisticswidget.cpp | 0 | ||||
-rw-r--r-- | qt-ui/statistics/statisticswidget.h | 0 | ||||
-rw-r--r-- | qt-ui/statistics/yearstatistics.cpp | 0 | ||||
-rw-r--r-- | qt-ui/statistics/yearstatistics.h | 0 | ||||
-rw-r--r-- | subsurface.pro | 12 |
10 files changed, 21 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 44fa1343a..2eef2d055 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,6 +164,14 @@ SET(SUBSURFACE_PROFILE_LIB_SRCS qt-ui/profile/tankitem.cpp ) +#the yearly statistics widget. +SET(SUBSURFACE_STATISTICS_LIB_SRCS + qt-ui/statistics/statisticswidget.cpp + qt-ui/statistics/yearstatistics.cpp + qt-ui/statistics/statisticsbar.cpp + qt-ui/statistics/monthstatistics.cpp +) + #the main app. SET(SUBSURFACE_APP main.cpp @@ -182,6 +190,7 @@ ENDIF() ADD_LIBRARY(subsurface_corelib STATIC ${SUBSURFACE_CORE_LIB_SRCS} ) ADD_LIBRARY(subsurface_profile STATIC ${SUBSURFACE_PROFILE_LIB_SRCS}) +ADD_LIBRARY(subsurface_statistics STATIC ${SUBSURFACE_STATISTICS_LIB_SRCS}) ADD_LIBRARY(subsurface_generated_ui STATIC ${SUBSURFACE_UI_HDRS}) ADD_LIBRARY(subsurface_interface STATIC ${SUBSURFACE_INTERFACE}) ADD_EXECUTABLE(subsurface ${SUBSURFACE_APP} ${SUBSURFACE_QRC_HRDS} ) @@ -190,6 +199,7 @@ target_link_libraries( subsurface subsurface_generated_ui subsurface_interface subsurface_profile + subsurface_statistics subsurface_corelib ${QT_LIBRARIES} ${MARBLE_LIBRARIES} @@ -198,6 +208,7 @@ target_link_libraries( subsurface -lzip ) +ADD_DEPENDENCIES(subsurface_statistics subsurface_generated_ui) ADD_DEPENDENCIES(subsurface_profile subsurface_generated_ui) ADD_DEPENDENCIES(subsurface_interface subsurface_generated_ui) ADD_DEPENDENCIES(subsurface_generated_ui version) diff --git a/qt-ui/statistics/monthstatistics.cpp b/qt-ui/statistics/monthstatistics.cpp new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/qt-ui/statistics/monthstatistics.cpp diff --git a/qt-ui/statistics/monthstatistics.h b/qt-ui/statistics/monthstatistics.h new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/qt-ui/statistics/monthstatistics.h diff --git a/qt-ui/statistics/statisticsbar.cpp b/qt-ui/statistics/statisticsbar.cpp new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/qt-ui/statistics/statisticsbar.cpp diff --git a/qt-ui/statistics/statisticsbar.h b/qt-ui/statistics/statisticsbar.h new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/qt-ui/statistics/statisticsbar.h diff --git a/qt-ui/statistics/statisticswidget.cpp b/qt-ui/statistics/statisticswidget.cpp new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/qt-ui/statistics/statisticswidget.cpp diff --git a/qt-ui/statistics/statisticswidget.h b/qt-ui/statistics/statisticswidget.h new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/qt-ui/statistics/statisticswidget.h diff --git a/qt-ui/statistics/yearstatistics.cpp b/qt-ui/statistics/yearstatistics.cpp new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/qt-ui/statistics/yearstatistics.cpp diff --git a/qt-ui/statistics/yearstatistics.h b/qt-ui/statistics/yearstatistics.h new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/qt-ui/statistics/yearstatistics.h diff --git a/subsurface.pro b/subsurface.pro index 6e20df9c2..06186897a 100644 --- a/subsurface.pro +++ b/subsurface.pro @@ -95,7 +95,11 @@ HEADERS = \ qt-ui/configuredivecomputerdialog.h \ configuredivecomputer.h \ configuredivecomputerthreads.h \ - devicedetails.h + devicedetails.h \ + qt-ui/statistics/monthstatistics.h \ + qt-ui/statistics/statisticswidget.h \ + qt-ui/statistics/statisticsbar.h \ + qt-ui/statistics/yearstatistics.h android: HEADERS -= \ qt-ui/usermanual.h \ @@ -180,7 +184,11 @@ SOURCES = \ qt-ui/configuredivecomputerdialog.cpp \ configuredivecomputer.cpp \ configuredivecomputerthreads.cpp \ - devicedetails.cpp + devicedetails.cpp \ + qt-ui/statistics/statisticswidget.cpp \ + qt-ui/statistics/yearstatistics.cpp \ + qt-ui/statistics/statisticsbar.cpp \ + qt-ui/statistics/monthstatistics.cpp android: SOURCES += android.cpp else: linux*: SOURCES += linux.c |