From 6eba8acbf2f676699f577766a915915d03aadd8d Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Sun, 28 Aug 2022 22:48:14 +0200 Subject: [PATCH] updated many documentation images to auto-generated ones --- doc/CMakeLists.txt | 87 +++++++++++++++++- doc/dox/examples_and_tutorials.dox | 2 +- doc/dox/jkqtplotter.dox | 4 +- doc/dox/whatsnew.dox | 2 + doc/images/INVERTED_HSV.png | Bin 2721 -> 0 bytes doc/images/JKQTPBarHorizontalGraph.png | Bin 0 -> 13850 bytes doc/images/JKQTPBarVerticalGraph.png | Bin 0 -> 14331 bytes doc/images/JKQTPColumnContourPlot.png | Bin 0 -> 93938 bytes doc/images/JKQTPContour.png | Bin 74763 -> 0 bytes doc/images/JKQTPContour_small.png | Bin 26931 -> 0 bytes doc/images/JKQTPFilledCurveXGraph.png | Bin 0 -> 23666 bytes doc/images/JKQTPFilledCurveXGraph_wiggle.png | Bin 0 -> 30318 bytes doc/images/JKQTPFilledCurveYGraph.png | Bin 0 -> 24640 bytes doc/images/JKQTPFilledCurveYGraph_wiggle.png | Bin 0 -> 46424 bytes .../JKQTPViolinplotHorizontalElement.png | Bin 0 -> 23886 bytes doc/images/JKQTPXYFunctionLineGraph.png | Bin 0 -> 157594 bytes doc/images/JKQTPXYLineGraph.png | Bin 0 -> 30492 bytes doc/images/JKQTPXYScatterGraph.png | Bin 0 -> 21491 bytes doc/images/JKQTPbarHorizontalGraphStacked.png | Bin 13268 -> 18293 bytes doc/images/JKQTPbarVerticalGraphStacked.png | Bin 13861 -> 18164 bytes doc/images/TRAFFICLIGHT.png | Bin 3650 -> 0 bytes doc/images/blue.png | Bin 2893 -> 0 bytes doc/images/editor_editor.png | Bin 12377 -> 0 bytes doc/images/gray.png | Bin 3223 -> 0 bytes doc/images/green.png | Bin 2894 -> 0 bytes doc/images/hot.png | Bin 2647 -> 0 bytes doc/images/hsv.png | Bin 2738 -> 0 bytes doc/images/matlab.png | Bin 3042 -> 0 bytes doc/images/ocean.png | Bin 3821 -> 0 bytes doc/images/path2426.png | Bin 8468 -> 0 bytes doc/images/plot_bargraphhorplot.png | Bin 13455 -> 0 bytes doc/images/plot_bargraphverplot.png | Bin 13610 -> 0 bytes doc/images/plot_evalcurve.png | Bin 67573 -> 0 bytes .../plot_filledcurvexerrorplots_small.png | Bin doc/images/plot_filledcurvexplots.png | Bin 35422 -> 0 bytes doc/images/plot_lineplots.png | Bin 38513 -> 0 bytes doc/images/plot_stephorplot1.png | Bin 10612 -> 0 bytes doc/images/plot_stephorplot2.png | Bin 10459 -> 0 bytes doc/images/plot_stepverplot1.png | Bin 11720 -> 0 bytes doc/images/plot_stepverplot2.png | Bin 11823 -> 0 bytes doc/images/rainbow.png | Bin 4253 -> 0 bytes doc/images/red.png | Bin 3024 -> 0 bytes doc/images/rygb.png | Bin 3804 -> 0 bytes examples/README.md | 4 +- examples/barchart/barchart.cpp | 7 +- examples/contourplot/contourplot.cpp | 2 +- examples/dateaxes/dateaxes.cpp | 2 + examples/filledgraphs/filledgraphs.cpp | 68 ++++++++++---- examples/functionplot/functionplot.cpp | 6 +- examples/geo_arrows/geo_arrows.cpp | 2 +- examples/geo_simple/geo_simple.cpp | 2 +- examples/geometric/geometric.cpp | 6 +- examples/imageplot/imageplot.cpp | 2 +- .../imageplot_modifier/imageplot_modifier.cpp | 2 +- .../imageplot_nodatastore.cpp | 2 +- .../imageplot_userpal/imageplot_userpal.cpp | 2 +- examples/impulsesplot/impulsesplot.cpp | 2 +- .../jkqtpexampleapplication.cpp | 59 ++++++++---- .../libexampletools/jkqtpexampleapplication.h | 7 +- examples/logaxes/logaxes.cpp | 2 +- examples/mandelbrot/mandelbrot.cpp | 3 +- examples/mandelbrot/mandelbrotmainwindow.cpp | 1 + examples/mandelbrot/mandelbrotmainwindow.h | 2 + examples/multiplot/CMakeLists.txt | 6 +- examples/multiplot/README.md | 14 +-- examples/multiplot/test_multiplot.cpp | 7 +- examples/multiplot/test_multiplot.pro | 2 +- examples/multiplot/test_multiplot_ui.ui | 2 +- examples/parametriccurve/parametriccurve.cpp | 7 +- .../paramscatterplot/paramscatterplot.cpp | 2 +- .../paramscatterplot_image.cpp | 8 +- .../parsedfunctionplot/parsedfunctionplot.cpp | 2 +- examples/rgbimageplot/rgbimageplot.cpp | 2 +- examples/rgbimageplot_qt/rgbimageplot_qt.cpp | 2 +- examples/scatter/scatter.cpp | 2 +- examples/simpletest/simpletest.cpp | 3 +- examples/stackedbars/README.md | 4 +- examples/stackedbars/stackedbars.cpp | 6 +- examples/stepplots/stepplots.cpp | 2 +- examples/styledboxplot/test_styledboxplot.cpp | 2 +- examples/styling/test_styling.cpp | 1 + examples/styling/test_styling.ui | 2 +- .../symbols_and_errors/symbols_and_errors.cpp | 2 +- .../symbols_and_styles/symbols_and_styles.cpp | 2 +- examples/violinplot/violinplot.cpp | 45 +++++---- examples/wiggleplots/wiggleplots.cpp | 8 +- lib/jkqtplotter/graphs/jkqtpbarchart.h | 8 +- lib/jkqtplotter/graphs/jkqtpbarchartbase.h | 2 +- lib/jkqtplotter/graphs/jkqtpcontour.h | 2 +- .../graphs/jkqtpevaluatedparametriccurve.h | 2 +- lib/jkqtplotter/graphs/jkqtpfilledcurve.h | 9 +- lib/jkqtplotter/graphs/jkqtplines.h | 2 +- lib/jkqtplotter/graphs/jkqtpscatter.h | 2 +- lib/jkqtplotter/jkqtpbaseplotter.h | 2 +- .../JKQTPbarHorizontalGraphStacked_small.png | Bin 9659 -> 0 bytes .../JKQTPbarVerticalGraphStacked_small.png | Bin 9310 -> 0 bytes screenshots/contourplot.png | Bin 208760 -> 135912 bytes screenshots/contourplot_small.png | Bin 23910 -> 23054 bytes screenshots/dateaxes_timeaxis_small.png | Bin 9070 -> 11310 bytes screenshots/evalcurve_small.png | Bin 23017 -> 17807 bytes screenshots/filledgraphs.png | Bin 52560 -> 36099 bytes screenshots/filledgraphs_small.png | Bin 7086 -> 9593 bytes screenshots/filledgraphs_y.png | Bin 0 -> 38890 bytes screenshots/filledgraphs_y_small.png | Bin 0 -> 12233 bytes screenshots/functionplot.png | Bin 98514 -> 94224 bytes screenshots/functionplot_fy.png | Bin 103528 -> 93478 bytes screenshots/functionplot_fy_small.png | Bin 0 -> 14633 bytes screenshots/functionplot_small.png | Bin 23585 -> 14379 bytes screenshots/geometric.png | Bin 127983 -> 179891 bytes screenshots/geometric_small.png | Bin 25595 -> 17288 bytes screenshots/imageplot.png | Bin 15427 -> 23191 bytes screenshots/imageplot_modifier.png | Bin 88688 -> 78522 bytes screenshots/imageplot_modifier_small.png | Bin 19726 -> 13846 bytes screenshots/imageplot_nodatastore.png | Bin 47347 -> 26455 bytes screenshots/imageplot_nodatastore_small.png | Bin 17491 -> 15796 bytes screenshots/imageplot_small.png | Bin 13055 -> 12120 bytes screenshots/imageplot_userpal_program.png | Bin 18844 -> 18515 bytes .../imageplot_userpal_program_small.png | Bin 15264 -> 9850 bytes screenshots/impulsesplot.png | Bin 12667 -> 16560 bytes screenshots/impulsesplot_small.png | Bin 9426 -> 6113 bytes screenshots/mandelbrot.png | Bin 57434 -> 92515 bytes screenshots/mandelbrot_small.png | Bin 14291 -> 10534 bytes screenshots/multiplot.png | Bin 0 -> 77492 bytes screenshots/multiplot_controlwindow.png | Bin 0 -> 37707 bytes screenshots/multiplot_controlwindow_small.png | Bin 0 -> 6027 bytes ...preview.png => multiplot_printpreview.png} | Bin screenshots/multiplot_small.png | Bin 0 -> 12977 bytes screenshots/parametriccurve1.png | Bin 23907 -> 24239 bytes screenshots/parametriccurve1_small.png | Bin 0 -> 6852 bytes screenshots/parametriccurve2.png | Bin 27867 -> 28273 bytes screenshots/parametriccurve2_small.png | Bin 0 -> 7524 bytes screenshots/paramscatterplot.png | Bin 75563 -> 98671 bytes screenshots/paramscatterplot_small.png | Bin 16690 -> 13977 bytes screenshots/parsedfunctionplot.png | Bin 37281 -> 32161 bytes screenshots/parsedfunctionplot_small.png | Bin 15178 -> 9271 bytes screenshots/rgbimageplot.png | Bin 81472 -> 34706 bytes screenshots/rgbimageplot_qt.png | Bin 339339 -> 238404 bytes screenshots/rgbimageplot_qt_small.png | Bin 22483 -> 20775 bytes screenshots/rgbimageplot_small.png | Bin 18467 -> 15330 bytes screenshots/scatter.png | Bin 34220 -> 30240 bytes screenshots/scatter_small.png | Bin 8423 -> 11782 bytes screenshots/simpletest.png | Bin 58526 -> 44456 bytes screenshots/simpletest_small.png | Bin 9741 -> 14337 bytes screenshots/stackedbars.png | Bin 0 -> 26302 bytes screenshots/stackedbars_hor.png | Bin 0 -> 28018 bytes screenshots/stackedbars_hor_small.png | Bin 0 -> 6074 bytes screenshots/stackedbars_small.png | Bin 0 -> 6167 bytes screenshots/stepplots.png | Bin 34799 -> 52100 bytes screenshots/stepplots_small.png | Bin 11035 -> 9060 bytes screenshots/symbols_and_errors.png | Bin 29594 -> 26455 bytes screenshots/symbols_and_errors_small.png | Bin 12680 -> 7813 bytes screenshots/symbols_and_styles.png | Bin 245184 -> 112502 bytes screenshots/symbols_and_styles_small.png | Bin 18711 -> 18752 bytes screenshots/test_distributionplot.png | Bin 100501 -> 99386 bytes screenshots/test_distributionplot_small.png | Bin 10646 -> 10646 bytes screenshots/test_multiplot.png | Bin 63970 -> 0 bytes screenshots/test_multiplot_controlwindow.png | Bin 78825 -> 0 bytes screenshots/test_multiplot_small.png | Bin 15430 -> 0 bytes screenshots/test_styledboxplot.png | Bin 25688 -> 21215 bytes screenshots/test_styledboxplot_small.png | Bin 5083 -> 8058 bytes screenshots/violinplot_hor.png | Bin 50088 -> 43045 bytes screenshots/violinplot_hor_small.png | Bin 0 -> 10570 bytes screenshots/violinplot_vert.png | Bin 50957 -> 43855 bytes screenshots/violinplot_vert_small.png | Bin 0 -> 10734 bytes screenshots/wiggleplot_x.png | Bin 92208 -> 43331 bytes screenshots/wiggleplot_x_small.png | Bin 0 -> 10086 bytes screenshots/wiggleplot_y.png | Bin 113706 -> 67566 bytes screenshots/wiggleplot_y_small.png | Bin 0 -> 13207 bytes tools/jkqtmathtext_render/CMakeLists.txt | 1 - 169 files changed, 298 insertions(+), 143 deletions(-) delete mode 100644 doc/images/INVERTED_HSV.png create mode 100644 doc/images/JKQTPBarHorizontalGraph.png create mode 100644 doc/images/JKQTPBarVerticalGraph.png create mode 100644 doc/images/JKQTPColumnContourPlot.png delete mode 100644 doc/images/JKQTPContour.png delete mode 100644 doc/images/JKQTPContour_small.png create mode 100644 doc/images/JKQTPFilledCurveXGraph.png create mode 100644 doc/images/JKQTPFilledCurveXGraph_wiggle.png create mode 100644 doc/images/JKQTPFilledCurveYGraph.png create mode 100644 doc/images/JKQTPFilledCurveYGraph_wiggle.png create mode 100644 doc/images/JKQTPViolinplotHorizontalElement.png create mode 100644 doc/images/JKQTPXYFunctionLineGraph.png create mode 100644 doc/images/JKQTPXYLineGraph.png create mode 100644 doc/images/JKQTPXYScatterGraph.png delete mode 100644 doc/images/TRAFFICLIGHT.png delete mode 100644 doc/images/blue.png delete mode 100644 doc/images/editor_editor.png delete mode 100644 doc/images/gray.png delete mode 100644 doc/images/green.png delete mode 100644 doc/images/hot.png delete mode 100644 doc/images/hsv.png delete mode 100644 doc/images/matlab.png delete mode 100644 doc/images/ocean.png delete mode 100644 doc/images/path2426.png delete mode 100644 doc/images/plot_bargraphhorplot.png delete mode 100644 doc/images/plot_bargraphverplot.png delete mode 100644 doc/images/plot_evalcurve.png rename {screenshots => doc/images}/plot_filledcurvexerrorplots_small.png (100%) delete mode 100644 doc/images/plot_filledcurvexplots.png delete mode 100644 doc/images/plot_lineplots.png delete mode 100644 doc/images/plot_stephorplot1.png delete mode 100644 doc/images/plot_stephorplot2.png delete mode 100644 doc/images/plot_stepverplot1.png delete mode 100644 doc/images/plot_stepverplot2.png delete mode 100644 doc/images/rainbow.png delete mode 100644 doc/images/red.png delete mode 100644 doc/images/rygb.png delete mode 100644 screenshots/JKQTPbarHorizontalGraphStacked_small.png delete mode 100644 screenshots/JKQTPbarVerticalGraphStacked_small.png create mode 100644 screenshots/filledgraphs_y.png create mode 100644 screenshots/filledgraphs_y_small.png create mode 100644 screenshots/functionplot_fy_small.png create mode 100644 screenshots/multiplot.png create mode 100644 screenshots/multiplot_controlwindow.png create mode 100644 screenshots/multiplot_controlwindow_small.png rename screenshots/{test_multiplot_printpreview.png => multiplot_printpreview.png} (100%) create mode 100644 screenshots/multiplot_small.png create mode 100644 screenshots/parametriccurve1_small.png create mode 100644 screenshots/parametriccurve2_small.png create mode 100644 screenshots/stackedbars.png create mode 100644 screenshots/stackedbars_hor.png create mode 100644 screenshots/stackedbars_hor_small.png create mode 100644 screenshots/stackedbars_small.png delete mode 100644 screenshots/test_multiplot.png delete mode 100644 screenshots/test_multiplot_controlwindow.png delete mode 100644 screenshots/test_multiplot_small.png create mode 100644 screenshots/violinplot_hor_small.png create mode 100644 screenshots/violinplot_vert_small.png create mode 100644 screenshots/wiggleplot_x_small.png create mode 100644 screenshots/wiggleplot_y_small.png diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 395e31c019..090550ceab 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -72,10 +72,11 @@ if(JKQtPlotter_BUILD_EXAMPLES) # the output basename equals the example name in this list, # unless you specify the basenames by adding it/them after a slash '/' # e.g. "barchart/barchart,barchart_hor" + # the basenames are applied to the windows in the order of their windowTitle()s! set(JKQTPlotter_GenerateDocScreenshots_From scatter simpletest - barchart/barchart_hor,barchart + barchart/barchart,barchart_hor wiggleplots/wiggleplot_x,wiggleplot_y advplotstyling/advancedlineandfillstyling boxplot @@ -85,16 +86,65 @@ if(JKQtPlotter_BUILD_EXAMPLES) dateaxes/dateaxes,dateaxes_timeaxis distributionplot/test_distributionplot evalcurve - filledgraphs + filledgraphs/filledgraphs,filledgraphs_y functionplot/functionplot,functionplot_fy styledboxplot/test_styledboxplot - test_multiplot + multiplot/multiplot,multiplot_controlwindow + #symbols_and_styles + symbols_and_errors + stepplots + stackedbars/stackedbars,stackedbars_hor + #geo_arrows + #geo_simple + geometric + imageplot + imageplot_modifier + imageplot_nodatastore + imageplot_userpal/imageplot_userpal_program + impulsesplot + parametriccurve/parametriccurve1,parametriccurve2 + paramscatterplot + #paramscatterplot_image + parsedfunctionplot + rgbimageplot + rgbimageplot_qt + mandelbrot + #speed + ) + + + + + + # custom target that generates the images for the JKQTMathText documentation + set(JKQTPlotter_GenerateDocImage_DefaultOptions --screenshotdir="${CMAKE_CURRENT_LIST_DIR}/../doc/images/" --screenshotplot --disablehighdpi) + set(JKQTPlotter_GenerateDocImages_From + stackedbars/JKQTPbarVerticalGraphStacked,JKQTPbarHorizontalGraphStacked + scatter/JKQTPXYScatterGraph + simpletest/JKQTPXYLineGraph + barchart/JKQTPBarVerticalGraph,JKQTPBarHorizontalGraph + wiggleplots/JKQTPFilledCurveXGraph_wiggle,JKQTPFilledCurveYGraph_wiggle + contourplot/JKQTPColumnContourPlot + filledgraphs/JKQTPFilledCurveXGraph,JKQTPFilledCurveYGraph + evalcurve/JKQTPXYFunctionLineGraph ) add_custom_target(JKQTPlotter_GenerateDocScreenshots COMMENT "Building JKQTPlotter Documentation Screenshots ..." ) + add_custom_target(JKQTPlotter_GenerateDocImages + COMMENT "Building JKQTPlotter Documentation Images ..." + ) + + + + + + + + + foreach(ex ${JKQTPlotter_GenerateDocScreenshots_From}) string(REGEX MATCH "(.+)/(.+)" dummy ${ex}) if(CMAKE_MATCH_1 STREQUAL "" OR CMAKE_MATCH_2 STREQUAL "") @@ -124,4 +174,35 @@ if(JKQtPlotter_BUILD_EXAMPLES) unset(basename) endforeach() + + foreach(ex ${JKQTPlotter_GenerateDocImages_From}) + string(REGEX MATCH "(.+)/(.+)" dummy ${ex}) + if(CMAKE_MATCH_1 STREQUAL "" OR CMAKE_MATCH_2 STREQUAL "") + set(example ${ex}) + set(basename ${ex}) + else() + set(example ${CMAKE_MATCH_1}) + set(basename ${CMAKE_MATCH_2}) + endif() + + set(loc_target_name JKQTPlotter_GenerateDocImages_${example}) + set(dep_name jkqtptest_${example}) + string(TOUPPER ${example} example_upper) + add_custom_target(${loc_target_name} + COMMENT "Building JKQTPlotter Documentation Image: ${example_upper}" + COMMAND $ ${JKQTPlotter_GenerateDocImage_DefaultOptions} --screenshotbasename=${basename} + WORKING_DIRECTORY ${JKQtPlotter_QT_BINDIR} + DEPENDS ${dep_name} + ) + + add_dependencies(JKQTPlotter_GenerateDocImages ${loc_target_name}) + + unset(loc_target_name) + unset(dep_name) + unset(example) + unset(example_upper) + unset(basename) + endforeach() + + endif() diff --git a/doc/dox/examples_and_tutorials.dox b/doc/dox/examples_and_tutorials.dox index 5b7de6e646..2841f16d0d 100644 --- a/doc/dox/examples_and_tutorials.dox +++ b/doc/dox/examples_and_tutorials.dox @@ -37,7 +37,7 @@ All test-projects are Qt-projects that use qmake to build. You can load them int \image html barchart_small.png \subpage JKQTPlotterBarcharts `JKQTPBarVerticalGraph`
C-style arrays of data - \image html JKQTPBarHorizontalGraphStacked_small.png + \image html stackedbars_small.png \subpage JKQTPlotterStackedBarChart `JKQTPBarVerticalStackableGraph`, `JKQTPBarHorizontalStackableGraph`
C++-style vectors of data \image html filledgraphs_small.png diff --git a/doc/dox/jkqtplotter.dox b/doc/dox/jkqtplotter.dox index d5732e4fda..0f501f6d77 100644 --- a/doc/dox/jkqtplotter.dox +++ b/doc/dox/jkqtplotter.dox @@ -520,7 +520,7 @@ Examples: \image html overlayimageenhanced_small.png JKQTPOverlayImageEnhanced, JKQTPColumnOverlayImageEnhanced - \image html JKQTPContour_small.png + \image html JKQTPColumnContourPlot_small.png JKQTPContourPlot, JKQTPColumnContourPlot @@ -572,7 +572,7 @@ Examples: Screenshot Classes - \image html JKQTPContour_small.png + \image html JKQTPColumnContourPlot_small.png JKQTPContourPlot, JKQTPColumnContourPlot diff --git a/doc/dox/whatsnew.dox b/doc/dox/whatsnew.dox index b42b5535ed..88b1042845 100644 --- a/doc/dox/whatsnew.dox +++ b/doc/dox/whatsnew.dox @@ -38,6 +38,8 @@ Changes, compared to \ref page_whatsnew_V4_0_0 "v4.0.0" include:
  • NEW: added JKQTBasePlotter::grabPixelImage() and JKQTPlotter::grabPixelImage(), which grab the plotter into a QImage
  • NEW: added option to not display the preview dialog to JKQTBasePlotter::copyPixelImage() and JKQTPlotter::copyPixelImage()
  • NEW: added simple scatter plot JKQTPXYScatterGraph
    • +
  • NEW: made resize-timer status accessible from outside via JKQTPlotter::isResizeTimerRunning()
    • +
  • NEW: made it's delay a global static variable that can be set and red with JKQTPlotter::setGlobalResizeDelay() and JKQTPlotter::getGlobalResizeDelay()
  • JKQTMathText: