Merge pull request #171 from sieren/plot-data

Add Data Plotting capability
sieren · Oct 13, 2016 · 5c3faa9 · 5c3faa9
2 parents 88f71f8 + 8e24573
commit 5c3faa9
Show file tree

Hide file tree

Showing 14 changed files with 36,785 additions and 63 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,6 +35,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 # Find the QtWidgets library
 find_package(Qt5Widgets REQUIRED)
 find_package(Qt5Network)
+find_package(Qt5PrintSupport)
 
 add_definitions(-DGLEW_STATIC)
 # The Qt5Widgets_INCLUDES also includes the include directories for
@@ -113,11 +114,13 @@ if (APPLE)
   target_link_libraries(
       QSyncthingTray
       ${Qt5Core_QTMAIN_LIBRARIES}
-      ${COCOA_LIBRARY})
+      ${COCOA_LIBRARY}
+      Qt5::PrintSupport)
 else()
   target_link_libraries(
       QSyncthingTray
-      ${Qt5Core_QTMAIN_LIBRARIES})
+      ${Qt5Core_QTMAIN_LIBRARIES}
+      Qt5::PrintSupport)
 endif()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")

diff --git a/QSyncthingTray.pro b/QSyncthingTray.pro
@@ -7,22 +7,29 @@ HEADERS       = includes/qst/window.h \
                 includes/qst/platforms.hpp \
                 includes/qst/apihandler.hpp \
                 includes/qst/startuptab.hpp \
-                includes/qst/utilities.hpp \
+                includes/qst/statswidget.h \
                 includes/qst/syncwebview.h \
-                includes/qst/syncwebpage.h
+                includes/qst/syncwebpage.h \
+                includes/qst/utilities.hpp \
+                includes/qst/updatenotifier.h \
+                includes/contrib/qcustomplot.h
 SOURCES       = sources/qst/main.cpp \
                 sources/qst/window.cpp \
                 sources/qst/syncconnector.cpp \
                 sources/qst/processmonitor.cpp \
                 sources/qst/startuptab.cpp \
+                sources/qst/statswidget.cpp \
                 sources/qst/syncwebview.cpp \
-                sources/qst/syncwebpage.cpp
+                sources/qst/syncwebpage.cpp \
+                sources/qst/updatenotifier.cpp \
+                sources/contrib/qcustomplot.cpp
 RESOURCES     = \
                 resources/qsyncthing.qrc
 
 QT += widgets
 QT += network
 QT += webenginewidgets
+QT += printsupport
 INCLUDEPATH += $$PWD/includes/
 # install
 target.path = binary/

diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt
@@ -9,17 +9,21 @@ project(QSyncthingTray)
 #
 
 set(qst_include_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/qst)
+set(contrib_include_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/contrib)
+
 set(qst_HEADERS
   ${qst_include_ROOT}/apihandler.hpp
   ${qst_include_ROOT}/platforms.hpp
   ${qst_include_ROOT}/processmonitor.hpp
   ${qst_include_ROOT}/settingsmigrator.hpp
   ${qst_include_ROOT}/startuptab.hpp
+  ${qst_include_ROOT}/statswidget.h
   ${qst_include_ROOT}/syncconnector.h
   ${qst_include_ROOT}/updatenotifier.h
   ${qst_include_ROOT}/utilities.hpp
   ${qst_include_ROOT}/webview.h
   ${qst_include_ROOT}/window.h
+  ${contrib_include_ROOT}/qcustomplot.h
 )
 
 if (${QST_BUILD_WEBKIT})