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: