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

Fixed crash on startup if no power zones for bikes are defined (#4509)

Browse Source 
Fix for #4508:
* Safeguarded reading zones in TrainSidebar.cpp
* Added additional check to prevent PowerZonesWidget from painting itself
  if zone list is empty
* Returning a empty list from multiple methods in class Zones if given
  range is out of allowed range (was: check only for range too high, below
  0 was ignored):
  * Zones::getZoneLows(.)
  * Zones::getZoneHighs(.)
  * Zones::getZoneNames(.)
  * Zones::getZoneDescriptions(.)
This commit is contained in:
Joachim Kohlhammer
2024-05-31 18:59:02 +02:00
committed by GitHub
parent 804a9046d9
commit e592645cfb
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Metrics/Zones.cpp
View File

@@ -705,7 +705,7 @@ void Zones::setZonesFromCP(int rnum)
// return the list of starting values of zones for a given range
QList <int> Zones::getZoneLows(int rnum) const
{
if (rnum >= ranges.size()) return QList <int>();
if (rnum < 0 || rnum >= ranges.size()) return QList <int>();
const ZoneRange &range = ranges[rnum];
QList <int> return_values;
@@ -721,7 +721,7 @@ QList <int> Zones::getZoneLows(int rnum) const
QList <int> Zones::getZoneHighs(int rnum) const
{
if (rnum >= ranges.size()) return QList <int>();
if (rnum < 0 || rnum >= ranges.size()) return QList <int>();
const ZoneRange &range = ranges[rnum];
QList <int> return_values;
@@ -736,7 +736,7 @@ QList <int> Zones::getZoneHighs(int rnum) const
// return the list of zone names
QList <QString> Zones::getZoneNames(int rnum) const
{
if (rnum >= ranges.size()) return QList <QString>();
if (rnum < 0 || rnum >= ranges.size()) return QList <QString>();
const ZoneRange &range = ranges[rnum];
QList <QString> return_values;
@@ -751,7 +751,7 @@ QList <QString> Zones::getZoneNames(int rnum) const
// return the list of zone names
QList <QString> Zones::getZoneDescriptions(int rnum) const
{
if (rnum >= ranges.size()) return QList <QString>();
if (rnum < 0 || rnum >= ranges.size()) return QList <QString>();
const ZoneRange &range = ranges[rnum];
QList <QString> return_values;

2
src/Train/PowerZonesWidget.cpp
View File

@@ -100,7 +100,7 @@ void
PowerZonesWidget::paintEvent
(QPaintEvent *event)
{
if (dominantZone == 0) {
if (zones.length() == 0 || dominantZone == 0) {
event->accept();
return;
}

16
src/Train/TrainSidebar.cpp
View File

@@ -288,10 +288,12 @@ TrainSidebar::TrainSidebar(Context *context) : GcWindow(context), context(contex
int zonerange = context->athlete->zones("Bike")->whichRange(QDateTime::currentDateTime().date());
int numZones = context->athlete->zones("Bike")->numZones(zonerange);
QList<QColor> zoneColors;
for (int i = 0; i < numZones; ++i) {
zoneColors << zoneColor(i, numZones);
if (zonerange != -1) {
int numZones = context->athlete->zones("Bike")->numZones(zonerange);
for (int i = 0; i < numZones; ++i) {
zoneColors << zoneColor(i, numZones);
}
}
workoutInfo = new InfoWidget(zoneColors, context->athlete->zones("Bike")->getZoneDescriptions(zonerange));
workoutInfo->setFrameStyle(QFrame::NoFrame);
@@ -700,10 +702,12 @@ TrainSidebar::configChanged(qint32 why)
deviceTree->setStyleSheet(GCColor::stylesheet(true));
int zonerange = context->athlete->zones("Bike")->whichRange(QDateTime::currentDateTime().date());
int numZones = context->athlete->zones("Bike")->numZones(zonerange);
QList<QColor> zoneColors;
for (int i = 0; i < numZones; ++i) {
zoneColors << zoneColor(i, numZones);
if (zonerange != -1) {
int numZones = context->athlete->zones("Bike")->numZones(zonerange);
for (int i = 0; i < numZones; ++i) {
zoneColors << zoneColor(i, numZones);
}
}
workoutInfo->setPowerZoneColors(zoneColors);
workoutInfo->setPowerZoneNames(context->athlete->zones("Bike")->getZoneDescriptions(zonerange));