nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

There are two overloads for QStringList and QVector<QString> (#3977)

Browse Source 
These are not required in Qt6, as QStringList is an QVector<QString>
This commit is contained in:
Andreas Buhr
2024-01-12 00:22:20 +01:00
committed by GitHub
parent 408709c1d6
commit 466bdf1939
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Charts/GenericChart.cpp
View File

@@ -151,6 +151,8 @@ GenericChart::addCurve(QString name, QVector<double> xseries, QVector<double> ys
return true;
}
#if QT_VERSION < 0x060000
// In Qt 6, QStringList is a QVector<QString>, so we don't need an additional overload
// helper for python - no aggregateby, no annotations
bool
GenericChart::addCurve(QString name, QVector<double> xseries, QVector<double> yseries, QStringList fseries, QString xname, QString yname,
@@ -163,6 +165,7 @@ GenericChart::addCurve(QString name, QVector<double> xseries, QVector<double> ys
opengl, legend, datalabels, fill, RideMetric::Average, QList<GenericAnnotationInfo>());
return true;
}
#endif
// configure axis, after curves added
bool

4
src/Charts/GenericChart.h
View File

@@ -319,10 +319,14 @@ class GenericChart : public QWidget {
int line, int symbol, int size, QString color, int opacity, bool opengl, bool legend, bool datalabels,
bool fill, RideMetric::MetricType mtype, QList<GenericAnnotationInfo>annotations);
#if QT_VERSION < 0x060000
// In Qt 6, QStringList is a QVector<QString>, so we don't need an additional overload
// helper for Python and R charts fseries is a stringlist
bool addCurve(QString name, QVector<double> xseries, QVector<double> yseries, QStringList fseries, QString xname, QString yname,
QStringList labels, QStringList colors,
int line, int symbol, int size, QString color, int opacity, bool opengl, bool legend, bool datalabels, bool fill);
#endif
// configure axis, after curves added
bool configureAxis(QString name, bool visible, int align, double min, double max,