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

ErgFileplot: Updating the zone-coloring and prediction on changed intensity (#4515)

Browse Source 
This is a followup to #4479, taking care of manually changed intensity:
* Adjusting the coloring when sections change their power zone
* Adjusting the W'Balance prediction
This commit is contained in:
Joachim Kohlhammer
2024-06-22 15:49:35 +02:00
committed by GitHub
parent 0d78b3e9c8
commit 7052724fe7
6 changed files with 79 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Context.h
View File

@@ -209,6 +209,7 @@ class Context : public QObject
void notifyPause() { emit pause(); }
void notifyStop() { emit stop(); }
void notifySeek(long x) { emit seek(x); }
void notifyIntensityChanged(int intensity) { emit intensityChanged(intensity); };
// date range selection
void notifyDateRangeChanged(DateRange x) { dr_=x; emit dateRangeSelected(x); }
@@ -327,6 +328,7 @@ class Context : public QObject
void unpause();
void pause();
void stop();
void intensityChanged(int intensity);
// R messages
void rMessage(QString);

107
src/Train/ErgFilePlot.cpp
View File

@@ -208,9 +208,10 @@ ErgFilePlot::ErgFilePlot(Context *context) : context(context)
pal.setColor(QPalette::Text, GColor(CWBAL));
axisWidget(QwtAxisId(QwtAxis::YRight, 3))->setPalette(pal);
QwtPlot::setAxisFont(QwtAxisId(QwtAxis::YRight, 3), stGiles);
QwtText title2("W'bal");
QwtText title2(tr("W' Balance (J)"));
title2.setFont(stGiles);
QwtPlot::setAxisTitle(QwtAxisId(QwtAxis::YRight,3), title2);
QwtPlot::setAxisTitle(QwtAxisId(QwtAxis::YRight, 3), title2);
setAxisLabelAlignment(QwtAxisId(QwtAxis::YRight, 3), Qt::AlignVCenter);
// telemetry history
wattsCurve = new QwtPlotCurve("Power");
@@ -288,6 +289,7 @@ ErgFilePlot::ErgFilePlot(Context *context) : context(context)
connect(picker, SIGNAL(moved(const QPoint&)), this, SLOT(hover(const QPoint&)));
connect(context, SIGNAL(start()), this, SLOT(startWorkout()));
connect(context, SIGNAL(stop()), this, SLOT(stopWorkout()));
connect(context, SIGNAL(intensityChanged(int)), this, SLOT(intensityChanged(int)));
bydist = false;
ergFile = NULL;
@@ -491,29 +493,7 @@ ErgFilePlot::setData(ErgFile *ergfile)
LodCurve->show();
} else {
QList<ErgFileZoneSection> zoneSections = ergFile->ZoneSections();
bool antiAlias = appsettings->value(this, GC_ANTIALIAS, false).toBool();
for (int i = 0; i < zoneSections.length(); ++i) {
QVector<QPointF> sectionData;
sectionData << QPointF(zoneSections[i].start, zoneSections[i].startValue)
<< QPointF(zoneSections[i].end, zoneSections[i].endValue);
QColor color = QColor(zoneColor(zoneSections[i].zone, 0));
color.setAlpha(sectionAlphaNeutral);
QwtPlotCurve *sectionCurve = new QwtPlotCurve("Course Load");
sectionCurve->setSamples(sectionData);
sectionCurve->setBaseline(-1000);
sectionCurve->setYAxis(QwtAxis::YLeft);
sectionCurve->setZ(-100);
sectionCurve->setPen(QColor(0, 0, 0, 0));
sectionCurve->setBrush(color);
sectionCurve->setRenderHint(QwtPlotItem::RenderAntialiased, antiAlias);
sectionCurve->attach(this);
sectionCurve->hide();
powerSectionCurves.append(sectionCurve);
}
selectCurves();
powerHeadroom->setVisible(true);
powerHeadroom->setSamples(QVector<QPointF> { dynamic_cast<QwtPointArrayData<double>*>(lodData)->boundingRect().bottomLeft() });
createSectionCurve();
QColor brush_color1 = QColor(GColor(CTPOWER));
brush_color1.setAlpha(200);
@@ -636,16 +616,6 @@ ErgFilePlot::setData(ErgFile *ergfile)
}
}
// compute wbal curve for the erg file
calculator.setErg(ergfile);
setAxisTitle(QwtAxisId(QwtAxis::YRight, 3), tr("W' Balance (j)"));
setAxisScale(QwtAxisId(QwtAxis::YRight, 3),qMin(double(calculator.minY-1000),double(0)),calculator.maxY+1000);
setAxisLabelAlignment(QwtAxisId(QwtAxis::YRight, 3),Qt::AlignVCenter);
// and the values ... but avoid sharing!
wbalCurvePredict->setSamples(calculator.xdata(false), calculator.ydata());
} else {
// clear the plot we have nothing selected
@@ -667,6 +637,8 @@ ErgFilePlot::setData(ErgFile *ergfile)
setAxisScale(QwtAxis::XBottom, (double)0, 1000 * 60 * 60, 15*60*1000);
}
updateWBalCurvePredict();
// make the XBottom scale visible
setAxisVisible(QwtAxis::XBottom, true);
}
@@ -977,6 +949,16 @@ ErgFilePlot::selectTooltip
}
void
ErgFilePlot::intensityChanged
(int intensity)
{
Q_UNUSED(intensity);
createSectionCurve();
updateWBalCurvePredict();
}
QString
ErgFilePlot::secsToString
(int fullSecs) const
@@ -1034,6 +1016,61 @@ ErgFilePlot::highlightSectionCurve
}
void
ErgFilePlot::updateWBalCurvePredict
()
{
if (ergFile && ergFile->hasWatts()) {
// compute wbal curve for the erg file
calculator.setErg(ergFile);
setAxisScale(QwtAxisId(QwtAxis::YRight, 3),qMin(double(calculator.minY-1000),double(0)),calculator.maxY+1000);
// and the values ... but avoid sharing!
wbalCurvePredict->setSamples(calculator.xdata(false), calculator.ydata());
wbalCurvePredict->setVisible(true);
} else {
wbalCurvePredict->setVisible(false);
}
}
void
ErgFilePlot::createSectionCurve
()
{
if (ergFile && ergFile->hasWatts()) {
for (int i = 0; i < powerSectionCurves.length(); ++i) {
delete powerSectionCurves[i];
}
powerSectionCurves.clear();
QList<ErgFileZoneSection> zoneSections = ergFile->ZoneSections();
bool antiAlias = appsettings->value(this, GC_ANTIALIAS, false).toBool();
for (int i = 0; i < zoneSections.length(); ++i) {
QVector<QPointF> sectionData;
sectionData << QPointF(zoneSections[i].start, zoneSections[i].startValue)
<< QPointF(zoneSections[i].end, zoneSections[i].endValue);
QColor color = QColor(zoneColor(zoneSections[i].zone, 0));
color.setAlpha(sectionAlphaNeutral);
QwtPlotCurve *sectionCurve = new QwtPlotCurve("Course Load");
sectionCurve->setSamples(sectionData);
sectionCurve->setBaseline(-1000);
sectionCurve->setYAxis(QwtAxis::YLeft);
sectionCurve->setZ(-100);
sectionCurve->setPen(QColor(0, 0, 0, 0));
sectionCurve->setBrush(color);
sectionCurve->setRenderHint(QwtPlotItem::RenderAntialiased, antiAlias);
sectionCurve->attach(this);
sectionCurve->hide();
powerSectionCurves.append(sectionCurve);
}
selectCurves();
powerHeadroom->setVisible(true);
powerHeadroom->setSamples(QVector<QPointF> { dynamic_cast<QwtPointArrayData<double>*>(lodData)->boundingRect().bottomLeft() });
}
}
// curve data.. code snaffled in from the Qwt example (realtime_plot)
CurveData::CurveData(): d_count(0) { }

3
src/Train/ErgFilePlot.h
View File

@@ -161,6 +161,7 @@ class ErgFilePlot : public QwtPlot
void stopWorkout();
void selectCurves();
void selectTooltip();
void intensityChanged(int intensity);
int showColorZones() const;
void setShowColorZones(int index);
@@ -212,6 +213,8 @@ class ErgFilePlot : public QwtPlot
penTooltip *tooltip;
bool workoutActive = false;
void updateWBalCurvePredict();
void createSectionCurve();
void highlightSectionCurve(QwtPlotCurve const * const highlightedCurve);
QString secsToString(int fullSecs) const;
};

2
src/Train/TrainBottom.cpp
View File

@@ -209,7 +209,7 @@ TrainBottom::TrainBottom(TrainSidebar *trainSidebar, QWidget *parent) :
connect(loadUp, SIGNAL(clicked()), m_trainSidebar, SLOT(Higher()));
connect(loadDown, SIGNAL(clicked()), m_trainSidebar, SLOT(Lower()));
connect(intensitySlider, SIGNAL(valueChanged(int)), m_trainSidebar, SLOT(adjustIntensity(int)));
connect(m_trainSidebar, SIGNAL(intensityChanged(int)), intensitySlider, SLOT(setValue(int)));
connect(m_trainSidebar->context, SIGNAL(intensityChanged(int)), intensitySlider, SLOT(setValue(int)));
connect(m_trainSidebar, SIGNAL(setNotification(QString, int)), this, SLOT(setNotification(QString, int)));
connect(m_trainSidebar, SIGNAL(clearNotification(void)), this, SLOT(clearNotification(void)));

2
src/Train/TrainSidebar.cpp
View File

@@ -3002,7 +3002,7 @@ void TrainSidebar::adjustIntensity(int value)
// force replot
context->notifySetNow(context->getNow());
emit intensityChanged(lastAppliedIntensity);
context->notifyIntensityChanged(lastAppliedIntensity);
}
MultiDeviceDialog::MultiDeviceDialog(Context *, TrainSidebar *traintool) : traintool(traintool)

1
src/Train/TrainSidebar.h
View File

@@ -137,7 +137,6 @@ class TrainSidebar : public GcWindow
void start();
void pause();
void stop();
void intensityChanged(int value);
void statusChanged(int status);
void setNotification(QString msg, int timeout);
void clearNotification(void);