diff --git a/CMakeLists.txt b/CMakeLists.txt index b6cfb6e80d..d1ada946c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,11 +19,15 @@ endif() if(NOT DEFINED BUILD_EXAMPLES) option(BUILD_EXAMPLES "Build examples" ON) endif() +if(NOT DEFINED BUILD_HAS_OPENCV) + option(BUILD_HAS_OPENCV "OpenCV available?" OFF) +endif() if(NOT DEFINED LIB_INSTALL) option(LIB_INSTALL "Install library" ON) endif() + if(NOT DEFINED CMAKE_INSTALL_PREFIX) - option(CMAKE_INSTALL_PREFIX "Install directory" ${CMAKE_CURRENT_SOURCE_DIR}/instal) + option(CMAKE_INSTALL_PREFIX "Install directory" ${CMAKE_CURRENT_SOURCE_DIR}/install) endif() @@ -36,9 +40,13 @@ if (NOT WIN32) include(GNUInstallDirs) endif(NOT WIN32) -# Instruct CMake to run moc+rcc automatically when needed. +# Instruct CMake to run moc+rcc+uic automatically when needed. set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +# Find includes in the build directories +set(CMAKE_INCLUDE_CURRENT_DIR ON) # Set a default build type if none was specified if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) @@ -61,7 +69,8 @@ if (NOT CMAKE_INSTALL_INCLUDEDIR) endif() -find_package(Qt5 5.0 REQUIRED Core Gui Widgets PrintSupport) +find_package(Qt5 5.0 REQUIRED Core Gui Widgets PrintSupport Svg Xml OpenGl) + set (CMAKE_CXX_STANDARD 11) @@ -93,8 +102,16 @@ endif() +# place all DLLs and EXEs in the subdirectory output of the top level directory of the build tree +set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output) +set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output) + + + add_subdirectory(lib) if(BUILD_EXAMPLES) - #add_subdirectory(examples) + add_subdirectory(examples) endif() + + diff --git a/JKQtPlotterBuildAllExamples.pro b/JKQtPlotterBuildAllExamples.pro index 47119df0c4..c2352f7c69 100644 --- a/JKQtPlotterBuildAllExamples.pro +++ b/JKQtPlotterBuildAllExamples.pro @@ -15,17 +15,17 @@ SUBDIRS += jkqtplotterlib \ jkqtfastplotter_test -jkqtplotterlib.file = staticlib/jkqtplotterlib/jkqtplotterlib.pro -jkqtplotterlib_sharedlib.file = sharedlib/jkqtplotterlib/jkqtplotterlib.pro +jkqtplotterlib.file = qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro +jkqtplotterlib_sharedlib.file = qmake/sharedlib/jkqtplotterlib/jkqtplotterlib.pro -jkqtmathtextlib.file = staticlib/jkqtmathtextlib/jkqtmathtextlib.pro -jkqtmathtextlib_sharedlib.file = sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro +jkqtmathtextlib.file = qmake/staticlib/jkqtmathtextlib/jkqtmathtextlib.pro +jkqtmathtextlib_sharedlib.file = qmake/sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro -jkqtpcommonlib.file = staticlib/jkqtpcommonlib/jkqtpcommonlib.pro -jkqtpcommonlib_sharedlib.file = sharedlib/jkqtpcommonlib/jkqtpcommonlib.pro +jkqtpcommonlib.file = qmake/staticlib/jkqtpcommonlib/jkqtpcommonlib.pro +jkqtpcommonlib_sharedlib.file = qmake/sharedlib/jkqtpcommonlib/jkqtpcommonlib.pro -jkqtfastplotterlib.file = staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro -jkqtfastplotterlib_sharedlib.file = sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro +jkqtfastplotterlib.file = qmake/staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro +jkqtfastplotterlib_sharedlib.file = qmake/sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro jkqtmathtext_simpletest.subdir = examples/jkqtmathtext_simpletest jkqtmathtext_simpletest.depends = jkqtmathtextlib @@ -44,13 +44,13 @@ jkqtfastplotter_test.depends = jkqtfastplotterlib defineTest(addSimpleTest) { test_name = $$1 - SUBDIRS += jkqtplotter_simpletest_$${test_name} + SUBDIRS += jkqtptst_$${test_name} - jkqtplotter_simpletest_$${test_name}.file = examples/simpletest_$${test_name}/jkqtplotter_simpletest_$${test_name}.pro - jkqtplotter_simpletest_$${test_name}.depends = jkqtplotterlib + jkqtptst_$${test_name}.file = examples/$${test_name}/$${test_name}.pro + jkqtptst_$${test_name}.depends = jkqtplotterlib - export (jkqtplotter_simpletest_$${test_name}.file) - export (jkqtplotter_simpletest_$${test_name}.depends) + export (jkqtptst_$${test_name}.file) + export (jkqtptst_$${test_name}.depends) export (SUBDIRS) } @@ -96,7 +96,7 @@ defineTest(addTest) { test_name = $$1 SUBDIRS += test_$${test_name} - test_$${test_name}.file = examples/test_$${test_name}/test_$${test_name}.pro + test_$${test_name}.file = examples/$${test_name}/test_$${test_name}.pro test_$${test_name}.depends = jkqtplotterlib export (test_$${test_name}.file) diff --git a/README.md b/README.md index 416d4dd995..11a83b3cc8 100644 --- a/README.md +++ b/README.md @@ -61,8 +61,8 @@ The [Screenshots-page](./screenshots/) contains several screenshots, partly take ## Building Building instructions can be found here: - include necessary files into QMake project: [`./lib/*.pri`](./lib/README.md) -- [build a static library](./staticlib): [`./staticlib/*.pro`](./staticlib/README.md) -- [build a shared library (DLL, SO, ...)](./sharedlib): [`./sharedlib/*.pro`](./sharedlib/README.md) +- [build a static library](./staticlib): [`./qmake/staticlib/*.pro`](./qmake/staticlib/README.md) +- [build a shared library (DLL, SO, ...)](./sharedlib): [`./qmake/sharedlib/*.pro`](./qmake/sharedlib/README.md) ## Continuous Integration Status diff --git a/doc/dox/buildinstructions.dox b/doc/dox/buildinstructions.dox index 33de11bb4e..7ef279a9bb 100644 --- a/doc/dox/buildinstructions.dox +++ b/doc/dox/buildinstructions.dox @@ -21,9 +21,9 @@ include(/lib/jkqtplotter.pri) \subsection page_buildinstructions_QMAKESTATIC QMake Static Library There are several `.PRO`-files, that can be used to build the full library, or a limited subsets of it as static link library: - - staticlib/jkqtplotterlib/jkqtplotterlib.pro builds the complete library (JKQTPlotter, JKQTFastPlotter, JKQTMathText) as static link library - - staticlib/jkqtmathtextlib/jkqtmathtextlib.pro builds only JKQTMathText as static link library - - staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro builds only JKQTFastPlotter as static link library + - qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro builds the complete library (JKQTPlotter, JKQTFastPlotter, JKQTMathText) as static link library + - qmake/staticlib/jkqtmathtextlib/jkqtmathtextlib.pro builds only JKQTMathText as static link library + - qmake/staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro builds only JKQTFastPlotter as static link library . They will produce a static link library that you can include into your projects, e.g. with the following QMake-snippet: @@ -31,14 +31,14 @@ They will produce a static link library that you can include into your projects, # include JKQTPlotter library DEPENDPATH += \ /lib \ - /staticlib/jkqtplotterlib + /qmake/staticlib/jkqtplotterlib INCLUDEPATH += /lib CONFIG (debug, debug|release) { - DEPENDPATH += /staticlib/jkqtplotterlib/debug - LIBS += -L/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + DEPENDPATH += /qmake/staticlib/jkqtplotterlib/debug + LIBS += -L/qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - DEPENDPATH += /staticlib/jkqtplotterlib/release - LIBS += -L/staticlib/jkqtplotterlib/release -ljkqtplotterlib + DEPENDPATH += /qmake/staticlib/jkqtplotterlib/release + LIBS += -L/qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } \endcode @@ -47,7 +47,7 @@ This snippet assumes that you built the libraries with the provided `.PRO`-files TEMPLATE = subdirs # the (static library version) of JKQTPlotter -jkqtplotterlib_static.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro +jkqtplotterlib_static.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro # your project file, with declared dependencies on jkqtplotterlib_static test_styling.file=$$PWD/test_styling.pro @@ -62,9 +62,9 @@ SUBDIRS += jkqtplotterlib_static test_styling \subsection page_buildinstructions_QMAKEDYNAMIC QMake Dynamic Library There are several `.PRO`-files, that can be used to build the full library, or a limited subsets of it as shred library: - - sharedlib/jkqtplotterlib/jkqtplotterlib.pro builds the complete library (JKQTPlotter, JKQTFastPlotter, JKQTMathText) as shared library - - sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro builds only JKQTMathText as shared library - - sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro builds only JKQTFastPlotter as shared library + - qmake/sharedlib/jkqtplotterlib/jkqtplotterlib.pro builds the complete library (JKQTPlotter, JKQTFastPlotter, JKQTMathText) as shared library + - qmake/sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro builds only JKQTMathText as shared library + - qmake/sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro builds only JKQTFastPlotter as shared library . They will produce a dynamic link library that you can include into your projects, e.g. with the following QMake-snippet: @@ -72,24 +72,24 @@ They will produce a dynamic link library that you can include into your projects # include JKQTPlotter library DEPENDPATH += \ /lib \ - /sharedlib/jkqtplotterlib + /qmake/sharedlib/jkqtplotterlib INCLUDEPATH += /lib CONFIG (debug, debug|release) { # ensure that DLLs are copied to the output directory - install_jkqtplotter_dll.files = /sharedlib/jkqtplotterlib/debug/jkqtplotterlib_debug.* + install_jkqtplotter_dll.files = /qmake/sharedlib/jkqtplotterlib/debug/jkqtplotterlib_debug.* install_jkqtplotter_dll.path = $$OUT_PWD INSTALLS += install_jkqtplotter_dll # link agains DLLs - DEPENDPATH += /sharedlib/jkqtplotterlib/debug - LIBS += -L/sharedlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + DEPENDPATH += /qmake/sharedlib/jkqtplotterlib/debug + LIBS += -L/qmake/sharedlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { # ensure that DLLs are copied to the output directory - install_jkqtplotter_dll.files = /sharedlib/jkqtplotterlib/release/jkqtplotterlib.* + install_jkqtplotter_dll.files = /qmake/sharedlib/jkqtplotterlib/release/jkqtplotterlib.* install_jkqtplotter_dll.path = $$OUT_PWD INSTALLS += install_jkqtplotter_dll # link agains DLLs - DEPENDPATH += /sharedlib/jkqtplotterlib/release - LIBS += -L/sharedlib/jkqtplotterlib/release -ljkqtplotterlib + DEPENDPATH += /qmake/sharedlib/jkqtplotterlib/release + LIBS += -L/qmake/sharedlib/jkqtplotterlib/release -ljkqtplotterlib } \endcode @@ -98,7 +98,7 @@ This snippet assumes that you built the libraries with the provided `.PRO`-files TEMPLATE = subdirs # the (shared library version) of JKQTPlotter -jkqtplotterlib_shared.file = ../../sharedlib/jkqtplotterlib.pro +jkqtplotterlib_shared.file = ../../qmake/sharedlib/jkqtplotterlib.pro # your project file, with declared dependencies on jkqtplotterlib_shared test_styling.file=$$PWD/test_styling.pro diff --git a/doc/dox/examples_and_tutorials.dox b/doc/dox/examples_and_tutorials.dox index 81674e058b..a0ed0a23ac 100644 --- a/doc/dox/examples_and_tutorials.dox +++ b/doc/dox/examples_and_tutorials.dox @@ -14,55 +14,55 @@ All test-projects are Qt-projects that use qmake to build. You can load them int \image html jkqtplotter_simpletest1_small.png \subpage JKQTPlotterSimpleTest `JKQTPXYLineGraph`
C++-style QVector arrays of data - \image html jkqtplotter_simpletest_speed_small.png + \image html speed_small.png \subpage JKQTPlotterSpeedTest `JKQTPXYLineGraph`
external `std::array` data, not owned by datastore
live-data, measure plotting speed
tipps to increas plotting speed - \image html jkqtplotter_simpletest_symbols_and_styles_small.png + \image html symbols_and_styles_small.png \subpage JKQTPlotterSymbolsAndStyles `JKQTPXYLineGraph`
C++ vector of data
setting line styles and symbol styles
automatic graph coloring - \image html jkqtplotter_simpletest_stepplots_small.png + \image html stepplots_small.png \subpage JKQTPlotterSpecialStepLinePlot `JKQTPSpecialLineHorizontalGraph`
C++ vector of data
different step/special line modes, filled and line-only - \image html jkqtplotter_simpletest_symbols_and_errors_small.png + \image html symbols_and_errors_small.png \subpage JKQTPlotterSymbolsErrors `JKQTPXYLineErrorGraph`
C-style arrays of data - \image html jkqtplotter_simpletest_errorbarstyles_small.png + \image html errorbarstyles_small.png \subpage JKQTPlotterErrorBarStyles `JKQTPXYLineErrorGraph`
different styles of error indicators for x- and y-errors
C++-style QVector for data
styling error indicators
moving key and formatting plotter grid - \image html jkqtplotter_simpletest_barchart_small.png + \image html barchart_small.png \subpage JKQTPlotterBarcharts `JKQTPBarVerticalGraph`
C-style arrays of data \image html JKQTPBarHorizontalGraphStacked_small.png \subpage JKQTPlotterStackedBarChart `JKQTPBarVerticalStackableGraph`, `JKQTPBarHorizontalStackableGraph`
C++-style vectors of data - \image html jkqtplotter_simpletest_filledgraphs_small.png + \image html filledgraphs_small.png \subpage JKQTPlotterFilledGraphs `JKQTPBarVerticalGraph`
setting/altering data in `JKQTPDatstore` directly
transparent plots
calculating histograms - \image html jkqtplotter_simpletest_impulsesplot_small.png + \image html impulsesplot_small.png \subpage JKQTPlotterImpulsePlots `JKQTPImpulsesVerticalGraph` and `JKQTPImpulsesHorizontalGraph`
C++-style QVector as plot data - \image html jkqtplotter_simpletest_paramscatterplot_small.png + \image html paramscatterplot_small.png \subpage JKQTPlotterParamScatter `JKQTPXYParametrizedScatterGraph`
C++-style QVector as plot data
modify scatter/points/line-graph properties by data - \image html jkqtplotter_simpletest_paramscatterplot_image_small.png + \image html paramscatterplot_image_small.png \subpage JKQTPlotterParamScatterImage `JKQTPXYParametrizedScatterGraph`
C++-style QVector as plot data
rectangular arrangement of scatters
generative computer graphics - \image html jkqtplotter_simpletest_parametriccurve_small.png + \image html parametriccurve_small.png \subpage JKQTPlotterParametricCurves `JKQTPXYLineGraph` and `JKQTPXYParametrizedScatterGraph`
C++-style QVector as plot data
parametric curve plotting - \image html jkqtplotter_simpletest_functionplot_small.png + \image html functionplot_small.png \subpage JKQTPlotterFunctionPlots `JKQTPXFunctionLineGraph`
diretly plotting C/C++-functions - \image html jkqtplotter_simpletest_parsedfunctionplot_small.png + \image html parsedfunctionplot_small.png \subpage JKQTPlotterParsedFunctionPlot `JKQTPXParsedFunctionLineGraph`
plotting functions with the internal math equation parser/evaluator - \image html jkqtplotter_simpletest_geometric_small.png + \image html geometric_small.png \subpage JKQTPlotterGeometricGraphs `JKQTPPlotObject`, `JKQTPGeoArc`, `JKQTPGeoLine`, `JKQTPGeoRectangle`, ... - \image html jkqtplotter_simpletest_boxplot_small.png + \image html boxplot_small.png \subpage JKQTPlotterBoxplotsGraphs `JKQTPBoxplotVerticalGraph`, `JKQTPBoxplotHorizontalGraph`, ... - \image html jkqtplotter_simpletest_violinplot_small.png + \image html violinplot_small.png \subpage JKQTPlotterViolinplotGraphs `JKQTPViolinplotVerticalElement`, `JKQTPViolinplotHorizontalElement`, ... @@ -72,13 +72,13 @@ All test-projects are Qt-projects that use qmake to build. You can load them int - -
Screenshot Description Notes -
\image html jkqtplotter_simpletest_logaxes_small.png +
\image html logaxes_small.png \subpage JKQTPlotterLogAxes `JKQTPXYLineGraph` and `JKQTPGeoText`
C++ vector of data
logarithmic axes and styling
plot line styles
internal LaTeX parser
add commenting text to a graph -
\image html jkqtplotter_simpletest_dateaxes_timeaxis_small.png +
\image html dateaxes_timeaxis_small.png \subpage JKQTPlotterDateTimeAxes `JKQTPXYLineGraph` and `JKQTPFilledVerticalRangeGraph`
C++ vector of data
date/time axes
plot min/max range graph
internal LaTeX parser
data from CSV files -
\image html jkqtplotter_simpletest_advancedlineandfillstyling_small.png +
\image html advancedlineandfillstyling_small.png \subpage JKQTPlotterAdvancedLineAndFillStyling `JKQTPXYLineGraph`, `JKQTPSpecialLineHorizontalGraph` and `JKQTPBarVerticalGraph`
C++ vector of data
advanced line styling and filling
\image html test_styledboxplot_small.png @@ -95,28 +95,28 @@ All test-projects are Qt-projects that use qmake to build. You can load them int
Screenshot Description Notes -
\image html jkqtplotter_simpletest_rgbimageplot_qt_small.png +
\image html rgbimageplot_qt_small.png \subpage JKQTPlotterImagePlotQImageRGB `JKQTPImage`
`QImage` drawn onto a plot with arbitrary scaling
inverted coordinate axes -
\image html jkqtplotter_simpletest_imageplot_small.png +
\image html imageplot_small.png \subpage JKQTPlotterImagePlot `JKQTPColumnMathImage`
image data copied from C-style row-major array into a single column of the internal datastore
Describes several options of the image plotting classes (different ways of color coding, what to do with data above/below the limits etc.) -
\image html jkqtplotter_simpletest_imageplot_modifier_small.png +
\image html imageplot_modifier_small.png \subpage JKQTPlotterImagePlotModifier `JKQTPColumnMathImage`
image data copied from C-style row-major array into a single column of the internal datastore
Image is modified by a second image to display two data dimensions at the same time -
\image html jkqtplotter_simpletest_imageplot_nodatastore_small.png +
\image html imageplot_nodatastore_small.png \subpage JKQTPlotterImagePlotNoDatastore `JKQTPMathImage`
image data in a C-style row-major array, not using internal datastore -
\image html jkqtplotter_simpletest_rgbimageplot_small.png +
\image html rgbimageplot_small.png \subpage JKQTPlotterRGBImagePlot `JKQTPColumnRGBMathImage`
image data in a C-style row-major array, not using internal datastore
RGB/CMY color compositing -
\image html jkqtplotter_simpletest_imageplot_opencv_small.png +
\image html imageplot_opencv_small.png \subpage JKQTPlotterImagePlotOpenCV `JKQTPColumnMathImage`
image data copied from OpenCV cv::Mat-structure into a single column of the internal datastore -
\image html jkqtplotter_simpletest_rgbimageplot_opencv_small.png +
\image html rgbimageplot_opencv_small.png \subpage JKQTPlotterImagePlotRGBOpenCV `JKQTPColumnRGBMathImage`
image data copied from OpenCV cv::Mat-structure into three columns of the internal datastore
inverted coordinate axes -
\image html jkqtplotter_simpletest_contourplot_small.png +
\image html contourplot_small.png \subpage JKQTPlotterContourPlot `JKQTPColumnContourPlot`
image data edited inside JKQTPDatastore
@@ -127,7 +127,7 @@ All test-projects are Qt-projects that use qmake to build. You can load them int - - -
Screenshot Description Notes -
\image html jkqtplotter_simpletest_ui_small.png +
\image html ui_small.png \subpage JKQTPlotterQtCreator using Qt Form Designer
parsed function plots (`JKQTPXParsedFunctionLineGraph`)
\image html jkqtplotter_test_user_interaction_small.gif @@ -153,22 +153,22 @@ All test-projects are Qt-projects that use qmake to build. You can load them int
Screenshot Description Notes -
\image html simpletest_datastore_small.png +
\image html datastore_small.png \subpage JKQTPlotterBasicJKQTPDatastore Basic Data Management with JKQTPDatastore
Copying data into a JKQTPDatastore
Editing data inside a JKQTPDatastore
Editing Image Data in a JKQTPDatastore -
\image html simpletest_datastore_iterators_small.png +
\image html datastore_iterators_small.png \subpage JKQTPlotterBasicJKQTPDatastoreIterators Iterator-based Data Management with JKQTPDatastore -
\image html jkqtplotter_simpletest_datastore_statistics_small.png +
\image html datastore_statistics_small.png \subpage JKQTPlotterBasicJKQTPDatastoreStatistics Advanced 1-Dimensional Statistical Computation with JKQTPDatastore
using the internal statistics library (see \ref jkqtptools_math_statistics )
basic statistics (mean, standard deviation, ...)
boxplots
histograms
kernel density estimates (KDE) -
\image html jkqtplotter_simpletest_datastore_regression_small.png +
\image html datastore_regression_small.png \subpage JKQTPlotterBasicJKQTPDatastoreRegression Advanced 1-Dimensional Statistical Computation with JKQTPDatastore
using the internal statistics library
Regression Analysis (with the Statistics Library)
robust regression (IRLS)
weighted regression
non-linear regression
polynomial fitting -
\image html jkqtplotter_simpletest_datastore_groupedstat_small.png +
\image html datastore_groupedstat_small.png \subpage JKQTPlotterBasicJKQTPDatastoreStatisticsGroupedStat Advanced 1-Dimensional Statistical Computation with JKQTPDatastore
grouped statistics
error indicators from data
boxplots -
\image html jkqtplotter_simpletest_datastore_statistics_2d_small.png +
\image html datastore_statistics_2d_small.png \subpage JKQTPlotterBasicJKQTPDatastoreStatistics2D Advanced 2-Dimensional Statistical Computation with JKQTPDatastore
using the internal statistics library (see \ref jkqtptools_math_statistics )
histograms
kernel density estimates (KDE)
diff --git a/doc/dox/jkqtplotter.dox b/doc/dox/jkqtplotter.dox index cb569b085b..04ede701ba 100644 --- a/doc/dox/jkqtplotter.dox +++ b/doc/dox/jkqtplotter.dox @@ -260,13 +260,13 @@ This group assembles graphs that show their data with symbols and optionally wit 		\image html beeswarmplot_small.png JKQTPSingleColumnSymbolsGraph
\image html jkqtplotter_simpletest_symbols_and_styles_small.png + \image html symbols_and_styles_small.png JKQTPXYLineGraph, JKQTPXYLineErrorGraph
\image html jkqtplotter_simpletest_paramscatterplot_small.png + \image html paramscatterplot_small.png JKQTPXYParametrizedScatterGraph, JKQTPXYParametrizedErrorScatterGraph
\image html jkqtplotter_simpletest_stepplots_small.png + \image html stepplots_small.png JKQTPSpecialLineHorizontalGraph, JKQTPSpecialLineVerticalGraph
@@ -281,10 +281,10 @@ This group assembles graphs that show their data with symbols and optionally wit 		\image html beeswarmplot_small.png JKQTPSingleColumnSymbolsGraph
\image html jkqtplotter_simpletest_symbols_and_styles_small.png + \image html symbols_and_styles_small.png JKQTPXYLineGraph, JKQTPXYLineErrorGraph
\image html jkqtplotter_simpletest_stepplots_small.png + \image html stepplots_small.png JKQTPSpecialLineHorizontalGraph, JKQTPSpecialLineVerticalGraph
@@ -297,7 +297,7 @@ This group assembles graphs that show their data with symbols and optionally wit Screenshot Classes - \image html jkqtplotter_simpletest_paramscatterplot_small.png + \image html paramscatterplot_small.png JKQTPXYParametrizedScatterGraph, JKQTPXYParametrizedErrorScatterGraph @@ -309,7 +309,7 @@ This group assembles graphs that show their data with symbols and optionally wit Screenshot Classes - \image html jkqtplotter_simpletest_filledgraphs_small.png + \image html filledgraphs_small.png JKQTPFilledCurveXGraph, JKQTPFilledCurveYGraph \image html plot_filledcurvexerrorplots_small.png @@ -327,7 +327,7 @@ This group assembles graphs that show their data with symbols and optionally wit Screenshot Classes - \image html jkqtplotter_simpletest_functionplot_small.png + \image html functionplot_small.png JKQTPXParsedFunctionLineGraph, JKQTPYParsedFunctionLineGraph @@ -339,7 +339,7 @@ This group assembles graphs that show their data with symbols and optionally wit Screenshot Classes - \image html jkqtplotter_simpletest_functionplot_small.png + \image html functionplot_small.png JKQTPXFunctionLineGraph, JKQTPYFunctionLineGraph @@ -351,7 +351,7 @@ This group assembles graphs that show their data with symbols and optionally wit Screenshot Classes - \image html jkqtplotter_simpletest_barchart_small.png + \image html barchart_small.png JKQTPBarVerticalGraph, JKQTPBarHorizontalGraph \image html barchart_error_small.png @@ -360,7 +360,7 @@ This group assembles graphs that show their data with symbols and optionally wit \image html JKQTPbarVerticalGraphStacked_small.png JKQTPBarVerticalStackableGraph, JKQTPBarHorizontalStackableGraph - \image html jkqtplotter_simpletest_impulsesplot_small.png + \image html impulsesplot_small.png JKQTPImpulsesHorizontalGraph, JKQTPImpulsesVerticalGraph \image html impulses_errors_small.png @@ -375,7 +375,7 @@ This group assembles graphs that show their data with symbols and optionally wit Screenshot Classes - \image html jkqtplotter_simpletest_boxplot_small.png + \image html boxplot_small.png JKQTPBoxplotVerticalGraph, JKQTPBoxplotHorizontalGraph \image html JKQTPViolinplotVerticalElement_small.png @@ -453,7 +453,7 @@ Examples: Screenshot Classes - \image html jkqtplotter_simpletest_rgbimageplot_qt_small.png + \image html rgbimageplot_qt_small.png JKQTPImage \image html JKQTPMathImageBaseModifyNone_small.png @@ -481,13 +481,13 @@ Examples: Screenshot Classes - \image html jkqtplotter_simpletest_rgbimageplot_qt_small.png + \image html rgbimageplot_qt_small.png JKQTPImage \image html JKQTPMathImageBaseModifyNone_small.png JKQTPMathImage, JKQTPColumnMathImage - \image html jkqtplotter_simpletest_rgbimageplot_opencv_small.png + \image html rgbimageplot_opencv_small.png JKQTPRGBMathImage, JKQTPColumnRGBMathImage diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt new file mode 100644 index 0000000000..722ca29778 --- /dev/null +++ b/examples/CMakeLists.txt @@ -0,0 +1,56 @@ +cmake_minimum_required(VERSION 3.0) + +message( STATUS ) +message( STATUS "............................................................................." ) +message( STATUS ".. BUILDING EXAMPLES" ) +message( STATUS "............................................................................." ) + +add_subdirectory(jkqtfastplotter_test) + +add_subdirectory(jkqtmathtext_simpletest) +add_subdirectory(jkqtmathtext_test) + + +add_subdirectory(advancedlineandfillstyling) +add_subdirectory(barchart) +add_subdirectory(boxplot) +add_subdirectory(contourplot) +add_subdirectory(datastore) +add_subdirectory(datastore_groupedstat) +add_subdirectory(datastore_iterators) +add_subdirectory(datastore_regression) +add_subdirectory(datastore_statistics) +add_subdirectory(datastore_statistics_2d) +add_subdirectory(dateaxes) +add_subdirectory(distributionplot) +add_subdirectory(errorbarstyles) +add_subdirectory(filledgraphs) +add_subdirectory(functionplot) +add_subdirectory(geometric) +add_subdirectory(imageplot) +add_subdirectory(imageplot_modifier) +add_subdirectory(imageplot_nodatastore) +add_subdirectory(imageplot_opencv) +add_subdirectory(impulsesplot) +add_subdirectory(logaxes) +add_subdirectory(multiplot) +add_subdirectory(parametriccurve) +add_subdirectory(paramscatterplot) +add_subdirectory(paramscatterplot_image) +add_subdirectory(parsedfunctionplot) +add_subdirectory(rgbimageplot) +add_subdirectory(rgbimageplot_opencv) +add_subdirectory(rgbimageplot_qt) +add_subdirectory(simpletest) +add_subdirectory(speed) +add_subdirectory(stackedbars) +add_subdirectory(stepplots) +add_subdirectory(styledboxplot) +add_subdirectory(styling) +add_subdirectory(symbols_and_errors) +add_subdirectory(symbols_and_styles) +add_subdirectory(ui) +add_subdirectory(user_interaction) +add_subdirectory(violinplot) + + diff --git a/examples/README.md b/examples/README.md index dfb1e9cd40..6d00c1746b 100644 --- a/examples/README.md +++ b/examples/README.md @@ -8,31 +8,31 @@ All test-projects are Qt-projects that use qmake to build. You can load them int | Screenshot | Description | Notes | |:-------------:| ------------- | ------------- | | [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest1_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest/README.md) | [Very Basic Example (Line Graph)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest/README.md) | `JKQTPXYLineGraph`
C++-style QVector arrays of data | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_speed_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_speed) | [Line Graph with Live Data / Speed Test](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_speed) | `JKQTPXYLineGraph`
external `std::array` data, not owned by datastore
live-data, measure plotting speed
tipps to increas plotting speed | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_symbols_and_styles_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_symbols_and_styles) | [Line Graph with Different Symbols and Line Styles](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_symbols_and_styles) | `JKQTPXYLineGraph`
C++ vector of data
setting line styles and symbol styles
automatic graph coloring | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_stepplots_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_stepplots) | [Special Step Line Plots in Different Styles](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_stepplots) | `JKQTPSpecialLineHorizontalGraph`
C++ vector of data
different step modes, filled and line-only | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_symbols_and_errors_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_symbols_and_errors) | [Simple Line/Symbol Graph With Errorbars](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_symbols_and_errors) | `JKQTPXYLineErrorGraph`
C-style arrays of data | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_errorbarstyles_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_errorbarstyles) | [Different Types of Error Indicators](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_errorbarstyles) | `JKQTPXYLineErrorGraph`
different styles of error indicators for x- and y-errors
C++-style QVector for data
styling error indicators
moving key and formatting plotter grid | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_barchart_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_barchart) | [Simple Bar Charts](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_barchart) | `JKQTPBarVerticalGraph`
C-style arrays of data | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/JKQTPbarHorizontalGraphStacked_small.png)
![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/JKQTPbarVerticalGraphStacked_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_stackedbars) | [Stacked Bar Charts](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_stackedbars) | `JKQTPBarVerticalStackableGraph`, `JKQTPBarHorizontalStackableGraph`
C++-style vectors of data | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_filledgraphs_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_filledgraphs) | [Filled Curve Plots](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_filledgraphs) | `JKQTPBarVerticalGraph`
setting/altering data in `JKQTPDatstore` directly
transparent plots
calculating histograms | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_impulsesplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_impulsesplot) | [Impulse Plots](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_impulsesplot) | `JKQTPImpulsesVerticalGraph` and `JKQTPImpulsesHorizontalGraph`
C++-style QVector as plot data | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_paramscatterplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_paramscatterplot) | [Scatter Graph with Parametrized Symbols/Colors](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_paramscatterplot) | `JKQTPXYParametrizedScatterGraph`
C++-style QVector as plot data
modify scatter/points/line-graph properties by data | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_paramscatterplot_image_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_paramscatterplot_image) | [Draw an Artistic Image with a Parametrized Scatter Graph](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_paramscatterplot_image) | `JKQTPXYParametrizedScatterGraph`
C++-style QVector as plot data
rectangular arrangement of scatters
generative computer graphics | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_parametriccurve_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_parametriccurve) | [Plotting Parametric Curves](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_parametriccurve) | `JKQTPXYLineGraph` and `JKQTPXYParametrizedScatterGraph`
C++-style QVector as plot data
parametric curve plotting | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_functionplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_functionplot) | [Plotting Mathematical Functions as Line Graphs](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_functionplot) | `JKQTPXFunctionLineGraph`
diretly plotting C/C++-functions | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_parsedfunctionplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_parsedfunctionplot) | [Plotting Parsed Mathematical Functions as Line Graphs](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_parsedfunctionplot) | `JKQTPXParsedFunctionLineGraph`
plotting functions with the internal math equation parser/evaluator | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_geometric_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_geometric) | [Plotting Geometric Objects](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_geometric) | | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_boxplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_boxplot) | [Plotting Box Plots](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_boxplot) | `JKQTPBoxplotVerticalGraph`, `JKQTPBoxplotHorizontalGraph` | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_violinplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_violinplot) | [Plotting Violin Plots](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_violinplot) | `JKQTPViolinplotVerticalElement`, `JKQTPViolinplotHorizontalElement` | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/speed_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/speed) | [Line Graph with Live Data / Speed Test](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/speed) | `JKQTPXYLineGraph`
external `std::array` data, not owned by datastore
live-data, measure plotting speed
tipps to increas plotting speed | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/symbols_and_styles_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/symbols_and_styles) | [Line Graph with Different Symbols and Line Styles](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/symbols_and_styles) | `JKQTPXYLineGraph`
C++ vector of data
setting line styles and symbol styles
automatic graph coloring | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/stepplots_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/stepplots) | [Special Step Line Plots in Different Styles](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/stepplots) | `JKQTPSpecialLineHorizontalGraph`
C++ vector of data
different step modes, filled and line-only | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/symbols_and_errors_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/symbols_and_errors) | [Simple Line/Symbol Graph With Errorbars](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/symbols_and_errors) | `JKQTPXYLineErrorGraph`
C-style arrays of data | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/errorbarstyles_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/errorbarstyles) | [Different Types of Error Indicators](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/errorbarstyles) | `JKQTPXYLineErrorGraph`
different styles of error indicators for x- and y-errors
C++-style QVector for data
styling error indicators
moving key and formatting plotter grid | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/barchart_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/barchart) | [Simple Bar Charts](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/barchart) | `JKQTPBarVerticalGraph`
C-style arrays of data | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/JKQTPbarHorizontalGraphStacked_small.png)
![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/JKQTPbarVerticalGraphStacked_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/stackedbars) | [Stacked Bar Charts](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/stackedbars) | `JKQTPBarVerticalStackableGraph`, `JKQTPBarHorizontalStackableGraph`
C++-style vectors of data | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/filledgraphs_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/filledgraphs) | [Filled Curve Plots](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/filledgraphs) | `JKQTPBarVerticalGraph`
setting/altering data in `JKQTPDatstore` directly
transparent plots
calculating histograms | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/impulsesplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/impulsesplot) | [Impulse Plots](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/impulsesplot) | `JKQTPImpulsesVerticalGraph` and `JKQTPImpulsesHorizontalGraph`
C++-style QVector as plot data | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/paramscatterplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/paramscatterplot) | [Scatter Graph with Parametrized Symbols/Colors](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/paramscatterplot) | `JKQTPXYParametrizedScatterGraph`
C++-style QVector as plot data
modify scatter/points/line-graph properties by data | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/paramscatterplot_image_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/paramscatterplot_image) | [Draw an Artistic Image with a Parametrized Scatter Graph](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/paramscatterplot_image) | `JKQTPXYParametrizedScatterGraph`
C++-style QVector as plot data
rectangular arrangement of scatters
generative computer graphics | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/parametriccurve_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/parametriccurve) | [Plotting Parametric Curves](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/parametriccurve) | `JKQTPXYLineGraph` and `JKQTPXYParametrizedScatterGraph`
C++-style QVector as plot data
parametric curve plotting | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/functionplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/functionplot) | [Plotting Mathematical Functions as Line Graphs](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/functionplot) | `JKQTPXFunctionLineGraph`
diretly plotting C/C++-functions | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/parsedfunctionplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/parsedfunctionplot) | [Plotting Parsed Mathematical Functions as Line Graphs](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/parsedfunctionplot) | `JKQTPXParsedFunctionLineGraph`
plotting functions with the internal math equation parser/evaluator | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/geometric_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/geometric) | [Plotting Geometric Objects](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/geometric) | | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/boxplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/boxplot) | [Plotting Box Plots](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/boxplot) | `JKQTPBoxplotVerticalGraph`, `JKQTPBoxplotHorizontalGraph` | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/violinplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/violinplot) | [Plotting Violin Plots](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/violinplot) | `JKQTPViolinplotVerticalElement`, `JKQTPViolinplotHorizontalElement` | ## Styling the Plot, Keys, Axes, ... | Screenshot | Description | Notes | |:-------------:| ------------- | ------------- | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_logaxes_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_logaxes) | [logarithmic axes](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_logaxes) | `JKQTPXYLineGraph` and `JKQTPGeoText`
C++ vector of data
logarithmic axes and styling
plot line styles
internal LaTeX parser
add commenting text to a graph | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_dateaxes_small.png)
![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_dateaxes_dates_small.png)
![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_dateaxes_timeaxis_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_dateaxes) | [date/time axes](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_dateaxes) | `JKQTPXYLineGraph` and `JKQTPFilledVerticalRangeGraph`
C++ vector of data
date/time axes
plot min/max range graph
internal LaTeX parser
data from CSV files | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_advancedlineandfillstyling_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_advancedlineandfillstyling) | [advanced line and fill styling](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_advancedlineandfillstyling) | `JKQTPXYLineGraph`, `JKQTPSpecialLineHorizontalGraph` and `JKQTPBarVerticalGraph`
C++ vector of data
advanced line styling and filling | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/logaxes_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/logaxes) | [logarithmic axes](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/logaxes) | `JKQTPXYLineGraph` and `JKQTPGeoText`
C++ vector of data
logarithmic axes and styling
plot line styles
internal LaTeX parser
add commenting text to a graph | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/dateaxes_small.png)
![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/dateaxes_dates_small.png)
![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/dateaxes_timeaxis_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/dateaxes) | [date/time axes](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/dateaxes) | `JKQTPXYLineGraph` and `JKQTPFilledVerticalRangeGraph`
C++ vector of data
date/time axes
plot min/max range graph
internal LaTeX parser
data from CSV files | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/advancedlineandfillstyling_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/advancedlineandfillstyling) | [advanced line and fill styling](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/advancedlineandfillstyling) | `JKQTPXYLineGraph`, `JKQTPSpecialLineHorizontalGraph` and `JKQTPBarVerticalGraph`
C++ vector of data
advanced line styling and filling | | [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/test_styledboxplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/test_styledboxplot) | [Styling of Boxplots](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/test_styledboxplot) | Modifying different Aspects of the Styling of boxplots | | [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/test_styling_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/test_styling) | [Styling of JKQTPlotter](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/test_styling) | Modifying different Aspects of the Styling of JKQTPlotter | @@ -40,14 +40,14 @@ All test-projects are Qt-projects that use qmake to build. You can load them int | Screenshot | Description | Notes | |:-------------:| ------------- | ------------- | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_rgbimageplot_qt_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_rgbimageplot_qt) | [`QImage` as a Graph](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_rgbimageplot_qt) | `JKQTPImage`
`QImage` drawn onto a plot with arbitrary scaling
inverted coordinate axes | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_imageplot) | [Basic 1-channel Raw C Image Plot](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_imageplot) | `JKQTPColumnMathImage`
image data copied from C-style row-major array into a single column of the internal datastore
Describes several options of the image plotting classes (different ways of color coding, what to do with data above/below the limits etc.) | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot_modifier_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_imageplot_modifier) | [Modifier-Feature of Image Plots](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_imageplot_modifier) | `JKQTPColumnMathImage`
image data copied from C-style row-major array into a single column of the internal datastore
Image is modified by a second image to display two data dimensions at the same time | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot_nodatastore_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_imageplot_nodatastore) | [Basic 1-channel Raw C Image Plot
without the internal datastore](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_imageplot_nodatastore) | `JKQTPMathImage`
image data in a C-style row-major array, not using internal datastore | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_rgbimageplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/jkqtplotter_simpletest_rgbimageplot) | [Simple 3-channel Math RGB/CMY Image Plot](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/jkqtplotter_simpletest_rgbimageplot) | `JKQTPColumnRGBMathImage`
image data in a C-style row-major array, not using internal datastore
RGB/CMY color compositing | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot_opencv_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_imageplot_opencv) | [1-channel OpenCV cv::Mat Image Plot](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_imageplot_opencv) | `JKQTPColumnMathImage`
image data copied from OpenCV cv::Mat-structure into a single column of the internal datastore | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_rgbimageplot_opencv_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_rgbimageplot_opencv) | [RGB OpenCV cv::Mat Image Plot](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_rgbimageplot_opencv) | `JKQTPColumnRGBMathImage`
image data copied from OpenCV cv::Mat-structure into three columns
inverted coordinate axesof the internal datastore | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_contourplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_contourplot) | [Contour Plots](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_contourplot) | `JKQTPColumnContourPlot`
image data edited inside JKQTPDatastore | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/rgbimageplot_qt_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/rgbimageplot_qt) | [`QImage` as a Graph](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/rgbimageplot_qt) | `JKQTPImage`
`QImage` drawn onto a plot with arbitrary scaling
inverted coordinate axes | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/imageplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/imageplot) | [Basic 1-channel Raw C Image Plot](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/imageplot) | `JKQTPColumnMathImage`
image data copied from C-style row-major array into a single column of the internal datastore
Describes several options of the image plotting classes (different ways of color coding, what to do with data above/below the limits etc.) | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/imageplot_modifier_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/imageplot_modifier) | [Modifier-Feature of Image Plots](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/imageplot_modifier) | `JKQTPColumnMathImage`
image data copied from C-style row-major array into a single column of the internal datastore
Image is modified by a second image to display two data dimensions at the same time | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/imageplot_nodatastore_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/imageplot_nodatastore) | [Basic 1-channel Raw C Image Plot
without the internal datastore](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/imageplot_nodatastore) | `JKQTPMathImage`
image data in a C-style row-major array, not using internal datastore | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/rgbimageplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/rgbimageplot) | [Simple 3-channel Math RGB/CMY Image Plot](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/rgbimageplot) | `JKQTPColumnRGBMathImage`
image data in a C-style row-major array, not using internal datastore
RGB/CMY color compositing | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/imageplot_opencv_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/imageplot_opencv) | [1-channel OpenCV cv::Mat Image Plot](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/imageplot_opencv) | `JKQTPColumnMathImage`
image data copied from OpenCV cv::Mat-structure into a single column of the internal datastore | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/rgbimageplot_opencv_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/rgbimageplot_opencv) | [RGB OpenCV cv::Mat Image Plot](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/rgbimageplot_opencv) | `JKQTPColumnRGBMathImage`
image data copied from OpenCV cv::Mat-structure into three columns
inverted coordinate axesof the internal datastore | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/contourplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/contourplot) | [Contour Plots](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/contourplot) | `JKQTPColumnContourPlot`
image data edited inside JKQTPDatastore | @@ -55,7 +55,7 @@ All test-projects are Qt-projects that use qmake to build. You can load them int | Screenshot | Description | Notes | |:-------------:| ------------- | ------------- | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_ui_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_ui) | [Placing JKQTPlotter into a Qt User-Interface-XML-file (`*.ui`)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_ui) | using Qt Form Designer
parsed function plots (`JKQTPXParsedFunctionLineGraph`) | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/ui_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/ui) | [Placing JKQTPlotter into a Qt User-Interface-XML-file (`*.ui`)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/ui) | using Qt Form Designer
parsed function plots (`JKQTPXParsedFunctionLineGraph`) | | [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_test_user_interaction_small.gif)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/test_user_interaction) | [User Interaction](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/test_user_interaction) | different possibilities of user-interaction in JKQtPlotter | @@ -63,12 +63,12 @@ All test-projects are Qt-projects that use qmake to build. You can load them int | Screenshot | Description | Notes | |:-------------:| ------------- | ------------- | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/simpletest_datastore_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore) | [Tutorial: Basic Usage of JKQTPDatastore](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore) | Basic Data Management with JKQTPDatastore
Copying data into a JKQTPDatastore
Editing data inside a JKQTPDatastore
Editing Image Data in a JKQTPDatastore | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/simpletest_datastore_iterators_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore_iterators) | [Tutorial: Iterator-based access to JKQTPDatastore](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore_iterators) | Iterator-based Data Management with JKQTPDatastore | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_statistics_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore_statistics) | [Tutorial: Advanced 1-Dimensional Statistics with JKQTPDatastore](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore_statistics) | Advanced 1-Dimensional Statistical Computation with JKQTPDatastore
using the internal statistics library
basic statistics (mean, standard deviation, ...)
boxplots
histograms
kernel density estimates (KDE) | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_regression_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore_regression) | [Tutorial: Regression Analysis (with the Statistics Library)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore_regression) | Advanced 1-Dimensional Statistical Computation with JKQTPDatastore
using the internal statistics library
Regression Analysis (with the Statistics Library)
robust regression (IRLS)
weighted regression
non-linear regression
polynomial fitting | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_groupedstat_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore_groupedstat) | [Tutorial: 1-Dimensional Group Statistics (with the Statistics Library)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore_groupedstat) | Advanced 1-Dimensional Statistical Computation with JKQTPDatastore
grouped statistics
error indicators from data
boxplots | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_statistics_2d_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore_statistics_2d) | [Tutorial: Advanced 2-Dimensional Statistics with JKQTPDatastore](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore_statistics_2d) | Advanced 2-Dimensional Statistical Computation with JKQTPDatastore
using the internal statistics library
histograms
kernel density estimates (KDE) | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore) | [Tutorial: Basic Usage of JKQTPDatastore](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore) | Basic Data Management with JKQTPDatastore
Copying data into a JKQTPDatastore
Editing data inside a JKQTPDatastore
Editing Image Data in a JKQTPDatastore | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_iterators_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore_iterators) | [Tutorial: Iterator-based access to JKQTPDatastore](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore_iterators) | Iterator-based Data Management with JKQTPDatastore | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_statistics_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore_statistics) | [Tutorial: Advanced 1-Dimensional Statistics with JKQTPDatastore](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore_statistics) | Advanced 1-Dimensional Statistical Computation with JKQTPDatastore
using the internal statistics library
basic statistics (mean, standard deviation, ...)
boxplots
histograms
kernel density estimates (KDE) | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_regression_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore_regression) | [Tutorial: Regression Analysis (with the Statistics Library)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore_regression) | Advanced 1-Dimensional Statistical Computation with JKQTPDatastore
using the internal statistics library
Regression Analysis (with the Statistics Library)
robust regression (IRLS)
weighted regression
non-linear regression
polynomial fitting | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_groupedstat_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore_groupedstat) | [Tutorial: 1-Dimensional Group Statistics (with the Statistics Library)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore_groupedstat) | Advanced 1-Dimensional Statistical Computation with JKQTPDatastore
grouped statistics
error indicators from data
boxplots | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_statistics_2d_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore_statistics_2d) | [Tutorial: Advanced 2-Dimensional Statistics with JKQTPDatastore](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore_statistics_2d) | Advanced 2-Dimensional Statistical Computation with JKQTPDatastore
using the internal statistics library
histograms
kernel density estimates (KDE) | ## More Complex Examples diff --git a/examples/advancedlineandfillstyling/CMakeLists.txt b/examples/advancedlineandfillstyling/CMakeLists.txt new file mode 100644 index 0000000000..d5241b0186 --- /dev/null +++ b/examples/advancedlineandfillstyling/CMakeLists.txt @@ -0,0 +1,26 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME advancedlineandfillstyling) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES advancedlineandfillstyling.cpp ) +set(HEADERS ) +set(RESOURCES ) +set(UIS advancedlineandfillstyling.qrc ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_advancedlineandfillstyling/README.md b/examples/advancedlineandfillstyling/README.md similarity index 86% rename from examples/simpletest_advancedlineandfillstyling/README.md rename to examples/advancedlineandfillstyling/README.md index c6bb1bb6ad..a86daa35f6 100644 --- a/examples/simpletest_advancedlineandfillstyling/README.md +++ b/examples/advancedlineandfillstyling/README.md @@ -1,7 +1,7 @@ # Example (JKQTPlotter): Advanced Line and Fill Styling {#JKQTPlotterAdvancedLineAndFillStyling} -This project (see `./examples/simpletest_advancedlineandfillstyling/`) demonstrates how to use advanced line styling and filling options (e.g. custom dash-styles, gradient, image fills, transparencies, ...) with JKQtPlotter. +This project (see `./examples/advancedlineandfillstyling/`) demonstrates how to use advanced line styling and filling options (e.g. custom dash-styles, gradient, image fills, transparencies, ...) with JKQtPlotter. -The source code of the main application can be found in [`jkqtplotter_simpletest_advancedlineandfillstyling.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_advancedlineandfillstyling/jkqtplotter_simpletest_advancedlineandfillstyling.cpp). +The source code of the main application can be found in [`advancedlineandfillstyling.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/advancedlineandfillstyling/advancedlineandfillstyling.cpp). Initially several data columns are generated and added to the internal datastore. Then several line graphs are added that all use different custom dashes. In addition the third line does not use a single color, but a gradient for coloring: ```.cpp @@ -104,7 +104,7 @@ In addition to the graph background properties, also the plot/widget/key backgro The result looks like this: -![jkqtplotter_simpletest_advancedlineandfillstyling](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_advancedlineandfillstyling.png) +![advancedlineandfillstyling](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/advancedlineandfillstyling.png) diff --git a/examples/simpletest_advancedlineandfillstyling/jkqtplotter_simpletest_advancedlineandfillstyling.cpp b/examples/advancedlineandfillstyling/advancedlineandfillstyling.cpp similarity index 98% rename from examples/simpletest_advancedlineandfillstyling/jkqtplotter_simpletest_advancedlineandfillstyling.cpp rename to examples/advancedlineandfillstyling/advancedlineandfillstyling.cpp index cd4749a159..c48dd0df85 100644 --- a/examples/simpletest_advancedlineandfillstyling/jkqtplotter_simpletest_advancedlineandfillstyling.cpp +++ b/examples/advancedlineandfillstyling/advancedlineandfillstyling.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_advancedlineandfillstyling.cpp +/** \example advancedlineandfillstyling.cpp * Shows how to use advanced line styling and filling options with JKQTPlotter * * \ref JKQTPlotterAdvancedLineAndFillStyling, JKQTPXYLineGraph, JKQTPSpecialLineHorizontalGraph, JKQTPBarVerticalGraph diff --git a/examples/simpletest_advancedlineandfillstyling/jkqtplotter_simpletest_advancedlineandfillstyling.pro b/examples/advancedlineandfillstyling/advancedlineandfillstyling.pro similarity index 61% rename from examples/simpletest_advancedlineandfillstyling/jkqtplotter_simpletest_advancedlineandfillstyling.pro rename to examples/advancedlineandfillstyling/advancedlineandfillstyling.pro index 4ff8775877..95bfb4f06e 100644 --- a/examples/simpletest_advancedlineandfillstyling/jkqtplotter_simpletest_advancedlineandfillstyling.pro +++ b/examples/advancedlineandfillstyling/advancedlineandfillstyling.pro @@ -1,7 +1,7 @@ # source code for this simple demo -SOURCES = jkqtplotter_simpletest_advancedlineandfillstyling.cpp +SOURCES = advancedlineandfillstyling.cpp -RESOURCES += jkqtplotter_simpletest_advancedlineandfillstyling.qrc +RESOURCES += advancedlineandfillstyling.qrc # configure Qt CONFIG += link_prl qt @@ -9,16 +9,16 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # output executable name -TARGET = jkqtplotter_simpletest_advancedlineandfillstyling +TARGET = advancedlineandfillstyling # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_advancedlineandfillstyling/jkqtplotter_simpletest_advancedlineandfillstyling.qrc b/examples/advancedlineandfillstyling/advancedlineandfillstyling.qrc similarity index 100% rename from examples/simpletest_advancedlineandfillstyling/jkqtplotter_simpletest_advancedlineandfillstyling.qrc rename to examples/advancedlineandfillstyling/advancedlineandfillstyling.qrc diff --git a/examples/advancedlineandfillstyling/advancedlineandfillstyling_and_lib.pro b/examples/advancedlineandfillstyling/advancedlineandfillstyling_and_lib.pro new file mode 100644 index 0000000000..63ecda2ec9 --- /dev/null +++ b/examples/advancedlineandfillstyling/advancedlineandfillstyling_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib advancedlineandfillstyling + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +advancedlineandfillstyling.file=$$PWD/advancedlineandfillstyling.pro +advancedlineandfillstyling.depends = jkqtplotterlib diff --git a/examples/simpletest_advancedlineandfillstyling/example.bmp b/examples/advancedlineandfillstyling/example.bmp similarity index 100% rename from examples/simpletest_advancedlineandfillstyling/example.bmp rename to examples/advancedlineandfillstyling/example.bmp diff --git a/examples/barchart/CMakeLists.txt b/examples/barchart/CMakeLists.txt new file mode 100644 index 0000000000..2407bba8da --- /dev/null +++ b/examples/barchart/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME barchart) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES barchart.cpp ) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_barchart/README.md b/examples/barchart/README.md similarity index 87% rename from examples/simpletest_barchart/README.md rename to examples/barchart/README.md index 9ced74e83e..145c354810 100644 --- a/examples/simpletest_barchart/README.md +++ b/examples/barchart/README.md @@ -1,7 +1,7 @@ # Example (JKQTPlotter): Simple barchart {#JKQTPlotterBarcharts} -This project (see [`simpletest_barchart`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_barchart) simply creates a JKQTPlotter widget (as a new window) and adds several barcharts. They are ordered in groups. +This project (see [`barchart`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/barchart) simply creates a JKQTPlotter widget (as a new window) and adds several barcharts. They are ordered in groups. -The source code of the main application is (see [`jkqtplotter_simpletest_barchart.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_barchart/jkqtplotter_simpletest_barchart.cpp): +The source code of the main application is (see [`barchart.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/barchart/barchart.cpp): ```.cpp #include #include "jkqtplotter/jkqtplotter.h" @@ -91,6 +91,6 @@ int main(int argc, char* argv[]) ``` The result looks like this: -![jkqtplotter_simpletest_barchart](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_barchart.png) +![barchart](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/barchart.png) diff --git a/examples/simpletest_barchart/jkqtplotter_simpletest_barchart.cpp b/examples/barchart/barchart.cpp similarity index 98% rename from examples/simpletest_barchart/jkqtplotter_simpletest_barchart.cpp rename to examples/barchart/barchart.cpp index 5d9b0a4b10..d6620ce78c 100644 --- a/examples/simpletest_barchart/jkqtplotter_simpletest_barchart.cpp +++ b/examples/barchart/barchart.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_barchart.cpp +/** \example barchart.cpp * Shows how to draw Barcharts with JKQTPlotter * * \ref JKQTPlotterBarcharts diff --git a/examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot.pro b/examples/barchart/barchart.pro similarity index 57% rename from examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot.pro rename to examples/barchart/barchart.pro index bfac3ea3d2..c9ce4f2064 100644 --- a/examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot.pro +++ b/examples/barchart/barchart.pro @@ -1,5 +1,5 @@ # source code for this simple demo -SOURCES = jkqtplotter_simpletest_boxplot.cpp +SOURCES = barchart.cpp # configure Qt CONFIG += link_prl qt @@ -7,21 +7,21 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # output executable name -TARGET = jkqtplotter_simpletest_boxplot +TARGET = barchart # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") - win32-msvc*: DEFINES += _USE_MATH_DEFINES win32-msvc*: DEFINES += NOMINMAX + diff --git a/examples/barchart/barchart_and_lib.pro b/examples/barchart/barchart_and_lib.pro new file mode 100644 index 0000000000..6879571711 --- /dev/null +++ b/examples/barchart/barchart_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib barchart + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +barchart.file=$$PWD/barchart.pro +barchart.depends = jkqtplotterlib diff --git a/examples/boxplot/CMakeLists.txt b/examples/boxplot/CMakeLists.txt new file mode 100644 index 0000000000..18ab65bf34 --- /dev/null +++ b/examples/boxplot/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME boxplot) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES boxplot.cpp ) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_boxplot/README.md b/examples/boxplot/README.md similarity index 88% rename from examples/simpletest_boxplot/README.md rename to examples/boxplot/README.md index 641e4b4b64..0e2603f511 100644 --- a/examples/simpletest_boxplot/README.md +++ b/examples/boxplot/README.md @@ -1,6 +1,6 @@ # Example (JKQTPlotter): Boxplots {#JKQTPlotterBoxplotsGraphs} -This project (see [`simpletest_boxplot`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_boxplot) demonstrates how to use JKQTPlotter to draw box plots using the classes `JKQTPBoxplotVerticalGraph` and `JKQTPBoxplotHorizontalGraph`. +This project (see [`boxplot`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/boxplot) demonstrates how to use JKQTPlotter to draw box plots using the classes `JKQTPBoxplotVerticalGraph` and `JKQTPBoxplotHorizontalGraph`. [JKQTPlotterBasicJKQTPDatastoreStatistics]: @ref JKQTPlotterBasicJKQTPDatastoreStatistics "Advanced 1-Dimensional Statistics with JKQTPDatastore" [statisticslibrary]: @ref jkqtptools_math_statistics "JKQTPlotter Statistics Library" @@ -8,7 +8,7 @@ This project (see [`simpletest_boxplot`](https://github.com/jkriege2/JKQtPlotter ***Note*** that this example explains how to add boxplots to a graph by hand, i.e. by calculating all the statistical properties for the boxplots by hand. The internal [statisticslibrary] offers methods to perform these calculations, which are explained in the tutorial [JKQTPlotterBasicJKQTPDatastoreStatistics] in detail. Additional advanced styling of boxplots is covered by the example [JKQTPlotterBoxplotStyling]. -The source code of the main application is (see [`jkqtplotter_simpletest_boxplot.cpp`](jkqtplotter_simpletest_boxplot.cpp). +The source code of the main application is (see [`boxplot.cpp`](boxplot.cpp). After adding all necessary data to the JKQTDatastore: ```.cpp @@ -72,7 +72,7 @@ You can further style the plot by e.g. setting: The result looks like this: -![jkqtplotter_simpletest_boxplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_boxplot.png) +![boxplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/boxplot.png) In addition to the simple box plots, the image above also shows outliers as small circles. these need to be drawn with a separate `JKQTPXYLineGraph`: diff --git a/examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot.cpp b/examples/boxplot/boxplot.cpp similarity index 99% rename from examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot.cpp rename to examples/boxplot/boxplot.cpp index fe0546fa2b..27e39ad009 100644 --- a/examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot.cpp +++ b/examples/boxplot/boxplot.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_boxplot.cpp +/** \example boxplot.cpp * Shows how to draw Boxplots with JKQTPlotter * * \ref JKQTPlotterBoxplotsGraphs diff --git a/examples/simpletest_barchart/jkqtplotter_simpletest_barchart.pro b/examples/boxplot/boxplot.pro similarity index 57% rename from examples/simpletest_barchart/jkqtplotter_simpletest_barchart.pro rename to examples/boxplot/boxplot.pro index 74e6f96e4c..2dce2df1cd 100644 --- a/examples/simpletest_barchart/jkqtplotter_simpletest_barchart.pro +++ b/examples/boxplot/boxplot.pro @@ -1,5 +1,5 @@ # source code for this simple demo -SOURCES = jkqtplotter_simpletest_barchart.cpp +SOURCES = boxplot.cpp # configure Qt CONFIG += link_prl qt @@ -7,21 +7,21 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # output executable name -TARGET = jkqtplotter_simpletest_barchart +TARGET = boxplot # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") + win32-msvc*: DEFINES += _USE_MATH_DEFINES win32-msvc*: DEFINES += NOMINMAX - diff --git a/examples/boxplot/boxplot_and_lib.pro b/examples/boxplot/boxplot_and_lib.pro new file mode 100644 index 0000000000..385c91668b --- /dev/null +++ b/examples/boxplot/boxplot_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib boxplot + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +boxplot.file=$$PWD/boxplot.pro +boxplot.depends = jkqtplotterlib diff --git a/examples/contourplot/CMakeLists.txt b/examples/contourplot/CMakeLists.txt new file mode 100644 index 0000000000..fd40677b89 --- /dev/null +++ b/examples/contourplot/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME contourplot) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES contourplot.cpp contourplotanimator.cpp ) +set(HEADERS contourplotanimator.h ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_contourplot/README.md b/examples/contourplot/README.md similarity index 81% rename from examples/simpletest_contourplot/README.md rename to examples/contourplot/README.md index 44d14b00bf..e398f799bd 100644 --- a/examples/simpletest_contourplot/README.md +++ b/examples/contourplot/README.md @@ -1,11 +1,11 @@ # Example (JKQTPlotter): Contour Plots {#JKQTPlotterContourPlot} -This project (see `./examples/simpletest_contourplot/`) shows how to draw contour plots with JKQTPlotter. +This project (see `./examples/contourplot/`) shows how to draw contour plots with JKQTPlotter. [TOC] # Drawing a Contour Plot -The source code of the main application is (see [`jkqtplotter_simpletest_contourplot.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_contourplot/jkqtplotter_simpletest_contourplot.cpp) ). +The source code of the main application is (see [`contourplot.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/contourplot/contourplot.cpp) ). First the electric potential from a quadrupole is calculated and stored in an image column inside the JKQTPDatastore: ```.cpp @@ -86,18 +86,18 @@ Note that we created the list of contour levels to draw explicitly here using `J The result looks like this: -![jkqtplotter_simpletest_contourplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_contourplot.png) +![contourplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/contourplot.png) # Styling a Contour Plot You can change the way that the colors for the contours are chosen by calling `JKQTPColumnContourPlot::setContourColoringMode()` with another mode: - `JKQTPColumnContourPlot::SingleColorContours` uses the same color (set by `JKQTPColumnContourPlot::setLineColor()`) for all contours.
- ![jkqtplotter_simpletest_contourplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_contourplot_SingleColorContours.png) + ![contourplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/contourplot_SingleColorContours.png) - `JKQTPColumnContourPlot::ColorContoursFromPaletteByValue` is the mode used for the example above, which chooses the color from the current color-palette based on the current image data range and the actual level of the contour line.
- ![jkqtplotter_simpletest_contourplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_contourplot_ColorContoursFromPaletteByValue.png) + ![contourplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/contourplot_ColorContoursFromPaletteByValue.png) - `JKQTPColumnContourPlot::ColorContoursFromPalette` chooses the color by evenly spacing the contour lines over the full color palette. the line-color will then have no connection to the actual value of the level.
- ![jkqtplotter_simpletest_contourplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_contourplot_ColorContoursFromPalette.png) + ![contourplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/contourplot_ColorContoursFromPalette.png) In all modes you can override the coloring of single levels by calling `JKQTPColumnContourPlot::setOverrideColor(level, color)`. In the example above this looks like this: @@ -117,15 +117,15 @@ In all modes you can override the coloring of single levels by calling `JKQTPCol This code results (in the default coloring mode `JKQTPColumnContourPlot::ColorContoursFromPaletteByValue`) in: -![jkqtplotter_simpletest_contourplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_contourplot_overridecolors.png) +![contourplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/contourplot_overridecolors.png) # Gimmick: Animating a Contour Plot -In order to demonstrate the caching implemented in the contour plot, there is optional animation code inside this example, in the form of the class `ContourPlotAnimator` (see (see [`ContourPlotAnimator.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_contourplot/ContourPlotAnimator.cpp) ). +In order to demonstrate the caching implemented in the contour plot, there is optional animation code inside this example, in the form of the class `ContourPlotAnimator` (see (see [`ContourPlotAnimator.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/contourplot/ContourPlotAnimator.cpp) ). The code therein results in an animation like this: -![jkqtplotter_simpletest_contourplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_contourplot_animated.gif) +![contourplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/contourplot_animated.gif) Note that zooming can still be perfomred without the need to recalculate the contour lines. diff --git a/examples/simpletest_contourplot/jkqtplotter_simpletest_contourplot.cpp b/examples/contourplot/contourplot.cpp similarity index 99% rename from examples/simpletest_contourplot/jkqtplotter_simpletest_contourplot.cpp rename to examples/contourplot/contourplot.cpp index 99da5b0dd0..d6d5acc762 100644 --- a/examples/simpletest_contourplot/jkqtplotter_simpletest_contourplot.cpp +++ b/examples/contourplot/contourplot.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_contourplot.cpp +/** \example contourplot.cpp * Shows how to plot a contour plot with JKQTPlotter * * \ref JKQTPlotterContourPlot diff --git a/examples/simpletest_contourplot/jkqtplotter_simpletest_contourplot.pro b/examples/contourplot/contourplot.pro similarity index 58% rename from examples/simpletest_contourplot/jkqtplotter_simpletest_contourplot.pro rename to examples/contourplot/contourplot.pro index 12c126b29a..697ab597af 100644 --- a/examples/simpletest_contourplot/jkqtplotter_simpletest_contourplot.pro +++ b/examples/contourplot/contourplot.pro @@ -1,5 +1,5 @@ # source code for this simple demo -SOURCES = jkqtplotter_simpletest_contourplot.cpp \ +SOURCES = contourplot.cpp \ contourplotanimator.cpp # configure Qt @@ -8,15 +8,15 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # output executable name -TARGET = jkqtplotter_simpletest_contourplot +TARGET = contourplot # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/contourplot/contourplot_and_lib.pro b/examples/contourplot/contourplot_and_lib.pro new file mode 100644 index 0000000000..a924c03bc1 --- /dev/null +++ b/examples/contourplot/contourplot_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib contourplot + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +contourplot.file=$$PWD/contourplot.pro +contourplot.depends = jkqtplotterlib diff --git a/examples/simpletest_contourplot/contourplotanimator.cpp b/examples/contourplot/contourplotanimator.cpp similarity index 100% rename from examples/simpletest_contourplot/contourplotanimator.cpp rename to examples/contourplot/contourplotanimator.cpp diff --git a/examples/simpletest_contourplot/contourplotanimator.h b/examples/contourplot/contourplotanimator.h similarity index 100% rename from examples/simpletest_contourplot/contourplotanimator.h rename to examples/contourplot/contourplotanimator.h diff --git a/examples/datastore/CMakeLists.txt b/examples/datastore/CMakeLists.txt new file mode 100644 index 0000000000..7c1be28179 --- /dev/null +++ b/examples/datastore/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME datastore) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES datastore.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_datastore/README.md b/examples/datastore/README.md similarity index 89% rename from examples/simpletest_datastore/README.md rename to examples/datastore/README.md index f862984fab..d1214b9d55 100644 --- a/examples/simpletest_datastore/README.md +++ b/examples/datastore/README.md @@ -8,7 +8,7 @@ [JKQTPlotterBasicJKQTPDatastoreStatistics2D]: @ref JKQTPlotterBasicJKQTPDatastoreStatistics2D "Advanced 2-Dimensional Statistics with JKQTPDatastore" [statisticslibrary]: @ref jkqtptools_math_statistics "JKQTPlotter Statistics Library" -This tutorial project (see `./examples/simpletest_datastore/`) explains several options of JKQTPDatastore, which is the class used to centrally store the data for (most) graphs on a JKQTPlotter widget. +This tutorial project (see `./examples/datastore/`) explains several options of JKQTPDatastore, which is the class used to centrally store the data for (most) graphs on a JKQTPlotter widget. ***Note*** that there are additional tutorial explaining other aspects of data mangement in JKQTPDatastore: - [JKQTPlotterBasicJKQTPDatastore] @@ -22,7 +22,7 @@ This tutorial project (see `./examples/simpletest_datastore/`) explains several [TOC] -The source code of the main application can be found in [`jkqtplotter_simpletest_datastore.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore/jkqtplotter_simpletest_datastore.cpp). +The source code of the main application can be found in [`datastore.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore/datastore.cpp). This tutorial cites parts of this code to demonstrate different ways of working with data for the graphs. In every code-segment below, we will use these two declarations from the code to access the internal datastore of the JKQTPlotter instance: @@ -57,7 +57,7 @@ Note that you could also use a `std::vector` instead, as `JKQTPDatastore::addCop The plot from the code above looks like this: -![simpletest_datastore_sine](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/simpletest_datastore_sine.png) +![datastore_sine](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_sine.png) ## Copy Data from a C-array into a Column of the JKQTPDatastore @@ -74,7 +74,7 @@ Of course if you have your data in a C-array, you can use the same syntax: The plot from the code above looks like this: -![simpletest_datastore_linkedcarray](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/simpletest_datastore_linkedcarray.png) +![datastore_linkedcarray](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_linkedcarray.png) ## Copy Data from a Map into a JKQTPDatastore @@ -93,7 +93,7 @@ Since graphs often display (x,y)-pairs, it may make sense to store them in a map ``` This code results in a graph like this: -![simpletest_datastore_map](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/simpletest_datastore_map.png) +![datastore_map](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_map.png) # Reference External Data in a column of the JKQTPDatastore @@ -119,7 +119,7 @@ Note however that the ownership of the data is not transfered to the JKQTPDatast The plot from the code above looks like this: -![simpletest_datastore_linkedcarray](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/simpletest_datastore_linkedcarray.png) +![datastore_linkedcarray](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_linkedcarray.png) ## Referencing with Transfer of Ownership @@ -156,7 +156,7 @@ Then use JKQTPDatastore::set() to fill them with data: Plotting these two columns versus each other results in a simple sine graph: -![simpletest_datastore_sine](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/simpletest_datastore_sine.png) +![datastore_sine](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_sine.png) @@ -234,7 +234,7 @@ Plotting these two columns versus each other results in: -![simpletest_datastore_calccolumns](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/simpletest_datastore_calccolumns.png) +![datastore_calccolumns](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_calccolumns.png) ## 2D-Datasets and Images @@ -294,7 +294,7 @@ In the example above we used the simple JKQTPDatastore::set() store values into ``` Drawing this column as an image (using JKQTPColumnMathImage) will look like this: -![simpletest_datastore_sineimg](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/simpletest_datastore_sineimg.png) +![datastore_sineimg](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_sineimg.png) In these examples, the iteration and calculation is written out with an explicit for-loop. JKQTPDatastore also offers a shortcut function for this that accepts a functor with the calculation only: ```.cpp @@ -324,7 +324,7 @@ Then you can plot these as a parametrized scatter graph (`JKQTPXYParametrizedSca ``` The result will look like this (`JKQTPXYParametrizedScatterGraph` on the left and `JKQTPColumnMathImage` on the right): -![simpletest_datastore_image](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/simpletest_datastore_image.png) +![datastore_image](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_image.png) @@ -353,13 +353,13 @@ in which an image was calculated pixel-by-pixel with explicit int indices. Alter All these code fragments result in the same graphs: -![simpletest_datastore_image](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/simpletest_datastore_image.png) +![datastore_image](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_image.png) You can also use this interface to interface with algorithms e.g. from the C++ standard template library. E.g. if you want to sort the data in a column, you can simply call ```.cpp std::sort(datastore->begin(colY), datastore->end(colY)); ``` -![simpletest_datastore_image_sorted](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/simpletest_datastore_image_sorted.png) +![datastore_image_sorted](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_image_sorted.png) This, together with `JKQTPDatastore::backInserter()` allows to use `JKQTDatastore` together with algorithms from the C++ standard template libarary and other templated algorithms based on the same iterator-based interfaces (e.g. in boost). \ No newline at end of file diff --git a/examples/simpletest_datastore/jkqtplotter_simpletest_datastore.cpp b/examples/datastore/datastore.cpp similarity index 99% rename from examples/simpletest_datastore/jkqtplotter_simpletest_datastore.cpp rename to examples/datastore/datastore.cpp index cec6a04d96..a025b84f53 100644 --- a/examples/simpletest_datastore/jkqtplotter_simpletest_datastore.cpp +++ b/examples/datastore/datastore.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_datastore.cpp +/** \example datastore.cpp * Several basic examples of how to add data to and edit data in a JKQTPDatastore. * * \ref JKQTPlottersimpletest_datastore diff --git a/examples/simpletest/jkqtplotter_simpletest.pro b/examples/datastore/datastore.pro similarity index 60% rename from examples/simpletest/jkqtplotter_simpletest.pro rename to examples/datastore/datastore.pro index 4c7925a21a..33a0d278d2 100644 --- a/examples/simpletest/jkqtplotter_simpletest.pro +++ b/examples/datastore/datastore.pro @@ -1,5 +1,5 @@ # source code for this simple demo -SOURCES = jkqtplotter_simpletest.cpp +SOURCES = datastore.cpp # configure Qt CONFIG += link_prl qt @@ -7,15 +7,15 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # output executable name -TARGET = jkqtplotter_simpletest +TARGET = datastore # include JKQTPlotter source headers and link against library -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/datastore/datastore_and_lib.pro b/examples/datastore/datastore_and_lib.pro new file mode 100644 index 0000000000..def7efc6b4 --- /dev/null +++ b/examples/datastore/datastore_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib datastore + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +datastore.file=$$PWD/datastore.pro +datastore.depends = jkqtplotterlib diff --git a/examples/datastore_groupedstat/CMakeLists.txt b/examples/datastore_groupedstat/CMakeLists.txt new file mode 100644 index 0000000000..aef8f11dc3 --- /dev/null +++ b/examples/datastore_groupedstat/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME datastore_groupedstat) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_datastore_groupedstat/README.md b/examples/datastore_groupedstat/README.md similarity index 87% rename from examples/simpletest_datastore_groupedstat/README.md rename to examples/datastore_groupedstat/README.md index 0298879465..c163fb0fdb 100644 --- a/examples/simpletest_datastore_groupedstat/README.md +++ b/examples/datastore_groupedstat/README.md @@ -8,7 +8,7 @@ [JKQTPlotterBasicJKQTPDatastoreStatistics2D]: @ref JKQTPlotterBasicJKQTPDatastoreStatistics2D "Advanced 2-Dimensional Statistics with JKQTPDatastore" [statisticslibrary]: @ref jkqtptools_math_statistics "JKQTPlotter Statistics Library" -This tutorial project (see `./examples/simpletest_datastore_groupedstat/`) explains several advanced functions of JKQTPDatastore in combination with the [[statisticslibrary]] conatined in JKQTPlotter. +This tutorial project (see `./examples/datastore_groupedstat/`) explains several advanced functions of JKQTPDatastore in combination with the [[statisticslibrary]] conatined in JKQTPlotter. ***Note*** that there are additional tutorial explaining other aspects of data mangement in JKQTPDatastore: - [JKQTPlotterBasicJKQTPDatastore] @@ -20,7 +20,7 @@ This tutorial project (see `./examples/simpletest_datastore_groupedstat/`) expla [TOC] -The source code of the main application can be found in [`jkqtplotter_simpletest_datastore_groupedstat.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore_groupedstat/jkqtplotter_simpletest_datastore_groupedstat.cpp). +The source code of the main application can be found in [`datastore_groupedstat.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore_groupedstat/datastore_groupedstat.cpp). This tutorial cites only parts of this code to demonstrate different ways of working with data for the graphs. # Barcharts & Boxplots from categorized data @@ -63,7 +63,7 @@ This dataset can be visualized with a simple scatter plot: The resulting plot looks like this: -![jkqtplotter_simpletest_datastore_groupedstat_barchartrawdata](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_groupedstat_barchartrawdata.png) +![datastore_groupedstat_barchartrawdata](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_groupedstat_barchartrawdata.png) ## Calculating Grouped Statistics for a Barchart @@ -98,7 +98,7 @@ Finally the calculated groups are drawn: The resulting plot looks like this: -![jkqtplotter_simpletest_datastore_groupedstat_barchart](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_groupedstat_barchart.png) +![datastore_groupedstat_barchart](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_groupedstat_barchart.png) In order to safe yo the typing of the code above, shortcuts in the form of adaptors exist: ```.cpp @@ -146,7 +146,7 @@ The result can be plotted using JKQTPBoxplotVerticalGraph, which receives a colu The resulting plot looks like this: -![jkqtplotter_simpletest_datastore_groupedstat_boxplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_groupedstat_boxplot.png) +![datastore_groupedstat_boxplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_groupedstat_boxplot.png) In order to safe yo the typing of the code above, shortcuts in the form of adaptors exist: ```.cpp @@ -192,7 +192,7 @@ This dataset can be visualized: The resulting plot looks like this: -![jkqtplotter_simpletest_datastore_groupedstat_scatterrawdata](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_groupedstat_scatterrawdata.png) +![datastore_groupedstat_scatterrawdata](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_groupedstat_scatterrawdata.png) ## Calculating x- and y-Errors from Categorized Data @@ -240,7 +240,7 @@ Finally the calculated groups are drawn The resulting plot looks like this: -![jkqtplotter_simpletest_datastore_groupedstat_scatter](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_groupedstat_scatter.png) +![datastore_groupedstat_scatter](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_groupedstat_scatter.png) In order to safe yo the typing of the code above, shortcuts in the form of adaptors exist: @@ -258,8 +258,8 @@ Also other flavors exist that generate different graphs (see the JKQTPlotter doc # Screenshot of the full Program -The output of the full test program [`jkqtplotter_simpletest_datastore_groupedstat.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore_groupedstat/jkqtplotter_simpletest_datastore_groupedstat.cpp) looks like this: +The output of the full test program [`datastore_groupedstat.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore_groupedstat/datastore_groupedstat.cpp) looks like this: -![jkqtplotter_simpletest_datastore_groupedstat](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_groupedstat.png) +![datastore_groupedstat](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_groupedstat.png) diff --git a/examples/simpletest_datastore_groupedstat/jkqtplotter_simpletest_datastore_groupedstat.cpp b/examples/datastore_groupedstat/datastore_groupedstat.cpp similarity index 99% rename from examples/simpletest_datastore_groupedstat/jkqtplotter_simpletest_datastore_groupedstat.cpp rename to examples/datastore_groupedstat/datastore_groupedstat.cpp index e019c74965..ee23aca078 100644 --- a/examples/simpletest_datastore_groupedstat/jkqtplotter_simpletest_datastore_groupedstat.cpp +++ b/examples/datastore_groupedstat/datastore_groupedstat.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_datastore_groupedstat.cpp +/** \example datastore_groupedstat.cpp * Explains how to use the internal statistics library (see \ref jkqtptools_statistics ) together with JKQTPDatastore to generate grouped statistics (i.e. calculates errorbars or boxplots from groups of datapoints in a x/y-dataset). * * \ref JKQTPlotterBasicJKQTPDatastoreStatisticsGroupedStat diff --git a/examples/simpletest_datastore/jkqtplotter_simpletest_datastore.pro b/examples/datastore_groupedstat/datastore_groupedstat.pro similarity index 59% rename from examples/simpletest_datastore/jkqtplotter_simpletest_datastore.pro rename to examples/datastore_groupedstat/datastore_groupedstat.pro index 4a70d92f72..38f2b4ab60 100644 --- a/examples/simpletest_datastore/jkqtplotter_simpletest_datastore.pro +++ b/examples/datastore_groupedstat/datastore_groupedstat.pro @@ -1,5 +1,5 @@ # source code for this simple demo -SOURCES = jkqtplotter_simpletest_datastore.cpp +SOURCES = datastore_groupedstat.cpp # configure Qt CONFIG += link_prl qt @@ -7,15 +7,15 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # output executable name -TARGET = jkqtplotter_simpletest_datastore +TARGET = datastore_groupedstat # include JKQTPlotter source headers and link against library -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/datastore_groupedstat/datastore_groupedstat_and_lib.pro b/examples/datastore_groupedstat/datastore_groupedstat_and_lib.pro new file mode 100644 index 0000000000..a839f0cb60 --- /dev/null +++ b/examples/datastore_groupedstat/datastore_groupedstat_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib datastore_groupedstat + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +datastore_groupedstat.file=$$PWD/datastore_groupedstat.pro +datastore_groupedstat.depends = jkqtplotterlib diff --git a/examples/datastore_iterators/CMakeLists.txt b/examples/datastore_iterators/CMakeLists.txt new file mode 100644 index 0000000000..deed7e06ba --- /dev/null +++ b/examples/datastore_iterators/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME datastore_iterators) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_datastore_iterators/README.md b/examples/datastore_iterators/README.md similarity index 90% rename from examples/simpletest_datastore_iterators/README.md rename to examples/datastore_iterators/README.md index 407f5e0e25..59641a2f2e 100644 --- a/examples/simpletest_datastore_iterators/README.md +++ b/examples/datastore_iterators/README.md @@ -8,7 +8,7 @@ [JKQTPlotterBasicJKQTPDatastoreStatistics2D]: @ref JKQTPlotterBasicJKQTPDatastoreStatistics2D "Advanced 2-Dimensional Statistics with JKQTPDatastore" [statisticslibrary]: @ref jkqtptools_math_statistics "JKQTPlotter Statistics Library" -This tutorial project (see `./examples/simpletest_datastore_iterators/`) explains how to use the iterator-based interface to JKQTPDatastore. +This tutorial project (see `./examples/datastore_iterators/`) explains how to use the iterator-based interface to JKQTPDatastore. ***Note*** that there are additional tutorial explaining other aspects of data mangement in JKQTPDatastore: - [JKQTPlotterBasicJKQTPDatastore] @@ -23,7 +23,7 @@ This tutorial project (see `./examples/simpletest_datastore_iterators/`) explain [TOC] -The source code of the main application can be found in [`jkqtplotter_simpletest_datastore_iterators.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore_iterators/jkqtplotter_simpletest_datastore_iterators.cpp). +The source code of the main application can be found in [`datastore_iterators.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore_iterators/datastore_iterators.cpp). This tutorial cites parts of this code to demonstrate different ways of working with JKQTPDatastore's iterator-interface. In every code-segment below, we will use these two declarations from the code to access the internal datastore of the JKQTPlotter instance: @@ -48,7 +48,7 @@ In other tutorials we used e.g. `JKQTPDatastore::set()` to set values in data co ``` Here we added two columns with 50 entries. `XCol` contains linearly spaced values between 0 and 2*pi and `YCol` contains 50 uninitialized values. Then we iterate an index `i` over all these items (`datastore->getRows(XCol)` returns the rows in a column, i.e. 50 in the example above) and used `JKQTPDatastore::set()` to store the calculated values in the two columns. The current x-values is read from `XCol` using `JKQTPDatastore::get()`. The resulting plot looks like this: -![simpletest_datastore_iterators_cosine](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/simpletest_datastore_iterators_cosine.png) +![simpletest_datastore_iterators_cosine](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_iterators_cosine.png) The same loop can be written using iterators: ```.cpp @@ -90,14 +90,14 @@ Of course you can now also interface other algorithms, like e.g. [`std::sort()`] With this line of code, the `YCol` is sorted in ascending order and the plot becomes: -![simpletest_datastore_iterators_cosine_ysorted](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/simpletest_datastore_iterators_cosine_ysorted.png) +![simpletest_datastore_iterators_cosine_ysorted](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_iterators_cosine_ysorted.png) Another example would be to replace all value `y<-0.5` with the value `1.0` using [`std::replace_if()`](https://de.cppreference.com/w/cpp/algorithm/replace): ```.cpp std::replace_if(datastore->begin(YCol), datastore->end(YCol), [](double v) { return v<-0.5; }, 1.0); ``` -![simpletest_datastore_iterators_cosine_yreplaced](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/simpletest_datastore_iterators_cosine_yreplaced.png) +![simpletest_datastore_iterators_cosine_yreplaced](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_iterators_cosine_yreplaced.png) Finally also the [erase-remove idiom](https://en.wikipedia.org/wiki/Erase%E2%80%93remove_idiom) (e.g. known from `std::vector`) is supported: ```.cpp diff --git a/examples/simpletest_datastore_iterators/jkqtplotter_simpletest_datastore_iterators.cpp b/examples/datastore_iterators/datastore_iterators.cpp similarity index 97% rename from examples/simpletest_datastore_iterators/jkqtplotter_simpletest_datastore_iterators.cpp rename to examples/datastore_iterators/datastore_iterators.cpp index 0f6e3accbb..f9afcc7c04 100644 --- a/examples/simpletest_datastore_iterators/jkqtplotter_simpletest_datastore_iterators.cpp +++ b/examples/datastore_iterators/datastore_iterators.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_datastore_iterators.cpp +/** \example datastore_iterators.cpp * Iterator-base data Management in JKQTPDatastore. * * \ref JKQTPlotterBasicJKQTPDatastoreIterators diff --git a/examples/simpletest_datastore_iterators/jkqtplotter_simpletest_datastore_iterators.pro b/examples/datastore_iterators/datastore_iterators.pro similarity index 57% rename from examples/simpletest_datastore_iterators/jkqtplotter_simpletest_datastore_iterators.pro rename to examples/datastore_iterators/datastore_iterators.pro index 4e21595c7d..dff263d8ed 100644 --- a/examples/simpletest_datastore_iterators/jkqtplotter_simpletest_datastore_iterators.pro +++ b/examples/datastore_iterators/datastore_iterators.pro @@ -1,5 +1,5 @@ # source code for this simple demo -SOURCES = jkqtplotter_simpletest_datastore_iterators.cpp +SOURCES = datastore_iterators.cpp # configure Qt CONFIG += link_prl qt @@ -7,15 +7,15 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # output executable name -TARGET = jkqtplotter_simpletest_datastore_iterators +TARGET = datastore_iterators # include JKQTPlotter source headers and link against library -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/datastore_iterators/datastore_iterators_and_lib.pro b/examples/datastore_iterators/datastore_iterators_and_lib.pro new file mode 100644 index 0000000000..6e9bcae884 --- /dev/null +++ b/examples/datastore_iterators/datastore_iterators_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib datastore_iterators + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +datastore_iterators.file=$$PWD/datastore_iterators.pro +datastore_iterators.depends = jkqtplotterlib diff --git a/examples/datastore_regression/CMakeLists.txt b/examples/datastore_regression/CMakeLists.txt new file mode 100644 index 0000000000..af9a74c08e --- /dev/null +++ b/examples/datastore_regression/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME datastore_regression) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_datastore_regression/README.md b/examples/datastore_regression/README.md similarity index 90% rename from examples/simpletest_datastore_regression/README.md rename to examples/datastore_regression/README.md index d7d2aab14c..48661ed7a1 100644 --- a/examples/simpletest_datastore_regression/README.md +++ b/examples/datastore_regression/README.md @@ -8,7 +8,7 @@ [JKQTPlotterBasicJKQTPDatastoreStatistics2D]: @ref JKQTPlotterBasicJKQTPDatastoreStatistics2D "Advanced 2-Dimensional Statistics with JKQTPDatastore" [statisticslibrary]: @ref jkqtptools_math_statistics "JKQTPlotter Statistics Library" -This tutorial project (see `./examples/simpletest_datastore_statistics/`) explains several advanced functions of JKQTPDatastore in combination with the [[statisticslibrary]] conatined in JKQTPlotter. +This tutorial project (see `./examples/datastore_statistics/`) explains several advanced functions of JKQTPDatastore in combination with the [[statisticslibrary]] conatined in JKQTPlotter. ***Note*** that there are additional tutorial explaining other aspects of data mangement in JKQTPDatastore: - [JKQTPlotterBasicJKQTPDatastore] @@ -21,7 +21,7 @@ This tutorial project (see `./examples/simpletest_datastore_statistics/`) explai [TOC] -The source code of the main application can be found in [`jkqtplotter_simpletest_datastore_regression.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore_statistics/jkqtplotter_simpletest_datastore_regression.cpp). +The source code of the main application can be found in [`datastore_regression.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore_statistics/datastore_regression.cpp). This tutorial cites only parts of this code to demonstrate different ways of performing regression analysis. # Simple Linear Regression @@ -75,7 +75,7 @@ Here the x- and y-columns from the `JKQTPXYGraph`-based graph `graphD` (see abov The plot resulting from any of the variants above looks like this: -![jkqtplotter_simpletest_datastore_regression_lin](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_regression_lin.png) +![datastore_regression_lin](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_regression_lin.png) # Robust Linear Regression @@ -123,13 +123,13 @@ and The following screenshot shows the result of the IRLS regression analysis and for comparison the normal linear regression for the same dataset (plotted using `jkqtpstatAddLinearRegression(graphD);`): -![jkqtplotter_simpletest_datastore_regression_linrobust](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_regression_linrobust.png) +![datastore_regression_linrobust](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_regression_linrobust.png) The following screenshot shows the influence of the regularization parameter p (default value 1.1) onto the fit result: - the closer `p` is to 1, the more robust the fit is (it is closer to the L1-norm) - the closer `p` is to 2, the closer the fit is to the least squares solution (i.e. the normal regression obtained with the L2 norm) -![jkqtplotter_simpletest_datastore_regression_linrobust_p](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_regression_linrobust_p.png) +![datastore_regression_linrobust_p](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_regression_linrobust_p.png) @@ -203,7 +203,7 @@ Here the x- and y-columns from the `JKQTPXYGraph`-based graph `graphE` (see abov The plot resulting from any of the variants above looks like this: -![jkqtplotter_simpletest_datastore_regression_linweight](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_regression_linweight.png) +![datastore_regression_linweight](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_regression_linweight.png) For this plot we also added a call to ```.cpp @@ -282,7 +282,7 @@ The regression models can be plotted using a `JKQTPXFunctionLineGraph`. the fucn The resulting plot looks like this: -![jkqtplotter_simpletest_datastore_regression_nonlinreg](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_regression_nonlinreg.png) +![datastore_regression_nonlinreg](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_regression_nonlinreg.png) Of course also "adaptors" exist that allow to perform the steps above in a single function call: @@ -347,11 +347,11 @@ Each model is also ploted using a `JKQTPXFunctionLineGraph`. The plot function a The resulting plots look like this (without added gaussian noise): -![jkqtplotter_simpletest_datastore_regression_polynom](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_regression_polynom.png) +![datastore_regression_polynom](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_regression_polynom.png) ... and with added gaussian noise: -![jkqtplotter_simpletest_datastore_regression_polynom_errros](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_regression_polynom_errros.png) +![datastore_regression_polynom_errros](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_regression_polynom_errros.png) Of course also the "adaptor" shortcuts are available: ```.cpp @@ -363,8 +363,8 @@ Of course also the "adaptor" shortcuts are available: # Screenshot of the full Program -The output of the full test program [`jkqtplotter_simpletest_datastore_regression.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore_statistics/jkqtplotter_simpletest_datastore_regression.cpp) looks like this: +The output of the full test program [`datastore_regression.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore_statistics/datastore_regression.cpp) looks like this: -![jkqtplotter_simpletest_datastore_regression](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_regression.png) +![datastore_regression](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_regression.png) diff --git a/examples/simpletest_datastore_regression/jkqtplotter_simpletest_datastore_regression.cpp b/examples/datastore_regression/datastore_regression.cpp similarity index 99% rename from examples/simpletest_datastore_regression/jkqtplotter_simpletest_datastore_regression.cpp rename to examples/datastore_regression/datastore_regression.cpp index fd074789a4..4dd9f88ff2 100644 --- a/examples/simpletest_datastore_regression/jkqtplotter_simpletest_datastore_regression.cpp +++ b/examples/datastore_regression/datastore_regression.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_datastore_regression.cpp +/** \example datastore_regression.cpp * Explains how to use the internal statistics library (see \ref jkqtptools_statistics ) together with JKQTPDatastore to perform different types of regression and polynomial fitting. * * \ref JKQTPlotterBasicJKQTPDatastoreRegression diff --git a/examples/simpletest_datastore_regression/jkqtplotter_simpletest_datastore_regression.pro b/examples/datastore_regression/datastore_regression.pro similarity index 57% rename from examples/simpletest_datastore_regression/jkqtplotter_simpletest_datastore_regression.pro rename to examples/datastore_regression/datastore_regression.pro index c7337b2806..40b73627d6 100644 --- a/examples/simpletest_datastore_regression/jkqtplotter_simpletest_datastore_regression.pro +++ b/examples/datastore_regression/datastore_regression.pro @@ -1,5 +1,5 @@ # source code for this simple demo -SOURCES = jkqtplotter_simpletest_datastore_regression.cpp +SOURCES = datastore_regression.cpp # configure Qt CONFIG += link_prl qt @@ -7,15 +7,15 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # output executable name -TARGET = jkqtplotter_simpletest_datastore_regression +TARGET = datastore_regression # include JKQTPlotter source headers and link against library -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/datastore_regression/datastore_regression_and_lib.pro b/examples/datastore_regression/datastore_regression_and_lib.pro new file mode 100644 index 0000000000..18a45a4148 --- /dev/null +++ b/examples/datastore_regression/datastore_regression_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib datastore_regression + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +datastore_regression.file=$$PWD/datastore_regression.pro +datastore_regression.depends = jkqtplotterlib diff --git a/examples/datastore_statistics/CMakeLists.txt b/examples/datastore_statistics/CMakeLists.txt new file mode 100644 index 0000000000..9dc73a8110 --- /dev/null +++ b/examples/datastore_statistics/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME datastore_statistics) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_datastore_statistics/README.md b/examples/datastore_statistics/README.md similarity index 87% rename from examples/simpletest_datastore_statistics/README.md rename to examples/datastore_statistics/README.md index 1bacdbb887..ec980cceea 100644 --- a/examples/simpletest_datastore_statistics/README.md +++ b/examples/datastore_statistics/README.md @@ -8,7 +8,7 @@ [JKQTPlotterBasicJKQTPDatastoreStatistics2D]: @ref JKQTPlotterBasicJKQTPDatastoreStatistics2D "Advanced 2-Dimensional Statistics with JKQTPDatastore" [statisticslibrary]: @ref jkqtptools_math_statistics "JKQTPlotter Statistics Library" -This tutorial project (see `./examples/simpletest_datastore_statistics/`) explains several advanced functions of JKQTPDatastore in combination with the [[statisticslibrary]] conatined in JKQTPlotter. +This tutorial project (see `./examples/datastore_statistics/`) explains several advanced functions of JKQTPDatastore in combination with the [[statisticslibrary]] conatined in JKQTPlotter. ***Note*** that there are additional tutorial explaining other aspects of data mangement in JKQTPDatastore: - [JKQTPlotterBasicJKQTPDatastore] @@ -20,7 +20,7 @@ This tutorial project (see `./examples/simpletest_datastore_statistics/`) explai [TOC] -The source code of the main application can be found in [`jkqtplotter_simpletest_datastore_statistics.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore_statistics/jkqtplotter_simpletest_datastore_statistics.cpp). +The source code of the main application can be found in [`datastore_statistics.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore_statistics/datastore_statistics.cpp). This tutorial cites only parts of this code to demonstrate different ways of working with data for the graphs. # Generating different sets of random numbers @@ -64,7 +64,7 @@ The three sets of random numbers from above can be visualized e.g. by a `JKQTPPe This (if repeated for all three columns) results in a plot like this: -![jkqtplotter_simpletest_datastore_statistics_dataonly](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_statistics_dataonly.png) +![datastore_statistics_dataonly](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_statistics_dataonly.png) Based on the raw data we can now use JKQTPlotter's [statisticslibrary] to calculate some basic properties, like the average (`jkqtpstatAverage()`) or the standard deviation (`jkqtpstatStdDev()`): @@ -132,7 +132,7 @@ In order to save you the work of writing out this code, the [statisticslibrary] Here `-0.25`indicates the location (on the y-axis) of the boxplot. and the plot is calculated for the data in the `JKQTPDatastore` column `randomdatacol2`. -![jkqtplotter_simpletest_datastore_statistics_boxplots_simple](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_statistics_boxplots_simple.png) +![datastore_statistics_boxplots_simple](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_statistics_boxplots_simple.png) ## Boxplots with Outliers @@ -148,7 +148,7 @@ Usually the boxplot draws its whiskers at the minimum and maximum value of the d As you can see this restuns the `JKQTPBoxplotHorizontalElement` and in addition a `JKQTPSingleColumnSymbolsGraph` for the display of the outliers. The result looks like this: -![jkqtplotter_simpletest_datastore_statistics_boxplots_outliers](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_statistics_boxplots_outliers.png) +![datastore_statistics_boxplots_outliers](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_statistics_boxplots_outliers.png) @@ -175,7 +175,7 @@ Again there are "adaptors" which significanty reduce the amount of coude you hav The resulting plot looks like this (the distributions used to generate the random data are also shown as line plots!): -![jkqtplotter_simpletest_datastore_statistics_hist](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_statistics_hist.png) +![datastore_statistics_hist](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_statistics_hist.png) @@ -223,7 +223,7 @@ Again a shortcut "adaptor" simplifies this task: Plots that result from such calls look like this: -![jkqtplotter_simpletest_datastore_statistics_kde](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_statistics_kde.png) +![datastore_statistics_kde](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_statistics_kde.png) # Cummulative Histograms and KDEs @@ -238,14 +238,14 @@ Both histograms and KDEs support a parameter `bool cummulative`, which allows to false, true); ``` -![jkqtplotter_simpletest_datastore_statistics_cumhistkde](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_statistics_cumhistkde.png) +![datastore_statistics_cumhistkde](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_statistics_cumhistkde.png) # Screenshot of the full Program -The output of the full test program [`jkqtplotter_simpletest_datastore_statistics.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore_statistics/jkqtplotter_simpletest_datastore_statistics.cpp) looks like this: +The output of the full test program [`datastore_statistics.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore_statistics/datastore_statistics.cpp) looks like this: -![jkqtplotter_simpletest_datastore_statistics](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_statistics.png) +![datastore_statistics](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_statistics.png) diff --git a/examples/simpletest_datastore_statistics/jkqtplotter_simpletest_datastore_statistics.cpp b/examples/datastore_statistics/datastore_statistics.cpp similarity index 99% rename from examples/simpletest_datastore_statistics/jkqtplotter_simpletest_datastore_statistics.cpp rename to examples/datastore_statistics/datastore_statistics.cpp index 295c19ef7b..b55d7dcb17 100644 --- a/examples/simpletest_datastore_statistics/jkqtplotter_simpletest_datastore_statistics.cpp +++ b/examples/datastore_statistics/datastore_statistics.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_datastore_statistics.cpp +/** \example datastore_statistics.cpp * Explains how to use the internal statistics library (see \ref jkqtptools_statistics ) together with JKQTPDatastore to generate advanced plots for 1-dimensional data. * * \ref JKQTPlotterBasicJKQTPDatastoreStatistics diff --git a/examples/datastore_statistics/datastore_statistics.pro b/examples/datastore_statistics/datastore_statistics.pro new file mode 100644 index 0000000000..e3637c9188 --- /dev/null +++ b/examples/datastore_statistics/datastore_statistics.pro @@ -0,0 +1,27 @@ +# source code for this simple demo +SOURCES = datastore_statistics.cpp + +# configure Qt +CONFIG += link_prl qt +QT += core gui xml svg +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport + +# output executable name +TARGET = datastore_statistics + +# include JKQTPlotter source headers and link against library +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib +INCLUDEPATH += ../../lib +CONFIG (debug, debug|release) { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug +} else { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib +} +message("LIBS = $$LIBS") + +win32-msvc*: DEFINES += _USE_MATH_DEFINES +win32-msvc*: DEFINES += NOMINMAX + + + + diff --git a/examples/datastore_statistics/datastore_statistics_and_lib.pro b/examples/datastore_statistics/datastore_statistics_and_lib.pro new file mode 100644 index 0000000000..05725b9add --- /dev/null +++ b/examples/datastore_statistics/datastore_statistics_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib datastore_statistics + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +datastore_statistics.file=$$PWD/datastore_statistics.pro +datastore_statistics.depends = jkqtplotterlib diff --git a/examples/datastore_statistics_2d/CMakeLists.txt b/examples/datastore_statistics_2d/CMakeLists.txt new file mode 100644 index 0000000000..d4607117b4 --- /dev/null +++ b/examples/datastore_statistics_2d/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME datastore_statistics_2d) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_datastore_statistics_2d/README.md b/examples/datastore_statistics_2d/README.md similarity index 86% rename from examples/simpletest_datastore_statistics_2d/README.md rename to examples/datastore_statistics_2d/README.md index 124ba0d450..f45a92f73a 100644 --- a/examples/simpletest_datastore_statistics_2d/README.md +++ b/examples/datastore_statistics_2d/README.md @@ -8,7 +8,7 @@ [JKQTPlotterBasicJKQTPDatastoreStatistics2D]: @ref JKQTPlotterBasicJKQTPDatastoreStatistics2D "Advanced 2-Dimensional Statistics with JKQTPDatastore" [statisticslibrary]: @ref jkqtptools_math_statistics "JKQTPlotter Statistics Library" -This tutorial project (see `./examples/simpletest_datastore_statistics_2d/`) explains several advanced functions of JKQTPDatastore in combination with the [[statisticslibrary]] conatined in JKQTPlotter. +This tutorial project (see `./examples/datastore_statistics_2d/`) explains several advanced functions of JKQTPDatastore in combination with the [[statisticslibrary]] conatined in JKQTPlotter. ***Note*** that there are additional tutorial explaining other aspects of data mangement in JKQTPDatastore: - [JKQTPlotterBasicJKQTPDatastore] @@ -20,7 +20,7 @@ This tutorial project (see `./examples/simpletest_datastore_statistics_2d/`) exp [TOC] -The source code of the main application can be found in [`jkqtplotter_simpletest_datastore_statistics_2d.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore_statistics_2d/jkqtplotter_simpletest_datastore_statistics_2d.cpp). +The source code of the main application can be found in [`datastore_statistics_2d.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore_statistics_2d/datastore_statistics_2d.cpp). This tutorial cites only parts of this code to demonstrate different ways of working with data for the graphs. # Generating different sets of random numbers @@ -95,7 +95,7 @@ In addition to get an idea of the used distributions, we can add two ellipses in The resulting plot looks like this: -![jkqtplotter_simpletest_datastore_statistics_2d_scatteronly](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_statistics_2d_scatteronly.png) +![datastore_statistics_2d_scatteronly](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_statistics_2d_scatteronly.png) # Marginal Statistics @@ -140,7 +140,7 @@ Note that the plots are put into `JKQTPlotter`-instances `plothistBottom` and `p This results in a graph like this: -![jkqtplotter_simpletest_datastore_statistics_2d_marginhist](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_statistics_2d_marginhist.png) +![datastore_statistics_2d_marginhist](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_statistics_2d_marginhist.png) With the same method, also marginal Kernel Density Estimates can be drawn: @@ -151,7 +151,7 @@ With the same method, also marginal Kernel Density Estimates can be drawn: jkqtpstatAddVKDE1DAutoranged(plotkdeRight->getPlotter(), datastore1->begin(randomdatacoly_small), datastore1->end(randomdatacoly_small), 0.01, &jkqtpstatKernel1DGaussian, bwy); ``` -![jkqtplotter_simpletest_datastore_statistics_2d_marginkde](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_statistics_2d_marginkde.png) +![datastore_statistics_2d_marginkde](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_statistics_2d_marginkde.png) # 2D Histogram @@ -195,7 +195,7 @@ Finally the histogram is drawn using a `JKQTPColumnMathImage`: The resulting image plot looks like this: -![jkqtplotter_simpletest_datastore_statistics_2d_hist](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_statistics_2d_hist.png) +![datastore_statistics_2d_hist](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_statistics_2d_hist.png) There is also an "adaptor" which significanty reduce the amount of coude you have to type (i.e. it replaces all the code above): @@ -207,7 +207,7 @@ There is also an "adaptor" which significanty reduce the amount of coude you hav These differ in the type of plot that is added `jkqtpstatAddHistogram2DImage()` adds an image graph (`JKQTPColumnMathImage`) and `jkqtpstatAddHistogram2DContour()` adds a contour plot (`JKQTPColumnContourPlot`). A contour plot may look like this: -![jkqtplotter_simpletest_datastore_statistics_2d_histcontour](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_statistics_2d_histcontour.png) +![datastore_statistics_2d_histcontour](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_statistics_2d_histcontour.png) @@ -260,7 +260,7 @@ Finally the histogram is drawn using a `JKQTPColumnMathImage`: The resulting plot image looks like this: -![jkqtplotter_simpletest_datastore_statistics_2d_kde](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_statistics_2d_kde.png) +![datastore_statistics_2d_kde](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_statistics_2d_kde.png) Note that calculating a KDE is a rather time-consuming task. The KDE in the image above took about 8s to calculate (from 150 datapairs and on a 193*267 pixel grid), whereas the corresponding histogram took only 1ms to calculate! @@ -273,15 +273,15 @@ There is also an "adaptor" which significanty reduce the amount of coude you hav These differ in the type of plot that is added `jkqtpstatAddKDE2DImage()` adds an image graph (`JKQTPColumnMathImage`) and `jkqtpstatAddKDE2DContour()` adds a contour plot (`JKQTPColumnContourPlot`). the first is shown in the screenshot above, the latter looks like this: -![jkqtplotter_simpletest_datastore_statistics_2d_kdecontour](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_statistics_2d_kdecontour.png) +![datastore_statistics_2d_kdecontour](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_statistics_2d_kdecontour.png) # Screenshot of the full Program -The output of the full test program [`jkqtplotter_simpletest_datastore_statistics_2d.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore_statistics_2d/jkqtplotter_simpletest_datastore_statistics_2d.cpp) looks like this: +The output of the full test program [`datastore_statistics_2d.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore_statistics_2d/datastore_statistics_2d.cpp) looks like this: -![jkqtplotter_simpletest_datastore_statistics_2d](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_datastore_statistics_2d.png) +![datastore_statistics_2d](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/datastore_statistics_2d.png) diff --git a/examples/simpletest_datastore_statistics_2d/jkqtplotter_simpletest_datastore_statistics_2d.cpp b/examples/datastore_statistics_2d/datastore_statistics_2d.cpp similarity index 98% rename from examples/simpletest_datastore_statistics_2d/jkqtplotter_simpletest_datastore_statistics_2d.cpp rename to examples/datastore_statistics_2d/datastore_statistics_2d.cpp index 9f785cd1bc..60bc85f22f 100644 --- a/examples/simpletest_datastore_statistics_2d/jkqtplotter_simpletest_datastore_statistics_2d.cpp +++ b/examples/datastore_statistics_2d/datastore_statistics_2d.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_datastore_statistics_2d.cpp +/** \example datastore_statistics_2d.cpp * Explains how to use the internal statistics library (see \ref jkqtptools_statistics ) together with JKQTPDatastore to generate advanced plots for 2-dimensional data. * * \ref JKQTPlotterBasicJKQTPDatastoreStatistics2D @@ -159,12 +159,12 @@ int main(int argc, char* argv[]) // 3. Marginal (1D) Statistics of the x-position and y-position deistributions: - // 3.1. First we calculate the x/y marginal histograms, as desribed in https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_datastore_statistics + // 3.1. First we calculate the x/y marginal histograms, as desribed in https://github.com/jkriege2/JKQtPlotter/tree/master/examples/datastore_statistics timer.start(); jkqtpstatAddHHistogram1DAutoranged(plothistBottom->getPlotter(), datastore1->begin(randomdatacolx), datastore1->end(randomdatacolx), 1.0, true); jkqtpstatAddVHistogram1DAutoranged(plothistLeft->getPlotter(), datastore1->begin(randomdatacoly), datastore1->end(randomdatacoly), 1.0, true); qDebug()<<"histogram, 1D: "<begin(randomdatacolx_small), datastore1->end(randomdatacolx_small)); qDebug()< objects. +This project (see `./examples/errorbarstyles/`) simply creates a JKQTPlotter widget (as a new window) and adds several curves show-casing different styles of error indicators. Data is initialized from two QVector objects. [JKQTPlotterBasicJKQTPDatastoreStatisticsGroupedStat]: @ref JKQTPlotterBasicJKQTPDatastoreStatisticsGroupedStat "1-Dimensional Group Statistics with JKQTPDatastore" [statisticslibrary]: @ref jkqtptools_math_statistics "JKQTPlotter Statistics Library" ***Note:*** This examples explains how to plot graphs with error indicators, when the data has already been calculated. The tutorial [JKQTPlotterBasicJKQTPDatastoreStatisticsGroupedStat] explains one way how to use the [statisticslibrary] in order to calculate the errors from data. -The source code of the main application can be found in [`jkqtplotter_simpletest_errorbarstyles.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.cpp). +The source code of the main application can be found in [`errorbarstyles.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/errorbarstyles/errorbarstyles.cpp). -First some data is added to the internal datastore (mostly, like explained in several other examples, like e.g. [Line Graph with Different Symbols and Line Styles](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_symbols_and_styles)). The (in a loop) several graphs are added, each with a distinct style for its error indicators: +First some data is added to the internal datastore (mostly, like explained in several other examples, like e.g. [Line Graph with Different Symbols and Line Styles](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/symbols_and_styles)). The (in a loop) several graphs are added, each with a distinct style for its error indicators: ```.cpp // 3. now we make several plots with different error styles @@ -109,12 +109,12 @@ In addition the plot key is moved outside the pot and the grid in the plot is sw The result looks like this: -![jkqtplotter_simpletest_errorbarstyles](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_errorbarstyles.png) +![errorbarstyles](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/errorbarstyles.png) Error bars are implemented in the mixin-classes `JKQTPXYGraphErrors`, `JKQTPXGraphErrors` and `JKQTPYGraphErrors` that are all derived from `JKQTPGraphErrors`. With these it is simple to add error indicators to several different plot styles. Usually you can recognize these by looking at the class name, e.g. `JKQTPXYLineGraph` is a simple line+symbol graph, and `JKQTPXYLineErrorGraph` is the same with error indictaors (see above). There are also several other plots with error indicators: - - `JKQTPBarVerticalErrorGraph` for barcharts with errors:
![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_errorbarstyles_barcharts.png) - - `JKQTPImpulsesVerticalGraph` for impulse/candle-stick charts with errors:
![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_errorbarstyles_impulses.png) - - `JKQTPFilledCurveXErrorGraph` for filled curves with errors:
![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_errorbarstyles_filledcurves.png) + - `JKQTPBarVerticalErrorGraph` for barcharts with errors:
![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/errorbarstyles_barcharts.png) + - `JKQTPImpulsesVerticalGraph` for impulse/candle-stick charts with errors:
![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/errorbarstyles_impulses.png) + - `JKQTPFilledCurveXErrorGraph` for filled curves with errors:
![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/errorbarstyles_filledcurves.png) . diff --git a/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.cpp b/examples/errorbarstyles/errorbarstyles.cpp similarity index 98% rename from examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.cpp rename to examples/errorbarstyles/errorbarstyles.cpp index 34ccd66e68..848bf3bd14 100644 --- a/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.cpp +++ b/examples/errorbarstyles/errorbarstyles.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_errorbarstyles.cpp +/** \example errorbarstyles.cpp * Shows how to use different error indicator styles with JKQTPlotter * * \ref JKQTPlotterErrorBarStyles diff --git a/examples/errorbarstyles/errorbarstyles.pro b/examples/errorbarstyles/errorbarstyles.pro new file mode 100644 index 0000000000..83eb797715 --- /dev/null +++ b/examples/errorbarstyles/errorbarstyles.pro @@ -0,0 +1,26 @@ +# source code for this simple demo +SOURCES = errorbarstyles.cpp + +# configure Qt +CONFIG += link_prl qt +QT += core gui xml svg +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport + +# output executable name +TARGET = errorbarstyles + +# include JKQTPlotter source code +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib +INCLUDEPATH += ../../lib +CONFIG (debug, debug|release) { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug +} else { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib +} +message("LIBS = $$LIBS") + + +win32-msvc*: DEFINES += _USE_MATH_DEFINES +win32-msvc*: DEFINES += NOMINMAX + + diff --git a/examples/errorbarstyles/errorbarstyles_and_lib.pro b/examples/errorbarstyles/errorbarstyles_and_lib.pro new file mode 100644 index 0000000000..dd69695eb5 --- /dev/null +++ b/examples/errorbarstyles/errorbarstyles_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib errorbarstyles + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +errorbarstyles.file=$$PWD/errorbarstyles.pro +errorbarstyles.depends = jkqtplotterlib diff --git a/examples/filledgraphs/CMakeLists.txt b/examples/filledgraphs/CMakeLists.txt new file mode 100644 index 0000000000..cf1b8c36e5 --- /dev/null +++ b/examples/filledgraphs/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME filledgraphs) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES filledgraphs.qrc ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_filledgraphs/README.md b/examples/filledgraphs/README.md similarity index 76% rename from examples/simpletest_filledgraphs/README.md rename to examples/filledgraphs/README.md index 6a23262d2c..9f58edd1d0 100644 --- a/examples/simpletest_filledgraphs/README.md +++ b/examples/filledgraphs/README.md @@ -1,7 +1,7 @@ # Example (JKQTPlotter): Filled Curve Plots {#JKQTPlotterFilledGraphs} -This project (see `./examples/simpletest_filledgraphs/`) simply creates a JKQTPlotter widget (as a new window) and adds several filled curve graphs (Histograms). Data is initialized from QVector objects. +This project (see `./examples/filledgraphs/`) simply creates a JKQTPlotter widget (as a new window) and adds several filled curve graphs (Histograms). Data is initialized from QVector objects. -The source code of the main application can be found in [`jkqtplotter_simpletest_filledgraphs.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs.cpp). +The source code of the main application can be found in [`filledgraphs.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/filledgraphs/filledgraphs.cpp). First the data columns for three x-y-curves are generated. One column of x-values with entries 0,1,2,...,254,255 (256 entries). ```.cpp @@ -65,11 +65,11 @@ The curves are fille with a semi-transparent color, which is achieved by setting The result looks like this: -![jkqtplotter_simpletest_filledgraphs](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_filledgraphs.png) +![filledgraphs](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/filledgraphs.png) If you use `JKQTPFilledCurveYGraph` instead of `JKQTPFilledCurveXGraph`, the curve will not be filled until the y=0-axis, but until the x=0-axis. Of course you will also have to swap the x- and y-data columns. The result will look like this: -![jkqtplotter_simpletest_filledgraphs_yaxis](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_filledgraphs_yaxis.png) +![filledgraphs_yaxis](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/filledgraphs_yaxis.png) diff --git a/examples/simpletest_filledgraphs/example.bmp b/examples/filledgraphs/example.bmp similarity index 100% rename from examples/simpletest_filledgraphs/example.bmp rename to examples/filledgraphs/example.bmp diff --git a/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs.cpp b/examples/filledgraphs/filledgraphs.cpp similarity index 98% rename from examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs.cpp rename to examples/filledgraphs/filledgraphs.cpp index be3d0db6dd..96b90bec65 100644 --- a/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs.cpp +++ b/examples/filledgraphs/filledgraphs.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_filledgraphs.cpp +/** \example filledgraphs.cpp * Shows how to use filled graphs with JKQTPlotter * * \ref JKQTPlotterFilledGraphs diff --git a/examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve.pro b/examples/filledgraphs/filledgraphs.pro similarity index 56% rename from examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve.pro rename to examples/filledgraphs/filledgraphs.pro index 05da67fb2b..4b6cf64b4a 100644 --- a/examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve.pro +++ b/examples/filledgraphs/filledgraphs.pro @@ -1,5 +1,7 @@ # source code for this simple demo -SOURCES = jkqtplotter_simpletest_parametriccurve.cpp +SOURCES = filledgraphs.cpp + +RESOURCES += filledgraphs.qrc # configure Qt CONFIG += link_prl qt @@ -7,16 +9,16 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # output executable name -TARGET = jkqtplotter_simpletest_parametriccurve +TARGET = filledgraphs # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs.qrc b/examples/filledgraphs/filledgraphs.qrc similarity index 100% rename from examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs.qrc rename to examples/filledgraphs/filledgraphs.qrc diff --git a/examples/filledgraphs/filledgraphs_and_lib.pro b/examples/filledgraphs/filledgraphs_and_lib.pro new file mode 100644 index 0000000000..f7f6f4d65c --- /dev/null +++ b/examples/filledgraphs/filledgraphs_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib filledgraphs + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +filledgraphs.file=$$PWD/filledgraphs.pro +filledgraphs.depends = jkqtplotterlib diff --git a/examples/functionplot/CMakeLists.txt b/examples/functionplot/CMakeLists.txt new file mode 100644 index 0000000000..f8029c7911 --- /dev/null +++ b/examples/functionplot/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME functionplot) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_functionplot/README.md b/examples/functionplot/README.md similarity index 82% rename from examples/simpletest_functionplot/README.md rename to examples/functionplot/README.md index e8e48ddaba..a4cd1876ee 100644 --- a/examples/simpletest_functionplot/README.md +++ b/examples/functionplot/README.md @@ -1,6 +1,6 @@ # Example (JKQTPlotter): Plotting Mathematical Functions as Line Graphs {#JKQTPlotterFunctionPlots} ## Basics -This project (see `./examples/simpletest_functionplot/`) demonstrates how to plot mathematical functions as line graphs. The functions may be defined as static C functions, C++ functors or c++ inline functions. See [examples/simpletest_parsedfunctionplot](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_parsedfunctionplot) for an example of how to use an internal equation parser provided with JKQTPlotter instead of directly defining functions. +This project (see `./examples/functionplot/`) demonstrates how to plot mathematical functions as line graphs. The functions may be defined as static C functions, C++ functors or c++ inline functions. See [examples/parsedfunctionplot](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/parsedfunctionplot) for an example of how to use an internal equation parser provided with JKQTPlotter instead of directly defining functions. [TOC] @@ -112,16 +112,16 @@ JKQTPXFunctionLineGraph* func7=new JKQTPXFunctionLineGraph(plot); This code snippets above result in a plot like this: -![jkqtplotter_simpletest_functionplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_functionplot.png) +![functionplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/functionplot.png) # Notes Note that all the different variants to provide parameters can be used with all types of functions! -Also see the example [Plotting Parsed Mathematical Functions as Line Graphs](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_parsedfunctionplot) for details on how the actual plotting algorithm works. That example also shows how to define a function as a string, which is then parsed and evaluated by an expression parser library embedded in JKQTPlotter. +Also see the example [Plotting Parsed Mathematical Functions as Line Graphs](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/parsedfunctionplot) for details on how the actual plotting algorithm works. That example also shows how to define a function as a string, which is then parsed and evaluated by an expression parser library embedded in JKQTPlotter. All examples above use the graph class `JKQTPXFunctionLineGraph`, which plots a function `y=f(x)`. If you want to plot a function `x=f(y)`, you can use the class `JKQTPYFunctionLineGraph` instead. If in the examples above, we exchange all `JKQTPXFunctionLineGraph` for `JKQTPYFunctionLineGraph`, the graphs will be rotated by 90 degree, as all functions are interpreted as `x=f(y)`: -![jkqtplotter_simpletest_functionplot_fy](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_functionplot_fy.png) +![functionplot_fy](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/functionplot_fy.png) diff --git a/examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot.cpp b/examples/functionplot/functionplot.cpp similarity index 98% rename from examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot.cpp rename to examples/functionplot/functionplot.cpp index fa944eb553..3eb9b0741e 100644 --- a/examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot.cpp +++ b/examples/functionplot/functionplot.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_functionplot.cpp +/** \example functionplot.cpp * Shows how to plot Mathematical Functions as Line Graphs with JKQTPlotter (as evaluated C/C++ functions) * * \ref JKQTPlotterFunctionPlots diff --git a/examples/functionplot/functionplot.pro b/examples/functionplot/functionplot.pro new file mode 100644 index 0000000000..e390406777 --- /dev/null +++ b/examples/functionplot/functionplot.pro @@ -0,0 +1,28 @@ +# source code for this simple demo +SOURCES = functionplot.cpp + +# configure Qt +CONFIG += link_prl qt +QT += core gui xml svg +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport + +# output executable name +TARGET = functionplot + + +# include JKQTPlotter source code +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib +INCLUDEPATH += ../../lib +CONFIG (debug, debug|release) { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug +} else { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib +} +message("LIBS = $$LIBS") + +win32-msvc*: DEFINES += _USE_MATH_DEFINES +win32-msvc*: DEFINES += NOMINMAX + + + + diff --git a/examples/functionplot/functionplot_and_lib.pro b/examples/functionplot/functionplot_and_lib.pro new file mode 100644 index 0000000000..6fd593ed81 --- /dev/null +++ b/examples/functionplot/functionplot_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib functionplot + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +functionplot.file=$$PWD/functionplot.pro +functionplot.depends = jkqtplotterlib diff --git a/examples/geometric/CMakeLists.txt b/examples/geometric/CMakeLists.txt new file mode 100644 index 0000000000..46bf288134 --- /dev/null +++ b/examples/geometric/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME geometric) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_geometric/README.md b/examples/geometric/README.md similarity index 76% rename from examples/simpletest_geometric/README.md rename to examples/geometric/README.md index 7b42efd989..bcf852dd34 100644 --- a/examples/simpletest_geometric/README.md +++ b/examples/geometric/README.md @@ -1,7 +1,8 @@ # Example (JKQTPlotter): Plotting Geometric Objects {#JKQTPlotterGeometricGraphs} -This project (see `./test/simpletest_geometric/`) shows the capabilities of JKQTPlotter to also draw geometric elements, like circles, ellipses, rectangles etc. -The source code of the main application can be found in [`jkqtplotter_simpletest_geometric.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_geometric/jkqtplotter_simpletest_geometric.cpp). First a plot is generated and the axis aspect ratio is set to 1, so an accurate plot is generated. Then several geometric graphs are added to the plot. Here are some examples, you can find more more examples in the source code of the example: +This project shows the capabilities of JKQTPlotter to also draw geometric elements, like circles, ellipses, rectangles etc. + +The source code of the main application can be found in [`geometric.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/geometric/geometric.cpp). First a plot is generated and the axis aspect ratio is set to 1, so an accurate plot is generated. Then several geometric graphs are added to the plot. Here are some examples, you can find more more examples in the source code of the example: ```.cpp // a text element @@ -67,7 +68,7 @@ The source code of the main application can be found in [`jkqtplotter_simpletes The result of the example combines all these elements and looks like this: -![jkqtplotter_simpletest_geometric](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_geometric.png) +![geometric](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/geometric.png) diff --git a/examples/simpletest_geometric/jkqtplotter_simpletest_geometric.cpp b/examples/geometric/geometric.cpp similarity index 97% rename from examples/simpletest_geometric/jkqtplotter_simpletest_geometric.cpp rename to examples/geometric/geometric.cpp index 6b2b19b0a3..5734ac725a 100644 --- a/examples/simpletest_geometric/jkqtplotter_simpletest_geometric.cpp +++ b/examples/geometric/geometric.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_geometric.cpp +/** \example geometric.cpp * Shows how to plot several geometric forms with JKQTPlotter * * \ref JKQTPlotterGeometricGraphs diff --git a/examples/simpletest_geometric/jkqtplotter_simpletest_geometric.pro b/examples/geometric/geometric.pro similarity index 62% rename from examples/simpletest_geometric/jkqtplotter_simpletest_geometric.pro rename to examples/geometric/geometric.pro index aeab4bd4c9..15397b3873 100644 --- a/examples/simpletest_geometric/jkqtplotter_simpletest_geometric.pro +++ b/examples/geometric/geometric.pro @@ -1,5 +1,5 @@ # source code for this simple demo -SOURCES = jkqtplotter_simpletest_geometric.cpp +SOURCES = geometric.cpp # configure Qt CONFIG += link_prl qt @@ -7,15 +7,15 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # output executable name -TARGET = jkqtplotter_simpletest_geometric +TARGET = geometric # include JKQTPlotter source code DEPENDPATH += ../../lib ../../staticlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/geometric/geometric_and_lib.pro b/examples/geometric/geometric_and_lib.pro new file mode 100644 index 0000000000..d9dfcda7bd --- /dev/null +++ b/examples/geometric/geometric_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib geometric + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +geometric.file=$$PWD/geometric.pro +geometric.depends = jkqtplotterlib diff --git a/examples/imageplot/CMakeLists.txt b/examples/imageplot/CMakeLists.txt new file mode 100644 index 0000000000..33fcca9ae9 --- /dev/null +++ b/examples/imageplot/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME imageplot) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_imageplot/README.md b/examples/imageplot/README.md similarity index 76% rename from examples/simpletest_imageplot/README.md rename to examples/imageplot/README.md index 9f18adb557..01f9b10210 100644 --- a/examples/simpletest_imageplot/README.md +++ b/examples/imageplot/README.md @@ -1,7 +1,7 @@ # Example (JKQTPlotter): Simple math image plot {#JKQTPlotterImagePlot} -This project (see `./examples/simpletest_imageplot/`) simply creates a JKQTPlotter widget (as a new window) and adds a color-coded image plot of a mathematical function (here the Airy disk). The image is stored as a simple C-array in row-major ordering and then copied into a single column of the internal datasdtore (JKQTPMathImage could be directly used without the internal datastore). This very simple interface can also be used to interface with many common image processing libraries, like CImg or OpenCV. +This project (see `./examples/imageplot/`) simply creates a JKQTPlotter widget (as a new window) and adds a color-coded image plot of a mathematical function (here the Airy disk). The image is stored as a simple C-array in row-major ordering and then copied into a single column of the internal datasdtore (JKQTPMathImage could be directly used without the internal datastore). This very simple interface can also be used to interface with many common image processing libraries, like CImg or OpenCV. -The source code of the main application is (see [`jkqtplotter_simpletest_imageplot.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_imageplot/jkqtplotter_simpletest_imageplot.cpp): +The source code of the main application is (see [`imageplot.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/imageplot/imageplot.cpp): ```.cpp #include #include @@ -111,7 +111,7 @@ int main(int argc, char* argv[]) ``` The result looks like this: -![jkqtplotter_simpletest_imageplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot.png) +![imageplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/imageplot.png) There are several ways to modify the plot: 1. You can set the color scale manually (here 0..2), by using @@ -125,7 +125,7 @@ There are several ways to modify the plot: graph->setAutoImageRange(true); ``` from above. The result will look like this:
- ![jkqtplotter_simpletest_imageplot__scale02](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot__scale02.png)
+ ![imageplot__scale02](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/imageplot__scale02.png)
Note how the color scale is not used completely, because data really only scales between 0 and 1. 2. If you set the color-range to 0.1 .. 0.8 with ``` @@ -134,13 +134,13 @@ There are several ways to modify the plot: graph->setImageMax(0.8); ``` Then there will be datapoints above or below the range of the colorscale. The default behaviour of the graph is to use the first color of the palette for every pixel with a value below the minimum (here 0.1) and the last color in the palette for every pixel with a value above the maximum.
- ![jkqtplotter_simpletest_imageplot__smallscalelimitcolor](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot__smallscalelimitcolor.png)
+ ![imageplot__smallscalelimitcolor](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/imageplot__smallscalelimitcolor.png)
You can change this behaviour by `setRangeMinFailAction(),setRangeMaxFailAction()` with one of these parameters: - `JKQTPMathImageLastPaletteColor`: the default behaviour explained above - `JKQTPMathImageGivenColor`: use a color set by `setRangeMinFailColor(),setRangeMaxFailColor()` (here e.g. black for min and grey for max)
- ![jkqtplotter_simpletest_imageplot__smallscalecolor](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot__smallscalecolor.png) + ![imageplot__smallscalecolor](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/imageplot__smallscalecolor.png) - `JKQTPMathImageTransparent`: draw pixels transparent
- ![jkqtplotter_simpletest_imageplot__smallscaletransparent](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot__smallscaletransparent.png) + ![imageplot__smallscaletransparent](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/imageplot__smallscaletransparent.png) . . diff --git a/examples/simpletest_imageplot/jkqtplotter_simpletest_imageplot.cpp b/examples/imageplot/imageplot.cpp similarity index 98% rename from examples/simpletest_imageplot/jkqtplotter_simpletest_imageplot.cpp rename to examples/imageplot/imageplot.cpp index 4bd3737621..49a7e02516 100644 --- a/examples/simpletest_imageplot/jkqtplotter_simpletest_imageplot.cpp +++ b/examples/imageplot/imageplot.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_imageplot.cpp +/** \example imageplot.cpp * Shows how to plot colored math images/matrices with JKQTPlotter * * \ref JKQTPlotterImagePlot diff --git a/examples/imageplot/imageplot.pro b/examples/imageplot/imageplot.pro new file mode 100644 index 0000000000..153f27862e --- /dev/null +++ b/examples/imageplot/imageplot.pro @@ -0,0 +1,27 @@ +# source code for this simple demo +SOURCES = imageplot.cpp + +# configure Qt +CONFIG += link_prl qt +QT += core gui xml svg +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport + +# output executable name +TARGET = imageplot + +# include JKQTPlotter source code +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib +INCLUDEPATH += ../../lib +CONFIG (debug, debug|release) { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug +} else { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib +} +message("LIBS = $$LIBS") + +win32-msvc*: DEFINES += _USE_MATH_DEFINES +win32-msvc*: DEFINES += NOMINMAX + + + + diff --git a/examples/imageplot/imageplot_and_lib.pro b/examples/imageplot/imageplot_and_lib.pro new file mode 100644 index 0000000000..cd086ab132 --- /dev/null +++ b/examples/imageplot/imageplot_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib imageplot + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +imageplot.file=$$PWD/imageplot.pro +imageplot.depends = jkqtplotterlib diff --git a/examples/imageplot_modifier/CMakeLists.txt b/examples/imageplot_modifier/CMakeLists.txt new file mode 100644 index 0000000000..2bc8e4c60a --- /dev/null +++ b/examples/imageplot_modifier/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME imageplot_modifier) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_imageplot_modifier/README.md b/examples/imageplot_modifier/README.md similarity index 78% rename from examples/simpletest_imageplot_modifier/README.md rename to examples/imageplot_modifier/README.md index 16a3e07fcd..149f72cda2 100644 --- a/examples/simpletest_imageplot_modifier/README.md +++ b/examples/imageplot_modifier/README.md @@ -1,7 +1,7 @@ # Example (JKQTPlotter): Simple math image plot with modifier datat {#JKQTPlotterImagePlotModifier} -This project (see `./examples/simpletest_imageplot_modifier/`) creates a JKQTPlotter widget (as a new window) and adds a color-coded image plot of a mathematical function (here `sin(r)`). Then a second image (linearly scaling from 1 in the center to 0 at the borders) is used to modify the first image. The modification can alter several properties of the original image, like its saturation, its transparency (alpha) ... +This project (see `./examples/imageplot_modifier/`) creates a JKQTPlotter widget (as a new window) and adds a color-coded image plot of a mathematical function (here `sin(r)`). Then a second image (linearly scaling from 1 in the center to 0 at the borders) is used to modify the first image. The modification can alter several properties of the original image, like its saturation, its transparency (alpha) ... -The source code of the main application is (see [`jkqtplotter_simpletest_imageplot_modifier.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.cpp): +The source code of the main application is (see [`imageplot_modifier.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/imageplot_modifier/imageplot_modifier.cpp): ```.cpp #include #include @@ -107,12 +107,12 @@ int main(int argc, char* argv[]) } ``` The data image (`sin(r/30)`) on its own looks like this:
-![jkqtplotter_simpletest_imageplot_modifier_imageonly](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot_modifier_imageonly.png)
+![imageplot_modifier_imageonly](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/imageplot_modifier_imageonly.png)
and the modifier image on its own would look like this:
-![jkqtplotter_simpletest_imageplot_modifier_modifieronly](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot_modifier_modifieronly.png) +![imageplot_modifier_modifieronly](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/imageplot_modifier_modifieronly.png) Combined the two form this plot:
-![jkqtplotter_simpletest_imageplot_modifier](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot_modifier.png) +![imageplot_modifier](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/imageplot_modifier.png) There are several modification modes available (see also documentation of JKQTPMathImageBase::ModifierMode): @@ -125,6 +125,6 @@ There are several modification modes available (see also documentation of JKQTPM -See [`test/simpletest_imageplot`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_imageplot) for a detailed description of the other possibilities that the class JKQTPColumnMathImage (and also JKQTPMathImage) offer with respect to determining how an image is plotted. You can combine all options there with the modifier feature described here. +See [`examples/imageplot`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/imageplot) for a detailed description of the other possibilities that the class JKQTPColumnMathImage (and also JKQTPMathImage) offer with respect to determining how an image is plotted. You can combine all options there with the modifier feature described here. diff --git a/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.cpp b/examples/imageplot_modifier/imageplot_modifier.cpp similarity index 98% rename from examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.cpp rename to examples/imageplot_modifier/imageplot_modifier.cpp index 3891028a54..7a5ce4cc63 100644 --- a/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.cpp +++ b/examples/imageplot_modifier/imageplot_modifier.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_imageplot_modifier.cpp +/** \example imageplot_modifier.cpp * Shows how to plot colored math images/matrices modified by a second data-column/image with JKQTPlotter * * \ref JKQTPlotterImagePlotModifier diff --git a/examples/imageplot_modifier/imageplot_modifier.pro b/examples/imageplot_modifier/imageplot_modifier.pro new file mode 100644 index 0000000000..0fbd41e24d --- /dev/null +++ b/examples/imageplot_modifier/imageplot_modifier.pro @@ -0,0 +1,27 @@ +# source code for this simple demo +SOURCES = imageplot_modifier.cpp + +# configure Qt +CONFIG += link_prl qt +QT += core gui xml svg +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport + +# output executable name +TARGET = imageplot_modifier + +# include JKQTPlotter source code +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib +INCLUDEPATH += ../../lib +CONFIG (debug, debug|release) { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug +} else { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib +} +message("LIBS = $$LIBS") + +win32-msvc*: DEFINES += _USE_MATH_DEFINES +win32-msvc*: DEFINES += NOMINMAX + + + + diff --git a/examples/imageplot_modifier/imageplot_modifier_and_lib.pro b/examples/imageplot_modifier/imageplot_modifier_and_lib.pro new file mode 100644 index 0000000000..f3c02ce792 --- /dev/null +++ b/examples/imageplot_modifier/imageplot_modifier_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib imageplot_modifier + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +imageplot_modifier.file=$$PWD/imageplot_modifier.pro +imageplot_modifier.depends = jkqtplotterlib diff --git a/examples/imageplot_nodatastore/CMakeLists.txt b/examples/imageplot_nodatastore/CMakeLists.txt new file mode 100644 index 0000000000..0c6caee156 --- /dev/null +++ b/examples/imageplot_nodatastore/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME imageplot_nodatastore) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_imageplot_nodatastore/README.md b/examples/imageplot_nodatastore/README.md similarity index 72% rename from examples/simpletest_imageplot_nodatastore/README.md rename to examples/imageplot_nodatastore/README.md index b62c8430d9..c75a495143 100644 --- a/examples/simpletest_imageplot_nodatastore/README.md +++ b/examples/imageplot_nodatastore/README.md @@ -1,7 +1,7 @@ # Example (JKQTPlotter): Simple math image plot without use of central JKQTdatastore {#JKQTPlotterImagePlotNoDatastore} -This project (see `./examples/simpletest_imageplot_nodatastore/`) simply creates a JKQTPlotter widget (as a new window) and adds a color-coded image plot of a mathematical function (here the Airy disk). The image is stored as a simple C-array in row-major ordering and then given to a JKQTPMathImage to visualize it. The data is stored as a pointer directly in the JKQTPMathImage object. There is also a variant JKQTPColumnMathImage of JKQTPMathImage, which references a column in the internal JKQTdatastore and uses the data there for plotting. In both cases data has to be organized as a row-major matrix of values. JKQTPMathImage supports different dataytpes ([u]nit8/16/32/64,float,double see `JKQTPMathImageBase::DataType`) that can be configured e.g. by `setData()`. +This project (see `./examples/imageplot_nodatastore/`) simply creates a JKQTPlotter widget (as a new window) and adds a color-coded image plot of a mathematical function (here the Airy disk). The image is stored as a simple C-array in row-major ordering and then given to a JKQTPMathImage to visualize it. The data is stored as a pointer directly in the JKQTPMathImage object. There is also a variant JKQTPColumnMathImage of JKQTPMathImage, which references a column in the internal JKQTdatastore and uses the data there for plotting. In both cases data has to be organized as a row-major matrix of values. JKQTPMathImage supports different dataytpes ([u]nit8/16/32/64,float,double see `JKQTPMathImageBase::DataType`) that can be configured e.g. by `setData()`. -The source code of the main application is (see [`jkqtplotter_simpletest_imageplot_nodatastore.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.cpp): +The source code of the main application is (see [`imageplot_nodatastore.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/imageplot_nodatastore/imageplot_nodatastore.cpp): ```.cpp #include #include @@ -103,8 +103,8 @@ int main(int argc, char* argv[]) The result looks like this: -![jkqtplotter_simpletest_imageplot_nodatastore](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot_nodatastore.png) +![imageplot_nodatastore](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/imageplot_nodatastore.png) -See [`test/simpletest_imageplot`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_imageplot) for a detailed description of the other possibilities that the class JKQTPColumnMathImage (and also JKQTPMathImage) offer with respect to determining how an image is plottet. +See [`examples/imageplot`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/imageplot) for a detailed description of the other possibilities that the class JKQTPColumnMathImage (and also JKQTPMathImage) offer with respect to determining how an image is plottet. diff --git a/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.cpp b/examples/imageplot_nodatastore/imageplot_nodatastore.cpp similarity index 98% rename from examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.cpp rename to examples/imageplot_nodatastore/imageplot_nodatastore.cpp index 62ef0cb60c..8453429004 100644 --- a/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.cpp +++ b/examples/imageplot_nodatastore/imageplot_nodatastore.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_imageplot_nodatastore.cpp +/** \example imageplot_nodatastore.cpp * Simple math image plot without use of central JKQTdatastore * * \ref JKQTPlotterImagePlotNoDatastore diff --git a/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.pro b/examples/imageplot_nodatastore/imageplot_nodatastore.pro similarity index 70% rename from examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.pro rename to examples/imageplot_nodatastore/imageplot_nodatastore.pro index d2018ee28f..b67178cc90 100644 --- a/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.pro +++ b/examples/imageplot_nodatastore/imageplot_nodatastore.pro @@ -1,10 +1,10 @@ TEMPLATE = app # output executable name -TARGET = jkqtplotter_simpletest_imageplot_nodatastore +TARGET = imageplot_nodatastore # source code for this simple demo -SOURCES = jkqtplotter_simpletest_imageplot_nodatastore.cpp +SOURCES = imageplot_nodatastore.cpp # configure Qt CONFIG += link_prl qt @@ -12,12 +12,12 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/imageplot_nodatastore/imageplot_nodatastore_and_lib.pro b/examples/imageplot_nodatastore/imageplot_nodatastore_and_lib.pro new file mode 100644 index 0000000000..32d9b18d55 --- /dev/null +++ b/examples/imageplot_nodatastore/imageplot_nodatastore_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib imageplot_nodatastore + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +imageplot_nodatastore.file=$$PWD/imageplot_nodatastore.pro +imageplot_nodatastore.depends = jkqtplotterlib diff --git a/examples/simpletest_imageplot_opencv/.gitignore b/examples/imageplot_opencv/.gitignore similarity index 100% rename from examples/simpletest_imageplot_opencv/.gitignore rename to examples/imageplot_opencv/.gitignore diff --git a/examples/imageplot_opencv/CMakeLists.txt b/examples/imageplot_opencv/CMakeLists.txt new file mode 100644 index 0000000000..b354f04bac --- /dev/null +++ b/examples/imageplot_opencv/CMakeLists.txt @@ -0,0 +1,34 @@ +cmake_minimum_required(VERSION 3.0) +if (BUILD_HAS_OPENCV) + find_package( OpenCV ) + if(OpenCV_FOUND) + + set(EXAMPLE_NAME imageplot_opencv) + set(EXENAME jkqtptest_${EXAMPLE_NAME}) + + message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + # Set up source files + set(SOURCES ${EXAMPLE_NAME}.cpp) + set(HEADERS ) + set(RESOURCES ) + set(UIS ) + + add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) + target_include_directories(${EXENAME} PRIVATE ../../lib) + if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) + elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) + endif() + include_directories( ${OpenCV_INCLUDE_DIRS} ) + target_link_libraries(${EXENAME} ${OpenCV_LIBS} ) + + + + # Installation + if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif(LIB_INSTALL) + endif(OpenCV_FOUND) +endif() \ No newline at end of file diff --git a/examples/simpletest_imageplot_opencv/README.md b/examples/imageplot_opencv/README.md similarity index 81% rename from examples/simpletest_imageplot_opencv/README.md rename to examples/imageplot_opencv/README.md index d24a904d51..3af489b160 100644 --- a/examples/simpletest_imageplot_opencv/README.md +++ b/examples/imageplot_opencv/README.md @@ -1,10 +1,10 @@ # Example (JKQTPlotter): Simple math image plot, showin a 1-channel OpenCV cv::Mat {#JKQTPlotterImagePlotOpenCV} -This project (see `./examples/simpletest_imageplot_opencv/`) simply creates a JKQTPlotter widget (as a new window) and adds a color-coded image plot of a mathematical function (here the Airy disk). The image is generated as an OpenCV cv::Mat image and then copied into a single column of the internal datasdtore (JKQTPMathImage could be directly used without the internal datastore). +This project (see `./examples/imageplot_opencv/`) simply creates a JKQTPlotter widget (as a new window) and adds a color-coded image plot of a mathematical function (here the Airy disk). The image is generated as an OpenCV cv::Mat image and then copied into a single column of the internal datasdtore (JKQTPMathImage could be directly used without the internal datastore). To copy the data a special OpenCV Interface function `JKQTPCopyCvMatToColumn()` is used, that copies the data from a cv::Mat directly into a column. The function `JKQTPCopyCvMatToColumn()` is available from the (non-default) header-only extension from `jkqtplotter/jkqtpopencvinterface.h`. This header provides facilities to interface JKQTPlotter with OPenCV. -The source code of the main application is (see [`jkqtplotter_simpletest_imageplot_opencv.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_imageplot_opencv/jkqtplotter_simpletest_imageplot_opencv.cpp): +The source code of the main application is (see [`imageplot_opencv.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/imageplot_opencv/imageplot_opencv.cpp): ```.cpp #include #include @@ -117,7 +117,7 @@ int main(int argc, char* argv[]) ``` The result looks like this: -![jkqtplotter_simpletest_imageplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot_opencv.png) +![imageplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/imageplot_opencv.png) -See [`test/simpletest_imageplot`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_imageplot) for a detailed description of the other possibilities that the class JKQTPColumnMathImage (and also JKQTPMathImage) offer with respect to determining how an image is plottet. +See [`examples/imageplot`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/imageplot) for a detailed description of the other possibilities that the class JKQTPColumnMathImage (and also JKQTPMathImage) offer with respect to determining how an image is plottet. diff --git a/examples/simpletest_imageplot_opencv/jkqtplotter_simpletest_imageplot_opencv.cpp b/examples/imageplot_opencv/imageplot_opencv.cpp similarity index 98% rename from examples/simpletest_imageplot_opencv/jkqtplotter_simpletest_imageplot_opencv.cpp rename to examples/imageplot_opencv/imageplot_opencv.cpp index 66a40b6108..51b77f3043 100644 --- a/examples/simpletest_imageplot_opencv/jkqtplotter_simpletest_imageplot_opencv.cpp +++ b/examples/imageplot_opencv/imageplot_opencv.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_imageplot_opencv.cpp +/** \example imageplot_opencv.cpp * Simple math image plot, showin a 1-channel OpenCV cv::Mat * * \ref JKQTPlotterImagePlotOpenCV diff --git a/examples/simpletest_imageplot_opencv/jkqtplotter_simpletest_imageplot_opencv.pro b/examples/imageplot_opencv/imageplot_opencv.pro similarity index 79% rename from examples/simpletest_imageplot_opencv/jkqtplotter_simpletest_imageplot_opencv.pro rename to examples/imageplot_opencv/imageplot_opencv.pro index 8d00a29027..505a11b657 100644 --- a/examples/simpletest_imageplot_opencv/jkqtplotter_simpletest_imageplot_opencv.pro +++ b/examples/imageplot_opencv/imageplot_opencv.pro @@ -1,5 +1,5 @@ # source code for this simple demo -SOURCES = jkqtplotter_simpletest_imageplot_opencv.cpp +SOURCES = imageplot_opencv.cpp # configure Qt CONFIG += link_prl qt @@ -7,7 +7,7 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # output executable name -TARGET = jkqtplotter_simpletest_imageplot_opencv +TARGET = imageplot_opencv # link agains OpenCV-3.4.1 @@ -25,9 +25,9 @@ opencvdlls.path=$$OUT_PWD INCLUDEPATH+=../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/imageplot_opencv/imageplot_opencv_and_lib.pro b/examples/imageplot_opencv/imageplot_opencv_and_lib.pro new file mode 100644 index 0000000000..264efa102b --- /dev/null +++ b/examples/imageplot_opencv/imageplot_opencv_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib imageplot_opencv + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +imageplot_opencv.file=$$PWD/imageplot_opencv.pro +imageplot_opencv.depends = jkqtplotterlib diff --git a/examples/impulsesplot/CMakeLists.txt b/examples/impulsesplot/CMakeLists.txt new file mode 100644 index 0000000000..2655373646 --- /dev/null +++ b/examples/impulsesplot/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME impulsesplot) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_impulsesplot/README.md b/examples/impulsesplot/README.md similarity index 65% rename from examples/simpletest_impulsesplot/README.md rename to examples/impulsesplot/README.md index dd8409364c..d056a0bc89 100644 --- a/examples/simpletest_impulsesplot/README.md +++ b/examples/impulsesplot/README.md @@ -1,6 +1,6 @@ # Example (JKQTPlotter): Simple impulse plots {#JKQTPlotterImpulsePlots} -This project (see `./examples/simpletest_impulsesplot/`) simply creates a JKQTPlotter widget (as a new window) and adds a single impulse graph. -The source code of the main application is (see [`jkqtplotter_simpletest_impulsesplot.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot.cpp). +This project (see `./examples/impulsesplot/`) simply creates a JKQTPlotter widget (as a new window) and adds a single impulse graph. +The source code of the main application is (see [`impulsesplot.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/impulsesplot/impulsesplot.cpp). @@ -34,7 +34,7 @@ Now an impulse graph object is generated and added to the plot: The result looks like this: -![jkqtplotter_simpletest_impulsesplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_impulsesplot.png) +![impulsesplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/impulsesplot.png) There is an alternative class `JKQTPImpulsesHorizontalGraph` which draws horizontal impulse plots: ```.cpp @@ -48,7 +48,7 @@ There is an alternative class `JKQTPImpulsesHorizontalGraph` which draws horizon This code snippet results in a plot like this: -![jkqtplotter_simpletest_impulsesplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_impulsesplot_horizontal.png) +![impulsesplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/impulsesplot_horizontal.png) The classes `JKQTPImpulsesVerticalGraph` and `JKQTPImpulsesHorizontalGraph` also provide the ability to draw a symbol at the end of the impulse, e.g. using this code: @@ -59,7 +59,7 @@ The classes `JKQTPImpulsesVerticalGraph` and `JKQTPImpulsesHorizontalGraph` also This code snippet results in a plot like this: -![jkqtplotter_simpletest_impulsesplot_symbols](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_impulsesplot_symbols.png) +![impulsesplot_symbols](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/impulsesplot_symbols.png) Finally you can move the baseline (i.e. the level, where the impulses start, which is typically x=0 or y=0) in the classes `JKQTPImpulsesVerticalGraph` and `JKQTPImpulsesHorizontalGraph`: @@ -69,5 +69,5 @@ Finally you can move the baseline (i.e. the level, where the impulses start, whi This code snippet results in a plot like this: -![jkqtplotter_simpletest_impulsesplot_baseline](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_impulsesplot_baseline.png) +![impulsesplot_baseline](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/impulsesplot_baseline.png) diff --git a/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot.cpp b/examples/impulsesplot/impulsesplot.cpp similarity index 97% rename from examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot.cpp rename to examples/impulsesplot/impulsesplot.cpp index 632f61ad39..3708d30f62 100644 --- a/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot.cpp +++ b/examples/impulsesplot/impulsesplot.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_impulsesplot.cpp +/** \example impulsesplot.cpp * Shows how to plot impulse graphs with JKQTPlotter * * \ref JKQTPlotterImpulsePlots diff --git a/examples/impulsesplot/impulsesplot.pro b/examples/impulsesplot/impulsesplot.pro new file mode 100644 index 0000000000..ef4be1f179 --- /dev/null +++ b/examples/impulsesplot/impulsesplot.pro @@ -0,0 +1,28 @@ +# source code for this simple demo +SOURCES = impulsesplot.cpp + +# configure Qt +CONFIG += link_prl qt +QT += core gui xml svg +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport + +# output executable name +TARGET = impulsesplot + + +# include JKQTPlotter source code +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib +INCLUDEPATH += ../../lib +CONFIG (debug, debug|release) { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug +} else { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib +} +message("LIBS = $$LIBS") + +win32-msvc*: DEFINES += _USE_MATH_DEFINES +win32-msvc*: DEFINES += NOMINMAX + + + + diff --git a/examples/impulsesplot/impulsesplot_and_lib.pro b/examples/impulsesplot/impulsesplot_and_lib.pro new file mode 100644 index 0000000000..dd9db97d63 --- /dev/null +++ b/examples/impulsesplot/impulsesplot_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib impulsesplot + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +impulsesplot.file=$$PWD/impulsesplot.pro +impulsesplot.depends = jkqtplotterlib diff --git a/examples/jkqtfastplotter_test/CMakeLists.txt b/examples/jkqtfastplotter_test/CMakeLists.txt new file mode 100644 index 0000000000..fb77d9c54b --- /dev/null +++ b/examples/jkqtfastplotter_test/CMakeLists.txt @@ -0,0 +1,31 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME jkqtfastplotter_test) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES + jkqtfastplotter_test.cpp + jkqtfastplotter_test_testmain.cpp +) +set(HEADERS jkqtfastplotter_test_testmain.h ) +set(RESOURCES jkqtfastplotter_test.qrc ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTFastPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTFastPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/jkqtfastplotter_test/jkqtfastplotter_test.pro b/examples/jkqtfastplotter_test/jkqtfastplotter_test.pro index 71f562cecf..5e2d81eff5 100644 --- a/examples/jkqtfastplotter_test/jkqtfastplotter_test.pro +++ b/examples/jkqtfastplotter_test/jkqtfastplotter_test.pro @@ -29,12 +29,12 @@ DEFINES += DEBUG_TIMING greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # include JKQTPlotter library -DEPENDPATH += ../../lib ../../staticlib/jkqtfastplotterlib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtfastplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtfastplotterlib/debug -ljkqtfastplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtfastplotterlib/debug -ljkqtfastplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtfastplotterlib/release -ljkqtfastplotterlib + LIBS += -L../../qmake/staticlib/jkqtfastplotterlib/release -ljkqtfastplotterlib } message("LIBS = $$LIBS") win32-msvc*: DEFINES += _USE_MATH_DEFINES diff --git a/examples/jkqtfastplotter_test/jkqtfastplotter_test.qrc b/examples/jkqtfastplotter_test/jkqtfastplotter_test.qrc new file mode 100644 index 0000000000..5c4c6e55ce --- /dev/null +++ b/examples/jkqtfastplotter_test/jkqtfastplotter_test.qrc @@ -0,0 +1,6 @@ + + + lena.png + lena.jpg + + diff --git a/examples/jkqtfastplotter_test/jkqtfastplotter_test_and_lib.pro b/examples/jkqtfastplotter_test/jkqtfastplotter_test_and_lib.pro index cfc8993276..aba02c336a 100644 --- a/examples/jkqtfastplotter_test/jkqtfastplotter_test_and_lib.pro +++ b/examples/jkqtfastplotter_test/jkqtfastplotter_test_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtfastplotterlib jkqtfastplotter_test -jkqtfastplotterlib.file = ../../staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro +jkqtfastplotterlib.file = ../../qmake/staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro jkqtfastplotter_test.file=$$PWD/jkqtfastplotter_test.pro jkqtfastplotter_test.depends = jkqtfastplotterlib diff --git a/examples/jkqtfastplotter_test/jkqtfastplotter_test_testmain.cpp b/examples/jkqtfastplotter_test/jkqtfastplotter_test_testmain.cpp index 35aa001b07..2532e4afa0 100644 --- a/examples/jkqtfastplotter_test/jkqtfastplotter_test_testmain.cpp +++ b/examples/jkqtfastplotter_test/jkqtfastplotter_test_testmain.cpp @@ -65,7 +65,7 @@ TestMain::TestMain(QWidget *parent) : JKQTFPLinePlot* p3=new JKQTFPLinePlot(pl1, N1, x, y3, QColor("darkgreen")); JKQTFPLinePlot* pv=new JKQTFPLinePlot(pl1, &xx, &yy, QColor("black"), Qt::SolidLine, 3); - img=QImage("lena.png"); + img=QImage(":/lena.png"); JKQTFPQImagePlot* p4=new JKQTFPQImagePlot(pl2, &img, 0, 10, 0, 10); for (int x=0; x - - - RunConfiguration0-BaseEnvironmentBase - 2 - - - RunConfiguration0-CommandLineArguments - - - - RunConfiguration0-ProFile - example/example.pro - - - RunConfiguration0-RunConfiguration.name - example - - - RunConfiguration0-UseDyldImageSuffix - false - - - RunConfiguration0-UseTerminal - false - - - RunConfiguration0-UserEnvironmentChanges - - - - RunConfiguration0-UserSetName - false - - - RunConfiguration0-UserSetWorkingDirectory - false - - - RunConfiguration0-UserWorkingDirectory - - - - RunConfiguration0-type - Qt4ProjectManager.Qt4RunConfiguration - - - activeRunConfiguration - 0 - - - activebuildconfiguration - Debug - - - buildConfiguration-Debug - - Debug - 0 - 2 - 2 - - - - buildConfiguration-Release - - Release - 0 - 2 - 0 - - - - buildconfiguration-Debug-buildstep0 - - Debug - - - - buildconfiguration-Debug-buildstep1 - - Debug - - - - buildconfiguration-Debug-cleanstep0 - - Debug - true - - clean - - - - - buildconfiguration-Release-buildstep0 - - Release - - - - buildconfiguration-Release-buildstep1 - - Release - - - - buildconfiguration-Release-cleanstep0 - - Release - - - - buildconfigurations - - Debug - Release - - - - buildstep0 - - - - - - - buildstep1 - - - - - - buildsteps - - trolltech.qt4projectmanager.qmake - trolltech.qt4projectmanager.make - - - - cleanstep0 - - - true - - - - cleansteps - - trolltech.qt4projectmanager.make - - - - defaultFileEncoding - System - - - project - - - diff --git a/examples/jkqtplot_test/jkqtplot_test.pro b/examples/jkqtplot_test/jkqtplot_test.pro index e63344177c..ddd5f43023 100644 --- a/examples/jkqtplot_test/jkqtplot_test.pro +++ b/examples/jkqtplot_test/jkqtplot_test.pro @@ -64,9 +64,9 @@ DEPENDPATH += $$PWD #$$PWD/../../lib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/jkqtplot_test/jkqtplot_test_and_lib.pro b/examples/jkqtplot_test/jkqtplot_test_and_lib.pro index ba5aa84c27..252840dd20 100644 --- a/examples/jkqtplot_test/jkqtplot_test_and_lib.pro +++ b/examples/jkqtplot_test/jkqtplot_test_and_lib.pro @@ -5,4 +5,4 @@ SUBDIRS += jkqtplot_test jkqtplotterlib jkqtplot_test.file=$$PWD/jkqtplot_test.pro jkqtplot_test.depends = jkqtplotterlib -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro diff --git a/examples/logaxes/CMakeLists.txt b/examples/logaxes/CMakeLists.txt new file mode 100644 index 0000000000..c46ca4eb9b --- /dev/null +++ b/examples/logaxes/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME logaxes) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_logaxes/README.md b/examples/logaxes/README.md similarity index 79% rename from examples/simpletest_logaxes/README.md rename to examples/logaxes/README.md index a7a6bd9b81..d43d9d0bd4 100644 --- a/examples/simpletest_logaxes/README.md +++ b/examples/logaxes/README.md @@ -1,7 +1,7 @@ # Example (JKQTPlotter): Line Graph with Logarithmic y-axis {#JKQTPlotterLogAxes} -This project (see `./examples/simpletest_logaxes/`) simply creates a JKQTPlotter widget (as a new window) and several line-graphs of different resonance curves. +This project (see `./examples/logaxes/`) simply creates a JKQTPlotter widget (as a new window) and several line-graphs of different resonance curves. -The source code of the main application can be found in [`jkqtplotter_simpletest_logaxes.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.cpp). Mainly several graphs are generated in a loop and then different line styles are applied to the graphs (set by ``graph->setLineStyle()`). The colors are set automtically from an internal default palette. The main loop looks like this: +The source code of the main application can be found in [`logaxes.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/logaxes/logaxes.cpp). Mainly several graphs are generated in a loop and then different line styles are applied to the graphs (set by ``graph->setLineStyle()`). The colors are set automtically from an internal default palette. The main loop looks like this: ```.cpp QVector pens {Qt::SolidLine, Qt::DashLine, Qt::DotLine, Qt::DashDotLine, Qt::DashDotDotLine }; @@ -47,8 +47,8 @@ Then a `JKQTPGeoText` is added to the graph, which shows the function plotted in plot.addGraph(new JKQTPGeoText(&plot, 1.25, 10, "$\\frac{A}{A_{stat}}=\\frac{1}{\\sqrt{\\left(1-\\eta^2\\right)^2+\\left(2{\\eta}D\\right)^2}}$", 15, QColor("black"))); ``` The difference between not using and using `$...$` for the equation can be seen here: -- no $-math-mode: ![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_logaxes_lowqmathrendering.png) -- using $-math-mode: ![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_logaxes_highqmathrendering.png) +- no $-math-mode: ![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/logaxes_lowqmathrendering.png) +- using $-math-mode: ![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/logaxes_highqmathrendering.png) Finally the y-axis is switched to logarithmic scaling and the axis labels are set: ```.cpp @@ -84,15 +84,15 @@ As an alternative `JKQTPCALTexponentCharacter` does not use the power-of-10 nota The result looks like this: -![jkqtplotter_simpletest_logaxes](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_logaxes.png) +![logaxes](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/logaxes.png) Without the logarithmic scaling we would have: -![jkqtplotter_simpletest_logaxes_nolog](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_logaxes_nolog.png) +![logaxes_nolog](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/logaxes_nolog.png) Switching the minor grid off results in a plot like this: -![jkqtplotter_simpletest_logaxes_nominorgrid](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_logaxes_nominorgrid.png) +![logaxes_nominorgrid](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/logaxes_nominorgrid.png) These examples show the results for different typical values for `setMinorTicks()`: diff --git a/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.cpp b/examples/logaxes/logaxes.cpp similarity index 99% rename from examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.cpp rename to examples/logaxes/logaxes.cpp index c124148209..90ed37a8a5 100644 --- a/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.cpp +++ b/examples/logaxes/logaxes.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_logaxes.cpp +/** \example logaxes.cpp * Shows how to use logarithmic axes with JKQTPlotter * * \ref JKQTPlotterLogAxes diff --git a/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.pro b/examples/logaxes/logaxes.pro similarity index 57% rename from examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.pro rename to examples/logaxes/logaxes.pro index 6e76408829..2460bf81eb 100644 --- a/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.pro +++ b/examples/logaxes/logaxes.pro @@ -1,5 +1,5 @@ # source code for this simple demo -SOURCES = jkqtplotter_simpletest_logaxes.cpp +SOURCES = logaxes.cpp # configure Qt CONFIG += link_prl qt @@ -7,15 +7,15 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # output executable name -TARGET = jkqtplotter_simpletest_logaxes +TARGET = logaxes # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/logaxes/logaxes_and_lib.pro b/examples/logaxes/logaxes_and_lib.pro new file mode 100644 index 0000000000..8f881f15fb --- /dev/null +++ b/examples/logaxes/logaxes_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib logaxes + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +logaxes.file=$$PWD/logaxes.pro +logaxes.depends = jkqtplotterlib diff --git a/examples/multiplot/CMakeLists.txt b/examples/multiplot/CMakeLists.txt new file mode 100644 index 0000000000..5ccfa4ded3 --- /dev/null +++ b/examples/multiplot/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME test_multiplot) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp test_multiplot_ui.cpp) +set(HEADERS test_multiplot_ui.h) +set(RESOURCES test_multiplot.qrc ) +set(UIS test_multiplot_ui.ui ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/test_multiplot/README.md b/examples/multiplot/README.md similarity index 100% rename from examples/test_multiplot/README.md rename to examples/multiplot/README.md diff --git a/examples/test_multiplot/plotsymbol.png b/examples/multiplot/plotsymbol.png similarity index 100% rename from examples/test_multiplot/plotsymbol.png rename to examples/multiplot/plotsymbol.png diff --git a/examples/test_multiplot/test_multiplot.cpp b/examples/multiplot/test_multiplot.cpp similarity index 100% rename from examples/test_multiplot/test_multiplot.cpp rename to examples/multiplot/test_multiplot.cpp diff --git a/examples/test_multiplot/test_multiplot.pro b/examples/multiplot/test_multiplot.pro similarity index 81% rename from examples/test_multiplot/test_multiplot.pro rename to examples/multiplot/test_multiplot.pro index a43634eaef..f5133ab4ed 100644 --- a/examples/test_multiplot/test_multiplot.pro +++ b/examples/multiplot/test_multiplot.pro @@ -16,9 +16,9 @@ TARGET = test_multiplot DEPENDPATH += ../../lib ../../staticlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/test_multiplot/test_multiplot.qrc b/examples/multiplot/test_multiplot.qrc similarity index 100% rename from examples/test_multiplot/test_multiplot.qrc rename to examples/multiplot/test_multiplot.qrc diff --git a/examples/test_multiplot/test_multiplot_and_lib.pro b/examples/multiplot/test_multiplot_and_lib.pro similarity index 65% rename from examples/test_multiplot/test_multiplot_and_lib.pro rename to examples/multiplot/test_multiplot_and_lib.pro index 6257d486f0..e17bffff30 100644 --- a/examples/test_multiplot/test_multiplot_and_lib.pro +++ b/examples/multiplot/test_multiplot_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib test_multiplot -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro test_multiplot.file=$$PWD/test_multiplot.pro test_multiplot.depends = jkqtplotterlib diff --git a/examples/test_multiplot/test_multiplot_ui.cpp b/examples/multiplot/test_multiplot_ui.cpp similarity index 100% rename from examples/test_multiplot/test_multiplot_ui.cpp rename to examples/multiplot/test_multiplot_ui.cpp diff --git a/examples/test_multiplot/test_multiplot_ui.h b/examples/multiplot/test_multiplot_ui.h similarity index 100% rename from examples/test_multiplot/test_multiplot_ui.h rename to examples/multiplot/test_multiplot_ui.h diff --git a/examples/test_multiplot/test_multiplot_ui.ui b/examples/multiplot/test_multiplot_ui.ui similarity index 100% rename from examples/test_multiplot/test_multiplot_ui.ui rename to examples/multiplot/test_multiplot_ui.ui diff --git a/examples/parametriccurve/CMakeLists.txt b/examples/parametriccurve/CMakeLists.txt new file mode 100644 index 0000000000..696b3911c0 --- /dev/null +++ b/examples/parametriccurve/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME parametriccurve) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_parametriccurve/README.md b/examples/parametriccurve/README.md similarity index 61% rename from examples/simpletest_parametriccurve/README.md rename to examples/parametriccurve/README.md index bf76f82464..f198c5ab5b 100644 --- a/examples/simpletest_parametriccurve/README.md +++ b/examples/parametriccurve/README.md @@ -1,7 +1,7 @@ # Example (JKQTPlotter): Plotting Parametric Curves {#JKQTPlotterParametricCurves} -This project (see `./examples/simpletest_parametriccurve/`) demonstrates how to draw parametric curves, using [`JKQTPXYLineGraph`}(../simpletest) and [`JKQTPXYParametrizedScatterGraph`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_paramscatterplot). +This project (see `./examples/parametriccurve/`) demonstrates how to draw parametric curves, using [`JKQTPXYLineGraph`}(../simpletest) and [`JKQTPXYParametrizedScatterGraph`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/paramscatterplot). -The source code of the main application can be found in [`jkqtplotter_simpletest_parametriccurve.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve.cpp). First, the parametric curve (here a [logarithic spiral](https://en.wikipedia.org/wiki/Logarithmic_spiral)) is sampled into two columns containing the x- and y-values along the curve. In addition the radial distance from x=y=0 is added into a third column: +The source code of the main application can be found in [`parametriccurve.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/parametriccurve/parametriccurve.cpp). First, the parametric curve (here a [logarithic spiral](https://en.wikipedia.org/wiki/Logarithmic_spiral)) is sampled into two columns containing the x- and y-values along the curve. In addition the radial distance from x=y=0 is added into a third column: ```.cpp QVector X, Y, R; const int Ndata=500; // number of plot points in each curve @@ -49,11 +49,11 @@ If you use `JKQTPXYParametrizedScatterGraph` instead of `JKQTPXYLineGraph`, you The result looks like this: -![jkqtplotter_simpletest_parametriccurve](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_parametriccurve1.png) +![parametriccurve](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/parametriccurve1.png) ... and with the line-color set by the radius: -![jkqtplotter_simpletest_parametriccurve](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_parametriccurve2.png) +![parametriccurve](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/parametriccurve2.png) diff --git a/examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve.cpp b/examples/parametriccurve/parametriccurve.cpp similarity index 98% rename from examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve.cpp rename to examples/parametriccurve/parametriccurve.cpp index 40c62f41e7..92f888d816 100644 --- a/examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve.cpp +++ b/examples/parametriccurve/parametriccurve.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_parametriccurve.cpp +/** \example parametriccurve.cpp * Shows how to plot parametric curves from datapoints with JKQTPlotter * * \ref JKQTPlotterParametricCurves diff --git a/examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot.pro b/examples/parametriccurve/parametriccurve.pro similarity index 56% rename from examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot.pro rename to examples/parametriccurve/parametriccurve.pro index 0bbb0e4077..baa320691d 100644 --- a/examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot.pro +++ b/examples/parametriccurve/parametriccurve.pro @@ -1,5 +1,5 @@ # source code for this simple demo -SOURCES = jkqtplotter_simpletest_paramscatterplot.cpp +SOURCES = parametriccurve.cpp # configure Qt CONFIG += link_prl qt @@ -7,16 +7,16 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # output executable name -TARGET = jkqtplotter_simpletest_paramscatterplot +TARGET = parametriccurve # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/parametriccurve/parametriccurve_and_lib.pro b/examples/parametriccurve/parametriccurve_and_lib.pro new file mode 100644 index 0000000000..44676b1aa1 --- /dev/null +++ b/examples/parametriccurve/parametriccurve_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib parametriccurve + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +parametriccurve.file=$$PWD/parametriccurve.pro +parametriccurve.depends = jkqtplotterlib diff --git a/examples/paramscatterplot/CMakeLists.txt b/examples/paramscatterplot/CMakeLists.txt new file mode 100644 index 0000000000..4e4baed6df --- /dev/null +++ b/examples/paramscatterplot/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME paramscatterplot) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_paramscatterplot/README.md b/examples/paramscatterplot/README.md similarity index 86% rename from examples/simpletest_paramscatterplot/README.md rename to examples/paramscatterplot/README.md index 99eed041c5..b504375b3a 100644 --- a/examples/simpletest_paramscatterplot/README.md +++ b/examples/paramscatterplot/README.md @@ -1,13 +1,13 @@ # Example (JKQTPlotter): Scatter Graph with Parametrized Symbols/Colors {#JKQTPlotterParamScatter} -This project (see `./examples/simpletest_paramscatterplot/`) demonstrates the capabilities of `JKQTPXYParametrizedScatterGraph`. This graph class plots symbol&line-graphs, juts like [`JKQTPXYLineGraph`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_symbols_and_styles/) and in addition modifies several properties of each plot point by data from an additional column. These properties can be modified: +This project (see `./examples/paramscatterplot/`) demonstrates the capabilities of `JKQTPXYParametrizedScatterGraph`. This graph class plots symbol&line-graphs, juts like [`JKQTPXYLineGraph`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/symbols_and_styles/) and in addition modifies several properties of each plot point by data from an additional column. These properties can be modified: - symbol size - symbol type - symbol/line color - line width -The source code of the main application can be found in [`jkqtplotter_simpletest_paramscatterplot.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot.cpp). First, several datasets are generated and added to the internal datastore. the resulting datatable looks like this: +The source code of the main application can be found in [`paramscatterplot.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/paramscatterplot/paramscatterplot.cpp). First, several datasets are generated and added to the internal datastore. the resulting datatable looks like this: -![jkqtplotter_simpletest_paramscatterplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_paramscatterplot_datatable.png) +![paramscatterplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/paramscatterplot_datatable.png) Then several plots are added that modify different properties. @@ -106,7 +106,7 @@ Note also that it is possible to combine any of parametrizations above in a sing The full test appication combines all these variants and the result looks like this: -![jkqtplotter_simpletest_paramscatterplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_paramscatterplot.png) +![paramscatterplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/paramscatterplot.png) In `` you can also set special functors that transform the values from the data columns (symbol type+size, datapoint), before using them for the plot, which gives you even more control. As an example you can set a special functor to `graph6`: diff --git a/examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot.cpp b/examples/paramscatterplot/paramscatterplot.cpp similarity index 99% rename from examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot.cpp rename to examples/paramscatterplot/paramscatterplot.cpp index c331fb4a28..1c0d969ddf 100644 --- a/examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot.cpp +++ b/examples/paramscatterplot/paramscatterplot.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_paramscatterplot.cpp +/** \example paramscatterplot.cpp * JKQTPlotter: Examples: Scatter Graph with Parametrized Symbols/Colors * * \ref JKQTPlotterParamScatter diff --git a/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.pro b/examples/paramscatterplot/paramscatterplot.pro similarity index 56% rename from examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.pro rename to examples/paramscatterplot/paramscatterplot.pro index 189d87db3d..a0e68f0823 100644 --- a/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.pro +++ b/examples/paramscatterplot/paramscatterplot.pro @@ -1,5 +1,5 @@ # source code for this simple demo -SOURCES = jkqtplotter_simpletest_symbols_and_styles.cpp +SOURCES = paramscatterplot.cpp # configure Qt CONFIG += link_prl qt @@ -7,16 +7,16 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # output executable name -TARGET = jkqtplotter_simpletest_symbols_and_styles +TARGET = paramscatterplot # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/paramscatterplot/paramscatterplot_and_lib.pro b/examples/paramscatterplot/paramscatterplot_and_lib.pro new file mode 100644 index 0000000000..c68bd29bcb --- /dev/null +++ b/examples/paramscatterplot/paramscatterplot_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib paramscatterplot + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +paramscatterplot.file=$$PWD/paramscatterplot.pro +paramscatterplot.depends = jkqtplotterlib diff --git a/examples/paramscatterplot_image/CMakeLists.txt b/examples/paramscatterplot_image/CMakeLists.txt new file mode 100644 index 0000000000..6930b59d3d --- /dev/null +++ b/examples/paramscatterplot_image/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME paramscatterplot_image) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ${EXAMPLE_NAME}.qrc ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_paramscatterplot_image/README.md b/examples/paramscatterplot_image/README.md similarity index 72% rename from examples/simpletest_paramscatterplot_image/README.md rename to examples/paramscatterplot_image/README.md index fd0726558e..adff6e8e59 100644 --- a/examples/simpletest_paramscatterplot_image/README.md +++ b/examples/paramscatterplot_image/README.md @@ -1,5 +1,5 @@ # Example (JKQTPlotter): Draw an Artistic Image with a Parametrized Scatter Graph {#JKQTPlotterParamScatterImage} -This project (see `./examples/simpletest_paramscatterplot_image/`) demonstrates the capabilities of `JKQTPXYParametrizedScatterGraph` to display parametrized scatters in a rectangular arrangement. See the test program in [`test/simpletest_paramscatterplot`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_paramscatterplot) for a basic example of the capabilities of `JKQTPXYParametrizedScatterGraph`. +This project (see `./examples/paramscatterplot_image/`) demonstrates the capabilities of `JKQTPXYParametrizedScatterGraph` to display parametrized scatters in a rectangular arrangement. See the test program in [`examples/paramscatterplot`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/paramscatterplot) for a basic example of the capabilities of `JKQTPXYParametrizedScatterGraph`. In this example, we load an image, convert it to greyscale and store it, together with x/y-coordinate-vectors in the datastore. Then a `JKQTPXYParametrizedScatterGraph` is used to draw the image as a pointilistic artwork, where each pixel is represented by a disk. The color of the disk is chosen from a color-palette, based on the grey-value. The size of each disk is chosen from the inverse grey value. @@ -75,20 +75,20 @@ Finally the plot is styled and the axis aspect ratios are fixed: The full test appication combines all these variants and the result looks like this: -![jkqtplotter_simpletest_paramscatterplot_image](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_paramscatterplot_image.png) +![paramscatterplot_image](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/paramscatterplot_image.png) You can modify the example above in several ways, e.g. by choosing another symbol (e.g. a star): -![jkqtplotter_simpletest_paramscatterplot_image_star](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_paramscatterplot_image_star.png) +![paramscatterplot_image_star](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/paramscatterplot_image_star.png) ... or by changing the color palette and the symbol: -![jkqtplotter_simpletest_paramscatterplot_image_palette](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_paramscatterplot_image_palette.png) +![paramscatterplot_image_palette](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/paramscatterplot_image_palette.png) -![jkqtplotter_simpletest_paramscatterplot_image_palette_triangle](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_paramscatterplot_image_palette_triangle.png) +![paramscatterplot_image_palette_triangle](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/paramscatterplot_image_palette_triangle.png) ... or even to set a different symbol for each pixel, based on the values in `columnS` (simply add `graph1->setSymbolColumn(columnS)`): -![jkqtplotter_simpletest_paramscatterplot_image_varsymbol](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_paramscatterplot_image_varsymbol.png) +![paramscatterplot_image_varsymbol](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/paramscatterplot_image_varsymbol.png) diff --git a/examples/simpletest_paramscatterplot_image/example.bmp b/examples/paramscatterplot_image/example.bmp similarity index 100% rename from examples/simpletest_paramscatterplot_image/example.bmp rename to examples/paramscatterplot_image/example.bmp diff --git a/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image.cpp b/examples/paramscatterplot_image/paramscatterplot_image.cpp similarity index 98% rename from examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image.cpp rename to examples/paramscatterplot_image/paramscatterplot_image.cpp index a9c4e0d0e1..82419829bf 100644 --- a/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image.cpp +++ b/examples/paramscatterplot_image/paramscatterplot_image.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_paramscatterplot_image.cpp +/** \example paramscatterplot_image.cpp * JKQTPlotter: Examples: Draw an Artistic Image with a Parametrized Scatter Graph * * \ref JKQTPlotterParamScatterImage diff --git a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.pro b/examples/paramscatterplot_image/paramscatterplot_image.pro similarity index 53% rename from examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.pro rename to examples/paramscatterplot_image/paramscatterplot_image.pro index 2d56e01b85..70552c8517 100644 --- a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.pro +++ b/examples/paramscatterplot_image/paramscatterplot_image.pro @@ -1,6 +1,7 @@ # source code for this simple demo -SOURCES = jkqtplotter_simpletest_stepplots.cpp -#SOURCES = jkqtplotter_simpletest_stepplots_vertical.cpp +SOURCES = paramscatterplot_image.cpp + +RESOURCES += paramscatterplot_image.qrc # configure Qt CONFIG += link_prl qt @@ -8,22 +9,22 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # output executable name -TARGET = jkqtplotter_simpletest_stepplots +TARGET = paramscatterplot_image # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") - win32-msvc*: DEFINES += _USE_MATH_DEFINES win32-msvc*: DEFINES += NOMINMAX + diff --git a/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image.qrc b/examples/paramscatterplot_image/paramscatterplot_image.qrc similarity index 100% rename from examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image.qrc rename to examples/paramscatterplot_image/paramscatterplot_image.qrc diff --git a/examples/paramscatterplot_image/paramscatterplot_image_and_lib.pro b/examples/paramscatterplot_image/paramscatterplot_image_and_lib.pro new file mode 100644 index 0000000000..a9281d2c99 --- /dev/null +++ b/examples/paramscatterplot_image/paramscatterplot_image_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib paramscatterplot_image + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +paramscatterplot_image.file=$$PWD/paramscatterplot_image.pro +paramscatterplot_image.depends = jkqtplotterlib diff --git a/examples/parsedfunctionplot/CMakeLists.txt b/examples/parsedfunctionplot/CMakeLists.txt new file mode 100644 index 0000000000..912e7585a7 --- /dev/null +++ b/examples/parsedfunctionplot/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME parsedfunctionplot) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_parsedfunctionplot/README.md b/examples/parsedfunctionplot/README.md similarity index 63% rename from examples/simpletest_parsedfunctionplot/README.md rename to examples/parsedfunctionplot/README.md index b83770de9b..eeb7781530 100644 --- a/examples/simpletest_parsedfunctionplot/README.md +++ b/examples/parsedfunctionplot/README.md @@ -2,9 +2,9 @@ # Plot Function f(x) -This project (see `./examples/simpletest_parsedfunctionplot/`) demonstrates how to plot mathematical functions as line graphs. The functions are defined as strings that will be evaluated with the equation parser, integrated into JKQTPlotter. +This project (see `./examples/parsedfunctionplot/`) demonstrates how to plot mathematical functions as line graphs. The functions are defined as strings that will be evaluated with the equation parser, integrated into JKQTPlotter. -Note: See the example [Plotting Mathematical Functions as Line Graphs](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_functionplot) if you don't want to draw parsed functions, but want to provide a C function, or C++ functor! +Note: See the example [Plotting Mathematical Functions as Line Graphs](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/functionplot) if you don't want to draw parsed functions, but want to provide a C function, or C++ functor! Adding an evaluated funtion to a graph is very simple: ```.cpp @@ -14,7 +14,7 @@ Adding an evaluated funtion to a graph is very simple: ``` As you can see a graph of the type `JKQTPXParsedFunctionLineGraph` is used, which plots a function that depends on the variable `x`. The given function is parsed and evaluated (see [`lib/jkqtcommon/jkqtpmathparser.h`](https://github.com/jkriege2/JKQTPlotter/blob/master/lib/jkqtcommon/jkqtpmathparser.h) for details on the features of the math parser). An intelligent drawing algorithm chooses the number of control points for drawing a smooth graph, with sufficient amount of details, by evaluating locally the slope of the function. -In the example in [`test/simpletest_parsedfunctionplot/simpletest_parsedfunctionplot.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_parsedfunctionplot/simpletest_parsedfunctionplot.cpp) we do not simply set a fixed function, but add a `QLineEdit` which allows to edit the function and redraws it, once ENTER is pressed: +In the example in [`examples/parsedfunctionplot/parsedfunctionplot.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/parsedfunctionplot/parsedfunctionplot.cpp) we do not simply set a fixed function, but add a `QLineEdit` which allows to edit the function and redraws it, once ENTER is pressed: ```.cpp JKQTPlotter* plot=new JKQTPlotter(&mainWin); QLineEdit* edit=new QLineEdit(&mainWin); @@ -44,11 +44,11 @@ In the example in [`test/simpletest_parsedfunctionplot/simpletest_parsedfunction This code snippet results in a plot like this: -![jkqtplotter_simpletest_parsedfunctionplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_parsedfunctionplot.png) +![parsedfunctionplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/parsedfunctionplot.png) # Plotting with parameters -As shown in [Plotting Mathematical Functions as Line Graphs](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_functionplot) you can also use externally set parameters in a plot function. These parameters can be double numbers and may be set with either as an internal parameter vector, or may be read from a parameter column (as shown in the [linked example](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_functionplot)). These parameters are available as variables `p1`, `p2`, ... in the function string. Here is a small example: +As shown in [Plotting Mathematical Functions as Line Graphs](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/functionplot) you can also use externally set parameters in a plot function. These parameters can be double numbers and may be set with either as an internal parameter vector, or may be read from a parameter column (as shown in the [linked example](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/functionplot)). These parameters are available as variables `p1`, `p2`, ... in the function string. Here is a small example: ```.cpp JKQTPXParsedFunctionLineGraph* parsedFunc=new JKQTPXParsedFunctionLineGraph(plot); @@ -61,17 +61,17 @@ As shown in [Plotting Mathematical Functions as Line Graphs](https://github.com/ If you use the graph class `JKQTPYParsedFunctionLineGraph` instead of `JKQTPXParsedFunctionLineGraph`, you can plot functions `x=f(y)` (instead of `y=f(x)`). The function from the example above will then ahve to be changed to `sin(y*8)*exp(-y/4)` and the result will look like this: -![jkqtplotter_simpletest_parsedfunctionplot_fy](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_parsedfunctionplot_fy.png) +![parsedfunctionplot_fy](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/parsedfunctionplot_fy.png) # Properties of the Adaptive Plotting Algorithm The adaptive capabilities of the rendering algorithm can be seen, when plotting e.g. `2/x`, which is drawn smoothely, even around the undefined value at `x=0`: -![jkqtplotter_simpletest_parsedfunctionplot_2overx.png](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_parsedfunctionplot_2overx.png) +![parsedfunctionplot_2overx.png](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/parsedfunctionplot_2overx.png) With an additional checkbox in this example, you can switch drawing the actual sample points of the drawing algorithm on and off, by calling `parsedFunc->setDisplaySamplePoints(...)`. This can be used to debug the drawing algorithm and explore its parameters (which you can set with `setMinSamples()`, `setMaxRefinementDegree()`, `setSlopeTolerance()`, `setMinPixelPerSample()`). Here is an example of a 2/x function with shown sample points: -![jkqtplotter_simpletest_parsedfunctionplot_2overx_samplepoints.png](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_parsedfunctionplot_2overx_samplepoints.png) +![parsedfunctionplot_2overx_samplepoints.png](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/parsedfunctionplot_2overx_samplepoints.png) diff --git a/examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot.cpp b/examples/parsedfunctionplot/parsedfunctionplot.cpp similarity index 98% rename from examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot.cpp rename to examples/parsedfunctionplot/parsedfunctionplot.cpp index 73d800fa8a..4023495f86 100644 --- a/examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot.cpp +++ b/examples/parsedfunctionplot/parsedfunctionplot.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_parsedfunctionplot.cpp +/** \example parsedfunctionplot.cpp * JKQTPlotter: Examples: Plotting Parsed Mathematical Functions as Line Graphs * * \ref JKQTPlotterParsedFunctionPlot diff --git a/examples/parsedfunctionplot/parsedfunctionplot.pro b/examples/parsedfunctionplot/parsedfunctionplot.pro new file mode 100644 index 0000000000..c0a3a10222 --- /dev/null +++ b/examples/parsedfunctionplot/parsedfunctionplot.pro @@ -0,0 +1,28 @@ +# source code for this simple demo +SOURCES = parsedfunctionplot.cpp + +# configure Qt +CONFIG += link_prl qt +QT += core gui xml svg +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport + +# output executable name +TARGET = parsedfunctionplot + + +# include JKQTPlotter source code +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib +INCLUDEPATH += ../../lib +CONFIG (debug, debug|release) { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug +} else { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib +} +message("LIBS = $$LIBS") + +win32-msvc*: DEFINES += _USE_MATH_DEFINES +win32-msvc*: DEFINES += NOMINMAX + + + + diff --git a/examples/parsedfunctionplot/parsedfunctionplot_and_lib.pro b/examples/parsedfunctionplot/parsedfunctionplot_and_lib.pro new file mode 100644 index 0000000000..bbe5497e09 --- /dev/null +++ b/examples/parsedfunctionplot/parsedfunctionplot_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib parsedfunctionplot + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +parsedfunctionplot.file=$$PWD/parsedfunctionplot.pro +parsedfunctionplot.depends = jkqtplotterlib diff --git a/examples/rgbimageplot/CMakeLists.txt b/examples/rgbimageplot/CMakeLists.txt new file mode 100644 index 0000000000..4a06234a9d --- /dev/null +++ b/examples/rgbimageplot/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME rgbimageplot) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_rgbimageplot/README.md b/examples/rgbimageplot/README.md similarity index 81% rename from examples/simpletest_rgbimageplot/README.md rename to examples/rgbimageplot/README.md index 87484b91a0..6d23941aa5 100644 --- a/examples/simpletest_rgbimageplot/README.md +++ b/examples/rgbimageplot/README.md @@ -1,7 +1,7 @@ # Example (JKQTPlotter): Simple Math RGB/CMY Image Plot {#JKQTPlotterRGBImagePlot} -This project (see `./examples/simpletest_imageplot/`) simply creates a JKQTPlotter widget (as a new window) and adds an image plot of a mathematical function (here the Airy disk). The function is calculated with different parameters and then the result for each parameter is mapped onto a separate color channel in the output. The image is stored as a simple C-array in row-major ordering and then copied into a single column of the internal datasdtore (JKQTPMathImage could be directly used without the internal datastore). This very simple interface can also be used to interface with many common image processing libraries, like CImg or OpenCV. +This project (see `./examples/imageplot/`) simply creates a JKQTPlotter widget (as a new window) and adds an image plot of a mathematical function (here the Airy disk). The function is calculated with different parameters and then the result for each parameter is mapped onto a separate color channel in the output. The image is stored as a simple C-array in row-major ordering and then copied into a single column of the internal datasdtore (JKQTPMathImage could be directly used without the internal datastore). This very simple interface can also be used to interface with many common image processing libraries, like CImg or OpenCV. -The source code of the main application is (see [`jkqtplotter_simpletest_rgbimageplot.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_imageplot/jkqtplotter_simpletest_rgbimageplot.cpp): +The source code of the main application is (see [`rgbimageplot.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/imageplot/rgbimageplot.cpp): ```.cpp #include #include @@ -114,7 +114,7 @@ int main(int argc, char* argv[]) ``` The result looks like this: -![jkqtplotter_simpletest_rgbimageplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_rgbimageplot.png) +![rgbimageplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/rgbimageplot.png) In the example above, we calculated two airy disks for two wavelengths and assigned them to the R and G color channel of the output image. Alternatively you can also assign them to the CMY-channels of the output image: ```.cpp @@ -124,6 +124,6 @@ In the example above, we calculated two airy disks for two wavelengths and assig The result will then look like this: -![jkqtplotter_simpletest_rgbimageplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_rgbimageplot_cmy.png) +![rgbimageplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/rgbimageplot_cmy.png) Note that the CMY-color model is a subtractive color model, whereas RGB is an additive model. Therefore CMY-color-scales range from CMY to white, whereas the RGB-scales range from RGB to black! \ No newline at end of file diff --git a/examples/simpletest_rgbimageplot/jkqtplotter_simpletest_rgbimageplot.cpp b/examples/rgbimageplot/rgbimageplot.cpp similarity index 98% rename from examples/simpletest_rgbimageplot/jkqtplotter_simpletest_rgbimageplot.cpp rename to examples/rgbimageplot/rgbimageplot.cpp index b82fc9ea2a..815fef2fda 100644 --- a/examples/simpletest_rgbimageplot/jkqtplotter_simpletest_rgbimageplot.cpp +++ b/examples/rgbimageplot/rgbimageplot.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_rgbimageplot.cpp +/** \example rgbimageplot.cpp * Shows how to plot colored math images with JKQTPlotter, where different images/matrices are assigned to different color channels * * \ref JKQTPlotterRGBImagePlot diff --git a/examples/rgbimageplot/rgbimageplot.pro b/examples/rgbimageplot/rgbimageplot.pro new file mode 100644 index 0000000000..da4d0a0648 --- /dev/null +++ b/examples/rgbimageplot/rgbimageplot.pro @@ -0,0 +1,27 @@ +# source code for this simple demo +SOURCES = rgbimageplot.cpp + +# configure Qt +CONFIG += link_prl qt +QT += core gui xml svg +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport + +# output executable name +TARGET = rgbimageplot + +# include JKQTPlotter source code +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib +INCLUDEPATH += ../../lib +CONFIG (debug, debug|release) { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug +} else { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib +} +message("LIBS = $$LIBS") + +win32-msvc*: DEFINES += _USE_MATH_DEFINES +win32-msvc*: DEFINES += NOMINMAX + + + + diff --git a/examples/rgbimageplot/rgbimageplot_and_lib.pro b/examples/rgbimageplot/rgbimageplot_and_lib.pro new file mode 100644 index 0000000000..9b6801ea89 --- /dev/null +++ b/examples/rgbimageplot/rgbimageplot_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib rgbimageplot + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +rgbimageplot.file=$$PWD/rgbimageplot.pro +rgbimageplot.depends = jkqtplotterlib diff --git a/examples/simpletest_rgbimageplot_opencv/.gitignore b/examples/rgbimageplot_opencv/.gitignore similarity index 100% rename from examples/simpletest_rgbimageplot_opencv/.gitignore rename to examples/rgbimageplot_opencv/.gitignore diff --git a/examples/rgbimageplot_opencv/CMakeLists.txt b/examples/rgbimageplot_opencv/CMakeLists.txt new file mode 100644 index 0000000000..596840d179 --- /dev/null +++ b/examples/rgbimageplot_opencv/CMakeLists.txt @@ -0,0 +1,33 @@ +cmake_minimum_required(VERSION 3.0) +if (BUILD_HAS_OPENCV) + find_package( OpenCV ) + if(OpenCV_FOUND) + + set(EXAMPLE_NAME rgbimageplot_opencv) + set(EXENAME jkqtptest_${EXAMPLE_NAME}) + + message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + # Set up source files + set(SOURCES ${EXAMPLE_NAME}.cpp) + set(HEADERS ) + set(RESOURCES ) + set(UIS ) + + add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) + target_include_directories(${EXENAME} PRIVATE ../../lib) + if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) + elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) + endif() + include_directories( ${OpenCV_INCLUDE_DIRS} ) + target_link_libraries(${EXENAME} ${OpenCV_LIBS} ) + + + # Installation + if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif(LIB_INSTALL) + endif(OpenCV_FOUND) +endif(BUILD_HAS_OPENCV) \ No newline at end of file diff --git a/examples/simpletest_rgbimageplot_opencv/README.md b/examples/rgbimageplot_opencv/README.md similarity index 80% rename from examples/simpletest_rgbimageplot_opencv/README.md rename to examples/rgbimageplot_opencv/README.md index b4137e4c91..67531eee8a 100644 --- a/examples/simpletest_rgbimageplot_opencv/README.md +++ b/examples/rgbimageplot_opencv/README.md @@ -1,10 +1,10 @@ # Example (JKQTPlotter): Simple RGB image plot, showing a 3-channel OpenCV cv::Mat {#JKQTPlotterImagePlotRGBOpenCV} -This project (see `./examples/simpletest_imageplot_opencv/`) simply creates a JKQTPlotter widget (as a new window) and shows an RGB image read from a BMP-file. The image is generated as an [OpenCV](https://opencv.org/) [`cv::Mat`](https://docs.opencv.org/4.0.0/d3/d63/classcv_1_1Mat.html) image and then copied into a single column of the internal datasdtore (JKQTPMathImage could be directly used without the internal datastore). +This project (see `./examples/imageplot_opencv/`) simply creates a JKQTPlotter widget (as a new window) and shows an RGB image read from a BMP-file. The image is generated as an [OpenCV](https://opencv.org/) [`cv::Mat`](https://docs.opencv.org/4.0.0/d3/d63/classcv_1_1Mat.html) image and then copied into a single column of the internal datasdtore (JKQTPMathImage could be directly used without the internal datastore). To copy the data a special OpenCV Interface function `JKQTPCopyCvMatToColumn()` is used, that copies the data from a (https://opencv.org/) [`cv::Mat`](https://docs.opencv.org/4.0.0/d3/d63/classcv_1_1Mat.html) directly into a column. The function `JKQTPCopyCvMatToColumn()` is available from the (non-default) header-only extension from `jkqtplotter/jkqtpopencvinterface.h`. This header provides facilities to interface JKQTPlotter with OpenCV. -The source code of the main application is (see [`jkqtplotter_simpletest_imageplot_opencv.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_imageplot_opencv/jkqtplotter_simpletest_imageplot_opencv.cpp): +The source code of the main application is (see [`imageplot_opencv.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/imageplot_opencv/imageplot_opencv.cpp): ```.cpp #include #include @@ -95,7 +95,7 @@ int main(int argc, char* argv[]) ``` The result looks like this: -![jkqtplotter_simpletest_imageplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_rgbimageplot_opencv.png) +![imageplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/rgbimageplot_opencv.png) The image is upside-down, because computer images use a coordinate system with 0 at the top-left (left-handed coordinate system) and the JKQTPlotter has its 0 at the bottom-left (right-handed coordinate system). @@ -106,7 +106,7 @@ You can modify the program above to display the image in the correct orientation ``` This will reorient the y-axis to point from top to bottom (for increasing positive coordinates): -![jkqtplotter_simpletest_imageplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_rgbimageplot_opencv_updisdedown.png) +![imageplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/rgbimageplot_opencv_updisdedown.png) diff --git a/examples/simpletest_rgbimageplot_opencv/example.bmp b/examples/rgbimageplot_opencv/example.bmp similarity index 100% rename from examples/simpletest_rgbimageplot_opencv/example.bmp rename to examples/rgbimageplot_opencv/example.bmp diff --git a/examples/simpletest_rgbimageplot_opencv/jkqtplotter_simpletest_rgbimageplot_opencv.cpp b/examples/rgbimageplot_opencv/rgbimageplot_opencv.cpp similarity index 98% rename from examples/simpletest_rgbimageplot_opencv/jkqtplotter_simpletest_rgbimageplot_opencv.cpp rename to examples/rgbimageplot_opencv/rgbimageplot_opencv.cpp index ee052d6fdd..eceb231e95 100644 --- a/examples/simpletest_rgbimageplot_opencv/jkqtplotter_simpletest_rgbimageplot_opencv.cpp +++ b/examples/rgbimageplot_opencv/rgbimageplot_opencv.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_rgbimageplot_opencv.cpp +/** \example rgbimageplot_opencv.cpp * JKQTPlotter: Examples: Simple RGB image plot, showing a 3-channel OpenCV cv::Mat * * \ref JKQTPlotterImagePlotRGBOpenCV diff --git a/examples/simpletest_rgbimageplot_opencv/jkqtplotter_simpletest_rgbimageplot_opencv.pro b/examples/rgbimageplot_opencv/rgbimageplot_opencv.pro similarity index 80% rename from examples/simpletest_rgbimageplot_opencv/jkqtplotter_simpletest_rgbimageplot_opencv.pro rename to examples/rgbimageplot_opencv/rgbimageplot_opencv.pro index 97dd0c0a4e..12169ee04b 100644 --- a/examples/simpletest_rgbimageplot_opencv/jkqtplotter_simpletest_rgbimageplot_opencv.pro +++ b/examples/rgbimageplot_opencv/rgbimageplot_opencv.pro @@ -1,5 +1,5 @@ # source code for this simple demo -SOURCES = jkqtplotter_simpletest_rgbimageplot_opencv.cpp +SOURCES = rgbimageplot_opencv.cpp # configure Qt CONFIG += link_prl qt @@ -7,7 +7,7 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # output executable name -TARGET = jkqtplotter_simpletest_rgbimageplot_opencv +TARGET = rgbimageplot_opencv exampleimg.files=$$PWD/example.bmp exampleimg.path=$$OUT_PWD @@ -28,9 +28,9 @@ opencvdlls.path=$$OUT_PWD INCLUDEPATH+=../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/rgbimageplot_opencv/rgbimageplot_opencv_and_lib.pro b/examples/rgbimageplot_opencv/rgbimageplot_opencv_and_lib.pro new file mode 100644 index 0000000000..ca7e7d3d31 --- /dev/null +++ b/examples/rgbimageplot_opencv/rgbimageplot_opencv_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib rgbimageplot_opencv + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +rgbimageplot_opencv.file=$$PWD/rgbimageplot_opencv.pro +rgbimageplot_opencv.depends = jkqtplotterlib diff --git a/examples/rgbimageplot_qt/CMakeLists.txt b/examples/rgbimageplot_qt/CMakeLists.txt new file mode 100644 index 0000000000..a2ad14e7d7 --- /dev/null +++ b/examples/rgbimageplot_qt/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME rgbimageplot_qt) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ${EXAMPLE_NAME}.qrc ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_rgbimageplot_qt/README.md b/examples/rgbimageplot_qt/README.md similarity index 65% rename from examples/simpletest_rgbimageplot_qt/README.md rename to examples/rgbimageplot_qt/README.md index 79999f083e..6f7b59e30f 100644 --- a/examples/simpletest_rgbimageplot_qt/README.md +++ b/examples/rgbimageplot_qt/README.md @@ -1,7 +1,7 @@ # Example (JKQTPlotter): QImage as a Graph {#JKQTPlotterImagePlotQImageRGB} -This project (see `./examples/simpletest_rgbimageplot_qt/`) simply creates a JKQTPlotter widget (as a new window) and adds an image plot with an image taken from a [QImage](http://doc.qt.io/qt-5/qimage.html) object. +This project (see `./examples/rgbimageplot_qt/`) simply creates a JKQTPlotter widget (as a new window) and adds an image plot with an image taken from a [QImage](http://doc.qt.io/qt-5/qimage.html) object. -The source code of the main application is (see [`jkqtplotter_simpletest_rgbimageplot_qt.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt.cpp). the main parts are: +The source code of the main application is (see [`rgbimageplot_qt.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/rgbimageplot_qt/rgbimageplot_qt.cpp). the main parts are: ```.cpp // 2. now we open a BMP-file and load it into an OpenCV cv::Mat QImage image(":/example.bmp"); @@ -25,7 +25,7 @@ The source code of the main application is (see [`jkqtplotter_simpletest_rgbimag ``` The result looks like this: -![jkqtplotter_simpletest_imageplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_rgbimageplot_qt.png) +![imageplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/rgbimageplot_qt.png) The image is upside-down, because computer images use a coordinate system with 0 at the top-left (left-handed coordinate system) and the JKQTPlotter has its 0 at the bottom-left (right-handed coordinate system). @@ -37,7 +37,7 @@ You can modify the program above to display the image in the correct orientation ``` This will reorient the y-axis to point from top to bottom (for increasing positive coordinates): -![jkqtplotter_simpletest_imageplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_rgbimageplot_qt_updisdedown.png) +![imageplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/rgbimageplot_qt_updisdedown.png) diff --git a/examples/simpletest_rgbimageplot_qt/example.bmp b/examples/rgbimageplot_qt/example.bmp similarity index 100% rename from examples/simpletest_rgbimageplot_qt/example.bmp rename to examples/rgbimageplot_qt/example.bmp diff --git a/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt.cpp b/examples/rgbimageplot_qt/rgbimageplot_qt.cpp similarity index 97% rename from examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt.cpp rename to examples/rgbimageplot_qt/rgbimageplot_qt.cpp index ac0aea6c9f..a8c9450afa 100644 --- a/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt.cpp +++ b/examples/rgbimageplot_qt/rgbimageplot_qt.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_rgbimageplot_qt.cpp +/** \example rgbimageplot_qt.cpp * JKQTPlotter: Examples: `QImage` as a Graph * * \ref JKQTPlotterImagePlotQImageRGB diff --git a/examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot.pro b/examples/rgbimageplot_qt/rgbimageplot_qt.pro similarity index 56% rename from examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot.pro rename to examples/rgbimageplot_qt/rgbimageplot_qt.pro index dd6e3c20ae..b9d0afdbfc 100644 --- a/examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot.pro +++ b/examples/rgbimageplot_qt/rgbimageplot_qt.pro @@ -1,5 +1,8 @@ # source code for this simple demo -SOURCES = jkqtplotter_simpletest_functionplot.cpp +SOURCES += rgbimageplot_qt.cpp + +RESOURCES += rgbimageplot_qt.qrc + # configure Qt CONFIG += link_prl qt @@ -7,16 +10,15 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # output executable name -TARGET = jkqtplotter_simpletest_functionplot - +TARGET = rgbimageplot_qt # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") @@ -25,4 +27,3 @@ win32-msvc*: DEFINES += NOMINMAX - diff --git a/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt.qrc b/examples/rgbimageplot_qt/rgbimageplot_qt.qrc similarity index 100% rename from examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt.qrc rename to examples/rgbimageplot_qt/rgbimageplot_qt.qrc diff --git a/examples/rgbimageplot_qt/rgbimageplot_qt_and_lib.pro b/examples/rgbimageplot_qt/rgbimageplot_qt_and_lib.pro new file mode 100644 index 0000000000..a9fbc126fe --- /dev/null +++ b/examples/rgbimageplot_qt/rgbimageplot_qt_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib rgbimageplot_qt + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +rgbimageplot_qt.file=$$PWD/rgbimageplot_qt.pro +rgbimageplot_qt.depends = jkqtplotterlib diff --git a/examples/simpletest/CMakeLists.txt b/examples/simpletest/CMakeLists.txt new file mode 100644 index 0000000000..7f4ff3fff2 --- /dev/null +++ b/examples/simpletest/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME simpletest) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES simpletest.cpp ) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest/README.md b/examples/simpletest/README.md index 5fc4d247e9..a4c4e5e06e 100644 --- a/examples/simpletest/README.md +++ b/examples/simpletest/README.md @@ -14,12 +14,12 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport TARGET = jkqtplotter_simpletest # include JKQTPlotter source headers and link against library -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } ``` diff --git a/examples/simpletest/jkqtplotter_simpletest_and_lib.pro b/examples/simpletest/jkqtplotter_simpletest_and_lib.pro deleted file mode 100644 index 59d6f2a5f1..0000000000 --- a/examples/simpletest/jkqtplotter_simpletest_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest.file=$$PWD/jkqtplotter_simpletest.pro -jkqtplotter_simpletest.depends = jkqtplotterlib diff --git a/examples/simpletest/jkqtplotter_simpletest.cpp b/examples/simpletest/simpletest.cpp similarity index 100% rename from examples/simpletest/jkqtplotter_simpletest.cpp rename to examples/simpletest/simpletest.cpp diff --git a/examples/simpletest/simpletest.pro b/examples/simpletest/simpletest.pro new file mode 100644 index 0000000000..95b5fba6da --- /dev/null +++ b/examples/simpletest/simpletest.pro @@ -0,0 +1,27 @@ +# source code for this simple demo +SOURCES = simpletest.cpp + +# configure Qt +CONFIG += link_prl qt +QT += core gui xml svg +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport + +# output executable name +TARGET = simpletest + +# include JKQTPlotter source headers and link against library +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib +INCLUDEPATH += ../../lib +CONFIG (debug, debug|release) { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug +} else { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib +} +message("LIBS = $$LIBS") + +win32-msvc*: DEFINES += _USE_MATH_DEFINES +win32-msvc*: DEFINES += NOMINMAX + + + + diff --git a/examples/simpletest/simpletest_and_lib.pro b/examples/simpletest/simpletest_and_lib.pro new file mode 100644 index 0000000000..0d63f78d55 --- /dev/null +++ b/examples/simpletest/simpletest_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib simpletest + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +simpletest.file=$$PWD/simpletest.pro +simpletest.depends = jkqtplotterlib diff --git a/examples/simpletest_advancedlineandfillstyling/jkqtplotter_simpletest_advancedlineandfillstyling_and_lib.pro b/examples/simpletest_advancedlineandfillstyling/jkqtplotter_simpletest_advancedlineandfillstyling_and_lib.pro deleted file mode 100644 index 48737bd8af..0000000000 --- a/examples/simpletest_advancedlineandfillstyling/jkqtplotter_simpletest_advancedlineandfillstyling_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_advancedlineandfillstyling - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_advancedlineandfillstyling.file=$$PWD/jkqtplotter_simpletest_advancedlineandfillstyling.pro -jkqtplotter_simpletest_advancedlineandfillstyling.depends = jkqtplotterlib diff --git a/examples/simpletest_barchart/jkqtplotter_simpletest_barchart_and_lib.pro b/examples/simpletest_barchart/jkqtplotter_simpletest_barchart_and_lib.pro deleted file mode 100644 index 59576927ca..0000000000 --- a/examples/simpletest_barchart/jkqtplotter_simpletest_barchart_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_barchart - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_barchart.file=$$PWD/jkqtplotter_simpletest_barchart.pro -jkqtplotter_simpletest_barchart.depends = jkqtplotterlib diff --git a/examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot_and_lib.pro b/examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot_and_lib.pro deleted file mode 100644 index a3624eac97..0000000000 --- a/examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_boxplot - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_boxplot.file=$$PWD/jkqtplotter_simpletest_boxplot.pro -jkqtplotter_simpletest_boxplot.depends = jkqtplotterlib diff --git a/examples/simpletest_contourplot/jkqtplotter_simpletest_contourplot_and_lib.pro b/examples/simpletest_contourplot/jkqtplotter_simpletest_contourplot_and_lib.pro deleted file mode 100644 index 834ddb09c0..0000000000 --- a/examples/simpletest_contourplot/jkqtplotter_simpletest_contourplot_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_contourplot - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_contourplot.file=$$PWD/jkqtplotter_simpletest_contourplot.pro -jkqtplotter_simpletest_contourplot.depends = jkqtplotterlib diff --git a/examples/simpletest_datastore/jkqtplotter_simpletest_datastore_and_lib.pro b/examples/simpletest_datastore/jkqtplotter_simpletest_datastore_and_lib.pro deleted file mode 100644 index 01630b7267..0000000000 --- a/examples/simpletest_datastore/jkqtplotter_simpletest_datastore_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_datastore - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_datastore.file=$$PWD/jkqtplotter_simpletest_datastore.pro -jkqtplotter_simpletest_datastore.depends = jkqtplotterlib diff --git a/examples/simpletest_datastore_groupedstat/jkqtplotter_simpletest_datastore_groupedstat.pro b/examples/simpletest_datastore_groupedstat/jkqtplotter_simpletest_datastore_groupedstat.pro deleted file mode 100644 index 817ebf4752..0000000000 --- a/examples/simpletest_datastore_groupedstat/jkqtplotter_simpletest_datastore_groupedstat.pro +++ /dev/null @@ -1,27 +0,0 @@ -# source code for this simple demo -SOURCES = jkqtplotter_simpletest_datastore_groupedstat.cpp - -# configure Qt -CONFIG += link_prl qt -QT += core gui xml svg -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport - -# output executable name -TARGET = jkqtplotter_simpletest_datastore_groupedstat - -# include JKQTPlotter source headers and link against library -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib -INCLUDEPATH += ../../lib -CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug -} else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib -} -message("LIBS = $$LIBS") - -win32-msvc*: DEFINES += _USE_MATH_DEFINES -win32-msvc*: DEFINES += NOMINMAX - - - - diff --git a/examples/simpletest_datastore_groupedstat/jkqtplotter_simpletest_datastore_groupedstat_and_lib.pro b/examples/simpletest_datastore_groupedstat/jkqtplotter_simpletest_datastore_groupedstat_and_lib.pro deleted file mode 100644 index f3d7e69339..0000000000 --- a/examples/simpletest_datastore_groupedstat/jkqtplotter_simpletest_datastore_groupedstat_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_datastore_groupedstat - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_datastore_groupedstat.file=$$PWD/jkqtplotter_simpletest_datastore_groupedstat.pro -jkqtplotter_simpletest_datastore_groupedstat.depends = jkqtplotterlib diff --git a/examples/simpletest_datastore_iterators/jkqtplotter_simpletest_datastore_iterators_and_lib.pro b/examples/simpletest_datastore_iterators/jkqtplotter_simpletest_datastore_iterators_and_lib.pro deleted file mode 100644 index 19250ec8fb..0000000000 --- a/examples/simpletest_datastore_iterators/jkqtplotter_simpletest_datastore_iterators_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_datastore_iterators - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_datastore_iterators.file=$$PWD/jkqtplotter_simpletest_datastore_iterators.pro -jkqtplotter_simpletest_datastore_iterators.depends = jkqtplotterlib diff --git a/examples/simpletest_datastore_regression/jkqtplotter_simpletest_datastore_regression_and_lib.pro b/examples/simpletest_datastore_regression/jkqtplotter_simpletest_datastore_regression_and_lib.pro deleted file mode 100644 index 43f256e5fa..0000000000 --- a/examples/simpletest_datastore_regression/jkqtplotter_simpletest_datastore_regression_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_datastore_regression - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_datastore_regression.file=$$PWD/jkqtplotter_simpletest_datastore_regression.pro -jkqtplotter_simpletest_datastore_regression.depends = jkqtplotterlib diff --git a/examples/simpletest_datastore_statistics/jkqtplotter_simpletest_datastore_statistics.pro b/examples/simpletest_datastore_statistics/jkqtplotter_simpletest_datastore_statistics.pro deleted file mode 100644 index 5b7780aae1..0000000000 --- a/examples/simpletest_datastore_statistics/jkqtplotter_simpletest_datastore_statistics.pro +++ /dev/null @@ -1,27 +0,0 @@ -# source code for this simple demo -SOURCES = jkqtplotter_simpletest_datastore_statistics.cpp - -# configure Qt -CONFIG += link_prl qt -QT += core gui xml svg -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport - -# output executable name -TARGET = jkqtplotter_simpletest_datastore_statistics - -# include JKQTPlotter source headers and link against library -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib -INCLUDEPATH += ../../lib -CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug -} else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib -} -message("LIBS = $$LIBS") - -win32-msvc*: DEFINES += _USE_MATH_DEFINES -win32-msvc*: DEFINES += NOMINMAX - - - - diff --git a/examples/simpletest_datastore_statistics/jkqtplotter_simpletest_datastore_statistics_and_lib.pro b/examples/simpletest_datastore_statistics/jkqtplotter_simpletest_datastore_statistics_and_lib.pro deleted file mode 100644 index 1b65492102..0000000000 --- a/examples/simpletest_datastore_statistics/jkqtplotter_simpletest_datastore_statistics_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_datastore_statistics - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_datastore_statistics.file=$$PWD/jkqtplotter_simpletest_datastore_statistics.pro -jkqtplotter_simpletest_datastore_statistics.depends = jkqtplotterlib diff --git a/examples/simpletest_datastore_statistics_2d/jkqtplotter_simpletest_datastore_statistics_2d.pro b/examples/simpletest_datastore_statistics_2d/jkqtplotter_simpletest_datastore_statistics_2d.pro deleted file mode 100644 index 99e59f10be..0000000000 --- a/examples/simpletest_datastore_statistics_2d/jkqtplotter_simpletest_datastore_statistics_2d.pro +++ /dev/null @@ -1,27 +0,0 @@ -# source code for this simple demo -SOURCES = jkqtplotter_simpletest_datastore_statistics_2d.cpp - -# configure Qt -CONFIG += link_prl qt -QT += core gui xml svg -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport - -# output executable name -TARGET = jkqtplotter_simpletest_datastore_statistics_2d - -# include JKQTPlotter source headers and link against library -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib -INCLUDEPATH += ../../lib -CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug -} else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib -} -message("LIBS = $$LIBS") - -win32-msvc*: DEFINES += _USE_MATH_DEFINES -win32-msvc*: DEFINES += NOMINMAX - - - - diff --git a/examples/simpletest_datastore_statistics_2d/jkqtplotter_simpletest_datastore_statistics_2d_and_lib.pro b/examples/simpletest_datastore_statistics_2d/jkqtplotter_simpletest_datastore_statistics_2d_and_lib.pro deleted file mode 100644 index dd3d5f14f9..0000000000 --- a/examples/simpletest_datastore_statistics_2d/jkqtplotter_simpletest_datastore_statistics_2d_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_datastore_statistics_2d - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_datastore_statistics_2d.file=$$PWD/jkqtplotter_simpletest_datastore_statistics_2d.pro -jkqtplotter_simpletest_datastore_statistics_2d.depends = jkqtplotterlib diff --git a/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes.pro b/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes.pro deleted file mode 100644 index 1b82cf0698..0000000000 --- a/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes.pro +++ /dev/null @@ -1,30 +0,0 @@ -# source code for this simple demo -SOURCES = jkqtplotter_simpletest_dateaxes.cpp - -# configure Qt -CONFIG += link_prl qt -QT += core gui xml svg -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport - -# output executable name -TARGET = jkqtplotter_simpletest_dateaxes - -# include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib -INCLUDEPATH += ../../lib -CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug -} else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib -} -message("LIBS = $$LIBS") - - - -win32-msvc*: DEFINES += _USE_MATH_DEFINES -win32-msvc*: DEFINES += NOMINMAX - - - -RESOURCES += \ - jkqtplotter_simpletest_dateaxes.qrc diff --git a/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes_and_lib.pro b/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes_and_lib.pro deleted file mode 100644 index 7823da2f14..0000000000 --- a/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_dateaxes - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_dateaxes.file=$$PWD/jkqtplotter_simpletest_dateaxes.pro -jkqtplotter_simpletest_dateaxes.depends = jkqtplotterlib diff --git a/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.pro b/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.pro deleted file mode 100644 index fdfa80f457..0000000000 --- a/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.pro +++ /dev/null @@ -1,26 +0,0 @@ -# source code for this simple demo -SOURCES = jkqtplotter_simpletest_errorbarstyles.cpp - -# configure Qt -CONFIG += link_prl qt -QT += core gui xml svg -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport - -# output executable name -TARGET = jkqtplotter_simpletest_errorbarstyles - -# include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib -INCLUDEPATH += ../../lib -CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug -} else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib -} -message("LIBS = $$LIBS") - - -win32-msvc*: DEFINES += _USE_MATH_DEFINES -win32-msvc*: DEFINES += NOMINMAX - - diff --git a/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles_and_lib.pro b/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles_and_lib.pro deleted file mode 100644 index 6f93c1b848..0000000000 --- a/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_errorbarstyles - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_errorbarstyles.file=$$PWD/jkqtplotter_simpletest_errorbarstyles.pro -jkqtplotter_simpletest_errorbarstyles.depends = jkqtplotterlib diff --git a/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs.pro b/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs.pro deleted file mode 100644 index 60520a91ef..0000000000 --- a/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs.pro +++ /dev/null @@ -1,30 +0,0 @@ -# source code for this simple demo -SOURCES = jkqtplotter_simpletest_filledgraphs.cpp - -RESOURCES += jkqtplotter_simpletest_filledgraphs.qrc - -# configure Qt -CONFIG += link_prl qt -QT += core gui xml svg -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport - -# output executable name -TARGET = jkqtplotter_simpletest_filledgraphs - - -# include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib -INCLUDEPATH += ../../lib -CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug -} else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib -} -message("LIBS = $$LIBS") - -win32-msvc*: DEFINES += _USE_MATH_DEFINES -win32-msvc*: DEFINES += NOMINMAX - - - - diff --git a/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs_and_lib.pro b/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs_and_lib.pro deleted file mode 100644 index 2498609440..0000000000 --- a/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_filledgraphs - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_filledgraphs.file=$$PWD/jkqtplotter_simpletest_filledgraphs.pro -jkqtplotter_simpletest_filledgraphs.depends = jkqtplotterlib diff --git a/examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot_and_lib.pro b/examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot_and_lib.pro deleted file mode 100644 index 656af33fad..0000000000 --- a/examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_functionplot - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_functionplot.file=$$PWD/jkqtplotter_simpletest_functionplot.pro -jkqtplotter_simpletest_functionplot.depends = jkqtplotterlib diff --git a/examples/simpletest_geometric/jkqtplotter_simpletest_geometric_and_lib.pro b/examples/simpletest_geometric/jkqtplotter_simpletest_geometric_and_lib.pro deleted file mode 100644 index b0e4f7ccfe..0000000000 --- a/examples/simpletest_geometric/jkqtplotter_simpletest_geometric_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_geometric - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_geometric.file=$$PWD/jkqtplotter_simpletest_geometric.pro -jkqtplotter_simpletest_geometric.depends = jkqtplotterlib diff --git a/examples/simpletest_imageplot/jkqtplotter_simpletest_imageplot_and_lib.pro b/examples/simpletest_imageplot/jkqtplotter_simpletest_imageplot_and_lib.pro deleted file mode 100644 index ac9371dcad..0000000000 --- a/examples/simpletest_imageplot/jkqtplotter_simpletest_imageplot_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_imageplot - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_imageplot.file=$$PWD/jkqtplotter_simpletest_imageplot.pro -jkqtplotter_simpletest_imageplot.depends = jkqtplotterlib diff --git a/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.pro b/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.pro deleted file mode 100644 index d3be1d43c0..0000000000 --- a/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.pro +++ /dev/null @@ -1,27 +0,0 @@ -# source code for this simple demo -SOURCES = jkqtplotter_simpletest_imageplot_modifier.cpp - -# configure Qt -CONFIG += link_prl qt -QT += core gui xml svg -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport - -# output executable name -TARGET = jkqtplotter_simpletest_imageplot_modifier - -# include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib -INCLUDEPATH += ../../lib -CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug -} else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib -} -message("LIBS = $$LIBS") - -win32-msvc*: DEFINES += _USE_MATH_DEFINES -win32-msvc*: DEFINES += NOMINMAX - - - - diff --git a/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier_and_lib.pro b/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier_and_lib.pro deleted file mode 100644 index 969659eccd..0000000000 --- a/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_imageplot_modifier - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_imageplot_modifier.file=$$PWD/jkqtplotter_simpletest_imageplot_modifier.pro -jkqtplotter_simpletest_imageplot_modifier.depends = jkqtplotterlib diff --git a/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore_and_lib.pro b/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore_and_lib.pro deleted file mode 100644 index 6e1b2c92b7..0000000000 --- a/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_imageplot_nodatastore - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_imageplot_nodatastore.file=$$PWD/jkqtplotter_simpletest_imageplot_nodatastore.pro -jkqtplotter_simpletest_imageplot_nodatastore.depends = jkqtplotterlib diff --git a/examples/simpletest_imageplot_opencv/jkqtplotter_simpletest_imageplot_opencv_and_lib.pro b/examples/simpletest_imageplot_opencv/jkqtplotter_simpletest_imageplot_opencv_and_lib.pro deleted file mode 100644 index 6ae6b5ad73..0000000000 --- a/examples/simpletest_imageplot_opencv/jkqtplotter_simpletest_imageplot_opencv_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_imageplot_opencv - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_imageplot_opencv.file=$$PWD/jkqtplotter_simpletest_imageplot_opencv.pro -jkqtplotter_simpletest_imageplot_opencv.depends = jkqtplotterlib diff --git a/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot.pro b/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot.pro deleted file mode 100644 index 0d034e8feb..0000000000 --- a/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot.pro +++ /dev/null @@ -1,28 +0,0 @@ -# source code for this simple demo -SOURCES = jkqtplotter_simpletest_impulsesplot.cpp - -# configure Qt -CONFIG += link_prl qt -QT += core gui xml svg -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport - -# output executable name -TARGET = jkqtplotter_simpletest_impulsesplot - - -# include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib -INCLUDEPATH += ../../lib -CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug -} else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib -} -message("LIBS = $$LIBS") - -win32-msvc*: DEFINES += _USE_MATH_DEFINES -win32-msvc*: DEFINES += NOMINMAX - - - - diff --git a/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot_and_lib.pro b/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot_and_lib.pro deleted file mode 100644 index de96a09325..0000000000 --- a/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_impulsesplot - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_impulsesplot.file=$$PWD/jkqtplotter_simpletest_impulsesplot.pro -jkqtplotter_simpletest_impulsesplot.depends = jkqtplotterlib diff --git a/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes_and_lib.pro b/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes_and_lib.pro deleted file mode 100644 index 82f9fb8724..0000000000 --- a/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_logaxes - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_logaxes.file=$$PWD/jkqtplotter_simpletest_logaxes.pro -jkqtplotter_simpletest_logaxes.depends = jkqtplotterlib diff --git a/examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve_and_lib.pro b/examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve_and_lib.pro deleted file mode 100644 index 160b7085a7..0000000000 --- a/examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_parametriccurve - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_parametriccurve.file=$$PWD/jkqtplotter_simpletest_parametriccurve.pro -jkqtplotter_simpletest_parametriccurve.depends = jkqtplotterlib diff --git a/examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot_and_lib.pro b/examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot_and_lib.pro deleted file mode 100644 index 3878e7a844..0000000000 --- a/examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_paramscatterplot - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_paramscatterplot.file=$$PWD/jkqtplotter_simpletest_paramscatterplot.pro -jkqtplotter_simpletest_paramscatterplot.depends = jkqtplotterlib diff --git a/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image.pro b/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image.pro deleted file mode 100644 index 1b4e6ad0d9..0000000000 --- a/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image.pro +++ /dev/null @@ -1,30 +0,0 @@ -# source code for this simple demo -SOURCES = jkqtplotter_simpletest_paramscatterplot_image.cpp - -RESOURCES += jkqtplotter_simpletest_paramscatterplot_image.qrc - -# configure Qt -CONFIG += link_prl qt -QT += core gui xml svg -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport - -# output executable name -TARGET = jkqtplotter_simpletest_paramscatterplot_image - - -# include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib -INCLUDEPATH += ../../lib -CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug -} else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib -} -message("LIBS = $$LIBS") - -win32-msvc*: DEFINES += _USE_MATH_DEFINES -win32-msvc*: DEFINES += NOMINMAX - - - - diff --git a/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image_and_lib.pro b/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image_and_lib.pro deleted file mode 100644 index 1db6672d12..0000000000 --- a/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_paramscatterplot_image - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_paramscatterplot_image.file=$$PWD/jkqtplotter_simpletest_paramscatterplot_image.pro -jkqtplotter_simpletest_paramscatterplot_image.depends = jkqtplotterlib diff --git a/examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot.pro b/examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot.pro deleted file mode 100644 index ffd69eec5e..0000000000 --- a/examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot.pro +++ /dev/null @@ -1,28 +0,0 @@ -# source code for this simple demo -SOURCES = jkqtplotter_simpletest_parsedfunctionplot.cpp - -# configure Qt -CONFIG += link_prl qt -QT += core gui xml svg -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport - -# output executable name -TARGET = jkqtplotter_simpletest_parsedfunctionplot - - -# include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib -INCLUDEPATH += ../../lib -CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug -} else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib -} -message("LIBS = $$LIBS") - -win32-msvc*: DEFINES += _USE_MATH_DEFINES -win32-msvc*: DEFINES += NOMINMAX - - - - diff --git a/examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot_and_lib.pro b/examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot_and_lib.pro deleted file mode 100644 index e905c85edb..0000000000 --- a/examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_parsedfunctionplot - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_parsedfunctionplot.file=$$PWD/jkqtplotter_simpletest_parsedfunctionplot.pro -jkqtplotter_simpletest_parsedfunctionplot.depends = jkqtplotterlib diff --git a/examples/simpletest_rgbimageplot/jkqtplotter_simpletest_rgbimageplot.pro b/examples/simpletest_rgbimageplot/jkqtplotter_simpletest_rgbimageplot.pro deleted file mode 100644 index 31753d531f..0000000000 --- a/examples/simpletest_rgbimageplot/jkqtplotter_simpletest_rgbimageplot.pro +++ /dev/null @@ -1,27 +0,0 @@ -# source code for this simple demo -SOURCES = jkqtplotter_simpletest_rgbimageplot.cpp - -# configure Qt -CONFIG += link_prl qt -QT += core gui xml svg -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport - -# output executable name -TARGET = jkqtplotter_simpletest_rgbimageplot - -# include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib -INCLUDEPATH += ../../lib -CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug -} else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib -} -message("LIBS = $$LIBS") - -win32-msvc*: DEFINES += _USE_MATH_DEFINES -win32-msvc*: DEFINES += NOMINMAX - - - - diff --git a/examples/simpletest_rgbimageplot/jkqtplotter_simpletest_rgbimageplot_and_lib.pro b/examples/simpletest_rgbimageplot/jkqtplotter_simpletest_rgbimageplot_and_lib.pro deleted file mode 100644 index cdea571dac..0000000000 --- a/examples/simpletest_rgbimageplot/jkqtplotter_simpletest_rgbimageplot_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_rgbimageplot - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_rgbimageplot.file=$$PWD/jkqtplotter_simpletest_rgbimageplot.pro -jkqtplotter_simpletest_rgbimageplot.depends = jkqtplotterlib diff --git a/examples/simpletest_rgbimageplot_opencv/jkqtplotter_simpletest_rgbimageplot_opencv_and_lib.pro b/examples/simpletest_rgbimageplot_opencv/jkqtplotter_simpletest_rgbimageplot_opencv_and_lib.pro deleted file mode 100644 index 4460ec9487..0000000000 --- a/examples/simpletest_rgbimageplot_opencv/jkqtplotter_simpletest_rgbimageplot_opencv_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_rgbimageplot_opencv - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_rgbimageplot_opencv.file=$$PWD/jkqtplotter_simpletest_rgbimageplot_opencv.pro -jkqtplotter_simpletest_rgbimageplot_opencv.depends = jkqtplotterlib diff --git a/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt.pro b/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt.pro deleted file mode 100644 index f63fb54fc8..0000000000 --- a/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt.pro +++ /dev/null @@ -1,29 +0,0 @@ -# source code for this simple demo -SOURCES += jkqtplotter_simpletest_rgbimageplot_qt.cpp - -RESOURCES += jkqtplotter_simpletest_rgbimageplot_qt.qrc - - -# configure Qt -CONFIG += link_prl qt -QT += core gui xml svg -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport - -# output executable name -TARGET = jkqtplotter_simpletest_rgbimageplot_qt - -# include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib -INCLUDEPATH += ../../lib -CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug -} else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib -} -message("LIBS = $$LIBS") - -win32-msvc*: DEFINES += _USE_MATH_DEFINES -win32-msvc*: DEFINES += NOMINMAX - - - diff --git a/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt_and_lib.pro b/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt_and_lib.pro deleted file mode 100644 index aa9bbfba3f..0000000000 --- a/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_rgbimageplot_qt - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_rgbimageplot_qt.file=$$PWD/jkqtplotter_simpletest_rgbimageplot_qt.pro -jkqtplotter_simpletest_rgbimageplot_qt.depends = jkqtplotterlib diff --git a/examples/simpletest_speed/jkqtplotter_simpletest_speed_and_lib.pro b/examples/simpletest_speed/jkqtplotter_simpletest_speed_and_lib.pro deleted file mode 100644 index 195e71c7a0..0000000000 --- a/examples/simpletest_speed/jkqtplotter_simpletest_speed_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_speed - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_speed.file=$$PWD/jkqtplotter_simpletest_speed.pro -jkqtplotter_simpletest_speed.depends = jkqtplotterlib diff --git a/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars.pro b/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars.pro deleted file mode 100644 index 7fc97628ba..0000000000 --- a/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars.pro +++ /dev/null @@ -1,28 +0,0 @@ -# source code for this simple demo -SOURCES = jkqtplotter_simpletest_stackedbars.cpp - -# configure Qt -CONFIG += link_prl qt -QT += core gui xml svg -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport - -# output executable name -TARGET = jkqtplotter_simpletest_stackedbars - - -# include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib -INCLUDEPATH += ../../lib -CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug -} else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib -} -message("LIBS = $$LIBS") - - -win32-msvc*: DEFINES += _USE_MATH_DEFINES -win32-msvc*: DEFINES += NOMINMAX - - - diff --git a/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars_and_lib.pro b/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars_and_lib.pro deleted file mode 100644 index 53f9d81b7d..0000000000 --- a/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_stackedbars - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_stackedbars.file=$$PWD/jkqtplotter_simpletest_stackedbars.pro -jkqtplotter_simpletest_stackedbars.depends = jkqtplotterlib diff --git a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_and_lib.pro b/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_and_lib.pro deleted file mode 100644 index af8c787114..0000000000 --- a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_stepplots - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_stepplots.file=$$PWD/jkqtplotter_simpletest_stepplots.pro -jkqtplotter_simpletest_stepplots.depends = jkqtplotterlib diff --git a/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors.pro b/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors.pro deleted file mode 100644 index b2aa21bcb6..0000000000 --- a/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors.pro +++ /dev/null @@ -1,28 +0,0 @@ -# source code for this simple demo -SOURCES = jkqtplotter_simpletest_symbols_and_errors.cpp - -# configure Qt -CONFIG += link_prl qt -QT += core gui xml svg -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport - -# output executable name -TARGET = jkqtplotter_simpletest_symbols_and_errors - - -# include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib -INCLUDEPATH += ../../lib -CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug -} else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib -} -message("LIBS = $$LIBS") - -win32-msvc*: DEFINES += _USE_MATH_DEFINES -win32-msvc*: DEFINES += NOMINMAX - - - - diff --git a/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors_and_lib.pro b/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors_and_lib.pro deleted file mode 100644 index 1d53e7cafa..0000000000 --- a/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_symbols_and_errors - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_symbols_and_errors.file=$$PWD/jkqtplotter_simpletest_symbols_and_errors.pro -jkqtplotter_simpletest_symbols_and_errors.depends = jkqtplotterlib diff --git a/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles_and_lib.pro b/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles_and_lib.pro deleted file mode 100644 index 6ad6caa069..0000000000 --- a/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_symbols_and_styles - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_symbols_and_styles.file=$$PWD/jkqtplotter_simpletest_symbols_and_styles.pro -jkqtplotter_simpletest_symbols_and_styles.depends = jkqtplotterlib diff --git a/examples/simpletest_ui/jkqtplotter_simpletest_ui_and_lib.pro b/examples/simpletest_ui/jkqtplotter_simpletest_ui_and_lib.pro deleted file mode 100644 index f4a2d362d4..0000000000 --- a/examples/simpletest_ui/jkqtplotter_simpletest_ui_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_ui - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_ui.file=$$PWD/jkqtplotter_simpletest_ui.pro -jkqtplotter_simpletest_ui.depends = jkqtplotterlib diff --git a/examples/simpletest_violinplot/jkqtplotter_simpletest_violinplot.pro b/examples/simpletest_violinplot/jkqtplotter_simpletest_violinplot.pro deleted file mode 100644 index abf2985c3c..0000000000 --- a/examples/simpletest_violinplot/jkqtplotter_simpletest_violinplot.pro +++ /dev/null @@ -1,27 +0,0 @@ -# source code for this simple demo -SOURCES = jkqtplotter_simpletest_violinplot.cpp - -# configure Qt -CONFIG += link_prl qt -QT += core gui xml svg -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport - -# output executable name -TARGET = jkqtplotter_simpletest_violinplot - -# include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib -INCLUDEPATH += ../../lib -CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug -} else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib -} -message("LIBS = $$LIBS") - - - -win32-msvc*: DEFINES += _USE_MATH_DEFINES -win32-msvc*: DEFINES += NOMINMAX - - diff --git a/examples/simpletest_violinplot/jkqtplotter_simpletest_violinplot_and_lib.pro b/examples/simpletest_violinplot/jkqtplotter_simpletest_violinplot_and_lib.pro deleted file mode 100644 index ee47d6ed2a..0000000000 --- a/examples/simpletest_violinplot/jkqtplotter_simpletest_violinplot_and_lib.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_violinplot - -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro - -jkqtplotter_simpletest_violinplot.file=$$PWD/jkqtplotter_simpletest_violinplot.pro -jkqtplotter_simpletest_violinplot.depends = jkqtplotterlib diff --git a/examples/speed/CMakeLists.txt b/examples/speed/CMakeLists.txt new file mode 100644 index 0000000000..3e50893abf --- /dev/null +++ b/examples/speed/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME speed) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp speedtestplot.cpp) +set(HEADERS speedtestplot.h) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_speed/README.md b/examples/speed/README.md similarity index 93% rename from examples/simpletest_speed/README.md rename to examples/speed/README.md index 5af9bd0822..32c6973897 100644 --- a/examples/simpletest_speed/README.md +++ b/examples/speed/README.md @@ -1,5 +1,5 @@ # Example (JKQTPlotter): Simple line-graph with live-data (speed test) {#JKQTPlotterSpeedTest} -This project (see `./examples/simpletest_speed/`) simply creates a JKQTPlotter widget (as a new window) and adds two line-graph (a sine and a cosine wave). +This project (see `./examples/speed/`) simply creates a JKQTPlotter widget (as a new window) and adds two line-graph (a sine and a cosine wave). Data is stored in two [`std::array`](https://en.cppreference.com/w/cpp/container/array) objects (`X`, `Y`, and `Y2`) and the data is added as external pointer to the datastore: ```.cpp // 3. make data available to JKQTPlotter by adding it to the internal datastore. @@ -51,7 +51,7 @@ void SpeedTestPlot::plotNewData() The result looks like this: -![jkqtplotter_simpletest_speed1](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_speed.png) +![speed1](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/speed.png) There are different facor affecting the replot speed: 1. *Anti-Aliasing:* If `JKQTPlotter` uses Anti-Aliasing for plotting, the plots are much nicer, but also about a factor of 3-4 slower. This is due to the increased amount of calculations, necessary in the drawing sub-system of Qt. diff --git a/examples/simpletest_speed/jkqtplotter_simpletest_speed.cpp b/examples/speed/speed.cpp similarity index 100% rename from examples/simpletest_speed/jkqtplotter_simpletest_speed.cpp rename to examples/speed/speed.cpp diff --git a/examples/simpletest_speed/jkqtplotter_simpletest_speed.pro b/examples/speed/speed.pro similarity index 58% rename from examples/simpletest_speed/jkqtplotter_simpletest_speed.pro rename to examples/speed/speed.pro index 086aa241d5..d6d1e7bad7 100644 --- a/examples/simpletest_speed/jkqtplotter_simpletest_speed.pro +++ b/examples/speed/speed.pro @@ -1,5 +1,5 @@ # source code for this simple demo -SOURCES = jkqtplotter_simpletest_speed.cpp speedtestplot.cpp +SOURCES = speed.cpp speedtestplot.cpp HEADERS = speedtestplot.h # configure Qt @@ -8,15 +8,15 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # output executable name -TARGET = jkqtplotter_simpletest_speed +TARGET = speed # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/speed/speed_and_lib.pro b/examples/speed/speed_and_lib.pro new file mode 100644 index 0000000000..8c3538c82b --- /dev/null +++ b/examples/speed/speed_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib speed + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +speed.file=$$PWD/speed.pro +speed.depends = jkqtplotterlib diff --git a/examples/simpletest_speed/speedtestplot.cpp b/examples/speed/speedtestplot.cpp similarity index 100% rename from examples/simpletest_speed/speedtestplot.cpp rename to examples/speed/speedtestplot.cpp diff --git a/examples/simpletest_speed/speedtestplot.h b/examples/speed/speedtestplot.h similarity index 100% rename from examples/simpletest_speed/speedtestplot.h rename to examples/speed/speedtestplot.h diff --git a/examples/stackedbars/CMakeLists.txt b/examples/stackedbars/CMakeLists.txt new file mode 100644 index 0000000000..54643ff3ed --- /dev/null +++ b/examples/stackedbars/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME stackedbars) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_stackedbars/README.md b/examples/stackedbars/README.md similarity index 93% rename from examples/simpletest_stackedbars/README.md rename to examples/stackedbars/README.md index ec597b8fed..0ff22da0cb 100644 --- a/examples/simpletest_stackedbars/README.md +++ b/examples/stackedbars/README.md @@ -1,7 +1,7 @@ # Example (JKQTPlotter): Simple stacked barchart {#JKQTPlotterStackedBarChart} -This project (see `./examples/simpletest_stackedbars/`) simply creates a JKQTPlotter widget (as a new window) and adds several stacked barcharts. +This project (see `./examples/stackedbars/`) simply creates a JKQTPlotter widget (as a new window) and adds several stacked barcharts. -The source code of the main application is (see [`jkqtplotter_simpletest_stackedbars.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars.cpp): +The source code of the main application is (see [`stackedbars.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/stackedbars/stackedbars.cpp): ```.cpp #include #include "jkqtplotter/jkqtplotter.h" diff --git a/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars.cpp b/examples/stackedbars/stackedbars.cpp similarity index 99% rename from examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars.cpp rename to examples/stackedbars/stackedbars.cpp index e8a884513d..920933c9e7 100644 --- a/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars.cpp +++ b/examples/stackedbars/stackedbars.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_stackedbars.cpp +/** \example stackedbars.cpp * JKQTPlotter: Examples: Simple stacked barchart * * \ref JKQTPlotterStackedBarChart diff --git a/examples/stackedbars/stackedbars.pro b/examples/stackedbars/stackedbars.pro new file mode 100644 index 0000000000..e3bf1535f6 --- /dev/null +++ b/examples/stackedbars/stackedbars.pro @@ -0,0 +1,28 @@ +# source code for this simple demo +SOURCES = stackedbars.cpp + +# configure Qt +CONFIG += link_prl qt +QT += core gui xml svg +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport + +# output executable name +TARGET = stackedbars + + +# include JKQTPlotter source code +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib +INCLUDEPATH += ../../lib +CONFIG (debug, debug|release) { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug +} else { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib +} +message("LIBS = $$LIBS") + + +win32-msvc*: DEFINES += _USE_MATH_DEFINES +win32-msvc*: DEFINES += NOMINMAX + + + diff --git a/examples/stackedbars/stackedbars_and_lib.pro b/examples/stackedbars/stackedbars_and_lib.pro new file mode 100644 index 0000000000..a40a0619af --- /dev/null +++ b/examples/stackedbars/stackedbars_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib stackedbars + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +stackedbars.file=$$PWD/stackedbars.pro +stackedbars.depends = jkqtplotterlib diff --git a/examples/stepplots/CMakeLists.txt b/examples/stepplots/CMakeLists.txt new file mode 100644 index 0000000000..7ddb53cf88 --- /dev/null +++ b/examples/stepplots/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME stepplots) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_stepplots/README.md b/examples/stepplots/README.md similarity index 69% rename from examples/simpletest_stepplots/README.md rename to examples/stepplots/README.md index c4a836b303..9da1cb2675 100644 --- a/examples/simpletest_stepplots/README.md +++ b/examples/stepplots/README.md @@ -1,7 +1,7 @@ # Example (JKQTPlotter): Step Line Plots in Different Styles {#JKQTPlotterSpecialStepLinePlot} -This project (see `./examples/simpletest_stepplots/`) simply creates a JKQTPlotter widget (as a new window) and adds a single line-graph (a sine-wave). Data is initialized from two QVector objects. +This project (see `./examples/stepplots/`) simply creates a JKQTPlotter widget (as a new window) and adds a single line-graph (a sine-wave). Data is initialized from two QVector objects. -The source code of the main application can be found in [`jkqtplotter_simpletest_stepplots.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.cpp). For the most part, several datasets of cosine-curves are generated. Then graphs of type `JKQTPSpecialLineHorizontalGraph` are added to the plot: +The source code of the main application can be found in [`stepplots.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/stepplots/stepplots.cpp). For the most part, several datasets of cosine-curves are generated. Then graphs of type `JKQTPSpecialLineHorizontalGraph` are added to the plot: ```.cpp // 3 now we make several plots with different step styles, each one also contains a @@ -39,12 +39,12 @@ In addition to the symbol type and line style, you can also alter the size of th The result looks like this: -![jkqtplotter_simpletest_stepplots](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_stepplots.png) +![stepplots](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/stepplots.png) If you use `` instead of the horizontal variant `` and exchange x- for y-data, you will get a plot like this: -![jkqtplotter_simpletest_stepplots_vertical.png](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_stepplots_vertical.png) +![stepplots_vertical.png](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/stepplots_vertical.png) Also note how the red graph is filled towards the y-axis, not the x-axis. diff --git a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.cpp b/examples/stepplots/stepplots.cpp similarity index 99% rename from examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.cpp rename to examples/stepplots/stepplots.cpp index 45891e8f21..696158611c 100644 --- a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.cpp +++ b/examples/stepplots/stepplots.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_stepplots.cpp +/** \example stepplots.cpp * JKQTPlotter: Examples: Special/Step Line Plots in Different Styles * * \ref JKQTPlotterSpecialStepLinePlot diff --git a/examples/stepplots/stepplots.pro b/examples/stepplots/stepplots.pro new file mode 100644 index 0000000000..1749c05e34 --- /dev/null +++ b/examples/stepplots/stepplots.pro @@ -0,0 +1,29 @@ +# source code for this simple demo +SOURCES = stepplots.cpp +#SOURCES = stepplots_vertical.cpp + +# configure Qt +CONFIG += link_prl qt +QT += core gui xml svg +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport + +# output executable name +TARGET = stepplots + + +# include JKQTPlotter source code +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib +INCLUDEPATH += ../../lib +CONFIG (debug, debug|release) { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug +} else { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib +} +message("LIBS = $$LIBS") + + +win32-msvc*: DEFINES += _USE_MATH_DEFINES +win32-msvc*: DEFINES += NOMINMAX + + + diff --git a/examples/stepplots/stepplots_and_lib.pro b/examples/stepplots/stepplots_and_lib.pro new file mode 100644 index 0000000000..4b6e775e6e --- /dev/null +++ b/examples/stepplots/stepplots_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib stepplots + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +stepplots.file=$$PWD/stepplots.pro +stepplots.depends = jkqtplotterlib diff --git a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_vertical.cpp b/examples/stepplots/stepplots_vertical.cpp similarity index 99% rename from examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_vertical.cpp rename to examples/stepplots/stepplots_vertical.cpp index db99863e4c..dadfbdafdb 100644 --- a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_vertical.cpp +++ b/examples/stepplots/stepplots_vertical.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_stepplots.cpp +/** \example stepplots.cpp * JKQTPlotter: Examples: Special/Step Line Plots in Different Styles * * \ref JKQTPlotterSpecialStepLinePlot diff --git a/examples/styledboxplot/CMakeLists.txt b/examples/styledboxplot/CMakeLists.txt new file mode 100644 index 0000000000..65bdc19794 --- /dev/null +++ b/examples/styledboxplot/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME styledboxplot) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES test_styledboxplot.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/test_styledboxplot/README.md b/examples/styledboxplot/README.md similarity index 96% rename from examples/test_styledboxplot/README.md rename to examples/styledboxplot/README.md index 0c8a782e64..8068a4b520 100644 --- a/examples/test_styledboxplot/README.md +++ b/examples/styledboxplot/README.md @@ -1,5 +1,5 @@ # Example (JKQTPlotter): Styling different aspects of boxplots {#JKQTPlotterBoxplotStyling} -This project (see [`test_styledboxplot`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/test_styledboxplot) demonstrates how to style different aspects of boxplots and how to draw different types and styles of boxplots. For a simple introduction into how to use boxplots, see [Plotting Box Plots](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_boxplot) and [Plotting a Statistical Distribution of Data](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/test_distributionplot). +This project (see [`test_styledboxplot`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/test_styledboxplot) demonstrates how to style different aspects of boxplots and how to draw different types and styles of boxplots. For a simple introduction into how to use boxplots, see [Plotting Box Plots](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/boxplot) and [Plotting a Statistical Distribution of Data](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/test_distributionplot). [JKQTPlotterBasicJKQTPDatastore]: @ref JKQTPlotterBasicJKQTPDatastore "Basic Usage of JKQTPDatastore" [JKQTPlotterBasicJKQTPDatastoreIterators]: @ref JKQTPlotterBasicJKQTPDatastoreIterators "Iterator-Based usage of JKQTPDatastore" diff --git a/examples/test_styledboxplot/test_styledboxplot.cpp b/examples/styledboxplot/test_styledboxplot.cpp similarity index 100% rename from examples/test_styledboxplot/test_styledboxplot.cpp rename to examples/styledboxplot/test_styledboxplot.cpp diff --git a/examples/test_styledboxplot/test_styledboxplot.pro b/examples/styledboxplot/test_styledboxplot.pro similarity index 67% rename from examples/test_styledboxplot/test_styledboxplot.pro rename to examples/styledboxplot/test_styledboxplot.pro index 6bd0eacb02..617009bd9b 100644 --- a/examples/test_styledboxplot/test_styledboxplot.pro +++ b/examples/styledboxplot/test_styledboxplot.pro @@ -10,12 +10,12 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport TARGET = test_styledboxplot # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/test_styledboxplot/test_styledboxplot_and_lib.pro b/examples/styledboxplot/test_styledboxplot_and_lib.pro similarity index 67% rename from examples/test_styledboxplot/test_styledboxplot_and_lib.pro rename to examples/styledboxplot/test_styledboxplot_and_lib.pro index 35564d409b..3fcd52ded2 100644 --- a/examples/test_styledboxplot/test_styledboxplot_and_lib.pro +++ b/examples/styledboxplot/test_styledboxplot_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib test_styledboxplot -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro test_styledboxplot.file=$$PWD/test_styledboxplot.pro test_styledboxplot.depends = jkqtplotterlib diff --git a/examples/styling/CMakeLists.txt b/examples/styling/CMakeLists.txt new file mode 100644 index 0000000000..b3c3bf2acc --- /dev/null +++ b/examples/styling/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME styling) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES test_styling.cpp test_styling_main.cpp) +set(HEADERS test_styling.h ) +set(RESOURCES ) +set(UIS test_styling.ui ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/test_styling/README.md b/examples/styling/README.md similarity index 100% rename from examples/test_styling/README.md rename to examples/styling/README.md diff --git a/examples/test_styling/test_styling.cpp b/examples/styling/test_styling.cpp similarity index 100% rename from examples/test_styling/test_styling.cpp rename to examples/styling/test_styling.cpp diff --git a/examples/test_styling/test_styling.h b/examples/styling/test_styling.h similarity index 100% rename from examples/test_styling/test_styling.h rename to examples/styling/test_styling.h diff --git a/examples/test_styling/test_styling.pro b/examples/styling/test_styling.pro similarity index 80% rename from examples/test_styling/test_styling.pro rename to examples/styling/test_styling.pro index 0c2bf0ca5d..49c880cc78 100644 --- a/examples/test_styling/test_styling.pro +++ b/examples/styling/test_styling.pro @@ -24,10 +24,10 @@ INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/test_styling/test_styling.ui b/examples/styling/test_styling.ui similarity index 100% rename from examples/test_styling/test_styling.ui rename to examples/styling/test_styling.ui diff --git a/examples/test_styling/test_styling_and_lib.pro b/examples/styling/test_styling_and_lib.pro similarity index 64% rename from examples/test_styling/test_styling_and_lib.pro rename to examples/styling/test_styling_and_lib.pro index 70c7086ed2..1e8af218c2 100644 --- a/examples/test_styling/test_styling_and_lib.pro +++ b/examples/styling/test_styling_and_lib.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro test_styling.file=$$PWD/test_styling.pro test_styling.depends = jkqtplotterlib diff --git a/examples/test_styling/test_styling_main.cpp b/examples/styling/test_styling_main.cpp similarity index 100% rename from examples/test_styling/test_styling_main.cpp rename to examples/styling/test_styling_main.cpp diff --git a/examples/symbols_and_errors/CMakeLists.txt b/examples/symbols_and_errors/CMakeLists.txt new file mode 100644 index 0000000000..54a30a4e5b --- /dev/null +++ b/examples/symbols_and_errors/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME symbols_and_errors) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_symbols_and_errors/README.md b/examples/symbols_and_errors/README.md similarity index 74% rename from examples/simpletest_symbols_and_errors/README.md rename to examples/symbols_and_errors/README.md index 6de4f203a9..7cfd1bf749 100644 --- a/examples/simpletest_symbols_and_errors/README.md +++ b/examples/symbols_and_errors/README.md @@ -1,7 +1,7 @@ # Example (JKQTPlotter): Simple line-graph with error bars {#JKQTPlotterSymbolsErrors} -This project (see `./examples/simpletest_symbols_and_errors/`) simply creates a JKQTPlotter widget (as a new window) and adds a single line-graph (a sine-wave) that has y-errorbars. In addition, this example shows how to change some of the axis properties and how to use LaTeX markup to format axis labels (can actually be used for all labels in JKQTPlotter). Also, in comparison to the last example, here we initialize the data from C-type arrays (double*), instead of QVector objects. +This project (see `./examples/symbols_and_errors/`) simply creates a JKQTPlotter widget (as a new window) and adds a single line-graph (a sine-wave) that has y-errorbars. In addition, this example shows how to change some of the axis properties and how to use LaTeX markup to format axis labels (can actually be used for all labels in JKQTPlotter). Also, in comparison to the last example, here we initialize the data from C-type arrays (double*), instead of QVector objects. -The source code of the main application is (see [`jkqtplotter_simpletest_symbols_and_errors.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors.cpp): +The source code of the main application is (see [`symbols_and_errors.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/symbols_and_errors/symbols_and_errors.cpp): ```.cpp #include #include "jkqtplotter/jkqtplotter.h" @@ -70,6 +70,6 @@ int main(int argc, char* argv[]) ``` The result looks like this: -![jkqtplotter_simpletest_symbols_and_errors](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_symbols_and_errors.png) +![symbols_and_errors](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/symbols_and_errors.png) diff --git a/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors.cpp b/examples/symbols_and_errors/symbols_and_errors.cpp similarity index 97% rename from examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors.cpp rename to examples/symbols_and_errors/symbols_and_errors.cpp index 3d6b0ff62b..63aa977fd4 100644 --- a/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors.cpp +++ b/examples/symbols_and_errors/symbols_and_errors.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_symbols_and_errors.cpp +/** \example symbols_and_errors.cpp * JKQTPlotter: Examples: Simple line-graph with error bars * * \ref JKQTPlotterSymbolsErrors diff --git a/examples/symbols_and_errors/symbols_and_errors.pro b/examples/symbols_and_errors/symbols_and_errors.pro new file mode 100644 index 0000000000..2c8e71735c --- /dev/null +++ b/examples/symbols_and_errors/symbols_and_errors.pro @@ -0,0 +1,28 @@ +# source code for this simple demo +SOURCES = symbols_and_errors.cpp + +# configure Qt +CONFIG += link_prl qt +QT += core gui xml svg +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport + +# output executable name +TARGET = symbols_and_errors + + +# include JKQTPlotter source code +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib +INCLUDEPATH += ../../lib +CONFIG (debug, debug|release) { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug +} else { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib +} +message("LIBS = $$LIBS") + +win32-msvc*: DEFINES += _USE_MATH_DEFINES +win32-msvc*: DEFINES += NOMINMAX + + + + diff --git a/examples/symbols_and_errors/symbols_and_errors_and_lib.pro b/examples/symbols_and_errors/symbols_and_errors_and_lib.pro new file mode 100644 index 0000000000..d5205e23ef --- /dev/null +++ b/examples/symbols_and_errors/symbols_and_errors_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib symbols_and_errors + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +symbols_and_errors.file=$$PWD/symbols_and_errors.pro +symbols_and_errors.depends = jkqtplotterlib diff --git a/examples/symbols_and_styles/CMakeLists.txt b/examples/symbols_and_styles/CMakeLists.txt new file mode 100644 index 0000000000..04325e71d3 --- /dev/null +++ b/examples/symbols_and_styles/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME symbols_and_styles) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_symbols_and_styles/README.md b/examples/symbols_and_styles/README.md similarity index 68% rename from examples/simpletest_symbols_and_styles/README.md rename to examples/symbols_and_styles/README.md index 18ea572b3d..d795074f0f 100644 --- a/examples/simpletest_symbols_and_styles/README.md +++ b/examples/symbols_and_styles/README.md @@ -1,7 +1,7 @@ # Example (JKQTPlotter): Line Graph with Different Symbols and Line Styles {#JKQTPlotterSymbolsAndStyles} -This project (see `./examples/simpletest_symbols_and_styles/`) simply creates a JKQTPlotter widget (as a new window) and adds a single line-graph (a sine-wave). Data is initialized from two QVector objects. +This project (see `./examples/symbols_and_styles/`) simply creates a JKQTPlotter widget (as a new window) and adds a single line-graph (a sine-wave). Data is initialized from two QVector objects. -The source code of the main application can be found in [`jkqtplotter_simpletest_symbols_and_styles.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.cpp). Mainly several graphs are generated in a loop and then different symbol and line styles are applied to the graph (set by `graph->setSymbolType()` for the symbol and `graph->setLineStyle()` for the line style). The colors are set automtically from an internal default palette. The main loop looks like this: +The source code of the main application can be found in [`symbols_and_styles.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/symbols_and_styles/symbols_and_styles.cpp). Mainly several graphs are generated in a loop and then different symbol and line styles are applied to the graph (set by `graph->setSymbolType()` for the symbol and `graph->setLineStyle()` for the line style). The colors are set automtically from an internal default palette. The main loop looks like this: ```.cpp QVector pens {Qt::NoPen, Qt::SolidLine, Qt::DashLine, Qt::DotLine, Qt::DashDotLine, Qt::DashDotDotLine }; @@ -46,7 +46,7 @@ Note: There are additional, more advanced options for styling the graphs. See th The result looks like this: -![jkqtplotter_simpletest_symbols_and_styles](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_symbols_and_styles.png) +![symbols_and_styles](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/symbols_and_styles.png) diff --git a/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.cpp b/examples/symbols_and_styles/symbols_and_styles.cpp similarity index 98% rename from examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.cpp rename to examples/symbols_and_styles/symbols_and_styles.cpp index e7c338d1f9..6c3cddc7cb 100644 --- a/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.cpp +++ b/examples/symbols_and_styles/symbols_and_styles.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_symbols_and_styles.cpp +/** \example symbols_and_styles.cpp * JKQTPlotter: Examples: Line Graph with Different Symbols and Line Styles * * \ref JKQTPlotterSymbolsAndStyles diff --git a/examples/symbols_and_styles/symbols_and_styles.pro b/examples/symbols_and_styles/symbols_and_styles.pro new file mode 100644 index 0000000000..ae6b269450 --- /dev/null +++ b/examples/symbols_and_styles/symbols_and_styles.pro @@ -0,0 +1,28 @@ +# source code for this simple demo +SOURCES = symbols_and_styles.cpp + +# configure Qt +CONFIG += link_prl qt +QT += core gui xml svg +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport + +# output executable name +TARGET = symbols_and_styles + + +# include JKQTPlotter source code +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib +INCLUDEPATH += ../../lib +CONFIG (debug, debug|release) { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug +} else { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib +} +message("LIBS = $$LIBS") + +win32-msvc*: DEFINES += _USE_MATH_DEFINES +win32-msvc*: DEFINES += NOMINMAX + + + + diff --git a/examples/symbols_and_styles/symbols_and_styles_and_lib.pro b/examples/symbols_and_styles/symbols_and_styles_and_lib.pro new file mode 100644 index 0000000000..41efeedc37 --- /dev/null +++ b/examples/symbols_and_styles/symbols_and_styles_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib symbols_and_styles + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +symbols_and_styles.file=$$PWD/symbols_and_styles.pro +symbols_and_styles.depends = jkqtplotterlib diff --git a/examples/ui/CMakeLists.txt b/examples/ui/CMakeLists.txt new file mode 100644 index 0000000000..b1a9b3c34e --- /dev/null +++ b/examples/ui/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME ui) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp formwithjkqtplotter.cpp) +set(HEADERS formwithjkqtplotter.h) +set(RESOURCES ) +set(UIS formwithjkqtplotter.ui ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_ui/README.md b/examples/ui/README.md similarity index 79% rename from examples/simpletest_ui/README.md rename to examples/ui/README.md index d6dc60e202..98a3111c3a 100644 --- a/examples/simpletest_ui/README.md +++ b/examples/ui/README.md @@ -1,5 +1,5 @@ # Tutorial (JKQTPlotter): Using a JKQTPlotter inside a Qt User Interface Designer (UI) File {#JKQTPlotterQtCreator} -This project (see `./examples/simpletest_ui/`) demonstrates how to create add a `JKQTPlotter` inside the Qt Form Editor (e.g. called from of Qt Creator) into a widget. +This project (see `./examples/ui/`) demonstrates how to create add a `JKQTPlotter` inside the Qt Form Editor (e.g. called from of Qt Creator) into a widget. # Instructions on how to use JKQTPlotter in the Qt Form Designer @@ -18,10 +18,10 @@ For this to work you have to follow the steps shown below: # QMake-Project of this example -The QMake project for such a project looks like this (see [`jkqtplotter_simpletest_ui.pro`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_ui/jkqtplotter_simpletest_ui.pro): +The QMake project for such a project looks like this (see [`ui.pro`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/ui/ui.pro): ```.qmake # source code for this simple demo -SOURCES = jkqtplotter_simpletest_ui.cpp \ +SOURCES = ui.cpp \ formwithjkqtplotter.cpp FORMS += formwithjkqtplotter.ui @@ -34,15 +34,15 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # output executable name -TARGET = jkqtplotter_simpletest_ui +TARGET = ui # include JKQTPlotter source headers and link against library -DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") @@ -78,7 +78,7 @@ int main(int argc, char* argv[]) The Form was designed in the Qt Form Designer within Qt Creator, using the method described above (see `formwithjkqtplotter.ui`): -![jkqtplotter_simpletest_ui1](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_ui_widget.png) +![ui1](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/ui_widget.png) In addition the example implements some simple functionality in the `formwithjkqtplotter.cpp/.h`-files. A single graph, which parses and plots a function (from a `QLineEdit`) is added to the plot in the constructor: ```.cpp @@ -134,11 +134,11 @@ void FormWithJKQTPlotter::on_btnReplot_clicked() The result looks like this: -![jkqtplotter_simpletest_ui1](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_ui.png) +![ui1](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/ui.png) If you set both axes to logarithmic and modify the plotted function a bit, you get: -![jkqtplotter_simpletest_ui1](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_ui_loglog.png) +![ui1](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/ui_loglog.png) diff --git a/examples/simpletest_ui/formwithjkqtplotter.cpp b/examples/ui/formwithjkqtplotter.cpp similarity index 100% rename from examples/simpletest_ui/formwithjkqtplotter.cpp rename to examples/ui/formwithjkqtplotter.cpp diff --git a/examples/simpletest_ui/formwithjkqtplotter.h b/examples/ui/formwithjkqtplotter.h similarity index 100% rename from examples/simpletest_ui/formwithjkqtplotter.h rename to examples/ui/formwithjkqtplotter.h diff --git a/examples/simpletest_ui/formwithjkqtplotter.ui b/examples/ui/formwithjkqtplotter.ui similarity index 100% rename from examples/simpletest_ui/formwithjkqtplotter.ui rename to examples/ui/formwithjkqtplotter.ui diff --git a/examples/simpletest_ui/jkqtplotter_simpletest_ui.cpp b/examples/ui/ui.cpp similarity index 100% rename from examples/simpletest_ui/jkqtplotter_simpletest_ui.cpp rename to examples/ui/ui.cpp diff --git a/examples/simpletest_ui/jkqtplotter_simpletest_ui.pro b/examples/ui/ui.pro similarity index 68% rename from examples/simpletest_ui/jkqtplotter_simpletest_ui.pro rename to examples/ui/ui.pro index 7e51875d04..48720c4975 100644 --- a/examples/simpletest_ui/jkqtplotter_simpletest_ui.pro +++ b/examples/ui/ui.pro @@ -1,5 +1,5 @@ # source code for this simple demo -SOURCES = jkqtplotter_simpletest_ui.cpp \ +SOURCES = ui.cpp \ formwithjkqtplotter.cpp FORMS += formwithjkqtplotter.ui @@ -12,15 +12,15 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # output executable name -TARGET = jkqtplotter_simpletest_ui +TARGET = ui # include JKQTPlotter source headers and link against library DEPENDPATH += ../../lib ../../staticlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/ui/ui_and_lib.pro b/examples/ui/ui_and_lib.pro new file mode 100644 index 0000000000..8f1e35a24e --- /dev/null +++ b/examples/ui/ui_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib ui + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +ui.file=$$PWD/ui.pro +ui.depends = jkqtplotterlib diff --git a/examples/user_interaction/CMakeLists.txt b/examples/user_interaction/CMakeLists.txt new file mode 100644 index 0000000000..74233f36d7 --- /dev/null +++ b/examples/user_interaction/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME user_interaction) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES test_user_interaction.cpp test_user_interaction_main.cpp) +set(HEADERS test_user_interaction.h) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/test_user_interaction/README.md b/examples/user_interaction/README.md similarity index 100% rename from examples/test_user_interaction/README.md rename to examples/user_interaction/README.md diff --git a/examples/test_user_interaction/test_user_interaction.cpp b/examples/user_interaction/test_user_interaction.cpp similarity index 100% rename from examples/test_user_interaction/test_user_interaction.cpp rename to examples/user_interaction/test_user_interaction.cpp diff --git a/examples/test_user_interaction/test_user_interaction.h b/examples/user_interaction/test_user_interaction.h similarity index 100% rename from examples/test_user_interaction/test_user_interaction.h rename to examples/user_interaction/test_user_interaction.h diff --git a/examples/test_user_interaction/test_user_interaction.pro b/examples/user_interaction/test_user_interaction.pro similarity index 81% rename from examples/test_user_interaction/test_user_interaction.pro rename to examples/user_interaction/test_user_interaction.pro index 36ea38ae6b..f88170301b 100644 --- a/examples/test_user_interaction/test_user_interaction.pro +++ b/examples/user_interaction/test_user_interaction.pro @@ -19,9 +19,9 @@ HEADERS += \ DEPENDPATH += ../../lib ../../staticlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/test_user_interaction/test_user_interaction_and_lib.pro b/examples/user_interaction/test_user_interaction_and_lib.pro similarity index 69% rename from examples/test_user_interaction/test_user_interaction_and_lib.pro rename to examples/user_interaction/test_user_interaction_and_lib.pro index e12816f879..0961aa9623 100644 --- a/examples/test_user_interaction/test_user_interaction_and_lib.pro +++ b/examples/user_interaction/test_user_interaction_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib test_user_interaction -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro test_user_interaction.file=$$PWD/test_user_interaction.pro test_user_interaction.depends = jkqtplotterlib diff --git a/examples/test_user_interaction/test_user_interaction_main.cpp b/examples/user_interaction/test_user_interaction_main.cpp similarity index 100% rename from examples/test_user_interaction/test_user_interaction_main.cpp rename to examples/user_interaction/test_user_interaction_main.cpp diff --git a/examples/violinplot/CMakeLists.txt b/examples/violinplot/CMakeLists.txt new file mode 100644 index 0000000000..88b0d695f8 --- /dev/null +++ b/examples/violinplot/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.0) + +set(EXAMPLE_NAME violinplot) +set(EXENAME jkqtptest_${EXAMPLE_NAME}) + +message( STATUS ".. Building Example ${EXAMPLE_NAME}" ) + + +# Set up source files +set(SOURCES ${EXAMPLE_NAME}.cpp) +set(HEADERS ) +set(RESOURCES ) +set(UIS ) + +add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS}) +target_include_directories(${EXENAME} PRIVATE ../../lib) +if(BUILD_STATIC_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterLib) +elseif(BUILD_SHARED_LIBS) + target_link_libraries(${EXENAME} JKQTPlotterSharedLib) +endif() + + + +# Installation +if(LIB_INSTALL) + install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif(LIB_INSTALL) diff --git a/examples/simpletest_violinplot/README.md b/examples/violinplot/README.md similarity index 83% rename from examples/simpletest_violinplot/README.md rename to examples/violinplot/README.md index 8ef1a46b44..05aaa96b6c 100644 --- a/examples/simpletest_violinplot/README.md +++ b/examples/violinplot/README.md @@ -5,9 +5,9 @@ [statisticslibrary]: @ref jkqtptools_math_statistics "JKQTPlotter Statistics Library" [JKQTPlotterBoxplotStyling]: @ref JKQTPlotterBoxplotStyling "Styling different aspects of boxplots" -This project (see [`simpletest_violinplot`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/simpletest_violinplot) demonstrates how to use JKQTPlotter to draw violin plots using the classes `JKQTPViolinplotVerticalElement` and `JKQTPViolinplotHorizontalElement`. Violin plots can be thought of as an extension to box plots, as they are also used to represent the distribution of a random variable, but contain more info than the "simple" 5-number statistics used for boxplots: Violin Plots show an estimate of the desnsity distribution of the random vriable, e.g. calculated as a kernel density estimate, or as a simple histogram. The Plotting classes themselves do not calculate these estimates, but only draw them into the plot. The density estimates are calculated by functions from the [statisticslibrary]. +This project (see [`violinplot`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/violinplot) demonstrates how to use JKQTPlotter to draw violin plots using the classes `JKQTPViolinplotVerticalElement` and `JKQTPViolinplotHorizontalElement`. Violin plots can be thought of as an extension to box plots, as they are also used to represent the distribution of a random variable, but contain more info than the "simple" 5-number statistics used for boxplots: Violin Plots show an estimate of the desnsity distribution of the random vriable, e.g. calculated as a kernel density estimate, or as a simple histogram. The Plotting classes themselves do not calculate these estimates, but only draw them into the plot. The density estimates are calculated by functions from the [statisticslibrary]. -The source code of the main application is (see [`jkqtplotter_simpletest_violinplot.cpp`](jkqtplotter_simpletest_violinplot.cpp). +The source code of the main application is (see [`violinplot.cpp`](violinplot.cpp). # Generating a test Dataset @@ -83,7 +83,7 @@ The center of the `gData1` was set to 0 and the center of the violin plot is set The result looks like this, if we use the same method as above to calculate also the violin plots for `randomdatacol2` and `randomdatacol3`: -![jkqtplotter_simpletest_violinplot_vert](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_violinplot_vert.png) +![violinplot_vert](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/violinplot_vert.png) Note that we set different styles for the three plots with: ```.cpp @@ -104,7 +104,7 @@ Also for the green and blue plot, we did not calculate a kernel density estimate Finally note that if you use `JKQTPViolinplotHorizontalElement` instead of the `JKQTPViolinplotVerticalElement` used above, you can also draw horizontal violin plots: -![jkqtplotter_simpletest_violinplot_hor](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_violinplot_hor.png) +![violinplot_hor](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/violinplot_hor.png) # Adapters as shortcuts to drawing Violin Plots diff --git a/examples/simpletest_violinplot/jkqtplotter_simpletest_violinplot.cpp b/examples/violinplot/violinplot.cpp similarity index 99% rename from examples/simpletest_violinplot/jkqtplotter_simpletest_violinplot.cpp rename to examples/violinplot/violinplot.cpp index b77987e326..aa6065223b 100644 --- a/examples/simpletest_violinplot/jkqtplotter_simpletest_violinplot.cpp +++ b/examples/violinplot/violinplot.cpp @@ -1,4 +1,4 @@ -/** \example jkqtplotter_simpletest_violinplot->cpp +/** \example violinplot.cpp * Shows how to draw Violin-Plot with JKQTPlotter * * \ref JKQTPlotterViolinplotGraphs diff --git a/examples/violinplot/violinplot.pro b/examples/violinplot/violinplot.pro new file mode 100644 index 0000000000..8d6802e328 --- /dev/null +++ b/examples/violinplot/violinplot.pro @@ -0,0 +1,27 @@ +# source code for this simple demo +SOURCES = violinplot.cpp + +# configure Qt +CONFIG += link_prl qt +QT += core gui xml svg +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport + +# output executable name +TARGET = violinplot + +# include JKQTPlotter source code +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib +INCLUDEPATH += ../../lib +CONFIG (debug, debug|release) { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug +} else { + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib +} +message("LIBS = $$LIBS") + + + +win32-msvc*: DEFINES += _USE_MATH_DEFINES +win32-msvc*: DEFINES += NOMINMAX + + diff --git a/examples/violinplot/violinplot_and_lib.pro b/examples/violinplot/violinplot_and_lib.pro new file mode 100644 index 0000000000..4b9edddcc5 --- /dev/null +++ b/examples/violinplot/violinplot_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtplotterlib violinplot + +jkqtplotterlib.file = ../../qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro + +violinplot.file=$$PWD/violinplot.pro +violinplot.depends = jkqtplotterlib diff --git a/lib/jkqtcommon/CMakeLists.txt b/lib/jkqtcommon/CMakeLists.txt index 6bc5e1a998..033f50ee95 100644 --- a/lib/jkqtcommon/CMakeLists.txt +++ b/lib/jkqtcommon/CMakeLists.txt @@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.0) set(libBasename JKQTCommon) -message( STATUS ) -message( STATUS "-----------------------------------------------------------------------------" ) if(BUILD_SHARED_LIBS) set(libsh_name ${libBasename}SharedLib) set(${libsh_name}_LIBRARY ${libsh_name} PARENT_SCOPE) @@ -19,7 +17,7 @@ endif(BUILD_STATIC_LIBS) # Set up source files -set(SRCS +set(SOURCES jkqtpdebuggingtools.cpp jkqtpmathtools.cpp jkqtpalgorithms.cpp @@ -67,15 +65,15 @@ set(HEADERS if(BUILD_SHARED_LIBS) - add_library(${libsh_name} SHARED ${SRCS} ${HEADERS}) + add_library(${libsh_name} SHARED ${SOURCES} ${HEADERS}) set_property(TARGET ${libsh_name} PROPERTY VERSION "${PROJECT_VERSION}") target_link_libraries(${libsh_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport) - target_compile_definitions(${libsh_name} PRIVATE JKQTP_LIB_IN_DLL) + target_compile_definitions(${libsh_name} PUBLIC JKQTP_LIB_IN_DLL) target_compile_definitions(${libsh_name} PRIVATE JKQTP_LIB_EXPORT_LIBRARY) endif() if(BUILD_STATIC_LIBS) - add_library(${lib_name} STATIC ${SRCS} ${HEADERS}) + add_library(${lib_name} STATIC ${SOURCES} ${HEADERS}) set_property(TARGET ${lib_name} PROPERTY VERSION "${PROJECT_VERSION}") target_link_libraries(${lib_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport) endif() diff --git a/lib/jkqtcommon/jkqtpmathparser.h b/lib/jkqtcommon/jkqtpmathparser.h index 4609782c27..dd94607e10 100644 --- a/lib/jkqtcommon/jkqtpmathparser.h +++ b/lib/jkqtcommon/jkqtpmathparser.h @@ -315,7 +315,7 @@ class JKQTP_LIB_EXPORT JKQTPMathParser /** \brief result of any expression * \ingroup jkmpultil*/ - struct jkmpResult { + struct JKQTP_LIB_EXPORT jkmpResult { jkmpResult(); bool isValid; @@ -336,7 +336,7 @@ class JKQTP_LIB_EXPORT JKQTPMathParser * only contains pointers to the data * \ingroup jkmpultil */ - struct jkmpVariable { + struct JKQTP_LIB_EXPORT jkmpVariable { jkmpVariable(); jkmpResultType type; /*!< \brief type of the variable */ bool internal; /*!< \brief this is an internal variable */ @@ -348,7 +348,7 @@ class JKQTP_LIB_EXPORT JKQTPMathParser /** \brief This struct is for managing temporary variables. It is generally like jkmpVariable. * \ingroup jkmpultil */ - struct jkmpTempVariable { + struct JKQTP_LIB_EXPORT jkmpTempVariable { std::string name; /*!< \brief name of the variable */ jkmpResultType type; /*!< \brief type of the variable */ bool internal; /*!< \brief this is an internal variable */ @@ -385,7 +385,7 @@ class JKQTP_LIB_EXPORT JKQTPMathParser /** \brief description of a user registered function */ - struct jkmpFunctionDescriptor { + struct JKQTP_LIB_EXPORT jkmpFunctionDescriptor { jkmpEvaluateFunc function; /*!< \brief a pointer to the function implementation */ std::string name; /*!< \brief name of the function */ }; @@ -400,7 +400,7 @@ class JKQTP_LIB_EXPORT JKQTPMathParser * All allowed node types must inherit from jkmpNode * \ingroup jkmpNodes */ - class jkmpNode { + class JKQTP_LIB_EXPORT jkmpNode { protected: JKQTPMathParser* parser; /*!< \brief points to the parser object that is used to evaluate this node */ jkmpNode* parent; /*!< \brief points to the parent node */ @@ -430,7 +430,7 @@ class JKQTP_LIB_EXPORT JKQTPMathParser * add (+), subtract (-), multiply (*), divide (/), a to the power of b (a^b) * \ingroup jkmpNodes */ - class jkmpBinaryArithmeticNode: public jkmpNode { + class JKQTP_LIB_EXPORT jkmpBinaryArithmeticNode: public jkmpNode { private: jkmpNode* left, *right; char operation; @@ -455,7 +455,7 @@ class JKQTP_LIB_EXPORT JKQTPMathParser * \brief This class represents a binary boolean operation: and, or, xor, nor, nand * \ingroup jkmpNodes */ - class jkmpBinaryBoolNode: public jkmpNode { + class JKQTP_LIB_EXPORT jkmpBinaryBoolNode: public jkmpNode { private: jkmpNode* left, *right; char operation; @@ -480,7 +480,7 @@ class JKQTP_LIB_EXPORT JKQTPMathParser * \brief This class represents a binary compare operation: !=, ==, >=, <=, >, < * \ingroup jkmpNodes */ - class jkmpCompareNode: public jkmpNode { + class JKQTP_LIB_EXPORT jkmpCompareNode: public jkmpNode { private: jkmpNode* left, *right; char operation; @@ -505,7 +505,7 @@ class JKQTP_LIB_EXPORT JKQTPMathParser * \brief This class represents a unary operations: ! (bool negation), - (arithmetic negation) * \ingroup jkmpNodes */ - class jkmpUnaryNode: public jkmpNode { + class JKQTP_LIB_EXPORT jkmpUnaryNode: public jkmpNode { private: jkmpNode* child; char operation; @@ -529,7 +529,7 @@ class JKQTP_LIB_EXPORT JKQTPMathParser * \brief This class represents a variable assignment (a = expression) * \ingroup jkmpNodes */ - class jkmpVariableAssignNode: public jkmpNode { + class JKQTP_LIB_EXPORT jkmpVariableAssignNode: public jkmpNode { private: jkmpNode* child; std::string variable; @@ -554,7 +554,7 @@ class JKQTP_LIB_EXPORT JKQTPMathParser * \brief This class represents a number, a string contant or a boolean contant (true/false) * \ingroup jkmpNodes */ - class jkmpConstantNode: public jkmpNode { + class JKQTP_LIB_EXPORT jkmpConstantNode: public jkmpNode { private: jkmpResult data; public: @@ -573,7 +573,7 @@ class JKQTP_LIB_EXPORT JKQTPMathParser * \brief This class represents a variable. * \ingroup jkmpNodes */ - class jkmpVariableNode: public jkmpNode { + class JKQTP_LIB_EXPORT jkmpVariableNode: public jkmpNode { private: std::string var; public: @@ -598,7 +598,7 @@ class JKQTP_LIB_EXPORT JKQTPMathParser * * Functions may have 8 parameters at the most. */ - class jkmpFunctionNode: public jkmpNode { + class JKQTP_LIB_EXPORT jkmpFunctionNode: public jkmpNode { private: std::string fun; jkmpNode** child; @@ -627,7 +627,7 @@ class JKQTP_LIB_EXPORT JKQTPMathParser * * when evaluating the result will be the result of the last node in the list. */ - class jkmpNodeList: public jkmpNode { + class JKQTP_LIB_EXPORT jkmpNodeList: public jkmpNode { private: std::vector list; public: @@ -666,7 +666,7 @@ class JKQTP_LIB_EXPORT JKQTPMathParser * error handler and assign it (function pointer) to the global variable jkmathparser_exception_function. * If this is not nullptr this function will be called instead of throwing an exception. */ - class jkmpException : public std::exception { + class JKQTP_LIB_EXPORT jkmpException : public std::exception { private: /** \brief the error message */ std::string errormessage; diff --git a/lib/jkqtcommon/jkqtpstatbasics.h b/lib/jkqtcommon/jkqtpstatbasics.h index 1de8886f01..0e466b065e 100644 --- a/lib/jkqtcommon/jkqtpstatbasics.h +++ b/lib/jkqtcommon/jkqtpstatbasics.h @@ -1015,7 +1015,7 @@ inline void jkqtpstat5NumberStatisticsAndOutliers(InputIt first, InputIt last, O \ingroup jkqtptools_math_statistics_basic \see https://en.wikipedia.org/wiki/Five-number_summary, jkqtpstat5NumberStatistics() */ -struct JKQTPStat5NumberStatistics { +struct JKQTP_LIB_EXPORT JKQTPStat5NumberStatistics { JKQTPStat5NumberStatistics(); /** \brief minimum value */ diff --git a/lib/jkqtcommon/jkqtpstatpoly.h b/lib/jkqtcommon/jkqtpstatpoly.h index d5f0774793..c9a42055f8 100644 --- a/lib/jkqtcommon/jkqtpstatpoly.h +++ b/lib/jkqtcommon/jkqtpstatpoly.h @@ -62,7 +62,7 @@ \f[ \begin{bmatrix} y_1\\ y_2\\ y_3 \\ \vdots \\ y_n \end{bmatrix}= \begin{bmatrix} 1 & x_1 & x_1^2 & \dots & x_1^P \\ 1 & x_2 & x_2^2 & \dots & x_2^P\\ 1 & x_3 & x_3^2 & \dots & x_3^P \\ \vdots & \vdots & \vdots & & \vdots \\ 1 & x_n & x_n^2 & \dots & x_n^P \end{bmatrix} \begin{bmatrix} p_0\\ p_1\\ p_2\\ \vdots \\ p_P \end{bmatrix} \f] \f[ \vec{y}=V\vec{p}\ \ \ \ \ \Rightarrow\ \ \ \ \ \vec{p}=(V^TV)^{-1}V^T\vec{y} \f] - \image html jkqtplotter_simpletest_datastore_regression_polynom.png + \image html datastore_regression_polynom.png \see https://en.wikipedia.org/wiki/Polynomial_regression */ diff --git a/lib/jkqtcommon/jkqtpstatregression.h b/lib/jkqtcommon/jkqtpstatregression.h index c2627b9893..fc5d241cd1 100644 --- a/lib/jkqtcommon/jkqtpstatregression.h +++ b/lib/jkqtcommon/jkqtpstatregression.h @@ -65,7 +65,7 @@ \f[ a=\overline{y}-b\cdot\overline{x} \f] \f[ b=\frac{\sum x_iy_i-N\cdot\overline{x}\cdot\overline{y}}{\sum x_i^2-N\cdot(\overline{x})^2} \f] - \image html jkqtplotter_simpletest_datastore_regression_lin.png + \image html datastore_regression_lin.png */ template inline void jkqtpstatLinearRegression(InputItX firstX, InputItX lastX, InputItY firstY, InputItY lastY, double& coeffA, double& coeffB, bool fixA=false, bool fixB=false) { @@ -137,7 +137,7 @@ inline void jkqtpstatLinearRegression(InputItX firstX, InputItX lastX, InputItY \f[ \overline{x^2}=\sum\limits_iw_i^2\cdot x_i^2 \f] \f[ \overline{w^2}=\sum\limits_iw_i^2 \f] - \image html jkqtplotter_simpletest_datastore_regression_linweight.png + \image html datastore_regression_linweight.png */ template @@ -221,7 +221,7 @@ inline void jkqtpstatLinearWeightedRegression(InputItX firstX, InputItX lastX, I \image html irls.png - \image html jkqtplotter_simpletest_datastore_regression_linrobust_p.png + \image html datastore_regression_linrobust_p.png \see https://en.wikipedia.org/wiki/Iteratively_reweighted_least_squares, C. Sidney Burrus: "Iterative Reweighted Least Squares", http://cnx.org/content/m45285/latest/ */ diff --git a/lib/jkqtfastplotter/CMakeLists.txt b/lib/jkqtfastplotter/CMakeLists.txt index ceaa2cdd6b..0a52c4a497 100644 --- a/lib/jkqtfastplotter/CMakeLists.txt +++ b/lib/jkqtfastplotter/CMakeLists.txt @@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.0) set(libBasename JKQTFastPlotter) -message( STATUS ) -message( STATUS "-----------------------------------------------------------------------------" ) if(BUILD_SHARED_LIBS) set(libsh_name ${libBasename}SharedLib) set(${libsh_name}_LIBRARY ${libsh_name} PARENT_SCOPE) @@ -17,10 +15,8 @@ if(BUILD_STATIC_LIBS) endif(BUILD_STATIC_LIBS) -find_package(Qt5 COMPONENTS Core Gui OpenGL Script Widgets PrintSupport) - # Set up source files -set(SRCS +set(SOURCES jkqtfastplotter.cpp ) @@ -31,15 +27,15 @@ set(HEADERS if(BUILD_SHARED_LIBS) - add_library(${libsh_name} SHARED ${SRCS} ${HEADERS} ${RESOURCES}) + add_library(${libsh_name} SHARED ${SOURCES} ${HEADERS} ${RESOURCES}) set_property(TARGET ${libsh_name} PROPERTY VERSION "${PROJECT_VERSION}") target_link_libraries(${libsh_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::OpenGL JKQTCommonSharedLib) - target_compile_definitions(${libsh_name} PRIVATE JKQTP_LIB_IN_DLL) + target_compile_definitions(${libsh_name} PUBLIC JKQTP_LIB_IN_DLL) target_compile_definitions(${libsh_name} PRIVATE JKQTP_LIB_EXPORT_LIBRARY) endif() if(BUILD_STATIC_LIBS) - add_library(${lib_name} STATIC ${SRCS} ${HEADERS} ${RESOURCES}) + add_library(${lib_name} STATIC ${SOURCES} ${HEADERS} ${RESOURCES}) set_property(TARGET ${lib_name} PROPERTY VERSION "${PROJECT_VERSION}") target_link_libraries(${lib_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::OpenGL JKQTCommonLib) endif() diff --git a/lib/jkqtmathtext/CMakeLists.txt b/lib/jkqtmathtext/CMakeLists.txt index b02111c5d1..722a2daa8f 100644 --- a/lib/jkqtmathtext/CMakeLists.txt +++ b/lib/jkqtmathtext/CMakeLists.txt @@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.0) set(libBasename JKQTMathText) -message( STATUS ) -message( STATUS "-----------------------------------------------------------------------------" ) if(BUILD_SHARED_LIBS) set(libsh_name ${libBasename}SharedLib) set(${libsh_name}_LIBRARY ${libsh_name} PARENT_SCOPE) @@ -19,7 +17,7 @@ endif(BUILD_STATIC_LIBS) # Set up source files -set(SRCS +set(SOURCES jkqtmathtext.cpp ) @@ -35,15 +33,15 @@ endif(BUILD_INCLUDE_XITS_FONTS) if(BUILD_SHARED_LIBS) - add_library(${libsh_name} SHARED ${SRCS} ${HEADERS} ${RESOURCES}) + add_library(${libsh_name} SHARED ${SOURCES} ${HEADERS} ${RESOURCES}) set_property(TARGET ${libsh_name} PROPERTY VERSION "${PROJECT_VERSION}") target_link_libraries(${libsh_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport JKQTCommonSharedLib) - target_compile_definitions(${libsh_name} PRIVATE JKQTP_LIB_IN_DLL) + target_compile_definitions(${libsh_name} PUBLIC JKQTP_LIB_IN_DLL) target_compile_definitions(${libsh_name} PRIVATE JKQTP_LIB_EXPORT_LIBRARY) endif() if(BUILD_STATIC_LIBS) - add_library(${lib_name} STATIC ${SRCS} ${HEADERS} ${RESOURCES}) + add_library(${lib_name} STATIC ${SOURCES} ${HEADERS} ${RESOURCES}) set_property(TARGET ${lib_name} PROPERTY VERSION "${PROJECT_VERSION}") target_link_libraries(${lib_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport JKQTCommonLib) endif() diff --git a/lib/jkqtmathtext/jkqtmathtext.cpp b/lib/jkqtmathtext/jkqtmathtext.cpp index 32d83dee35..e4e9d0b012 100644 --- a/lib/jkqtmathtext/jkqtmathtext.cpp +++ b/lib/jkqtmathtext/jkqtmathtext.cpp @@ -378,6 +378,10 @@ bool JKQTMathText::MTtextNode::toHtml(QString &html, JKQTMathText::MTenvironment return true; } +QString JKQTMathText::MTtextNode::getText() const { + return this->text; +} + QString JKQTMathText::MTtextNode::getTypeName() const { return QLatin1String("MTtextNode(")+text+")"; @@ -514,6 +518,18 @@ void JKQTMathText::MTinstruction1Node::setDrawBoxes(bool draw) child->setDrawBoxes(draw); } +JKQTMathText::MTnode *JKQTMathText::MTinstruction1Node::getChild() const { + return this->child; +} + +QString JKQTMathText::MTinstruction1Node::getName() const { + return this->name; +} + +QStringList JKQTMathText::MTinstruction1Node::getParameters() const { + return this->parameters; +} + bool JKQTMathText::MTinstruction1Node::setupMTenvironment(JKQTMathText::MTenvironment &ev) { if (name=="bf" || name=="textbf" || name=="mathbf") ev.bold=true; @@ -1976,6 +1992,10 @@ void JKQTMathText::MTlistNode::setDrawBoxes(bool draw) } } +QList JKQTMathText::MTlistNode::getNodes() const { + return this->nodes; +} + @@ -3192,6 +3212,10 @@ bool JKQTMathText::MTsymbolNode::toHtml(QString &html, JKQTMathText::MTenvironme return ok; } +QString JKQTMathText::MTsymbolNode::getSymbolName() const { + return this->symbolName; +} + QString JKQTMathText::MTsymbolNode::getSymbolFontName() const { QFont f; switch(font) { diff --git a/lib/jkqtmathtext/jkqtmathtext.h b/lib/jkqtmathtext/jkqtmathtext.h index 212675bfe8..a1597c562f 100644 --- a/lib/jkqtmathtext/jkqtmathtext.h +++ b/lib/jkqtmathtext/jkqtmathtext.h @@ -703,7 +703,7 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { }; /** \brief beschreibt die Größe eines Knotens */ - struct MTnodeSize { + struct JKQTP_LIB_EXPORT MTnodeSize { MTnodeSize(); double width; double baselineHeight; @@ -718,7 +718,7 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { * * \image html jkqtmathtext_node_geo.png */ - class MTnode { + class JKQTP_LIB_EXPORT MTnode { public: MTnode(JKQTMathText* parent); virtual ~MTnode(); @@ -789,7 +789,7 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { /** \brief subclass representing one text node in the syntax tree * \ingroup jkqtmathtext_items */ - class MTtextNode: public MTnode { + class JKQTP_LIB_EXPORT MTtextNode: public MTnode { public: MTtextNode(JKQTMathText* parent, const QString& text, bool addWhitespace, bool stripInnerWhitepace=false); virtual ~MTtextNode() override; @@ -798,9 +798,7 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { /** \copydoc MTnode::toHtml() */ virtual bool toHtml(QString& html, JKQTMathText::MTenvironment currentEv, JKQTMathText::MTenvironment defaultEv) override; /*! \copydoc text */ - inline QString getText() const { - return this->text; - } + QString getText() const; virtual QString getTypeName() const override ; protected: /** \copydoc MTnode::getSizeInternal() */ @@ -813,7 +811,7 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { /** \brief subclass representing one text node in the syntax tree * \ingroup jkqtmathtext_items */ - class MTplainTextNode: public MTtextNode { + class JKQTP_LIB_EXPORT MTplainTextNode: public MTtextNode { public: MTplainTextNode(JKQTMathText* parent, const QString& text, bool addWhitespace, bool stripInnerWhitepace=false); /** \copydoc MTnode::getTypeName() */ @@ -825,7 +823,7 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { /** \brief subclass representing one whitepsace node in the syntax tree * \ingroup jkqtmathtext_items */ - class MTwhitespaceNode: public MTtextNode { + class JKQTP_LIB_EXPORT MTwhitespaceNode: public MTtextNode { public: MTwhitespaceNode(JKQTMathText* parent); virtual ~MTwhitespaceNode() override; @@ -839,7 +837,7 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { /** \brief subclass representing one symbol (e.g. \c \\alpha , \c \\cdot ...) node in the syntax tree * \ingroup jkqtmathtext_items */ - class MTsymbolNode: public MTnode { + class JKQTP_LIB_EXPORT MTsymbolNode: public MTnode { public: MTsymbolNode(JKQTMathText* parent, const QString& name, bool addWhitespace); virtual ~MTsymbolNode() override; @@ -850,9 +848,7 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { /** \copydoc MTnode::toHtml() */ virtual bool toHtml(QString& html, JKQTMathText::MTenvironment currentEv, JKQTMathText::MTenvironment defaultEv) override; /*! \copydoc symbolName */ - inline QString getSymbolName() const { - return this->symbolName; - } + QString getSymbolName() const; QString getSymbolFontName() const; protected: /** \copydoc MTnode::getSizeInternal() */ @@ -885,7 +881,7 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { /** \brief subclass representing a list of nodes in the syntax tree * \ingroup jkqtmathtext_items */ - class MTlistNode: public MTnode { + class JKQTP_LIB_EXPORT MTlistNode: public MTnode { public: MTlistNode(JKQTMathText* parent); virtual ~MTlistNode() override; @@ -899,9 +895,7 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { /** \copydoc MTnode::setDrawBoxes() */ virtual void setDrawBoxes(bool draw) override; /*! \copydoc nodes */ - inline QList getNodes() const { - return this->nodes; - } + QList getNodes() const; protected: /** \copydoc MTnode::getSizeInternal() */ virtual void getSizeInternal(QPainter& painter, MTenvironment currentEv, double& width, double& baselineHeight, double& overallHeight, double& strikeoutPos, const MTnodeSize* prevNodeSize=nullptr) override; @@ -912,7 +906,7 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { /** \brief subclass representing an instruction node with exactly one argument in the syntax tree * \ingroup jkqtmathtext_items */ - class MTinstruction1Node: public MTnode { + class JKQTP_LIB_EXPORT MTinstruction1Node: public MTnode { public: MTinstruction1Node(JKQTMathText* parent, const QString& name, MTnode* child, const QStringList& parameters=QStringList()); virtual ~MTinstruction1Node() override; @@ -926,17 +920,11 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { /** \copydoc MTnode::setDrawBoxes() */ virtual void setDrawBoxes(bool draw) override; /*! \brief returns the child node */ - inline MTnode* getChild() const { - return this->child; - } + MTnode* getChild() const; /*! \copydoc name */ - inline QString getName() const { - return this->name; - } + QString getName() const; /*! \copydoc parameters */ - inline QStringList getParameters() const { - return this->parameters; - } + QStringList getParameters() const; protected: /** \copydoc MTnode::getSizeInternal() */ virtual void getSizeInternal(QPainter& painter, MTenvironment currentEv, double& width, double& baselineHeight, double& overallHeight, double& strikeoutPos, const MTnodeSize* prevNodeSize=nullptr) override; @@ -954,7 +942,7 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { * * \image html jkqtmathtext_subscriptnode_getSizeInternal.png */ - class MTsubscriptNode: public MTnode { + class JKQTP_LIB_EXPORT MTsubscriptNode: public MTnode { public: MTsubscriptNode(JKQTMathText* parent, MTnode* child); virtual ~MTsubscriptNode() override; @@ -982,7 +970,7 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { * * \note a MTlistNode might modify the positioning slightly for special cases (e.g. \c \\int , \c \\sum ... or after braces) */ - class MTsuperscriptNode: public MTnode { + class JKQTP_LIB_EXPORT MTsuperscriptNode: public MTnode { public: MTsuperscriptNode(JKQTMathText* parent, MTnode* child); virtual ~MTsuperscriptNode() override; @@ -1007,7 +995,7 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { /** \brief subclass representing a brace node * \ingroup jkqtmathtext_items */ - class MTbraceNode: public MTnode { + class JKQTP_LIB_EXPORT MTbraceNode: public MTnode { public: MTbraceNode(JKQTMathText* parent, const QString& openbrace, const QString& closebrace, MTnode* child, bool showRightBrace=true); virtual ~MTbraceNode() override; @@ -1050,7 +1038,7 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { /** \brief subclass representing a sqrt node * \ingroup jkqtmathtext_items */ - class MTsqrtNode: public MTnode { + class JKQTP_LIB_EXPORT MTsqrtNode: public MTnode { public: MTsqrtNode(JKQTMathText* parent, MTnode* child, int degree=2); virtual ~MTsqrtNode() override; @@ -1094,7 +1082,7 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { /** \brief subclass representing a \\frac node * \ingroup jkqtmathtext_items */ - class MTfracNode: public MTnode { + class JKQTP_LIB_EXPORT MTfracNode: public MTnode { public: MTfracNode(JKQTMathText* parent, MTnode* child_top, MTnode* child_bottom, MTfracMode mode); virtual ~MTfracNode() override; @@ -1128,7 +1116,7 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { /** \brief subclass representing a \\begin{matrix} node * \ingroup jkqtmathtext_items */ - class MTmatrixNode: public MTnode { + class JKQTP_LIB_EXPORT MTmatrixNode: public MTnode { public: MTmatrixNode(JKQTMathText* parent, QVector > children); virtual ~MTmatrixNode() override; @@ -1172,12 +1160,12 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { MTDdoubleunderline, /*!< \brief double underline under block \image html mathparser/MTDdoubleunderline.png */ MTDtilde /*!< \brief tilde over block \image html mathparser/MTDtilde.png */ }; - static QString decorationToString(MTdecoration mode); + JKQTP_LIB_EXPORT static QString decorationToString(MTdecoration mode); /** \brief subclass representing a decorated text m (e.g. \c \\vec \c \\hat ...) node * \ingroup jkqtmathtext_items */ - class MTdecoratedNode: public MTnode { + class JKQTP_LIB_EXPORT MTdecoratedNode: public MTnode { public: MTdecoratedNode(JKQTMathText* parent, MTdecoration decoration, MTnode* child); virtual ~MTdecoratedNode() override; @@ -1435,7 +1423,7 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { return this->parsedNode; } - struct tbrData { + struct JKQTP_LIB_EXPORT tbrData { explicit tbrData(const QFont& f, const QString& text, QPaintDevice *pd); QFontMetricsF fm; QString text; @@ -1446,7 +1434,7 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { bool operator==(const tbrData& other) const; }; - struct tbrDataH { + struct JKQTP_LIB_EXPORT tbrDataH { explicit tbrDataH(const QFont& f, const QString& text, QPaintDevice *pd); QString text; QFont f; @@ -1454,9 +1442,9 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { bool operator==(const tbrDataH& other) const; }; - static QList tbrs; - static QHash tbrh; - static QRectF getTightBoundingRect(const QFont &fm, const QString& text, QPaintDevice *pd); + JKQTP_LIB_EXPORT static QList tbrs; + JKQTP_LIB_EXPORT static QHash tbrh; + JKQTP_LIB_EXPORT static QRectF getTightBoundingRect(const QFont &fm, const QString& text, QPaintDevice *pd); }; diff --git a/lib/jkqtplotter/CMakeLists.txt b/lib/jkqtplotter/CMakeLists.txt index 4ef78a307e..ef3b465e9b 100644 --- a/lib/jkqtplotter/CMakeLists.txt +++ b/lib/jkqtplotter/CMakeLists.txt @@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.0) set(libBasename JKQTPlotter) -message( STATUS ) -message( STATUS "-----------------------------------------------------------------------------" ) if(BUILD_SHARED_LIBS) set(libsh_name ${libBasename}SharedLib) set(${libsh_name}_LIBRARY ${libsh_name} PARENT_SCOPE) @@ -16,10 +14,8 @@ if(BUILD_STATIC_LIBS) message( STATUS "-- Building ${lib_name}" ) endif(BUILD_STATIC_LIBS) -find_package(Qt5 5.0 REQUIRED Core Gui Widgets PrintSupport Svg Xml) - # Set up source files -set(SRCS +set(SOURCES jkqtptools.cpp jkqtpbaseelements.cpp jkqtpbaseplotter.cpp @@ -36,7 +32,7 @@ set(SRCS jkqtpcoordinateaxesstyle.cpp jkqtpimagetools.cpp ) -set(SRCS_GRAPHS +set(SOURCES_GRAPHS graphs/jkqtpscatter.cpp graphs/jkqtprange.cpp graphs/jkqtpspecialline.cpp @@ -58,10 +54,10 @@ set(SRCS_GRAPHS graphs/jkqtpviolinplotstylingmixins.cpp graphs/jkqtpstatisticsadaptors.cpp ) -set(SRCS_OVERLAYS +set(SOURCES_OVERLAYS overlays/jkqtpbasicoverlays.cpp ) -set(SRCS_GUI +set(SOURCES_GUI gui/jkqtpcomboboxes.cpp gui/jkqtpenhancedspinboxes.cpp gui/jkqtpenhancedtableview.cpp @@ -127,15 +123,15 @@ set(RESOURCES if(BUILD_SHARED_LIBS) - add_library(${libsh_name} SHARED ${SRCS} ${SRCS_GRAPHS} ${SRCS_GUI} ${SRCS_OVERLAYS} ${HEADERS} ${HEADERS_GRAPHS} ${HEADERS_GUI} ${HEADERS_OVERLAYS} ${RESOURCES}) + add_library(${libsh_name} SHARED ${SOURCES} ${SOURCES_GRAPHS} ${SOURCES_GUI} ${SOURCES_OVERLAYS} ${HEADERS} ${HEADERS_GRAPHS} ${HEADERS_GUI} ${HEADERS_OVERLAYS} ${RESOURCES}) set_property(TARGET ${libsh_name} PROPERTY VERSION "${PROJECT_VERSION}") target_link_libraries(${libsh_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Svg Qt5::Xml JKQTCommonSharedLib JKQTMathTextSharedLib) - target_compile_definitions(${libsh_name} PRIVATE JKQTP_LIB_IN_DLL) + target_compile_definitions(${libsh_name} PUBLIC JKQTP_LIB_IN_DLL) target_compile_definitions(${libsh_name} PRIVATE JKQTP_LIB_EXPORT_LIBRARY) endif() if(BUILD_STATIC_LIBS) - add_library(${lib_name} STATIC ${SRCS} ${SRCS_GRAPHS} ${SRCS_GUI} ${SRCS_OVERLAYS} ${HEADERS} ${HEADERS_GRAPHS} ${HEADERS_GUI} ${HEADERS_OVERLAYS} ${RESOURCES}) + add_library(${lib_name} STATIC ${SOURCES} ${SOURCES_GRAPHS} ${SOURCES_GUI} ${SOURCES_OVERLAYS} ${HEADERS} ${HEADERS_GRAPHS} ${HEADERS_GUI} ${HEADERS_OVERLAYS} ${RESOURCES}) set_property(TARGET ${lib_name} PROPERTY VERSION "${PROJECT_VERSION}") target_link_libraries(${lib_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Svg Qt5::Xml JKQTCommonLib JKQTMathTextLib) endif() @@ -175,7 +171,7 @@ if(LIB_INSTALL) DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtplotter/gui COMPONENT Headers) - install(FILES ${SRCS_OVERLAYS} + install(FILES ${SOURCES_OVERLAYS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtplotter/overlays COMPONENT Headers) diff --git a/lib/jkqtplotter/graphs/jkqtpcontour.h b/lib/jkqtplotter/graphs/jkqtpcontour.h index 09733688ba..adac75ef06 100644 --- a/lib/jkqtplotter/graphs/jkqtpcontour.h +++ b/lib/jkqtplotter/graphs/jkqtpcontour.h @@ -64,7 +64,7 @@ * * \image html JKQTPContour.png * - * \image html jkqtplotter_simpletest_contourplot.png + * \image html contourplot.png * * \note This class uses a caching strategy to determine whether contour lines need to be recalculated (which is time-consuming): * Whenever contours have been calculated, these contours are stored in the member contourLinesCache and can then be used for @@ -78,9 +78,9 @@ class JKQTP_LIB_EXPORT JKQTPContourPlot: public JKQTPMathImage, public JKQTPGrap public: /** \brief options of how the colors for the contours are chosen (note that all images in the documentation show the same graph, just with different coloring modes!)*/ enum ContourColoringMode { - SingleColorContours, /*!< \brief each contour line has the same color \image html jkqtplotter_simpletest_contourplot_SingleColorContours.png */ - ColorContoursFromPaletteByValue, /*!< \brief the color for each contour line is determined by the current color palette, image range and the value associated with each contour line \image html jkqtplotter_simpletest_contourplot_ColorContoursFromPaletteByValue.png */ - ColorContoursFromPalette, /*!< \brief the color for each contour line is chosen from the current color palette, distributing the contour lines evenly over the palette, wirhout any connection to the value associated with each contour line \image html jkqtplotter_simpletest_contourplot_ColorContoursFromPalette.png */ + SingleColorContours, /*!< \brief each contour line has the same color \image html contourplot_SingleColorContours.png */ + ColorContoursFromPaletteByValue, /*!< \brief the color for each contour line is determined by the current color palette, image range and the value associated with each contour line \image html contourplot_ColorContoursFromPaletteByValue.png */ + ColorContoursFromPalette, /*!< \brief the color for each contour line is chosen from the current color palette, distributing the contour lines evenly over the palette, wirhout any connection to the value associated with each contour line \image html contourplot_ColorContoursFromPalette.png */ }; /** \brief class constructor */ @@ -133,14 +133,14 @@ class JKQTP_LIB_EXPORT JKQTPContourPlot: public JKQTPMathImage, public JKQTPGrap void addContourLevel(double level); /** \brief add another level for which to draw a contour and define an override color for this line * - * \image html jkqtplotter_simpletest_contourplot_overridecolors.png + * \image html contourplot_overridecolors.png * * \see setOverrideColor(), addContourLevel(), hasOverrideColor(), removeOverrideColor(), getOverrideColor() */ void addContourLevel(double level, QColor overrideColor); /** \brief define an override color for the contour line at the given level * - * \image html jkqtplotter_simpletest_contourplot_overridecolors.png + * \image html contourplot_overridecolors.png * * \see setOverrideColor(), addContourLevel(), hasOverrideColor(), removeOverrideColor(), getOverrideColor() */ diff --git a/lib/jkqtplotter/graphs/jkqtpfilledcurve.h b/lib/jkqtplotter/graphs/jkqtpfilledcurve.h index 022168a57d..ae247ee4d0 100644 --- a/lib/jkqtplotter/graphs/jkqtpfilledcurve.h +++ b/lib/jkqtplotter/graphs/jkqtpfilledcurve.h @@ -33,7 +33,7 @@ /*! \brief This implements filled curve plots where the area is filled between the plot line and the x-Axis. \ingroup jkqtplotter_filledgraphs - \image html jkqtplotter_simpletest_filledgraphs.png + \image html filledgraphs.png \see \ref JKQTPlotterFilledGraphs */ @@ -80,7 +80,7 @@ class JKQTP_LIB_EXPORT JKQTPFilledCurveXErrorGraph: public JKQTPFilledCurveXGrap /*! \brief This implements filled curve plots where the area is filled between the plot line and y-Axis \ingroup jkqtplotter_filledgraphs - \image html jkqtplotter_simpletest_filledgraphs_yaxis.png + \image html filledgraphs_yaxis.png \see \ref JKQTPlotterFilledGraphs diff --git a/lib/jkqtplotter/graphs/jkqtpimage.h b/lib/jkqtplotter/graphs/jkqtpimage.h index c714c45fcb..39dc99db20 100644 --- a/lib/jkqtplotter/graphs/jkqtpimage.h +++ b/lib/jkqtplotter/graphs/jkqtpimage.h @@ -127,7 +127,7 @@ class JKQTP_LIB_EXPORT JKQTPImageBase: public JKQTPGraph { /*! \brief base class to hold an image from an 2-dimensional array of values \ingroup jkqtplotter_imagelots_elements - \image html jkqtplotter_simpletest_imageplot.png + \image html imageplot.png */ class JKQTP_LIB_EXPORT JKQTPMathImageBase: public JKQTPImageBase { @@ -333,7 +333,7 @@ class JKQTP_LIB_EXPORT JKQTPMathImageBase: public JKQTPImageBase { /*! \brief class to plot an image from a QImage object \ingroup jkqtplotter_imagelots_elements - \image html jkqtplotter_simpletest_rgbimageplot_qt.png + \image html rgbimageplot_qt.png \see \ref JKQTPlotterImagePlotQImageRGB */ @@ -466,9 +466,9 @@ class JKQTP_LIB_EXPORT JKQTPImage: public JKQTPImageBase { /*! \brief class to plot an image from an 2-dimensional array of values \ingroup jkqtplotter_imagelots_elements - \image html jkqtplotter_simpletest_imageplot.png - \image html jkqtplotter_simpletest_imageplot_modifier.png - \image html jkqtplotter_simpletest_imageplot__smallscaletransparent.png + \image html imageplot.png + \image html imageplot_modifier.png + \image html imageplot__smallscaletransparent.png \see \ref JKQTPlotterImagePlotNoDatastore */ @@ -994,9 +994,9 @@ int JKQTPMathImage::getModifierSampleSize() const { /*! \brief class to plot an image from an 2-dimensional array of values stored in a column of the datastore \ingroup jkqtplotter_imagelots_elements - \image html jkqtplotter_simpletest_imageplot.png - \image html jkqtplotter_simpletest_imageplot_modifier.png - \image html jkqtplotter_simpletest_imageplot__smallscaletransparent.png + \image html imageplot.png + \image html imageplot_modifier.png + \image html imageplot__smallscaletransparent.png \see jkqtpstatAddKDE2DImage(), jkqtpstatAddHistogram2DImage(), \ref JKQTPlotterImagePlot, \ref JKQTPlotterImagePlotModifier, \ref JKQTPlotterImagePlotOpenCV */ diff --git a/lib/jkqtplotter/graphs/jkqtpimagergb.h b/lib/jkqtplotter/graphs/jkqtpimagergb.h index d0bf1edef1..2dcbfb2f00 100644 --- a/lib/jkqtplotter/graphs/jkqtpimagergb.h +++ b/lib/jkqtplotter/graphs/jkqtpimagergb.h @@ -38,7 +38,7 @@ \ingroup jkqtplotter_imagelots_elements \image html rgbimageplots.png - \image html jkqtplotter_simpletest_rgbimageplot_opencv.png + \image html rgbimageplot_opencv.png */ class JKQTP_LIB_EXPORT JKQTPRGBMathImage: public JKQTPMathImageBase { Q_OBJECT @@ -422,9 +422,9 @@ class JKQTP_LIB_EXPORT JKQTPRGBMathImage: public JKQTPMathImageBase { \image html rgbimageplots.png - \image html jkqtplotter_simpletest_rgbimageplot_opencv.png + \image html rgbimageplot_opencv.png - \image html jkqtplotter_simpletest_rgbimageplot.png + \image html rgbimageplot.png \see Examples: \ref JKQTPlotterRGBImagePlot and \ref JKQTPlotterImagePlotRGBOpenCV */ diff --git a/lib/jkqtplotter/graphs/jkqtpimpulses.h b/lib/jkqtplotter/graphs/jkqtpimpulses.h index d9861f069c..47b7dfda77 100644 --- a/lib/jkqtplotter/graphs/jkqtpimpulses.h +++ b/lib/jkqtplotter/graphs/jkqtpimpulses.h @@ -66,12 +66,12 @@ class JKQTP_LIB_EXPORT JKQTPImpulsesHorizontalGraph: public JKQTPXYGraph, public /** \brief baseline of the plot (NOTE: 0 is interpreted as until plot border in log-mode!!!) * - * \image html jkqtplotter_simpletest_impulsesplot_baseline.png + * \image html impulsesplot_baseline.png */ double baseline; /** \brief indicates whether to draw symbols at the top of the impulse * - * \image html jkqtplotter_simpletest_impulsesplot_symbols.png + * \image html impulsesplot_symbols.png */ bool drawSymbols; }; diff --git a/lib/jkqtplotter/graphs/jkqtpscatter.h b/lib/jkqtplotter/graphs/jkqtpscatter.h index 57c3a76836..40f492a265 100644 --- a/lib/jkqtplotter/graphs/jkqtpscatter.h +++ b/lib/jkqtplotter/graphs/jkqtpscatter.h @@ -98,9 +98,9 @@ class JKQTP_LIB_EXPORT JKQTPXYLineGraph: public JKQTPXYGraph, public JKQTPGraphL set the properties sizeColumn and/or colorColumn to change the size and/or color of the symbols according to the values in the column. - \image html jkqtplotter_simpletest_paramscatterplot.png "Different Styles of Parametrized Scatter/Line Graphs" + \image html paramscatterplot.png "Different Styles of Parametrized Scatter/Line Graphs" - \image html jkqtplotter_simpletest_paramscatterplot_image_star.png "JKQTPXYParametrizedScatterGraph with symbols organized in a grid" + \image html paramscatterplot_image_star.png "JKQTPXYParametrizedScatterGraph with symbols organized in a grid" \note For the size, line width and symbol type columns, you can also set a functor, which converts the column value (optionally based also on the x- and y-location of the data point) into the local symbol size, symbol type or line width. Use the functions diff --git a/lib/jkqtplotter/graphs/jkqtpspecialline.h b/lib/jkqtplotter/graphs/jkqtpspecialline.h index 0698bba1ad..7e04b88a4d 100644 --- a/lib/jkqtplotter/graphs/jkqtpspecialline.h +++ b/lib/jkqtplotter/graphs/jkqtpspecialline.h @@ -46,7 +46,7 @@ class JKQTPDatastore; /*! \brief This implements a step plot with values \f$ \left(x, f(x) \right) \f$ \ingroup jkqtplotter_linesymbolgraphs_simple - \image html jkqtplotter_simpletest_stepplots.png + \image html stepplots.png \see JKQTPSpecialLineVerticalGraph, JKQTPFilledCurveXGraph, \ref JKQTPlotterSpecialStepLinePlot */ @@ -106,7 +106,7 @@ class JKQTP_LIB_EXPORT JKQTPSpecialLineHorizontalGraph: public JKQTPXYGraph, pub /*! \brief This implements a step plot with values \f$ \left(f(y), y \right) \f$ \ingroup jkqtplotter_linesymbolgraphs_simple - \image html jkqtplotter_simpletest_stepplots_vertical.png + \image html stepplots_vertical.png \see JKQTPSpecialLineHorizontalGraph, JKQTPFilledCurveYGraph, \ref JKQTPlotterSpecialStepLinePlot */ diff --git a/lib/jkqtplotter/graphs/jkqtpstatisticsadaptors.h b/lib/jkqtplotter/graphs/jkqtpstatisticsadaptors.h index e2dc6f0daa..2bed280824 100644 --- a/lib/jkqtplotter/graphs/jkqtpstatisticsadaptors.h +++ b/lib/jkqtplotter/graphs/jkqtpstatisticsadaptors.h @@ -58,7 +58,7 @@ jkqtpstatAddHBoxplot(plot1->getPlotter(), datastore1->begin(randomdatacol1), datastore1->end(randomdatacol1), -0.3); \endcode - \image html jkqtplotter_simpletest_datastore_statistics_boxplots_simple.png + \image html datastore_statistics_boxplots_simple.png \see \ref JKQTPlotterBasicJKQTPDatastoreStatistics, jkqtpstat5NumberStatistics() @@ -156,7 +156,7 @@ inline JKQTPBoxplotVerticalElement* jkqtpstatAddVBoxplot(JKQTBasePlotter* plotte 0.05, 0.95 // Quantiles for the boxplot box whiskers' ends \endcode - \image html jkqtplotter_simpletest_datastore_statistics_boxplots_outliers.png + \image html datastore_statistics_boxplots_outliers.png \see \ref JKQTPlotterBasicJKQTPDatastoreStatistics, jkqtpstat5NumberStatistics() */ @@ -820,7 +820,7 @@ inline std::pair jkqtpstatAddHHistogram1DAutoranged(plot1->getPlotter(), datastore1->begin(randomdatacol1), datastore1->end(randomdatacol1), 11); \endcode - \image html jkqtplotter_simpletest_datastore_statistics_hist.png + \image html datastore_statistics_hist.png \see \ref JKQTPlotterBasicJKQTPDatastoreStatistics, jkqtpstatHistogram1DAutoranged(), JKQTPBarVerticalGraph */ @@ -858,7 +858,7 @@ inline JKQTPBarVerticalGraph* jkqtpstatAddHHistogram1DAutoranged(JKQTBasePlotter jkqtpstatAddHHistogram1DAutoranged(plot1->getPlotter(), datastore1->begin(randomdatacol1), datastore1->end(randomdatacol1), 0.5); \endcode - \image html jkqtplotter_simpletest_datastore_statistics_hist.png + \image html datastore_statistics_hist.png \see \ref JKQTPlotterBasicJKQTPDatastoreStatistics, jkqtpstatHistogram1DAutoranged(), JKQTPBarVerticalGraph */ @@ -898,7 +898,7 @@ inline JKQTPBarVerticalGraph* jkqtpstatAddHHistogram1DAutoranged(JKQTBasePlotter jkqtpstatAddHHistogram1D(plot1->getPlotter(), datastore1->begin(randomdatacol1), datastore1->end(randomdatacol1), bins.begin(), bins.end()); \endcode - \image html jkqtplotter_simpletest_datastore_statistics_hist.png + \image html datastore_statistics_hist.png \see \ref JKQTPlotterBasicJKQTPDatastoreStatistics, jkqtpstatHistogram1D(), JKQTPBarVerticalGraph */ @@ -1051,7 +1051,7 @@ inline JKQTPBarHorizontalGraph* jkqtpstatAddVHistogram1D(JKQTBasePlotter* plotte \param[out] oymax position of the last histogram bin in y-direction \return a graph class pointer (of type \c JKQTPColumnMathImage ) displaying the histogram data - \image html jkqtplotter_simpletest_datastore_statistics_2d_hist.png + \image html datastore_statistics_2d_hist.png \see jkqtpstatHistogram2D(), \ref JKQTPlotterBasicJKQTPDatastoreStatistics2D */ @@ -1106,7 +1106,7 @@ inline JKQTPColumnMathImage* jkqtpstatAddHistogram2DImage(JKQTBasePlotter* plott \param[out] oymax position of the last histogram bin in y-direction \return a graph class pointer (of type \c JKQTPColumnContourPlot ) displaying the histogram data as a contour plot - \image html jkqtplotter_simpletest_datastore_statistics_2d_histcontour.png + \image html datastore_statistics_2d_histcontour.png \see jkqtpstatHistogram2D(), \ref JKQTPlotterBasicJKQTPDatastoreStatistics2D */ @@ -1156,7 +1156,7 @@ inline JKQTPColumnContourPlot* jkqtpstatAddHistogram2DContour(JKQTBasePlotter* p \param[out] oymax position of the last histogram bin in y-direction \return a graph class pointer (of type \c JKQTPColumnMathImage ) displaying the histogram data - \image html jkqtplotter_simpletest_datastore_statistics_2d_hist.png + \image html datastore_statistics_2d_hist.png \see jkqtpstatHistogram2D(), \ref JKQTPlotterBasicJKQTPDatastoreStatistics2D */ @@ -1213,7 +1213,7 @@ inline JKQTPColumnMathImage* jkqtpstatAddHistogram2DImage(JKQTBasePlotter* plott \param[out] oymax position of the last histogram bin in y-direction \return a graph class pointer (of type \c JKQTPColumnContourPlot ) displaying the histogram data as a contour plot - \image html jkqtplotter_simpletest_datastore_statistics_2d_histcontour.png + \image html datastore_statistics_2d_histcontour.png \see jkqtpstatHistogram2D(), \ref JKQTPlotterBasicJKQTPDatastoreStatistics2D @@ -1270,7 +1270,7 @@ inline JKQTPColumnContourPlot* jkqtpstatAddHistogram2DContour(JKQTBasePlotter* p jkqtpstatAddHKDE1DAutoranged(plot1->getPlotter(), datastore1->begin(randomdatacol1), datastore1->end(randomdatacol1), 200); \endcode - \image html jkqtplotter_simpletest_datastore_statistics_kde.png + \image html datastore_statistics_kde.png \see \ref JKQTPlotterBasicJKQTPDatastoreStatistics, jkqtpstatKDE1DAutoranged(), JKQTPXYLineGraph @@ -1312,7 +1312,7 @@ inline JKQTPXYLineGraph* jkqtpstatAddHKDE1DAutoranged(JKQTBasePlotter* plotter, jkqtpstatAddHKDE1DAutoranged(plot1->getPlotter(), datastore1->begin(randomdatacol1), datastore1->end(randomdatacol1), 0.01); \endcode - \image html jkqtplotter_simpletest_datastore_statistics_kde.png + \image html datastore_statistics_kde.png \see \ref JKQTPlotterBasicJKQTPDatastoreStatistics, jkqtpstatKDE1DAutoranged(), JKQTPXYLineGraph @@ -1356,7 +1356,7 @@ inline JKQTPXYLineGraph* jkqtpstatAddHKDE1DAutoranged(JKQTBasePlotter* plotter, jkqtpstatAddHKDE1D(plot1->getPlotter(), datastore1->begin(randomdatacol1), datastore1->end(randomdatacol1), bins.begin(), bins.end()); \endcode - \image html jkqtplotter_simpletest_datastore_statistics_kde.png + \image html datastore_statistics_kde.png \see \ref JKQTPlotterBasicJKQTPDatastoreStatistics, jkqtpstatKDE1D(), JKQTPXYLineGraph @@ -1399,7 +1399,7 @@ inline JKQTPXYLineGraph* jkqtpstatAddHKDE1D(JKQTBasePlotter* plotter, InputIt fi jkqtpstatAddHKDE1D(plot1->getPlotter(), datastore1->begin(randomdatacol1), datastore1->end(randomdatacol1), bins.begin(), bins.end()); \endcode - \image html jkqtplotter_simpletest_datastore_statistics_kde.png + \image html datastore_statistics_kde.png \see \ref JKQTPlotterBasicJKQTPDatastoreStatistics, jkqtpstatKDE1D(), JKQTPXYLineGraph */ @@ -1448,7 +1448,7 @@ inline JKQTPXYLineGraph* jkqtpstatAddHKDE1D(JKQTBasePlotter* plotter, InputIt fi jkqtpstatAddVKDE1DAutoranged(plot1->getPlotter(), datastore1->begin(randomdatacol1), datastore1->end(randomdatacol1), 200); \endcode - \image html jkqtplotter_simpletest_datastore_statistics_kde.png + \image html datastore_statistics_kde.png \see \ref JKQTPlotterBasicJKQTPDatastoreStatistics, jkqtpstatKDE1DAutoranged(), JKQTPXYLineGraph @@ -1490,7 +1490,7 @@ inline JKQTPXYLineGraph* jkqtpstatAddVKDE1DAutoranged(JKQTBasePlotter* plotter, jkqtpstatAddVKDE1DAutoranged(plot1->getPlotter(), datastore1->begin(randomdatacol1), datastore1->end(randomdatacol1), 0.01); \endcode - \image html jkqtplotter_simpletest_datastore_statistics_kde.png + \image html datastore_statistics_kde.png \see \ref JKQTPlotterBasicJKQTPDatastoreStatistics, jkqtpstatKDE1DAutoranged(), JKQTPXYLineGraph @@ -1534,7 +1534,7 @@ inline JKQTPXYLineGraph* jkqtpstatAddVKDE1DAutoranged(JKQTBasePlotter* plotter, jkqtpstatAddVKDE1D(plot1->getPlotter(), datastore1->begin(randomdatacol1), datastore1->end(randomdatacol1), bins.begin(), bins.end()); \endcode - \image html jkqtplotter_simpletest_datastore_statistics_kde.png + \image html datastore_statistics_kde.png \see \ref JKQTPlotterBasicJKQTPDatastoreStatistics, jkqtpstatKDE1D(), JKQTPXYLineGraph @@ -1577,7 +1577,7 @@ inline JKQTPXYLineGraph* jkqtpstatAddVKDE1D(JKQTBasePlotter* plotter, InputIt fi jkqtpstatAddVKDE1D(plot1->getPlotter(), datastore1->begin(randomdatacol1), datastore1->end(randomdatacol1), bins.begin(), bins.end()); \endcode - \image html jkqtplotter_simpletest_datastore_statistics_kde.png + \image html datastore_statistics_kde.png \see \ref JKQTPlotterBasicJKQTPDatastoreStatistics, jkqtpstatKDE1D(), JKQTPXYLineGraph */ @@ -1632,7 +1632,7 @@ inline JKQTPXYLineGraph* jkqtpstatAddVKDE1D(JKQTBasePlotter* plotter, InputIt fi \param[out] oymax position of the last KDE bin in y-direction \return a graph class pointer (of type \c JKQTPColumnMathImage ) displaying the KDE data - \image html jkqtplotter_simpletest_datastore_statistics_2d_kde.png + \image html datastore_statistics_2d_kde.png \see jkqtpstatKDE2D(), \ref JKQTPlotterBasicJKQTPDatastoreStatistics2D */ @@ -1689,7 +1689,7 @@ inline JKQTPColumnMathImage* jkqtpstatAddKDE2DImage(JKQTBasePlotter* plotter, In \param[out] oymax position of the last KDE bin in y-direction \return a graph class pointer (of type \c JKQTPColumnContourPlot ) displaying the KDE data as a contour plot - \image html jkqtplotter_simpletest_datastore_statistics_2d_kdecontour.png + \image html datastore_statistics_2d_kdecontour.png \see jkqtpstatKDE2D(), \ref JKQTPlotterBasicJKQTPDatastoreStatistics2D */ @@ -1746,7 +1746,7 @@ inline JKQTPColumnContourPlot* jkqtpstatAddKDE2DContour(JKQTBasePlotter* plotter jkqtpstatAddLinearRegression(plot1->getPlotter(), datastore1->begin(colLinX), datastore1->end(colLinX), datastore1->begin(colLinY), datastore1->end(colLinY)); \endcode - \image html jkqtplotter_simpletest_datastore_regression_lin.png + \image html datastore_regression_lin.png \see \ref JKQTPlotterBasicJKQTPDatastoreRegression, jkqtpstatLinearRegression() */ @@ -1789,7 +1789,7 @@ inline JKQTPXFunctionLineGraph* jkqtpstatAddLinearRegression(JKQTBasePlotter* pl jkqtpstatAddLinearRegression(graphD); \endcode - \image html jkqtplotter_simpletest_datastore_regression_lin.png + \image html datastore_regression_lin.png \note The line graph is added to the same plotter that is the parent of \a datagraph ! @@ -1822,7 +1822,7 @@ JKQTP_LIB_EXPORT JKQTPXFunctionLineGraph* jkqtpstatAddLinearRegression(JKQTPXYGr jkqtpstatAddRobustIRLSLinearRegression(plot1->getPlotter(), datastore1->begin(colLinX), datastore1->end(colLinX), datastore1->begin(colLinY), datastore1->end(colLinY)); \endcode - \image html jkqtplotter_simpletest_datastore_regression_linrobust.png + \image html datastore_regression_linrobust.png \see \ref JKQTPlotterBasicJKQTPDatastoreRegression, jkqtpstatRobustIRLSLinearRegression() */ @@ -1868,7 +1868,7 @@ inline JKQTPXFunctionLineGraph* jkqtpstatAddRobustIRLSLinearRegression(JKQTBaseP jkqtpstatAddRobustIRLSLinearRegression(graphD); \endcode - \image html jkqtplotter_simpletest_datastore_regression_linrobust.png + \image html datastore_regression_linrobust.png \note The line graph is added to the same plotter that is the parent of \a datagraph ! @@ -1910,7 +1910,7 @@ JKQTP_LIB_EXPORT JKQTPXFunctionLineGraph *jkqtpstatAddRobustIRLSLinearRegression &jkqtp_inversePropSaveDefault); \endcode - \image html jkqtplotter_simpletest_datastore_regression_linweight.png + \image html datastore_regression_linweight.png \see \ref JKQTPlotterBasicJKQTPDatastoreRegression, jkqtpstatLinearRegression() */ @@ -1954,7 +1954,7 @@ inline JKQTPXFunctionLineGraph* jkqtpstatAddLinearWeightedRegression(JKQTBasePlo jkqtpstatAddLinearWeightedRegression(graphD); \endcode - \image html jkqtplotter_simpletest_datastore_regression_linweight.png + \image html datastore_regression_linweight.png \note The line graph is added to the same plotter that is the parent of \a datagraph ! @@ -1996,7 +1996,7 @@ JKQTP_LIB_EXPORT JKQTPXFunctionLineGraph* jkqtpstatAddLinearWeightedRegression(J jkqtpstatRegression(plot1->getPlotter(), JKQTPStatRegressionModelType::Exponential, datastore1->begin(colLinX), datastore1->end(colLinX), datastore1->begin(colLinY), datastore1->end(colLinY)); \endcode - \image html jkqtplotter_simpletest_datastore_regression_nonlinreg.png + \image html datastore_regression_nonlinreg.png \see \ref JKQTPlotterBasicJKQTPDatastoreRegression, jkqtpstatRegression() */ @@ -2038,7 +2038,7 @@ inline JKQTPXFunctionLineGraph* jkqtpstatAddRegression(JKQTBasePlotter* plotter, jkqtpstatRegression(graphD, JKQTPStatRegressionModelType::Exponential); \endcode - \image html jkqtplotter_simpletest_datastore_regression_nonlinreg.png + \image html datastore_regression_nonlinreg.png \note The line graph is added to the same plotter that is the parent of \a datagraph ! @@ -2072,7 +2072,7 @@ JKQTP_LIB_EXPORT JKQTPXFunctionLineGraph* jkqtpstatAddRegression(JKQTPXYGraph *d jkqtpstatAddRobustIRLSRegression(plot1->getPlotter(), JKQTPStatRegressionModelType::Exponential, datastore1->begin(colLinX), datastore1->end(colLinX), datastore1->begin(colLinY), datastore1->end(colLinY)); \endcode - \image html jkqtplotter_simpletest_datastore_regression_linrobust.png + \image html datastore_regression_linrobust.png \see \ref JKQTPlotterBasicJKQTPDatastoreRegression, jkqtpstatRobustIRLSRegression() */ @@ -2118,7 +2118,7 @@ inline JKQTPXFunctionLineGraph* jkqtpstatAddRobustIRLSRegression(JKQTBasePlotter jkqtpstatAddRobustIRLSRegression(graphD, JKQTPStatRegressionModelType::Exponential); \endcode - \image html jkqtplotter_simpletest_datastore_regression_linrobust.png + \image html datastore_regression_linrobust.png \note The line graph is added to the same plotter that is the parent of \a datagraph ! @@ -2162,7 +2162,7 @@ JKQTP_LIB_EXPORT JKQTPXFunctionLineGraph *jkqtpstatAddRobustIRLSRegression(JKQTP &jkqtp_inversePropSaveDefault); \endcode - \image html jkqtplotter_simpletest_datastore_regression_linweight.png + \image html datastore_regression_linweight.png \see \ref JKQTPlotterBasicJKQTPDatastoreRegression, jkqtpstatWeightedRegression() */ @@ -2206,7 +2206,7 @@ inline JKQTPXFunctionLineGraph* jkqtpstatAddWeightedRegression(JKQTBasePlotter* jkqtpstatAddWeightedRegression(graphD, JKQTPStatRegressionModelType::Exponential); \endcode - \image html jkqtplotter_simpletest_datastore_regression_linweight.png + \image html datastore_regression_linweight.png \note The line graph is added to the same plotter that is the parent of \a datagraph ! @@ -2241,7 +2241,7 @@ JKQTP_LIB_EXPORT JKQTPXFunctionLineGraph* jkqtpstatAddWeightedRegression(JKQTPXY jkqtpstatAddPolyFit(plot1->getPlotter(), JKQTPStatRegressionModelType::Exponential, datastore1->begin(colLinX), datastore1->end(colLinX), datastore1->begin(colLinY), datastore1->end(colLinY), 3, std::back_inserter(pFit)); \endcode - \image html jkqtplotter_simpletest_datastore_regression_polynom.png + \image html datastore_regression_polynom.png \see \ref JKQTPlotterBasicJKQTPDatastoreRegression, jkqtpstatPolyFit() */ @@ -2276,7 +2276,7 @@ inline JKQTPXFunctionLineGraph* jkqtpstatAddPolyFit(JKQTBasePlotter* plotter, In jkqtpstatAddPolyFit(plot1->getPlotter(), JKQTPStatRegressionModelType::Exponential, datastore1->begin(colLinX), datastore1->end(colLinX), datastore1->begin(colLinY), datastore1->end(colLinY), 3); \endcode - \image html jkqtplotter_simpletest_datastore_regression_polynom.png + \image html datastore_regression_polynom.png \see \ref JKQTPlotterBasicJKQTPDatastoreRegression, jkqtpstatPolyFit() */ @@ -2304,7 +2304,7 @@ inline JKQTPXFunctionLineGraph* jkqtpstatAddPolyFit(JKQTBasePlotter* plotter, In jkqtpstatAddPolyFit(graphD, 3,std::back_inserter(pFit)); \endcode - \image html jkqtplotter_simpletest_datastore_regression_polynom.png + \image html datastore_regression_polynom.png \see \ref JKQTPlotterBasicJKQTPDatastoreRegression, jkqtpstatPolyFit() */ @@ -2331,7 +2331,7 @@ inline JKQTPXFunctionLineGraph* jkqtpstatAddPolyFit(JKQTPXYGraph *datagraph, siz jkqtpstatAddPolyFit(graphD, 3); \endcode - \image html jkqtplotter_simpletest_datastore_regression_polynom.png + \image html datastore_regression_polynom.png \see \ref JKQTPlotterBasicJKQTPDatastoreRegression, jkqtpstatPolyFit() */ diff --git a/lib/jkqtplotter/jkqtpgraphsbaseerrors.h b/lib/jkqtplotter/jkqtpgraphsbaseerrors.h index ce64c71089..4e6e190189 100644 --- a/lib/jkqtplotter/jkqtpgraphsbaseerrors.h +++ b/lib/jkqtplotter/jkqtpgraphsbaseerrors.h @@ -36,7 +36,7 @@ \ingroup jkqtplotter_basegraphserrors \ingroup jkqtplotter_basegraphs_stylemixins - \image html jkqtplotter_simpletest_errorbarstyles.png "line-graphs with different types of error indicators" + \image html errorbarstyles.png "line-graphs with different types of error indicators" \see \ref jkqtplotter_graphsgroup_classstructure_mixins diff --git a/sharedlib/README.md b/qmake/sharedlib/README.md similarity index 67% rename from sharedlib/README.md rename to qmake/sharedlib/README.md index 9d197bef03..8153d032f1 100644 --- a/sharedlib/README.md +++ b/qmake/sharedlib/README.md @@ -9,24 +9,24 @@ There are several `.PRO`-files, that can be used to build the full library, or a ```.qmake # include JKQTPlotter library -DEPENDPATH += /lib /sharedlib/jkqtplotterlib +DEPENDPATH += /lib /qmake/sharedlib/jkqtplotterlib INCLUDEPATH += /lib CONFIG (debug, debug|release) { # ensure that DLLs are copied to the output directory - install_jkqtplotter_dll.files = /sharedlib/jkqtplotterlib/debug/jkqtplotterlib_debug.* + install_jkqtplotter_dll.files = /qmake/sharedlib/jkqtplotterlib/debug/jkqtplotterlib_debug.* install_jkqtplotter_dll.path = $$OUT_PWD INSTALLS += install_jkqtplotter_dll # link agains DLLs - DEPENDPATH += /sharedlib/jkqtplotterlib/debug - LIBS += -L/sharedlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + DEPENDPATH += /qmake/sharedlib/jkqtplotterlib/debug + LIBS += -L/qmake/sharedlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { # ensure that DLLs are copied to the output directory - install_jkqtplotter_dll.files = /sharedlib/jkqtplotterlib/release/jkqtplotterlib.* + install_jkqtplotter_dll.files = /qmake/sharedlib/jkqtplotterlib/release/jkqtplotterlib.* install_jkqtplotter_dll.path = $$OUT_PWD INSTALLS += install_jkqtplotter_dll - DEPENDPATH += /sharedlib/jkqtplotterlib/release + DEPENDPATH += /qmake/sharedlib/jkqtplotterlib/release # link agains DLLs - LIBS += -L/sharedlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L/qmake/sharedlib/jkqtplotterlib/release -ljkqtplotterlib } ``` diff --git a/sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro b/qmake/sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro similarity index 100% rename from sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro rename to qmake/sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro diff --git a/sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro b/qmake/sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro similarity index 100% rename from sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro rename to qmake/sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro diff --git a/sharedlib/jkqtpcommonlib/jkqtpcommonlib.pro b/qmake/sharedlib/jkqtpcommonlib/jkqtpcommonlib.pro similarity index 100% rename from sharedlib/jkqtpcommonlib/jkqtpcommonlib.pro rename to qmake/sharedlib/jkqtpcommonlib/jkqtpcommonlib.pro diff --git a/sharedlib/jkqtplotterlib/jkqtplotterlib.pro b/qmake/sharedlib/jkqtplotterlib/jkqtplotterlib.pro similarity index 100% rename from sharedlib/jkqtplotterlib/jkqtplotterlib.pro rename to qmake/sharedlib/jkqtplotterlib/jkqtplotterlib.pro diff --git a/staticlib/README.md b/qmake/staticlib/README.md similarity index 59% rename from staticlib/README.md rename to qmake/staticlib/README.md index 96988dfbae..71645ddfc4 100644 --- a/staticlib/README.md +++ b/qmake/staticlib/README.md @@ -9,14 +9,14 @@ There are several `.PRO`-files, that can be used to build the full library, or a ```.qmake # include JKQTPlotter library -DEPENDPATH += /staticlib/jkqtplotterlib /lib +DEPENDPATH += /qmake/staticlib/jkqtplotterlib /lib INCLUDEPATH += /lib CONFIG (debug, debug|release) { - DEPENDPATH += /staticlib/jkqtplotterlib/debug - LIBS += -L/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + DEPENDPATH += /qmake/staticlib/jkqtplotterlib/debug + LIBS += -L/qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - DEPENDPATH += /staticlib/jkqtplotterlib/release - LIBS += -L/staticlib/jkqtplotterlib/release -ljkqtplotterlib + DEPENDPATH += /qmake/staticlib/jkqtplotterlib/release + LIBS += -L/qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } ``` diff --git a/staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro b/qmake/staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro similarity index 100% rename from staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro rename to qmake/staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro diff --git a/staticlib/jkqtmathtextlib/jkqtmathtextlib.pro b/qmake/staticlib/jkqtmathtextlib/jkqtmathtextlib.pro similarity index 100% rename from staticlib/jkqtmathtextlib/jkqtmathtextlib.pro rename to qmake/staticlib/jkqtmathtextlib/jkqtmathtextlib.pro diff --git a/staticlib/jkqtpcommonlib/jkqtpcommonlib.pro b/qmake/staticlib/jkqtpcommonlib/jkqtpcommonlib.pro similarity index 100% rename from staticlib/jkqtpcommonlib/jkqtpcommonlib.pro rename to qmake/staticlib/jkqtpcommonlib/jkqtpcommonlib.pro diff --git a/staticlib/jkqtplotterlib/jkqtplotterlib.pro b/qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro similarity index 100% rename from staticlib/jkqtplotterlib/jkqtplotterlib.pro rename to qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro diff --git a/screenshots/README.md b/screenshots/README.md index 7c3df54cc6..8d7f630bec 100644 --- a/screenshots/README.md +++ b/screenshots/README.md @@ -12,7 +12,7 @@ You can plot C-arrays as images in different color-coding styles. Diferent Overl ![Scatterplots](./screen_images_latex.png) -![Scatterplots](./jkqtplotter_simpletest_imageplot.png) +![Scatterplots](./imageplot.png) ## Plotting a user-defined (parsed) function @@ -34,7 +34,7 @@ Scatter Plots can have symbols where the shape/color/size is parametrized by a d ![JKQTPBarVerticalGraphStacked](../doc/images/JKQTPBarVerticalGraphStacked.png) ![JKQTPBarHorizontalGraphStacked](../doc/images/JKQTPBarHorizontalGraphStacked.png) -![jkqtplotter_simpletest_barchart](./jkqtplotter_simpletest_barchart.png) +![barchart](./barchart.png) ## Screenshots of included LaTeX renderer diff --git a/screenshots/jkqtplotter_simpletest_advancedlineandfillstyling.png b/screenshots/advancedlineandfillstyling.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_advancedlineandfillstyling.png rename to screenshots/advancedlineandfillstyling.png diff --git a/screenshots/jkqtplotter_simpletest_advancedlineandfillstyling_small.png b/screenshots/advancedlineandfillstyling_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_advancedlineandfillstyling_small.png rename to screenshots/advancedlineandfillstyling_small.png diff --git a/screenshots/jkqtplotter_simpletest_barchart.png b/screenshots/barchart.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_barchart.png rename to screenshots/barchart.png diff --git a/screenshots/jkqtplotter_simpletest_barchart_small.png b/screenshots/barchart_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_barchart_small.png rename to screenshots/barchart_small.png diff --git a/screenshots/jkqtplotter_simpletest_boxplot.png b/screenshots/boxplot.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_boxplot.png rename to screenshots/boxplot.png diff --git a/screenshots/jkqtplotter_simpletest_boxplot_small.png b/screenshots/boxplot_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_boxplot_small.png rename to screenshots/boxplot_small.png diff --git a/screenshots/jkqtplotter_simpletest_contourplot.png b/screenshots/contourplot.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_contourplot.png rename to screenshots/contourplot.png diff --git a/screenshots/jkqtplotter_simpletest_contourplot_ColorContoursFromPalette.png b/screenshots/contourplot_ColorContoursFromPalette.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_contourplot_ColorContoursFromPalette.png rename to screenshots/contourplot_ColorContoursFromPalette.png diff --git a/screenshots/jkqtplotter_simpletest_contourplot_ColorContoursFromPaletteByValue.png b/screenshots/contourplot_ColorContoursFromPaletteByValue.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_contourplot_ColorContoursFromPaletteByValue.png rename to screenshots/contourplot_ColorContoursFromPaletteByValue.png diff --git a/screenshots/jkqtplotter_simpletest_contourplot_SingleColorContours.png b/screenshots/contourplot_SingleColorContours.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_contourplot_SingleColorContours.png rename to screenshots/contourplot_SingleColorContours.png diff --git a/screenshots/jkqtplotter_simpletest_contourplot_animated.gif b/screenshots/contourplot_animated.gif similarity index 100% rename from screenshots/jkqtplotter_simpletest_contourplot_animated.gif rename to screenshots/contourplot_animated.gif diff --git a/screenshots/jkqtplotter_simpletest_contourplot_overridecolors.png b/screenshots/contourplot_overridecolors.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_contourplot_overridecolors.png rename to screenshots/contourplot_overridecolors.png diff --git a/screenshots/jkqtplotter_simpletest_contourplot_small.png b/screenshots/contourplot_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_contourplot_small.png rename to screenshots/contourplot_small.png diff --git a/screenshots/simpletest_datastore_calccolumns.png b/screenshots/datastore_calccolumns.png similarity index 100% rename from screenshots/simpletest_datastore_calccolumns.png rename to screenshots/datastore_calccolumns.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_groupedstat.png b/screenshots/datastore_groupedstat.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_groupedstat.png rename to screenshots/datastore_groupedstat.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_groupedstat_barchart.png b/screenshots/datastore_groupedstat_barchart.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_groupedstat_barchart.png rename to screenshots/datastore_groupedstat_barchart.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_groupedstat_barchartrawdata.png b/screenshots/datastore_groupedstat_barchartrawdata.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_groupedstat_barchartrawdata.png rename to screenshots/datastore_groupedstat_barchartrawdata.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_groupedstat_boxplot.png b/screenshots/datastore_groupedstat_boxplot.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_groupedstat_boxplot.png rename to screenshots/datastore_groupedstat_boxplot.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_groupedstat_scatter.png b/screenshots/datastore_groupedstat_scatter.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_groupedstat_scatter.png rename to screenshots/datastore_groupedstat_scatter.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_groupedstat_scatterrawdata.png b/screenshots/datastore_groupedstat_scatterrawdata.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_groupedstat_scatterrawdata.png rename to screenshots/datastore_groupedstat_scatterrawdata.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_groupedstat_small.png b/screenshots/datastore_groupedstat_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_groupedstat_small.png rename to screenshots/datastore_groupedstat_small.png diff --git a/screenshots/simpletest_datastore_image.png b/screenshots/datastore_image.png similarity index 100% rename from screenshots/simpletest_datastore_image.png rename to screenshots/datastore_image.png diff --git a/screenshots/simpletest_datastore_image_sorted.png b/screenshots/datastore_image_sorted.png similarity index 100% rename from screenshots/simpletest_datastore_image_sorted.png rename to screenshots/datastore_image_sorted.png diff --git a/screenshots/simpletest_datastore_iterators_cosine.png b/screenshots/datastore_iterators_cosine.png similarity index 100% rename from screenshots/simpletest_datastore_iterators_cosine.png rename to screenshots/datastore_iterators_cosine.png diff --git a/screenshots/simpletest_datastore_iterators_cosine_yreplaced.png b/screenshots/datastore_iterators_cosine_yreplaced.png similarity index 100% rename from screenshots/simpletest_datastore_iterators_cosine_yreplaced.png rename to screenshots/datastore_iterators_cosine_yreplaced.png diff --git a/screenshots/simpletest_datastore_iterators_cosine_ysorted.png b/screenshots/datastore_iterators_cosine_ysorted.png similarity index 100% rename from screenshots/simpletest_datastore_iterators_cosine_ysorted.png rename to screenshots/datastore_iterators_cosine_ysorted.png diff --git a/screenshots/simpletest_datastore_iterators_small.png b/screenshots/datastore_iterators_small.png similarity index 100% rename from screenshots/simpletest_datastore_iterators_small.png rename to screenshots/datastore_iterators_small.png diff --git a/screenshots/simpletest_datastore_linkedcarray.png b/screenshots/datastore_linkedcarray.png similarity index 100% rename from screenshots/simpletest_datastore_linkedcarray.png rename to screenshots/datastore_linkedcarray.png diff --git a/screenshots/simpletest_datastore_map.png b/screenshots/datastore_map.png similarity index 100% rename from screenshots/simpletest_datastore_map.png rename to screenshots/datastore_map.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_regression.png b/screenshots/datastore_regression.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_regression.png rename to screenshots/datastore_regression.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_regression_lin.png b/screenshots/datastore_regression_lin.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_regression_lin.png rename to screenshots/datastore_regression_lin.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_regression_linrobust.png b/screenshots/datastore_regression_linrobust.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_regression_linrobust.png rename to screenshots/datastore_regression_linrobust.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_regression_linrobust_p.png b/screenshots/datastore_regression_linrobust_p.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_regression_linrobust_p.png rename to screenshots/datastore_regression_linrobust_p.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_regression_linweight.png b/screenshots/datastore_regression_linweight.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_regression_linweight.png rename to screenshots/datastore_regression_linweight.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_regression_nonlinreg.png b/screenshots/datastore_regression_nonlinreg.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_regression_nonlinreg.png rename to screenshots/datastore_regression_nonlinreg.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_regression_polynom.png b/screenshots/datastore_regression_polynom.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_regression_polynom.png rename to screenshots/datastore_regression_polynom.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_regression_polynom_errros.png b/screenshots/datastore_regression_polynom_errros.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_regression_polynom_errros.png rename to screenshots/datastore_regression_polynom_errros.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_regression_small.png b/screenshots/datastore_regression_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_regression_small.png rename to screenshots/datastore_regression_small.png diff --git a/screenshots/simpletest_datastore_sine.png b/screenshots/datastore_sine.png similarity index 100% rename from screenshots/simpletest_datastore_sine.png rename to screenshots/datastore_sine.png diff --git a/screenshots/simpletest_datastore_sineimg.png b/screenshots/datastore_sineimg.png similarity index 100% rename from screenshots/simpletest_datastore_sineimg.png rename to screenshots/datastore_sineimg.png diff --git a/screenshots/simpletest_datastore_small.png b/screenshots/datastore_small.png similarity index 100% rename from screenshots/simpletest_datastore_small.png rename to screenshots/datastore_small.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_statistics.png b/screenshots/datastore_statistics.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_statistics.png rename to screenshots/datastore_statistics.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_statistics_2d.png b/screenshots/datastore_statistics_2d.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_statistics_2d.png rename to screenshots/datastore_statistics_2d.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_statistics_2d_hist.png b/screenshots/datastore_statistics_2d_hist.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_statistics_2d_hist.png rename to screenshots/datastore_statistics_2d_hist.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_statistics_2d_histcontour.png b/screenshots/datastore_statistics_2d_histcontour.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_statistics_2d_histcontour.png rename to screenshots/datastore_statistics_2d_histcontour.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_statistics_2d_kde.png b/screenshots/datastore_statistics_2d_kde.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_statistics_2d_kde.png rename to screenshots/datastore_statistics_2d_kde.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_statistics_2d_kdecontour.png b/screenshots/datastore_statistics_2d_kdecontour.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_statistics_2d_kdecontour.png rename to screenshots/datastore_statistics_2d_kdecontour.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_statistics_2d_marginhist.png b/screenshots/datastore_statistics_2d_marginhist.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_statistics_2d_marginhist.png rename to screenshots/datastore_statistics_2d_marginhist.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_statistics_2d_marginkde.png b/screenshots/datastore_statistics_2d_marginkde.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_statistics_2d_marginkde.png rename to screenshots/datastore_statistics_2d_marginkde.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_statistics_2d_scatteronly.png b/screenshots/datastore_statistics_2d_scatteronly.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_statistics_2d_scatteronly.png rename to screenshots/datastore_statistics_2d_scatteronly.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_statistics_2d_small.png b/screenshots/datastore_statistics_2d_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_statistics_2d_small.png rename to screenshots/datastore_statistics_2d_small.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_statistics_boxplots.png b/screenshots/datastore_statistics_boxplots.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_statistics_boxplots.png rename to screenshots/datastore_statistics_boxplots.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_statistics_boxplots_outliers.png b/screenshots/datastore_statistics_boxplots_outliers.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_statistics_boxplots_outliers.png rename to screenshots/datastore_statistics_boxplots_outliers.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_statistics_boxplots_simple.png b/screenshots/datastore_statistics_boxplots_simple.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_statistics_boxplots_simple.png rename to screenshots/datastore_statistics_boxplots_simple.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_statistics_cumhistkde.png b/screenshots/datastore_statistics_cumhistkde.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_statistics_cumhistkde.png rename to screenshots/datastore_statistics_cumhistkde.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_statistics_dataonly.png b/screenshots/datastore_statistics_dataonly.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_statistics_dataonly.png rename to screenshots/datastore_statistics_dataonly.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_statistics_hist.png b/screenshots/datastore_statistics_hist.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_statistics_hist.png rename to screenshots/datastore_statistics_hist.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_statistics_kde.png b/screenshots/datastore_statistics_kde.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_statistics_kde.png rename to screenshots/datastore_statistics_kde.png diff --git a/screenshots/jkqtplotter_simpletest_datastore_statistics_small.png b/screenshots/datastore_statistics_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_datastore_statistics_small.png rename to screenshots/datastore_statistics_small.png diff --git a/screenshots/jkqtplotter_simpletest_dateaxes.png b/screenshots/dateaxes.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_dateaxes.png rename to screenshots/dateaxes.png diff --git a/screenshots/jkqtplotter_simpletest_dateaxes_dates_small.png b/screenshots/dateaxes_dates_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_dateaxes_dates_small.png rename to screenshots/dateaxes_dates_small.png diff --git a/screenshots/jkqtplotter_simpletest_dateaxes_small.png b/screenshots/dateaxes_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_dateaxes_small.png rename to screenshots/dateaxes_small.png diff --git a/screenshots/jkqtplotter_simpletest_dateaxes_timeaxis.png b/screenshots/dateaxes_timeaxis.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_dateaxes_timeaxis.png rename to screenshots/dateaxes_timeaxis.png diff --git a/screenshots/jkqtplotter_simpletest_dateaxes_timeaxis_small.png b/screenshots/dateaxes_timeaxis_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_dateaxes_timeaxis_small.png rename to screenshots/dateaxes_timeaxis_small.png diff --git a/screenshots/jkqtplotter_simpletest_errorbarstyles.png b/screenshots/errorbarstyles.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_errorbarstyles.png rename to screenshots/errorbarstyles.png diff --git a/screenshots/jkqtplotter_simpletest_errorbarstyles_barcharts.png b/screenshots/errorbarstyles_barcharts.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_errorbarstyles_barcharts.png rename to screenshots/errorbarstyles_barcharts.png diff --git a/screenshots/jkqtplotter_simpletest_errorbarstyles_filledcurves.png b/screenshots/errorbarstyles_filledcurves.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_errorbarstyles_filledcurves.png rename to screenshots/errorbarstyles_filledcurves.png diff --git a/screenshots/jkqtplotter_simpletest_errorbarstyles_impulses.png b/screenshots/errorbarstyles_impulses.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_errorbarstyles_impulses.png rename to screenshots/errorbarstyles_impulses.png diff --git a/screenshots/jkqtplotter_simpletest_errorbarstyles_small.png b/screenshots/errorbarstyles_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_errorbarstyles_small.png rename to screenshots/errorbarstyles_small.png diff --git a/screenshots/jkqtplotter_simpletest_filledgraphs.png b/screenshots/filledgraphs.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_filledgraphs.png rename to screenshots/filledgraphs.png diff --git a/screenshots/jkqtplotter_simpletest_filledgraphs_small.png b/screenshots/filledgraphs_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_filledgraphs_small.png rename to screenshots/filledgraphs_small.png diff --git a/screenshots/jkqtplotter_simpletest_filledgraphs_yaxis.png b/screenshots/filledgraphs_yaxis.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_filledgraphs_yaxis.png rename to screenshots/filledgraphs_yaxis.png diff --git a/screenshots/jkqtplotter_simpletest_functionplot.png b/screenshots/functionplot.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_functionplot.png rename to screenshots/functionplot.png diff --git a/screenshots/jkqtplotter_simpletest_functionplot_fy.png b/screenshots/functionplot_fy.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_functionplot_fy.png rename to screenshots/functionplot_fy.png diff --git a/screenshots/jkqtplotter_simpletest_functionplot_small.png b/screenshots/functionplot_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_functionplot_small.png rename to screenshots/functionplot_small.png diff --git a/screenshots/jkqtplotter_simpletest_geometric.png b/screenshots/geometric.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_geometric.png rename to screenshots/geometric.png diff --git a/screenshots/jkqtplotter_simpletest_geometric_small.png b/screenshots/geometric_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_geometric_small.png rename to screenshots/geometric_small.png diff --git a/screenshots/jkqtplotter_simpletest_imageplot.png b/screenshots/imageplot.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_imageplot.png rename to screenshots/imageplot.png diff --git a/screenshots/jkqtplotter_simpletest_imageplot__scale02.png b/screenshots/imageplot__scale02.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_imageplot__scale02.png rename to screenshots/imageplot__scale02.png diff --git a/screenshots/jkqtplotter_simpletest_imageplot__smallscalecolor.png b/screenshots/imageplot__smallscalecolor.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_imageplot__smallscalecolor.png rename to screenshots/imageplot__smallscalecolor.png diff --git a/screenshots/jkqtplotter_simpletest_imageplot__smallscalelimitcolor.png b/screenshots/imageplot__smallscalelimitcolor.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_imageplot__smallscalelimitcolor.png rename to screenshots/imageplot__smallscalelimitcolor.png diff --git a/screenshots/jkqtplotter_simpletest_imageplot__smallscaletransparent.png b/screenshots/imageplot__smallscaletransparent.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_imageplot__smallscaletransparent.png rename to screenshots/imageplot__smallscaletransparent.png diff --git a/screenshots/jkqtplotter_simpletest_imageplot_modifier.png b/screenshots/imageplot_modifier.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_imageplot_modifier.png rename to screenshots/imageplot_modifier.png diff --git a/screenshots/jkqtplotter_simpletest_imageplot_modifier_imageonly.png b/screenshots/imageplot_modifier_imageonly.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_imageplot_modifier_imageonly.png rename to screenshots/imageplot_modifier_imageonly.png diff --git a/screenshots/jkqtplotter_simpletest_imageplot_modifier_modifieronly.png b/screenshots/imageplot_modifier_modifieronly.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_imageplot_modifier_modifieronly.png rename to screenshots/imageplot_modifier_modifieronly.png diff --git a/screenshots/jkqtplotter_simpletest_imageplot_modifier_small.png b/screenshots/imageplot_modifier_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_imageplot_modifier_small.png rename to screenshots/imageplot_modifier_small.png diff --git a/screenshots/jkqtplotter_simpletest_imageplot_nodatastore.png b/screenshots/imageplot_nodatastore.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_imageplot_nodatastore.png rename to screenshots/imageplot_nodatastore.png diff --git a/screenshots/jkqtplotter_simpletest_imageplot_nodatastore_small.png b/screenshots/imageplot_nodatastore_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_imageplot_nodatastore_small.png rename to screenshots/imageplot_nodatastore_small.png diff --git a/screenshots/jkqtplotter_simpletest_imageplot_opencv.png b/screenshots/imageplot_opencv.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_imageplot_opencv.png rename to screenshots/imageplot_opencv.png diff --git a/screenshots/jkqtplotter_simpletest_imageplot_opencv_small.png b/screenshots/imageplot_opencv_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_imageplot_opencv_small.png rename to screenshots/imageplot_opencv_small.png diff --git a/screenshots/jkqtplotter_simpletest_imageplot_small.png b/screenshots/imageplot_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_imageplot_small.png rename to screenshots/imageplot_small.png diff --git a/screenshots/jkqtplotter_simpletest_impulsesplot.png b/screenshots/impulsesplot.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_impulsesplot.png rename to screenshots/impulsesplot.png diff --git a/screenshots/jkqtplotter_simpletest_impulsesplot_baseline.png b/screenshots/impulsesplot_baseline.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_impulsesplot_baseline.png rename to screenshots/impulsesplot_baseline.png diff --git a/screenshots/jkqtplotter_simpletest_impulsesplot_horizontal.png b/screenshots/impulsesplot_horizontal.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_impulsesplot_horizontal.png rename to screenshots/impulsesplot_horizontal.png diff --git a/screenshots/jkqtplotter_simpletest_impulsesplot_small.png b/screenshots/impulsesplot_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_impulsesplot_small.png rename to screenshots/impulsesplot_small.png diff --git a/screenshots/jkqtplotter_simpletest_impulsesplot_symbols.png b/screenshots/impulsesplot_symbols.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_impulsesplot_symbols.png rename to screenshots/impulsesplot_symbols.png diff --git a/screenshots/jkqtplotter_simpletest_logaxes.png b/screenshots/logaxes.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_logaxes.png rename to screenshots/logaxes.png diff --git a/screenshots/jkqtplotter_simpletest_logaxes_highqmathrendering.png b/screenshots/logaxes_highqmathrendering.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_logaxes_highqmathrendering.png rename to screenshots/logaxes_highqmathrendering.png diff --git a/screenshots/jkqtplotter_simpletest_logaxes_lowqmathrendering.png b/screenshots/logaxes_lowqmathrendering.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_logaxes_lowqmathrendering.png rename to screenshots/logaxes_lowqmathrendering.png diff --git a/screenshots/jkqtplotter_simpletest_logaxes_nolog.png b/screenshots/logaxes_nolog.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_logaxes_nolog.png rename to screenshots/logaxes_nolog.png diff --git a/screenshots/jkqtplotter_simpletest_logaxes_nominorgrid.png b/screenshots/logaxes_nominorgrid.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_logaxes_nominorgrid.png rename to screenshots/logaxes_nominorgrid.png diff --git a/screenshots/jkqtplotter_simpletest_logaxes_small.png b/screenshots/logaxes_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_logaxes_small.png rename to screenshots/logaxes_small.png diff --git a/screenshots/jkqtplotter_simpletest_parametriccurve1.png b/screenshots/parametriccurve1.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_parametriccurve1.png rename to screenshots/parametriccurve1.png diff --git a/screenshots/jkqtplotter_simpletest_parametriccurve2.png b/screenshots/parametriccurve2.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_parametriccurve2.png rename to screenshots/parametriccurve2.png diff --git a/screenshots/jkqtplotter_simpletest_parametriccurve_small.png b/screenshots/parametriccurve_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_parametriccurve_small.png rename to screenshots/parametriccurve_small.png diff --git a/screenshots/jkqtplotter_simpletest_paramscatterplot.png b/screenshots/paramscatterplot.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_paramscatterplot.png rename to screenshots/paramscatterplot.png diff --git a/screenshots/jkqtplotter_simpletest_paramscatterplot_datatable.png b/screenshots/paramscatterplot_datatable.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_paramscatterplot_datatable.png rename to screenshots/paramscatterplot_datatable.png diff --git a/screenshots/jkqtplotter_simpletest_paramscatterplot_image.png b/screenshots/paramscatterplot_image.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_paramscatterplot_image.png rename to screenshots/paramscatterplot_image.png diff --git a/screenshots/jkqtplotter_simpletest_paramscatterplot_image_palette.png b/screenshots/paramscatterplot_image_palette.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_paramscatterplot_image_palette.png rename to screenshots/paramscatterplot_image_palette.png diff --git a/screenshots/jkqtplotter_simpletest_paramscatterplot_image_palette_triangle.png b/screenshots/paramscatterplot_image_palette_triangle.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_paramscatterplot_image_palette_triangle.png rename to screenshots/paramscatterplot_image_palette_triangle.png diff --git a/screenshots/jkqtplotter_simpletest_paramscatterplot_image_small.png b/screenshots/paramscatterplot_image_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_paramscatterplot_image_small.png rename to screenshots/paramscatterplot_image_small.png diff --git a/screenshots/jkqtplotter_simpletest_paramscatterplot_image_star.png b/screenshots/paramscatterplot_image_star.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_paramscatterplot_image_star.png rename to screenshots/paramscatterplot_image_star.png diff --git a/screenshots/jkqtplotter_simpletest_paramscatterplot_image_varsymbol.png b/screenshots/paramscatterplot_image_varsymbol.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_paramscatterplot_image_varsymbol.png rename to screenshots/paramscatterplot_image_varsymbol.png diff --git a/screenshots/jkqtplotter_simpletest_paramscatterplot_small.png b/screenshots/paramscatterplot_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_paramscatterplot_small.png rename to screenshots/paramscatterplot_small.png diff --git a/screenshots/jkqtplotter_simpletest_parsedfunctionplot.png b/screenshots/parsedfunctionplot.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_parsedfunctionplot.png rename to screenshots/parsedfunctionplot.png diff --git a/screenshots/jkqtplotter_simpletest_parsedfunctionplot_2overx.png b/screenshots/parsedfunctionplot_2overx.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_parsedfunctionplot_2overx.png rename to screenshots/parsedfunctionplot_2overx.png diff --git a/screenshots/jkqtplotter_simpletest_parsedfunctionplot_2overx_samplepoints.png b/screenshots/parsedfunctionplot_2overx_samplepoints.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_parsedfunctionplot_2overx_samplepoints.png rename to screenshots/parsedfunctionplot_2overx_samplepoints.png diff --git a/screenshots/jkqtplotter_simpletest_parsedfunctionplot_fy.png b/screenshots/parsedfunctionplot_fy.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_parsedfunctionplot_fy.png rename to screenshots/parsedfunctionplot_fy.png diff --git a/screenshots/jkqtplotter_simpletest_parsedfunctionplot_small.png b/screenshots/parsedfunctionplot_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_parsedfunctionplot_small.png rename to screenshots/parsedfunctionplot_small.png diff --git a/screenshots/jkqtplotter_simpletest_rgbimageplot.png b/screenshots/rgbimageplot.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_rgbimageplot.png rename to screenshots/rgbimageplot.png diff --git a/screenshots/jkqtplotter_simpletest_rgbimageplot_cmy.png b/screenshots/rgbimageplot_cmy.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_rgbimageplot_cmy.png rename to screenshots/rgbimageplot_cmy.png diff --git a/screenshots/jkqtplotter_simpletest_rgbimageplot_opencv.png b/screenshots/rgbimageplot_opencv.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_rgbimageplot_opencv.png rename to screenshots/rgbimageplot_opencv.png diff --git a/screenshots/jkqtplotter_simpletest_rgbimageplot_opencv_small.png b/screenshots/rgbimageplot_opencv_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_rgbimageplot_opencv_small.png rename to screenshots/rgbimageplot_opencv_small.png diff --git a/screenshots/jkqtplotter_simpletest_rgbimageplot_opencv_updisdedown.png b/screenshots/rgbimageplot_opencv_updisdedown.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_rgbimageplot_opencv_updisdedown.png rename to screenshots/rgbimageplot_opencv_updisdedown.png diff --git a/screenshots/jkqtplotter_simpletest_rgbimageplot_qt.png b/screenshots/rgbimageplot_qt.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_rgbimageplot_qt.png rename to screenshots/rgbimageplot_qt.png diff --git a/screenshots/jkqtplotter_simpletest_rgbimageplot_qt_small.png b/screenshots/rgbimageplot_qt_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_rgbimageplot_qt_small.png rename to screenshots/rgbimageplot_qt_small.png diff --git a/screenshots/jkqtplotter_simpletest_rgbimageplot_qt_updisdedown.png b/screenshots/rgbimageplot_qt_updisdedown.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_rgbimageplot_qt_updisdedown.png rename to screenshots/rgbimageplot_qt_updisdedown.png diff --git a/screenshots/jkqtplotter_simpletest_rgbimageplot_small.png b/screenshots/rgbimageplot_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_rgbimageplot_small.png rename to screenshots/rgbimageplot_small.png diff --git a/screenshots/jkqtplotter_simpletest_speed.png b/screenshots/speed.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_speed.png rename to screenshots/speed.png diff --git a/screenshots/jkqtplotter_simpletest_speed_small.png b/screenshots/speed_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_speed_small.png rename to screenshots/speed_small.png diff --git a/screenshots/jkqtplotter_simpletest_stepplots.png b/screenshots/stepplots.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_stepplots.png rename to screenshots/stepplots.png diff --git a/screenshots/jkqtplotter_simpletest_stepplots_small.png b/screenshots/stepplots_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_stepplots_small.png rename to screenshots/stepplots_small.png diff --git a/screenshots/jkqtplotter_simpletest_stepplots_vertical.png b/screenshots/stepplots_vertical.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_stepplots_vertical.png rename to screenshots/stepplots_vertical.png diff --git a/screenshots/jkqtplotter_simpletest_symbols_and_errors.png b/screenshots/symbols_and_errors.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_symbols_and_errors.png rename to screenshots/symbols_and_errors.png diff --git a/screenshots/jkqtplotter_simpletest_symbols_and_errors_small.png b/screenshots/symbols_and_errors_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_symbols_and_errors_small.png rename to screenshots/symbols_and_errors_small.png diff --git a/screenshots/jkqtplotter_simpletest_symbols_and_styles.png b/screenshots/symbols_and_styles.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_symbols_and_styles.png rename to screenshots/symbols_and_styles.png diff --git a/screenshots/jkqtplotter_simpletest_symbols_and_styles_small.png b/screenshots/symbols_and_styles_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_symbols_and_styles_small.png rename to screenshots/symbols_and_styles_small.png diff --git a/screenshots/jkqtplotter_simpletest_ui.png b/screenshots/ui.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_ui.png rename to screenshots/ui.png diff --git a/screenshots/jkqtplotter_simpletest_ui_loglog.png b/screenshots/ui_loglog.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_ui_loglog.png rename to screenshots/ui_loglog.png diff --git a/screenshots/jkqtplotter_simpletest_ui_small.png b/screenshots/ui_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_ui_small.png rename to screenshots/ui_small.png diff --git a/screenshots/jkqtplotter_simpletest_ui_widget.png b/screenshots/ui_widget.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_ui_widget.png rename to screenshots/ui_widget.png diff --git a/screenshots/jkqtplotter_simpletest_violinplot_hor.png b/screenshots/violinplot_hor.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_violinplot_hor.png rename to screenshots/violinplot_hor.png diff --git a/screenshots/jkqtplotter_simpletest_violinplot_small.png b/screenshots/violinplot_small.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_violinplot_small.png rename to screenshots/violinplot_small.png diff --git a/screenshots/jkqtplotter_simpletest_violinplot_vert.png b/screenshots/violinplot_vert.png similarity index 100% rename from screenshots/jkqtplotter_simpletest_violinplot_vert.png rename to screenshots/violinplot_vert.png diff --git a/staticlib/jkqtmathtextlib/CMakeLists.txt b/staticlib/jkqtmathtextlib/CMakeLists.txt deleted file mode 100644 index 77407e17e6..0000000000 --- a/staticlib/jkqtmathtextlib/CMakeLists.txt +++ /dev/null @@ -1,44 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -# common definitions -include(../../common_include.cmake) - - -IF(CMAKE_BUILD_TYPE MATCHES RELEASE) - SET(LIB_NAME libjkqtmathtext_static) -ELSE() - SET(LIB_NAME libjkqtmathtext_static_debug) -ENDIF(CMAKE_BUILD_TYPE MATCHES RELEASE) - - -# configure compiler -include(${CMAKE_CURRENT_SOURCE_DIR}/../../common_compilersettings.cmake) - - - - -# Find the QtWidgets library -find_package(Qt5 COMPONENTS Core Gui PrintSupport CONFIG REQUIRED) -# Find includes in corresponding build directories -set(CMAKE_INCLUDE_CURRENT_DIR ON) -# Instruct CMake to run moc automatically when needed -set(CMAKE_AUTOMOC ON) -# Create code from a list of Qt designer ui files -set(CMAKE_AUTOUIC ON) - - -# All build libraries are moved to this directory -set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}) -message(${CMAKE_CURRENT_SOURCE_DIR}) - -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../lib/jkqtcommon/) -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../lib/jkqtmathtext/) - -# define output library and properties -ADD_LIBRARY(${LIB_NAME} ${SOURCES} ${HEADERS}) -INSTALL(TARGETS ${LIB_NAME} DESTINATION bin) - -# define target -target_link_libraries(${LIB_NAME} Qt5::Core Qt5::Widgets Qt5::PrintSupport) -#target_compile_features(${LIB_NAME} PUBLIC cxx_std_11) -target_include_directories(${LIB_NAME} PUBLIC "../../lib/jkqtmathtext/") -#export(TARGETS ${LIB_NAME})