From 5cc0b65d9a17bcf272a593590fd5de807fdf53d9 Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Thu, 24 Aug 2023 21:49:39 +0200 Subject: [PATCH] NEW: added JKQTPLabelMinBesides and JKQTPLabelMaxBesides to JKQTPLabelPosition, so labels can be set besides the axes --- doc/dox/whatsnew.dox | 1 + .../JKQTBasePlotter_addSecondaryXAxis.png | Bin 56157 -> 53356 bytes .../JKQTBasePlotter_addSecondaryYAxis.png | Bin 64138 -> 65032 bytes doc/images/JKQTPBarHorizontalErrorGraph.png | Bin 17018 -> 18050 bytes .../JKQTPBarHorizontalErrorGraph_small.png | Bin 9565 -> 9408 bytes ...QTPBarHorizontalGraphCustomDrawFunctor.png | Bin 13158 -> 13261 bytes ...HorizontalGraphCustomDrawFunctor_small.png | Bin 5416 -> 5355 bytes .../JKQTPBarHorizontalGraphFunctorFilling.png | Bin 10908 -> 11383 bytes ...BarHorizontalGraphFunctorFilling_small.png | Bin 5277 -> 5074 bytes ...JKQTPBarHorizontalGraphTwoColorFilling.png | Bin 14359 -> 15468 bytes ...arHorizontalGraphTwoColorFilling_small.png | Bin 7375 -> 7350 bytes doc/images/JKQTPBarVerticalErrorGraph.png | Bin 18280 -> 18376 bytes .../JKQTPBarVerticalErrorGraph_small.png | Bin 9628 -> 9732 bytes ...JKQTPBarVerticalGraphCustomDrawFunctor.png | Bin 13224 -> 13404 bytes ...arVerticalGraphCustomDrawFunctor_small.png | Bin 5336 -> 5561 bytes .../JKQTPBarVerticalGraphFunctorFilling.png | Bin 11851 -> 11894 bytes ...TPBarVerticalGraphFunctorFilling_small.png | Bin 5355 -> 5185 bytes .../JKQTPBarVerticalGraphTwoColorFilling.png | Bin 15802 -> 16598 bytes ...PBarVerticalGraphTwoColorFilling_small.png | Bin 7502 -> 7385 bytes doc/images/JKQTPBoxplotHorizontalGraph.png | Bin 19000 -> 19460 bytes .../JKQTPBoxplotHorizontalGraph_small.png | Bin 4017 -> 4051 bytes doc/images/JKQTPBoxplotVerticalGraph.png | Bin 17474 -> 17973 bytes .../JKQTPBoxplotVerticalGraph_small.png | Bin 3876 -> 3783 bytes doc/images/JKQTPColumnContourPlot.png | Bin 88648 -> 87692 bytes doc/images/JKQTPColumnContourPlot_small.png | Bin 21323 -> 20886 bytes .../JKQTPCoordinateAxisStyleDrawMode0.png | Bin 22498 -> 22280 bytes doc/images/JKQTPFilledCurveXErrorGraph.png | Bin 37155 -> 37077 bytes .../JKQTPFilledCurveXErrorGraph_small.png | Bin 14570 -> 14615 bytes doc/images/JKQTPFilledCurveXGraph.png | Bin 24557 -> 24551 bytes doc/images/JKQTPFilledCurveXGraph_small.png | Bin 9397 -> 9522 bytes doc/images/JKQTPFilledCurveXGraph_wiggle.png | Bin 31441 -> 31830 bytes doc/images/JKQTPFilledCurveYErrorGraph.png | Bin 33399 -> 35211 bytes .../JKQTPFilledCurveYErrorGraph_small.png | Bin 14405 -> 14357 bytes doc/images/JKQTPFilledCurveYGraph.png | Bin 25028 -> 25306 bytes doc/images/JKQTPFilledCurveYGraph_small.png | Bin 11722 -> 11400 bytes doc/images/JKQTPFilledCurveYGraph_wiggle.png | Bin 46753 -> 46994 bytes .../JKQTPImpulsesHorizontalErrorGraph.png | Bin 9712 -> 10213 bytes ...KQTPImpulsesHorizontalErrorGraph_small.png | Bin 5549 -> 5420 bytes doc/images/JKQTPImpulsesHorizontalGraph.png | Bin 9344 -> 9753 bytes .../JKQTPImpulsesHorizontalGraphBaseline.png | Bin 9781 -> 10178 bytes ...JKQTPImpulsesHorizontalGraphNoBaseline.png | Bin 9344 -> 9753 bytes .../JKQTPImpulsesHorizontalGraph_small.png | Bin 5639 -> 5486 bytes .../JKQTPImpulsesVerticalErrorGraph.png | Bin 10886 -> 11173 bytes .../JKQTPImpulsesVerticalErrorGraph_small.png | Bin 3368 -> 3417 bytes doc/images/JKQTPImpulsesVerticalGraph.png | Bin 9211 -> 9524 bytes .../JKQTPImpulsesVerticalGraphBaseline.png | Bin 9700 -> 10033 bytes .../JKQTPImpulsesVerticalGraphNoBaseline.png | Bin 9211 -> 9524 bytes .../JKQTPImpulsesVerticalGraph_Symbols.png | Bin 21678 -> 22050 bytes ...QTPImpulsesVerticalGraph_Symbols_small.png | Bin 4686 -> 4769 bytes .../JKQTPImpulsesVerticalGraph_small.png | Bin 3123 -> 3159 bytes doc/images/JKQTPXYFunctionLineGraph.png | Bin 104223 -> 105043 bytes doc/images/JKQTPXYFunctionLineGraph_small.png | Bin 17886 -> 17875 bytes .../JKQTPXYLineErrorGraph_JKQTPErrorBars.png | Bin 33318 -> 34455 bytes ...PXYLineErrorGraph_JKQTPErrorBars_small.png | Bin 5729 -> 5821 bytes .../JKQTPXYLineErrorGraph_JKQTPErrorLines.png | Bin 46588 -> 48141 bytes ...XYLineErrorGraph_JKQTPErrorLines_small.png | Bin 7925 -> 8017 bytes ...QTPXYLineErrorGraph_JKQTPErrorPolygons.png | Bin 35298 -> 37117 bytes ...ineErrorGraph_JKQTPErrorPolygons_small.png | Bin 6686 -> 6766 bytes doc/images/axisstyle/JKQTPCALTdate.png | Bin 2260 -> 2286 bytes doc/images/axisstyle/JKQTPCALTdatetime.png | Bin 2040 -> 1705 bytes doc/images/axisstyle/JKQTPCALTdefault.png | Bin 1902 -> 1927 bytes doc/images/axisstyle/JKQTPCALTexponent.png | Bin 1574 -> 1538 bytes .../axisstyle/JKQTPCALTexponentCharacter.png | Bin 2127 -> 2271 bytes doc/images/axisstyle/JKQTPCALTfrac.png | Bin 2090 -> 2170 bytes doc/images/axisstyle/JKQTPCALTintfrac.png | Bin 2007 -> 2070 bytes doc/images/axisstyle/JKQTPCALTintsfrac.png | Bin 2208 -> 2281 bytes .../axisstyle/JKQTPCALTintslashfrac.png | Bin 1870 -> 1843 bytes doc/images/axisstyle/JKQTPCALTprintf.png | Bin 2224 -> 2165 bytes doc/images/axisstyle/JKQTPCALTscientific.png | Bin 1828 -> 1799 bytes doc/images/axisstyle/JKQTPCALTsfrac.png | Bin 2291 -> 2362 bytes doc/images/axisstyle/JKQTPCALTslashfrac.png | Bin 2017 -> 1978 bytes doc/images/axisstyle/JKQTPCALTtime.png | Bin 1745 -> 2017 bytes doc/images/axisstyle/JKQTPLTMLin.png | Bin 4452 -> 4716 bytes doc/images/axisstyle/JKQTPLTMLinOrPower.png | Bin 3856 -> 4115 bytes doc/images/axisstyle/JKQTPLTMPower.png | Bin 3311 -> 3353 bytes .../axisstyle/axis_unit_scaling_none.png | Bin 3560 -> 3703 bytes doc/images/axisstyle/axis_unit_scaling_pi.png | Bin 4434 -> 4735 bytes .../jkqtmathtext/jkqtmathtext_unicode.png | Bin 3839 -> 3807 bytes doc/images/labelstyles/JKQTPLabelCenter.png | Bin 6674 -> 4367 bytes .../labelstyles/JKQTPLabelCenter_zeroaxis.png | Bin 0 -> 4635 bytes doc/images/labelstyles/JKQTPLabelMax.png | Bin 6607 -> 4356 bytes .../labelstyles/JKQTPLabelMaxBesides.png | Bin 0 -> 3944 bytes .../JKQTPLabelMaxBesides_zeroaxis.png | Bin 0 -> 4241 bytes .../labelstyles/JKQTPLabelMax_zeroaxis.png | Bin 0 -> 4619 bytes doc/images/labelstyles/JKQTPLabelMin.png | Bin 6555 -> 4332 bytes .../labelstyles/JKQTPLabelMinBesides.png | Bin 0 -> 3721 bytes .../JKQTPLabelMinBesides_zeroaxis.png | Bin 0 -> 4234 bytes .../labelstyles/JKQTPLabelMin_zeroaxis.png | Bin 0 -> 4571 bytes doc/images/styles/blackandwhite.ini.png | Bin 137438 -> 137589 bytes doc/images/styles/blueprint.ini.png | Bin 139612 -> 139323 bytes doc/images/styles/cyberpunk.ini.png | Bin 152301 -> 152748 bytes doc/images/styles/dark.ini.png | Bin 142861 -> 143980 bytes doc/images/styles/default.ini.png | Bin 148053 -> 148780 bytes .../styles/legacy_default_style.ini.png | Bin 141463 -> 141454 bytes doc/images/styles/seaborn.ini.png | Bin 107210 -> 107707 bytes doc/images/styles/simple_arrowsaxes.ini.png | Bin 153970 -> 155157 bytes doc/images/styles/simple_axesoffset.ini.png | Bin 136951 -> 139509 bytes .../styles/simple_axesoffset_plotbox.ini.png | Bin 140649 -> 143776 bytes doc/images/styles/simple_gridandticks.ini.png | Bin 141443 -> 143593 bytes lib/jkqtmathtext/jkqtmathtexttools.h | 6 +- lib/jkqtplotter/graphs/jkqtpimagergb.cpp | 37 +- lib/jkqtplotter/jkqtpbaseplotter.cpp | 73 +-- lib/jkqtplotter/jkqtpbaseplotter.h | 15 +- lib/jkqtplotter/jkqtpcoordinateaxes.cpp | 544 ++++++++++++------ lib/jkqtplotter/jkqtpcoordinateaxes.h | 58 +- lib/jkqtplotter/jkqtpimagetools.cpp | 32 +- lib/jkqtplotter/jkqtptools.cpp | 10 +- lib/jkqtplotter/jkqtptools.h | 20 +- screenshots/advancedlineandfillstyling.png | Bin 111957 -> 113062 bytes .../advancedlineandfillstyling_small.png | Bin 21790 -> 21734 bytes screenshots/barchart_customdrawfunctor.png | Bin 12281 -> 12555 bytes .../barchart_customdrawfunctor_hor.png | Bin 12344 -> 12532 bytes .../barchart_customdrawfunctor_hor_small.png | Bin 5416 -> 5355 bytes .../barchart_customdrawfunctor_small.png | Bin 5336 -> 5561 bytes screenshots/barchart_errorbars.png | Bin 17131 -> 16916 bytes screenshots/barchart_errorbars_hor.png | Bin 15520 -> 16473 bytes screenshots/barchart_errorbars_hor_small.png | Bin 9565 -> 9408 bytes screenshots/barchart_errorbars_small.png | Bin 9628 -> 9732 bytes screenshots/barchart_functorfill.png | Bin 10717 -> 10612 bytes screenshots/barchart_functorfill_hor.png | Bin 9779 -> 10282 bytes .../barchart_functorfill_hor_small.png | Bin 5277 -> 5074 bytes screenshots/barchart_functorfill_small.png | Bin 5355 -> 5185 bytes screenshots/barchart_twocolor.png | Bin 13903 -> 14294 bytes screenshots/barchart_twocolor_hor.png | Bin 13105 -> 13806 bytes screenshots/barchart_twocolor_hor_small.png | Bin 7375 -> 7350 bytes screenshots/barchart_twocolor_small.png | Bin 7502 -> 7385 bytes screenshots/boxplot.png | Bin 27501 -> 27882 bytes screenshots/boxplot_small.png | Bin 6712 -> 6728 bytes screenshots/contourplot.png | Bin 81873 -> 80978 bytes screenshots/contourplot_small.png | Bin 21323 -> 20886 bytes screenshots/datastore.png | Bin 61864 -> 61745 bytes screenshots/datastore_calccolumns.png | Bin 26995 -> 27795 bytes screenshots/datastore_image.png | Bin 52729 -> 53287 bytes screenshots/datastore_image_sorted.png | Bin 52729 -> 53287 bytes screenshots/datastore_iterators.png | Bin 39878 -> 40546 bytes screenshots/datastore_iterators_cosine.png | Bin 39878 -> 40546 bytes .../datastore_iterators_cosine_ysorted.png | Bin 40706 -> 41659 bytes screenshots/datastore_iterators_small.png | Bin 8085 -> 7977 bytes screenshots/datastore_linkedcarray.png | Bin 14250 -> 14835 bytes screenshots/datastore_map.png | Bin 17491 -> 17803 bytes screenshots/datastore_sine.png | Bin 43385 -> 42982 bytes screenshots/datastore_sineimg.png | Bin 7495 -> 7728 bytes screenshots/datastore_small.png | Bin 12022 -> 12124 bytes screenshots/datastore_statistics_2d.png | Bin 123746 -> 123627 bytes screenshots/datastore_statistics_2d_small.png | Bin 11083 -> 11051 bytes screenshots/errorbarstyles.png | Bin 91678 -> 89931 bytes screenshots/errorbarstyles_impulses.png | Bin 9579 -> 9929 bytes .../errorbarstyles_impulses_horizontal.png | Bin 8981 -> 9353 bytes ...rorbarstyles_impulses_horizontal_small.png | Bin 5549 -> 5420 bytes screenshots/errorbarstyles_impulses_small.png | Bin 3368 -> 3417 bytes screenshots/errorbarstyles_small.png | Bin 12111 -> 12208 bytes screenshots/evalcurve.png | Bin 104223 -> 105043 bytes screenshots/evalcurve_small.png | Bin 17886 -> 17875 bytes screenshots/filledgraphs.png | Bin 22306 -> 22092 bytes screenshots/filledgraphs_errors.png | Bin 34502 -> 34328 bytes screenshots/filledgraphs_errors_small.png | Bin 14570 -> 14615 bytes screenshots/filledgraphs_errors_y.png | Bin 30978 -> 32493 bytes screenshots/filledgraphs_errors_y_small.png | Bin 14405 -> 14357 bytes screenshots/filledgraphs_small.png | Bin 9397 -> 9522 bytes screenshots/filledgraphs_y.png | Bin 22827 -> 22798 bytes screenshots/filledgraphs_y_small.png | Bin 11722 -> 11400 bytes screenshots/functionplot.png | Bin 57857 -> 59217 bytes screenshots/functionplot_fy.png | Bin 55647 -> 56971 bytes screenshots/functionplot_fy_small.png | Bin 16694 -> 16716 bytes screenshots/functionplot_small.png | Bin 16518 -> 16298 bytes screenshots/geo_coordinateaxis0.png | Bin 21391 -> 20925 bytes screenshots/geo_coordinateaxis0_small.png | Bin 13630 -> 13280 bytes screenshots/geometric.png | Bin 180031 -> 181145 bytes screenshots/geometric_small.png | Bin 15112 -> 15460 bytes screenshots/imageplot.png | Bin 16297 -> 15957 bytes screenshots/imageplot__scale02.png | Bin 14722 -> 14118 bytes screenshots/imageplot__smallscalecolor.png | Bin 14384 -> 14103 bytes .../imageplot__smallscalelimitcolor.png | Bin 14263 -> 13963 bytes .../imageplot__smallscaletransparent.png | Bin 20713 -> 20198 bytes screenshots/imageplot_modifier.png | Bin 66179 -> 66241 bytes screenshots/imageplot_modifier_small.png | Bin 14402 -> 14189 bytes screenshots/imageplot_nodatastore.png | Bin 19288 -> 18948 bytes screenshots/imageplot_nodatastore_small.png | Bin 13853 -> 13805 bytes screenshots/imageplot_small.png | Bin 10395 -> 10199 bytes screenshots/imageplot_userpal_program.png | Bin 13486 -> 13731 bytes .../imageplot_userpal_program_small.png | Bin 7726 -> 7838 bytes screenshots/impulsesplot.png | Bin 8298 -> 8619 bytes screenshots/impulsesplot_horizontal.png | Bin 8648 -> 8918 bytes screenshots/impulsesplot_horizontal_small.png | Bin 5639 -> 5486 bytes screenshots/impulsesplot_small.png | Bin 3123 -> 3159 bytes screenshots/impulsesplot_symbols.png | Bin 19905 -> 20170 bytes screenshots/impulsesplot_symbols_small.png | Bin 4686 -> 4769 bytes screenshots/logaxes.png | Bin 54373 -> 56495 bytes screenshots/logaxes_nolog.png | Bin 34320 -> 35842 bytes screenshots/logaxes_nominorgrid.png | Bin 49425 -> 51266 bytes screenshots/logaxes_small.png | Bin 10735 -> 10630 bytes screenshots/mandelbrot.png | Bin 68287 -> 68222 bytes screenshots/mandelbrot_small.png | Bin 10549 -> 10531 bytes screenshots/multiplot.png | Bin 71959 -> 73086 bytes screenshots/multiplot_controlwindow.png | Bin 23170 -> 23189 bytes screenshots/multiplot_controlwindow_small.png | Bin 6245 -> 6240 bytes screenshots/multiplot_small.png | Bin 11025 -> 10918 bytes screenshots/parametriccurve1.png | Bin 15200 -> 15476 bytes screenshots/parametriccurve1_small.png | Bin 7310 -> 6883 bytes screenshots/parametriccurve2.png | Bin 16060 -> 15821 bytes screenshots/parametriccurve2_small.png | Bin 8044 -> 7731 bytes screenshots/paramscatterplot.png | Bin 73196 -> 79903 bytes screenshots/paramscatterplot_small.png | Bin 10519 -> 10362 bytes screenshots/parsedfunctionplot.png | Bin 37483 -> 38369 bytes screenshots/parsedfunctionplot_small.png | Bin 7781 -> 7721 bytes screenshots/rgbimageplot.png | Bin 24803 -> 24977 bytes screenshots/rgbimageplot_qt.png | Bin 97972 -> 98365 bytes screenshots/rgbimageplot_qt_small.png | Bin 19874 -> 19897 bytes screenshots/rgbimageplot_qt_upsidedown.png | Bin 98685 -> 98476 bytes .../rgbimageplot_qt_upsidedown_small.png | Bin 20314 -> 20349 bytes screenshots/rgbimageplot_small.png | Bin 13759 -> 13753 bytes screenshots/second_axis.png | Bin 58992 -> 59235 bytes screenshots/second_axis_hor.png | Bin 51717 -> 48980 bytes screenshots/second_axis_hor_small.png | Bin 20252 -> 19726 bytes screenshots/second_axis_small.png | Bin 14656 -> 14671 bytes screenshots/stepplots.png | Bin 38009 -> 38000 bytes screenshots/stepplots_small.png | Bin 6204 -> 6298 bytes screenshots/symbols_and_errors.png | Bin 24509 -> 25056 bytes screenshots/symbols_and_errors_small.png | Bin 5142 -> 5222 bytes screenshots/test_distributionplot.png | Bin 64826 -> 65327 bytes screenshots/test_distributionplot_small.png | Bin 10440 -> 10204 bytes screenshots/test_styledboxplot.png | Bin 13775 -> 13779 bytes screenshots/test_styledboxplot_small.png | Bin 5158 -> 5397 bytes screenshots/violinplot_hor.png | Bin 28645 -> 28767 bytes screenshots/violinplot_hor_small.png | Bin 11227 -> 10725 bytes screenshots/violinplot_vert.png | Bin 29744 -> 30211 bytes screenshots/violinplot_vert_small.png | Bin 11133 -> 11288 bytes screenshots/wiggleplot_x.png | Bin 28738 -> 28984 bytes screenshots/wiggleplot_x_small.png | Bin 9422 -> 9544 bytes screenshots/wiggleplot_y.png | Bin 42035 -> 42146 bytes screenshots/wiggleplot_y_small.png | Bin 12173 -> 11958 bytes .../jkqtplotter_doc_imagegenerator.cpp | 30 +- 232 files changed, 540 insertions(+), 286 deletions(-) create mode 100644 doc/images/labelstyles/JKQTPLabelCenter_zeroaxis.png create mode 100644 doc/images/labelstyles/JKQTPLabelMaxBesides.png create mode 100644 doc/images/labelstyles/JKQTPLabelMaxBesides_zeroaxis.png create mode 100644 doc/images/labelstyles/JKQTPLabelMax_zeroaxis.png create mode 100644 doc/images/labelstyles/JKQTPLabelMinBesides.png create mode 100644 doc/images/labelstyles/JKQTPLabelMinBesides_zeroaxis.png create mode 100644 doc/images/labelstyles/JKQTPLabelMin_zeroaxis.png diff --git a/doc/dox/whatsnew.dox b/doc/dox/whatsnew.dox index 3ca33cc694..50b90971f1 100644 --- a/doc/dox/whatsnew.dox +++ b/doc/dox/whatsnew.dox @@ -94,6 +94,7 @@ Changes, compared to \ref page_whatsnew_V4_0_0 "v4.0.0" include:
  • NEW: added entry for JKQTBasePlotterStyle::plotLabelColor to set the plot label color
  • NEW: added JKQTBasePlotterStyle::plotLabelTopBorder to set the spacing between top and plot label
  • NEW: Due to addition of JKQTMathText::setFontOptions() and the matchign extension of JKQTMathText::setFontSpecial() (see below) you can now add modifiers like +BOLD+ITALIC to any font-name provided to JKQTPlotter and in style INI-files
  • +
  • NEW: added JKQTPLabelMinBesides and JKQTPLabelMaxBesides to JKQTPLabelPosition, so labels can be set besides the axes
  • JKQTMathText: