From 8c36ce219623d0378a9151e97950be62008caa25 Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Mon, 31 Oct 2022 20:34:01 +0100 Subject: [PATCH] NEW: barcharts and impulse graphs may now draw their baseline as stylable line (default: off) --- .gitignore | 22 +++++ doc/CMakeLists.txt | 4 +- doc/dox/whatsnew.dox | 1 + doc/images/JKQTPBarVerticalGraphBaseline.png | Bin 0 -> 13584 bytes .../JKQTPBarVerticalGraphNoBaseline.png | Bin 0 -> 14015 bytes .../JKQTPImpulsesHorizontalGraphBaseline.png | Bin 0 -> 8950 bytes ...JKQTPImpulsesHorizontalGraphNoBaseline.png | Bin 0 -> 8235 bytes .../JKQTPImpulsesVerticalGraphBaseline.png | Bin 0 -> 8778 bytes .../JKQTPImpulsesVerticalGraphNoBaseline.png | Bin 0 -> 8319 bytes examples/barchart/barchart.cpp | 79 ++++++++++++------ examples/impulsesplot/impulsesplot.cpp | 33 +++++++- .../jkqtpexampleapplication.cpp | 3 +- lib/jkqtplotter/graphs/jkqtpbarchart.cpp | 33 ++++++++ lib/jkqtplotter/graphs/jkqtpbarchartbase.cpp | 26 +++++- lib/jkqtplotter/graphs/jkqtpbarchartbase.h | 22 +++++ lib/jkqtplotter/graphs/jkqtpimpulses.cpp | 61 ++++++++++++-- lib/jkqtplotter/graphs/jkqtpimpulses.h | 34 +++++++- lib/jkqtplotter/jkqtpgraphsbasestyle.cpp | 40 ++++++++- lib/jkqtplotter/jkqtpgraphsbasestyle.h | 44 +++++++++- .../jkqtpgraphsbasestylingmixins.h | 31 ++++--- screenshots/parsedfunctionplot.png | Bin 29293 -> 29281 bytes screenshots/parsedfunctionplot_small.png | Bin 8340 -> 8315 bytes 22 files changed, 373 insertions(+), 60 deletions(-) create mode 100644 doc/images/JKQTPBarVerticalGraphBaseline.png create mode 100644 doc/images/JKQTPBarVerticalGraphNoBaseline.png create mode 100644 doc/images/JKQTPImpulsesHorizontalGraphBaseline.png create mode 100644 doc/images/JKQTPImpulsesHorizontalGraphNoBaseline.png create mode 100644 doc/images/JKQTPImpulsesVerticalGraphBaseline.png create mode 100644 doc/images/JKQTPImpulsesVerticalGraphNoBaseline.png diff --git a/.gitignore b/.gitignore index 22bc77c063..3bc02cd7d9 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,25 @@ Sicherungskopie_* /out *.synctex.gz *.bak +/doc/images/JKQTPImpulsesHorizontalErrorGraphBaseline.png +/doc/images/JKQTPImpulsesHorizontalErrorGraphBaseline_small.png +/doc/images/JKQTPImpulsesHorizontalErrorGraphNoBaseline.png +/doc/images/JKQTPImpulsesHorizontalErrorGraphNoBaseline_small.png +/doc/images/JKQTPImpulsesHorizontalGraphBaseline_small.png +/doc/images/JKQTPImpulsesHorizontalGraphNoBaseline_small.png +/doc/images/JKQTPImpulsesVerticalErrorGraphBaseline.png +/doc/images/JKQTPImpulsesVerticalErrorGraphBaseline_small.png +/doc/images/JKQTPImpulsesVerticalErrorGraphNoBaseline.png +/doc/images/JKQTPImpulsesVerticalErrorGraphNoBaseline_small.png +/doc/images/JKQTPImpulsesVerticalGraphBaseline_small.png +/doc/images/JKQTPImpulsesVerticalGraphNoBaseline_small.png +/doc/images/JKQTPImpulsesVerticalGraph_SymbolsBaseline.png +/doc/images/JKQTPImpulsesVerticalGraph_SymbolsBaseline_small.png +/doc/images/JKQTPImpulsesVerticalGraph_SymbolsNoBaseline.png +/doc/images/JKQTPImpulsesVerticalGraph_SymbolsNoBaseline_small.png +/doc/images/JKQTPBarHorizontalGraphBaseline.png +/doc/images/JKQTPBarHorizontalGraphBaseline_small.png +/doc/images/JKQTPBarHorizontalGraphNoBaseline.png +/doc/images/JKQTPBarHorizontalGraphNoBaseline_small.png +/doc/images/JKQTPBarVerticalGraphBaseline_small.png +/doc/images/JKQTPBarVerticalGraphNoBaseline_small.png diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 06e16c30f5..8a3edc05bf 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -193,7 +193,7 @@ if(JKQtPlotter_BUILD_EXAMPLES) stackedbars/JKQTPbarVerticalGraphStacked,JKQTPbarHorizontalGraphStacked/--smallscreenshotplot scatter/JKQTPXYScatterGraph,JKQTPXYScatterErrorGraph/--smallscreenshotplot simpletest/JKQTPXYLineGraph/--smallscreenshotplot - barchart/JKQTPBarVerticalGraph,JKQTPBarHorizontalGraph/--smallscreenshotplot + barchart/JKQTPBarVerticalGraph,JKQTPBarHorizontalGraph,JKQTPBarVerticalGraphNoBaseline,JKQTPBarHorizontalGraphNoBaseline,JKQTPBarVerticalGraphBaseline,JKQTPBarHorizontalGraphBaseline/--iteratefunctorsteps--smallscreenshotplot barchart_twocolor/JKQTPBarVerticalGraphTwoColorFilling,JKQTPBarHorizontalGraphTwoColorFilling/--smallscreenshotplot barchart_errorbars/JKQTPBarVerticalErrorGraph,JKQTPBarHorizontalErrorGraph/--smallscreenshotplot barchart_functorfill/JKQTPBarVerticalGraphFunctorFilling,JKQTPBarHorizontalGraphFunctorFilling/--smallscreenshotplot @@ -204,7 +204,7 @@ if(JKQtPlotter_BUILD_EXAMPLES) filledgraphs_errors/JKQTPFilledCurveXErrorGraph,JKQTPFilledCurveYErrorGraph/--smallscreenshotplot evalcurve/JKQTPXYFunctionLineGraph/--smallscreenshotplot geo_coordinateaxis0/JKQTPCoordinateAxisStyleDrawMode0 - impulsesplot/JKQTPImpulsesVerticalGraph,JKQTPImpulsesVerticalGraph_Symbols,JKQTPImpulsesHorizontalGraph,JKQTPImpulsesVerticalErrorGraph,JKQTPImpulsesHorizontalErrorGraph/--smallscreenshotplot + impulsesplot/JKQTPImpulsesVerticalGraph,JKQTPImpulsesVerticalGraph_Symbols,JKQTPImpulsesHorizontalGraph,JKQTPImpulsesVerticalErrorGraph,JKQTPImpulsesHorizontalErrorGraph,JKQTPImpulsesVerticalGraphNoBaseline,JKQTPImpulsesVerticalGraph_SymbolsNoBaseline,JKQTPImpulsesHorizontalGraphNoBaseline,JKQTPImpulsesVerticalErrorGraphNoBaseline,JKQTPImpulsesHorizontalErrorGraphNoBaseline,JKQTPImpulsesVerticalGraphBaseline,JKQTPImpulsesVerticalGraph_SymbolsBaseline,JKQTPImpulsesHorizontalGraphBaseline,JKQTPImpulsesVerticalErrorGraphBaseline,JKQTPImpulsesHorizontalErrorGraphBaseline/--iteratefunctorsteps--smallscreenshotplot symbols_and_errors/JKQTPXYLineErrorGraph_JKQTPErrorBars,JKQTPXYLineErrorGraph_JKQTPErrorLines,JKQTPXYLineErrorGraph_JKQTPErrorPolygons/--iteratefunctorsteps--iteratefunctorsteps_suppressinitial--smallscreenshotplot boxplot/JKQTPBoxplotVerticalGraph,JKQTPBoxplotHorizontalGraph/--iteratefunctorsteps--iteratefunctorsteps_suppressinitial--smallscreenshotplot ) diff --git a/doc/dox/whatsnew.dox b/doc/dox/whatsnew.dox index 1f221b70a6..19560a6615 100644 --- a/doc/dox/whatsnew.dox +++ b/doc/dox/whatsnew.dox @@ -65,6 +65,7 @@ Changes, compared to \ref page_whatsnew_V4_0_0 "v4.0.0" include:
  • NEW: barcharts may have rounded corners now, via JKQTPBarGraphBase::setRectRadius()
  • NEW: barcharts can be colored by a user-specified functor
  • NEW: you can provide a custom draw functor to barcharts to completely customize their look
  • +
  • NEW: barcharts and impulse graphs may now draw their baseline as stylable line (default: off)
  • JKQTMathText: