FIXED: Height of one-column key/legend was too large

jkriege2 · Aug 24, 2023 · 134739c · 134739c
1 parent 5cc0b65
commit 134739c
Show file tree

Hide file tree

Showing 94 changed files with 3 additions and 2 deletions.
diff --git a/doc/dox/whatsnew.dox b/doc/dox/whatsnew.dox
@@ -39,7 +39,8 @@ Changes, compared to  \ref page_whatsnew_V4_0_0 "v4.0.0" include:
     <li>FIXED: fixes strange rendering with distortions (especially in text!), by correcting size calculation of internal image buffer</li>
     <li>FIXED: exporting gridPrinting plots when using only a JKQTBasePlotter</li>
     <li>FIXED: fixed impleentations of JKQTPlotter::beginGraphs(), which actually returned the end-iterator (COPY-PASTE-ERROR!!!)</li>
-    <li>partly FIXED issue <a href="https://github.com/jkriege2/JKQtPlotter/pull/99">#99: Clipping of Tick Labels</a>: for horizontal axes, additional space at the left  and/or right of the plot is allowed so labels are no longer clipped (thanks to <a href="https://github.com/allenbarnett5">user:allenbarnett5/a> for reporting)</li>
+    <li>FIXED issue <a href="https://github.com/jkriege2/JKQtPlotter/pull/99">#99: Clipping of Tick Labels</a>: for horizontal axes, additional space at the left  and/or right of the plot is allowed so labels are no longer clipped (thanks to <a href="https://github.com/allenbarnett5">user:allenbarnett5/a> for reporting)</li>
+    <li>FIXED issue <a href="https://github.com/jkriege2/JKQtPlotter/pull/99">#99: Height of one-column key/legend was too large</a> (thanks to <a href="https://github.com/allenbarnett5">user:allenbarnett5/a> for reporting)</li>
     <li>FIXED/NEW: placement of plot-title (was not centerd in its box, but glued to the bottom) by adding a plotstyle parameter JKQTBasePlotterStyle::plotLabelOffset</li>
     <li>REORGANIZED: separated line-graphs from jkqtpscatter.h/.cpp into jkqtplines.h/.cpp</li>
     <li>IMPROVED: QT6-compatibility by removing deprecated warnings</li>

diff --git a/doc/images/JKQTPBarHorizontalErrorGraph.png b/doc/images/JKQTPBarHorizontalErrorGraph.png
diff --git a/doc/images/JKQTPBarHorizontalErrorGraph_small.png b/doc/images/JKQTPBarHorizontalErrorGraph_small.png
diff --git a/doc/images/JKQTPBarVerticalErrorGraph.png b/doc/images/JKQTPBarVerticalErrorGraph.png
diff --git a/doc/images/JKQTPBarVerticalErrorGraph_small.png b/doc/images/JKQTPBarVerticalErrorGraph_small.png
diff --git a/doc/images/JKQTPFilledCurveXErrorGraph.png b/doc/images/JKQTPFilledCurveXErrorGraph.png
diff --git a/doc/images/JKQTPFilledCurveXErrorGraph_small.png b/doc/images/JKQTPFilledCurveXErrorGraph_small.png
diff --git a/doc/images/JKQTPFilledCurveXGraph.png b/doc/images/JKQTPFilledCurveXGraph.png
diff --git a/doc/images/JKQTPFilledCurveXGraph_small.png b/doc/images/JKQTPFilledCurveXGraph_small.png
diff --git a/doc/images/JKQTPFilledCurveYErrorGraph.png b/doc/images/JKQTPFilledCurveYErrorGraph.png
diff --git a/doc/images/JKQTPFilledCurveYErrorGraph_small.png b/doc/images/JKQTPFilledCurveYErrorGraph_small.png
diff --git a/doc/images/JKQTPFilledCurveYGraph.png b/doc/images/JKQTPFilledCurveYGraph.png
diff --git a/doc/images/JKQTPFilledCurveYGraph_small.png b/doc/images/JKQTPFilledCurveYGraph_small.png
diff --git a/doc/images/JKQTPFilledCurveYGraph_wiggle.png b/doc/images/JKQTPFilledCurveYGraph_wiggle.png
diff --git a/doc/images/JKQTPXYFunctionLineGraph.png b/doc/images/JKQTPXYFunctionLineGraph.png
diff --git a/doc/images/JKQTPXYFunctionLineGraph_small.png b/doc/images/JKQTPXYFunctionLineGraph_small.png
diff --git a/doc/images/JKQTPXYScatterErrorGraph.png b/doc/images/JKQTPXYScatterErrorGraph.png
diff --git a/doc/images/JKQTPXYScatterErrorGraph_small.png b/doc/images/JKQTPXYScatterErrorGraph_small.png
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_unicode.png b/doc/images/jkqtmathtext/jkqtmathtext_unicode.png
diff --git a/doc/images/styles/blackandwhite.ini.png b/doc/images/styles/blackandwhite.ini.png
diff --git a/doc/images/styles/blueprint.ini.png b/doc/images/styles/blueprint.ini.png
diff --git a/doc/images/styles/cyberpunk.ini.png b/doc/images/styles/cyberpunk.ini.png
diff --git a/doc/images/styles/dark.ini.png b/doc/images/styles/dark.ini.png
diff --git a/doc/images/styles/default.ini.png b/doc/images/styles/default.ini.png
diff --git a/doc/images/styles/legacy_default_style.ini.png b/doc/images/styles/legacy_default_style.ini.png
diff --git a/doc/images/styles/seaborn.ini.png b/doc/images/styles/seaborn.ini.png
diff --git a/doc/images/styles/simple_arrowsaxes.ini.png b/doc/images/styles/simple_arrowsaxes.ini.png
diff --git a/doc/images/styles/simple_axesoffset.ini.png b/doc/images/styles/simple_axesoffset.ini.png
diff --git a/doc/images/styles/simple_axesoffset_plotbox.ini.png b/doc/images/styles/simple_axesoffset_plotbox.ini.png
diff --git a/doc/images/styles/simple_gridandticks.ini.png b/doc/images/styles/simple_gridandticks.ini.png
diff --git a/lib/jkqtplotter/jkqtpbaseplotter.cpp b/lib/jkqtplotter/jkqtpbaseplotter.cpp
@@ -4649,7 +4649,7 @@ void JKQTBasePlotter::getKeyExtent(JKQTPEnhancedPainter& painter, double* width,
         double w=0;
         double h=0;
         painter.setFont(f);
-        if (text_height!=nullptr) *text_height=0;
+        //if (text_height!=nullptr) *text_height=0;
 
 
         for (int i=0; i<graphs.size(); i++) {

diff --git a/screenshots/barchart_errorbars.png b/screenshots/barchart_errorbars.png
diff --git a/screenshots/barchart_errorbars_hor.png b/screenshots/barchart_errorbars_hor.png
diff --git a/screenshots/barchart_errorbars_hor_small.png b/screenshots/barchart_errorbars_hor_small.png
diff --git a/screenshots/barchart_errorbars_small.png b/screenshots/barchart_errorbars_small.png
diff --git a/screenshots/boxplot.png b/screenshots/boxplot.png
diff --git a/screenshots/boxplot_small.png b/screenshots/boxplot_small.png
diff --git a/screenshots/datastore.png b/screenshots/datastore.png
diff --git a/screenshots/datastore_regression.png b/screenshots/datastore_regression.png
diff --git a/screenshots/datastore_regression_lin.png b/screenshots/datastore_regression_lin.png
diff --git a/screenshots/datastore_regression_linrobust.png b/screenshots/datastore_regression_linrobust.png
diff --git a/screenshots/datastore_regression_linrobust_p.png b/screenshots/datastore_regression_linrobust_p.png
diff --git a/screenshots/datastore_regression_linweight.png b/screenshots/datastore_regression_linweight.png
diff --git a/screenshots/datastore_regression_polynom.png b/screenshots/datastore_regression_polynom.png
diff --git a/screenshots/datastore_regression_polynom_errros.png b/screenshots/datastore_regression_polynom_errros.png
diff --git a/screenshots/datastore_regression_small.png b/screenshots/datastore_regression_small.png
diff --git a/screenshots/datastore_small.png b/screenshots/datastore_small.png
diff --git a/screenshots/datastore_statistics.png b/screenshots/datastore_statistics.png
diff --git a/screenshots/datastore_statistics_2d.png b/screenshots/datastore_statistics_2d.png
diff --git a/screenshots/datastore_statistics_2d_small.png b/screenshots/datastore_statistics_2d_small.png
diff --git a/screenshots/datastore_statistics_cumhistkde.png b/screenshots/datastore_statistics_cumhistkde.png
diff --git a/screenshots/datastore_statistics_hist.png b/screenshots/datastore_statistics_hist.png
diff --git a/screenshots/datastore_statistics_kde.png b/screenshots/datastore_statistics_kde.png
diff --git a/screenshots/datastore_statistics_small.png b/screenshots/datastore_statistics_small.png
diff --git a/screenshots/dateaxes.png b/screenshots/dateaxes.png
diff --git a/screenshots/dateaxes_small.png b/screenshots/dateaxes_small.png
diff --git a/screenshots/errorbarstyles.png b/screenshots/errorbarstyles.png
diff --git a/screenshots/errorbarstyles_small.png b/screenshots/errorbarstyles_small.png
diff --git a/screenshots/evalcurve.png b/screenshots/evalcurve.png
diff --git a/screenshots/evalcurve_small.png b/screenshots/evalcurve_small.png
diff --git a/screenshots/filledgraphs.png b/screenshots/filledgraphs.png
diff --git a/screenshots/filledgraphs_errors.png b/screenshots/filledgraphs_errors.png
diff --git a/screenshots/filledgraphs_errors_small.png b/screenshots/filledgraphs_errors_small.png
diff --git a/screenshots/filledgraphs_errors_y.png b/screenshots/filledgraphs_errors_y.png
diff --git a/screenshots/filledgraphs_errors_y_small.png b/screenshots/filledgraphs_errors_y_small.png
diff --git a/screenshots/filledgraphs_small.png b/screenshots/filledgraphs_small.png
diff --git a/screenshots/filledgraphs_y.png b/screenshots/filledgraphs_y.png
diff --git a/screenshots/filledgraphs_y_small.png b/screenshots/filledgraphs_y_small.png
diff --git a/screenshots/logaxes.png b/screenshots/logaxes.png
diff --git a/screenshots/logaxes_nolog.png b/screenshots/logaxes_nolog.png
diff --git a/screenshots/logaxes_nominorgrid.png b/screenshots/logaxes_nominorgrid.png
diff --git a/screenshots/logaxes_small.png b/screenshots/logaxes_small.png
diff --git a/screenshots/mandelbrot.png b/screenshots/mandelbrot.png
diff --git a/screenshots/mandelbrot_small.png b/screenshots/mandelbrot_small.png
diff --git a/screenshots/multiplot.png b/screenshots/multiplot.png
diff --git a/screenshots/multiplot_controlwindow.png b/screenshots/multiplot_controlwindow.png
diff --git a/screenshots/multiplot_controlwindow_small.png b/screenshots/multiplot_controlwindow_small.png
diff --git a/screenshots/multiplot_small.png b/screenshots/multiplot_small.png
diff --git a/screenshots/parsedfunctionplot.png b/screenshots/parsedfunctionplot.png
diff --git a/screenshots/parsedfunctionplot_small.png b/screenshots/parsedfunctionplot_small.png
diff --git a/screenshots/scatter_customsymbol.png b/screenshots/scatter_customsymbol.png
diff --git a/screenshots/scatter_customsymbol_small.png b/screenshots/scatter_customsymbol_small.png
diff --git a/screenshots/scatter_error.png b/screenshots/scatter_error.png
diff --git a/screenshots/scatter_error_small.png b/screenshots/scatter_error_small.png
diff --git a/screenshots/stepplots.png b/screenshots/stepplots.png
diff --git a/screenshots/stepplots_small.png b/screenshots/stepplots_small.png
diff --git a/screenshots/test_distributionplot.png b/screenshots/test_distributionplot.png
diff --git a/screenshots/test_distributionplot_small.png b/screenshots/test_distributionplot_small.png
diff --git a/screenshots/violinplot_hor.png b/screenshots/violinplot_hor.png
diff --git a/screenshots/violinplot_hor_small.png b/screenshots/violinplot_hor_small.png
diff --git a/screenshots/violinplot_vert.png b/screenshots/violinplot_vert.png
diff --git a/screenshots/violinplot_vert_small.png b/screenshots/violinplot_vert_small.png
diff --git a/screenshots/wiggleplot_y.png b/screenshots/wiggleplot_y.png
diff --git a/screenshots/wiggleplot_y_small.png b/screenshots/wiggleplot_y_small.png