# HG changeset patch # User František Kučera # Date 1540939975 -3600 # Node ID 8c5364450a46f5fb92df4d92ee5e991363c1538c # Parent 97847181b7243289fd27137ff5b72105f3b7670a rename from out-chart to out-gui diff -r 97847181b724 -r 8c5364450a46 CMakeLists.txt --- a/CMakeLists.txt Wed Oct 10 00:01:48 2018 +0200 +++ b/CMakeLists.txt Tue Oct 30 23:52:55 2018 +0100 @@ -1,3 +1,3 @@ -project (relpipe-out-chart.qt.cpp) +project (relpipe-out-gui.qt.cpp) cmake_minimum_required(VERSION 2.8) add_subdirectory (src) diff -r 97847181b724 -r 8c5364450a46 nbproject/configurations.xml --- a/nbproject/configurations.xml Wed Oct 10 00:01:48 2018 +0200 +++ b/nbproject/configurations.xml Tue Oct 30 23:52:55 2018 +0100 @@ -47,15 +47,6 @@ /usr/share/cmake-3.10/Modules/CMakeCXXCompilerABI.cpp /usr/share/cmake-3.10/Modules/CMakeCompilerABI.h - - - RelpipeChartMainWindow.cpp - RelpipeChartMainWindow.h - RelpipeChartMainWindow.ui - RelpipeTableModel.h - relpipe-out-chart.cpp - - build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW/moc_QtRelationalReaderStringHadler.cpp build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW/moc_RelpipeChartMainWindow.cpp + build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW/moc_RelpipeChartWidget.cpp build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW/moc_RelpipeTableModel.cpp @@ -70,6 +62,25 @@ build/Debug/src/relpipe-out-chart_autogen/mocs_compilation.cpp + + + + + + mocs_compilation.cpp + + + + + + RelpipeChartMainWindow.cpp + RelpipeChartMainWindow.h + RelpipeChartMainWindow.ui + RelpipeChartWidget.h + RelpipeTableModel.h + relpipe-out-chart.cpp + + false - + + @@ -101,28 +114,7 @@ build/Debug ${MAKE} -f Makefile ${MAKE} -f Makefile clean - build/Debug/src/relpipe-out-chart - - - build/Debug/src - src - build/Debug/src/relpipe-out-chart_autogen/include - ../relpipe-lib-reader.cpp/include - ../relpipe-lib-cli.cpp/include - /usr/include/x86_64-linux-gnu/qt5 - /usr/include/x86_64-linux-gnu/qt5/QtWidgets - /usr/include/x86_64-linux-gnu/qt5/QtGui - /usr/include/x86_64-linux-gnu/qt5/QtCore - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ - /usr/include/x86_64-linux-gnu/qt5/QtCharts - - - QT_CHARTS_LIB - QT_CORE_LIB - QT_GUI_LIB - QT_WIDGETS_LIB - - + build/Debug/src/relpipe-out-gui build/Debug @@ -134,6 +126,8 @@ ex="false" tool="1" flavor2="11"> + + + + + + + + + + + + /usr/include/x86_64-linux-gnu/qt5/QtCore + + + QT_CHARTS_LIB + QT_CORE_LIB + QT_GUI_LIB + QT_WIDGETS_LIB + + + + + + + ../relpipe-lib-reader.cpp/include/relpipe/reader/handlers + src + build/Debug/src/relpipe-out-gui_autogen/EWIEGA46WW + ../relpipe-lib-reader.cpp/include/relpipe/reader + /usr/include/x86_64-linux-gnu/qt5/QtGui + /usr/include/x86_64-linux-gnu/qt5/QtWidgets + build/Debug/src/relpipe-out-gui_autogen/include + /usr/include/x86_64-linux-gnu/qt5/QtCharts + build/Debug/src/relpipe-out-gui_autogen + /usr/include/x86_64-linux-gnu/qt5 + ../relpipe-lib-reader.cpp/include + build/Debug/src + + + + build/Debug/src + src + build/Debug/src/relpipe-out-gui_autogen/include + ../relpipe-lib-reader.cpp/include + ../relpipe-lib-cli.cpp/include + /usr/include/x86_64-linux-gnu/qt5 + /usr/include/x86_64-linux-gnu/qt5/QtWidgets + /usr/include/x86_64-linux-gnu/qt5/QtGui + /usr/include/x86_64-linux-gnu/qt5/QtCore + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ + /usr/include/x86_64-linux-gnu/qt5/QtCharts /usr/include + + QT_CHARTS_LIB + QT_CORE_LIB + QT_GUI_LIB + QT_WIDGETS_LIB + + + + + + + /usr/include/x86_64-linux-gnu/qt5/QtCore + ../relpipe-lib-reader.cpp/include/relpipe/reader/handlers + src + build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW + ../relpipe-lib-reader.cpp/include/relpipe/reader + /usr/include/x86_64-linux-gnu/qt5/QtGui + /usr/include/x86_64-linux-gnu/qt5/QtWidgets + build/Debug/src/relpipe-out-chart_autogen/include + /usr/include/x86_64-linux-gnu/qt5/QtCharts + build/Debug/src/relpipe-out-chart_autogen + /usr/include/x86_64-linux-gnu/qt5 + ../relpipe-lib-reader.cpp/include + build/Debug/src + + + /usr/include/x86_64-linux-gnu/qt5/QtWidgets + build/Debug/src/relpipe-out-gui_autogen/include + ../relpipe-lib-reader.cpp/include/relpipe/reader/handlers + src + /usr/include/x86_64-linux-gnu/qt5/QtGui + ../relpipe-lib-reader.cpp/include/relpipe/reader + /usr/include/x86_64-linux-gnu/qt5/QtCharts + /usr/include/x86_64-linux-gnu/qt5 + ../relpipe-lib-reader.cpp/include + build/Debug/src + + + ../relpipe-lib-cli.cpp/include/relpipe/cli + ../relpipe-lib-reader.cpp/include/relpipe/reader/handlers + ../relpipe-lib-reader.cpp/include/relpipe/reader + src + /usr/include/x86_64-linux-gnu/qt5/QtGui + /usr/include/x86_64-linux-gnu/qt5/QtWidgets + build/Debug/src/relpipe-out-gui_autogen/include + /usr/include/x86_64-linux-gnu/qt5/QtCharts + ../relpipe-lib-cli.cpp/include + ../relpipe-lib-reader.cpp/include + /usr/include/x86_64-linux-gnu/qt5 + build/Debug/src + @@ -208,6 +307,8 @@ + + diff -r 97847181b724 -r 8c5364450a46 src/CMakeLists.txt --- a/src/CMakeLists.txt Wed Oct 10 00:01:48 2018 +0200 +++ b/src/CMakeLists.txt Tue Oct 30 23:52:55 2018 +0100 @@ -1,4 +1,4 @@ -set(EXECUTABLE_FILE "relpipe-out-chart") +set(EXECUTABLE_FILE "relpipe-out-gui") # Qt libraries: set(CMAKE_INCLUDE_CURRENT_DIR ON) # Find includes in corresponding build directories @@ -22,6 +22,7 @@ add_executable( ${EXECUTABLE_FILE} QtRelationalReaderStringHadler.h # QObjects must be listed here (including them from other files is not enough) + #RelpipeChartWidget.h RelpipeTableModel.h RelpipeChartMainWindow.ui RelpipeChartMainWindow.cpp