mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2025-01-12 08:50:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

further reorganizations of code

Browse Source
This commit is contained in:
jkriege2 2019-06-20 16:06:31 +02:00
parent 60999478f8
commit fae6b28a58
129 changed files with 685 additions and 585 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -23,7 +23,7 @@ if(NOT DEFINED LIB_INSTALL)
option(LIB_INSTALL "Install library" ON) option(LIB_INSTALL "Install library" ON)
endif() endif()
if(NOT DEFINED CMAKE_INSTALL_PREFIX) if(NOT DEFINED CMAKE_INSTALL_PREFIX)
option(CMAKE_INSTALL_PREFIX "Install directory" .) option(CMAKE_INSTALL_PREFIX "Install directory" ${CMAKE_CURRENT_SOURCE_DIR}/instal)
endif() endif()
@ -74,10 +74,17 @@ if(MSVC)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
add_compile_options(/EHsc) 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() else()
add_compile_options(-fexceptions) add_compile_options(-fexceptions)
endif() endif()
if(BUILD_INCLUDE_XITS_FONTS) if(BUILD_INCLUDE_XITS_FONTS)
add_definitions(-DAUTOLOAD_XITS_FONTS -DUSE_XITS_FONTS ) add_definitions(-DAUTOLOAD_XITS_FONTS -DUSE_XITS_FONTS )
else() else()

2
doc/Doxyfile
View File

@ -885,7 +885,7 @@ RECURSIVE = YES
EXCLUDE = moc_*.* \ EXCLUDE = moc_*.* \
qrc_*.* \ qrc_*.* \
build-* \ build-* \
../lib/jkqtplotterressources/math_fonts/xits \ ../lib/jkqtplotter/resources/math_fonts/xits \
Makefile \ Makefile \
Makefile*.* \ Makefile*.* \
../examples/jkqtmathtext_test/asana \ ../examples/jkqtmathtext_test/asana \

14
doc/dox/jkqtplotter.dox
View File

@ -570,7 +570,7 @@ You can e.g. use these general methods to alter the styles for all JKQTPlotter i
JKQTPGetSystemDefaultStyle().userActionColor=QColor("red"); JKQTPGetSystemDefaultStyle().userActionColor=QColor("red");
\endcode \endcode
Several pre-made styles are available in the JKQTPlotter repository (<a href="https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotterressources/styles/">https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotterressources/styles/</a>). Several pre-made styles are available in the JKQTPlotter repository (<a href="https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotter/resources/styles/">https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotter/resources/styles/</a>).
These are also linked into the JKQTPlotter library as Qt ressource into the subdirectory \c :/JKQTPlotter/styles/ . You can use them as follows: 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} \code{.cpp}
@ -588,22 +588,22 @@ Here is a table with all available ready-made styles:
<td> <b> The Default Style </b> <td> <b> The Default Style </b>
<td> \image html style_default.png <td> \image html style_default.png
<tr> <tr>
<td> <a href="https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotterressources/styles/simple_gridandticks.ini"> \c :/JKQTPlotter/styles/simple_gridandticks.ini</a> <td> <a href="https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotter/resources/styles/simple_gridandticks.ini"> \c :/JKQTPlotter/styles/simple_gridandticks.ini</a>
<td> \image html style_simple_axesoffset_plotbox.png <td> \image html style_simple_axesoffset_plotbox.png
<tr> <tr>
<td> <a href="https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotterressources/styles/simple_axesoffset.ini"> \c :/JKQTPlotter/styles/simple_axesoffset.ini</a> <td> <a href="https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotter/resources/styles/simple_axesoffset.ini"> \c :/JKQTPlotter/styles/simple_axesoffset.ini</a>
<td> \image html style_simple_axesoffset.png <td> \image html style_simple_axesoffset.png
<tr> <tr>
<td> <a href="https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotterressources/styles/simple_axesoffset_plotbox.ini"> \c :/JKQTPlotter/styles/simple_axesoffset_plotbox.ini</a> <td> <a href="https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotter/resources/styles/simple_axesoffset_plotbox.ini"> \c :/JKQTPlotter/styles/simple_axesoffset_plotbox.ini</a>
<td> \image html style_simple_axesoffset_plotbox.png <td> \image html style_simple_axesoffset_plotbox.png
<tr> <tr>
<td> <a href="https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotterressources/styles/dark.ini"> \c :/JKQTPlotter/styles/dark.ini</a> <td> <a href="https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotter/resources/styles/dark.ini"> \c :/JKQTPlotter/styles/dark.ini</a>
<td> \image html style_dark.png <td> \image html style_dark.png
<tr> <tr>
<td> <a href="https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotterressources/styles/blueprint.ini"> \c :/JKQTPlotter/styles/blueprint.ini</a> <td> <a href="https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotter/resources/styles/blueprint.ini"> \c :/JKQTPlotter/styles/blueprint.ini</a>
<td> \image html style_blueprint.png <td> \image html style_blueprint.png
<tr> <tr>
<td> <a href="https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotterressources/styles/blackandwhite.ini"> \c :/JKQTPlotter/styles/blackandwhite.ini</a> <td> <a href="https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotter/resources/styles/blackandwhite.ini"> \c :/JKQTPlotter/styles/blackandwhite.ini</a>
<td> \image html style_blackandwhite.png <td> \image html style_blackandwhite.png
</table> </table>

2
doc/dox/license.dox
View File

@ -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 The source for this library can be found here: https://github.com/alif-type/xits
\note The XITS fonts are distributed in \note The XITS fonts are distributed in
<a href="https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotterressources/math_fonts/xits">lib/jkqtplotterressources/math_fonts/xits</a> <a href="https://github.com/jkriege2/JKQtPlotter/tree/master/lib/jkqtplotter/resources/math_fonts/xits">lib/jkqtplotter/resources/math_fonts/xits</a>
and are automatically added to the binary libraries as Qt Resources. You can prevent this by adding the line and are automatically added to the binary libraries as Qt Resources. You can prevent this by adding the line
\code \code
DEFINES += NO_XITS_FONTS DEFINES += NO_XITS_FONTS

2
examples/jkqtplot_test/TestWidgetBarcharts.cpp
View File

@ -3,7 +3,7 @@
#include <QDate> #include <QDate>
#include <QDateTime> #include <QDateTime>
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtpgraphsbarchart.h" #include "jkqtplotter/graphs/jkqtpbarchart.h"

8
examples/jkqtplot_test/TestWidgetBarcharts.h
View File

@ -11,10 +11,10 @@
#include <QFormLayout> #include <QFormLayout>
#include <QCheckBox> #include <QCheckBox>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsgeometric.h" #include "jkqtplotter/graphs/jkqtpgeometric.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtplotter/overlays/jkqtpbasicoverlays.h"
#include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/graphs/jkqtpparsedfunction.h"
#include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpbaseelements.h"
#include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"

10
examples/jkqtplot_test/TestWidgetContourPlots.h
View File

@ -11,11 +11,11 @@
#include <QFormLayout> #include <QFormLayout>
#include <QCheckBox> #include <QCheckBox>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsgeometric.h" #include "jkqtplotter/graphs/jkqtpgeometric.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpgraphscontour.h" #include "jkqtplotter/graphs/jkqtpcontour.h"
#include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtplotter/overlays/jkqtpbasicoverlays.h"
#include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/graphs/jkqtpparsedfunction.h"
#include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpbaseelements.h"
#include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"

8
examples/jkqtplot_test/TestWidgetEmptyPlot.h
View File

@ -11,10 +11,10 @@
#include <QFormLayout> #include <QFormLayout>
#include <QCheckBox> #include <QCheckBox>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsgeometric.h" #include "jkqtplotter/graphs/jkqtpgeometric.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtplotter/overlays/jkqtpbasicoverlays.h"
#include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/graphs/jkqtpparsedfunction.h"
#include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpbaseelements.h"
#include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"

8
examples/jkqtplot_test/TestWidgetFunctionPlots.h
View File

@ -11,10 +11,10 @@
#include <QFormLayout> #include <QFormLayout>
#include <QCheckBox> #include <QCheckBox>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsgeometric.h" #include "jkqtplotter/graphs/jkqtpgeometric.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtplotter/overlays/jkqtpbasicoverlays.h"
#include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/graphs/jkqtpparsedfunction.h"
#include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpbaseelements.h"
#include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h"
#include "jkqtplotter/gui/jkqtpcomboboxes.h" #include "jkqtplotter/gui/jkqtpcomboboxes.h"

8
examples/jkqtplot_test/TestWidgetGeometry.h
View File

@ -11,10 +11,10 @@
#include <QFormLayout> #include <QFormLayout>
#include <QCheckBox> #include <QCheckBox>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsgeometric.h" #include "jkqtplotter/graphs/jkqtpgeometric.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtplotter/overlays/jkqtpbasicoverlays.h"
#include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/graphs/jkqtpparsedfunction.h"
#include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpbaseelements.h"
#include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"

6
examples/jkqtplot_test/TestWidgetGraphs.cpp
View File

@ -3,9 +3,9 @@
#include <QDate> #include <QDate>
#include <QDateTime> #include <QDateTime>
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsboxplot.h" #include "jkqtplotter/graphs/jkqtpboxplot.h"
#include "jkqtplotter/jkqtpgraphsfilledcurve.h" #include "jkqtplotter/graphs/jkqtpfilledcurve.h"
#include "jkqtplotter/gui/jkqtpcomboboxes.h" #include "jkqtplotter/gui/jkqtpcomboboxes.h"

8
examples/jkqtplot_test/TestWidgetGraphs.h
View File

@ -11,10 +11,10 @@
#include <QFormLayout> #include <QFormLayout>
#include <QCheckBox> #include <QCheckBox>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsgeometric.h" #include "jkqtplotter/graphs/jkqtpgeometric.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtplotter/overlays/jkqtpbasicoverlays.h"
#include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/graphs/jkqtpparsedfunction.h"
#include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpbaseelements.h"
#include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"

4
examples/jkqtplot_test/TestWidgetImages.cpp
View File

@ -4,8 +4,8 @@
#include <QDateTime> #include <QDateTime>
#include <QApplication> #include <QApplication>
#include "jkqtplotter/gui/jkqtpcomboboxes.h" #include "jkqtplotter/gui/jkqtpcomboboxes.h"
#include "jkqtplotter/jkqtpgraphsimageoverlays.h" #include "jkqtplotter/graphs/jkqtpimageoverlays.h"
#include "jkqtplotter/jkqtpgraphsimagergb.h" #include "jkqtplotter/graphs/jkqtpimagergb.h"

8
examples/jkqtplot_test/TestWidgetImages.h
View File

@ -11,10 +11,10 @@
#include <QFormLayout> #include <QFormLayout>
#include <QCheckBox> #include <QCheckBox>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsgeometric.h" #include "jkqtplotter/graphs/jkqtpgeometric.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtplotter/overlays/jkqtpbasicoverlays.h"
#include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/graphs/jkqtpparsedfunction.h"
#include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpbaseelements.h"
#include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"

8
examples/jkqtplot_test/TestWidgetLogGraphs.h
View File

@ -11,10 +11,10 @@
#include <QFormLayout> #include <QFormLayout>
#include <QCheckBox> #include <QCheckBox>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsgeometric.h" #include "jkqtplotter/graphs/jkqtpgeometric.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtplotter/overlays/jkqtpbasicoverlays.h"
#include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/graphs/jkqtpparsedfunction.h"
#include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpbaseelements.h"
#include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"

8
examples/jkqtplot_test/TestWidgetParamScatterPlots.h
View File

@ -11,10 +11,10 @@
#include <QFormLayout> #include <QFormLayout>
#include <QCheckBox> #include <QCheckBox>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsgeometric.h" #include "jkqtplotter/graphs/jkqtpgeometric.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtplotter/overlays/jkqtpbasicoverlays.h"
#include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/graphs/jkqtpparsedfunction.h"
#include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpbaseelements.h"
#include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"

2
examples/jkqtplot_test/TestWidgetPeaksPlots.h
View File

@ -11,7 +11,7 @@
#include <QFormLayout> #include <QFormLayout>
#include <QCheckBox> #include <QCheckBox>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphspeakstream.h" #include "jkqtplotter/graphs/jkqtppeakstream.h"
#define N1 200 #define N1 200
#define N2 50 #define N2 50

10
examples/jkqtplot_test/TestWidgetRGBImages.h
View File

@ -11,11 +11,11 @@
#include <QFormLayout> #include <QFormLayout>
#include <QCheckBox> #include <QCheckBox>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsgeometric.h" #include "jkqtplotter/graphs/jkqtpgeometric.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpgraphsimagergb.h" #include "jkqtplotter/graphs/jkqtpimagergb.h"
#include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtplotter/overlays/jkqtpbasicoverlays.h"
#include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/graphs/jkqtpparsedfunction.h"
#include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpbaseelements.h"
#include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/gui/jkqtpgraphsmodel.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"

2
examples/simpletest/jkqtplotter_simpletest.cpp
View File

@ -6,7 +6,7 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
int main(int argc, char* argv[]) int main(int argc, char* argv[])

8
examples/simpletest_advancedlineandfillstyling/jkqtplotter_simpletest_advancedlineandfillstyling.cpp
View File

@ -6,10 +6,10 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsspecialline.h" #include "jkqtplotter/graphs/jkqtpspecialline.h"
#include "jkqtplotter/jkqtpgraphsbarchart.h" #include "jkqtplotter/graphs/jkqtpbarchart.h"
#include "jkqtplotter/jkqtpgraphsgeometric.h" #include "jkqtplotter/graphs/jkqtpgeometric.h"
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {

2
examples/simpletest_barchart/README.md
View File

@ -5,7 +5,7 @@ The source code of the main application is (see [`jkqtplotter_simpletest_barchar
```.cpp ```.cpp
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsbarchart.h" #include "jkqtplotter/graphs/jkqtpbarchart.h"
#define Ndata 5 #define Ndata 5
int main(int argc, char* argv[]) int main(int argc, char* argv[])

4
examples/simpletest_barchart/jkqtplotter_simpletest_barchart.cpp
View File

@ -6,8 +6,8 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsbarchart.h" #include "jkqtplotter/graphs/jkqtpbarchart.h"
#define Ndata 5 #define Ndata 5
int main(int argc, char* argv[]) int main(int argc, char* argv[])

4
examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot.cpp
View File

@ -6,8 +6,8 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsboxplot.h" #include "jkqtplotter/graphs/jkqtpboxplot.h"
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {

2
examples/simpletest_contourplot/jkqtplotter_simpletest_contourplot.cpp
View File

@ -7,7 +7,7 @@
#include <QApplication> #include <QApplication>
#include <cmath> #include <cmath>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphscontour.h" #include "jkqtplotter/graphs/jkqtpcontour.h"
#ifndef M_PI #ifndef M_PI
#define M_PI 3.14159265358979323846 #define M_PI 3.14159265358979323846

4
examples/simpletest_datastore/jkqtplotter_simpletest_datastore.cpp
View File

@ -6,8 +6,8 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include <algorithm> #include <algorithm>
int main(int argc, char* argv[]) int main(int argc, char* argv[])

6
examples/simpletest_datastore_groupedstat/jkqtplotter_simpletest_datastore_groupedstat.cpp
View File

@ -6,9 +6,9 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsbarchart.h" #include "jkqtplotter/graphs/jkqtpbarchart.h"
#include "jkqtplotter/jkqtpgraphsstatisticsadaptors.h" #include "jkqtplotter/graphs/jkqtpstatisticsadaptors.h"
#include "jkqtcommon/jkqtpstatisticstools.h" #include "jkqtcommon/jkqtpstatisticstools.h"
#include "jkqtcommon/jkqtpstringtools.h" #include "jkqtcommon/jkqtpstringtools.h"
#include <random> #include <random>

4
examples/simpletest_datastore_iterators/jkqtplotter_simpletest_datastore_iterators.cpp
View File

@ -6,8 +6,8 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include <algorithm> #include <algorithm>
int main(int argc, char* argv[]) int main(int argc, char* argv[])

8
examples/simpletest_datastore_regression/jkqtplotter_simpletest_datastore_regression.cpp
View File

@ -6,10 +6,10 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphspeakstream.h" #include "jkqtplotter/graphs/jkqtppeakstream.h"
#include "jkqtplotter/jkqtpgraphsboxplot.h" #include "jkqtplotter/graphs/jkqtpboxplot.h"
#include "jkqtplotter/jkqtpgraphsstatisticsadaptors.h" #include "jkqtplotter/graphs/jkqtpstatisticsadaptors.h"
#include "jkqtplotter/jkqtpgraphsevaluatedfunction.h" #include "jkqtplotter/graphs/jkqtpevaluatedfunction.h"
#include "jkqtcommon/jkqtpstatisticstools.h" #include "jkqtcommon/jkqtpstatisticstools.h"
#include "jkqtcommon/jkqtpstringtools.h" #include "jkqtcommon/jkqtpstringtools.h"
#include <random> #include <random>

8
examples/simpletest_datastore_statistics/jkqtplotter_simpletest_datastore_statistics.cpp
View File

@ -6,10 +6,10 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphspeakstream.h" #include "jkqtplotter/graphs/jkqtppeakstream.h"
#include "jkqtplotter/jkqtpgraphsboxplot.h" #include "jkqtplotter/graphs/jkqtpboxplot.h"
#include "jkqtplotter/jkqtpgraphsstatisticsadaptors.h" #include "jkqtplotter/graphs/jkqtpstatisticsadaptors.h"
#include "jkqtplotter/jkqtpgraphsevaluatedfunction.h" #include "jkqtplotter/graphs/jkqtpevaluatedfunction.h"
#include "jkqtcommon/jkqtpstatisticstools.h" #include "jkqtcommon/jkqtpstatisticstools.h"
#include "jkqtcommon/jkqtpstringtools.h" #include "jkqtcommon/jkqtpstringtools.h"
#include <random> #include <random>

8
examples/simpletest_datastore_statistics_2d/jkqtplotter_simpletest_datastore_statistics_2d.cpp
View File

@ -6,10 +6,10 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpgraphsstatisticsadaptors.h" #include "jkqtplotter/graphs/jkqtpstatisticsadaptors.h"
#include "jkqtplotter/jkqtpgraphsgeometric.h" #include "jkqtplotter/graphs/jkqtpgeometric.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtcommon/jkqtpstatisticstools.h" #include "jkqtcommon/jkqtpstatisticstools.h"
#include "jkqtcommon/jkqtpstringtools.h" #include "jkqtcommon/jkqtpstringtools.h"
#include <random> #include <random>

6
examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes.cpp
View File

@ -10,10 +10,10 @@
#include <QFile> #include <QFile>
#include <QTextStream> #include <QTextStream>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsgeometric.h" #include "jkqtplotter/graphs/jkqtpgeometric.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"
#include "jkqtplotter/jkqtpgraphsfilledcurve.h" #include "jkqtplotter/graphs/jkqtpfilledcurve.h"
void drawWithDateAxis(JKQTPlotter& plot) { void drawWithDateAxis(JKQTPlotter& plot) {

2
examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.cpp
View File

@ -6,7 +6,7 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"

2
examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs.cpp
View File

@ -6,7 +6,7 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsfilledcurve.h" #include "jkqtplotter/graphs/jkqtpfilledcurve.h"
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {

2
examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot.cpp
View File

@ -8,7 +8,7 @@
#include <QVector> #include <QVector>
#include <QMap> #include <QMap>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsevaluatedfunction.h" #include "jkqtplotter/graphs/jkqtpevaluatedfunction.h"
double sinc(double x) { double sinc(double x) {
return 10.0*sin(x)/x; return 10.0*sin(x)/x;

2
examples/simpletest_geometric/jkqtplotter_simpletest_geometric.cpp
View File

@ -6,7 +6,7 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsgeometric.h" #include "jkqtplotter/graphs/jkqtpgeometric.h"
int main(int argc, char* argv[]) int main(int argc, char* argv[])

2
examples/simpletest_imageplot/README.md
View File

@ -6,7 +6,7 @@ The source code of the main application is (see [`jkqtplotter_simpletest_imagepl
#include <QApplication> #include <QApplication>
#include <cmath> #include <cmath>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#ifndef M_PI #ifndef M_PI
#define M_PI 3.14159265358979323846 #define M_PI 3.14159265358979323846

2
examples/simpletest_imageplot/jkqtplotter_simpletest_imageplot.cpp
View File

@ -7,7 +7,7 @@
#include <QApplication> #include <QApplication>
#include <cmath> #include <cmath>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#ifndef M_PI #ifndef M_PI
#define M_PI 3.14159265358979323846 #define M_PI 3.14159265358979323846

2
examples/simpletest_imageplot_modifier/README.md
View File

@ -6,7 +6,7 @@ The source code of the main application is (see [`jkqtplotter_simpletest_imagepl
#include <QApplication> #include <QApplication>
#include <cmath> #include <cmath>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#ifndef M_PI #ifndef M_PI
#define M_PI 3.14159265358979323846 #define M_PI 3.14159265358979323846

2
examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.cpp
View File

@ -7,7 +7,7 @@
#include <QApplication> #include <QApplication>
#include <cmath> #include <cmath>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#ifndef M_PI #ifndef M_PI
#define M_PI 3.14159265358979323846 #define M_PI 3.14159265358979323846

2
examples/simpletest_imageplot_nodatastore/README.md
View File

@ -6,7 +6,7 @@ The source code of the main application is (see [`jkqtplotter_simpletest_imagepl
#include <QApplication> #include <QApplication>
#include <cmath> #include <cmath>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#ifndef M_PI #ifndef M_PI
#define M_PI 3.14159265358979323846 #define M_PI 3.14159265358979323846

2
examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.cpp
View File

@ -7,7 +7,7 @@
#include <QApplication> #include <QApplication>
#include <cmath> #include <cmath>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#ifndef M_PI #ifndef M_PI
#define M_PI 3.14159265358979323846 #define M_PI 3.14159265358979323846

2
examples/simpletest_imageplot_opencv/README.md
View File

@ -9,7 +9,7 @@ The source code of the main application is (see [`jkqtplotter_simpletest_imagepl
#include <QApplication> #include <QApplication>
#include <cmath> #include <cmath>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpopencvinterface.h" #include "jkqtplotter/jkqtpopencvinterface.h"
#include <opencv/cv.h> #include <opencv/cv.h>

4
examples/simpletest_imageplot_opencv/jkqtplotter_simpletest_imageplot_opencv.cpp
View File

@ -7,8 +7,8 @@
#include <QApplication> #include <QApplication>
#include <cmath> #include <cmath>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpopencvinterface.h" #include "jkqtplotter/jkqtpopencvinterface.h"
#include <opencv2/opencv.hpp> #include <opencv2/opencv.hpp>

2
examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot.cpp
View File

@ -6,7 +6,7 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsimpulses.h" #include "jkqtplotter/graphs/jkqtpimpulses.h"
// number of datapoints: // number of datapoints:
#define Ndata 40 #define Ndata 40

4
examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.cpp
View File

@ -6,8 +6,8 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsgeometric.h" #include "jkqtplotter/graphs/jkqtpgeometric.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"
#define sqr(x) ((x)*(x)) #define sqr(x) ((x)*(x))

2
examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve.cpp
View File

@ -6,7 +6,7 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
int main(int argc, char* argv[]) int main(int argc, char* argv[])

2
examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot.cpp
View File

@ -6,7 +6,7 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
int main(int argc, char* argv[]) int main(int argc, char* argv[])

4
examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image.cpp
View File

@ -6,8 +6,8 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
int main(int argc, char* argv[]) int main(int argc, char* argv[])

4
examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot.cpp
View File

@ -10,8 +10,8 @@
#include <QFormLayout> #include <QFormLayout>
#include <QDoubleSpinBox> #include <QDoubleSpinBox>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/graphs/jkqtpparsedfunction.h"

2
examples/simpletest_rgbimageplot/README.md
View File

@ -6,7 +6,7 @@ The source code of the main application is (see [`jkqtplotter_simpletest_rgbimag
#include <QApplication> #include <QApplication>
#include <cmath> #include <cmath>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsimagergb.h" #include "jkqtplotter/graphs/jkqtpimagergb.h"
#ifndef M_PI #ifndef M_PI
#define M_PI 3.14159265358979323846 #define M_PI 3.14159265358979323846

2
examples/simpletest_rgbimageplot/jkqtplotter_simpletest_rgbimageplot.cpp
View File

@ -7,7 +7,7 @@
#include <QApplication> #include <QApplication>
#include <cmath> #include <cmath>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsimagergb.h" #include "jkqtplotter/graphs/jkqtpimagergb.h"
#ifndef M_PI #ifndef M_PI
#define M_PI 3.14159265358979323846 #define M_PI 3.14159265358979323846

2
examples/simpletest_rgbimageplot_opencv/README.md
View File

@ -9,7 +9,7 @@ The source code of the main application is (see [`jkqtplotter_simpletest_imagepl
#include <QApplication> #include <QApplication>
#include <cmath> #include <cmath>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpopencvinterface.h" #include "jkqtplotter/jkqtpopencvinterface.h"
#include <opencv2/core.hpp> #include <opencv2/core.hpp>
#include <opencv2/imgcodecs.hpp> #include <opencv2/imgcodecs.hpp>

4
examples/simpletest_rgbimageplot_opencv/jkqtplotter_simpletest_rgbimageplot_opencv.cpp
View File

@ -7,8 +7,8 @@
#include <QApplication> #include <QApplication>
#include <cmath> #include <cmath>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsimagergb.h" #include "jkqtplotter/graphs/jkqtpimagergb.h"
#include "jkqtplotter/jkqtpopencvinterface.h" #include "jkqtplotter/jkqtpopencvinterface.h"
#include <opencv2/opencv.hpp> #include <opencv2/opencv.hpp>
#include <opencv2/imgcodecs.hpp> #include <opencv2/imgcodecs.hpp>

4
examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt.cpp
View File

@ -7,8 +7,8 @@
#include <QApplication> #include <QApplication>
#include <cmath> #include <cmath>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsimagergb.h" #include "jkqtplotter/graphs/jkqtpimagergb.h"

2
examples/simpletest_speed/jkqtplotter_simpletest_speed.cpp
View File

@ -2,7 +2,7 @@
#include <array> #include <array>
#include <random> #include <random>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "speedtestplot.h" #include "speedtestplot.h"
int main(int argc, char* argv[]) int main(int argc, char* argv[])

2
examples/simpletest_speed/speedtestplot.cpp
View File

@ -5,7 +5,7 @@
*/ */
#include "speedtestplot.h" #include "speedtestplot.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
SpeedTestPlot::SpeedTestPlot(): SpeedTestPlot::SpeedTestPlot():

2
examples/simpletest_stackedbars/README.md
View File

@ -5,7 +5,7 @@ The source code of the main application is (see [`jkqtplotter_simpletest_stacked
```.cpp ```.cpp
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsbarchart.h" #include "jkqtplotter/graphs/jkqtpbarchart.h"
#define Ndata 5 #define Ndata 5
int main(int argc, char* argv[]) int main(int argc, char* argv[])

4
examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars.cpp
View File

@ -6,8 +6,8 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsbarchart.h" #include "jkqtplotter/graphs/jkqtpbarchart.h"
template<class TGRAPH> template<class TGRAPH>

4
examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.cpp
View File

@ -6,8 +6,8 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsspecialline.h" #include "jkqtplotter/graphs/jkqtpspecialline.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"
int main(int argc, char* argv[]) int main(int argc, char* argv[])

4
examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_vertical.cpp
View File

@ -6,8 +6,8 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsspecialline.h" #include "jkqtplotter/graphs/jkqtpspecialline.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"
int main(int argc, char* argv[]) int main(int argc, char* argv[])

2
examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors.cpp
View File

@ -6,7 +6,7 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
// number of datapoints: // number of datapoints:
#define Ndata 10 #define Ndata 10

2
examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.cpp
View File

@ -6,7 +6,7 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"

2
examples/simpletest_ui/formwithjkqtplotter.h
View File

@ -2,7 +2,7 @@
#define FORMWITHJKQTPLOTTER_H #define FORMWITHJKQTPLOTTER_H
#include <QWidget> #include <QWidget>
#include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/graphs/jkqtpparsedfunction.h"
namespace Ui { namespace Ui {
class FormWithJKQTPlotter; class FormWithJKQTPlotter;

6
examples/simpletest_violinplot/jkqtplotter_simpletest_violinplot.cpp
View File

@ -6,9 +6,9 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsviolinplot.h" #include "jkqtplotter/graphs/jkqtpviolinplot.h"
#include "jkqtplotter/jkqtpgraphssinglecolumnsymbols.h" #include "jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h"
#include "jkqtplotter/jkqtpgraphsstatisticsadaptors.h" #include "jkqtplotter/graphs/jkqtpstatisticsadaptors.h"
#include "jkqtcommon/jkqtpstatisticstools.h" #include "jkqtcommon/jkqtpstatisticstools.h"
#include <random> #include <random>
#include <cmath> #include <cmath>

10
examples/test_distributionplot/test_distributionplot.cpp
View File

@ -6,11 +6,11 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsboxplot.h" #include "jkqtplotter/graphs/jkqtpboxplot.h"
#include "jkqtplotter/jkqtpgraphsbarchart.h" #include "jkqtplotter/graphs/jkqtpbarchart.h"
#include "jkqtplotter/jkqtpgraphssinglecolumnsymbols.h" #include "jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h"
#include "jkqtplotter/jkqtpgraphsevaluatedfunction.h" #include "jkqtplotter/graphs/jkqtpevaluatedfunction.h"
#include <map> #include <map>
#include <random> #include <random>
#include <cmath> #include <cmath>

2
examples/test_multiplot/README.md
View File

@ -94,7 +94,7 @@ The result looks like this:
![test_multiplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/test_multiplot.png) ![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) ![test_multiplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/test_multiplot_printpreview.png)

6
examples/test_multiplot/test_multiplot.cpp
View File

@ -6,9 +6,9 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/graphs/jkqtpparsedfunction.h"
#include "jkqtplotter/jkqtpgraphsbarchart.h" #include "jkqtplotter/graphs/jkqtpbarchart.h"
#include <random> #include <random>
#include <cmath> #include <cmath>
#include "test_multiplot_ui.h" #include "test_multiplot_ui.h"

4
examples/test_styledboxplot/test_styledboxplot.cpp
View File

@ -6,8 +6,8 @@
#include <QApplication> #include <QApplication>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsboxplot.h" #include "jkqtplotter/graphs/jkqtpboxplot.h"
#include "jkqtplotter/jkqtpgraphsgeometric.h" #include "jkqtplotter/graphs/jkqtpgeometric.h"
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {

12
examples/test_styling/README.md
View File

@ -81,12 +81,12 @@ The following gallery shows a set of example styles:
| Style-file | Screenshot | | Style-file | Screenshot |
|:-------------:| ------------- | |:-------------:| ------------- |
| <b> The Default Style </b> | ![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/style_default.png) | | <b> The Default Style </b> | ![](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/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/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/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/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/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/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/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/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/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/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/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) |
<b>Note:</b> The styles listed above are also linked into the executable as Qt ressource ... you can use them e.g. as follows: <b>Note:</b> The styles listed above are also linked into the executable as Qt ressource ... you can use them e.g. as follows:

8
examples/test_styling/test_styling.cpp
View File

@ -1,10 +1,10 @@
#include "test_styling.h" #include "test_styling.h"
#include "ui_test_styling.h" #include "ui_test_styling.h"
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsbarchart.h" #include "jkqtplotter/graphs/jkqtpbarchart.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpgraphsgeometric.h" #include "jkqtplotter/graphs/jkqtpgeometric.h"
#include <QDir> #include <QDir>
#include <QTextStream> #include <QTextStream>
#include <QFileDialog> #include <QFileDialog>

2
examples/test_user_interaction/test_user_interaction.h
View File

@ -3,7 +3,7 @@
#include <QWidget> #include <QWidget>
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include <QFormLayout> #include <QFormLayout>
#include <QCheckBox> #include <QCheckBox>
#include <QComboBox> #include <QComboBox>

6
lib/jkqtcommon/CMakeLists.txt
View File

@ -90,7 +90,7 @@ if(LIB_INSTALL)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY 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) endif(BUILD_SHARED_LIBS)
@ -99,12 +99,12 @@ if(LIB_INSTALL)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY 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) endif(BUILD_STATIC_LIBS)
install(FILES ${HEADERS} install(FILES ${HEADERS}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtcommon DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtcommon
COMPONENT Headers) COMPONENT Headers)
endif(LIB_INSTALL) endif(LIB_INSTALL)

2
lib/jkqtfastplotter.pri
View File

@ -11,7 +11,7 @@ isEmpty(JKQTP_FASTPLOTTER_PRI_INCLUDED) {
SOURCES += $$PWD/jkqtfastplotter/jkqtfastplotter.cpp SOURCES += $$PWD/jkqtfastplotter/jkqtfastplotter.cpp
RESOURCES += $$PWD/jkqtplotterressources/jkqtpbaseplotter.qrc RESOURCES += $$PWD/jkqtplotter/resources/jkqtpbaseplotter.qrc
QT += opengl QT += opengl

6
lib/jkqtfastplotter/CMakeLists.txt
View File

@ -54,7 +54,7 @@ if(LIB_INSTALL)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY 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) endif(BUILD_SHARED_LIBS)
@ -63,12 +63,12 @@ if(LIB_INSTALL)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY 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) endif(BUILD_STATIC_LIBS)
install(FILES ${HEADERS} install(FILES ${HEADERS}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtfastplotter DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtfastplotter
COMPONENT Headers) COMPONENT Headers)
endif(LIB_INSTALL) endif(LIB_INSTALL)

6
lib/jkqtmathtext/CMakeLists.txt
View File

@ -58,7 +58,7 @@ if(LIB_INSTALL)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY 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) endif(BUILD_SHARED_LIBS)
@ -67,12 +67,12 @@ if(LIB_INSTALL)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY 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) endif(BUILD_STATIC_LIBS)
install(FILES ${HEADERS} install(FILES ${HEADERS}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtmathtext DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtmathtext
COMPONENT Headers) COMPONENT Headers)
endif(LIB_INSTALL) endif(LIB_INSTALL)

94
lib/jkqtplotter.pri
View File

@ -14,42 +14,43 @@ isEmpty(JKQTP_PLOTTER_PRI_INCLUDED) {
$$PWD/jkqtplotter/jkqtpbaseelements.h \ $$PWD/jkqtplotter/jkqtpbaseelements.h \
$$PWD/jkqtplotter/jkqtpbaseplotter.h \ $$PWD/jkqtplotter/jkqtpbaseplotter.h \
$$PWD/jkqtplotter/jkqtpdatastorage.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/jkqtpgraphsbase.h \
$$PWD/jkqtplotter/jkqtpgraphsbaseerrors.h \ $$PWD/jkqtplotter/jkqtpgraphsbaseerrors.h \
$$PWD/jkqtplotter/jkqtpgraphsbasestylingmixins.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/jkqtplotter.h \
$$PWD/jkqtplotter/jkqtplotterstyle.h \ $$PWD/jkqtplotter/jkqtplotterstyle.h \
$$PWD/jkqtplotter/jkqtpkeystyle.h \ $$PWD/jkqtplotter/jkqtpkeystyle.h \
$$PWD/jkqtplotter/jkqtpbaseplotterstyle.h \ $$PWD/jkqtplotter/jkqtpbaseplotterstyle.h \
$$PWD/jkqtplotter/jkqtpcoordinateaxes.h \ $$PWD/jkqtplotter/jkqtpcoordinateaxes.h \
$$PWD/jkqtplotter/jkqtpcoordinateaxesstyle.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/jkqtpcomboboxes.h \
$$PWD/jkqtplotter/gui/jkqtpenhancedspinboxes.h \ $$PWD/jkqtplotter/gui/jkqtpenhancedspinboxes.h \
$$PWD/jkqtplotter/gui/jkqtpenhancedtableview.h \ $$PWD/jkqtplotter/gui/jkqtpenhancedtableview.h \
$$PWD/jkqtplotter/gui/jkqtpgraphsmodel.h \ $$PWD/jkqtplotter/gui/jkqtpgraphsmodel.h \
$$PWD/jkqtplotter/gui/jkvanishqtoolbar.h \ $$PWD/jkqtplotter/gui/jkvanishqtoolbar.h
$$PWD/jkqtplotter/jkqtpimagetools.h
@ -58,42 +59,43 @@ isEmpty(JKQTP_PLOTTER_PRI_INCLUDED) {
$$PWD/jkqtplotter/jkqtpbaseelements.cpp \ $$PWD/jkqtplotter/jkqtpbaseelements.cpp \
$$PWD/jkqtplotter/jkqtpbaseplotter.cpp \ $$PWD/jkqtplotter/jkqtpbaseplotter.cpp \
$$PWD/jkqtplotter/jkqtpdatastorage.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/jkqtpgraphsbase.cpp \
$$PWD/jkqtplotter/jkqtpgraphsbaseerrors.cpp \ $$PWD/jkqtplotter/jkqtpgraphsbaseerrors.cpp \
$$PWD/jkqtplotter/jkqtpgraphsbasestylingmixins.cpp \ $$PWD/jkqtplotter/jkqtpgraphsbasestylingmixins.cpp \
$$PWD/jkqtplotter/jkqtpgraphsboxplot.cpp \ $$PWD/jkqtplotter/jkqtpimagetools.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/jkqtplotter.cpp \ $$PWD/jkqtplotter/jkqtplotter.cpp \
$$PWD/jkqtplotter/jkqtplotterstyle.cpp \ $$PWD/jkqtplotter/jkqtplotterstyle.cpp \
$$PWD/jkqtplotter/jkqtpkeystyle.cpp \ $$PWD/jkqtplotter/jkqtpkeystyle.cpp \
$$PWD/jkqtplotter/jkqtpbaseplotterstyle.cpp \ $$PWD/jkqtplotter/jkqtpbaseplotterstyle.cpp \
$$PWD/jkqtplotter/jkqtpcoordinateaxes.cpp \ $$PWD/jkqtplotter/jkqtpcoordinateaxes.cpp \
$$PWD/jkqtplotter/jkqtpcoordinateaxesstyle.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/jkqtpcomboboxes.cpp \
$$PWD/jkqtplotter/gui/jkqtpenhancedspinboxes.cpp \ $$PWD/jkqtplotter/gui/jkqtpenhancedspinboxes.cpp \
$$PWD/jkqtplotter/gui/jkqtpenhancedtableview.cpp \ $$PWD/jkqtplotter/gui/jkqtpenhancedtableview.cpp \
$$PWD/jkqtplotter/gui/jkqtpgraphsmodel.cpp \ $$PWD/jkqtplotter/gui/jkqtpgraphsmodel.cpp \
$$PWD/jkqtplotter/gui/jkvanishqtoolbar.cpp \ $$PWD/jkqtplotter/gui/jkvanishqtoolbar.cpp
$$PWD/jkqtplotter/jkqtpimagetools.cpp
RESOURCES += $$PWD/jkqtplotter/resources/jkqtpbaseplotter.qrc \ RESOURCES += $$PWD/jkqtplotter/resources/jkqtpbaseplotter.qrc \

123
lib/jkqtplotter/CMakeLists.txt
View File

@ -24,85 +24,100 @@ set(SRCS
jkqtpbaseelements.cpp jkqtpbaseelements.cpp
jkqtpbaseplotter.cpp jkqtpbaseplotter.cpp
jkqtpdatastorage.cpp jkqtpdatastorage.cpp
jkqtpelementsoverlay.cpp jkqtpoverlaysbase.cpp
jkqtpgraphsscatter.cpp
jkqtpgraphsrange.cpp
jkqtpgraphsspecialline.cpp
jkqtpgraphsbarchart.cpp
jkqtpgraphsbase.cpp jkqtpgraphsbase.cpp
jkqtpgraphsbaseerrors.cpp jkqtpgraphsbaseerrors.cpp
jkqtpgraphsbasestylingmixins.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 jkqtplotter.cpp
jkqtplotterstyle.cpp jkqtplotterstyle.cpp
jkqtpkeystyle.cpp jkqtpkeystyle.cpp
jkqtpbaseplotterstyle.cpp jkqtpbaseplotterstyle.cpp
jkqtpcoordinateaxes.cpp jkqtpcoordinateaxes.cpp
jkqtpcoordinateaxesstyle.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/jkqtpcomboboxes.cpp
gui/jkqtpenhancedspinboxes.cpp gui/jkqtpenhancedspinboxes.cpp
gui/jkqtpenhancedtableview.cpp gui/jkqtpenhancedtableview.cpp
gui/jkqtpgraphsmodel.cpp gui/jkqtpgraphsmodel.cpp
gui/jkvanishqtoolbar.cpp gui/jkvanishqtoolbar.cpp
jkqtpimagetools.cpp
) )
set(HEADERS set(HEADERS
jkqtptools.h jkqtptools.h
jkqtpbaseelements.h jkqtpbaseelements.h
jkqtpbaseplotter.h jkqtpbaseplotter.h
jkqtpdatastorage.h jkqtpdatastorage.h
jkqtpelementsoverlay.h jkqtpoverlaysbase.h
jkqtpgraphsscatter.h
jkqtpgraphsrange.h
jkqtpgraphsspecialline.h
jkqtpgraphsbarchart.h
jkqtpgraphsbase.h jkqtpgraphsbase.h
jkqtpgraphsbaseerrors.h jkqtpgraphsbaseerrors.h
jkqtpgraphsbasestylingmixins.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 jkqtplotter.h
jkqtplotterstyle.h jkqtplotterstyle.h
jkqtpkeystyle.h jkqtpkeystyle.h
jkqtpbaseplotterstyle.h jkqtpbaseplotterstyle.h
jkqtpcoordinateaxes.h jkqtpcoordinateaxes.h
jkqtpcoordinateaxesstyle.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/jkqtpcomboboxes.h
gui/jkqtpenhancedspinboxes.h gui/jkqtpenhancedspinboxes.h
gui/jkqtpenhancedtableview.h gui/jkqtpenhancedtableview.h
gui/jkqtpgraphsmodel.h gui/jkqtpgraphsmodel.h
gui/jkvanishqtoolbar.h gui/jkvanishqtoolbar.h
jkqtpimagetools.h
) )
set(RESOURCES set(RESOURCES
@ -112,7 +127,7 @@ set(RESOURCES
if(BUILD_SHARED_LIBS) 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}") 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_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) target_compile_definitions(${libsh_name} PRIVATE JKQTP_LIB_IN_DLL)
@ -120,7 +135,7 @@ if(BUILD_SHARED_LIBS)
endif() endif()
if(BUILD_STATIC_LIBS) 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}") 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) target_link_libraries(${lib_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Svg Qt5::Xml JKQTCommonLib JKQTMathTextLib)
endif() endif()
@ -135,7 +150,7 @@ if(LIB_INSTALL)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtplotter INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
) )
endif(BUILD_SHARED_LIBS) endif(BUILD_SHARED_LIBS)
@ -144,7 +159,7 @@ if(LIB_INSTALL)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtplotter INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
) )
endif(BUILD_STATIC_LIBS) endif(BUILD_STATIC_LIBS)
@ -152,4 +167,16 @@ if(LIB_INSTALL)
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtplotter DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtplotter
COMPONENT Headers) 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) endif(LIB_INSTALL)

4
lib/jkqtplotter/jkqtpgraphsbarchart.cpp → lib/jkqtplotter/graphs/jkqtpbarchart.cpp
View File

@ -19,13 +19,13 @@
#include "jkqtplotter/jkqtpgraphsbarchart.h" #include "jkqtplotter/graphs/jkqtpbarchart.h"
#include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtpbaseplotter.h"
#include <stdlib.h> #include <stdlib.h>
#include <QDebug> #include <QDebug>
#include <iostream> #include <iostream>
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpbaseelements.h"
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"

0
lib/jkqtplotter/jkqtpgraphsbarchart.h → lib/jkqtplotter/graphs/jkqtpbarchart.h
View File

4
lib/jkqtplotter/jkqtpgraphsboxplot.cpp → lib/jkqtplotter/graphs/jkqtpboxplot.cpp
View File

@ -19,13 +19,13 @@
#include "jkqtplotter/jkqtpgraphsboxplot.h" #include "jkqtplotter/graphs/jkqtpboxplot.h"
#include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtpbaseplotter.h"
#include <stdlib.h> #include <stdlib.h>
#include <QDebug> #include <QDebug>
#include <iostream> #include <iostream>
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpbaseelements.h"
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#define SmallestGreaterZeroCompare_xvsgz() if ((xvsgz>10.0*DBL_MIN)&&((smallestGreaterZero<10.0*DBL_MIN) || (xvsgz<smallestGreaterZero))) smallestGreaterZero=xvsgz; #define SmallestGreaterZeroCompare_xvsgz() if ((xvsgz>10.0*DBL_MIN)&&((smallestGreaterZero<10.0*DBL_MIN) || (xvsgz<smallestGreaterZero))) smallestGreaterZero=xvsgz;

2
lib/jkqtplotter/jkqtpgraphsboxplot.h → lib/jkqtplotter/graphs/jkqtpboxplot.h
View File

@ -25,7 +25,7 @@
#include "jkqtcommon/jkqtp_imexport.h" #include "jkqtcommon/jkqtp_imexport.h"
#include "jkqtplotter/jkqtpimagetools.h" #include "jkqtplotter/jkqtpimagetools.h"
#include "jkqtplotter/jkqtpgraphsbase.h" #include "jkqtplotter/jkqtpgraphsbase.h"
#include "jkqtplotter/jkqtpgraphsboxplotstylingmixins.h" #include "jkqtplotter/graphs/jkqtpboxplotstylingmixins.h"
#include "jkqtplotter/jkqtpgraphsbasestylingmixins.h" #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
#ifndef jkqtpgraphsboxplot_H #ifndef jkqtpgraphsboxplot_H

4
lib/jkqtplotter/jkqtpgraphsboxplotstylingmixins.cpp → lib/jkqtplotter/graphs/jkqtpboxplotstylingmixins.cpp
View File

@ -19,13 +19,13 @@
#include "jkqtplotter/jkqtpgraphsboxplotstylingmixins.h" #include "jkqtplotter/graphs/jkqtpboxplotstylingmixins.h"
#include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtpbaseplotter.h"
#include <stdlib.h> #include <stdlib.h>
#include <QDebug> #include <QDebug>
#include <iostream> #include <iostream>
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpbaseelements.h"
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"

0
lib/jkqtplotter/jkqtpgraphsboxplotstylingmixins.h → lib/jkqtplotter/graphs/jkqtpboxplotstylingmixins.h
View File

3
lib/jkqtplotter/jkqtpgraphscontour.cpp → lib/jkqtplotter/graphs/jkqtpcontour.cpp
View File

@ -18,13 +18,12 @@
*/ */
#include "jkqtplotter/jkqtpgraphscontour.h" #include "jkqtplotter/graphs/jkqtpcontour.h"
#include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtpbaseplotter.h"
#include "jkqtplotter/jkqtpimagetools.h" #include "jkqtplotter/jkqtpimagetools.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"
#include "jkqtcommon/jkqtpenhancedpainter.h" #include "jkqtcommon/jkqtpenhancedpainter.h"
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtpgraphscontour.h"
#include <QDebug> #include <QDebug>
#include <QImageWriter> #include <QImageWriter>
#include <QFileDialog> #include <QFileDialog>

4
lib/jkqtplotter/jkqtpgraphscontour.h → lib/jkqtplotter/graphs/jkqtpcontour.h
View File

@ -27,10 +27,10 @@
#include <QImage> #include <QImage>
#include <QVector3D> #include <QVector3D>
#include <QIcon> #include <QIcon>
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"
#include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpbaseelements.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpgraphsbasestylingmixins.h" #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
#include "jkqtcommon/jkqtp_imexport.h" #include "jkqtcommon/jkqtp_imexport.h"
#include "jkqtplotter/jkqtpimagetools.h" #include "jkqtplotter/jkqtpimagetools.h"

5
lib/jkqtplotter/jkqtpgraphsevaluatedfunction.cpp → lib/jkqtplotter/graphs/jkqtpevaluatedfunction.cpp
View File

@ -19,16 +19,15 @@
#include "jkqtplotter/jkqtpgraphsevaluatedfunction.h" #include "jkqtplotter/graphs/jkqtpevaluatedfunction.h"
#include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtpbaseplotter.h"
#include <stdlib.h> #include <stdlib.h>
#include <QDebug> #include <QDebug>
#include <iostream> #include <iostream>
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpbaseelements.h"
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtpgraphsevaluatedfunction.h"

2
lib/jkqtplotter/jkqtpgraphsevaluatedfunction.h → lib/jkqtplotter/graphs/jkqtpevaluatedfunction.h
View File

@ -22,7 +22,7 @@
#include <QString> #include <QString>
#include <QPainter> #include <QPainter>
#include <QPair> #include <QPair>
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsbasestylingmixins.h" #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
#include "jkqtcommon/jkqtp_imexport.h" #include "jkqtcommon/jkqtp_imexport.h"
#include <functional> #include <functional>

4
lib/jkqtplotter/jkqtpgraphsfilledcurve.cpp → lib/jkqtplotter/graphs/jkqtpfilledcurve.cpp
View File

@ -19,13 +19,13 @@
#include "jkqtplotter/jkqtpgraphsfilledcurve.h" #include "jkqtplotter/graphs/jkqtpfilledcurve.h"
#include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtpbaseplotter.h"
#include <stdlib.h> #include <stdlib.h>
#include <QDebug> #include <QDebug>
#include <iostream> #include <iostream>
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpbaseelements.h"
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#define SmallestGreaterZeroCompare_xvsgz() if ((xvsgz>10.0*DBL_MIN)&&((smallestGreaterZero<10.0*DBL_MIN) || (xvsgz<smallestGreaterZero))) smallestGreaterZero=xvsgz; #define SmallestGreaterZeroCompare_xvsgz() if ((xvsgz>10.0*DBL_MIN)&&((smallestGreaterZero<10.0*DBL_MIN) || (xvsgz<smallestGreaterZero))) smallestGreaterZero=xvsgz;

2
lib/jkqtplotter/jkqtpgraphsfilledcurve.h → lib/jkqtplotter/graphs/jkqtpfilledcurve.h
View File

@ -21,7 +21,7 @@
#include "jkqtcommon/jkqtp_imexport.h" #include "jkqtcommon/jkqtp_imexport.h"
#include "jkqtplotter/jkqtpgraphsbase.h" #include "jkqtplotter/jkqtpgraphsbase.h"
#include "jkqtplotter/jkqtpgraphsbaseerrors.h" #include "jkqtplotter/jkqtpgraphsbaseerrors.h"
#include "jkqtplotter/jkqtpgraphsspecialline.h" #include "jkqtplotter/graphs/jkqtpspecialline.h"
#ifndef jkqtpgraphsfilledcurve_H #ifndef jkqtpgraphsfilledcurve_H
#define jkqtpgraphsfilledcurve_H #define jkqtpgraphsfilledcurve_H

2
lib/jkqtplotter/jkqtpgraphsgeometric.cpp → lib/jkqtplotter/graphs/jkqtpgeometric.cpp
View File

@ -19,7 +19,7 @@
#include "jkqtplotter/jkqtpgraphsgeometric.h" #include "jkqtplotter/graphs/jkqtpgeometric.h"
#include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtpbaseplotter.h"
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include <stdlib.h> #include <stdlib.h>

2
lib/jkqtplotter/jkqtpgraphsgeometric.h → lib/jkqtplotter/graphs/jkqtpgeometric.h
View File

@ -21,7 +21,7 @@
#include <QString> #include <QString>
#include <QPainter> #include <QPainter>
#include <QPair> #include <QPair>
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpgraphsbasestylingmixins.h" #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"
#include "jkqtcommon/jkqtp_imexport.h" #include "jkqtcommon/jkqtp_imexport.h"

2
lib/jkqtplotter/jkqtpgraphsimage.cpp → lib/jkqtplotter/graphs/jkqtpimage.cpp
View File

@ -18,7 +18,7 @@
*/ */
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtpbaseplotter.h"
#include "jkqtplotter/jkqtpimagetools.h" #include "jkqtplotter/jkqtpimagetools.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"

2
lib/jkqtplotter/jkqtpgraphsimage.h → lib/jkqtplotter/graphs/jkqtpimage.h
View File

@ -26,7 +26,7 @@
#include <QPainter> #include <QPainter>
#include <QImage> #include <QImage>
#include <QIcon> #include <QIcon>
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"
#include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpbaseelements.h"
#include "jkqtcommon/jkqtp_imexport.h" #include "jkqtcommon/jkqtp_imexport.h"

2
lib/jkqtplotter/jkqtpgraphsimageoverlays.cpp → lib/jkqtplotter/graphs/jkqtpimageoverlays.cpp
View File

@ -18,7 +18,7 @@
*/ */
#include "jkqtplotter/jkqtpgraphsimageoverlays.h" #include "jkqtplotter/graphs/jkqtpimageoverlays.h"
#include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtpbaseplotter.h"
#include "jkqtplotter/jkqtpimagetools.h" #include "jkqtplotter/jkqtpimagetools.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"

4
lib/jkqtplotter/jkqtpgraphsimageoverlays.h → lib/jkqtplotter/graphs/jkqtpimageoverlays.h
View File

@ -26,10 +26,10 @@
#include <QPainter> #include <QPainter>
#include <QImage> #include <QImage>
#include <QIcon> #include <QIcon>
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"
#include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpbaseelements.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtcommon/jkqtp_imexport.h" #include "jkqtcommon/jkqtp_imexport.h"
#include "jkqtplotter/jkqtpimagetools.h" #include "jkqtplotter/jkqtpimagetools.h"

2
lib/jkqtplotter/jkqtpgraphsimagergb.cpp → lib/jkqtplotter/graphs/jkqtpimagergb.cpp
View File

@ -18,7 +18,7 @@
*/ */
#include "jkqtplotter/jkqtpgraphsimagergb.h" #include "jkqtplotter/graphs/jkqtpimagergb.h"
#include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtpbaseplotter.h"
#include "jkqtplotter/jkqtpimagetools.h" #include "jkqtplotter/jkqtpimagetools.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"

2
lib/jkqtplotter/jkqtpgraphsimagergb.h → lib/jkqtplotter/graphs/jkqtpimagergb.h
View File

@ -26,7 +26,7 @@
#include <QPainter> #include <QPainter>
#include <QImage> #include <QImage>
#include <QIcon> #include <QIcon>
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"
#include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpbaseelements.h"
#include "jkqtcommon/jkqtp_imexport.h" #include "jkqtcommon/jkqtp_imexport.h"

4
lib/jkqtplotter/jkqtpgraphsimpulses.cpp → lib/jkqtplotter/graphs/jkqtpimpulses.cpp
View File

@ -19,13 +19,13 @@
#include "jkqtplotter/jkqtpgraphsimpulses.h" #include "jkqtplotter/graphs/jkqtpimpulses.h"
#include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtpbaseplotter.h"
#include <stdlib.h> #include <stdlib.h>
#include <QDebug> #include <QDebug>
#include <iostream> #include <iostream>
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"
#include "jkqtplotter/jkqtpgraphsimage.h" #include "jkqtplotter/graphs/jkqtpimage.h"
#include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpbaseelements.h"
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#define SmallestGreaterZeroCompare_xvsgz() if ((xvsgz>10.0*DBL_MIN)&&((smallestGreaterZero<10.0*DBL_MIN) || (xvsgz<smallestGreaterZero))) smallestGreaterZero=xvsgz; #define SmallestGreaterZeroCompare_xvsgz() if ((xvsgz>10.0*DBL_MIN)&&((smallestGreaterZero<10.0*DBL_MIN) || (xvsgz<smallestGreaterZero))) smallestGreaterZero=xvsgz;

0
lib/jkqtplotter/jkqtpgraphsimpulses.h → lib/jkqtplotter/graphs/jkqtpimpulses.h
View File

4
lib/jkqtplotter/jkqtpgraphsparsedfunction.cpp → lib/jkqtplotter/graphs/jkqtpparsedfunction.cpp
View File

@ -17,8 +17,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/graphs/jkqtpparsedfunction.h"
#include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/graphs/jkqtpscatter.h"
#include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtpbaseplotter.h"
#include "jkqtplotter/jkqtplotter.h" #include "jkqtplotter/jkqtplotter.h"
#include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtptools.h"

Some files were not shown because too many files have changed in this diff Show More