mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 11:55:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

CustomPlot: Fix build for Qt 6.0

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2020-08-14 16:46:55 +03:00
parent fa8185e5f9
commit 22681688ee
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/3rdparty/qcustomplot/qcustomplot.cpp vendored
View File

@ -15330,7 +15330,7 @@ void QCustomPlot::processRectSelection(QRect rect, QMouseEvent *event)
if (!potentialSelections.isEmpty()) if (!potentialSelections.isEmpty())
{ {
auto it = potentialSelections.begin(); auto it = potentialSelections.begin();
auto last = --potentialSelections.end(); const auto last = std::prev(potentialSelections.end());
while (it != last) // erase all except last element while (it != last) // erase all except last element
it = potentialSelections.erase(it); it = potentialSelections.erase(it);
} }
@ -16337,7 +16337,7 @@ void QCPColorGradient::updateColorBuffer()
} else // position is in between stops (or on an intermediate stop), interpolate color } else // position is in between stops (or on an intermediate stop), interpolate color
{ {
QMap<double, QColor>::const_iterator high = it; QMap<double, QColor>::const_iterator high = it;
QMap<double, QColor>::const_iterator low = --it; QMap<double, QColor>::const_iterator low = std::prev(it);
double t = (position-low.key())/(high.key()-low.key()); // interpolation factor 0..1 double t = (position-low.key())/(high.key()-low.key()); // interpolation factor 0..1
switch (mColorInterpolation) switch (mColorInterpolation)
{ {