diff --git a/doc/dox/whatsnew.dox b/doc/dox/whatsnew.dox index 67436d32a9..f2c2c10128 100644 --- a/doc/dox/whatsnew.dox +++ b/doc/dox/whatsnew.dox @@ -91,6 +91,7 @@ Changes, compared to \ref page_whatsnew_V4_0_0 "v4.0.0" include:
  • NEW: Using Q_SIGNALS/Q_SLOTS instead of signals/slots MOC-keywords ... this allows for interoperability with other signals/slots frameworks, thanks to user:nickmontini for the proposal
  • NEW: you can use any (preferably stepped/categorial) JKQTPMathImageColorPalette as default graph colors list in a style.ini file, by setting auto_styles/use_color_from_palette=PALETTE_NAME
  • 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
    • diff --git a/doc/images/JKQTPCoordinateAxisStyleDrawMode0.png b/doc/images/JKQTPCoordinateAxisStyleDrawMode0.png index 1f6347caa6..547752e1a6 100644 Binary files a/doc/images/JKQTPCoordinateAxisStyleDrawMode0.png and b/doc/images/JKQTPCoordinateAxisStyleDrawMode0.png differ diff --git a/doc/images/JKQTPXYLineGraph.png b/doc/images/JKQTPXYLineGraph.png index 436ffaa5fd..9864e81af5 100644 Binary files a/doc/images/JKQTPXYLineGraph.png and b/doc/images/JKQTPXYLineGraph.png differ diff --git a/doc/images/JKQTPXYLineGraph_small.png b/doc/images/JKQTPXYLineGraph_small.png index 18b23ae9ea..c56ded6474 100644 Binary files a/doc/images/JKQTPXYLineGraph_small.png and b/doc/images/JKQTPXYLineGraph_small.png differ diff --git a/doc/images/JKQTPXYScatterErrorGraph.png b/doc/images/JKQTPXYScatterErrorGraph.png index 6f0fb8a82e..86cfdcd10e 100644 Binary files a/doc/images/JKQTPXYScatterErrorGraph.png and b/doc/images/JKQTPXYScatterErrorGraph.png differ diff --git a/doc/images/JKQTPXYScatterErrorGraph_small.png b/doc/images/JKQTPXYScatterErrorGraph_small.png index fc296329a4..1366e23da0 100644 Binary files a/doc/images/JKQTPXYScatterErrorGraph_small.png and b/doc/images/JKQTPXYScatterErrorGraph_small.png differ diff --git a/doc/images/JKQTPXYScatterGraph.png b/doc/images/JKQTPXYScatterGraph.png index ee58472160..b48f11aff7 100644 Binary files a/doc/images/JKQTPXYScatterGraph.png and b/doc/images/JKQTPXYScatterGraph.png differ diff --git a/doc/images/JKQTPXYScatterGraph_small.png b/doc/images/JKQTPXYScatterGraph_small.png index 8c5051aa43..32bbc01e0d 100644 Binary files a/doc/images/JKQTPXYScatterGraph_small.png and b/doc/images/JKQTPXYScatterGraph_small.png differ diff --git a/doc/images/styles/blackandwhite.ini.png b/doc/images/styles/blackandwhite.ini.png index f3a917cd94..ae079c0b6f 100644 Binary files a/doc/images/styles/blackandwhite.ini.png and b/doc/images/styles/blackandwhite.ini.png differ diff --git a/doc/images/styles/blackandwhite.ini.symbols.png b/doc/images/styles/blackandwhite.ini.symbols.png index 856222d105..453fc6116e 100644 Binary files a/doc/images/styles/blackandwhite.ini.symbols.png and b/doc/images/styles/blackandwhite.ini.symbols.png differ diff --git a/doc/images/styles/blueprint.ini.png b/doc/images/styles/blueprint.ini.png index 90caea1005..dcbb778dad 100644 Binary files a/doc/images/styles/blueprint.ini.png and b/doc/images/styles/blueprint.ini.png differ diff --git a/doc/images/styles/blueprint.ini.symbols.png b/doc/images/styles/blueprint.ini.symbols.png index 5b86623fa0..75353c5081 100644 Binary files a/doc/images/styles/blueprint.ini.symbols.png and b/doc/images/styles/blueprint.ini.symbols.png differ diff --git a/doc/images/styles/cyberpunk.ini.png b/doc/images/styles/cyberpunk.ini.png index cadd6f409b..29cea090a5 100644 Binary files a/doc/images/styles/cyberpunk.ini.png and b/doc/images/styles/cyberpunk.ini.png differ diff --git a/doc/images/styles/cyberpunk.ini.symbols.png b/doc/images/styles/cyberpunk.ini.symbols.png index 3b838339d1..641b0af693 100644 Binary files a/doc/images/styles/cyberpunk.ini.symbols.png and b/doc/images/styles/cyberpunk.ini.symbols.png differ diff --git a/doc/images/styles/dark.ini.png b/doc/images/styles/dark.ini.png index 2189633879..b8ac3c4d71 100644 Binary files a/doc/images/styles/dark.ini.png and b/doc/images/styles/dark.ini.png differ diff --git a/doc/images/styles/dark.ini.symbols.png b/doc/images/styles/dark.ini.symbols.png index 61309bd12a..5dcb6ecefb 100644 Binary files a/doc/images/styles/dark.ini.symbols.png and b/doc/images/styles/dark.ini.symbols.png differ diff --git a/doc/images/styles/default.ini.png b/doc/images/styles/default.ini.png index 48186b66bd..c525428b42 100644 Binary files a/doc/images/styles/default.ini.png and b/doc/images/styles/default.ini.png differ diff --git a/doc/images/styles/default.ini.symbols.png b/doc/images/styles/default.ini.symbols.png index 43dd5bc57c..e55d50fc93 100644 Binary files a/doc/images/styles/default.ini.symbols.png and b/doc/images/styles/default.ini.symbols.png differ diff --git a/doc/images/styles/legacy_default_style.ini.png b/doc/images/styles/legacy_default_style.ini.png index 3fc424c5c5..8fe9702611 100644 Binary files a/doc/images/styles/legacy_default_style.ini.png and b/doc/images/styles/legacy_default_style.ini.png differ diff --git a/doc/images/styles/legacy_default_style.ini.symbols.png b/doc/images/styles/legacy_default_style.ini.symbols.png index 723d0311d1..944fb2fa84 100644 Binary files a/doc/images/styles/legacy_default_style.ini.symbols.png and b/doc/images/styles/legacy_default_style.ini.symbols.png differ diff --git a/doc/images/styles/seaborn.ini.png b/doc/images/styles/seaborn.ini.png index 1ca554b942..82dc3b799e 100644 Binary files a/doc/images/styles/seaborn.ini.png and b/doc/images/styles/seaborn.ini.png differ diff --git a/doc/images/styles/seaborn.ini.symbols.png b/doc/images/styles/seaborn.ini.symbols.png index 3654324ac0..ce22b98379 100644 Binary files a/doc/images/styles/seaborn.ini.symbols.png and b/doc/images/styles/seaborn.ini.symbols.png differ diff --git a/doc/images/styles/simple_arrowsaxes.ini.png b/doc/images/styles/simple_arrowsaxes.ini.png index 2e46601470..681f0231ee 100644 Binary files a/doc/images/styles/simple_arrowsaxes.ini.png and b/doc/images/styles/simple_arrowsaxes.ini.png differ diff --git a/doc/images/styles/simple_arrowsaxes.ini.symbols.png b/doc/images/styles/simple_arrowsaxes.ini.symbols.png index 43dd5bc57c..e55d50fc93 100644 Binary files a/doc/images/styles/simple_arrowsaxes.ini.symbols.png and b/doc/images/styles/simple_arrowsaxes.ini.symbols.png differ diff --git a/doc/images/styles/simple_axesoffset.ini.png b/doc/images/styles/simple_axesoffset.ini.png index 89b0719524..9da8abdc03 100644 Binary files a/doc/images/styles/simple_axesoffset.ini.png and b/doc/images/styles/simple_axesoffset.ini.png differ diff --git a/doc/images/styles/simple_axesoffset.ini.symbols.png b/doc/images/styles/simple_axesoffset.ini.symbols.png index 43dd5bc57c..e55d50fc93 100644 Binary files a/doc/images/styles/simple_axesoffset.ini.symbols.png and b/doc/images/styles/simple_axesoffset.ini.symbols.png differ diff --git a/doc/images/styles/simple_axesoffset_plotbox.ini.png b/doc/images/styles/simple_axesoffset_plotbox.ini.png index d90aca9b0d..13fd852df3 100644 Binary files a/doc/images/styles/simple_axesoffset_plotbox.ini.png and b/doc/images/styles/simple_axesoffset_plotbox.ini.png differ diff --git a/doc/images/styles/simple_axesoffset_plotbox.ini.symbols.png b/doc/images/styles/simple_axesoffset_plotbox.ini.symbols.png index 43dd5bc57c..e55d50fc93 100644 Binary files a/doc/images/styles/simple_axesoffset_plotbox.ini.symbols.png and b/doc/images/styles/simple_axesoffset_plotbox.ini.symbols.png differ diff --git a/doc/images/styles/simple_gridandticks.ini.png b/doc/images/styles/simple_gridandticks.ini.png index bf2b11f73c..593f4e8de1 100644 Binary files a/doc/images/styles/simple_gridandticks.ini.png and b/doc/images/styles/simple_gridandticks.ini.png differ diff --git a/doc/images/styles/simple_gridandticks.ini.symbols.png b/doc/images/styles/simple_gridandticks.ini.symbols.png index 43dd5bc57c..e55d50fc93 100644 Binary files a/doc/images/styles/simple_gridandticks.ini.symbols.png and b/doc/images/styles/simple_gridandticks.ini.symbols.png differ diff --git a/lib/jkqtplotter/jkqtpbaseplotter.cpp b/lib/jkqtplotter/jkqtpbaseplotter.cpp index 6f31ef016a..c974d05f87 100644 --- a/lib/jkqtplotter/jkqtpbaseplotter.cpp +++ b/lib/jkqtplotter/jkqtpbaseplotter.cpp @@ -821,7 +821,7 @@ void JKQTBasePlotter::calcPlotScaling(JKQTPEnhancedPainter& painter){ if (!plotLabel.isEmpty()) { QSizeF s=getTextSizeSize(plotterStyle.plotLabelFontName, plotterStyle.plotLabelFontSize*fontSizeMultiplier, plotLabel, painter); - internalTitleHeight=s.height()+2.0*pt2px(painter, plotterStyle.plotLabelOffset); + internalTitleHeight=s.height()+pt2px(painter, plotterStyle.plotLabelOffset)+pt2px(painter, plotterStyle.plotLabelTopBorder); internalPlotBorderTop+=internalTitleHeight; } @@ -1378,7 +1378,7 @@ void JKQTBasePlotter::drawPlot(JKQTPEnhancedPainter& painter) { double a=0,d=0,so=0,w=0; getTextSizeDetail(plotterStyle.plotLabelFontName,plotterStyle.plotLabelFontSize*fontSizeMultiplier,plotLabel, painter, w, a, d, so); QSizeF s=QSizeF(w, a+d); - mathText.draw(painter, internalPlotBorderLeft+(internalPlotWidth-s.width())/2.0,plotterStyle.plotBorderTop+a+pt2px(painter, plotterStyle.plotLabelOffset), plotterStyle.debugShowTextBoxes); + mathText.draw(painter, internalPlotBorderLeft+(internalPlotWidth-s.width())/2.0,plotterStyle.plotBorderTop+a+pt2px(painter, plotterStyle.plotLabelTopBorder), plotterStyle.debugShowTextBoxes); if (plotterStyle.debugShowRegionBoxes) { painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();}); QPen p("blue"); @@ -3011,6 +3011,20 @@ double JKQTBasePlotter::getPlotLabelOffset() const { return this->plotterStyle.plotLabelOffset; } + +void JKQTBasePlotter::setPlotLabelTopBorder(double __value) +{ + if (jkqtp_approximatelyUnequal(this->plotterStyle.plotLabelTopBorder , __value)) { + this->plotterStyle.plotLabelTopBorder = __value; + redrawPlot(); + } +} + +double JKQTBasePlotter::getPlotLabelTopBorder() const +{ + return this->plotterStyle.plotLabelTopBorder; +} + void JKQTBasePlotter::setPlotLabelColor(QColor __value) { if (this->plotterStyle.plotLabelColor != __value) { diff --git a/lib/jkqtplotter/jkqtpbaseplotter.h b/lib/jkqtplotter/jkqtpbaseplotter.h index d704e590fa..9a66785dd7 100644 --- a/lib/jkqtplotter/jkqtpbaseplotter.h +++ b/lib/jkqtplotter/jkqtpbaseplotter.h @@ -1139,6 +1139,8 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject { double getPlotLabelFontSize() const; /** \copydoc JKQTBasePlotterStyle::plotLabelOffset */ double getPlotLabelOffset() const; + /** \copydoc JKQTBasePlotterStyle::plotLabelTopBorder */ + double getPlotLabelTopBorder() const; /** \copydoc JKQTBasePlotterStyle::plotLabelFontName */ QString getplotLabelFontName() const; /** \copydoc JKQTBasePlotterStyle::plotLabelColor */ @@ -2017,6 +2019,8 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject { void setPlotLabelFontSize(double __value); /** \copydoc JKQTBasePlotterStyle::plotLabelOffset */ void setPlotLabelOffset(double __value); + /** \copydoc JKQTBasePlotterStyle::plotLabelTopBorder */ + void setPlotLabelTopBorder(double __value); /** \copydoc JKQTBasePlotterStyle::plotLabelFontName */ void setplotLabelFontName(const QString & __value); /** \copydoc JKQTBasePlotterStyle::plotLabelColor */ diff --git a/lib/jkqtplotter/jkqtpbaseplotterstyle.cpp b/lib/jkqtplotter/jkqtpbaseplotterstyle.cpp index 534855bcc7..e66e055c6d 100644 --- a/lib/jkqtplotter/jkqtpbaseplotterstyle.cpp +++ b/lib/jkqtplotter/jkqtpbaseplotterstyle.cpp @@ -21,9 +21,10 @@ JKQTBasePlotterStyle::JKQTBasePlotterStyle(): plotFrameWidth(1), plotFrameRounding(0), plotFrameVisible(false), - plotLabelFontName("GUI"), - plotLabelFontSize(qCeil(QApplication::font().pointSizeF()*1.2)), + plotLabelFontName("GUI+BOLD"), + plotLabelFontSize(qCeil(QApplication::font().pointSizeF()*1.5)), plotLabelOffset(qCeil(QApplication::font().pointSizeF()*0.4)), + plotLabelTopBorder(qCeil(QApplication::font().pointSizeF()*0.25)), useAntiAliasingForSystem(true), useAntiAliasingForText(true), defaultTextColor(QColor("black")), @@ -54,6 +55,7 @@ void JKQTBasePlotterStyle::loadSettings(const QSettings &settings, const QString plotLabelFontName=settings.value(group+"plot_label_font_name", defaultStyle.plotLabelFontName).toString(); plotLabelFontSize=settings.value(group+"plot_label_font_size", defaultStyle.plotLabelFontSize).toDouble(); plotLabelOffset=settings.value(group+"plot_label_offset", defaultStyle.plotLabelOffset).toDouble(); + plotLabelTopBorder=settings.value(group+"plot_label_top_border", defaultStyle.plotLabelTopBorder).toDouble(); plotLabelColor=jkqtp_String2QColor(settings.value(group+"plot_label_color", jkqtp_QColor2String(defaultStyle.plotLabelColor)).toString()); widgetBackgroundBrush=QBrush(jkqtp_String2QColor(settings.value(group+"widget_background_color", jkqtp_QColor2String(defaultStyle.widgetBackgroundBrush.color())).toString())); exportBackgroundBrush=QBrush(jkqtp_String2QColor(settings.value(group+"widget_background_color_for_export", jkqtp_QColor2String(defaultStyle.exportBackgroundBrush.color())).toString())); @@ -103,6 +105,7 @@ void JKQTBasePlotterStyle::saveSettings(QSettings &settings, const QString &grou settings.setValue(group+"plot_label_font_name", plotLabelFontName); settings.setValue(group+"plot_label_font_size", plotLabelFontSize); settings.setValue(group+"plot_label_offset", plotLabelOffset); + settings.setValue(group+"plot_label_top_border", plotLabelTopBorder); settings.setValue(group+"plot_label_color", jkqtp_QColor2String(plotLabelColor)); settings.setValue(group+"plot_frame_visible", plotFrameVisible); settings.setValue(group+"plot_frame_color", jkqtp_QColor2String(plotFrameColor)); diff --git a/lib/jkqtplotter/jkqtpbaseplotterstyle.h b/lib/jkqtplotter/jkqtpbaseplotterstyle.h index 7f20ac16cb..3785d373ed 100644 --- a/lib/jkqtplotter/jkqtpbaseplotterstyle.h +++ b/lib/jkqtplotter/jkqtpbaseplotterstyle.h @@ -141,8 +141,10 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotterStyle { double plotLabelFontSize; /** \brief the plot label color */ QColor plotLabelColor; - /** \brief offset of the plot label from the next element [pt]. This offset is added below AND above the plot label! */ + /** \brief offset of the plot label from the next element of the graph, i.e. below the label [pt]. \see plotLabelTopBorder for spacing above */ double plotLabelOffset; + /** \brief offset of the plot label from the top [pt]. \see plotLabelOffset for spacing between label and graph */ + double plotLabelTopBorder; /** \brief specifies whether to use antialiasing for plotting the coordinate system */ bool useAntiAliasingForSystem; /** \brief specifies whether to use antialiasing when drawing any text diff --git a/lib/jkqtplotter/resources/styles/default.ini b/lib/jkqtplotter/resources/styles/default.ini index bed37cc30f..a9fe5cf2d8 100644 --- a/lib/jkqtplotter/resources/styles/default.ini +++ b/lib/jkqtplotter/resources/styles/default.ini @@ -56,8 +56,10 @@ plot_border_bottom=5 text_default_color=black text_default_size=9 text_default_font_name=GUI -plot_label_font_name=GUI -plot_label_font_size=11 +plot_label_font_name=GUI+BOLD +plot_label_font_size=14 +plot_label_offset=4 +plot_label_top_border=3 plot_label_color=black plot_frame_visible=false plot_frame_color=black diff --git a/screenshots/datastore_groupedstat.png b/screenshots/datastore_groupedstat.png index 38671ad232..b6203e952f 100644 Binary files a/screenshots/datastore_groupedstat.png and b/screenshots/datastore_groupedstat.png differ diff --git a/screenshots/datastore_groupedstat_barchart.png b/screenshots/datastore_groupedstat_barchart.png index 68417409ac..0e0514faf3 100644 Binary files a/screenshots/datastore_groupedstat_barchart.png and b/screenshots/datastore_groupedstat_barchart.png differ diff --git a/screenshots/datastore_groupedstat_barchartrawdata.png b/screenshots/datastore_groupedstat_barchartrawdata.png index 86051b5dc9..57bbd660be 100644 Binary files a/screenshots/datastore_groupedstat_barchartrawdata.png and b/screenshots/datastore_groupedstat_barchartrawdata.png differ diff --git a/screenshots/datastore_groupedstat_boxplot.png b/screenshots/datastore_groupedstat_boxplot.png index 6a611c8e88..143a731fbf 100644 Binary files a/screenshots/datastore_groupedstat_boxplot.png and b/screenshots/datastore_groupedstat_boxplot.png differ diff --git a/screenshots/datastore_groupedstat_scatter.png b/screenshots/datastore_groupedstat_scatter.png index b68555136f..19739356e8 100644 Binary files a/screenshots/datastore_groupedstat_scatter.png and b/screenshots/datastore_groupedstat_scatter.png differ diff --git a/screenshots/datastore_groupedstat_scatterrawdata.png b/screenshots/datastore_groupedstat_scatterrawdata.png index 654ec7e94b..fe8ce03fcc 100644 Binary files a/screenshots/datastore_groupedstat_scatterrawdata.png and b/screenshots/datastore_groupedstat_scatterrawdata.png differ diff --git a/screenshots/datastore_groupedstat_small.png b/screenshots/datastore_groupedstat_small.png index a47e1284a7..c4189700c0 100644 Binary files a/screenshots/datastore_groupedstat_small.png and b/screenshots/datastore_groupedstat_small.png differ diff --git a/screenshots/datastore_regression.png b/screenshots/datastore_regression.png index eb504df9fb..b40623a97a 100644 Binary files a/screenshots/datastore_regression.png and b/screenshots/datastore_regression.png differ diff --git a/screenshots/datastore_regression_lin.png b/screenshots/datastore_regression_lin.png index f8ae4a463a..3ba6421e08 100644 Binary files a/screenshots/datastore_regression_lin.png and b/screenshots/datastore_regression_lin.png differ diff --git a/screenshots/datastore_regression_linrobust.png b/screenshots/datastore_regression_linrobust.png index 0cbd5973a5..9fe5b56e8b 100644 Binary files a/screenshots/datastore_regression_linrobust.png and b/screenshots/datastore_regression_linrobust.png differ diff --git a/screenshots/datastore_regression_linrobust_p.png b/screenshots/datastore_regression_linrobust_p.png index 6393916ee1..2c7d78d356 100644 Binary files a/screenshots/datastore_regression_linrobust_p.png and b/screenshots/datastore_regression_linrobust_p.png differ diff --git a/screenshots/datastore_regression_linweight.png b/screenshots/datastore_regression_linweight.png index c1c6d004e2..291318457d 100644 Binary files a/screenshots/datastore_regression_linweight.png and b/screenshots/datastore_regression_linweight.png differ diff --git a/screenshots/datastore_regression_nonlinreg_exp.png b/screenshots/datastore_regression_nonlinreg_exp.png index 3cf6cebf59..d9551ca064 100644 Binary files a/screenshots/datastore_regression_nonlinreg_exp.png and b/screenshots/datastore_regression_nonlinreg_exp.png differ diff --git a/screenshots/datastore_regression_nonlinreg_pow.png b/screenshots/datastore_regression_nonlinreg_pow.png index 018bc58091..cdf5ccabab 100644 Binary files a/screenshots/datastore_regression_nonlinreg_pow.png and b/screenshots/datastore_regression_nonlinreg_pow.png differ diff --git a/screenshots/datastore_regression_polynom.png b/screenshots/datastore_regression_polynom.png index 0057e914d4..8ed3ec2676 100644 Binary files a/screenshots/datastore_regression_polynom.png and b/screenshots/datastore_regression_polynom.png differ diff --git a/screenshots/datastore_regression_polynom_errros.png b/screenshots/datastore_regression_polynom_errros.png index 5273d4957b..15eb286127 100644 Binary files a/screenshots/datastore_regression_polynom_errros.png and b/screenshots/datastore_regression_polynom_errros.png differ diff --git a/screenshots/datastore_regression_small.png b/screenshots/datastore_regression_small.png index 9025531bc9..8b0fc5f4ff 100644 Binary files a/screenshots/datastore_regression_small.png and b/screenshots/datastore_regression_small.png differ diff --git a/screenshots/datastore_statistics.png b/screenshots/datastore_statistics.png index 49bc7b7450..ab013474ce 100644 Binary files a/screenshots/datastore_statistics.png and b/screenshots/datastore_statistics.png differ diff --git a/screenshots/datastore_statistics_2d.png b/screenshots/datastore_statistics_2d.png index 3b4cbbaa9a..23bf29b1b9 100644 Binary files a/screenshots/datastore_statistics_2d.png and b/screenshots/datastore_statistics_2d.png differ diff --git a/screenshots/datastore_statistics_2d_small.png b/screenshots/datastore_statistics_2d_small.png index 38bebd730e..94981e7a07 100644 Binary files a/screenshots/datastore_statistics_2d_small.png and b/screenshots/datastore_statistics_2d_small.png differ diff --git a/screenshots/datastore_statistics_boxplots_outliers.png b/screenshots/datastore_statistics_boxplots_outliers.png index 4a6f6a2ae9..01fb0d5365 100644 Binary files a/screenshots/datastore_statistics_boxplots_outliers.png and b/screenshots/datastore_statistics_boxplots_outliers.png differ diff --git a/screenshots/datastore_statistics_boxplots_simple.png b/screenshots/datastore_statistics_boxplots_simple.png index f504af5218..cf70f4dff8 100644 Binary files a/screenshots/datastore_statistics_boxplots_simple.png and b/screenshots/datastore_statistics_boxplots_simple.png differ diff --git a/screenshots/datastore_statistics_cumhistkde.png b/screenshots/datastore_statistics_cumhistkde.png index 1efd8f7f8e..bd7a56a780 100644 Binary files a/screenshots/datastore_statistics_cumhistkde.png and b/screenshots/datastore_statistics_cumhistkde.png differ diff --git a/screenshots/datastore_statistics_dataonly.png b/screenshots/datastore_statistics_dataonly.png index c2e23d6915..399ea34c1e 100644 Binary files a/screenshots/datastore_statistics_dataonly.png and b/screenshots/datastore_statistics_dataonly.png differ diff --git a/screenshots/datastore_statistics_hist.png b/screenshots/datastore_statistics_hist.png index 4e0eb602d0..5d696863c5 100644 Binary files a/screenshots/datastore_statistics_hist.png and b/screenshots/datastore_statistics_hist.png differ diff --git a/screenshots/datastore_statistics_kde.png b/screenshots/datastore_statistics_kde.png index 34ac69abba..1a8c1654f9 100644 Binary files a/screenshots/datastore_statistics_kde.png and b/screenshots/datastore_statistics_kde.png differ diff --git a/screenshots/datastore_statistics_small.png b/screenshots/datastore_statistics_small.png index e4d9d4d609..654bb6d112 100644 Binary files a/screenshots/datastore_statistics_small.png and b/screenshots/datastore_statistics_small.png differ diff --git a/screenshots/dateaxes.png b/screenshots/dateaxes.png index ede11ef433..b81f90f640 100644 Binary files a/screenshots/dateaxes.png and b/screenshots/dateaxes.png differ diff --git a/screenshots/dateaxes_small.png b/screenshots/dateaxes_small.png index 192aa8551d..782b2a1db6 100644 Binary files a/screenshots/dateaxes_small.png and b/screenshots/dateaxes_small.png differ diff --git a/screenshots/dateaxes_timeaxis.png b/screenshots/dateaxes_timeaxis.png index 67e20f5f51..ee6f7ffb67 100644 Binary files a/screenshots/dateaxes_timeaxis.png and b/screenshots/dateaxes_timeaxis.png differ diff --git a/screenshots/dateaxes_timeaxis_small.png b/screenshots/dateaxes_timeaxis_small.png index e5c831f0b7..7dac7c161b 100644 Binary files a/screenshots/dateaxes_timeaxis_small.png and b/screenshots/dateaxes_timeaxis_small.png differ diff --git a/screenshots/geo_coordinateaxis0.png b/screenshots/geo_coordinateaxis0.png index 7dd165f3c4..f0c90855da 100644 Binary files a/screenshots/geo_coordinateaxis0.png and b/screenshots/geo_coordinateaxis0.png differ diff --git a/screenshots/geo_coordinateaxis0_small.png b/screenshots/geo_coordinateaxis0_small.png index 72061bb7aa..0665198c58 100644 Binary files a/screenshots/geo_coordinateaxis0_small.png and b/screenshots/geo_coordinateaxis0_small.png differ diff --git a/screenshots/mandelbrot.png b/screenshots/mandelbrot.png index 1f5de189bd..d857fcbcbb 100644 Binary files a/screenshots/mandelbrot.png and b/screenshots/mandelbrot.png differ diff --git a/screenshots/mandelbrot_small.png b/screenshots/mandelbrot_small.png index 0df80dc528..f7e05ad4bf 100644 Binary files a/screenshots/mandelbrot_small.png and b/screenshots/mandelbrot_small.png differ diff --git a/screenshots/multiplot_controlwindow.png b/screenshots/multiplot_controlwindow.png index 1b765b284c..b1c1d1251b 100644 Binary files a/screenshots/multiplot_controlwindow.png and b/screenshots/multiplot_controlwindow.png differ diff --git a/screenshots/multiplot_controlwindow_small.png b/screenshots/multiplot_controlwindow_small.png index ec939456de..0edfd9d63b 100644 Binary files a/screenshots/multiplot_controlwindow_small.png and b/screenshots/multiplot_controlwindow_small.png differ diff --git a/screenshots/paramscatterplot_customsymbol.png b/screenshots/paramscatterplot_customsymbol.png index 8612623914..ccdf03505b 100644 Binary files a/screenshots/paramscatterplot_customsymbol.png and b/screenshots/paramscatterplot_customsymbol.png differ diff --git a/screenshots/paramscatterplot_customsymbol_small.png b/screenshots/paramscatterplot_customsymbol_small.png index 8874468cdc..18388e2f83 100644 Binary files a/screenshots/paramscatterplot_customsymbol_small.png and b/screenshots/paramscatterplot_customsymbol_small.png differ diff --git a/screenshots/parsedfunctionplot.png b/screenshots/parsedfunctionplot.png index d4eaa30fa6..2638eecb8a 100644 Binary files a/screenshots/parsedfunctionplot.png and b/screenshots/parsedfunctionplot.png differ diff --git a/screenshots/parsedfunctionplot_small.png b/screenshots/parsedfunctionplot_small.png index cb20b101e6..849e6bcfaf 100644 Binary files a/screenshots/parsedfunctionplot_small.png and b/screenshots/parsedfunctionplot_small.png differ diff --git a/screenshots/scatter.png b/screenshots/scatter.png index 76ff0eebb1..48294b3481 100644 Binary files a/screenshots/scatter.png and b/screenshots/scatter.png differ diff --git a/screenshots/scatter_customsymbol.png b/screenshots/scatter_customsymbol.png index 45289c4602..be0b70428e 100644 Binary files a/screenshots/scatter_customsymbol.png and b/screenshots/scatter_customsymbol.png differ diff --git a/screenshots/scatter_customsymbol_small.png b/screenshots/scatter_customsymbol_small.png index 8c3fd7971f..583382b499 100644 Binary files a/screenshots/scatter_customsymbol_small.png and b/screenshots/scatter_customsymbol_small.png differ diff --git a/screenshots/scatter_error.png b/screenshots/scatter_error.png index b15150ef1b..ee04d61ce7 100644 Binary files a/screenshots/scatter_error.png and b/screenshots/scatter_error.png differ diff --git a/screenshots/scatter_error_small.png b/screenshots/scatter_error_small.png index fc296329a4..1366e23da0 100644 Binary files a/screenshots/scatter_error_small.png and b/screenshots/scatter_error_small.png differ diff --git a/screenshots/scatter_small.png b/screenshots/scatter_small.png index 8c5051aa43..32bbc01e0d 100644 Binary files a/screenshots/scatter_small.png and b/screenshots/scatter_small.png differ diff --git a/screenshots/simpletest.png b/screenshots/simpletest.png index 04aa617830..4bfed9e5bc 100644 Binary files a/screenshots/simpletest.png and b/screenshots/simpletest.png differ diff --git a/screenshots/simpletest_small.png b/screenshots/simpletest_small.png index 18b23ae9ea..c56ded6474 100644 Binary files a/screenshots/simpletest_small.png and b/screenshots/simpletest_small.png differ