--- 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)
--- 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 @@
<itemPath>/usr/share/cmake-3.10/Modules/CMakeCXXCompilerABI.cpp</itemPath>
<itemPath>/usr/share/cmake-3.10/Modules/CMakeCompilerABI.h</itemPath>
</logicalFolder>
- <df root="." name="0">
- <df name="src">
- <in>RelpipeChartMainWindow.cpp</in>
- <in>RelpipeChartMainWindow.h</in>
- <in>RelpipeChartMainWindow.ui</in>
- <in>RelpipeTableModel.h</in>
- <in>relpipe-out-chart.cpp</in>
- </df>
- </df>
<logicalFolder name="relpipe-out-chart_autogen"
displayName="relpipe-out-chart_autogen"
projectFiles="true"
@@ -63,6 +54,7 @@
<logicalFolder name="EWIEGA46WW" displayName="EWIEGA46WW" projectFiles="true">
<itemPath>build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW/moc_QtRelationalReaderStringHadler.cpp</itemPath>
<itemPath>build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW/moc_RelpipeChartMainWindow.cpp</itemPath>
+ <itemPath>build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW/moc_RelpipeChartWidget.cpp</itemPath>
<itemPath>build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW/moc_RelpipeTableModel.cpp</itemPath>
</logicalFolder>
<logicalFolder name="include" displayName="include" projectFiles="true">
@@ -70,6 +62,25 @@
</logicalFolder>
<itemPath>build/Debug/src/relpipe-out-chart_autogen/mocs_compilation.cpp</itemPath>
</logicalFolder>
+ <df root="." name="0">
+ <df name="build">
+ <df name="Debug">
+ <df name="src">
+ <df name="relpipe-out-gui_autogen">
+ <in>mocs_compilation.cpp</in>
+ </df>
+ </df>
+ </df>
+ </df>
+ <df name="src">
+ <in>RelpipeChartMainWindow.cpp</in>
+ <in>RelpipeChartMainWindow.h</in>
+ <in>RelpipeChartMainWindow.ui</in>
+ <in>RelpipeChartWidget.h</in>
+ <in>RelpipeTableModel.h</in>
+ <in>relpipe-out-chart.cpp</in>
+ </df>
+ </df>
<logicalFolder name="ExternalFiles"
displayName="Important Files"
projectFiles="false"
@@ -92,7 +103,9 @@
<rebuildPropChanged>false</rebuildPropChanged>
</toolsSet>
<flagsDictionary>
- <element flagsID="0" commonFlags="-fsanitize=address -fPIC -std=gnu++11"/>
+ <element flagsID="0"
+ commonFlags="-mtune=generic -march=x86-64 -std=gnu++11 -fsanitize=address -fPIC -fstack-protector-strong"/>
+ <element flagsID="1" commonFlags="-std=c++14"/>
</flagsDictionary>
<codeAssistance>
</codeAssistance>
@@ -101,28 +114,7 @@
<buildCommandWorkingDir>build/Debug</buildCommandWorkingDir>
<buildCommand>${MAKE} -f Makefile</buildCommand>
<cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
- <executablePath>build/Debug/src/relpipe-out-chart</executablePath>
- <ccTool>
- <incDir>
- <pElem>build/Debug/src</pElem>
- <pElem>src</pElem>
- <pElem>build/Debug/src/relpipe-out-chart_autogen/include</pElem>
- <pElem>../relpipe-lib-reader.cpp/include</pElem>
- <pElem>../relpipe-lib-cli.cpp/include</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5/QtWidgets</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5/QtGui</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCore</pElem>
- <pElem>/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++</pElem>
- <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCharts</pElem>
- </incDir>
- <preprocessorList>
- <Elem>QT_CHARTS_LIB</Elem>
- <Elem>QT_CORE_LIB</Elem>
- <Elem>QT_GUI_LIB</Elem>
- <Elem>QT_WIDGETS_LIB</Elem>
- </preprocessorList>
- </ccTool>
+ <executablePath>build/Debug/src/relpipe-out-gui</executablePath>
</makeTool>
<preBuild>
<preBuildCommandWorkingDir>build/Debug</preBuildCommandWorkingDir>
@@ -134,6 +126,8 @@
ex="false"
tool="1"
flavor2="11">
+ <ccTool flags="1">
+ </ccTool>
</item>
<item path="build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW/moc_QtRelationalReaderStringHadler.cpp"
ex="true"
@@ -145,6 +139,11 @@
tool="3"
flavor2="0">
</item>
+ <item path="build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW/moc_RelpipeChartWidget.cpp"
+ ex="true"
+ tool="3"
+ flavor2="0">
+ </item>
<item path="build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW/moc_RelpipeTableModel.cpp"
ex="true"
tool="3"
@@ -157,19 +156,119 @@
<ccTool flags="0">
</ccTool>
</item>
+ <item path="build/Debug/src/relpipe-out-gui_autogen/mocs_compilation.cpp"
+ ex="false"
+ tool="1"
+ flavor2="8">
+ <ccTool flags="0">
+ </ccTool>
+ </item>
+ <folder path="0">
+ <ccTool>
+ <incDir>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCore</pElem>
+ </incDir>
+ <preprocessorList>
+ <Elem>QT_CHARTS_LIB</Elem>
+ <Elem>QT_CORE_LIB</Elem>
+ <Elem>QT_GUI_LIB</Elem>
+ <Elem>QT_WIDGETS_LIB</Elem>
+ </preprocessorList>
+ </ccTool>
+ </folder>
+ <folder path="0/build">
+ <ccTool>
+ <incDir>
+ <pElem>../relpipe-lib-reader.cpp/include/relpipe/reader/handlers</pElem>
+ <pElem>src</pElem>
+ <pElem>build/Debug/src/relpipe-out-gui_autogen/EWIEGA46WW</pElem>
+ <pElem>../relpipe-lib-reader.cpp/include/relpipe/reader</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtGui</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtWidgets</pElem>
+ <pElem>build/Debug/src/relpipe-out-gui_autogen/include</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCharts</pElem>
+ <pElem>build/Debug/src/relpipe-out-gui_autogen</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5</pElem>
+ <pElem>../relpipe-lib-reader.cpp/include</pElem>
+ <pElem>build/Debug/src</pElem>
+ </incDir>
+ </ccTool>
+ </folder>
<folder path="Modules">
<ccTool>
<incDir>
+ <pElem>build/Debug/src</pElem>
+ <pElem>src</pElem>
+ <pElem>build/Debug/src/relpipe-out-gui_autogen/include</pElem>
+ <pElem>../relpipe-lib-reader.cpp/include</pElem>
+ <pElem>../relpipe-lib-cli.cpp/include</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtWidgets</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtGui</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCore</pElem>
+ <pElem>/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCharts</pElem>
<pElem>/usr/include</pElem>
</incDir>
+ <preprocessorList>
+ <Elem>QT_CHARTS_LIB</Elem>
+ <Elem>QT_CORE_LIB</Elem>
+ <Elem>QT_GUI_LIB</Elem>
+ <Elem>QT_WIDGETS_LIB</Elem>
+ </preprocessorList>
+ </ccTool>
+ </folder>
+ <folder path="relpipe-out-chart_autogen">
+ <ccTool>
+ <incDir>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCore</pElem>
+ <pElem>../relpipe-lib-reader.cpp/include/relpipe/reader/handlers</pElem>
+ <pElem>src</pElem>
+ <pElem>build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW</pElem>
+ <pElem>../relpipe-lib-reader.cpp/include/relpipe/reader</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtGui</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtWidgets</pElem>
+ <pElem>build/Debug/src/relpipe-out-chart_autogen/include</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCharts</pElem>
+ <pElem>build/Debug/src/relpipe-out-chart_autogen</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5</pElem>
+ <pElem>../relpipe-lib-reader.cpp/include</pElem>
+ <pElem>build/Debug/src</pElem>
+ </incDir>
</ccTool>
</folder>
<item path="src/RelpipeChartMainWindow.cpp" ex="false" tool="1" flavor2="8">
<ccTool flags="0">
+ <incDir>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtWidgets</pElem>
+ <pElem>build/Debug/src/relpipe-out-gui_autogen/include</pElem>
+ <pElem>../relpipe-lib-reader.cpp/include/relpipe/reader/handlers</pElem>
+ <pElem>src</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtGui</pElem>
+ <pElem>../relpipe-lib-reader.cpp/include/relpipe/reader</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCharts</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5</pElem>
+ <pElem>../relpipe-lib-reader.cpp/include</pElem>
+ <pElem>build/Debug/src</pElem>
+ </incDir>
</ccTool>
</item>
<item path="src/relpipe-out-chart.cpp" ex="false" tool="1" flavor2="8">
<ccTool flags="0">
+ <incDir>
+ <pElem>../relpipe-lib-cli.cpp/include/relpipe/cli</pElem>
+ <pElem>../relpipe-lib-reader.cpp/include/relpipe/reader/handlers</pElem>
+ <pElem>../relpipe-lib-reader.cpp/include/relpipe/reader</pElem>
+ <pElem>src</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtGui</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtWidgets</pElem>
+ <pElem>build/Debug/src/relpipe-out-gui_autogen/include</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCharts</pElem>
+ <pElem>../relpipe-lib-cli.cpp/include</pElem>
+ <pElem>../relpipe-lib-reader.cpp/include</pElem>
+ <pElem>/usr/include/x86_64-linux-gnu/qt5</pElem>
+ <pElem>build/Debug/src</pElem>
+ </incDir>
</ccTool>
</item>
</conf>
@@ -208,6 +307,8 @@
</item>
<item path="src/RelpipeChartMainWindow.ui" ex="false" tool="3" flavor2="0">
</item>
+ <item path="src/RelpipeChartWidget.h" ex="false" tool="3" flavor2="0">
+ </item>
<item path="src/RelpipeTableModel.h" ex="false" tool="3" flavor2="0">
</item>
<item path="src/relpipe-out-chart.cpp" ex="false" tool="1" flavor2="0">
--- 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