From 33d5c1fe2b722226897a8abc40edbb53de9d068d Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Sun, 19 Apr 2020 14:42:36 +0100 Subject: [PATCH] Cosmetic Updates .. sorry, but the power profile colors are hardcoded (which is fine) but they are too dark, so fixed that up. .. also the overview (until it is configurable) doesn't show total work or variability index. Which I've added as they are quite useful esp. work as a proxy for load and calories. --- src/Charts/CPPlot.cpp | 4 ++-- src/Charts/OverviewWindow.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Charts/CPPlot.cpp b/src/Charts/CPPlot.cpp index 6ef68957c..8eae202e0 100644 --- a/src/Charts/CPPlot.cpp +++ b/src/Charts/CPPlot.cpp @@ -1168,10 +1168,10 @@ CPPlot::plotPowerProfile() if (percentile > 95 || percentile < 5) color = GColor(CPLOTGRID); else if (percentile < 51 && percentile > 49) { color = GColor(CPLOTGRID); - color.setRed(color.red() + 30); + color.setRed(150); } else { color = GColor(CPLOTGRID); - color.setBlue(color.blue() + 50); + color.setBlue(150); } QPen gridpen(color); diff --git a/src/Charts/OverviewWindow.cpp b/src/Charts/OverviewWindow.cpp index 8a7ec1d6e..54c93e01f 100644 --- a/src/Charts/OverviewWindow.cpp +++ b/src/Charts/OverviewWindow.cpp @@ -188,7 +188,7 @@ OverviewWindow::setConfiguration(QString config) newCard(tr("Heartrate Zones"), 1, 2, 11, Card::ZONE, RideFile::hr); newCard(tr("Climbing"), 1, 3, 5, Card::METRIC, "elevation_gain"); newCard(tr("Cadence"), 1, 4, 5, Card::METRIC, "average_cad"); - newCard(tr("Equivalent Power"), 1, 5, 5, Card::METRIC, "coggan_np"); + newCard(tr("Work"), 1, 6, 5, Card::METRIC, "total_work"); // column 2 newCard(tr("RPE"), 2, 0, 9, Card::RPE); @@ -200,7 +200,9 @@ OverviewWindow::setConfiguration(QString config) newCard(tr("Intensity"), 3, 0, 9, Card::METRIC, "coggan_if"); newCard(tr("Power"), 3, 1, 5, Card::METRIC, "average_power"); newCard(tr("Power Zones"), 3, 2, 11, Card::ZONE, RideFile::watts); - newCard(tr("Peak Power Index"), 3, 3, 17, Card::METRIC, "peak_power_index"); + newCard(tr("Equivalent Power"), 3, 3, 5, Card::METRIC, "coggan_np"); + newCard(tr("Peak Power Index"), 3, 4, 5, Card::METRIC, "peak_power_index"); + newCard(tr("Variability"), 3, 5, 5, Card::METRIC, "coggam_variability_index"); // column 4 newCard(tr("Distance"), 4, 0, 9, Card::METRIC, "total_distance");