diff --git a/CMakeLists.txt b/CMakeLists.txt index cbfdc4363b..b6cfb6e80d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ if(NOT DEFINED LIB_INSTALL) option(LIB_INSTALL "Install library" ON) endif() if(NOT DEFINED CMAKE_INSTALL_PREFIX) - option(CMAKE_INSTALL_PREFIX "Install directory" .) + option(CMAKE_INSTALL_PREFIX "Install directory" ${CMAKE_CURRENT_SOURCE_DIR}/instal) endif() @@ -74,10 +74,17 @@ if(MSVC) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) add_compile_options(/EHsc) - add_definitions(/D_USE_MATH_DEFINES /D_CRT_NO_VA_START_VALIDATION /DNOMINMAX) + # To enable M_PI, M_E,... + add_definitions(/D_USE_MATH_DEFINES) + # To Prevent Errors with min() and max() + add_definitions(/DNOMINMAX) + # To fix error: C2338: va_start argument must not + # have reference type and must not be parenthesized + add_definitions(/D_CRT_NO_VA_START_VALIDATION) else() add_compile_options(-fexceptions) endif() + if(BUILD_INCLUDE_XITS_FONTS) add_definitions(-DAUTOLOAD_XITS_FONTS -DUSE_XITS_FONTS ) else() diff --git a/doc/Doxyfile b/doc/Doxyfile index 611ba0b698..9a11ba3853 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -885,7 +885,7 @@ RECURSIVE = YES EXCLUDE = moc_*.* \ qrc_*.* \ build-* \ - ../lib/jkqtplotterressources/math_fonts/xits \ + ../lib/jkqtplotter/resources/math_fonts/xits \ Makefile \ Makefile*.* \ ../examples/jkqtmathtext_test/asana \ diff --git a/doc/dox/jkqtplotter.dox b/doc/dox/jkqtplotter.dox index eea6936ecc..cb569b085b 100644 --- a/doc/dox/jkqtplotter.dox +++ b/doc/dox/jkqtplotter.dox @@ -570,7 +570,7 @@ You can e.g. use these general methods to alter the styles for all JKQTPlotter i JKQTPGetSystemDefaultStyle().userActionColor=QColor("red"); \endcode -Several pre-made styles are available in the JKQTPlotter repository (https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotterressources/styles/). +Several pre-made styles are available in the JKQTPlotter repository (https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotter/resources/styles/). These are also linked into the JKQTPlotter library as Qt ressource into the subdirectory \c :/JKQTPlotter/styles/ . You can use them as follows: \code{.cpp} @@ -588,22 +588,22 @@ Here is a table with all available ready-made styles: The Default Style \image html style_default.png - \c :/JKQTPlotter/styles/simple_gridandticks.ini + \c :/JKQTPlotter/styles/simple_gridandticks.ini \image html style_simple_axesoffset_plotbox.png - \c :/JKQTPlotter/styles/simple_axesoffset.ini + \c :/JKQTPlotter/styles/simple_axesoffset.ini \image html style_simple_axesoffset.png - \c :/JKQTPlotter/styles/simple_axesoffset_plotbox.ini + \c :/JKQTPlotter/styles/simple_axesoffset_plotbox.ini \image html style_simple_axesoffset_plotbox.png - \c :/JKQTPlotter/styles/dark.ini + \c :/JKQTPlotter/styles/dark.ini \image html style_dark.png - \c :/JKQTPlotter/styles/blueprint.ini + \c :/JKQTPlotter/styles/blueprint.ini \image html style_blueprint.png - \c :/JKQTPlotter/styles/blackandwhite.ini + \c :/JKQTPlotter/styles/blackandwhite.ini \image html style_blackandwhite.png diff --git a/doc/dox/license.dox b/doc/dox/license.dox index 012269176b..0319229a58 100644 --- a/doc/dox/license.dox +++ b/doc/dox/license.dox @@ -547,7 +547,7 @@ high-quality math rendering. It is possible to use the class with other fonts, b The source for this library can be found here: https://github.com/alif-type/xits \note The XITS fonts are distributed in - lib/jkqtplotterressources/math_fonts/xits + lib/jkqtplotter/resources/math_fonts/xits and are automatically added to the binary libraries as Qt Resources. You can prevent this by adding the line \code DEFINES += NO_XITS_FONTS diff --git a/examples/jkqtplot_test/TestWidgetBarcharts.cpp b/examples/jkqtplot_test/TestWidgetBarcharts.cpp index fac9049e0b..3207f71b76 100644 --- a/examples/jkqtplot_test/TestWidgetBarcharts.cpp +++ b/examples/jkqtplot_test/TestWidgetBarcharts.cpp @@ -3,7 +3,7 @@ #include #include #include -#include "jkqtplotter/jkqtpgraphsbarchart.h" +#include "jkqtplotter/graphs/jkqtpbarchart.h" diff --git a/examples/jkqtplot_test/TestWidgetBarcharts.h b/examples/jkqtplot_test/TestWidgetBarcharts.h index b37d9ba0ba..b35d0b6dca 100644 --- a/examples/jkqtplot_test/TestWidgetBarcharts.h +++ b/examples/jkqtplot_test/TestWidgetBarcharts.h @@ -11,10 +11,10 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsgeometric.h" -#include "jkqtplotter/jkqtpgraphsimage.h" -#include "jkqtplotter/jkqtpelementsoverlay.h" -#include "jkqtplotter/jkqtpgraphsparsedfunction.h" +#include "jkqtplotter/graphs/jkqtpgeometric.h" +#include "jkqtplotter/graphs/jkqtpimage.h" +#include "jkqtplotter/overlays/jkqtpbasicoverlays.h" +#include "jkqtplotter/graphs/jkqtpparsedfunction.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/jkqtptools.h" diff --git a/examples/jkqtplot_test/TestWidgetContourPlots.h b/examples/jkqtplot_test/TestWidgetContourPlots.h index f59605fd2c..834676d1da 100644 --- a/examples/jkqtplot_test/TestWidgetContourPlots.h +++ b/examples/jkqtplot_test/TestWidgetContourPlots.h @@ -11,11 +11,11 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsgeometric.h" -#include "jkqtplotter/jkqtpgraphsimage.h" -#include "jkqtplotter/jkqtpgraphscontour.h" -#include "jkqtplotter/jkqtpelementsoverlay.h" -#include "jkqtplotter/jkqtpgraphsparsedfunction.h" +#include "jkqtplotter/graphs/jkqtpgeometric.h" +#include "jkqtplotter/graphs/jkqtpimage.h" +#include "jkqtplotter/graphs/jkqtpcontour.h" +#include "jkqtplotter/overlays/jkqtpbasicoverlays.h" +#include "jkqtplotter/graphs/jkqtpparsedfunction.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/jkqtptools.h" diff --git a/examples/jkqtplot_test/TestWidgetEmptyPlot.h b/examples/jkqtplot_test/TestWidgetEmptyPlot.h index dccb88893b..ca2229e51e 100644 --- a/examples/jkqtplot_test/TestWidgetEmptyPlot.h +++ b/examples/jkqtplot_test/TestWidgetEmptyPlot.h @@ -11,10 +11,10 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsgeometric.h" -#include "jkqtplotter/jkqtpgraphsimage.h" -#include "jkqtplotter/jkqtpelementsoverlay.h" -#include "jkqtplotter/jkqtpgraphsparsedfunction.h" +#include "jkqtplotter/graphs/jkqtpgeometric.h" +#include "jkqtplotter/graphs/jkqtpimage.h" +#include "jkqtplotter/overlays/jkqtpbasicoverlays.h" +#include "jkqtplotter/graphs/jkqtpparsedfunction.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/jkqtptools.h" diff --git a/examples/jkqtplot_test/TestWidgetFunctionPlots.h b/examples/jkqtplot_test/TestWidgetFunctionPlots.h index 52f68f254b..fb8cbaec78 100644 --- a/examples/jkqtplot_test/TestWidgetFunctionPlots.h +++ b/examples/jkqtplot_test/TestWidgetFunctionPlots.h @@ -11,10 +11,10 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsgeometric.h" -#include "jkqtplotter/jkqtpgraphsimage.h" -#include "jkqtplotter/jkqtpelementsoverlay.h" -#include "jkqtplotter/jkqtpgraphsparsedfunction.h" +#include "jkqtplotter/graphs/jkqtpgeometric.h" +#include "jkqtplotter/graphs/jkqtpimage.h" +#include "jkqtplotter/overlays/jkqtpbasicoverlays.h" +#include "jkqtplotter/graphs/jkqtpparsedfunction.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/gui/jkqtpcomboboxes.h" diff --git a/examples/jkqtplot_test/TestWidgetGeometry.h b/examples/jkqtplot_test/TestWidgetGeometry.h index 54926613c6..eaafc0c5ea 100644 --- a/examples/jkqtplot_test/TestWidgetGeometry.h +++ b/examples/jkqtplot_test/TestWidgetGeometry.h @@ -11,10 +11,10 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsgeometric.h" -#include "jkqtplotter/jkqtpgraphsimage.h" -#include "jkqtplotter/jkqtpelementsoverlay.h" -#include "jkqtplotter/jkqtpgraphsparsedfunction.h" +#include "jkqtplotter/graphs/jkqtpgeometric.h" +#include "jkqtplotter/graphs/jkqtpimage.h" +#include "jkqtplotter/overlays/jkqtpbasicoverlays.h" +#include "jkqtplotter/graphs/jkqtpparsedfunction.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/jkqtptools.h" diff --git a/examples/jkqtplot_test/TestWidgetGraphs.cpp b/examples/jkqtplot_test/TestWidgetGraphs.cpp index dbe632900b..76b1791a0c 100644 --- a/examples/jkqtplot_test/TestWidgetGraphs.cpp +++ b/examples/jkqtplot_test/TestWidgetGraphs.cpp @@ -3,9 +3,9 @@ #include #include #include -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsboxplot.h" -#include "jkqtplotter/jkqtpgraphsfilledcurve.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpboxplot.h" +#include "jkqtplotter/graphs/jkqtpfilledcurve.h" #include "jkqtplotter/gui/jkqtpcomboboxes.h" diff --git a/examples/jkqtplot_test/TestWidgetGraphs.h b/examples/jkqtplot_test/TestWidgetGraphs.h index 1e4e02b6e6..2252568315 100644 --- a/examples/jkqtplot_test/TestWidgetGraphs.h +++ b/examples/jkqtplot_test/TestWidgetGraphs.h @@ -11,10 +11,10 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsgeometric.h" -#include "jkqtplotter/jkqtpgraphsimage.h" -#include "jkqtplotter/jkqtpelementsoverlay.h" -#include "jkqtplotter/jkqtpgraphsparsedfunction.h" +#include "jkqtplotter/graphs/jkqtpgeometric.h" +#include "jkqtplotter/graphs/jkqtpimage.h" +#include "jkqtplotter/overlays/jkqtpbasicoverlays.h" +#include "jkqtplotter/graphs/jkqtpparsedfunction.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/jkqtptools.h" diff --git a/examples/jkqtplot_test/TestWidgetImages.cpp b/examples/jkqtplot_test/TestWidgetImages.cpp index 42c8b67f9e..314e647f7d 100644 --- a/examples/jkqtplot_test/TestWidgetImages.cpp +++ b/examples/jkqtplot_test/TestWidgetImages.cpp @@ -4,8 +4,8 @@ #include #include #include "jkqtplotter/gui/jkqtpcomboboxes.h" -#include "jkqtplotter/jkqtpgraphsimageoverlays.h" -#include "jkqtplotter/jkqtpgraphsimagergb.h" +#include "jkqtplotter/graphs/jkqtpimageoverlays.h" +#include "jkqtplotter/graphs/jkqtpimagergb.h" diff --git a/examples/jkqtplot_test/TestWidgetImages.h b/examples/jkqtplot_test/TestWidgetImages.h index cd187f1fdd..0ad733bc9b 100644 --- a/examples/jkqtplot_test/TestWidgetImages.h +++ b/examples/jkqtplot_test/TestWidgetImages.h @@ -11,10 +11,10 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsgeometric.h" -#include "jkqtplotter/jkqtpgraphsimage.h" -#include "jkqtplotter/jkqtpelementsoverlay.h" -#include "jkqtplotter/jkqtpgraphsparsedfunction.h" +#include "jkqtplotter/graphs/jkqtpgeometric.h" +#include "jkqtplotter/graphs/jkqtpimage.h" +#include "jkqtplotter/overlays/jkqtpbasicoverlays.h" +#include "jkqtplotter/graphs/jkqtpparsedfunction.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/jkqtptools.h" diff --git a/examples/jkqtplot_test/TestWidgetLogGraphs.h b/examples/jkqtplot_test/TestWidgetLogGraphs.h index 1c09942cc9..069fd726a4 100644 --- a/examples/jkqtplot_test/TestWidgetLogGraphs.h +++ b/examples/jkqtplot_test/TestWidgetLogGraphs.h @@ -11,10 +11,10 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsgeometric.h" -#include "jkqtplotter/jkqtpgraphsimage.h" -#include "jkqtplotter/jkqtpelementsoverlay.h" -#include "jkqtplotter/jkqtpgraphsparsedfunction.h" +#include "jkqtplotter/graphs/jkqtpgeometric.h" +#include "jkqtplotter/graphs/jkqtpimage.h" +#include "jkqtplotter/overlays/jkqtpbasicoverlays.h" +#include "jkqtplotter/graphs/jkqtpparsedfunction.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/jkqtptools.h" diff --git a/examples/jkqtplot_test/TestWidgetParamScatterPlots.h b/examples/jkqtplot_test/TestWidgetParamScatterPlots.h index 038303cf90..a1eb6c7c24 100644 --- a/examples/jkqtplot_test/TestWidgetParamScatterPlots.h +++ b/examples/jkqtplot_test/TestWidgetParamScatterPlots.h @@ -11,10 +11,10 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsgeometric.h" -#include "jkqtplotter/jkqtpgraphsimage.h" -#include "jkqtplotter/jkqtpelementsoverlay.h" -#include "jkqtplotter/jkqtpgraphsparsedfunction.h" +#include "jkqtplotter/graphs/jkqtpgeometric.h" +#include "jkqtplotter/graphs/jkqtpimage.h" +#include "jkqtplotter/overlays/jkqtpbasicoverlays.h" +#include "jkqtplotter/graphs/jkqtpparsedfunction.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/jkqtptools.h" diff --git a/examples/jkqtplot_test/TestWidgetPeaksPlots.h b/examples/jkqtplot_test/TestWidgetPeaksPlots.h index dc51916695..23b1feb099 100644 --- a/examples/jkqtplot_test/TestWidgetPeaksPlots.h +++ b/examples/jkqtplot_test/TestWidgetPeaksPlots.h @@ -11,7 +11,7 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphspeakstream.h" +#include "jkqtplotter/graphs/jkqtppeakstream.h" #define N1 200 #define N2 50 diff --git a/examples/jkqtplot_test/TestWidgetRGBImages.h b/examples/jkqtplot_test/TestWidgetRGBImages.h index 0348c6da24..400f192428 100644 --- a/examples/jkqtplot_test/TestWidgetRGBImages.h +++ b/examples/jkqtplot_test/TestWidgetRGBImages.h @@ -11,11 +11,11 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsgeometric.h" -#include "jkqtplotter/jkqtpgraphsimage.h" -#include "jkqtplotter/jkqtpgraphsimagergb.h" -#include "jkqtplotter/jkqtpelementsoverlay.h" -#include "jkqtplotter/jkqtpgraphsparsedfunction.h" +#include "jkqtplotter/graphs/jkqtpgeometric.h" +#include "jkqtplotter/graphs/jkqtpimage.h" +#include "jkqtplotter/graphs/jkqtpimagergb.h" +#include "jkqtplotter/overlays/jkqtpbasicoverlays.h" +#include "jkqtplotter/graphs/jkqtpparsedfunction.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/jkqtptools.h" diff --git a/examples/simpletest/jkqtplotter_simpletest.cpp b/examples/simpletest/jkqtplotter_simpletest.cpp index fa03731f0c..b69bcebb46 100644 --- a/examples/simpletest/jkqtplotter_simpletest.cpp +++ b/examples/simpletest/jkqtplotter_simpletest.cpp @@ -6,7 +6,7 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" int main(int argc, char* argv[]) diff --git a/examples/simpletest_advancedlineandfillstyling/jkqtplotter_simpletest_advancedlineandfillstyling.cpp b/examples/simpletest_advancedlineandfillstyling/jkqtplotter_simpletest_advancedlineandfillstyling.cpp index fae179fbfc..cd4749a159 100644 --- a/examples/simpletest_advancedlineandfillstyling/jkqtplotter_simpletest_advancedlineandfillstyling.cpp +++ b/examples/simpletest_advancedlineandfillstyling/jkqtplotter_simpletest_advancedlineandfillstyling.cpp @@ -6,10 +6,10 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsspecialline.h" -#include "jkqtplotter/jkqtpgraphsbarchart.h" -#include "jkqtplotter/jkqtpgraphsgeometric.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpspecialline.h" +#include "jkqtplotter/graphs/jkqtpbarchart.h" +#include "jkqtplotter/graphs/jkqtpgeometric.h" int main(int argc, char* argv[]) { diff --git a/examples/simpletest_barchart/README.md b/examples/simpletest_barchart/README.md index 44a64677aa..9ced74e83e 100644 --- a/examples/simpletest_barchart/README.md +++ b/examples/simpletest_barchart/README.md @@ -5,7 +5,7 @@ The source code of the main application is (see [`jkqtplotter_simpletest_barchar ```.cpp #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsbarchart.h" +#include "jkqtplotter/graphs/jkqtpbarchart.h" #define Ndata 5 int main(int argc, char* argv[]) diff --git a/examples/simpletest_barchart/jkqtplotter_simpletest_barchart.cpp b/examples/simpletest_barchart/jkqtplotter_simpletest_barchart.cpp index b5bbbfc440..5d9b0a4b10 100644 --- a/examples/simpletest_barchart/jkqtplotter_simpletest_barchart.cpp +++ b/examples/simpletest_barchart/jkqtplotter_simpletest_barchart.cpp @@ -6,8 +6,8 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsbarchart.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpbarchart.h" #define Ndata 5 int main(int argc, char* argv[]) diff --git a/examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot.cpp b/examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot.cpp index 9e13ed2aa0..fe0546fa2b 100644 --- a/examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot.cpp +++ b/examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot.cpp @@ -6,8 +6,8 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsboxplot.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpboxplot.h" int main(int argc, char* argv[]) { diff --git a/examples/simpletest_contourplot/jkqtplotter_simpletest_contourplot.cpp b/examples/simpletest_contourplot/jkqtplotter_simpletest_contourplot.cpp index 800cb594a4..99da5b0dd0 100644 --- a/examples/simpletest_contourplot/jkqtplotter_simpletest_contourplot.cpp +++ b/examples/simpletest_contourplot/jkqtplotter_simpletest_contourplot.cpp @@ -7,7 +7,7 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphscontour.h" +#include "jkqtplotter/graphs/jkqtpcontour.h" #ifndef M_PI #define M_PI 3.14159265358979323846 diff --git a/examples/simpletest_datastore/jkqtplotter_simpletest_datastore.cpp b/examples/simpletest_datastore/jkqtplotter_simpletest_datastore.cpp index 45057eed39..cec6a04d96 100644 --- a/examples/simpletest_datastore/jkqtplotter_simpletest_datastore.cpp +++ b/examples/simpletest_datastore/jkqtplotter_simpletest_datastore.cpp @@ -6,8 +6,8 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include int main(int argc, char* argv[]) diff --git a/examples/simpletest_datastore_groupedstat/jkqtplotter_simpletest_datastore_groupedstat.cpp b/examples/simpletest_datastore_groupedstat/jkqtplotter_simpletest_datastore_groupedstat.cpp index 7fa8cedf6e..e019c74965 100644 --- a/examples/simpletest_datastore_groupedstat/jkqtplotter_simpletest_datastore_groupedstat.cpp +++ b/examples/simpletest_datastore_groupedstat/jkqtplotter_simpletest_datastore_groupedstat.cpp @@ -6,9 +6,9 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsbarchart.h" -#include "jkqtplotter/jkqtpgraphsstatisticsadaptors.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpbarchart.h" +#include "jkqtplotter/graphs/jkqtpstatisticsadaptors.h" #include "jkqtcommon/jkqtpstatisticstools.h" #include "jkqtcommon/jkqtpstringtools.h" #include diff --git a/examples/simpletest_datastore_iterators/jkqtplotter_simpletest_datastore_iterators.cpp b/examples/simpletest_datastore_iterators/jkqtplotter_simpletest_datastore_iterators.cpp index fdff7f1bba..0f6e3accbb 100644 --- a/examples/simpletest_datastore_iterators/jkqtplotter_simpletest_datastore_iterators.cpp +++ b/examples/simpletest_datastore_iterators/jkqtplotter_simpletest_datastore_iterators.cpp @@ -6,8 +6,8 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include int main(int argc, char* argv[]) diff --git a/examples/simpletest_datastore_regression/jkqtplotter_simpletest_datastore_regression.cpp b/examples/simpletest_datastore_regression/jkqtplotter_simpletest_datastore_regression.cpp index a5dc7a4ca1..fd074789a4 100644 --- a/examples/simpletest_datastore_regression/jkqtplotter_simpletest_datastore_regression.cpp +++ b/examples/simpletest_datastore_regression/jkqtplotter_simpletest_datastore_regression.cpp @@ -6,10 +6,10 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphspeakstream.h" -#include "jkqtplotter/jkqtpgraphsboxplot.h" -#include "jkqtplotter/jkqtpgraphsstatisticsadaptors.h" -#include "jkqtplotter/jkqtpgraphsevaluatedfunction.h" +#include "jkqtplotter/graphs/jkqtppeakstream.h" +#include "jkqtplotter/graphs/jkqtpboxplot.h" +#include "jkqtplotter/graphs/jkqtpstatisticsadaptors.h" +#include "jkqtplotter/graphs/jkqtpevaluatedfunction.h" #include "jkqtcommon/jkqtpstatisticstools.h" #include "jkqtcommon/jkqtpstringtools.h" #include diff --git a/examples/simpletest_datastore_statistics/jkqtplotter_simpletest_datastore_statistics.cpp b/examples/simpletest_datastore_statistics/jkqtplotter_simpletest_datastore_statistics.cpp index 6da5377038..295c19ef7b 100644 --- a/examples/simpletest_datastore_statistics/jkqtplotter_simpletest_datastore_statistics.cpp +++ b/examples/simpletest_datastore_statistics/jkqtplotter_simpletest_datastore_statistics.cpp @@ -6,10 +6,10 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphspeakstream.h" -#include "jkqtplotter/jkqtpgraphsboxplot.h" -#include "jkqtplotter/jkqtpgraphsstatisticsadaptors.h" -#include "jkqtplotter/jkqtpgraphsevaluatedfunction.h" +#include "jkqtplotter/graphs/jkqtppeakstream.h" +#include "jkqtplotter/graphs/jkqtpboxplot.h" +#include "jkqtplotter/graphs/jkqtpstatisticsadaptors.h" +#include "jkqtplotter/graphs/jkqtpevaluatedfunction.h" #include "jkqtcommon/jkqtpstatisticstools.h" #include "jkqtcommon/jkqtpstringtools.h" #include diff --git a/examples/simpletest_datastore_statistics_2d/jkqtplotter_simpletest_datastore_statistics_2d.cpp b/examples/simpletest_datastore_statistics_2d/jkqtplotter_simpletest_datastore_statistics_2d.cpp index 820a5a939b..9f785cd1bc 100644 --- a/examples/simpletest_datastore_statistics_2d/jkqtplotter_simpletest_datastore_statistics_2d.cpp +++ b/examples/simpletest_datastore_statistics_2d/jkqtplotter_simpletest_datastore_statistics_2d.cpp @@ -6,10 +6,10 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsimage.h" -#include "jkqtplotter/jkqtpgraphsstatisticsadaptors.h" -#include "jkqtplotter/jkqtpgraphsgeometric.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" +#include "jkqtplotter/graphs/jkqtpimage.h" +#include "jkqtplotter/graphs/jkqtpstatisticsadaptors.h" +#include "jkqtplotter/graphs/jkqtpgeometric.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" #include "jkqtcommon/jkqtpstatisticstools.h" #include "jkqtcommon/jkqtpstringtools.h" #include diff --git a/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes.cpp b/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes.cpp index 431a9a80e5..8c6bbab9fd 100644 --- a/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes.cpp +++ b/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes.cpp @@ -10,10 +10,10 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsgeometric.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpgeometric.h" #include "jkqtplotter/jkqtptools.h" -#include "jkqtplotter/jkqtpgraphsfilledcurve.h" +#include "jkqtplotter/graphs/jkqtpfilledcurve.h" void drawWithDateAxis(JKQTPlotter& plot) { diff --git a/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.cpp b/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.cpp index 5fb391e2da..34ccd66e68 100644 --- a/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.cpp +++ b/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.cpp @@ -6,7 +6,7 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" #include "jkqtplotter/jkqtptools.h" diff --git a/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs.cpp b/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs.cpp index 6b8c0d2cf3..be3d0db6dd 100644 --- a/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs.cpp +++ b/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs.cpp @@ -6,7 +6,7 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsfilledcurve.h" +#include "jkqtplotter/graphs/jkqtpfilledcurve.h" int main(int argc, char* argv[]) { diff --git a/examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot.cpp b/examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot.cpp index 55b8d19b35..fa944eb553 100644 --- a/examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot.cpp +++ b/examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot.cpp @@ -8,7 +8,7 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsevaluatedfunction.h" +#include "jkqtplotter/graphs/jkqtpevaluatedfunction.h" double sinc(double x) { return 10.0*sin(x)/x; diff --git a/examples/simpletest_geometric/jkqtplotter_simpletest_geometric.cpp b/examples/simpletest_geometric/jkqtplotter_simpletest_geometric.cpp index f3a127911f..6b2b19b0a3 100644 --- a/examples/simpletest_geometric/jkqtplotter_simpletest_geometric.cpp +++ b/examples/simpletest_geometric/jkqtplotter_simpletest_geometric.cpp @@ -6,7 +6,7 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsgeometric.h" +#include "jkqtplotter/graphs/jkqtpgeometric.h" int main(int argc, char* argv[]) diff --git a/examples/simpletest_imageplot/README.md b/examples/simpletest_imageplot/README.md index f20ae35a38..9f18adb557 100644 --- a/examples/simpletest_imageplot/README.md +++ b/examples/simpletest_imageplot/README.md @@ -6,7 +6,7 @@ The source code of the main application is (see [`jkqtplotter_simpletest_imagepl #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #ifndef M_PI #define M_PI 3.14159265358979323846 diff --git a/examples/simpletest_imageplot/jkqtplotter_simpletest_imageplot.cpp b/examples/simpletest_imageplot/jkqtplotter_simpletest_imageplot.cpp index a3444ddf56..4bd3737621 100644 --- a/examples/simpletest_imageplot/jkqtplotter_simpletest_imageplot.cpp +++ b/examples/simpletest_imageplot/jkqtplotter_simpletest_imageplot.cpp @@ -7,7 +7,7 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #ifndef M_PI #define M_PI 3.14159265358979323846 diff --git a/examples/simpletest_imageplot_modifier/README.md b/examples/simpletest_imageplot_modifier/README.md index ef867c0799..16a3e07fcd 100644 --- a/examples/simpletest_imageplot_modifier/README.md +++ b/examples/simpletest_imageplot_modifier/README.md @@ -6,7 +6,7 @@ The source code of the main application is (see [`jkqtplotter_simpletest_imagepl #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #ifndef M_PI #define M_PI 3.14159265358979323846 diff --git a/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.cpp b/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.cpp index f336ef5a80..3891028a54 100644 --- a/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.cpp +++ b/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.cpp @@ -7,7 +7,7 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #ifndef M_PI #define M_PI 3.14159265358979323846 diff --git a/examples/simpletest_imageplot_nodatastore/README.md b/examples/simpletest_imageplot_nodatastore/README.md index 3fe6e520ac..b62c8430d9 100644 --- a/examples/simpletest_imageplot_nodatastore/README.md +++ b/examples/simpletest_imageplot_nodatastore/README.md @@ -6,7 +6,7 @@ The source code of the main application is (see [`jkqtplotter_simpletest_imagepl #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #ifndef M_PI #define M_PI 3.14159265358979323846 diff --git a/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.cpp b/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.cpp index d7ebedb03f..62ef0cb60c 100644 --- a/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.cpp +++ b/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.cpp @@ -7,7 +7,7 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #ifndef M_PI #define M_PI 3.14159265358979323846 diff --git a/examples/simpletest_imageplot_opencv/README.md b/examples/simpletest_imageplot_opencv/README.md index ab2f4095bf..d24a904d51 100644 --- a/examples/simpletest_imageplot_opencv/README.md +++ b/examples/simpletest_imageplot_opencv/README.md @@ -9,7 +9,7 @@ The source code of the main application is (see [`jkqtplotter_simpletest_imagepl #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include "jkqtplotter/jkqtpopencvinterface.h" #include diff --git a/examples/simpletest_imageplot_opencv/jkqtplotter_simpletest_imageplot_opencv.cpp b/examples/simpletest_imageplot_opencv/jkqtplotter_simpletest_imageplot_opencv.cpp index 30961fd550..66a40b6108 100644 --- a/examples/simpletest_imageplot_opencv/jkqtplotter_simpletest_imageplot_opencv.cpp +++ b/examples/simpletest_imageplot_opencv/jkqtplotter_simpletest_imageplot_opencv.cpp @@ -7,8 +7,8 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include "jkqtplotter/jkqtpopencvinterface.h" #include diff --git a/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot.cpp b/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot.cpp index 8f532bdc10..632f61ad39 100644 --- a/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot.cpp +++ b/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot.cpp @@ -6,7 +6,7 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsimpulses.h" +#include "jkqtplotter/graphs/jkqtpimpulses.h" // number of datapoints: #define Ndata 40 diff --git a/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.cpp b/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.cpp index 218760349c..c124148209 100644 --- a/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.cpp +++ b/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.cpp @@ -6,8 +6,8 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsgeometric.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpgeometric.h" #include "jkqtplotter/jkqtptools.h" #define sqr(x) ((x)*(x)) diff --git a/examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve.cpp b/examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve.cpp index 73a33ef508..40c62f41e7 100644 --- a/examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve.cpp +++ b/examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve.cpp @@ -6,7 +6,7 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" int main(int argc, char* argv[]) diff --git a/examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot.cpp b/examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot.cpp index df7713d43b..c331fb4a28 100644 --- a/examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot.cpp +++ b/examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot.cpp @@ -6,7 +6,7 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" int main(int argc, char* argv[]) diff --git a/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image.cpp b/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image.cpp index 4bcb7af107..a9c4e0d0e1 100644 --- a/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image.cpp +++ b/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image.cpp @@ -6,8 +6,8 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpimage.h" int main(int argc, char* argv[]) diff --git a/examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot.cpp b/examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot.cpp index eaec1d1cfa..73d800fa8a 100644 --- a/examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot.cpp +++ b/examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot.cpp @@ -10,8 +10,8 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsparsedfunction.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpparsedfunction.h" diff --git a/examples/simpletest_rgbimageplot/README.md b/examples/simpletest_rgbimageplot/README.md index 8c3ef78e26..87484b91a0 100644 --- a/examples/simpletest_rgbimageplot/README.md +++ b/examples/simpletest_rgbimageplot/README.md @@ -6,7 +6,7 @@ The source code of the main application is (see [`jkqtplotter_simpletest_rgbimag #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsimagergb.h" +#include "jkqtplotter/graphs/jkqtpimagergb.h" #ifndef M_PI #define M_PI 3.14159265358979323846 diff --git a/examples/simpletest_rgbimageplot/jkqtplotter_simpletest_rgbimageplot.cpp b/examples/simpletest_rgbimageplot/jkqtplotter_simpletest_rgbimageplot.cpp index c5c3a03c05..b82fc9ea2a 100644 --- a/examples/simpletest_rgbimageplot/jkqtplotter_simpletest_rgbimageplot.cpp +++ b/examples/simpletest_rgbimageplot/jkqtplotter_simpletest_rgbimageplot.cpp @@ -7,7 +7,7 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsimagergb.h" +#include "jkqtplotter/graphs/jkqtpimagergb.h" #ifndef M_PI #define M_PI 3.14159265358979323846 diff --git a/examples/simpletest_rgbimageplot_opencv/README.md b/examples/simpletest_rgbimageplot_opencv/README.md index 281acb35bd..b4137e4c91 100644 --- a/examples/simpletest_rgbimageplot_opencv/README.md +++ b/examples/simpletest_rgbimageplot_opencv/README.md @@ -9,7 +9,7 @@ The source code of the main application is (see [`jkqtplotter_simpletest_imagepl #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include "jkqtplotter/jkqtpopencvinterface.h" #include #include diff --git a/examples/simpletest_rgbimageplot_opencv/jkqtplotter_simpletest_rgbimageplot_opencv.cpp b/examples/simpletest_rgbimageplot_opencv/jkqtplotter_simpletest_rgbimageplot_opencv.cpp index 2ccaae6891..ee052d6fdd 100644 --- a/examples/simpletest_rgbimageplot_opencv/jkqtplotter_simpletest_rgbimageplot_opencv.cpp +++ b/examples/simpletest_rgbimageplot_opencv/jkqtplotter_simpletest_rgbimageplot_opencv.cpp @@ -7,8 +7,8 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsimagergb.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpimagergb.h" #include "jkqtplotter/jkqtpopencvinterface.h" #include #include diff --git a/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt.cpp b/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt.cpp index 194a776d83..ac0aea6c9f 100644 --- a/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt.cpp +++ b/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt.cpp @@ -7,8 +7,8 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsimagergb.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpimagergb.h" diff --git a/examples/simpletest_speed/jkqtplotter_simpletest_speed.cpp b/examples/simpletest_speed/jkqtplotter_simpletest_speed.cpp index 664815ccff..7d8ecae83a 100644 --- a/examples/simpletest_speed/jkqtplotter_simpletest_speed.cpp +++ b/examples/simpletest_speed/jkqtplotter_simpletest_speed.cpp @@ -2,7 +2,7 @@ #include #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" #include "speedtestplot.h" int main(int argc, char* argv[]) diff --git a/examples/simpletest_speed/speedtestplot.cpp b/examples/simpletest_speed/speedtestplot.cpp index 29ba10e227..c832f98888 100644 --- a/examples/simpletest_speed/speedtestplot.cpp +++ b/examples/simpletest_speed/speedtestplot.cpp @@ -5,7 +5,7 @@ */ #include "speedtestplot.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" SpeedTestPlot::SpeedTestPlot(): diff --git a/examples/simpletest_stackedbars/README.md b/examples/simpletest_stackedbars/README.md index 532c30821d..ec597b8fed 100644 --- a/examples/simpletest_stackedbars/README.md +++ b/examples/simpletest_stackedbars/README.md @@ -5,7 +5,7 @@ The source code of the main application is (see [`jkqtplotter_simpletest_stacked ```.cpp #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsbarchart.h" +#include "jkqtplotter/graphs/jkqtpbarchart.h" #define Ndata 5 int main(int argc, char* argv[]) diff --git a/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars.cpp b/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars.cpp index e7ab27337a..e8a884513d 100644 --- a/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars.cpp +++ b/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars.cpp @@ -6,8 +6,8 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsbarchart.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpbarchart.h" template diff --git a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.cpp b/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.cpp index b81f951c59..45891e8f21 100644 --- a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.cpp +++ b/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.cpp @@ -6,8 +6,8 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsspecialline.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpspecialline.h" #include "jkqtplotter/jkqtptools.h" int main(int argc, char* argv[]) diff --git a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_vertical.cpp b/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_vertical.cpp index 999088e700..db99863e4c 100644 --- a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_vertical.cpp +++ b/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_vertical.cpp @@ -6,8 +6,8 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsspecialline.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpspecialline.h" #include "jkqtplotter/jkqtptools.h" int main(int argc, char* argv[]) diff --git a/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors.cpp b/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors.cpp index fe2f32d36e..3d6b0ff62b 100644 --- a/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors.cpp +++ b/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors.cpp @@ -6,7 +6,7 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" // number of datapoints: #define Ndata 10 diff --git a/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.cpp b/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.cpp index a7e9bcee4a..e7c338d1f9 100644 --- a/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.cpp +++ b/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.cpp @@ -6,7 +6,7 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" #include "jkqtplotter/jkqtptools.h" diff --git a/examples/simpletest_ui/formwithjkqtplotter.h b/examples/simpletest_ui/formwithjkqtplotter.h index 880b28adb6..5d19c0517e 100644 --- a/examples/simpletest_ui/formwithjkqtplotter.h +++ b/examples/simpletest_ui/formwithjkqtplotter.h @@ -2,7 +2,7 @@ #define FORMWITHJKQTPLOTTER_H #include -#include "jkqtplotter/jkqtpgraphsparsedfunction.h" +#include "jkqtplotter/graphs/jkqtpparsedfunction.h" namespace Ui { class FormWithJKQTPlotter; diff --git a/examples/simpletest_violinplot/jkqtplotter_simpletest_violinplot.cpp b/examples/simpletest_violinplot/jkqtplotter_simpletest_violinplot.cpp index c39d6f2050..b77987e326 100644 --- a/examples/simpletest_violinplot/jkqtplotter_simpletest_violinplot.cpp +++ b/examples/simpletest_violinplot/jkqtplotter_simpletest_violinplot.cpp @@ -6,9 +6,9 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsviolinplot.h" -#include "jkqtplotter/jkqtpgraphssinglecolumnsymbols.h" -#include "jkqtplotter/jkqtpgraphsstatisticsadaptors.h" +#include "jkqtplotter/graphs/jkqtpviolinplot.h" +#include "jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h" +#include "jkqtplotter/graphs/jkqtpstatisticsadaptors.h" #include "jkqtcommon/jkqtpstatisticstools.h" #include #include diff --git a/examples/test_distributionplot/test_distributionplot.cpp b/examples/test_distributionplot/test_distributionplot.cpp index 0888ebcd89..c8280a539e 100644 --- a/examples/test_distributionplot/test_distributionplot.cpp +++ b/examples/test_distributionplot/test_distributionplot.cpp @@ -6,11 +6,11 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsboxplot.h" -#include "jkqtplotter/jkqtpgraphsbarchart.h" -#include "jkqtplotter/jkqtpgraphssinglecolumnsymbols.h" -#include "jkqtplotter/jkqtpgraphsevaluatedfunction.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpboxplot.h" +#include "jkqtplotter/graphs/jkqtpbarchart.h" +#include "jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h" +#include "jkqtplotter/graphs/jkqtpevaluatedfunction.h" #include #include #include diff --git a/examples/test_multiplot/README.md b/examples/test_multiplot/README.md index a9e6c76154..5332a65ce6 100644 --- a/examples/test_multiplot/README.md +++ b/examples/test_multiplot/README.md @@ -94,7 +94,7 @@ The result looks like this: ![test_multiplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/test_multiplot.png) -You push the print button (![test_multiplot](https://raw.githubusercontent.com/jkriege2/JKQTPlotter/master/lib/jkqtplotterressources/images/jkqtp_24_print.png)) to open a print preview dialog, which will give an impression of how the three plots will be arranged in a printout: +You push the print button (![test_multiplot](https://raw.githubusercontent.com/jkriege2/JKQTPlotter/master/lib/jkqtplotter/resources/images/jkqtp_24_print.png)) to open a print preview dialog, which will give an impression of how the three plots will be arranged in a printout: ![test_multiplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/test_multiplot_printpreview.png) diff --git a/examples/test_multiplot/test_multiplot.cpp b/examples/test_multiplot/test_multiplot.cpp index 0710610888..148f629eaa 100644 --- a/examples/test_multiplot/test_multiplot.cpp +++ b/examples/test_multiplot/test_multiplot.cpp @@ -6,9 +6,9 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsparsedfunction.h" -#include "jkqtplotter/jkqtpgraphsbarchart.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpparsedfunction.h" +#include "jkqtplotter/graphs/jkqtpbarchart.h" #include #include #include "test_multiplot_ui.h" diff --git a/examples/test_styledboxplot/test_styledboxplot.cpp b/examples/test_styledboxplot/test_styledboxplot.cpp index 1f2550faf6..39a7d05188 100644 --- a/examples/test_styledboxplot/test_styledboxplot.cpp +++ b/examples/test_styledboxplot/test_styledboxplot.cpp @@ -6,8 +6,8 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsboxplot.h" -#include "jkqtplotter/jkqtpgraphsgeometric.h" +#include "jkqtplotter/graphs/jkqtpboxplot.h" +#include "jkqtplotter/graphs/jkqtpgeometric.h" int main(int argc, char* argv[]) { diff --git a/examples/test_styling/README.md b/examples/test_styling/README.md index 18129e04fb..7eee0f3ee9 100644 --- a/examples/test_styling/README.md +++ b/examples/test_styling/README.md @@ -81,12 +81,12 @@ The following gallery shows a set of example styles: | Style-file | Screenshot | |:-------------:| ------------- | | The Default Style | ![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/style_default.png) | -| [`lib/jkqtplotterressources/style/simple_gridandticks.ini`](https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotterressources/styles/simple_gridandticks.ini) | ![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/style_simple_axesoffset_plotbox.png) | -| [`lib/jkqtplotterressources/style/simple_axesoffset.ini`](https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotterressources/styles/simple_axesoffset.ini) | ![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/style_simple_axesoffset.png) | -| [`lib/jkqtplotterressources/style/simple_axesoffset_plotbox.ini`](https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotterressources/styles/simple_axesoffset_plotbox.ini) | ![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/style_simple_axesoffset_plotbox.png) | -| [`lib/jkqtplotterressources/style/dark.ini`](https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotterressources/styles/dark.ini) | ![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/style_dark.png) | -| [`lib/jkqtplotterressources/style/blueprint.ini`](https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotterressources/styles/blueprint.ini) | ![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/style_blueprint.png) | -| [`lib/jkqtplotterressources/style/blackandwhite.ini`](https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotterressources/styles/blackandwhite.ini) | ![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/style_blackandwhite.png) | +| [`lib/jkqtplotter/resources/style/simple_gridandticks.ini`](https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotter/resources/styles/simple_gridandticks.ini) | ![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/style_simple_axesoffset_plotbox.png) | +| [`lib/jkqtplotter/resources/style/simple_axesoffset.ini`](https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotter/resources/styles/simple_axesoffset.ini) | ![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/style_simple_axesoffset.png) | +| [`lib/jkqtplotter/resources/style/simple_axesoffset_plotbox.ini`](https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotter/resources/styles/simple_axesoffset_plotbox.ini) | ![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/style_simple_axesoffset_plotbox.png) | +| [`lib/jkqtplotter/resources/style/dark.ini`](https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotter/resources/styles/dark.ini) | ![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/style_dark.png) | +| [`lib/jkqtplotter/resources/style/blueprint.ini`](https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotter/resources/styles/blueprint.ini) | ![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/style_blueprint.png) | +| [`lib/jkqtplotter/resources/style/blackandwhite.ini`](https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotter/resources/styles/blackandwhite.ini) | ![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/style_blackandwhite.png) | Note: The styles listed above are also linked into the executable as Qt ressource ... you can use them e.g. as follows: diff --git a/examples/test_styling/test_styling.cpp b/examples/test_styling/test_styling.cpp index 8069a0400a..2ea175cc7a 100644 --- a/examples/test_styling/test_styling.cpp +++ b/examples/test_styling/test_styling.cpp @@ -1,10 +1,10 @@ #include "test_styling.h" #include "ui_test_styling.h" #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsbarchart.h" -#include "jkqtplotter/jkqtpgraphsimage.h" -#include "jkqtplotter/jkqtpgraphsgeometric.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpbarchart.h" +#include "jkqtplotter/graphs/jkqtpimage.h" +#include "jkqtplotter/graphs/jkqtpgeometric.h" #include #include #include diff --git a/examples/test_user_interaction/test_user_interaction.h b/examples/test_user_interaction/test_user_interaction.h index 0bd104c246..5145e7d0dd 100644 --- a/examples/test_user_interaction/test_user_interaction.h +++ b/examples/test_user_interaction/test_user_interaction.h @@ -3,7 +3,7 @@ #include #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" #include #include #include diff --git a/lib/jkqtcommon/CMakeLists.txt b/lib/jkqtcommon/CMakeLists.txt index 6d53ea1401..6bc5e1a998 100644 --- a/lib/jkqtcommon/CMakeLists.txt +++ b/lib/jkqtcommon/CMakeLists.txt @@ -90,7 +90,7 @@ if(LIB_INSTALL) RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtcommon + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtcommon ) endif(BUILD_SHARED_LIBS) @@ -99,12 +99,12 @@ if(LIB_INSTALL) RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtcommon + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtcommon ) endif(BUILD_STATIC_LIBS) install(FILES ${HEADERS} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtcommon + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtcommon COMPONENT Headers) endif(LIB_INSTALL) diff --git a/lib/jkqtfastplotter.pri b/lib/jkqtfastplotter.pri index 825a63d31a..0d59ff5f4e 100644 --- a/lib/jkqtfastplotter.pri +++ b/lib/jkqtfastplotter.pri @@ -11,7 +11,7 @@ isEmpty(JKQTP_FASTPLOTTER_PRI_INCLUDED) { SOURCES += $$PWD/jkqtfastplotter/jkqtfastplotter.cpp - RESOURCES += $$PWD/jkqtplotterressources/jkqtpbaseplotter.qrc + RESOURCES += $$PWD/jkqtplotter/resources/jkqtpbaseplotter.qrc QT += opengl diff --git a/lib/jkqtfastplotter/CMakeLists.txt b/lib/jkqtfastplotter/CMakeLists.txt index 08dddb3f87..ceaa2cdd6b 100644 --- a/lib/jkqtfastplotter/CMakeLists.txt +++ b/lib/jkqtfastplotter/CMakeLists.txt @@ -54,7 +54,7 @@ if(LIB_INSTALL) RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtfastplotter + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtfastplotter ) endif(BUILD_SHARED_LIBS) @@ -63,12 +63,12 @@ if(LIB_INSTALL) RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtfastplotter + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtfastplotter ) endif(BUILD_STATIC_LIBS) install(FILES ${HEADERS} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtfastplotter + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtfastplotter COMPONENT Headers) endif(LIB_INSTALL) diff --git a/lib/jkqtmathtext/CMakeLists.txt b/lib/jkqtmathtext/CMakeLists.txt index 3656ffff76..b02111c5d1 100644 --- a/lib/jkqtmathtext/CMakeLists.txt +++ b/lib/jkqtmathtext/CMakeLists.txt @@ -58,7 +58,7 @@ if(LIB_INSTALL) RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtmathtext + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtmathtext ) endif(BUILD_SHARED_LIBS) @@ -67,12 +67,12 @@ if(LIB_INSTALL) RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtmathtext + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtmathtext ) endif(BUILD_STATIC_LIBS) install(FILES ${HEADERS} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtmathtext + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtmathtext COMPONENT Headers) endif(LIB_INSTALL) diff --git a/lib/jkqtplotter.pri b/lib/jkqtplotter.pri index cf324c02ea..396dc2513b 100644 --- a/lib/jkqtplotter.pri +++ b/lib/jkqtplotter.pri @@ -14,42 +14,43 @@ isEmpty(JKQTP_PLOTTER_PRI_INCLUDED) { $$PWD/jkqtplotter/jkqtpbaseelements.h \ $$PWD/jkqtplotter/jkqtpbaseplotter.h \ $$PWD/jkqtplotter/jkqtpdatastorage.h \ - $$PWD/jkqtplotter/jkqtpelementsoverlay.h \ - $$PWD/jkqtplotter/jkqtpgraphsscatter.h \ - $$PWD/jkqtplotter/jkqtpgraphsrange.h \ - $$PWD/jkqtplotter/jkqtpgraphsspecialline.h \ - $$PWD/jkqtplotter/jkqtpgraphsbarchart.h \ $$PWD/jkqtplotter/jkqtpgraphsbase.h \ $$PWD/jkqtplotter/jkqtpgraphsbaseerrors.h \ $$PWD/jkqtplotter/jkqtpgraphsbasestylingmixins.h \ - $$PWD/jkqtplotter/jkqtpgraphsboxplot.h \ - $$PWD/jkqtplotter/jkqtpgraphsboxplotstylingmixins.h \ - $$PWD/jkqtplotter/jkqtpgraphsevaluatedfunction.h \ - $$PWD/jkqtplotter/jkqtpgraphsfilledcurve.h \ - $$PWD/jkqtplotter/jkqtpgraphsgeometric.h \ - $$PWD/jkqtplotter/jkqtpgraphsimage.h \ - $$PWD/jkqtplotter/jkqtpgraphsimpulses.h \ - $$PWD/jkqtplotter/jkqtpgraphsparsedfunction.h \ - $$PWD/jkqtplotter/jkqtpgraphspeakstream.h \ - $$PWD/jkqtplotter/jkqtpgraphssinglecolumnsymbols.h \ - $$PWD/jkqtplotter/jkqtpgraphsimageoverlays.h \ - $$PWD/jkqtplotter/jkqtpgraphscontour.h \ - $$PWD/jkqtplotter/jkqtpgraphsimagergb.h \ - $$PWD/jkqtplotter/jkqtpgraphsviolinplot.h \ - $$PWD/jkqtplotter/jkqtpgraphsviolinplotstylingmixins.h \ - $$PWD/jkqtplotter/jkqtpgraphsstatisticsadaptors.h \ $$PWD/jkqtplotter/jkqtplotter.h \ $$PWD/jkqtplotter/jkqtplotterstyle.h \ $$PWD/jkqtplotter/jkqtpkeystyle.h \ $$PWD/jkqtplotter/jkqtpbaseplotterstyle.h \ $$PWD/jkqtplotter/jkqtpcoordinateaxes.h \ $$PWD/jkqtplotter/jkqtpcoordinateaxesstyle.h \ + $$PWD/jkqtplotter/jkqtpimagetools.h \ + $$PWD/jkqtplotter/jkqtpoverlaysbase.h \ + $$PWD/jkqtplotter/graphs/jkqtpboxplot.h \ + $$PWD/jkqtplotter/graphs/jkqtpboxplotstylingmixins.h \ + $$PWD/jkqtplotter/graphs/jkqtpevaluatedfunction.h \ + $$PWD/jkqtplotter/graphs/jkqtpfilledcurve.h \ + $$PWD/jkqtplotter/graphs/jkqtpgeometric.h \ + $$PWD/jkqtplotter/graphs/jkqtpimage.h \ + $$PWD/jkqtplotter/graphs/jkqtpimpulses.h \ + $$PWD/jkqtplotter/graphs/jkqtpparsedfunction.h \ + $$PWD/jkqtplotter/graphs/jkqtppeakstream.h \ + $$PWD/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h \ + $$PWD/jkqtplotter/graphs/jkqtpimageoverlays.h \ + $$PWD/jkqtplotter/graphs/jkqtpcontour.h \ + $$PWD/jkqtplotter/graphs/jkqtpimagergb.h \ + $$PWD/jkqtplotter/graphs/jkqtpviolinplot.h \ + $$PWD/jkqtplotter/graphs/jkqtpviolinplotstylingmixins.h \ + $$PWD/jkqtplotter/graphs/jkqtpstatisticsadaptors.h \ + $$PWD/jkqtplotter/graphs/jkqtpscatter.h \ + $$PWD/jkqtplotter/graphs/jkqtprange.h \ + $$PWD/jkqtplotter/graphs/jkqtpspecialline.h \ + $$PWD/jkqtplotter/graphs/jkqtpbarchart.h \ + $$PWD/jkqtplotter/overlays/jkqtpbasicoverlays.h \ $$PWD/jkqtplotter/gui/jkqtpcomboboxes.h \ $$PWD/jkqtplotter/gui/jkqtpenhancedspinboxes.h \ $$PWD/jkqtplotter/gui/jkqtpenhancedtableview.h \ $$PWD/jkqtplotter/gui/jkqtpgraphsmodel.h \ - $$PWD/jkqtplotter/gui/jkvanishqtoolbar.h \ - $$PWD/jkqtplotter/jkqtpimagetools.h + $$PWD/jkqtplotter/gui/jkvanishqtoolbar.h @@ -58,42 +59,43 @@ isEmpty(JKQTP_PLOTTER_PRI_INCLUDED) { $$PWD/jkqtplotter/jkqtpbaseelements.cpp \ $$PWD/jkqtplotter/jkqtpbaseplotter.cpp \ $$PWD/jkqtplotter/jkqtpdatastorage.cpp \ - $$PWD/jkqtplotter/jkqtpelementsoverlay.cpp \ - $$PWD/jkqtplotter/jkqtpgraphsscatter.cpp \ - $$PWD/jkqtplotter/jkqtpgraphsrange.cpp \ - $$PWD/jkqtplotter/jkqtpgraphsspecialline.cpp \ - $$PWD/jkqtplotter/jkqtpgraphsbarchart.cpp \ $$PWD/jkqtplotter/jkqtpgraphsbase.cpp \ $$PWD/jkqtplotter/jkqtpgraphsbaseerrors.cpp \ $$PWD/jkqtplotter/jkqtpgraphsbasestylingmixins.cpp \ - $$PWD/jkqtplotter/jkqtpgraphsboxplot.cpp \ - $$PWD/jkqtplotter/jkqtpgraphsboxplotstylingmixins.cpp \ - $$PWD/jkqtplotter/jkqtpgraphsevaluatedfunction.cpp \ - $$PWD/jkqtplotter/jkqtpgraphsfilledcurve.cpp \ - $$PWD/jkqtplotter/jkqtpgraphsgeometric.cpp \ - $$PWD/jkqtplotter/jkqtpgraphsimage.cpp \ - $$PWD/jkqtplotter/jkqtpgraphsimpulses.cpp \ - $$PWD/jkqtplotter/jkqtpgraphsparsedfunction.cpp \ - $$PWD/jkqtplotter/jkqtpgraphspeakstream.cpp \ - $$PWD/jkqtplotter/jkqtpgraphssinglecolumnsymbols.cpp \ - $$PWD/jkqtplotter/jkqtpgraphsimageoverlays.cpp \ - $$PWD/jkqtplotter/jkqtpgraphscontour.cpp \ - $$PWD/jkqtplotter/jkqtpgraphsimagergb.cpp \ - $$PWD/jkqtplotter/jkqtpgraphsviolinplot.cpp \ - $$PWD/jkqtplotter/jkqtpgraphsviolinplotstylingmixins.cpp \ - $$PWD/jkqtplotter/jkqtpgraphsstatisticsadaptors.cpp \ + $$PWD/jkqtplotter/jkqtpimagetools.cpp \ $$PWD/jkqtplotter/jkqtplotter.cpp \ $$PWD/jkqtplotter/jkqtplotterstyle.cpp \ $$PWD/jkqtplotter/jkqtpkeystyle.cpp \ $$PWD/jkqtplotter/jkqtpbaseplotterstyle.cpp \ $$PWD/jkqtplotter/jkqtpcoordinateaxes.cpp \ $$PWD/jkqtplotter/jkqtpcoordinateaxesstyle.cpp \ + $$PWD/jkqtplotter/jkqtpoverlaysbase.cpp \ + $$PWD/jkqtplotter/graphs/jkqtpboxplot.cpp \ + $$PWD/jkqtplotter/graphs/jkqtpboxplotstylingmixins.cpp \ + $$PWD/jkqtplotter/graphs/jkqtpevaluatedfunction.cpp \ + $$PWD/jkqtplotter/graphs/jkqtpfilledcurve.cpp \ + $$PWD/jkqtplotter/graphs/jkqtpgeometric.cpp \ + $$PWD/jkqtplotter/graphs/jkqtpimage.cpp \ + $$PWD/jkqtplotter/graphs/jkqtpimpulses.cpp \ + $$PWD/jkqtplotter/graphs/jkqtpparsedfunction.cpp \ + $$PWD/jkqtplotter/graphs/jkqtppeakstream.cpp \ + $$PWD/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.cpp \ + $$PWD/jkqtplotter/graphs/jkqtpimageoverlays.cpp \ + $$PWD/jkqtplotter/graphs/jkqtpcontour.cpp \ + $$PWD/jkqtplotter/graphs/jkqtpimagergb.cpp \ + $$PWD/jkqtplotter/graphs/jkqtpviolinplot.cpp \ + $$PWD/jkqtplotter/graphs/jkqtpviolinplotstylingmixins.cpp \ + $$PWD/jkqtplotter/graphs/jkqtpstatisticsadaptors.cpp \ + $$PWD/jkqtplotter/graphs/jkqtpscatter.cpp \ + $$PWD/jkqtplotter/graphs/jkqtprange.cpp \ + $$PWD/jkqtplotter/graphs/jkqtpspecialline.cpp \ + $$PWD/jkqtplotter/graphs/jkqtpbarchart.cpp \ + $$PWD/jkqtplotter/overlays/jkqtpbasicoverlays.cpp \ $$PWD/jkqtplotter/gui/jkqtpcomboboxes.cpp \ $$PWD/jkqtplotter/gui/jkqtpenhancedspinboxes.cpp \ $$PWD/jkqtplotter/gui/jkqtpenhancedtableview.cpp \ $$PWD/jkqtplotter/gui/jkqtpgraphsmodel.cpp \ - $$PWD/jkqtplotter/gui/jkvanishqtoolbar.cpp \ - $$PWD/jkqtplotter/jkqtpimagetools.cpp + $$PWD/jkqtplotter/gui/jkvanishqtoolbar.cpp RESOURCES += $$PWD/jkqtplotter/resources/jkqtpbaseplotter.qrc \ diff --git a/lib/jkqtplotter/CMakeLists.txt b/lib/jkqtplotter/CMakeLists.txt index 174dd80fcc..4ef78a307e 100644 --- a/lib/jkqtplotter/CMakeLists.txt +++ b/lib/jkqtplotter/CMakeLists.txt @@ -24,85 +24,100 @@ set(SRCS jkqtpbaseelements.cpp jkqtpbaseplotter.cpp jkqtpdatastorage.cpp - jkqtpelementsoverlay.cpp - jkqtpgraphsscatter.cpp - jkqtpgraphsrange.cpp - jkqtpgraphsspecialline.cpp - jkqtpgraphsbarchart.cpp + jkqtpoverlaysbase.cpp jkqtpgraphsbase.cpp jkqtpgraphsbaseerrors.cpp jkqtpgraphsbasestylingmixins.cpp - jkqtpgraphsboxplot.cpp - jkqtpgraphsboxplotstylingmixins.cpp - jkqtpgraphsevaluatedfunction.cpp - jkqtpgraphsfilledcurve.cpp - jkqtpgraphsgeometric.cpp - jkqtpgraphsimage.cpp - jkqtpgraphsimpulses.cpp - jkqtpgraphsparsedfunction.cpp - jkqtpgraphspeakstream.cpp - jkqtpgraphssinglecolumnsymbols.cpp - jkqtpgraphsimageoverlays.cpp - jkqtpgraphscontour.cpp - jkqtpgraphsimagergb.cpp - jkqtpgraphsviolinplot.cpp - jkqtpgraphsviolinplotstylingmixins.cpp - jkqtpgraphsstatisticsadaptors.cpp jkqtplotter.cpp jkqtplotterstyle.cpp jkqtpkeystyle.cpp jkqtpbaseplotterstyle.cpp jkqtpcoordinateaxes.cpp jkqtpcoordinateaxesstyle.cpp + jkqtpimagetools.cpp + ) +set(SRCS_GRAPHS + graphs/jkqtpscatter.cpp + graphs/jkqtprange.cpp + graphs/jkqtpspecialline.cpp + graphs/jkqtpbarchart.cpp + graphs/jkqtpboxplot.cpp + graphs/jkqtpboxplotstylingmixins.cpp + graphs/jkqtpevaluatedfunction.cpp + graphs/jkqtpfilledcurve.cpp + graphs/jkqtpgeometric.cpp + graphs/jkqtpimage.cpp + graphs/jkqtpimpulses.cpp + graphs/jkqtpparsedfunction.cpp + graphs/jkqtppeakstream.cpp + graphs/jkqtpsinglecolumnsymbols.cpp + graphs/jkqtpimageoverlays.cpp + graphs/jkqtpcontour.cpp + graphs/jkqtpimagergb.cpp + graphs/jkqtpviolinplot.cpp + graphs/jkqtpviolinplotstylingmixins.cpp + graphs/jkqtpstatisticsadaptors.cpp + ) +set(SRCS_OVERLAYS + overlays/jkqtpbasicoverlays.cpp +) +set(SRCS_GUI gui/jkqtpcomboboxes.cpp gui/jkqtpenhancedspinboxes.cpp gui/jkqtpenhancedtableview.cpp gui/jkqtpgraphsmodel.cpp gui/jkvanishqtoolbar.cpp - jkqtpimagetools.cpp ) + set(HEADERS jkqtptools.h jkqtpbaseelements.h jkqtpbaseplotter.h jkqtpdatastorage.h - jkqtpelementsoverlay.h - jkqtpgraphsscatter.h - jkqtpgraphsrange.h - jkqtpgraphsspecialline.h - jkqtpgraphsbarchart.h + jkqtpoverlaysbase.h jkqtpgraphsbase.h jkqtpgraphsbaseerrors.h jkqtpgraphsbasestylingmixins.h - jkqtpgraphsboxplot.h - jkqtpgraphsboxplotstylingmixins.h - jkqtpgraphsevaluatedfunction.h - jkqtpgraphsfilledcurve.h - jkqtpgraphsgeometric.h - jkqtpgraphsimage.h - jkqtpgraphsimpulses.h - jkqtpgraphsparsedfunction.h - jkqtpgraphspeakstream.h - jkqtpgraphssinglecolumnsymbols.h - jkqtpgraphsimageoverlays.h - jkqtpgraphscontour.h - jkqtpgraphsimagergb.h - jkqtpgraphsviolinplot.h - jkqtpgraphsviolinplotstylingmixins.h - jkqtpgraphsstatisticsadaptors.h jkqtplotter.h jkqtplotterstyle.h jkqtpkeystyle.h jkqtpbaseplotterstyle.h jkqtpcoordinateaxes.h jkqtpcoordinateaxesstyle.h + jkqtpimagetools.h +) +set(HEADERS_GRAPHS + graphs/jkqtpboxplot.h + graphs/jkqtpboxplotstylingmixins.h + graphs/jkqtpevaluatedfunction.h + graphs/jkqtpfilledcurve.h + graphs/jkqtpgeometric.h + graphs/jkqtpimage.h + graphs/jkqtpimpulses.h + graphs/jkqtpparsedfunction.h + graphs/jkqtppeakstream.h + graphs/jkqtpsinglecolumnsymbols.h + graphs/jkqtpimageoverlays.h + graphs/jkqtpcontour.h + graphs/jkqtpimagergb.h + graphs/jkqtpviolinplot.h + graphs/jkqtpviolinplotstylingmixins.h + graphs/jkqtpstatisticsadaptors.h + graphs/jkqtpscatter.h + graphs/jkqtprange.h + graphs/jkqtpspecialline.h + graphs/jkqtpbarchart.h +) +set(HEADERS_OVERLAY + overlays/jkqtpbasicoverlays.h +) +set(HEADERS_GUI gui/jkqtpcomboboxes.h gui/jkqtpenhancedspinboxes.h gui/jkqtpenhancedtableview.h gui/jkqtpgraphsmodel.h gui/jkvanishqtoolbar.h - jkqtpimagetools.h ) set(RESOURCES @@ -112,7 +127,7 @@ set(RESOURCES if(BUILD_SHARED_LIBS) - add_library(${libsh_name} SHARED ${SRCS} ${HEADERS} ${RESOURCES}) + add_library(${libsh_name} SHARED ${SRCS} ${SRCS_GRAPHS} ${SRCS_GUI} ${SRCS_OVERLAYS} ${HEADERS} ${HEADERS_GRAPHS} ${HEADERS_GUI} ${HEADERS_OVERLAYS} ${RESOURCES}) set_property(TARGET ${libsh_name} PROPERTY VERSION "${PROJECT_VERSION}") target_link_libraries(${libsh_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Svg Qt5::Xml JKQTCommonSharedLib JKQTMathTextSharedLib) target_compile_definitions(${libsh_name} PRIVATE JKQTP_LIB_IN_DLL) @@ -120,7 +135,7 @@ if(BUILD_SHARED_LIBS) endif() if(BUILD_STATIC_LIBS) - add_library(${lib_name} STATIC ${SRCS} ${HEADERS} ${RESOURCES}) + add_library(${lib_name} STATIC ${SRCS} ${SRCS_GRAPHS} ${SRCS_GUI} ${SRCS_OVERLAYS} ${HEADERS} ${HEADERS_GRAPHS} ${HEADERS_GUI} ${HEADERS_OVERLAYS} ${RESOURCES}) set_property(TARGET ${lib_name} PROPERTY VERSION "${PROJECT_VERSION}") target_link_libraries(${lib_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Svg Qt5::Xml JKQTCommonLib JKQTMathTextLib) endif() @@ -135,7 +150,7 @@ if(LIB_INSTALL) RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtplotter + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) endif(BUILD_SHARED_LIBS) @@ -144,7 +159,7 @@ if(LIB_INSTALL) RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtplotter + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) endif(BUILD_STATIC_LIBS) @@ -152,4 +167,16 @@ if(LIB_INSTALL) DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtplotter COMPONENT Headers) + install(FILES ${HEADERS_GRAPHS} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtplotter/graphs + COMPONENT Headers) + + install(FILES ${HEADERS_GUI} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtplotter/gui + COMPONENT Headers) + + install(FILES ${SRCS_OVERLAYS} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtplotter/overlays + COMPONENT Headers) + endif(LIB_INSTALL) diff --git a/lib/jkqtplotter/jkqtpgraphsbarchart.cpp b/lib/jkqtplotter/graphs/jkqtpbarchart.cpp similarity index 96% rename from lib/jkqtplotter/jkqtpgraphsbarchart.cpp rename to lib/jkqtplotter/graphs/jkqtpbarchart.cpp index cda5049542..ebe9f8e503 100644 --- a/lib/jkqtplotter/jkqtpgraphsbarchart.cpp +++ b/lib/jkqtplotter/graphs/jkqtpbarchart.cpp @@ -19,13 +19,13 @@ -#include "jkqtplotter/jkqtpgraphsbarchart.h" +#include "jkqtplotter/graphs/jkqtpbarchart.h" #include "jkqtplotter/jkqtpbaseplotter.h" #include #include #include #include "jkqtplotter/jkqtptools.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtplotter.h" diff --git a/lib/jkqtplotter/jkqtpgraphsbarchart.h b/lib/jkqtplotter/graphs/jkqtpbarchart.h similarity index 100% rename from lib/jkqtplotter/jkqtpgraphsbarchart.h rename to lib/jkqtplotter/graphs/jkqtpbarchart.h diff --git a/lib/jkqtplotter/jkqtpgraphsboxplot.cpp b/lib/jkqtplotter/graphs/jkqtpboxplot.cpp similarity index 97% rename from lib/jkqtplotter/jkqtpgraphsboxplot.cpp rename to lib/jkqtplotter/graphs/jkqtpboxplot.cpp index 8c24dfdfea..c8ba03e649 100644 --- a/lib/jkqtplotter/jkqtpgraphsboxplot.cpp +++ b/lib/jkqtplotter/graphs/jkqtpboxplot.cpp @@ -19,13 +19,13 @@ -#include "jkqtplotter/jkqtpgraphsboxplot.h" +#include "jkqtplotter/graphs/jkqtpboxplot.h" #include "jkqtplotter/jkqtpbaseplotter.h" #include #include #include #include "jkqtplotter/jkqtptools.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtplotter.h" #define SmallestGreaterZeroCompare_xvsgz() if ((xvsgz>10.0*DBL_MIN)&&((smallestGreaterZero<10.0*DBL_MIN) || (xvsgz #include #include #include "jkqtplotter/jkqtptools.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtplotter.h" diff --git a/lib/jkqtplotter/jkqtpgraphsboxplotstylingmixins.h b/lib/jkqtplotter/graphs/jkqtpboxplotstylingmixins.h similarity index 100% rename from lib/jkqtplotter/jkqtpgraphsboxplotstylingmixins.h rename to lib/jkqtplotter/graphs/jkqtpboxplotstylingmixins.h diff --git a/lib/jkqtplotter/jkqtpgraphscontour.cpp b/lib/jkqtplotter/graphs/jkqtpcontour.cpp similarity index 96% rename from lib/jkqtplotter/jkqtpgraphscontour.cpp rename to lib/jkqtplotter/graphs/jkqtpcontour.cpp index 66c20820f7..490ca3f711 100644 --- a/lib/jkqtplotter/jkqtpgraphscontour.cpp +++ b/lib/jkqtplotter/graphs/jkqtpcontour.cpp @@ -18,13 +18,12 @@ */ -#include "jkqtplotter/jkqtpgraphscontour.h" +#include "jkqtplotter/graphs/jkqtpcontour.h" #include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtpimagetools.h" #include "jkqtplotter/jkqtptools.h" #include "jkqtcommon/jkqtpenhancedpainter.h" #include "jkqtplotter/jkqtplotter.h" -#include "jkqtpgraphscontour.h" #include #include #include diff --git a/lib/jkqtplotter/jkqtpgraphscontour.h b/lib/jkqtplotter/graphs/jkqtpcontour.h similarity index 97% rename from lib/jkqtplotter/jkqtpgraphscontour.h rename to lib/jkqtplotter/graphs/jkqtpcontour.h index f415cfdc3c..09733688ba 100644 --- a/lib/jkqtplotter/jkqtpgraphscontour.h +++ b/lib/jkqtplotter/graphs/jkqtpcontour.h @@ -27,10 +27,10 @@ #include #include #include -#include "jkqtplotter/jkqtpgraphsscatter.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" #include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtpbaseelements.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h" #include "jkqtcommon/jkqtp_imexport.h" #include "jkqtplotter/jkqtpimagetools.h" diff --git a/lib/jkqtplotter/jkqtpgraphsevaluatedfunction.cpp b/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.cpp similarity index 99% rename from lib/jkqtplotter/jkqtpgraphsevaluatedfunction.cpp rename to lib/jkqtplotter/graphs/jkqtpevaluatedfunction.cpp index 3d61eeba2e..ae56a84f06 100644 --- a/lib/jkqtplotter/jkqtpgraphsevaluatedfunction.cpp +++ b/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.cpp @@ -19,16 +19,15 @@ -#include "jkqtplotter/jkqtpgraphsevaluatedfunction.h" +#include "jkqtplotter/graphs/jkqtpevaluatedfunction.h" #include "jkqtplotter/jkqtpbaseplotter.h" #include #include #include #include "jkqtplotter/jkqtptools.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtplotter.h" -#include "jkqtpgraphsevaluatedfunction.h" diff --git a/lib/jkqtplotter/jkqtpgraphsevaluatedfunction.h b/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.h similarity index 97% rename from lib/jkqtplotter/jkqtpgraphsevaluatedfunction.h rename to lib/jkqtplotter/graphs/jkqtpevaluatedfunction.h index beb07a4129..085d5d7f31 100644 --- a/lib/jkqtplotter/jkqtpgraphsevaluatedfunction.h +++ b/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.h @@ -22,7 +22,7 @@ #include #include #include -#include "jkqtplotter/jkqtpgraphsscatter.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h" #include "jkqtcommon/jkqtp_imexport.h" #include diff --git a/lib/jkqtplotter/jkqtpgraphsfilledcurve.cpp b/lib/jkqtplotter/graphs/jkqtpfilledcurve.cpp similarity index 95% rename from lib/jkqtplotter/jkqtpgraphsfilledcurve.cpp rename to lib/jkqtplotter/graphs/jkqtpfilledcurve.cpp index 68df6fcd87..3eb20721c8 100644 --- a/lib/jkqtplotter/jkqtpgraphsfilledcurve.cpp +++ b/lib/jkqtplotter/graphs/jkqtpfilledcurve.cpp @@ -19,13 +19,13 @@ -#include "jkqtplotter/jkqtpgraphsfilledcurve.h" +#include "jkqtplotter/graphs/jkqtpfilledcurve.h" #include "jkqtplotter/jkqtpbaseplotter.h" #include #include #include #include "jkqtplotter/jkqtptools.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtplotter.h" #define SmallestGreaterZeroCompare_xvsgz() if ((xvsgz>10.0*DBL_MIN)&&((smallestGreaterZero<10.0*DBL_MIN) || (xvsgz diff --git a/lib/jkqtplotter/jkqtpgraphsgeometric.h b/lib/jkqtplotter/graphs/jkqtpgeometric.h similarity index 97% rename from lib/jkqtplotter/jkqtpgraphsgeometric.h rename to lib/jkqtplotter/graphs/jkqtpgeometric.h index 61880615a7..0c3383c39a 100644 --- a/lib/jkqtplotter/jkqtpgraphsgeometric.h +++ b/lib/jkqtplotter/graphs/jkqtpgeometric.h @@ -21,7 +21,7 @@ #include #include #include -#include "jkqtplotter/jkqtpgraphsscatter.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h" #include "jkqtplotter/jkqtptools.h" #include "jkqtcommon/jkqtp_imexport.h" diff --git a/lib/jkqtplotter/jkqtpgraphsimage.cpp b/lib/jkqtplotter/graphs/jkqtpimage.cpp similarity index 97% rename from lib/jkqtplotter/jkqtpgraphsimage.cpp rename to lib/jkqtplotter/graphs/jkqtpimage.cpp index f9f7b02242..647d8fb9ed 100644 --- a/lib/jkqtplotter/jkqtpgraphsimage.cpp +++ b/lib/jkqtplotter/graphs/jkqtpimage.cpp @@ -18,7 +18,7 @@ */ -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtpimagetools.h" #include "jkqtplotter/jkqtptools.h" diff --git a/lib/jkqtplotter/jkqtpgraphsimage.h b/lib/jkqtplotter/graphs/jkqtpimage.h similarity index 97% rename from lib/jkqtplotter/jkqtpgraphsimage.h rename to lib/jkqtplotter/graphs/jkqtpimage.h index 57d8a5655e..c714c45fcb 100644 --- a/lib/jkqtplotter/jkqtpgraphsimage.h +++ b/lib/jkqtplotter/graphs/jkqtpimage.h @@ -26,7 +26,7 @@ #include #include #include -#include "jkqtplotter/jkqtpgraphsscatter.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" #include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtcommon/jkqtp_imexport.h" diff --git a/lib/jkqtplotter/jkqtpgraphsimageoverlays.cpp b/lib/jkqtplotter/graphs/jkqtpimageoverlays.cpp similarity index 96% rename from lib/jkqtplotter/jkqtpgraphsimageoverlays.cpp rename to lib/jkqtplotter/graphs/jkqtpimageoverlays.cpp index c53038646a..482ef9b2d0 100644 --- a/lib/jkqtplotter/jkqtpgraphsimageoverlays.cpp +++ b/lib/jkqtplotter/graphs/jkqtpimageoverlays.cpp @@ -18,7 +18,7 @@ */ -#include "jkqtplotter/jkqtpgraphsimageoverlays.h" +#include "jkqtplotter/graphs/jkqtpimageoverlays.h" #include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtpimagetools.h" #include "jkqtplotter/jkqtptools.h" diff --git a/lib/jkqtplotter/jkqtpgraphsimageoverlays.h b/lib/jkqtplotter/graphs/jkqtpimageoverlays.h similarity index 96% rename from lib/jkqtplotter/jkqtpgraphsimageoverlays.h rename to lib/jkqtplotter/graphs/jkqtpimageoverlays.h index a3d3f5d2d2..84d23f6155 100644 --- a/lib/jkqtplotter/jkqtpgraphsimageoverlays.h +++ b/lib/jkqtplotter/graphs/jkqtpimageoverlays.h @@ -26,10 +26,10 @@ #include #include #include -#include "jkqtplotter/jkqtpgraphsscatter.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" #include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtpbaseelements.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include "jkqtcommon/jkqtp_imexport.h" #include "jkqtplotter/jkqtpimagetools.h" diff --git a/lib/jkqtplotter/jkqtpgraphsimagergb.cpp b/lib/jkqtplotter/graphs/jkqtpimagergb.cpp similarity index 97% rename from lib/jkqtplotter/jkqtpgraphsimagergb.cpp rename to lib/jkqtplotter/graphs/jkqtpimagergb.cpp index 79a1625220..b7e84b55d9 100644 --- a/lib/jkqtplotter/jkqtpgraphsimagergb.cpp +++ b/lib/jkqtplotter/graphs/jkqtpimagergb.cpp @@ -18,7 +18,7 @@ */ -#include "jkqtplotter/jkqtpgraphsimagergb.h" +#include "jkqtplotter/graphs/jkqtpimagergb.h" #include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtpimagetools.h" #include "jkqtplotter/jkqtptools.h" diff --git a/lib/jkqtplotter/jkqtpgraphsimagergb.h b/lib/jkqtplotter/graphs/jkqtpimagergb.h similarity index 97% rename from lib/jkqtplotter/jkqtpgraphsimagergb.h rename to lib/jkqtplotter/graphs/jkqtpimagergb.h index 7c5c3088c5..d0bf1edef1 100644 --- a/lib/jkqtplotter/jkqtpgraphsimagergb.h +++ b/lib/jkqtplotter/graphs/jkqtpimagergb.h @@ -26,7 +26,7 @@ #include #include #include -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtcommon/jkqtp_imexport.h" diff --git a/lib/jkqtplotter/jkqtpgraphsimpulses.cpp b/lib/jkqtplotter/graphs/jkqtpimpulses.cpp similarity index 96% rename from lib/jkqtplotter/jkqtpgraphsimpulses.cpp rename to lib/jkqtplotter/graphs/jkqtpimpulses.cpp index 8246aab2de..0a1667c668 100644 --- a/lib/jkqtplotter/jkqtpgraphsimpulses.cpp +++ b/lib/jkqtplotter/graphs/jkqtpimpulses.cpp @@ -19,13 +19,13 @@ -#include "jkqtplotter/jkqtpgraphsimpulses.h" +#include "jkqtplotter/graphs/jkqtpimpulses.h" #include "jkqtplotter/jkqtpbaseplotter.h" #include #include #include #include "jkqtplotter/jkqtptools.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtplotter.h" #define SmallestGreaterZeroCompare_xvsgz() if ((xvsgz>10.0*DBL_MIN)&&((smallestGreaterZero<10.0*DBL_MIN) || (xvsgz. */ -#include "jkqtplotter/jkqtpgraphsparsedfunction.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" +#include "jkqtplotter/graphs/jkqtpparsedfunction.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" #include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtptools.h" diff --git a/lib/jkqtplotter/jkqtpgraphsparsedfunction.h b/lib/jkqtplotter/graphs/jkqtpparsedfunction.h similarity index 96% rename from lib/jkqtplotter/jkqtpgraphsparsedfunction.h rename to lib/jkqtplotter/graphs/jkqtpparsedfunction.h index 4993087eea..2d80410797 100644 --- a/lib/jkqtplotter/jkqtpgraphsparsedfunction.h +++ b/lib/jkqtplotter/graphs/jkqtpparsedfunction.h @@ -27,7 +27,7 @@ #include "jkqtplotter/jkqtptools.h" #include "jkqtcommon/jkqtpmathparser.h" #include "jkqtcommon/jkqtp_imexport.h" -#include "jkqtplotter/jkqtpgraphsevaluatedfunction.h" +#include "jkqtplotter/graphs/jkqtpevaluatedfunction.h" // forward declarations class JKQTBasePlotter; diff --git a/lib/jkqtplotter/jkqtpgraphspeakstream.cpp b/lib/jkqtplotter/graphs/jkqtppeakstream.cpp similarity index 96% rename from lib/jkqtplotter/jkqtpgraphspeakstream.cpp rename to lib/jkqtplotter/graphs/jkqtppeakstream.cpp index 79ee24037f..ab213a0ae1 100644 --- a/lib/jkqtplotter/jkqtpgraphspeakstream.cpp +++ b/lib/jkqtplotter/graphs/jkqtppeakstream.cpp @@ -19,7 +19,7 @@ -#include "jkqtplotter/jkqtpgraphspeakstream.h" +#include "jkqtplotter/graphs/jkqtppeakstream.h" #include "jkqtplotter/jkqtpbaseplotter.h" #include #include diff --git a/lib/jkqtplotter/jkqtpgraphspeakstream.h b/lib/jkqtplotter/graphs/jkqtppeakstream.h similarity index 100% rename from lib/jkqtplotter/jkqtpgraphspeakstream.h rename to lib/jkqtplotter/graphs/jkqtppeakstream.h diff --git a/lib/jkqtplotter/jkqtpgraphsrange.cpp b/lib/jkqtplotter/graphs/jkqtprange.cpp similarity index 95% rename from lib/jkqtplotter/jkqtpgraphsrange.cpp rename to lib/jkqtplotter/graphs/jkqtprange.cpp index 84941c847c..6c6fc8d9df 100644 --- a/lib/jkqtplotter/jkqtpgraphsrange.cpp +++ b/lib/jkqtplotter/graphs/jkqtprange.cpp @@ -19,14 +19,14 @@ -#include "jkqtplotter/jkqtpgraphsrange.h" +#include "jkqtplotter/graphs/jkqtprange.h" #include "jkqtplotter/jkqtpbaseplotter.h" #include #include #include #include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtpimagetools.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtplotter.h" #define SmallestGreaterZeroCompare_xvsgz() if ((xvsgz>10.0*DBL_MIN)&&((smallestGreaterZero<10.0*DBL_MIN) || (xvsgz #include #include #include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtpimagetools.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtplotter.h" #define SmallestGreaterZeroCompare_xvsgz() if ((xvsgz>10.0*DBL_MIN)&&((smallestGreaterZero<10.0*DBL_MIN) || (xvsgz #include diff --git a/lib/jkqtplotter/jkqtpgraphssinglecolumnsymbols.h b/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h similarity index 100% rename from lib/jkqtplotter/jkqtpgraphssinglecolumnsymbols.h rename to lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h diff --git a/lib/jkqtplotter/jkqtpgraphsspecialline.cpp b/lib/jkqtplotter/graphs/jkqtpspecialline.cpp similarity index 96% rename from lib/jkqtplotter/jkqtpgraphsspecialline.cpp rename to lib/jkqtplotter/graphs/jkqtpspecialline.cpp index 3b041ff082..23a04bca58 100644 --- a/lib/jkqtplotter/jkqtpgraphsspecialline.cpp +++ b/lib/jkqtplotter/graphs/jkqtpspecialline.cpp @@ -19,14 +19,14 @@ -#include "jkqtplotter/jkqtpgraphsspecialline.h" +#include "jkqtplotter/graphs/jkqtpspecialline.h" #include "jkqtplotter/jkqtpbaseplotter.h" #include #include #include #include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtpimagetools.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtplotter.h" #define SmallestGreaterZeroCompare_xvsgz() if ((xvsgz>10.0*DBL_MIN)&&((smallestGreaterZero<10.0*DBL_MIN) || (xvsgz #include #include #include "jkqtplotter/jkqtptools.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtplotter.h" #define SmallestGreaterZeroCompare_xvsgz() if ((xvsgz>10.0*DBL_MIN)&&((smallestGreaterZero<10.0*DBL_MIN) || (xvsgz #include #include #include "jkqtplotter/jkqtptools.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtplotter.h" diff --git a/lib/jkqtplotter/jkqtpgraphsviolinplotstylingmixins.h b/lib/jkqtplotter/graphs/jkqtpviolinplotstylingmixins.h similarity index 100% rename from lib/jkqtplotter/jkqtpgraphsviolinplotstylingmixins.h rename to lib/jkqtplotter/graphs/jkqtpviolinplotstylingmixins.h diff --git a/lib/jkqtplotter/gui/jkqtpcomboboxes.h b/lib/jkqtplotter/gui/jkqtpcomboboxes.h index b7475c8ad1..ea72e56db8 100644 --- a/lib/jkqtplotter/gui/jkqtpcomboboxes.h +++ b/lib/jkqtplotter/gui/jkqtpcomboboxes.h @@ -24,7 +24,7 @@ #include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtcommon/jkqtp_imexport.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include #include "jkqtplotter/jkqtpimagetools.h" #include "jkqtplotter/jkqtptools.h" diff --git a/lib/jkqtplotter/gui/jkqtpgraphsmodel.cpp b/lib/jkqtplotter/gui/jkqtpgraphsmodel.cpp index 62ab791652..70ad3f34dd 100644 --- a/lib/jkqtplotter/gui/jkqtpgraphsmodel.cpp +++ b/lib/jkqtplotter/gui/jkqtpgraphsmodel.cpp @@ -22,7 +22,7 @@ #include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtptools.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" #include diff --git a/lib/jkqtplotter/gui/jkqtpgraphsmodel.h b/lib/jkqtplotter/gui/jkqtpgraphsmodel.h index 0f88dab5a8..fef16b5ca1 100644 --- a/lib/jkqtplotter/gui/jkqtpgraphsmodel.h +++ b/lib/jkqtplotter/gui/jkqtpgraphsmodel.h @@ -34,7 +34,7 @@ class JKQTBasePlotter; // forward * This class is derived from QAbstractTableModel and implements a model where * some properties are editable. It is designed to be used together with e.g. QListView. * - * \image html JKQTPGraphsModel.png + * \image html graphs/jkqtpModel.png * */ class JKQTPGraphsModel : public QAbstractTableModel diff --git a/lib/jkqtplotter/jkqtpbaseplotter.cpp b/lib/jkqtplotter/jkqtpbaseplotter.cpp index 7ff7341866..b1bd1e09be 100644 --- a/lib/jkqtplotter/jkqtpbaseplotter.cpp +++ b/lib/jkqtplotter/jkqtpbaseplotter.cpp @@ -46,15 +46,15 @@ #ifdef QFWIDLIB_LIBRARY # include "qftools.h" #endif -#include "jkqtplotter/jkqtpgraphsboxplot.h" -#include "jkqtplotter/jkqtpgraphsbarchart.h" -#include "jkqtplotter/jkqtpgraphsfilledcurve.h" -#include "jkqtplotter/jkqtpgraphsspecialline.h" -#include "jkqtplotter/jkqtpgraphsimpulses.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" -#include "jkqtplotter/jkqtpgraphsgeometric.h" -#include "jkqtplotter/jkqtpgraphsimage.h" -#include "jkqtplotter/jkqtpgraphsimagergb.h" +#include "jkqtplotter/graphs/jkqtpboxplot.h" +#include "jkqtplotter/graphs/jkqtpbarchart.h" +#include "jkqtplotter/graphs/jkqtpfilledcurve.h" +#include "jkqtplotter/graphs/jkqtpspecialline.h" +#include "jkqtplotter/graphs/jkqtpimpulses.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" +#include "jkqtplotter/graphs/jkqtpgeometric.h" +#include "jkqtplotter/graphs/jkqtpimage.h" +#include "jkqtplotter/graphs/jkqtpimagergb.h" static QString globalUserSettigsFilename=""; static QString globalUserSettigsPrefix=""; diff --git a/lib/jkqtplotter/jkqtpbaseplotter.h b/lib/jkqtplotter/jkqtpbaseplotter.h index 913d626510..de23f4afac 100644 --- a/lib/jkqtplotter/jkqtpbaseplotter.h +++ b/lib/jkqtplotter/jkqtpbaseplotter.h @@ -22,7 +22,7 @@ #include "jkqtplotter/jkqtpbaseplotterstyle.h" #include "jkqtmathtext/jkqtmathtext.h" #include "jkqtplotter/jkqtpbaseelements.h" -#include "jkqtplotter/jkqtpelementsoverlay.h" +#include "jkqtplotter/overlays/jkqtpbasicoverlays.h" #include "jkqtcommon/jkqtpenhancedpainter.h" #include "jkqtplotter/gui/jkqtpenhancedspinboxes.h" diff --git a/lib/jkqtplotter/jkqtpgraphsbase.cpp b/lib/jkqtplotter/jkqtpgraphsbase.cpp index 10597827a9..1937a05155 100644 --- a/lib/jkqtplotter/jkqtpgraphsbase.cpp +++ b/lib/jkqtplotter/jkqtpgraphsbase.cpp @@ -25,7 +25,7 @@ #include #include #include "jkqtplotter/jkqtptools.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtplotter.h" #include "jkqtpgraphsbase.h" diff --git a/lib/jkqtplotter/jkqtpgraphsbaseerrors.cpp b/lib/jkqtplotter/jkqtpgraphsbaseerrors.cpp index a5cc6007e4..b1c8dec638 100644 --- a/lib/jkqtplotter/jkqtpgraphsbaseerrors.cpp +++ b/lib/jkqtplotter/jkqtpgraphsbaseerrors.cpp @@ -25,7 +25,7 @@ #include #include #include "jkqtplotter/jkqtptools.h" -#include "jkqtplotter/jkqtpgraphsimage.h" +#include "jkqtplotter/graphs/jkqtpimage.h" #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtplotter.h" #include "jkqtpgraphsbase.h" diff --git a/lib/jkqtplotter/jkqtplotter.cpp b/lib/jkqtplotter/jkqtplotter.cpp index 1c82cb90a2..8f473ed25a 100644 --- a/lib/jkqtplotter/jkqtplotter.cpp +++ b/lib/jkqtplotter/jkqtplotter.cpp @@ -28,7 +28,7 @@ #include #endif #include "jkqtplotter/jkqtplotter.h" -#include "jkqtplotter/jkqtpgraphsscatter.h" +#include "jkqtplotter/graphs/jkqtpscatter.h" #define jkqtp_RESIZE_DELAY 100 diff --git a/lib/jkqtplotter/jkqtpoverlaysbase.cpp b/lib/jkqtplotter/jkqtpoverlaysbase.cpp new file mode 100644 index 0000000000..3c1cf7b35e --- /dev/null +++ b/lib/jkqtplotter/jkqtpoverlaysbase.cpp @@ -0,0 +1,176 @@ +/* + Copyright (c) 2008-2019 Jan W. Krieger () + + + + This software is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License (LGPL) as published by + the Free Software Foundation, either version 2.1 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License (LGPL) for more details. + + You should have received a copy of the GNU Lesser General Public License (LGPL) + along with this program. If not, see . +*/ + + + +#include "jkqtplotter/jkqtpoverlaysbase.h" +#include "jkqtplotter/jkqtpbaseplotter.h" +#include "jkqtplotter/jkqtptools.h" +#include "jkqtcommon/jkqtpdrawingtools.h" +#include +#include + + + +JKQTPOverlayElement::JKQTPOverlayElement(JKQTBasePlotter *parent) : + QObject(parent) +{ + visible=true; +} + +void JKQTPOverlayElement::setParent(JKQTBasePlotter *parent) { + this->parent=parent; + QObject::setParent(parent); +} + +void JKQTPOverlayElement::setVisible(bool __value) +{ + this->visible = __value; +} + +bool JKQTPOverlayElement::isVisible() const +{ + return this->visible; +} + +QPointF JKQTPOverlayElement::transform(const QPointF &x) { + return QPointF(parent->x2p(x.x()), parent->y2p(x.y())); +} + +double JKQTPOverlayElement::transfromX(double x) +{ + return parent->x2p(x); +} + +double JKQTPOverlayElement::transfromY(double y) +{ + return parent->y2p(y); +} + +QPointF JKQTPOverlayElement::backTransform(const QPointF &x) { + return QPointF(parent->p2x(x.x()), parent->p2y(x.y())); +} + +QVector JKQTPOverlayElement::transform(const QVector &x) { + QVector res; + for (int i=0; i &x) { + QPainterPath res; + if (x.size()>0) { + res.moveTo(transform(x[0])); + for (int i=1; iposition=pos; +} + +void JKQTPOverlayOneCoordOverlay::setPosition(double __value) +{ + this->position = __value; +} + +double JKQTPOverlayOneCoordOverlay::getPosition() const +{ + return this->position; +} + + + + + + +JKQTPOverlayTwoCoordOverlay::JKQTPOverlayTwoCoordOverlay(double pos, double pos2, JKQTBasePlotter *parent): + JKQTPOverlayOneCoordOverlay(pos, parent) +{ + position2=pos2; +} + +void JKQTPOverlayTwoCoordOverlay::setPosition2(double __value) +{ + this->position2 = __value; +} + +double JKQTPOverlayTwoCoordOverlay::getPosition2() const +{ + return this->position2; +} + +JKQTPOverlayTwoPositionOverlay::JKQTPOverlayTwoPositionOverlay(double x1, double y1, double x2, double y2, JKQTBasePlotter *parent): + JKQTPOverlayElement(parent) +{ + this->x1=x1; + this->y1=y1; + this->x2=x2; + this->y2=y2; +} + +void JKQTPOverlayTwoPositionOverlay::setX1(double __value) +{ + this->x1 = __value; +} + +double JKQTPOverlayTwoPositionOverlay::getX1() const +{ + return this->x1; +} + +void JKQTPOverlayTwoPositionOverlay::setX2(double __value) +{ + this->x2 = __value; +} + +double JKQTPOverlayTwoPositionOverlay::getX2() const +{ + return this->x2; +} + +void JKQTPOverlayTwoPositionOverlay::setY1(double __value) +{ + this->y1 = __value; +} + +double JKQTPOverlayTwoPositionOverlay::getY1() const +{ + return this->y1; +} + +void JKQTPOverlayTwoPositionOverlay::setY2(double __value) +{ + this->y2 = __value; +} + +double JKQTPOverlayTwoPositionOverlay::getY2() const +{ + return this->y2; +} diff --git a/lib/jkqtplotter/jkqtpelementsoverlay.h b/lib/jkqtplotter/jkqtpoverlaysbase.h similarity index 60% rename from lib/jkqtplotter/jkqtpelementsoverlay.h rename to lib/jkqtplotter/jkqtpoverlaysbase.h index 670c4044c7..74c45aa9be 100644 --- a/lib/jkqtplotter/jkqtpelementsoverlay.h +++ b/lib/jkqtplotter/jkqtpoverlaysbase.h @@ -178,104 +178,4 @@ class JKQTP_LIB_EXPORT JKQTPOverlayTwoCoordOverlay : public JKQTPOverlayOneCoord - -/*! \brief draws a vertical line as an overlay - \ingroup jkqtplotter_overlays - - These simple primitive elements can be used to e.g. display fast changing indicators on the graph ... - */ -class JKQTP_LIB_EXPORT JKQTPOverlayVerticalLine : public JKQTPOverlayOneCoordOverlay, public JKQTPGraphLineStyleMixin, public JKQTPGraphTextStyleMixin { - Q_OBJECT - public: - explicit JKQTPOverlayVerticalLine(double pos, JKQTBasePlotter *parent = nullptr); - explicit JKQTPOverlayVerticalLine(double pos, const QString& text, JKQTBasePlotter *parent = nullptr); - - /** \brief plots the graph to the plotter object specified as parent */ - virtual void draw(JKQTPEnhancedPainter& painter); - /** \brief set element color */ - virtual void setColor(QColor c); - - /*! \copydoc text */ - void setText(const QString & __value); - /*! \copydoc text */ - QString getText() const; - protected: - /** \brief a text to display next to the vertical line */ - QString text; -}; - - - -/*! \brief draws a vertical range as an overlay - \ingroup jkqtplotter_overlays - - These simple primitive elements can be used to e.g. display fast changing indicators on the graph ... - */ -class JKQTP_LIB_EXPORT JKQTPOverlayVerticalRange : public JKQTPOverlayTwoCoordOverlay, public JKQTPGraphLineStyleMixin, public JKQTPGraphFillStyleMixin, public JKQTPGraphTextStyleMixin { - Q_OBJECT - public: - explicit JKQTPOverlayVerticalRange(double pos, double pos2, JKQTBasePlotter *parent = nullptr); - explicit JKQTPOverlayVerticalRange(double pos, double pos2, const QString& text, JKQTBasePlotter *parent = nullptr); - - /** \brief plots the graph to the plotter object specified as parent */ - virtual void draw(JKQTPEnhancedPainter& painter); - /** \brief set element color */ - virtual void setColor(QColor c); - - /*! \copydoc inverted */ - void setInverted(bool __value); - /*! \copydoc inverted */ - bool getInverted() const; - - /*! \copydoc text */ - void setText(const QString & __value); - /*! \copydoc text */ - QString getText() const; - protected: - /** \brief a text to display next to the range */ - QString text; - /** \brief if set \c false, the range is filled, otherwise everything outside the range is filled */ - bool inverted; -}; - -/*! \brief draws a line throught two points - \ingroup jkqtplotter_overlays - - */ -class JKQTP_LIB_EXPORT JKQTPOverlayLine : public JKQTPOverlayTwoPositionOverlay, public JKQTPGraphLineStyleMixin { - Q_OBJECT - public: - explicit JKQTPOverlayLine(double x1, double y1, double x2, double y2, JKQTBasePlotter *parent = nullptr); - - /** \brief plots the graph to the plotter object specified as parent */ - virtual void draw(JKQTPEnhancedPainter& painter); - - /*! \copydoc infinite */ - void setInfinite(bool __value); - /*! \copydoc infinite */ - bool getInfinite() const; - /** \brief set element color */ - virtual void setColor(QColor c); - protected: - /** \brief the line goes on infinitely */ - bool infinite; -}; - -/*! \brief draws a rectangle, spanned by two points - \ingroup jkqtplotter_overlays - - */ -class JKQTP_LIB_EXPORT JKQTPOverlayRectangle : public JKQTPOverlayTwoPositionOverlay, public JKQTPGraphLineStyleMixin, public JKQTPGraphFillStyleMixin { - Q_OBJECT - public: - explicit JKQTPOverlayRectangle(double x1, double y1, double x2, double y2, JKQTBasePlotter *parent = nullptr); - - /** \brief plots the graph to the plotter object specified as parent */ - virtual void draw(JKQTPEnhancedPainter& painter); - /** \brief set element color */ - virtual void setColor(QColor c); - - protected: -}; - #endif // jkqtpelementsoverlay_H diff --git a/lib/jkqtplotter/jkqtpelementsoverlay.cpp b/lib/jkqtplotter/overlays/jkqtpbasicoverlays.cpp similarity index 67% rename from lib/jkqtplotter/jkqtpelementsoverlay.cpp rename to lib/jkqtplotter/overlays/jkqtpbasicoverlays.cpp index bcbc4256d6..90c24b5a2e 100644 --- a/lib/jkqtplotter/jkqtpelementsoverlay.cpp +++ b/lib/jkqtplotter/overlays/jkqtpbasicoverlays.cpp @@ -19,7 +19,7 @@ -#include "jkqtplotter/jkqtpelementsoverlay.h" +#include "jkqtplotter/overlays/jkqtpbasicoverlays.h" #include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtptools.h" #include "jkqtcommon/jkqtpdrawingtools.h" @@ -27,87 +27,6 @@ #include -JKQTPOverlayElement::JKQTPOverlayElement(JKQTBasePlotter *parent) : - QObject(parent) -{ - visible=true; -} - -void JKQTPOverlayElement::setParent(JKQTBasePlotter *parent) { - this->parent=parent; - QObject::setParent(parent); -} - -void JKQTPOverlayElement::setVisible(bool __value) -{ - this->visible = __value; -} - -bool JKQTPOverlayElement::isVisible() const -{ - return this->visible; -} - -QPointF JKQTPOverlayElement::transform(const QPointF &x) { - return QPointF(parent->x2p(x.x()), parent->y2p(x.y())); -} - -double JKQTPOverlayElement::transfromX(double x) -{ - return parent->x2p(x); -} - -double JKQTPOverlayElement::transfromY(double y) -{ - return parent->y2p(y); -} - -QPointF JKQTPOverlayElement::backTransform(const QPointF &x) { - return QPointF(parent->p2x(x.x()), parent->p2y(x.y())); -} - -QVector JKQTPOverlayElement::transform(const QVector &x) { - QVector res; - for (int i=0; i &x) { - QPainterPath res; - if (x.size()>0) { - res.moveTo(transform(x[0])); - for (int i=1; iposition=pos; -} - -void JKQTPOverlayOneCoordOverlay::setPosition(double __value) -{ - this->position = __value; -} - -double JKQTPOverlayOneCoordOverlay::getPosition() const -{ - return this->position; -} - - - - - JKQTPOverlayVerticalLine::JKQTPOverlayVerticalLine(double pos, JKQTBasePlotter *parent): JKQTPOverlayOneCoordOverlay(pos, parent), JKQTPGraphTextStyleMixin(parent) { @@ -162,21 +81,6 @@ QString JKQTPOverlayVerticalLine::getText() const return this->text; } -JKQTPOverlayTwoCoordOverlay::JKQTPOverlayTwoCoordOverlay(double pos, double pos2, JKQTBasePlotter *parent): - JKQTPOverlayOneCoordOverlay(pos, parent) -{ - position2=pos2; -} - -void JKQTPOverlayTwoCoordOverlay::setPosition2(double __value) -{ - this->position2 = __value; -} - -double JKQTPOverlayTwoCoordOverlay::getPosition2() const -{ - return this->position2; -} JKQTPOverlayVerticalRange::JKQTPOverlayVerticalRange(double pos, double pos2, JKQTBasePlotter *parent): JKQTPOverlayTwoCoordOverlay(pos, pos2, parent), JKQTPGraphTextStyleMixin(parent) @@ -257,57 +161,6 @@ QString JKQTPOverlayVerticalRange::getText() const return text; } -JKQTPOverlayTwoPositionOverlay::JKQTPOverlayTwoPositionOverlay(double x1, double y1, double x2, double y2, JKQTBasePlotter *parent): - JKQTPOverlayElement(parent) -{ - this->x1=x1; - this->y1=y1; - this->x2=x2; - this->y2=y2; -} - -void JKQTPOverlayTwoPositionOverlay::setX1(double __value) -{ - this->x1 = __value; -} - -double JKQTPOverlayTwoPositionOverlay::getX1() const -{ - return this->x1; -} - -void JKQTPOverlayTwoPositionOverlay::setX2(double __value) -{ - this->x2 = __value; -} - -double JKQTPOverlayTwoPositionOverlay::getX2() const -{ - return this->x2; -} - -void JKQTPOverlayTwoPositionOverlay::setY1(double __value) -{ - this->y1 = __value; -} - -double JKQTPOverlayTwoPositionOverlay::getY1() const -{ - return this->y1; -} - -void JKQTPOverlayTwoPositionOverlay::setY2(double __value) -{ - this->y2 = __value; -} - -double JKQTPOverlayTwoPositionOverlay::getY2() const -{ - return this->y2; -} - - - diff --git a/lib/jkqtplotter/overlays/jkqtpbasicoverlays.h b/lib/jkqtplotter/overlays/jkqtpbasicoverlays.h new file mode 100644 index 0000000000..5acb6fa05b --- /dev/null +++ b/lib/jkqtplotter/overlays/jkqtpbasicoverlays.h @@ -0,0 +1,137 @@ +/* + Copyright (c) 2008-2019 Jan W. Krieger () + + + + This software is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License (LGPL) as published by + the Free Software Foundation, either version 2.1 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License (LGPL) for more details. + + You should have received a copy of the GNU Lesser General Public License (LGPL) + along with this program. If not, see . +*/ + + +#include +#include +#include +#include +#include "jkqtplotter/jkqtptools.h" +#include "jkqtplotter/jkqtpoverlaysbase.h" +#include "jkqtcommon/jkqtp_imexport.h" +#include "jkqtplotter/jkqtpgraphsbasestylingmixins.h" + +#ifndef jkqtpbasicoverlays_H +#define jkqtpbasicoverlays_H + +// forward declarations +class JKQTBasePlotter; + + + +/*! \brief draws a vertical line as an overlay + \ingroup jkqtplotter_overlays + + These simple primitive elements can be used to e.g. display fast changing indicators on the graph ... + */ +class JKQTP_LIB_EXPORT JKQTPOverlayVerticalLine : public JKQTPOverlayOneCoordOverlay, public JKQTPGraphLineStyleMixin, public JKQTPGraphTextStyleMixin { + Q_OBJECT + public: + explicit JKQTPOverlayVerticalLine(double pos, JKQTBasePlotter *parent = nullptr); + explicit JKQTPOverlayVerticalLine(double pos, const QString& text, JKQTBasePlotter *parent = nullptr); + + /** \brief plots the graph to the plotter object specified as parent */ + virtual void draw(JKQTPEnhancedPainter& painter); + /** \brief set element color */ + virtual void setColor(QColor c); + + /*! \copydoc text */ + void setText(const QString & __value); + /*! \copydoc text */ + QString getText() const; + protected: + /** \brief a text to display next to the vertical line */ + QString text; +}; + + + +/*! \brief draws a vertical range as an overlay + \ingroup jkqtplotter_overlays + + These simple primitive elements can be used to e.g. display fast changing indicators on the graph ... + */ +class JKQTP_LIB_EXPORT JKQTPOverlayVerticalRange : public JKQTPOverlayTwoCoordOverlay, public JKQTPGraphLineStyleMixin, public JKQTPGraphFillStyleMixin, public JKQTPGraphTextStyleMixin { + Q_OBJECT + public: + explicit JKQTPOverlayVerticalRange(double pos, double pos2, JKQTBasePlotter *parent = nullptr); + explicit JKQTPOverlayVerticalRange(double pos, double pos2, const QString& text, JKQTBasePlotter *parent = nullptr); + + /** \brief plots the graph to the plotter object specified as parent */ + virtual void draw(JKQTPEnhancedPainter& painter); + /** \brief set element color */ + virtual void setColor(QColor c); + + /*! \copydoc inverted */ + void setInverted(bool __value); + /*! \copydoc inverted */ + bool getInverted() const; + + /*! \copydoc text */ + void setText(const QString & __value); + /*! \copydoc text */ + QString getText() const; + protected: + /** \brief a text to display next to the range */ + QString text; + /** \brief if set \c false, the range is filled, otherwise everything outside the range is filled */ + bool inverted; +}; + +/*! \brief draws a line throught two points + \ingroup jkqtplotter_overlays + + */ +class JKQTP_LIB_EXPORT JKQTPOverlayLine : public JKQTPOverlayTwoPositionOverlay, public JKQTPGraphLineStyleMixin { + Q_OBJECT + public: + explicit JKQTPOverlayLine(double x1, double y1, double x2, double y2, JKQTBasePlotter *parent = nullptr); + + /** \brief plots the graph to the plotter object specified as parent */ + virtual void draw(JKQTPEnhancedPainter& painter); + + /*! \copydoc infinite */ + void setInfinite(bool __value); + /*! \copydoc infinite */ + bool getInfinite() const; + /** \brief set element color */ + virtual void setColor(QColor c); + protected: + /** \brief the line goes on infinitely */ + bool infinite; +}; + +/*! \brief draws a rectangle, spanned by two points + \ingroup jkqtplotter_overlays + + */ +class JKQTP_LIB_EXPORT JKQTPOverlayRectangle : public JKQTPOverlayTwoPositionOverlay, public JKQTPGraphLineStyleMixin, public JKQTPGraphFillStyleMixin { + Q_OBJECT + public: + explicit JKQTPOverlayRectangle(double x1, double y1, double x2, double y2, JKQTBasePlotter *parent = nullptr); + + /** \brief plots the graph to the plotter object specified as parent */ + virtual void draw(JKQTPEnhancedPainter& painter); + /** \brief set element color */ + virtual void setColor(QColor c); + + protected: +}; + +#endif // jkqtpbasicoverlays_H