t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to newest version of QCustomPlot (2.1.1)

Browse Source
This commit is contained in:
Collin Kidder
2023-02-14 20:23:45 -05:00
parent 329f1162ac
commit 4fa638a2f3
2 changed files with 244 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qcustomplot.cpp
+115 -87
View File
@@ -1,7 +1,7 @@
/***************************************************************************
** **
** QCustomPlot, an easy to use, modern plotting widget for Qt **
** Copyright (C) 2011-2021 Emanuel Eichhammer **
** Copyright (C) 2011-2022 Emanuel Eichhammer **
** **
** This program is free software: you can redistribute it and/or modify **
** it under the terms of the GNU General Public License as published by **
@@ -18,16 +18,16 @@
** **
****************************************************************************
** Author: Emanuel Eichhammer **
** Website/Contact: http://www.qcustomplot.com/ **
** Date: 29.03.21 **
** Version: 2.1.0 **
** Website/Contact: https://www.qcustomplot.com/ **
** Date: 06.11.22 **
** Version: 2.1.1 **
****************************************************************************/
#include "qcustomplot.h"
/* including file 'src/vector2d.cpp' */
/* modified 2021-03-29T02:30:44, size 7973 */
/* modified 2022-11-06T12:45:56, size 7973 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPVector2D
@@ -272,7 +272,7 @@ QCPVector2D &QCPVector2D::operator-=(const QCPVector2D &vector)
/* including file 'src/painter.cpp' */
/* modified 2021-03-29T02:30:44, size 8656 */
/* modified 2022-11-06T12:45:56, size 8656 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPPainter
@@ -489,7 +489,7 @@ void QCPPainter::makeNonCosmetic()
/* including file 'src/paintbuffer.cpp' */
/* modified 2021-03-29T02:30:44, size 18915 */
/* modified 2022-11-06T12:45:56, size 18915 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPAbstractPaintBuffer
@@ -908,11 +908,6 @@ void QCPPaintBufferGlFbo::draw(QCPPainter *painter) const
qDebug() << Q_FUNC_INFO << "OpenGL frame buffer object doesn't exist, reallocateBuffer was not called?";
return;
}
QOpenGLContext *cont = mGlContext.toStrongRef().data();
if (cont != QOpenGLContext::currentContext())
cont->makeCurrent(cont->surface());
painter->drawImage(0, 0, mGlFrameBuffer->toImage());
}
@@ -981,7 +976,7 @@ void QCPPaintBufferGlFbo::reallocateBuffer()
/* including file 'src/layer.cpp' */
/* modified 2021-03-29T02:30:44, size 37615 */
/* modified 2022-11-06T12:45:56, size 37615 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPLayer
@@ -1841,7 +1836,7 @@ void QCPLayerable::wheelEvent(QWheelEvent *event)
/* including file 'src/axis/range.cpp' */
/* modified 2021-03-29T02:30:44, size 12221 */
/* modified 2022-11-06T12:45:56, size 12221 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPRange
@@ -2163,7 +2158,7 @@ bool QCPRange::validRange(const QCPRange &range)
/* including file 'src/selection.cpp' */
/* modified 2021-03-29T02:30:44, size 21837 */
/* modified 2022-11-06T12:45:56, size 21837 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPDataRange
@@ -2764,7 +2759,7 @@ QCPDataSelection QCPDataSelection::inverse(const QCPDataRange &outerRange) const
/* including file 'src/selectionrect.cpp' */
/* modified 2021-03-29T02:30:44, size 9215 */
/* modified 2022-11-06T12:45:56, size 9215 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPSelectionRect
@@ -2993,7 +2988,7 @@ void QCPSelectionRect::draw(QCPPainter *painter)
/* including file 'src/layout.cpp' */
/* modified 2021-03-29T02:30:44, size 78863 */
/* modified 2022-11-06T12:45:56, size 78863 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPMarginGroup
@@ -5166,7 +5161,7 @@ void QCPLayoutInset::addElement(QCPLayoutElement *element, const QRectF &rect)
/* including file 'src/lineending.cpp' */
/* modified 2021-03-29T02:30:44, size 11189 */
/* modified 2022-11-06T12:45:56, size 11189 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPLineEnding
@@ -5460,7 +5455,7 @@ void QCPLineEnding::draw(QCPPainter *painter, const QCPVector2D &pos, double ang
/* including file 'src/axis/labelpainter.cpp' */
/* modified 2021-03-29T02:30:44, size 27296 */
/* modified 2022-11-06T12:45:56, size 27519 */
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -5658,8 +5653,8 @@ QByteArray QCPLabelPainterPrivate::generateLabelParameterHash() const
QByteArray result;
result.append(QByteArray::number(mParentPlot->bufferDevicePixelRatio()));
result.append(QByteArray::number(mRotation));
//result.append(QByteArray::number((int)tickLabelSide)); TODO: check whether this is really a cache-invalidating property
result.append(QByteArray::number((int)mSubstituteExponent));
//result.append(QByteArray::number(int(tickLabelSide))); TODO: check whether this is really a cache-invalidating property
result.append(QByteArray::number(int(mSubstituteExponent)));
result.append(QString(mMultiplicationSymbol).toUtf8());
result.append(mColor.name().toLatin1()+QByteArray::number(mColor.alpha(), 16));
result.append(mFont.toString().toLatin1());
@@ -5762,9 +5757,12 @@ QPointF QCPLabelPainterPrivate::getAnchorPos(const QPointF &tickPos)
case asTopRight: return tickPos+QPointF(-mPadding*M_SQRT1_2, mPadding*M_SQRT1_2);
case asBottomRight: return tickPos+QPointF(-mPadding*M_SQRT1_2, -mPadding*M_SQRT1_2);
case asBottomLeft: return tickPos+QPointF(mPadding*M_SQRT1_2, -mPadding*M_SQRT1_2);
default: qDebug() << Q_FUNC_INFO << "invalid mode for anchor side: " << mAnchorSide; break;
}
break;
}
case amSkewedUpright:
// fall through
case amSkewedRotated:
{
QCPVector2D anchorNormal(tickPos-mAnchorReference);
@@ -5773,6 +5771,7 @@ QPointF QCPLabelPainterPrivate::getAnchorPos(const QPointF &tickPos)
anchorNormal.normalize();
return tickPos+(anchorNormal*mPadding).toPointF();
}
default: qDebug() << Q_FUNC_INFO << "invalid mode for anchor mode: " << mAnchorMode; break;
}
return tickPos;
}
@@ -5990,8 +5989,8 @@ QByteArray QCPLabelPainterPrivate::cacheKey(const QString &text, const QColor &c
{
return text.toUtf8()+
QByteArray::number(color.red()+256*color.green()+65536*color.blue(), 36)+
QByteArray::number(color.alpha()+256*(int)side, 36)+
QByteArray::number((int)(rotation*100)%36000, 36);
QByteArray::number(color.alpha()+256*int(side), 36)+
QByteArray::number(int(rotation*100), 36);
}
QCPLabelPainterPrivate::AnchorSide QCPLabelPainterPrivate::skewedAnchorSide(const QPointF &tickPos, double sideExpandHorz, double sideExpandVert) const
@@ -6059,7 +6058,7 @@ void QCPLabelPainterPrivate::analyzeFontMetrics()
/* including file 'src/axis/axisticker.cpp' */
/* modified 2021-03-29T02:30:44, size 18688 */
/* modified 2022-11-06T12:45:56, size 18693 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPAxisTicker
@@ -6443,7 +6442,7 @@ double QCPAxisTicker::pickClosest(double target, const QVector<double> &candidat
*/
double QCPAxisTicker::getMantissa(double input, double *magnitude) const
{
const double mag = qPow(10.0, qFloor(qLn(input)/qLn(10.0)));
const double mag = std::pow(10.0, std::floor(std::log10(input)));
if (magnitude) *magnitude = mag;
return input/mag;
}
@@ -6479,7 +6478,7 @@ double QCPAxisTicker::cleanMantissa(double input) const
/* including file 'src/axis/axistickerdatetime.cpp' */
/* modified 2021-03-29T02:30:44, size 18829 */
/* modified 2022-11-06T12:45:56, size 18829 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPAxisTickerDateTime
@@ -6836,7 +6835,7 @@ double QCPAxisTickerDateTime::dateTimeToKey(const QDate &date, Qt::TimeSpec time
/* including file 'src/axis/axistickertime.cpp' */
/* modified 2021-03-29T02:30:44, size 11745 */
/* modified 2022-11-06T12:45:56, size 11745 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPAxisTickerTime
@@ -7085,7 +7084,7 @@ void QCPAxisTickerTime::replaceUnit(QString &text, QCPAxisTickerTime::TimeUnit u
/* including file 'src/axis/axistickerfixed.cpp' */
/* modified 2021-03-29T02:30:44, size 5575 */
/* modified 2022-11-06T12:45:56, size 5575 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPAxisTickerFixed
@@ -7187,7 +7186,7 @@ double QCPAxisTickerFixed::getTickStep(const QCPRange &range)
/* including file 'src/axis/axistickertext.cpp' */
/* modified 2021-03-29T02:30:44, size 8742 */
/* modified 2022-11-06T12:45:56, size 8742 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPAxisTickerText
@@ -7404,7 +7403,7 @@ QVector<double> QCPAxisTickerText::createTickVector(double tickStep, const QCPRa
/* including file 'src/axis/axistickerpi.cpp' */
/* modified 2021-03-29T02:30:44, size 11177 */
/* modified 2022-11-06T12:45:56, size 11177 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPAxisTickerPi
@@ -7691,7 +7690,7 @@ QString QCPAxisTickerPi::unicodeSubscript(int number) const
/* including file 'src/axis/axistickerlog.cpp' */
/* modified 2021-03-29T02:30:44, size 7890 */
/* modified 2022-11-06T12:45:56, size 7890 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPAxisTickerLog
@@ -7832,7 +7831,7 @@ QVector<double> QCPAxisTickerLog::createTickVector(double tickStep, const QCPRan
/* including file 'src/axis/axis.cpp' */
/* modified 2021-03-29T02:30:44, size 99883 */
/* modified 2022-11-06T12:45:56, size 99911 */
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -10353,7 +10352,7 @@ QCPAxisPainterPrivate::TickLabelData QCPAxisPainterPrivate::getTickLabelData(con
int eLast = -1; // last index of exponent part, rest of text after this will be suffixPart
if (substituteExponent)
{
ePos = text.indexOf(QLatin1Char('e'));
ePos = text.indexOf(QString(mParentPlot->locale().exponential()));
if (ePos > 0 && text.at(ePos-1).isDigit())
{
eLast = ePos;
@@ -10550,7 +10549,7 @@ void QCPAxisPainterPrivate::getMaxTickLabelSize(const QFont &font, const QString
/* including file 'src/scatterstyle.cpp' */
/* modified 2021-03-29T02:30:44, size 17466 */
/* modified 2022-11-06T12:45:56, size 17466 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPScatterStyle
@@ -11023,7 +11022,7 @@ void QCPScatterStyle::drawShape(QCPPainter *painter, double x, double y) const
/* including file 'src/plottable.cpp' */
/* modified 2021-03-29T02:30:44, size 38818 */
/* modified 2022-11-06T12:45:56, size 38818 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPSelectionDecorator
@@ -11994,7 +11993,7 @@ void QCPAbstractPlottable::deselectEvent(bool *selectionStateChanged)
/* including file 'src/item.cpp' */
/* modified 2021-03-29T02:30:44, size 49486 */
/* modified 2022-11-06T12:45:56, size 49486 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPItemAnchor
@@ -13266,7 +13265,7 @@ QCP::Interaction QCPAbstractItem::selectionCategory() const
/* including file 'src/core.cpp' */
/* modified 2021-03-29T02:30:44, size 127198 */
/* modified 2022-11-06T12:45:56, size 127625 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCustomPlot
@@ -13278,7 +13277,7 @@ QCP::Interaction QCPAbstractItem::selectionCategory() const
interacts with the user.
For tutorials on how to use QCustomPlot, see the website\n
http://www.qcustomplot.com/
https://www.qcustomplot.com/
*/
/* start of documentation of inline functions */
@@ -13602,7 +13601,7 @@ QCustomPlot::QCustomPlot(QWidget *parent) :
xAxis2(nullptr),
yAxis2(nullptr),
legend(nullptr),
mBufferDevicePixelRatio(1.0), // will be adapted to primary screen below
mBufferDevicePixelRatio(1.0), // will be adapted to true value below
mPlotLayout(nullptr),
mAutoAddPlottableToLegend(true),
mAntialiasedElements(QCP::aeNone),
@@ -13631,7 +13630,6 @@ QCustomPlot::QCustomPlot(QWidget *parent) :
mOpenGlCacheLabelsBackup(true)
{
setAttribute(Qt::WA_NoMousePropagation);
setAttribute(Qt::WA_OpaquePaintEvent);
setFocusPolicy(Qt::ClickFocus);
setMouseTracking(true);
QLocale currentLocale = locale();
@@ -15471,6 +15469,22 @@ QSize QCustomPlot::sizeHint() const
void QCustomPlot::paintEvent(QPaintEvent *event)
{
Q_UNUSED(event)
// detect if the device pixel ratio has changed (e.g. moving window between different DPI screens), and adapt buffers if necessary:
#ifdef QCP_DEVICEPIXELRATIO_SUPPORTED
# ifdef QCP_DEVICEPIXELRATIO_FLOAT
double newDpr = devicePixelRatioF();
# else
double newDpr = devicePixelRatio();
# endif
if (!qFuzzyCompare(mBufferDevicePixelRatio, newDpr))
{
setBufferDevicePixelRatio(newDpr);
replot(QCustomPlot::rpQueuedRefresh);
return;
}
#endif
QCPPainter painter(this);
if (painter.isActive())
{
@@ -16485,7 +16499,7 @@ void QCustomPlot::toPainter(QCPPainter *painter, int width, int height)
/* including file 'src/colorgradient.cpp' */
/* modified 2021-03-29T02:30:44, size 25278 */
/* modified 2022-11-06T12:45:56, size 25408 */
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -16715,10 +16729,10 @@ void QCPColorGradient::colorize(const double *data, const QCPRange &range, QRgb
const double value = data[dataIndexFactor*i];
if (skipNanCheck || !std::isnan(value))
{
int index = int((!logarithmic ? value-range.lower : qLn(value/range.lower)) * posToIndexFactor);
qint64 index = qint64((!logarithmic ? value-range.lower : qLn(value/range.lower)) * posToIndexFactor);
if (!mPeriodic)
{
index = qBound(0, index, mLevelCount-1);
index = qBound(qint64(0), index, qint64(mLevelCount-1));
} else
{
index %= mLevelCount;
@@ -16776,10 +16790,10 @@ void QCPColorGradient::colorize(const double *data, const unsigned char *alpha,
const double value = data[dataIndexFactor*i];
if (skipNanCheck || !std::isnan(value))
{
int index = int((!logarithmic ? value-range.lower : qLn(value/range.lower)) * posToIndexFactor);
qint64 index = qint64((!logarithmic ? value-range.lower : qLn(value/range.lower)) * posToIndexFactor);
if (!mPeriodic)
{
index = qBound(0, index, mLevelCount-1);
index = qBound(qint64(0), index, qint64(mLevelCount-1));
} else
{
index %= mLevelCount;
@@ -17022,7 +17036,7 @@ void QCPColorGradient::updateColorBuffer()
for (int i=0; i<mLevelCount; ++i)
{
double position = i*indexToPosFactor;
QMap<double, QColor>::const_iterator it = mColorStops.lowerBound(position);
QMap<double, QColor>::const_iterator it = const_cast<const QMap<double, QColor>*>(&mColorStops)->lowerBound(position); // force using the const lowerBound method
if (it == mColorStops.constEnd()) // position is on or after last stop, use color of last stop
{
if (useAlpha)
@@ -17120,7 +17134,7 @@ void QCPColorGradient::updateColorBuffer()
/* including file 'src/selectiondecorator-bracket.cpp' */
/* modified 2021-03-29T02:30:44, size 12308 */
/* modified 2022-11-06T12:45:56, size 12308 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPSelectionDecoratorBracket
@@ -17406,7 +17420,7 @@ QPointF QCPSelectionDecoratorBracket::getPixelCoordinates(const QCPPlottableInte
/* including file 'src/layoutelements/layoutelement-axisrect.cpp' */
/* modified 2021-03-29T02:30:44, size 47193 */
/* modified 2022-11-06T12:45:56, size 47193 */
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -18691,7 +18705,7 @@ void QCPAxisRect::wheelEvent(QWheelEvent *event)
/* including file 'src/layoutelements/layoutelement-legend.cpp' */
/* modified 2021-03-29T02:30:44, size 31762 */
/* modified 2022-11-06T12:45:56, size 31762 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPAbstractLegendItem
@@ -19615,7 +19629,7 @@ void QCPLegend::parentPlotInitialized(QCustomPlot *parentPlot)
/* including file 'src/layoutelements/layoutelement-textelement.cpp' */
/* modified 2021-03-29T02:30:44, size 12925 */
/* modified 2022-11-06T12:45:56, size 12925 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPTextElement
@@ -20021,7 +20035,7 @@ QColor QCPTextElement::mainTextColor() const
/* including file 'src/layoutelements/layoutelement-colorscale.cpp' */
/* modified 2021-03-29T02:30:44, size 26531 */
/* modified 2022-11-06T12:45:56, size 26531 */
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -20705,7 +20719,7 @@ void QCPColorScaleAxisRectPrivate::axisSelectableChanged(QCPAxis::SelectablePart
/* including file 'src/plottables/plottable-graph.cpp' */
/* modified 2021-03-29T02:30:44, size 74518 */
/* modified 2022-11-06T12:45:57, size 74926 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPGraphData
@@ -21535,21 +21549,37 @@ QVector<QPointF> QCPGraph::dataToImpulseLines(const QVector<QCPGraphData> &data)
{
for (int i=0; i<data.size(); ++i)
{
const double key = keyAxis->coordToPixel(data.at(i).key);
result[i*2+0].setX(valueAxis->coordToPixel(0));
result[i*2+0].setY(key);
result[i*2+1].setX(valueAxis->coordToPixel(data.at(i).value));
result[i*2+1].setY(key);
const QCPGraphData &current = data.at(i);
if (!qIsNaN(current.value))
{
const double key = keyAxis->coordToPixel(current.key);
result[i*2+0].setX(valueAxis->coordToPixel(0));
result[i*2+0].setY(key);
result[i*2+1].setX(valueAxis->coordToPixel(current.value));
result[i*2+1].setY(key);
} else
{
result[i*2+0] = QPointF(0, 0);
result[i*2+1] = QPointF(0, 0);
}
}
} else // key axis is horizontal
{
for (int i=0; i<data.size(); ++i)
{
const double key = keyAxis->coordToPixel(data.at(i).key);
result[i*2+0].setX(key);
result[i*2+0].setY(valueAxis->coordToPixel(0));
result[i*2+1].setX(key);
result[i*2+1].setY(valueAxis->coordToPixel(data.at(i).value));
const QCPGraphData &current = data.at(i);
if (!qIsNaN(current.value))
{
const double key = keyAxis->coordToPixel(data.at(i).key);
result[i*2+0].setX(key);
result[i*2+0].setY(valueAxis->coordToPixel(0));
result[i*2+1].setX(key);
result[i*2+1].setY(valueAxis->coordToPixel(data.at(i).value));
} else
{
result[i*2+0] = QPointF(0, 0);
result[i*2+1] = QPointF(0, 0);
}
}
}
return result;
@@ -22463,7 +22493,7 @@ int QCPGraph::findIndexBelowY(const QVector<QPointF> *data, double y) const
/* including file 'src/plottables/plottable-curve.cpp' */
/* modified 2021-03-29T02:30:44, size 63851 */
/* modified 2022-11-06T12:45:56, size 63851 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPCurveData
@@ -23921,7 +23951,7 @@ double QCPCurve::pointDistance(const QPointF &pixelPoint, QCPCurveDataContainer:
/* including file 'src/plottables/plottable-bars.cpp' */
/* modified 2021-03-29T02:30:44, size 43907 */
/* modified 2022-11-06T12:45:56, size 43907 */
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -25097,7 +25127,7 @@ void QCPBars::connectBars(QCPBars *lower, QCPBars *upper)
/* including file 'src/plottables/plottable-statisticalbox.cpp' */
/* modified 2021-03-29T02:30:44, size 28951 */
/* modified 2022-11-06T12:45:57, size 28951 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPStatisticalBoxData
@@ -25759,7 +25789,7 @@ QVector<QLineF> QCPStatisticalBox::getWhiskerBarLines(QCPStatisticalBoxDataConta
/* including file 'src/plottables/plottable-colormap.cpp' */
/* modified 2021-03-29T02:30:44, size 48149 */
/* modified 2022-11-06T12:45:56, size 48189 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPColorMapData
@@ -26129,8 +26159,8 @@ void QCPColorMapData::recalculateDataBounds()
{
if (mKeySize > 0 && mValueSize > 0)
{
double minHeight = mData[0];
double maxHeight = mData[0];
double minHeight = std::numeric_limits<double>::max();
double maxHeight = -std::numeric_limits<double>::max();
const int dataCount = mValueSize*mKeySize;
for (int i=0; i<dataCount; ++i)
{
@@ -26173,8 +26203,7 @@ void QCPColorMapData::clearAlpha()
void QCPColorMapData::fill(double z)
{
const int dataCount = mValueSize*mKeySize;
for (int i=0; i<dataCount; ++i)
mData[i] = z;
memset(mData, z, dataCount*sizeof(*mData));
mDataBounds = QCPRange(z, z);
mDataModified = true;
}
@@ -26193,8 +26222,7 @@ void QCPColorMapData::fillAlpha(unsigned char alpha)
if (mAlpha || createAlpha(false))
{
const int dataCount = mValueSize*mKeySize;
for (int i=0; i<dataCount; ++i)
mAlpha[i] = alpha;
memset(mAlpha, alpha, dataCount*sizeof(*mAlpha));
mDataModified = true;
}
}
@@ -26892,7 +26920,7 @@ void QCPColorMap::drawLegendIcon(QCPPainter *painter, const QRectF &rect) const
/* including file 'src/plottables/plottable-financial.cpp' */
/* modified 2021-03-29T02:30:44, size 42914 */
/* modified 2022-11-06T12:45:57, size 42914 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPFinancialData
@@ -27854,7 +27882,7 @@ QRectF QCPFinancial::selectionHitBox(QCPFinancialDataContainer::const_iterator i
/* including file 'src/plottables/plottable-errorbar.cpp' */
/* modified 2021-03-29T02:30:44, size 37679 */
/* modified 2022-11-06T12:45:56, size 37679 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPErrorBarsData
@@ -28822,7 +28850,7 @@ bool QCPErrorBars::rectIntersectsLine(const QRectF &pixelRect, const QLineF &lin
/* including file 'src/items/item-straightline.cpp' */
/* modified 2021-03-29T02:30:44, size 7596 */
/* modified 2022-11-06T12:45:56, size 7596 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPItemStraightLine
@@ -29003,7 +29031,7 @@ QPen QCPItemStraightLine::mainPen() const
/* including file 'src/items/item-line.cpp' */
/* modified 2021-03-29T02:30:44, size 8525 */
/* modified 2022-11-06T12:45:56, size 8525 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPItemLine
@@ -29234,7 +29262,7 @@ QPen QCPItemLine::mainPen() const
/* including file 'src/items/item-curve.cpp' */
/* modified 2021-03-29T02:30:44, size 7273 */
/* modified 2022-11-06T12:45:56, size 7273 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPItemCurve
@@ -29403,7 +29431,7 @@ QPen QCPItemCurve::mainPen() const
/* including file 'src/items/item-rect.cpp' */
/* modified 2021-03-29T02:30:44, size 6472 */
/* modified 2022-11-06T12:45:56, size 6472 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPItemRect
@@ -29560,7 +29588,7 @@ QBrush QCPItemRect::mainBrush() const
/* including file 'src/items/item-text.cpp' */
/* modified 2021-03-29T02:30:44, size 13335 */
/* modified 2022-11-06T12:45:56, size 13335 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPItemText
@@ -29908,7 +29936,7 @@ QBrush QCPItemText::mainBrush() const
/* including file 'src/items/item-ellipse.cpp' */
/* modified 2021-03-29T02:30:44, size 7881 */
/* modified 2022-11-06T12:45:56, size 7881 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPItemEllipse
@@ -30097,7 +30125,7 @@ QBrush QCPItemEllipse::mainBrush() const
/* including file 'src/items/item-pixmap.cpp' */
/* modified 2021-03-29T02:30:44, size 10622 */
/* modified 2022-11-06T12:45:56, size 10622 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPItemPixmap
@@ -30367,7 +30395,7 @@ QPen QCPItemPixmap::mainPen() const
/* including file 'src/items/item-tracer.cpp' */
/* modified 2021-03-29T02:30:44, size 14645 */
/* modified 2022-11-06T12:45:56, size 14645 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPItemTracer
@@ -30737,7 +30765,7 @@ QBrush QCPItemTracer::mainBrush() const
/* including file 'src/items/item-bracket.cpp' */
/* modified 2021-03-29T02:30:44, size 10705 */
/* modified 2022-11-06T12:45:56, size 10705 */
////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// QCPItemBracket
@@ -30978,7 +31006,7 @@ QPen QCPItemBracket::mainPen() const
/* including file 'src/polar/radialaxis.cpp' */
/* modified 2021-03-29T02:30:44, size 49415 */
/* modified 2022-11-06T12:45:57, size 49415 */
@@ -32439,7 +32467,7 @@ QCP::Interaction QCPPolarAxisRadial::selectionCategory() const
/* including file 'src/polar/layoutelement-angularaxis.cpp' */
/* modified 2021-03-29T02:30:44, size 57266 */
/* modified 2022-11-06T12:45:57, size 57266 */
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -34130,7 +34158,7 @@ bool QCPPolarAxisAngular::registerPolarGraph(QCPPolarGraph *graph)
/* including file 'src/polar/polargrid.cpp' */
/* modified 2021-03-29T02:30:44, size 7493 */
/* modified 2022-11-06T12:45:57, size 7493 */
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -34318,7 +34346,7 @@ void QCPPolarGrid::drawAngularGrid(QCPPainter *painter, const QPointF &center, d
/* including file 'src/polar/polargraph.cpp' */
/* modified 2021-03-29T02:30:44, size 44035 */
/* modified 2022-11-06T12:45:57, size 44035 */
////////////////////////////////////////////////////////////////////////////////////////////////////