mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2024-12-25 01:51:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

regained compatibility with pre 5.11 QT-Versions

Browse Source
This commit is contained in:
jkriege2 2020-08-15 09:16:15 +02:00
parent 755165d999
commit 139b0f5841
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/jkqtfastplotter/jkqtfastplotter.cpp
View File

@ -1447,7 +1447,11 @@ void JKQTFPQScaleBarXPlot::drawGraph(QPainter& painter) {
painter.drawLine(QLineF(xx1, yy1, xx2, yy2)); painter.drawLine(QLineF(xx1, yy1, xx2, yy2));
painter.setFont(font); painter.setFont(font);
QFontMetrics fm=painter.fontMetrics(); QFontMetrics fm=painter.fontMetrics();
#if QT_VERSION >= QT_VERSION_CHECK(5,11,0)
painter.drawText(static_cast<int>(xx1+(xx2-xx1)/2-fm.horizontalAdvance(s)/2), static_cast<int>(yy1+3*lineWidth+fm.ascent()), s); painter.drawText(static_cast<int>(xx1+(xx2-xx1)/2-fm.horizontalAdvance(s)/2), static_cast<int>(yy1+3*lineWidth+fm.ascent()), s);
#else
painter.drawText(static_cast<int>(xx1+(xx2-xx1)/2-fm.width(s)/2), static_cast<int>(yy1+3*lineWidth+fm.ascent()), s);
#endif
} else if (position==JKQTFPQScaleBarXPlot::TopLeft) { } else if (position==JKQTFPQScaleBarXPlot::TopLeft) {
yy1=parent->getInternalPlotBorderTop()+yDistance; yy1=parent->getInternalPlotBorderTop()+yDistance;
yy2=yy1; yy2=yy1;
@ -1458,7 +1462,11 @@ void JKQTFPQScaleBarXPlot::drawGraph(QPainter& painter) {
painter.drawLine(QLineF(xx1, yy1, xx2, yy2)); painter.drawLine(QLineF(xx1, yy1, xx2, yy2));
painter.setFont(font); painter.setFont(font);
QFontMetrics fm=painter.fontMetrics(); QFontMetrics fm=painter.fontMetrics();
#if QT_VERSION >= QT_VERSION_CHECK(5,11,0)
painter.drawText(static_cast<int>(xx1+(xx2-xx1)/2-fm.horizontalAdvance(s)/2), static_cast<int>(yy1+3*lineWidth+fm.ascent()), s); painter.drawText(static_cast<int>(xx1+(xx2-xx1)/2-fm.horizontalAdvance(s)/2), static_cast<int>(yy1+3*lineWidth+fm.ascent()), s);
#else
painter.drawText(static_cast<int>(xx1+(xx2-xx1)/2-fm.width(s)/2), static_cast<int>(yy1+3*lineWidth+fm.ascent()), s);
#endif
} else if (position==JKQTFPQScaleBarXPlot::BottomLeft) { } else if (position==JKQTFPQScaleBarXPlot::BottomLeft) {
yy1=parent->getInternalPlotBorderTop()+parent->getPlotHeight()-yDistance; yy1=parent->getInternalPlotBorderTop()+parent->getPlotHeight()-yDistance;
yy2=yy1; yy2=yy1;
@ -1469,7 +1477,11 @@ void JKQTFPQScaleBarXPlot::drawGraph(QPainter& painter) {
painter.drawLine(QLineF(xx1, yy1, xx2, yy2)); painter.drawLine(QLineF(xx1, yy1, xx2, yy2));
painter.setFont(font); painter.setFont(font);
QFontMetrics fm=painter.fontMetrics(); QFontMetrics fm=painter.fontMetrics();
#if QT_VERSION >= QT_VERSION_CHECK(5,11,0)
painter.drawText(static_cast<int>(xx1+(xx2-xx1)/2-fm.horizontalAdvance(s)/2), static_cast<int>(yy1-3*lineWidth-fm.descent()), s); painter.drawText(static_cast<int>(xx1+(xx2-xx1)/2-fm.horizontalAdvance(s)/2), static_cast<int>(yy1-3*lineWidth-fm.descent()), s);
#else
painter.drawText(static_cast<int>(xx1+(xx2-xx1)/2-fm.width(s)/2), static_cast<int>(yy1-3*lineWidth-fm.descent()), s);
#endif
} else if (position==JKQTFPQScaleBarXPlot::BottomRight) { } else if (position==JKQTFPQScaleBarXPlot::BottomRight) {
yy1=parent->getInternalPlotBorderTop()+parent->getPlotHeight()-yDistance; yy1=parent->getInternalPlotBorderTop()+parent->getPlotHeight()-yDistance;
yy2=yy1; yy2=yy1;
@ -1480,7 +1492,11 @@ void JKQTFPQScaleBarXPlot::drawGraph(QPainter& painter) {
painter.drawLine(QLineF(xx1, yy1, xx2, yy2)); painter.drawLine(QLineF(xx1, yy1, xx2, yy2));
painter.setFont(font); painter.setFont(font);
QFontMetrics fm=painter.fontMetrics(); QFontMetrics fm=painter.fontMetrics();
#if QT_VERSION >= QT_VERSION_CHECK(5,11,0)
painter.drawText(static_cast<int>(xx1+(xx2-xx1)/2-fm.horizontalAdvance(s)/2), static_cast<int>(yy1-3*lineWidth-fm.descent()), s); painter.drawText(static_cast<int>(xx1+(xx2-xx1)/2-fm.horizontalAdvance(s)/2), static_cast<int>(yy1-3*lineWidth-fm.descent()), s);
#else
painter.drawText(static_cast<int>(xx1+(xx2-xx1)/2-fm.width(s)/2), static_cast<int>(yy1-3*lineWidth-fm.descent()), s);
#endif
} }