From beac898601360f2cdfd3ea043f5cecfb8e17c113 Mon Sep 17 00:00:00 2001 From: Ale Martinez Date: Mon, 21 Oct 2019 21:56:05 -0300 Subject: [PATCH] Fix units of work in tooltips for AllPlot and CPPlot Also change wrong label in PMC (Coggan) Fixes #3194 --- src/Charts/AllPlot.cpp | 4 ++-- src/Charts/CPPlot.cpp | 5 +++++ src/Resources/xml/charts.xml | 2 +- src/Resources/xml/home-layout.xml | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Charts/AllPlot.cpp b/src/Charts/AllPlot.cpp index 14c46caac..19cb3be69 100644 --- a/src/Charts/AllPlot.cpp +++ b/src/Charts/AllPlot.cpp @@ -7058,7 +7058,7 @@ AllPlot::pointHover(QwtPlotCurve *curve, int index) QString paceunit = metricPace ? tr("min/100m") : tr("min/100yd"); paceStr = tr("\n%1 %2").arg(context->athlete->useMetricUnits ? kphToPace(yvalue, metricPace, true) : mphToPace(yvalue, metricPace, true)).arg(paceunit); } - } else if (curve->title() == tr("W'")) { + } else if (curve->title().text().startsWith(tr("W'"))) { // need to scale for W' bal yvalue /= 1000.0f; } else if (curve->title() == tr("Hb")) { @@ -7068,7 +7068,7 @@ AllPlot::pointHover(QwtPlotCurve *curve, int index) } else if (curve->title() == tr("Gear Ratio")) { precision = 2; } - + // output the tooltip QString text = QString("%1\n%2 %3%4\n%5 %6") .arg(this->axisTitle(curve->yAxis()).text()) diff --git a/src/Charts/CPPlot.cpp b/src/Charts/CPPlot.cpp index c88bf708a..5a634625d 100644 --- a/src/Charts/CPPlot.cpp +++ b/src/Charts/CPPlot.cpp @@ -2141,6 +2141,11 @@ CPPlot::pointHover(QwtPlotCurve *curve, int index) units2 = tr("%1 %2").arg(yvalue, 0, 'f', RideFile::decimalsFor(rideSeries)) .arg(tr("J")); // Joule + } else if (criticalSeries == CriticalPowerWindow::work) { + + units2 = tr("%1 %2").arg(yvalue, 0, 'f', 1) + .arg(tr("kJ")); // kJoule + } else if (criticalSeries == CriticalPowerWindow::kph) { if (metricPace) units2 = tr("%1 kph").arg(yvalue, 0, 'f', RideFile::decimalsFor(rideSeries)); diff --git a/src/Resources/xml/charts.xml b/src/Resources/xml/charts.xml index 5b3574b79..8cc9adc68 100644 --- a/src/Resources/xml/charts.xml +++ b/src/Resources/xml/charts.xml @@ -4,7 +4,7 @@ "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AG8AcgBlAAAABABSAFIAAAAQAFQAcgBpAFMAYwBvAHIAZQAAAAAAAwAAAAAAAAAAAAAAAAEVbKj4Yd8eThVsqPgAAAABFWyo+P//////////Af//VVX//wAAAAAAAAAAP/AAAAAAAAAAAAAAAf//AAAAAAAAAAAAAAAAAQAAA+cAAA4QAAAAFgB0AHIAaQBzAGMAbwByAGUAXwByAHIAAAAKAAAAAAAAAAAAAAAADAAyACAAUABhAHIAbQAAAAAAAAAAAAAOEAAAAAAD/////wAAAAAAAw==" "AAAAFgBQAE0AQwAgACgAVABSAEkATQBQACkAAAAWAFAATQBDACAAKABUAFIASQBNAFAAKQAlfRMAAAAA/wAlfrMAAAAA/wAAAAEAAP///////////////wAAAA0AAAADAAAAAgAAAAASAHQAcgBpAG0AcABfAHMAdABzAAAALgBUAFIASQBNAFAAIABTAGgAbwByAHQAIABUAGUAcgBtACAAUwB0AHIAZQBzAHMAAAAuAFQAUgBJAE0AUAAgAFMAaABvAHIAdAAgAFQAZQByAG0AIABTAHQAcgBlAHMAcwAAAAwAUwB0AHIAZQBzAHMAAAAAAAEAAAAAAAAAAAAAAAABAAAAAQAAAAEFrZAAAAB//1+/qXD//////////wH/////xMT//wAAAAAAAD/wAAAAAAAAAAAAAAH//wAAAAAAAAAAAAAAAAAAAAACAAAOEP////8AAAAK/////wAAAAAAAAAADAAyACAAUABhAHIAbQAAAAAAAAPnAAAOEAAAAAAA/////wAAAAIAAAAAEgB0AHIAaQBtAHAAXwBsAHQAcwAAACwAVABSAEkATQBQACAATABvAG4AZwAgAFQAZQByAG0AIABTAHQAcgBlAHMAcwAAACwAVABSAEkATQBQACAATABvAG4AZwAgAFQAZQByAG0AIABTAHQAcgBlAHMAcwAAAAwAUwB0AHIAZQBzAHMAAAAAAAEAAAAAAAAAAAAAAAABAAB//wAAf/9fv9LAAAB//1+/zjD//////////wH//6qq/////wAAAAAAAD/wAAAAAAAAAAAAAAH//wAAAAAAAAAAAAAAAAAAAAACAAAOEP////8AAAAKAAAAAAAAAAAAAAAADAAyACAAUABhAHIAbQAAAAAAAAPnAAAOEAAAAAAA/////wAAAAIAAAAAEAB0AHIAaQBtAHAAXwBzAGIAAAAoAFQAUgBJAE0AUAAgAFMAdAByAGUAcwBzACAAQgBhAGwAYQBuAGMAZQAAACgAVABSAEkATQBQACAAUwB0AHIAZQBzAHMAIABCAGEAbABhAG4AYwBlAAAADABTAHQAcgBlAHMAcwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////Af///////wAAAAAAAAAAP/AAAAAAAAAAAAAAAf//AAAAAAAAAAAAAAAAAAAAAAAAAA4Q/////wAAAAoAAAAAAAAAAAAAAAAMADIAIABQAGEAcgBtAAAAAAAAA+cAAA4QAAAAAAAAAAAcAFMAdAByAGUAcwBzACAAQgBhAGwAYQBuAGMAZQAAAAAAAg==" diff --git a/src/Resources/xml/home-layout.xml b/src/Resources/xml/home-layout.xml index adeb5ebd9..8cf06850b 100644 --- a/src/Resources/xml/home-layout.xml +++ b/src/Resources/xml/home-layout.xml @@ -87,7 +87,7 @@ - +