Qt: Update QCustomPlot to 2.1.1
Remove a bunch of line ending whitespace from upstream to get it to compile. Fix #18654
This commit is contained in:
parent
793365d0e0
commit
498dc04278
File diff suppressed because it is too large
Load Diff
|
@ -3,13 +3,13 @@
|
|||
****************************************************************************
|
||||
** **
|
||||
** QCustomPlot, an easy to use, modern plotting widget for Qt **
|
||||
** Copyright (C) 2011-2021 Emanuel Eichhammer **
|
||||
** Copyright (C) 2011-2022 Emanuel Eichhammer **
|
||||
** **
|
||||
****************************************************************************
|
||||
** 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 **
|
||||
** **
|
||||
** Emanuel Eichhammer has granted Wireshark permission to use QCustomPlot **
|
||||
** under the terms of the GNU General Public License version 2. **
|
||||
|
@ -125,10 +125,10 @@ class QCPPolarGrid;
|
|||
class QCPPolarGraph;
|
||||
|
||||
/* including file 'src/global.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 16981 */
|
||||
/* modified 2022-11-06T12:45:57, size 18102 */
|
||||
|
||||
#define QCUSTOMPLOT_VERSION_STR "2.1.0"
|
||||
#define QCUSTOMPLOT_VERSION 0x020100
|
||||
#define QCUSTOMPLOT_VERSION_STR "2.1.1"
|
||||
#define QCUSTOMPLOT_VERSION 0x020101
|
||||
|
||||
// decl definitions for shared library compilation/usage:
|
||||
#if defined(QT_STATIC_BUILD)
|
||||
|
@ -152,8 +152,35 @@ class QCPPolarGraph;
|
|||
|
||||
It provides QMetaObject-based reflection of its enums and flags via \a QCP::staticMetaObject.
|
||||
*/
|
||||
|
||||
// Qt version < 6.2.0: to get metatypes Q_GADGET/Q_ENUMS/Q_FLAGS in namespace we have to make it look like a class during moc-run
|
||||
#if QT_VERSION >= 0x060200 // don't use QT_VERSION_CHECK here, some moc versions don't understand it
|
||||
namespace QCP {
|
||||
Q_NAMESPACE
|
||||
Q_NAMESPACE // this is how to add the staticMetaObject to namespaces in newer Qt versions
|
||||
#else // Qt version older than 6.2.0
|
||||
# ifndef Q_MOC_RUN
|
||||
namespace QCP {
|
||||
# else // not in moc run
|
||||
class QCP {
|
||||
Q_GADGET
|
||||
Q_ENUMS(ExportPen)
|
||||
Q_ENUMS(ResolutionUnit)
|
||||
Q_ENUMS(SignDomain)
|
||||
Q_ENUMS(MarginSide)
|
||||
Q_ENUMS(AntialiasedElement)
|
||||
Q_ENUMS(PlottingHint)
|
||||
Q_ENUMS(Interaction)
|
||||
Q_ENUMS(SelectionRectMode)
|
||||
Q_ENUMS(SelectionType)
|
||||
|
||||
Q_FLAGS(AntialiasedElements)
|
||||
Q_FLAGS(PlottingHints)
|
||||
Q_FLAGS(MarginSides)
|
||||
Q_FLAGS(Interactions)
|
||||
public:
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
||||
/*!
|
||||
Defines the different units in which the image resolution can be specified in the export
|
||||
|
@ -296,20 +323,6 @@ enum SelectionType { stNone ///< The plottable is not selectable
|
|||
,stMultipleDataRanges ///< Any combination of data points/ranges can be selected
|
||||
};
|
||||
|
||||
Q_ENUM_NS(ExportPen)
|
||||
Q_ENUM_NS(ResolutionUnit)
|
||||
Q_ENUM_NS(SignDomain)
|
||||
Q_ENUM_NS(MarginSide)
|
||||
Q_FLAG_NS(MarginSides)
|
||||
Q_ENUM_NS(AntialiasedElement)
|
||||
Q_FLAG_NS(AntialiasedElements)
|
||||
Q_ENUM_NS(PlottingHint)
|
||||
Q_FLAG_NS(PlottingHints)
|
||||
Q_ENUM_NS(Interaction)
|
||||
Q_FLAG_NS(Interactions)
|
||||
Q_ENUM_NS(SelectionRectMode)
|
||||
Q_ENUM_NS(SelectionType)
|
||||
|
||||
/*! \internal
|
||||
|
||||
Returns whether the specified \a value is considered an invalid data value for plottables (i.e.
|
||||
|
@ -370,21 +383,55 @@ inline int getMarginValue(const QMargins &margins, QCP::MarginSide side)
|
|||
return 0;
|
||||
}
|
||||
|
||||
// for newer Qt versions we have to declare the enums/flags as metatypes inside the namespace using Q_ENUM_NS/Q_FLAG_NS:
|
||||
// if you change anything here, don't forget to change it for older Qt versions below, too,
|
||||
// and at the start of the namespace in the fake moc-run class
|
||||
#if QT_VERSION >= 0x060200
|
||||
Q_ENUM_NS(ExportPen)
|
||||
Q_ENUM_NS(ResolutionUnit)
|
||||
Q_ENUM_NS(SignDomain)
|
||||
Q_ENUM_NS(MarginSide)
|
||||
Q_ENUM_NS(AntialiasedElement)
|
||||
Q_ENUM_NS(PlottingHint)
|
||||
Q_ENUM_NS(Interaction)
|
||||
Q_ENUM_NS(SelectionRectMode)
|
||||
Q_ENUM_NS(SelectionType)
|
||||
|
||||
extern const QMetaObject staticMetaObject; // in moc-run we create a static meta object for QCP "fake" object. This line is the link to it via QCP::staticMetaObject in normal operation as namespace
|
||||
Q_FLAG_NS(AntialiasedElements)
|
||||
Q_FLAG_NS(PlottingHints)
|
||||
Q_FLAG_NS(MarginSides)
|
||||
Q_FLAG_NS(Interactions)
|
||||
#else
|
||||
extern const QMetaObject staticMetaObject;
|
||||
#endif
|
||||
|
||||
} // end of namespace QCP
|
||||
|
||||
Q_DECLARE_OPERATORS_FOR_FLAGS(QCP::AntialiasedElements)
|
||||
Q_DECLARE_OPERATORS_FOR_FLAGS(QCP::PlottingHints)
|
||||
Q_DECLARE_OPERATORS_FOR_FLAGS(QCP::MarginSides)
|
||||
Q_DECLARE_OPERATORS_FOR_FLAGS(QCP::Interactions)
|
||||
//no need to use Q_DECLARE_METATYPE on enum since Q_ENUM_NS adds enum as metatype automatically
|
||||
|
||||
// for older Qt versions we have to declare the enums/flags as metatypes outside the namespace using Q_DECLARE_METATYPE:
|
||||
// if you change anything here, don't forget to change it for newer Qt versions above, too,
|
||||
// and at the start of the namespace in the fake moc-run class
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 2, 0)
|
||||
Q_DECLARE_METATYPE(QCP::ExportPen)
|
||||
Q_DECLARE_METATYPE(QCP::ResolutionUnit)
|
||||
Q_DECLARE_METATYPE(QCP::SignDomain)
|
||||
Q_DECLARE_METATYPE(QCP::MarginSide)
|
||||
Q_DECLARE_METATYPE(QCP::AntialiasedElement)
|
||||
Q_DECLARE_METATYPE(QCP::PlottingHint)
|
||||
Q_DECLARE_METATYPE(QCP::Interaction)
|
||||
Q_DECLARE_METATYPE(QCP::SelectionRectMode)
|
||||
Q_DECLARE_METATYPE(QCP::SelectionType)
|
||||
#endif
|
||||
|
||||
/* end of 'src/global.h' */
|
||||
|
||||
|
||||
/* including file 'src/vector2d.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 4988 */
|
||||
/* modified 2022-11-06T12:45:56, size 4988 */
|
||||
|
||||
class QCP_LIB_DECL QCPVector2D
|
||||
{
|
||||
|
@ -459,7 +506,7 @@ inline QDebug operator<< (QDebug d, const QCPVector2D &vec)
|
|||
|
||||
|
||||
/* including file 'src/painter.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 4035 */
|
||||
/* modified 2022-11-06T12:45:56, size 4035 */
|
||||
|
||||
class QCP_LIB_DECL QCPPainter : public QPainter
|
||||
{
|
||||
|
@ -518,7 +565,7 @@ Q_DECLARE_METATYPE(QCPPainter::PainterMode)
|
|||
|
||||
|
||||
/* including file 'src/paintbuffer.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 5006 */
|
||||
/* modified 2022-11-06T12:45:56, size 5006 */
|
||||
|
||||
class QCP_LIB_DECL QCPAbstractPaintBuffer
|
||||
{
|
||||
|
@ -626,7 +673,7 @@ protected:
|
|||
|
||||
|
||||
/* including file 'src/layer.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 7038 */
|
||||
/* modified 2022-11-06T12:45:56, size 7038 */
|
||||
|
||||
class QCP_LIB_DECL QCPLayer : public QObject
|
||||
{
|
||||
|
@ -775,7 +822,7 @@ private:
|
|||
|
||||
|
||||
/* including file 'src/axis/range.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 5280 */
|
||||
/* modified 2022-11-06T12:45:56, size 5280 */
|
||||
|
||||
class QCP_LIB_DECL QCPRange
|
||||
{
|
||||
|
@ -893,7 +940,7 @@ inline const QCPRange operator/(const QCPRange& range, double value)
|
|||
|
||||
|
||||
/* including file 'src/selection.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 8569 */
|
||||
/* modified 2022-11-06T12:45:56, size 8569 */
|
||||
|
||||
class QCP_LIB_DECL QCPDataRange
|
||||
{
|
||||
|
@ -954,7 +1001,7 @@ public:
|
|||
friend inline const QCPDataSelection operator-(const QCPDataRange& a, const QCPDataRange& b);
|
||||
|
||||
// getters:
|
||||
int dataRangeCount() const { return static_cast<int>(mDataRanges.size()); }
|
||||
int dataRangeCount() const { return mDataRanges.size(); }
|
||||
int dataPointCount() const;
|
||||
QCPDataRange dataRange(int index=0) const;
|
||||
QList<QCPDataRange> dataRanges() const { return mDataRanges; }
|
||||
|
@ -1097,7 +1144,7 @@ inline QDebug operator<< (QDebug d, const QCPDataSelection &selection)
|
|||
|
||||
|
||||
/* including file 'src/selectionrect.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 3354 */
|
||||
/* modified 2022-11-06T12:45:56, size 3354 */
|
||||
|
||||
class QCP_LIB_DECL QCPSelectionRect : public QCPLayerable
|
||||
{
|
||||
|
@ -1151,7 +1198,7 @@ protected:
|
|||
|
||||
|
||||
/* including file 'src/layout.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 14279 */
|
||||
/* modified 2022-11-06T12:45:56, size 14279 */
|
||||
|
||||
class QCP_LIB_DECL QCPMarginGroup : public QObject
|
||||
{
|
||||
|
@ -1358,8 +1405,8 @@ public:
|
|||
virtual ~QCPLayoutGrid() Q_DECL_OVERRIDE;
|
||||
|
||||
// getters:
|
||||
int rowCount() const { return static_cast<int>(mElements.size()); }
|
||||
int columnCount() const { return mElements.size() > 0 ? static_cast<int>(mElements.first().size()) : 0; }
|
||||
int rowCount() const { return mElements.size(); }
|
||||
int columnCount() const { return mElements.size() > 0 ? mElements.first().size() : 0; }
|
||||
QList<double> columnStretchFactors() const { return mColumnStretchFactors; }
|
||||
QList<double> rowStretchFactors() const { return mRowStretchFactors; }
|
||||
int columnSpacing() const { return mColumnSpacing; }
|
||||
|
@ -1472,7 +1519,7 @@ Q_DECLARE_METATYPE(QCPLayoutInset::InsetPlacement)
|
|||
|
||||
|
||||
/* including file 'src/lineending.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 4426 */
|
||||
/* modified 2022-11-06T12:45:56, size 4426 */
|
||||
|
||||
class QCP_LIB_DECL QCPLineEnding
|
||||
{
|
||||
|
@ -1536,7 +1583,7 @@ Q_DECLARE_METATYPE(QCPLineEnding::EndingStyle)
|
|||
|
||||
|
||||
/* including file 'src/axis/labelpainter.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 7086 */
|
||||
/* modified 2022-11-06T12:45:56, size 7086 */
|
||||
|
||||
class QCPLabelPainterPrivate
|
||||
{
|
||||
|
@ -1676,7 +1723,7 @@ Q_DECLARE_METATYPE(QCPLabelPainterPrivate::AnchorSide)
|
|||
|
||||
|
||||
/* including file 'src/axis/axisticker.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 4230 */
|
||||
/* modified 2022-11-06T12:45:56, size 4230 */
|
||||
|
||||
class QCP_LIB_DECL QCPAxisTicker
|
||||
{
|
||||
|
@ -1741,7 +1788,7 @@ Q_DECLARE_METATYPE(QSharedPointer<QCPAxisTicker>)
|
|||
|
||||
|
||||
/* including file 'src/axis/axistickerdatetime.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 3600 */
|
||||
/* modified 2022-11-06T12:45:56, size 3600 */
|
||||
|
||||
class QCP_LIB_DECL QCPAxisTickerDateTime : public QCPAxisTicker
|
||||
{
|
||||
|
@ -1790,7 +1837,7 @@ protected:
|
|||
|
||||
|
||||
/* including file 'src/axis/axistickertime.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 3542 */
|
||||
/* modified 2022-11-06T12:45:56, size 3542 */
|
||||
|
||||
class QCP_LIB_DECL QCPAxisTickerTime : public QCPAxisTicker
|
||||
{
|
||||
|
@ -1842,7 +1889,7 @@ Q_DECLARE_METATYPE(QCPAxisTickerTime::TimeUnit)
|
|||
|
||||
|
||||
/* including file 'src/axis/axistickerfixed.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 3308 */
|
||||
/* modified 2022-11-06T12:45:56, size 3308 */
|
||||
|
||||
class QCP_LIB_DECL QCPAxisTickerFixed : public QCPAxisTicker
|
||||
{
|
||||
|
@ -1884,7 +1931,7 @@ Q_DECLARE_METATYPE(QCPAxisTickerFixed::ScaleStrategy)
|
|||
|
||||
|
||||
/* including file 'src/axis/axistickertext.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 3090 */
|
||||
/* modified 2022-11-06T12:45:56, size 3090 */
|
||||
|
||||
class QCP_LIB_DECL QCPAxisTickerText : public QCPAxisTicker
|
||||
{
|
||||
|
@ -1922,7 +1969,7 @@ protected:
|
|||
|
||||
|
||||
/* including file 'src/axis/axistickerpi.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 3911 */
|
||||
/* modified 2022-11-06T12:45:56, size 3911 */
|
||||
|
||||
class QCP_LIB_DECL QCPAxisTickerPi : public QCPAxisTicker
|
||||
{
|
||||
|
@ -1981,7 +2028,7 @@ Q_DECLARE_METATYPE(QCPAxisTickerPi::FractionStyle)
|
|||
|
||||
|
||||
/* including file 'src/axis/axistickerlog.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 2594 */
|
||||
/* modified 2022-11-06T12:45:56, size 2594 */
|
||||
|
||||
class QCP_LIB_DECL QCPAxisTickerLog : public QCPAxisTicker
|
||||
{
|
||||
|
@ -2013,7 +2060,7 @@ protected:
|
|||
|
||||
|
||||
/* including file 'src/axis/axis.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 20913 */
|
||||
/* modified 2022-11-06T12:45:56, size 20913 */
|
||||
|
||||
class QCP_LIB_DECL QCPGrid :public QCPLayerable
|
||||
{
|
||||
|
@ -2441,7 +2488,7 @@ protected:
|
|||
|
||||
|
||||
/* including file 'src/scatterstyle.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 7275 */
|
||||
/* modified 2022-11-06T12:45:56, size 7275 */
|
||||
|
||||
class QCP_LIB_DECL QCPScatterStyle
|
||||
{
|
||||
|
@ -2548,7 +2595,7 @@ Q_DECLARE_METATYPE(QCPScatterStyle::ScatterShape)
|
|||
|
||||
|
||||
/* including file 'src/datacontainer.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 34070 */
|
||||
/* modified 2022-11-06T12:45:56, size 34305 */
|
||||
|
||||
/*! \relates QCPDataContainer
|
||||
Returns whether the sort key of \a a is less than the sort key of \a b.
|
||||
|
@ -2568,7 +2615,7 @@ public:
|
|||
QCPDataContainer();
|
||||
|
||||
// getters:
|
||||
int size() const { return static_cast<int>(mData.size()-mPreallocSize); }
|
||||
int size() const { return mData.size()-mPreallocSize; }
|
||||
bool isEmpty() const { return size() == 0; }
|
||||
bool autoSqueeze() const { return mAutoSqueeze; }
|
||||
|
||||
|
@ -2859,7 +2906,7 @@ void QCPDataContainer<DataType>::add(const QVector<DataType> &data, bool already
|
|||
return;
|
||||
}
|
||||
|
||||
const int n = static_cast<int>(data.size());
|
||||
const int n = data.size();
|
||||
const int oldSize = size();
|
||||
|
||||
if (alreadySorted && oldSize > 0 && !qcpLessThanSortKey<DataType>(*constBegin(), *(data.constEnd()-1))) // prepend if new data is sorted and keys are all smaller than or equal to existing ones
|
||||
|
@ -3218,6 +3265,8 @@ QCPRange QCPDataContainer<DataType>::keyRange(bool &foundRange, QCP::SignDomain
|
|||
you should not use the returned QCPRange (e.g. the data container is empty or all points have the
|
||||
same value).
|
||||
|
||||
Inf and -Inf data values are ignored.
|
||||
|
||||
If \a inKeyRange has both lower and upper bound set to zero (is equal to <tt>QCPRange()</tt>),
|
||||
all data points are considered, without any restriction on the keys.
|
||||
|
||||
|
@ -3254,12 +3303,12 @@ QCPRange QCPDataContainer<DataType>::valueRange(bool &foundRange, QCP::SignDomai
|
|||
if (restrictKeyRange && (it->mainKey() < inKeyRange.lower || it->mainKey() > inKeyRange.upper))
|
||||
continue;
|
||||
current = it->valueRange();
|
||||
if ((current.lower < range.lower || !haveLower) && !qIsNaN(current.lower))
|
||||
if ((current.lower < range.lower || !haveLower) && !qIsNaN(current.lower) && std::isfinite(current.lower))
|
||||
{
|
||||
range.lower = current.lower;
|
||||
haveLower = true;
|
||||
}
|
||||
if ((current.upper > range.upper || !haveUpper) && !qIsNaN(current.upper))
|
||||
if ((current.upper > range.upper || !haveUpper) && !qIsNaN(current.upper) && std::isfinite(current.upper))
|
||||
{
|
||||
range.upper = current.upper;
|
||||
haveUpper = true;
|
||||
|
@ -3272,12 +3321,12 @@ QCPRange QCPDataContainer<DataType>::valueRange(bool &foundRange, QCP::SignDomai
|
|||
if (restrictKeyRange && (it->mainKey() < inKeyRange.lower || it->mainKey() > inKeyRange.upper))
|
||||
continue;
|
||||
current = it->valueRange();
|
||||
if ((current.lower < range.lower || !haveLower) && current.lower < 0 && !qIsNaN(current.lower))
|
||||
if ((current.lower < range.lower || !haveLower) && current.lower < 0 && !qIsNaN(current.lower) && std::isfinite(current.lower))
|
||||
{
|
||||
range.lower = current.lower;
|
||||
haveLower = true;
|
||||
}
|
||||
if ((current.upper > range.upper || !haveUpper) && current.upper < 0 && !qIsNaN(current.upper))
|
||||
if ((current.upper > range.upper || !haveUpper) && current.upper < 0 && !qIsNaN(current.upper) && std::isfinite(current.upper))
|
||||
{
|
||||
range.upper = current.upper;
|
||||
haveUpper = true;
|
||||
|
@ -3290,12 +3339,12 @@ QCPRange QCPDataContainer<DataType>::valueRange(bool &foundRange, QCP::SignDomai
|
|||
if (restrictKeyRange && (it->mainKey() < inKeyRange.lower || it->mainKey() > inKeyRange.upper))
|
||||
continue;
|
||||
current = it->valueRange();
|
||||
if ((current.lower < range.lower || !haveLower) && current.lower > 0 && !qIsNaN(current.lower))
|
||||
if ((current.lower < range.lower || !haveLower) && current.lower > 0 && !qIsNaN(current.lower) && std::isfinite(current.lower))
|
||||
{
|
||||
range.lower = current.lower;
|
||||
haveLower = true;
|
||||
}
|
||||
if ((current.upper > range.upper || !haveUpper) && current.upper > 0 && !qIsNaN(current.upper))
|
||||
if ((current.upper > range.upper || !haveUpper) && current.upper > 0 && !qIsNaN(current.upper) && std::isfinite(current.upper))
|
||||
{
|
||||
range.upper = current.upper;
|
||||
haveUpper = true;
|
||||
|
@ -3390,7 +3439,7 @@ void QCPDataContainer<DataType>::performAutoSqueeze()
|
|||
|
||||
|
||||
/* including file 'src/plottable.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 8461 */
|
||||
/* modified 2022-11-06T12:45:56, size 8461 */
|
||||
|
||||
class QCP_LIB_DECL QCPSelectionDecorator
|
||||
{
|
||||
|
@ -3547,7 +3596,7 @@ private:
|
|||
|
||||
|
||||
/* including file 'src/item.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 9425 */
|
||||
/* modified 2022-11-06T12:45:56, size 9425 */
|
||||
|
||||
class QCP_LIB_DECL QCPItemAnchor
|
||||
{
|
||||
|
@ -3732,7 +3781,7 @@ private:
|
|||
|
||||
|
||||
/* including file 'src/core.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 19304 */
|
||||
/* modified 2022-11-06T12:45:56, size 19304 */
|
||||
|
||||
class QCP_LIB_DECL QCustomPlot : public QWidget
|
||||
{
|
||||
|
@ -4102,7 +4151,7 @@ ItemType *QCustomPlot::itemAt(const QPointF &pos, bool onlySelectable) const
|
|||
|
||||
|
||||
/* including file 'src/plottable1d.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 25638 */
|
||||
/* modified 2022-11-06T12:45:56, size 25638 */
|
||||
|
||||
class QCPPlottableInterface1D
|
||||
{
|
||||
|
@ -4654,7 +4703,7 @@ void QCPAbstractPlottable1D<DataType>::drawPolyline(QCPPainter *painter, const Q
|
|||
{
|
||||
int i = 0;
|
||||
bool lastIsNan = false;
|
||||
const int lineDataSize = static_cast<int>(lineData.size());
|
||||
const int lineDataSize = lineData.size();
|
||||
while (i < lineDataSize && (qIsNaN(lineData.at(i).y()) || qIsNaN(lineData.at(i).x()))) // make sure first point is not NaN
|
||||
++i;
|
||||
++i; // because drawing works in 1 point retrospect
|
||||
|
@ -4674,7 +4723,7 @@ void QCPAbstractPlottable1D<DataType>::drawPolyline(QCPPainter *painter, const Q
|
|||
{
|
||||
int segmentStart = 0;
|
||||
int i = 0;
|
||||
const int lineDataSize = static_cast<int>(lineData.size());
|
||||
const int lineDataSize = lineData.size();
|
||||
while (i < lineDataSize)
|
||||
{
|
||||
if (qIsNaN(lineData.at(i).y()) || qIsNaN(lineData.at(i).x()) || qIsInf(lineData.at(i).y())) // NaNs create a gap in the line. Also filter Infs which make drawPolyline block
|
||||
|
@ -4694,7 +4743,7 @@ void QCPAbstractPlottable1D<DataType>::drawPolyline(QCPPainter *painter, const Q
|
|||
|
||||
|
||||
/* including file 'src/colorgradient.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 7262 */
|
||||
/* modified 2022-11-06T12:45:56, size 7262 */
|
||||
|
||||
class QCP_LIB_DECL QCPColorGradient
|
||||
{
|
||||
|
@ -4797,7 +4846,7 @@ Q_DECLARE_METATYPE(QCPColorGradient::GradientPreset)
|
|||
|
||||
|
||||
/* including file 'src/selectiondecorator-bracket.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 4458 */
|
||||
/* modified 2022-11-06T12:45:56, size 4458 */
|
||||
|
||||
class QCP_LIB_DECL QCPSelectionDecoratorBracket : public QCPSelectionDecorator
|
||||
{
|
||||
|
@ -4866,7 +4915,7 @@ Q_DECLARE_METATYPE(QCPSelectionDecoratorBracket::BracketStyle)
|
|||
|
||||
|
||||
/* including file 'src/layoutelements/layoutelement-axisrect.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 7529 */
|
||||
/* modified 2022-11-06T12:45:56, size 7529 */
|
||||
|
||||
class QCP_LIB_DECL QCPAxisRect : public QCPLayoutElement
|
||||
{
|
||||
|
@ -4992,7 +5041,7 @@ private:
|
|||
|
||||
|
||||
/* including file 'src/layoutelements/layoutelement-legend.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 10425 */
|
||||
/* modified 2022-11-06T12:45:56, size 10425 */
|
||||
|
||||
class QCP_LIB_DECL QCPAbstractLegendItem : public QCPLayoutElement
|
||||
{
|
||||
|
@ -5210,7 +5259,7 @@ Q_DECLARE_METATYPE(QCPLegend::SelectablePart)
|
|||
|
||||
|
||||
/* including file 'src/layoutelements/layoutelement-textelement.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 5359 */
|
||||
/* modified 2022-11-06T12:45:56, size 5359 */
|
||||
|
||||
class QCP_LIB_DECL QCPTextElement : public QCPLayoutElement
|
||||
{
|
||||
|
@ -5297,7 +5346,7 @@ private:
|
|||
|
||||
|
||||
/* including file 'src/layoutelements/layoutelement-colorscale.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 5939 */
|
||||
/* modified 2022-11-06T12:45:56, size 5939 */
|
||||
|
||||
|
||||
class QCPColorScaleAxisRectPrivate : public QCPAxisRect
|
||||
|
@ -5405,7 +5454,7 @@ private:
|
|||
|
||||
|
||||
/* including file 'src/plottables/plottable-graph.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 9316 */
|
||||
/* modified 2022-11-06T12:45:56, size 9316 */
|
||||
|
||||
class QCP_LIB_DECL QCPGraphData
|
||||
{
|
||||
|
@ -5544,7 +5593,7 @@ Q_DECLARE_METATYPE(QCPGraph::LineStyle)
|
|||
|
||||
|
||||
/* including file 'src/plottables/plottable-curve.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 7434 */
|
||||
/* modified 2022-11-06T12:45:56, size 7434 */
|
||||
|
||||
class QCP_LIB_DECL QCPCurveData
|
||||
{
|
||||
|
@ -5659,7 +5708,7 @@ Q_DECLARE_METATYPE(QCPCurve::LineStyle)
|
|||
|
||||
|
||||
/* including file 'src/plottables/plottable-bars.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 8955 */
|
||||
/* modified 2022-11-06T12:45:56, size 8955 */
|
||||
|
||||
class QCP_LIB_DECL QCPBarsGroup : public QObject
|
||||
{
|
||||
|
@ -5695,7 +5744,7 @@ public:
|
|||
// non-virtual methods:
|
||||
QList<QCPBars*> bars() const { return mBars; }
|
||||
QCPBars* bars(int index) const;
|
||||
int size() const { return static_cast<int>(mBars.size()); }
|
||||
int size() const { return mBars.size(); }
|
||||
bool isEmpty() const { return mBars.isEmpty(); }
|
||||
void clear();
|
||||
bool contains(QCPBars *bars) const { return mBars.contains(bars); }
|
||||
|
@ -5847,7 +5896,7 @@ Q_DECLARE_METATYPE(QCPBars::WidthType)
|
|||
|
||||
|
||||
/* including file 'src/plottables/plottable-statisticalbox.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 7522 */
|
||||
/* modified 2022-11-06T12:45:56, size 7522 */
|
||||
|
||||
class QCP_LIB_DECL QCPStatisticalBoxData
|
||||
{
|
||||
|
@ -5964,7 +6013,7 @@ protected:
|
|||
|
||||
|
||||
/* including file 'src/plottables/plottable-colormap.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 7092 */
|
||||
/* modified 2022-11-06T12:45:56, size 7092 */
|
||||
|
||||
class QCP_LIB_DECL QCPColorMapData
|
||||
{
|
||||
|
@ -6100,7 +6149,7 @@ protected:
|
|||
|
||||
|
||||
/* including file 'src/plottables/plottable-financial.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 8644 */
|
||||
/* modified 2022-11-06T12:45:56, size 8644 */
|
||||
|
||||
class QCP_LIB_DECL QCPFinancialData
|
||||
{
|
||||
|
@ -6239,7 +6288,7 @@ Q_DECLARE_METATYPE(QCPFinancial::ChartStyle)
|
|||
|
||||
|
||||
/* including file 'src/plottables/plottable-errorbar.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 7749 */
|
||||
/* modified 2022-11-06T12:45:56, size 7749 */
|
||||
|
||||
class QCP_LIB_DECL QCPErrorBarsData
|
||||
{
|
||||
|
@ -6255,8 +6304,8 @@ Q_DECLARE_TYPEINFO(QCPErrorBarsData, Q_PRIMITIVE_TYPE);
|
|||
|
||||
/*! \typedef QCPErrorBarsDataContainer
|
||||
|
||||
Container for storing \ref QCPErrorBarsData points. It is a typedef for
|
||||
<tt>QVector<QCPErrorBarsData></tt>.
|
||||
Container for storing \ref QCPErrorBarsData points. It is a typedef for <tt>QVector<\ref
|
||||
QCPErrorBarsData></tt>.
|
||||
|
||||
This is the container in which \ref QCPErrorBars holds its data. Unlike most other data
|
||||
containers for plottables, it is not based on \ref QCPDataContainer. This is because the error
|
||||
|
@ -6364,7 +6413,7 @@ protected:
|
|||
|
||||
|
||||
/* including file 'src/items/item-straightline.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 3137 */
|
||||
/* modified 2022-11-06T12:45:56, size 3137 */
|
||||
|
||||
class QCP_LIB_DECL QCPItemStraightLine : public QCPAbstractItem
|
||||
{
|
||||
|
@ -6407,7 +6456,7 @@ protected:
|
|||
|
||||
|
||||
/* including file 'src/items/item-line.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 3429 */
|
||||
/* modified 2022-11-06T12:45:56, size 3429 */
|
||||
|
||||
class QCP_LIB_DECL QCPItemLine : public QCPAbstractItem
|
||||
{
|
||||
|
@ -6457,7 +6506,7 @@ protected:
|
|||
|
||||
|
||||
/* including file 'src/items/item-curve.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 3401 */
|
||||
/* modified 2022-11-06T12:45:56, size 3401 */
|
||||
|
||||
class QCP_LIB_DECL QCPItemCurve : public QCPAbstractItem
|
||||
{
|
||||
|
@ -6508,7 +6557,7 @@ protected:
|
|||
|
||||
|
||||
/* including file 'src/items/item-rect.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 3710 */
|
||||
/* modified 2022-11-06T12:45:56, size 3710 */
|
||||
|
||||
class QCP_LIB_DECL QCPItemRect : public QCPAbstractItem
|
||||
{
|
||||
|
@ -6567,7 +6616,7 @@ protected:
|
|||
|
||||
|
||||
/* including file 'src/items/item-text.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 5576 */
|
||||
/* modified 2022-11-06T12:45:56, size 5576 */
|
||||
|
||||
class QCP_LIB_DECL QCPItemText : public QCPAbstractItem
|
||||
{
|
||||
|
@ -6664,7 +6713,7 @@ protected:
|
|||
|
||||
|
||||
/* including file 'src/items/item-ellipse.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 3890 */
|
||||
/* modified 2022-11-06T12:45:56, size 3890 */
|
||||
|
||||
class QCP_LIB_DECL QCPItemEllipse : public QCPAbstractItem
|
||||
{
|
||||
|
@ -6726,7 +6775,7 @@ protected:
|
|||
|
||||
|
||||
/* including file 'src/items/item-pixmap.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 4407 */
|
||||
/* modified 2022-11-06T12:45:56, size 4407 */
|
||||
|
||||
class QCP_LIB_DECL QCPItemPixmap : public QCPAbstractItem
|
||||
{
|
||||
|
@ -6795,7 +6844,7 @@ protected:
|
|||
|
||||
|
||||
/* including file 'src/items/item-tracer.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 4811 */
|
||||
/* modified 2022-11-06T12:45:56, size 4811 */
|
||||
|
||||
class QCP_LIB_DECL QCPItemTracer : public QCPAbstractItem
|
||||
{
|
||||
|
@ -6881,7 +6930,7 @@ Q_DECLARE_METATYPE(QCPItemTracer::TracerStyle)
|
|||
|
||||
|
||||
/* including file 'src/items/item-bracket.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 3991 */
|
||||
/* modified 2022-11-06T12:45:56, size 3991 */
|
||||
|
||||
class QCP_LIB_DECL QCPItemBracket : public QCPAbstractItem
|
||||
{
|
||||
|
@ -6948,7 +6997,7 @@ Q_DECLARE_METATYPE(QCPItemBracket::BracketStyle)
|
|||
|
||||
|
||||
/* including file 'src/polar/radialaxis.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 12227 */
|
||||
/* modified 2022-11-06T12:45:56, size 12227 */
|
||||
|
||||
|
||||
class QCP_LIB_DECL QCPPolarAxisRadial : public QCPLayerable
|
||||
|
@ -7200,7 +7249,7 @@ Q_DECLARE_METATYPE(QCPPolarAxisRadial::SelectablePart)
|
|||
|
||||
|
||||
/* including file 'src/polar/layoutelement-angularaxis.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 13461 */
|
||||
/* modified 2022-11-06T12:45:56, size 13461 */
|
||||
|
||||
class QCP_LIB_DECL QCPPolarAxisAngular : public QCPLayoutElement
|
||||
{
|
||||
|
@ -7473,7 +7522,7 @@ Q_DECLARE_METATYPE(QCPPolarAxisAngular::SelectablePart)
|
|||
|
||||
|
||||
/* including file 'src/polar/polargrid.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 4506 */
|
||||
/* modified 2022-11-06T12:45:56, size 4506 */
|
||||
|
||||
class QCP_LIB_DECL QCPPolarGrid :public QCPLayerable
|
||||
{
|
||||
|
@ -7553,7 +7602,7 @@ Q_DECLARE_METATYPE(QCPPolarGrid::GridType)
|
|||
|
||||
|
||||
/* including file 'src/polar/polargraph.h' */
|
||||
/* modified 2021-03-29T02:30:44, size 9606 */
|
||||
/* modified 2022-11-06T12:45:56, size 9606 */
|
||||
|
||||
|
||||
class QCP_LIB_DECL QCPPolarLegendItem : public QCPAbstractLegendItem
|
||||
|
|
Loading…
Reference in New Issue