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

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

Browse Source 
This reverts commit 466bdf1939.
PythonChart connect failed without the removed overload,
as reported in #3893
This commit is contained in:
Alejandro Martinez
2024-01-18 11:47:01 -03:00
parent 0be34094aa
commit 42aa24108c
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Charts/GenericChart.cpp
View File

@@ -151,8 +151,6 @@ 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,
@@ -165,7 +163,6 @@ 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,14 +319,10 @@ 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,