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:
- \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 |