FIXED/NEW: placement of plot-title (was not centerd in its box, but glued to the bottom) by adding a plotstyle parameter JKQTBasePlotterStyle::plotLabelOffset
@ -39,6 +39,7 @@ 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>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>
|
||||
<li>IMPROVED: added missing override declarations</li>
|
||||
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 46 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 6.5 KiB After Width: | Height: | Size: 6.5 KiB |
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 9.4 KiB After Width: | Height: | Size: 9.3 KiB |
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 139 KiB After Width: | Height: | Size: 135 KiB |
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 31 KiB |
Before Width: | Height: | Size: 142 KiB After Width: | Height: | Size: 134 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 154 KiB After Width: | Height: | Size: 146 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 146 KiB After Width: | Height: | Size: 137 KiB |
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 150 KiB After Width: | Height: | Size: 143 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 138 KiB After Width: | Height: | Size: 137 KiB |
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 108 KiB After Width: | Height: | Size: 106 KiB |
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 152 KiB After Width: | Height: | Size: 148 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 138 KiB After Width: | Height: | Size: 131 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 141 KiB After Width: | Height: | Size: 133 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 145 KiB After Width: | Height: | Size: 139 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
@ -821,8 +821,8 @@ void JKQTBasePlotter::calcPlotScaling(JKQTPEnhancedPainter& painter){
|
||||
|
||||
if (!plotLabel.isEmpty()) {
|
||||
QSizeF s=getTextSizeSize(plotterStyle.plotLabelFontName, plotterStyle.plotLabelFontSize*fontSizeMultiplier, plotLabel, painter);
|
||||
internalPlotBorderTop+=s.height()*1.2;
|
||||
internalTitleHeight=s.height()*1.2;
|
||||
internalTitleHeight=s.height()+2.0*pt2px(painter, plotterStyle.plotLabelOffset);
|
||||
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*1.2, plotterStyle.debugShowTextBoxes);
|
||||
mathText.draw(painter, internalPlotBorderLeft+(internalPlotWidth-s.width())/2.0,plotterStyle.plotBorderTop+a+pt2px(painter, plotterStyle.plotLabelOffset), plotterStyle.debugShowTextBoxes);
|
||||
if (plotterStyle.debugShowRegionBoxes) {
|
||||
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
|
||||
QPen p("blue");
|
||||
@ -2999,6 +2999,18 @@ double JKQTBasePlotter::getPlotLabelFontSize() const
|
||||
return this->plotterStyle.plotLabelFontSize;
|
||||
}
|
||||
|
||||
void JKQTBasePlotter::setPlotLabelOffset(double __value)
|
||||
{
|
||||
if (jkqtp_approximatelyUnequal(this->plotterStyle.plotLabelOffset , __value)) {
|
||||
this->plotterStyle.plotLabelOffset = __value;
|
||||
redrawPlot();
|
||||
}
|
||||
}
|
||||
|
||||
double JKQTBasePlotter::getPlotLabelOffset() const
|
||||
{
|
||||
return this->plotterStyle.plotLabelOffset;
|
||||
}
|
||||
void JKQTBasePlotter::setPlotLabelColor(QColor __value)
|
||||
{
|
||||
if (this->plotterStyle.plotLabelColor != __value) {
|
||||
|
@ -1137,6 +1137,8 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject {
|
||||
|
||||
/** \copydoc JKQTBasePlotterStyle::plotLabelFontSize */
|
||||
double getPlotLabelFontSize() const;
|
||||
/** \copydoc JKQTBasePlotterStyle::plotLabelOffset */
|
||||
double getPlotLabelOffset() const;
|
||||
/** \copydoc JKQTBasePlotterStyle::plotLabelFontName */
|
||||
QString getplotLabelFontName() const;
|
||||
/** \copydoc JKQTBasePlotterStyle::plotLabelColor */
|
||||
@ -2013,6 +2015,8 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject {
|
||||
void setKeyLayout(const JKQTPKeyLayout & __value);
|
||||
/** \copydoc JKQTBasePlotterStyle::plotLabelFontSize */
|
||||
void setPlotLabelFontSize(double __value);
|
||||
/** \copydoc JKQTBasePlotterStyle::plotLabelOffset */
|
||||
void setPlotLabelOffset(double __value);
|
||||
/** \copydoc JKQTBasePlotterStyle::plotLabelFontName */
|
||||
void setplotLabelFontName(const QString & __value);
|
||||
/** \copydoc JKQTBasePlotterStyle::plotLabelColor */
|
||||
|
@ -23,6 +23,7 @@ JKQTBasePlotterStyle::JKQTBasePlotterStyle():
|
||||
plotFrameVisible(false),
|
||||
plotLabelFontName("GUI"),
|
||||
plotLabelFontSize(qCeil(QApplication::font().pointSizeF()*1.2)),
|
||||
plotLabelOffset(qCeil(QApplication::font().pointSizeF()*0.4)),
|
||||
useAntiAliasingForSystem(true),
|
||||
useAntiAliasingForText(true),
|
||||
defaultTextColor(QColor("black")),
|
||||
@ -52,6 +53,7 @@ void JKQTBasePlotterStyle::loadSettings(const QSettings &settings, const QString
|
||||
debugTextBoxLineWidth=settings.value(group+"debug_textbox_linewidth", defaultStyle.debugTextBoxLineWidth).toDouble();
|
||||
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();
|
||||
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()));
|
||||
@ -100,6 +102,7 @@ void JKQTBasePlotterStyle::saveSettings(QSettings &settings, const QString &grou
|
||||
settings.setValue(group+"text_default_font_name", defaultFontName);
|
||||
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_color", jkqtp_QColor2String(plotLabelColor));
|
||||
settings.setValue(group+"plot_frame_visible", plotFrameVisible);
|
||||
settings.setValue(group+"plot_frame_color", jkqtp_QColor2String(plotFrameColor));
|
||||
|
@ -141,6 +141,8 @@ 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! */
|
||||
double plotLabelOffset;
|
||||
/** \brief specifies whether to use antialiasing for plotting the coordinate system */
|
||||
bool useAntiAliasingForSystem;
|
||||
/** \brief specifies whether to use antialiasing when drawing any text
|
||||
|
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 8.9 KiB After Width: | Height: | Size: 8.5 KiB |
Before Width: | Height: | Size: 7.7 KiB After Width: | Height: | Size: 7.3 KiB |
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 201 KiB After Width: | Height: | Size: 190 KiB |
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 53 KiB |
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 34 KiB |
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 50 KiB |
Before Width: | Height: | Size: 57 KiB After Width: | Height: | Size: 58 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 120 KiB After Width: | Height: | Size: 119 KiB |
Before Width: | Height: | Size: 122 KiB After Width: | Height: | Size: 121 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 31 KiB |
Before Width: | Height: | Size: 56 KiB After Width: | Height: | Size: 56 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 9.2 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 6.1 KiB |
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 6.3 KiB |
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 40 KiB |
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 33 KiB |
Before Width: | Height: | Size: 9.3 KiB After Width: | Height: | Size: 9.4 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
Before Width: | Height: | Size: 6.5 KiB After Width: | Height: | Size: 6.5 KiB |
Before Width: | Height: | Size: 9.4 KiB After Width: | Height: | Size: 9.3 KiB |
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |