From fb7f6d70d55e24ff2bdd52b2bcb8669e9ae282c0 Mon Sep 17 00:00:00 2001 From: Damien Date: Tue, 6 Jan 2015 18:42:43 +0100 Subject: [PATCH] Garmin Cycling Dynamics : Switch on Power Phase --- src/AllPlot.cpp | 380 +++++++++++++++++----------------- src/AllPlot.h | 24 +-- src/AllPlotInterval.cpp | 3 +- src/AllPlotWindow.cpp | 18 +- src/BasicRideMetrics.cpp | 170 +++++++-------- src/ComparePane.cpp | 2 +- src/Computrainer3dpFile.cpp | 4 +- src/CriticalPowerWindow.cpp | 2 +- src/FitRideFile.cpp | 49 ++--- src/FixGaps.cpp | 34 +-- src/GpxParser.cpp | 2 +- src/IntervalNavigator.cpp | 2 +- src/IntervalSummaryWindow.cpp | 12 +- src/JsonRideFile.l | 16 +- src/JsonRideFile.y | 42 ++-- src/ManualRideFile.cpp | 2 +- src/PwxRideFile.cpp | 4 +- src/RideEditor.cpp | 26 +-- src/RideFile.cpp | 318 ++++++++++++++-------------- src/RideFile.h | 26 +-- src/RideFileTableModel.cpp | 24 +-- src/RideSummaryWindow.cpp | 2 +- src/SplitActivityWizard.cpp | 2 +- 23 files changed, 583 insertions(+), 581 deletions(-) diff --git a/src/AllPlot.cpp b/src/AllPlot.cpp index ce7006543..a183e15d3 100644 --- a/src/AllPlot.cpp +++ b/src/AllPlot.cpp @@ -430,11 +430,11 @@ AllPlotObject::AllPlotObject(AllPlot *plot) : plot(plot) rpcoCurve->setPaintAttribute(QwtPlotCurve::FilterPoints, true); rpcoCurve->setYAxis(QwtAxisId(QwtAxis::yLeft, 3)); - ldcCurve = new QwtPlotIntervalCurve(tr("Left Pedal Power Phase")); - ldcCurve->setYAxis(QwtAxisId(QwtAxis::yLeft, 3)); + lppCurve = new QwtPlotIntervalCurve(tr("Left Pedal Power Phase")); + lppCurve->setYAxis(QwtAxisId(QwtAxis::yLeft, 3)); - rdcCurve = new QwtPlotIntervalCurve(tr("Right Pedal Power Phase")); - rdcCurve->setYAxis(QwtAxisId(QwtAxis::yLeft, 3)); + rppCurve = new QwtPlotIntervalCurve(tr("Right Pedal Power Phase")); + rppCurve->setYAxis(QwtAxisId(QwtAxis::yLeft, 3)); lpppCurve = new QwtPlotIntervalCurve(tr("Left Peak Pedal Power Phase")); lpppCurve->setYAxis(QwtAxisId(QwtAxis::yLeft, 3)); @@ -509,10 +509,10 @@ AllPlotObject::setColor(QColor color) // has to be different... windCurve->setPen(pen); if (antialias)windCurve->setRenderHint(QwtPlotItem::RenderAntialiased); - ldcCurve->setPen(pen); - if (antialias)ldcCurve->setRenderHint(QwtPlotItem::RenderAntialiased); - rdcCurve->setPen(pen); - if (antialias)rdcCurve->setRenderHint(QwtPlotItem::RenderAntialiased); + lppCurve->setPen(pen); + if (antialias)lppCurve->setRenderHint(QwtPlotItem::RenderAntialiased); + rppCurve->setPen(pen); + if (antialias)rppCurve->setRenderHint(QwtPlotItem::RenderAntialiased); lpppCurve->setPen(pen); if (antialias)lpppCurve->setRenderHint(QwtPlotItem::RenderAntialiased); rpppCurve->setPen(pen); @@ -564,8 +564,8 @@ AllPlotObject::~AllPlotObject() rpsCurve->detach(); delete rpsCurve; lpcoCurve->detach(); delete lpcoCurve; rpcoCurve->detach(); delete rpcoCurve; - ldcCurve->detach(); delete ldcCurve; - rdcCurve->detach(); delete rdcCurve; + lppCurve->detach(); delete lppCurve; + rppCurve->detach(); delete rppCurve; lpppCurve->detach(); delete lpppCurve; rpppCurve->detach(); delete rpppCurve; } @@ -612,8 +612,8 @@ AllPlotObject::setVisible(bool show) rpsCurve->detach(); lpcoCurve->detach(); rpcoCurve->detach(); - ldcCurve->detach(); - rdcCurve->detach(); + lppCurve->detach(); + rppCurve->detach(); lpppCurve->detach(); rpppCurve->detach(); balanceLCurve->detach(); @@ -669,8 +669,8 @@ AllPlotObject::setVisible(bool show) rpsCurve->attach(plot); lpcoCurve->attach(plot); rpcoCurve->attach(plot); - ldcCurve->attach(plot); - rdcCurve->attach(plot); + lppCurve->attach(plot); + rppCurve->attach(plot); lpppCurve->attach(plot); rpppCurve->attach(plot); balanceLCurve->attach(plot); @@ -736,8 +736,8 @@ AllPlotObject::hideUnwanted() rpcoCurve->detach(); } if (!plot->showDC) { - ldcCurve->detach(); - rdcCurve->detach(); + lppCurve->detach(); + rppCurve->detach(); } if (!plot->showPPP) { lpppCurve->detach(); @@ -921,8 +921,8 @@ AllPlot::configChanged(qint32) standard->rpsCurve->setRenderHint(QwtPlotItem::RenderAntialiased); standard->lpcoCurve->setRenderHint(QwtPlotItem::RenderAntialiased); standard->rpcoCurve->setRenderHint(QwtPlotItem::RenderAntialiased); - standard->ldcCurve->setRenderHint(QwtPlotItem::RenderAntialiased); - standard->rdcCurve->setRenderHint(QwtPlotItem::RenderAntialiased); + standard->lppCurve->setRenderHint(QwtPlotItem::RenderAntialiased); + standard->rppCurve->setRenderHint(QwtPlotItem::RenderAntialiased); standard->lpppCurve->setRenderHint(QwtPlotItem::RenderAntialiased); standard->rpppCurve->setRenderHint(QwtPlotItem::RenderAntialiased); standard->balanceLCurve->setRenderHint(QwtPlotItem::RenderAntialiased); @@ -1049,10 +1049,10 @@ AllPlot::configChanged(qint32) standard->rpcoCurve->setPen(rpcoPen); QPen ldcPen = QPen(GColor(CLPS)); ldcPen.setWidth(width); - standard->ldcCurve->setPen(ldcPen); + standard->lppCurve->setPen(ldcPen); QPen rdcPen = QPen(GColor(CRPS)); rdcPen.setWidth(width); - standard->rdcCurve->setPen(rdcPen); + standard->rppCurve->setPen(rdcPen); QPen lpppPen = QPen(GColor(CLPS)); lpppPen.setWidth(width); standard->lpppCurve->setPen(lpppPen); @@ -1209,13 +1209,13 @@ AllPlot::configChanged(qint32) p.setAlpha(64); standard->rpcoCurve->setBrush(QBrush(p)); - p = standard->ldcCurve->pen().color(); + p = standard->lppCurve->pen().color(); p.setAlpha(64); - standard->ldcCurve->setBrush(QBrush(p)); + standard->lppCurve->setBrush(QBrush(p)); - p = standard->rdcCurve->pen().color(); + p = standard->rppCurve->pen().color(); p.setAlpha(64); - standard->rdcCurve->setBrush(QBrush(p)); + standard->rppCurve->setBrush(QBrush(p)); p = standard->lpppCurve->pen().color(); p.setAlpha(64); @@ -1272,8 +1272,8 @@ AllPlot::configChanged(qint32) standard->rpsCurve->setBrush(Qt::NoBrush); standard->lpcoCurve->setBrush(Qt::NoBrush); standard->rpcoCurve->setBrush(Qt::NoBrush); - standard->ldcCurve->setBrush(Qt::NoBrush); - standard->rdcCurve->setBrush(Qt::NoBrush); + standard->lppCurve->setBrush(Qt::NoBrush); + standard->rppCurve->setBrush(Qt::NoBrush); standard->lpppCurve->setBrush(Qt::NoBrush); standard->rpppCurve->setBrush(Qt::NoBrush); standard->slopeCurve->setBrush(Qt::NoBrush); @@ -1448,19 +1448,19 @@ struct DataPoint { double time, hr, watts, atiss, antiss, np, rv, rcad, rgct, smo2, thb, o2hb, hhb, ap, xp, speed, cad, alt, temp, wind, torque, lrbalance, lte, rte, lps, rps, - lpco, rpco, ltdc, rtdc, lbdc, rbdc, ltppp, rtppp, lbppp, rbppp, + lpco, rpco, lppb, rppb, lppe, rppe, lpppb, rpppb, lpppe, rpppe, kphd, wattsd, cadd, nmd, hrd, slope; DataPoint(double t, double h, double w, double at, double an, double n, double rv, double rcad, double rgct, double smo2, double thb, double o2hb, double hhb, double l, double x, double s, double c, double a, double te, double wi, double tq, double lrb, double lte, double rte, double lps, double rps, - double lpco, double rpco, double ltdc, double rtdc, double lbdc, double rbdc, double ltppp, double rtppp, double lbppp, double rbppp, + double lpco, double rpco, double lppb, double rppb, double lppe, double rppe, double lpppb, double rpppb, double lpppe, double rpppe, double kphd, double wattsd, double cadd, double nmd, double hrd, double sl) : time(t), hr(h), watts(w), atiss(at), antiss(an), np(n), rv(rv), rcad(rcad), rgct(rgct), smo2(smo2), thb(thb), o2hb(o2hb), hhb(hhb), ap(l), xp(x), speed(s), cad(c), alt(a), temp(te), wind(wi), torque(tq), lrbalance(lrb), lte(lte), rte(rte), lps(lps), rps(rps), - lpco(lpco), rpco(rpco), ltdc(ltdc), rtdc(rtdc), lbdc(lbdc), rbdc(rbdc), ltppp(ltppp), rtppp(rtppp), lbppp(lbppp), rbppp(rbppp), + lpco(lpco), rpco(rpco), lppb(lppb), rppb(rppb), lppe(lppe), rppe(rppe), lpppb(lpppb), rpppb(rpppb), lpppe(lpppe), rpppe(rpppe), kphd(kphd), wattsd(wattsd), cadd(cadd), nmd(nmd), hrd(hrd), slope(sl) {} }; @@ -1619,10 +1619,10 @@ AllPlot::recalc(AllPlotObject *objects) if (!objects->rpsArray.empty()) objects->rpsCurve->setSamples(data, data); if (!objects->lpcoArray.empty()) objects->lpcoCurve->setSamples(data, data); if (!objects->rpcoArray.empty()) objects->rpcoCurve->setSamples(data, data); - if (!objects->ltdcArray.empty()) objects->ldcCurve->setSamples(new QwtIntervalSeriesData(intData)); - if (!objects->rtdcArray.empty()) objects->rdcCurve->setSamples(new QwtIntervalSeriesData(intData));; - if (!objects->ltpppArray.empty()) objects->lpppCurve->setSamples(new QwtIntervalSeriesData(intData)); - if (!objects->rtpppArray.empty()) objects->rpppCurve->setSamples(new QwtIntervalSeriesData(intData)); + if (!objects->lppbArray.empty()) objects->lppCurve->setSamples(new QwtIntervalSeriesData(intData)); + if (!objects->rppbArray.empty()) objects->rppCurve->setSamples(new QwtIntervalSeriesData(intData));; + if (!objects->lpppbArray.empty()) objects->lpppCurve->setSamples(new QwtIntervalSeriesData(intData)); + if (!objects->rpppbArray.empty()) objects->rpppCurve->setSamples(new QwtIntervalSeriesData(intData)); return; } @@ -1670,14 +1670,14 @@ AllPlot::recalc(AllPlotObject *objects) double totalRPS = 0.0; double totalLPCO = 0.0; double totalRPCO = 0.0; - double totalLTDC = 0.0; - double totalRTDC = 0.0; - double totalLBDC = 0.0; - double totalRBDC = 0.0; - double totalLTPPP = 0.0; - double totalRTPPP = 0.0; - double totalLBPPP = 0.0; - double totalRBPPP = 0.0; + double totalLPPB = 0.0; + double totalRPPB = 0.0; + double totalLPPE = 0.0; + double totalRPPE = 0.0; + double totalLPPPB = 0.0; + double totalRPPPB = 0.0; + double totalLPPPE = 0.0; + double totalRPPPE = 0.0; QList list; @@ -1720,8 +1720,8 @@ AllPlot::recalc(AllPlotObject *objects) objects->smoothRPS.resize(rideTimeSecs + 1); objects->smoothLPCO.resize(rideTimeSecs + 1); objects->smoothRPCO.resize(rideTimeSecs + 1); - objects->smoothLDC.resize(rideTimeSecs + 1); - objects->smoothRDC.resize(rideTimeSecs + 1); + objects->smoothLPP.resize(rideTimeSecs + 1); + objects->smoothRPP.resize(rideTimeSecs + 1); objects->smoothLPPP.resize(rideTimeSecs + 1); objects->smoothRPPP.resize(rideTimeSecs + 1); @@ -1759,14 +1759,14 @@ AllPlot::recalc(AllPlotObject *objects) (!objects->rpsArray.empty() ? objects->rpsArray[i] : 0), (!objects->lpcoArray.empty() ? objects->lpcoArray[i] : 0), (!objects->rpcoArray.empty() ? objects->rpcoArray[i] : 0), - (!objects->ltdcArray.empty() ? objects->ltdcArray[i] : 0), - (!objects->rtdcArray.empty() ? objects->rtdcArray[i] : 0), - (!objects->lbdcArray.empty() ? objects->lbdcArray[i] : 0), - (!objects->rbdcArray.empty() ? objects->rbdcArray[i] : 0), - (!objects->ltpppArray.empty() ? objects->ltpppArray[i] : 0), - (!objects->rtpppArray.empty() ? objects->rtpppArray[i] : 0), - (!objects->lbpppArray.empty() ? objects->lbpppArray[i] : 0), - (!objects->rbpppArray.empty() ? objects->rbpppArray[i] : 0), + (!objects->lppbArray.empty() ? objects->lppbArray[i] : 0), + (!objects->rppbArray.empty() ? objects->rppbArray[i] : 0), + (!objects->lppeArray.empty() ? objects->lppeArray[i] : 0), + (!objects->rppeArray.empty() ? objects->rppeArray[i] : 0), + (!objects->lpppbArray.empty() ? objects->lpppbArray[i] : 0), + (!objects->rpppbArray.empty() ? objects->rpppbArray[i] : 0), + (!objects->lpppeArray.empty() ? objects->lpppeArray[i] : 0), + (!objects->rpppeArray.empty() ? objects->rpppeArray[i] : 0), (!objects->accelArray.empty() ? objects->accelArray[i] : 0), (!objects->wattsDArray.empty() ? objects->wattsDArray[i] : 0), (!objects->cadDArray.empty() ? objects->cadDArray[i] : 0), @@ -1837,22 +1837,22 @@ AllPlot::recalc(AllPlotObject *objects) totalLPCO += objects->lpcoArray[i]; if (!objects->rpcoArray.empty()) totalRPCO += objects->rpcoArray[i]; - if (!objects->ltdcArray.empty()) - totalLTDC += (objects->ltdcArray[i]>0?objects->ltdcArray[i]:0); - if (!objects->rtdcArray.empty()) - totalRTDC += (objects->rtdcArray[i]>0?objects->rtdcArray[i]:0); - if (!objects->lbdcArray.empty()) - totalLBDC += (objects->lbdcArray[i]>0?objects->lbdcArray[i]:0); - if (!objects->rbdcArray.empty()) - totalRBDC += (objects->rbdcArray[i]>0?objects->rbdcArray[i]:0); - if (!objects->ltpppArray.empty()) - totalLTPPP += (objects->ltpppArray[i]>0?objects->ltpppArray[i]:0); - if (!objects->rtpppArray.empty()) - totalRTPPP += (objects->rtpppArray[i]>0?objects->rtpppArray[i]:0); - if (!objects->lbpppArray.empty()) - totalLBPPP += (objects->lbpppArray[i]>0?objects->lbpppArray[i]:0); - if (!objects->rbpppArray.empty()) - totalRBPPP += (objects->rbpppArray[i]>0?objects->rbpppArray[i]:0); + if (!objects->lppbArray.empty()) + totalLPPB += (objects->lppbArray[i]>0?objects->lppbArray[i]:0); + if (!objects->rppbArray.empty()) + totalRPPB += (objects->rppbArray[i]>0?objects->rppbArray[i]:0); + if (!objects->lppeArray.empty()) + totalLPPE += (objects->lppeArray[i]>0?objects->lppeArray[i]:0); + if (!objects->rppeArray.empty()) + totalRPPE += (objects->rppeArray[i]>0?objects->rppeArray[i]:0); + if (!objects->lpppbArray.empty()) + totalLPPPB += (objects->lpppbArray[i]>0?objects->lpppbArray[i]:0); + if (!objects->rpppbArray.empty()) + totalRPPPB += (objects->rpppbArray[i]>0?objects->rpppbArray[i]:0); + if (!objects->lpppeArray.empty()) + totalLPPPE += (objects->lpppeArray[i]>0?objects->lpppeArray[i]:0); + if (!objects->rpppeArray.empty()) + totalRPPPE += (objects->rpppeArray[i]>0?objects->rpppeArray[i]:0); totalDist = objects->distanceArray[i]; list.append(dp); @@ -1892,14 +1892,14 @@ AllPlot::recalc(AllPlotObject *objects) totalRPS -= dp.rps; totalLPCO -= dp.lpco; totalRPCO -= dp.rpco; - totalLTDC -= dp.ltdc; - totalRTDC -= dp.rtdc; - totalLBDC -= dp.lbdc; - totalRBDC -= dp.rbdc; - totalLTPPP -= dp.ltppp; - totalRTPPP -= dp.rtppp; - totalLBPPP -= dp.lbppp; - totalRBPPP -= dp.rbppp; + totalLPPB -= dp.lppb; + totalRPPB -= dp.rppb; + totalLPPE -= dp.lppe; + totalRPPE -= dp.rppe; + totalLPPPB -= dp.lpppb; + totalRPPPB -= dp.rpppb; + totalLPPPE -= dp.lpppe; + totalRPPPE -= dp.rpppe; totalBalance -= (dp.lrbalance>0?dp.lrbalance:50); list.removeFirst(); } @@ -1939,8 +1939,8 @@ AllPlot::recalc(AllPlotObject *objects) objects->smoothRPS[secs] = 0.0; objects->smoothLPCO[secs] = 0.0; objects->smoothRPCO[secs] = 0.0; - objects->smoothLDC[secs] = QwtIntervalSample(); - objects->smoothRDC[secs] = QwtIntervalSample(); + objects->smoothLPP[secs] = QwtIntervalSample(); + objects->smoothRPP[secs] = QwtIntervalSample(); objects->smoothLPPP[secs] = QwtIntervalSample(); objects->smoothRPPP[secs] = QwtIntervalSample(); objects->smoothBalanceL[secs] = 50; @@ -1995,10 +1995,10 @@ AllPlot::recalc(AllPlotObject *objects) objects->smoothRPS[secs] = totalRPS / list.size(); objects->smoothLPCO[secs] = totalLPCO / list.size(); objects->smoothRPCO[secs] = totalRPCO / list.size(); - objects->smoothLDC[secs] = QwtIntervalSample( bydist ? totalDist : secs / 60.0, QwtInterval(totalLTDC / list.size(), totalLBDC / list.size() ) ); - objects->smoothRDC[secs] = QwtIntervalSample( bydist ? totalDist : secs / 60.0, QwtInterval(totalRTDC / list.size(), totalRBDC / list.size() ) ); - objects->smoothLPPP[secs] = QwtIntervalSample( bydist ? totalDist : secs / 60.0, QwtInterval(totalLTPPP / list.size(), totalLBPPP / list.size() ) ); - objects->smoothRPPP[secs] = QwtIntervalSample( bydist ? totalDist : secs / 60.0, QwtInterval(totalRTPPP / list.size(), totalRBPPP / list.size() ) ); + objects->smoothLPP[secs] = QwtIntervalSample( bydist ? totalDist : secs / 60.0, QwtInterval(totalLPPB / list.size(), totalLPPE / list.size() ) ); + objects->smoothRPP[secs] = QwtIntervalSample( bydist ? totalDist : secs / 60.0, QwtInterval(totalRPPB / list.size(), totalRPPE / list.size() ) ); + objects->smoothLPPP[secs] = QwtIntervalSample( bydist ? totalDist : secs / 60.0, QwtInterval(totalLPPPB / list.size(), totalLPPPE / list.size() ) ); + objects->smoothRPPP[secs] = QwtIntervalSample( bydist ? totalDist : secs / 60.0, QwtInterval(totalRPPPB / list.size(), totalRPPPE / list.size() ) ); } objects->smoothDistance[secs] = totalDist; objects->smoothTime[secs] = secs / 60.0; @@ -2050,8 +2050,8 @@ AllPlot::recalc(AllPlotObject *objects) objects->smoothRPS.resize(0); objects->smoothLPCO.resize(0); objects->smoothRPCO.resize(0); - objects->smoothLDC.resize(0); - objects->smoothRDC.resize(0); + objects->smoothLPP.resize(0); + objects->smoothRPP.resize(0); objects->smoothLPPP.resize(0); objects->smoothRPPP.resize(0); objects->smoothBalanceL.resize(0); @@ -2108,10 +2108,10 @@ AllPlot::recalc(AllPlotObject *objects) objects->smoothRPS.append(dp->rps); objects->smoothLPCO.append(dp->lpco); objects->smoothRPCO.append(dp->rpco); - objects->smoothLDC.append(QwtIntervalSample( bydist ? objects->smoothDistance.last() : objects->smoothTime.last(), QwtInterval(dp->ltdc , dp->rbdc ) )); - objects->smoothRDC.append(QwtIntervalSample( bydist ? objects->smoothDistance.last() : objects->smoothTime.last(), QwtInterval(dp->rtdc , dp->rbdc ) )); - objects->smoothLPPP.append(QwtIntervalSample( bydist ? objects->smoothDistance.last() : objects->smoothTime.last(), QwtInterval(dp->ltppp , dp->lbppp ) )); - objects->smoothRPPP.append(QwtIntervalSample( bydist ? objects->smoothDistance.last() : objects->smoothTime.last(), QwtInterval(dp->rtppp , dp->rbppp ) )); + objects->smoothLPP.append(QwtIntervalSample( bydist ? objects->smoothDistance.last() : objects->smoothTime.last(), QwtInterval(dp->lppb , dp->rppe ) )); + objects->smoothRPP.append(QwtIntervalSample( bydist ? objects->smoothDistance.last() : objects->smoothTime.last(), QwtInterval(dp->rppb , dp->rppe ) )); + objects->smoothLPPP.append(QwtIntervalSample( bydist ? objects->smoothDistance.last() : objects->smoothTime.last(), QwtInterval(dp->lpppb , dp->lpppe ) )); + objects->smoothRPPP.append(QwtIntervalSample( bydist ? objects->smoothDistance.last() : objects->smoothTime.last(), QwtInterval(dp->rpppb , dp->rpppe ) )); double head = dp->headwind * (context->athlete->useMetricUnits ? 1.0f : MILES_PER_KM); @@ -2265,16 +2265,16 @@ AllPlot::recalc(AllPlotObject *objects) objects->smoothLPCO.data() + startingIndex, totalPoints); if (!objects->rpcoArray.empty()) objects->rpcoCurve->setSamples(xaxis.data() + startingIndex, objects->smoothRPCO.data() + startingIndex, totalPoints); - if (!objects->ltdcArray.empty()) { - objects->ldcCurve->setSamples(new QwtIntervalSeriesData(objects->smoothLDC)); + if (!objects->lppbArray.empty()) { + objects->lppCurve->setSamples(new QwtIntervalSeriesData(objects->smoothLPP)); } - if (!objects->rtdcArray.empty()) { - objects->rdcCurve->setSamples(new QwtIntervalSeriesData(objects->smoothRDC)); + if (!objects->rppbArray.empty()) { + objects->rppCurve->setSamples(new QwtIntervalSeriesData(objects->smoothRPP)); } - if (!objects->ltpppArray.empty()) { + if (!objects->lpppbArray.empty()) { objects->lpppCurve->setSamples(new QwtIntervalSeriesData(objects->smoothLPPP)); } - if (!objects->rtpppArray.empty()) { + if (!objects->rpppbArray.empty()) { objects->rpppCurve->setSamples(new QwtIntervalSeriesData(objects->smoothRPPP)); } @@ -2849,8 +2849,8 @@ AllPlot::setDataFromPlot(AllPlot *plot, int startidx, int stopidx) double *smoothRPS = &plot->standard->smoothRPS[startidx]; double *smoothLPCO = &plot->standard->smoothLPCO[startidx]; double *smoothRPCO = &plot->standard->smoothRPCO[startidx]; - QwtIntervalSample *smoothLDC = &plot->standard->smoothLDC[startidx]; - QwtIntervalSample *smoothRDC = &plot->standard->smoothRDC[startidx]; + QwtIntervalSample *smoothLPP = &plot->standard->smoothLPP[startidx]; + QwtIntervalSample *smoothRPP = &plot->standard->smoothRPP[startidx]; QwtIntervalSample *smoothLPPP = &plot->standard->smoothLPPP[startidx]; QwtIntervalSample *smoothRPPP = &plot->standard->smoothRPPP[startidx]; @@ -2947,8 +2947,8 @@ AllPlot::setDataFromPlot(AllPlot *plot, int startidx, int stopidx) standard->balanceRCurve->detach(); standard->lpcoCurve->detach(); standard->rpcoCurve->detach(); - standard->ldcCurve->detach(); - standard->rdcCurve->detach(); + standard->lppCurve->detach(); + standard->rppCurve->detach(); standard->lpppCurve->detach(); standard->rpppCurve->detach(); @@ -2990,10 +2990,10 @@ AllPlot::setDataFromPlot(AllPlot *plot, int startidx, int stopidx) standard->balanceRCurve->setVisible(rideItem->ride()->areDataPresent()->lrbalance && showBalance); standard->lpcoCurve->setVisible(rideItem->ride()->areDataPresent()->lpco && showPCO); standard->rpcoCurve->setVisible(rideItem->ride()->areDataPresent()->rpco && showPCO); - standard->ldcCurve->setVisible(rideItem->ride()->areDataPresent()->ltdc && showDC); - standard->rdcCurve->setVisible(rideItem->ride()->areDataPresent()->rtdc && showDC); - standard->lpppCurve->setVisible(rideItem->ride()->areDataPresent()->ltppp && showPPP); - standard->rpppCurve->setVisible(rideItem->ride()->areDataPresent()->rtppp && showPPP); + standard->lppCurve->setVisible(rideItem->ride()->areDataPresent()->lppb && showDC); + standard->rppCurve->setVisible(rideItem->ride()->areDataPresent()->rppb && showDC); + standard->lpppCurve->setVisible(rideItem->ride()->areDataPresent()->lpppb && showPPP); + standard->rpppCurve->setVisible(rideItem->ride()->areDataPresent()->rpppb && showPPP); if (showW) { standard->wCurve->setSamples(bydist ? plot->standard->wprimeDist.data() : plot->standard->wprimeTime.data(), @@ -3044,11 +3044,11 @@ AllPlot::setDataFromPlot(AllPlot *plot, int startidx, int stopidx) standard->rpcoCurve->setSamples(xaxis, smoothRPCO, points); QVector tmpLDC(points); - memcpy(tmpLDC.data(), smoothLDC, (points) * sizeof(QwtIntervalSample)); - standard->ldcCurve->setSamples(new QwtIntervalSeriesData(tmpLDC)); + memcpy(tmpLDC.data(), smoothLPP, (points) * sizeof(QwtIntervalSample)); + standard->lppCurve->setSamples(new QwtIntervalSeriesData(tmpLDC)); QVector tmpRDC(points); - memcpy(tmpRDC.data(), smoothRDC, (points) * sizeof(QwtIntervalSample)); - standard->rdcCurve->setSamples(new QwtIntervalSeriesData(tmpRDC)); + memcpy(tmpRDC.data(), smoothRPP, (points) * sizeof(QwtIntervalSample)); + standard->rppCurve->setSamples(new QwtIntervalSeriesData(tmpRDC)); QVector tmpLPPP(points); memcpy(tmpLPPP.data(), smoothLPPP, (points) * sizeof(QwtIntervalSample)); standard->lpppCurve->setSamples(new QwtIntervalSeriesData(tmpLPPP)); @@ -3211,9 +3211,9 @@ AllPlot::setDataFromPlot(AllPlot *plot, int startidx, int stopidx) standard->lpcoCurve->attach(this); standard->rpcoCurve->attach(this); } - if (!plot->standard->smoothLDC.empty()) { - standard->ldcCurve->attach(this); - standard->rdcCurve->attach(this); + if (!plot->standard->smoothLPP.empty()) { + standard->lppCurve->attach(this); + standard->rppCurve->attach(this); } if (!plot->standard->smoothLPPP.empty()) { standard->lpppCurve->attach(this); @@ -3289,8 +3289,8 @@ AllPlot::setDataFromPlot(AllPlot *plot) standard->rpsCurve->detach(); standard->lpcoCurve->detach(); standard->rpcoCurve->detach(); - standard->ldcCurve->detach(); - standard->rdcCurve->detach(); + standard->lppCurve->detach(); + standard->rppCurve->detach(); standard->lpppCurve->detach(); standard->rpppCurve->detach(); @@ -3332,8 +3332,8 @@ AllPlot::setDataFromPlot(AllPlot *plot) standard->rpsCurve->setVisible(false); standard->lpcoCurve->setVisible(false); standard->rpcoCurve->setVisible(false); - standard->ldcCurve->setVisible(false); - standard->rdcCurve->setVisible(false); + standard->lppCurve->setVisible(false); + standard->rppCurve->setVisible(false); standard->lpppCurve->setVisible(false); standard->rpppCurve->setVisible(false); @@ -3617,23 +3617,23 @@ AllPlot::setDataFromPlot(AllPlot *plot) } break; - case RideFile::ltdc: + case RideFile::lppb: { - ourICurve = standard->ldcCurve; - thereICurve = referencePlot->standard->ldcCurve; + ourICurve = standard->lppCurve; + thereICurve = referencePlot->standard->lppCurve; title = tr("Left Power Phase"); } break; - case RideFile::rtdc: + case RideFile::rppb: { - ourICurve = standard->rdcCurve; - thereICurve = referencePlot->standard->rdcCurve; + ourICurve = standard->rppCurve; + thereICurve = referencePlot->standard->rppCurve; title = tr("Right Power Phase"); } break; - case RideFile::ltppp: + case RideFile::lpppb: { ourICurve = standard->lpppCurve; thereICurve = referencePlot->standard->lpppCurve; @@ -3641,7 +3641,7 @@ AllPlot::setDataFromPlot(AllPlot *plot) } break; - case RideFile::rtppp: + case RideFile::rpppb: { ourICurve = standard->rpppCurve; thereICurve = referencePlot->standard->rpppCurve; @@ -3896,8 +3896,8 @@ AllPlot::setDataFromPlots(QList plots) standard->rpsCurve->detach(); standard->lpcoCurve->detach(); standard->rpcoCurve->detach(); - standard->ldcCurve->detach(); - standard->rdcCurve->detach(); + standard->lppCurve->detach(); + standard->rppCurve->detach(); standard->lpppCurve->detach(); standard->rpppCurve->detach(); @@ -3939,8 +3939,8 @@ AllPlot::setDataFromPlots(QList plots) standard->rpsCurve->setVisible(false); standard->lpcoCurve->setVisible(false); standard->rpcoCurve->setVisible(false); - standard->ldcCurve->setVisible(false); - standard->rdcCurve->setVisible(false); + standard->lppCurve->setVisible(false); + standard->rppCurve->setVisible(false); standard->lpppCurve->setVisible(false); standard->rpppCurve->setVisible(false); @@ -4284,26 +4284,26 @@ AllPlot::setDataFromPlots(QList plots) } break; - case RideFile::ltdc: - case RideFile::lbdc: + case RideFile::lppb: + case RideFile::lppe: { ourICurve = new QwtPlotIntervalCurve(tr("Left Power Phase")); - thereICurve = referencePlot->standard->ldcCurve; + thereICurve = referencePlot->standard->lppCurve; title = tr("Left Power Phase"); } break; - case RideFile::rtdc: - case RideFile::rbdc: + case RideFile::rppb: + case RideFile::rppe: { ourICurve = new QwtPlotIntervalCurve(tr("Right Power Phase")); - thereICurve = referencePlot->standard->rdcCurve; + thereICurve = referencePlot->standard->rppCurve; title = tr("Right Power Phase"); } break; - case RideFile::ltppp: - case RideFile::lbppp: + case RideFile::lpppb: + case RideFile::lpppe: { ourICurve = new QwtPlotIntervalCurve(tr("Left Peak Power Phase")); thereICurve = referencePlot->standard->lpppCurve; @@ -4311,8 +4311,8 @@ AllPlot::setDataFromPlots(QList plots) } break; - case RideFile::rtppp: - case RideFile::rbppp: + case RideFile::rpppb: + case RideFile::rpppe: { ourICurve = new QwtPlotIntervalCurve(tr("Right Peak Power Phase")); thereICurve = referencePlot->standard->rpppCurve; @@ -4849,25 +4849,25 @@ AllPlot::setDataFromObject(AllPlotObject *object, AllPlot *reference) standard->rpcoCurve->setVisible(true); } - if (!object->ltdcArray.empty()) { - standard->ldcCurve->setSamples(new QwtIntervalSeriesData(object->smoothLDC)); - standard->ldcCurve->attach(this); - standard->ldcCurve->setVisible(true); + if (!object->lppbArray.empty()) { + standard->lppCurve->setSamples(new QwtIntervalSeriesData(object->smoothLPP)); + standard->lppCurve->attach(this); + standard->lppCurve->setVisible(true); } - if (!object->rtdcArray.empty()) { - standard->rdcCurve->setSamples(new QwtIntervalSeriesData(object->smoothRDC)); - standard->rdcCurve->attach(this); - standard->rdcCurve->setVisible(true); + if (!object->rppbArray.empty()) { + standard->rppCurve->setSamples(new QwtIntervalSeriesData(object->smoothRPP)); + standard->rppCurve->attach(this); + standard->rppCurve->setVisible(true); } - if (!object->ltpppArray.empty()) { + if (!object->lpppbArray.empty()) { standard->lpppCurve->setSamples(new QwtIntervalSeriesData(object->smoothLPPP)); standard->lpppCurve->attach(this); standard->lpppCurve->setVisible(true); } - if (!object->rtpppArray.empty()) { + if (!object->rpppbArray.empty()) { standard->rpppCurve->setSamples(new QwtIntervalSeriesData(object->smoothRPPP)); standard->rpppCurve->attach(this); standard->rpppCurve->setVisible(true); @@ -4915,8 +4915,8 @@ AllPlot::setDataFromObject(AllPlotObject *object, AllPlot *reference) standard->rpsCurve->setVisible(referencePlot->showPS); standard->lpcoCurve->setVisible(referencePlot->showPCO); standard->rpcoCurve->setVisible(referencePlot->showPCO); - standard->ldcCurve->setVisible(referencePlot->showDC); - standard->rdcCurve->setVisible(referencePlot->showDC); + standard->lppCurve->setVisible(referencePlot->showDC); + standard->rppCurve->setVisible(referencePlot->showDC); standard->lpppCurve->setVisible(referencePlot->showPPP); standard->rpppCurve->setVisible(referencePlot->showPPP); @@ -5014,14 +5014,14 @@ AllPlot::setDataFromRideFile(RideFile *ride, AllPlotObject *here) here->rpsArray.resize(dataPresent->rps ? npoints : 0); here->lpcoArray.resize(dataPresent->lpco ? npoints : 0); here->rpcoArray.resize(dataPresent->rpco ? npoints : 0); - here->ltdcArray.resize(dataPresent->ltdc ? npoints : 0); - here->rtdcArray.resize(dataPresent->rtdc ? npoints : 0); - here->lbdcArray.resize(dataPresent->lbdc ? npoints : 0); - here->rbdcArray.resize(dataPresent->rbdc ? npoints : 0); - here->ltpppArray.resize(dataPresent->ltppp ? npoints : 0); - here->rtpppArray.resize(dataPresent->rtppp ? npoints : 0); - here->lbpppArray.resize(dataPresent->lbppp ? npoints : 0); - here->rbpppArray.resize(dataPresent->rbppp ? npoints : 0); + here->lppbArray.resize(dataPresent->lppb ? npoints : 0); + here->rppbArray.resize(dataPresent->rppb ? npoints : 0); + here->lppeArray.resize(dataPresent->lppe ? npoints : 0); + here->rppeArray.resize(dataPresent->rppe ? npoints : 0); + here->lpppbArray.resize(dataPresent->lpppb ? npoints : 0); + here->rpppbArray.resize(dataPresent->rpppb ? npoints : 0); + here->lpppeArray.resize(dataPresent->lpppe ? npoints : 0); + here->rpppeArray.resize(dataPresent->rpppe ? npoints : 0); here->timeArray.resize(npoints); here->distanceArray.resize(npoints); @@ -5064,8 +5064,8 @@ AllPlot::setDataFromRideFile(RideFile *ride, AllPlotObject *here) here->rpsCurve->detach(); here->lpcoCurve->detach(); here->rpcoCurve->detach(); - here->ldcCurve->detach(); - here->rdcCurve->detach(); + here->lppCurve->detach(); + here->rppCurve->detach(); here->lpppCurve->detach(); here->rpppCurve->detach(); @@ -5122,11 +5122,11 @@ AllPlot::setDataFromRideFile(RideFile *ride, AllPlotObject *here) here->lpcoCurve->attach(this); here->rpcoCurve->attach(this); } - if (!here->ltdcArray.empty()) { - here->ldcCurve->attach(this); - here->rdcCurve->attach(this); + if (!here->lppbArray.empty()) { + here->lppCurve->attach(this); + here->rppCurve->attach(this); } - if (!here->ltpppArray.empty()) { + if (!here->lpppbArray.empty()) { here->lpppCurve->attach(this); here->rpppCurve->attach(this); } @@ -5164,10 +5164,10 @@ AllPlot::setDataFromRideFile(RideFile *ride, AllPlotObject *here) here->balanceRCurve->setVisible(dataPresent->lrbalance && showBalance); here->lpcoCurve->setVisible(dataPresent->lpco && showPCO); here->rpcoCurve->setVisible(dataPresent->rpco && showPCO); - here->ldcCurve->setVisible(dataPresent->ltdc && showDC); - here->rdcCurve->setVisible(dataPresent->rtdc && showDC); - here->lpppCurve->setVisible(dataPresent->ltppp && showPPP); - here->rpppCurve->setVisible(dataPresent->rtppp && showPPP); + here->lppCurve->setVisible(dataPresent->lppb && showDC); + here->rppCurve->setVisible(dataPresent->rppb && showDC); + here->lpppCurve->setVisible(dataPresent->lpppb && showPPP); + here->rpppCurve->setVisible(dataPresent->rpppb && showPPP); // deltas here->accelCurve->setVisible(dataPresent->kph && showAccel); @@ -5249,14 +5249,14 @@ AllPlot::setDataFromRideFile(RideFile *ride, AllPlotObject *here) if (!here->rpsArray.empty()) here->rpsArray[arrayLength] = point->rps; if (!here->lpcoArray.empty()) here->lpcoArray[arrayLength] = point->lpco; if (!here->rpcoArray.empty()) here->rpcoArray[arrayLength] = point->rpco; - if (!here->ltdcArray.empty()) here->ltdcArray[arrayLength] = point->ltdc; - if (!here->rtdcArray.empty()) here->rtdcArray[arrayLength] = point->rtdc; - if (!here->lbdcArray.empty()) here->lbdcArray[arrayLength] = point->lbdc; - if (!here->rbdcArray.empty()) here->rbdcArray[arrayLength] = point->rbdc; - if (!here->ltpppArray.empty()) here->ltpppArray[arrayLength] = point->ltppp; - if (!here->rtpppArray.empty()) here->rtpppArray[arrayLength] = point->rtppp; - if (!here->lbpppArray.empty()) here->lbpppArray[arrayLength] = point->lbppp; - if (!here->rbpppArray.empty()) here->rbpppArray[arrayLength] = point->rbppp; + if (!here->lppbArray.empty()) here->lppbArray[arrayLength] = point->lppb; + if (!here->rppbArray.empty()) here->rppbArray[arrayLength] = point->rppb; + if (!here->lppeArray.empty()) here->lppeArray[arrayLength] = point->lppe; + if (!here->rppeArray.empty()) here->rppeArray[arrayLength] = point->rppe; + if (!here->lpppbArray.empty()) here->lpppbArray[arrayLength] = point->lpppb; + if (!here->rpppbArray.empty()) here->rpppbArray[arrayLength] = point->rpppb; + if (!here->lpppeArray.empty()) here->lpppeArray[arrayLength] = point->lpppe; + if (!here->rpppeArray.empty()) here->rpppeArray[arrayLength] = point->rpppe; here->distanceArray[arrayLength] = max(0, (context->athlete->useMetricUnits @@ -5313,8 +5313,8 @@ AllPlot::setDataFromRideFile(RideFile *ride, AllPlotObject *here) here->balanceRCurve->detach(); here->lpcoCurve->detach(); here->rpcoCurve->detach(); - here->ldcCurve->detach(); - here->rdcCurve->detach(); + here->lppCurve->detach(); + here->rppCurve->detach(); here->lpppCurve->detach(); here->rpppCurve->detach(); @@ -5475,16 +5475,16 @@ AllPlot::setShow(RideFile::SeriesType type, bool state) case RideFile::rpco: setShowPCO(state); break; - case RideFile::ltdc: - case RideFile::rtdc: - case RideFile::lbdc: - case RideFile::rbdc: + case RideFile::lppb: + case RideFile::rppb: + case RideFile::lppe: + case RideFile::rppe: setShowDC(state); break; - case RideFile::ltppp: - case RideFile::rtppp: - case RideFile::lbppp: - case RideFile::rbppp: + case RideFile::lpppb: + case RideFile::rpppb: + case RideFile::lpppe: + case RideFile::rpppe: setShowPPP(state); break; case RideFile::interval: @@ -5970,8 +5970,8 @@ void AllPlot::setShowDC(bool show) { showDC = show; - standard->ldcCurve->setVisible(show); - standard->rdcCurve->setVisible(show); + standard->lppCurve->setVisible(show); + standard->rppCurve->setVisible(show); setYMax(); // remember the curves and colors @@ -6133,12 +6133,12 @@ AllPlot::setPaintBrush(int state) p = standard->rpcoCurve->pen().color(); p.setAlpha(64); standard->rpcoCurve->setBrush(QBrush(p)); - p = standard->ldcCurve->pen().color(); + p = standard->lppCurve->pen().color(); p.setAlpha(64); - standard->ldcCurve->setBrush(QBrush(p)); - p = standard->rdcCurve->pen().color(); + standard->lppCurve->setBrush(QBrush(p)); + p = standard->rppCurve->pen().color(); p.setAlpha(64); - standard->rdcCurve->setBrush(QBrush(p)); + standard->rppCurve->setBrush(QBrush(p)); p = standard->lpppCurve->pen().color(); p.setAlpha(64); standard->lpppCurve->setBrush(QBrush(p)); @@ -6194,8 +6194,8 @@ AllPlot::setPaintBrush(int state) standard->rpsCurve->setBrush(Qt::NoBrush); standard->lpcoCurve->setBrush(Qt::NoBrush); standard->rpcoCurve->setBrush(Qt::NoBrush); - standard->ldcCurve->setBrush(Qt::NoBrush); - standard->rdcCurve->setBrush(Qt::NoBrush); + standard->lppCurve->setBrush(Qt::NoBrush); + standard->rppCurve->setBrush(Qt::NoBrush); standard->lpppCurve->setBrush(Qt::NoBrush); standard->rpppCurve->setBrush(Qt::NoBrush); standard->slopeCurve->setBrush(Qt::NoBrush); diff --git a/src/AllPlot.h b/src/AllPlot.h index e8171092f..adc3bd11f 100644 --- a/src/AllPlot.h +++ b/src/AllPlot.h @@ -373,8 +373,8 @@ class AllPlotObject : public QObject QwtPlotCurve *rpsCurve; QwtPlotCurve *lpcoCurve; QwtPlotCurve *rpcoCurve; - QwtPlotIntervalCurve *ldcCurve; - QwtPlotIntervalCurve *rdcCurve; + QwtPlotIntervalCurve *lppCurve; + QwtPlotIntervalCurve *rppCurve; QwtPlotIntervalCurve *lpppCurve; QwtPlotIntervalCurve *rpppCurve; @@ -423,14 +423,14 @@ class AllPlotObject : public QObject QVector rpsArray; QVector lpcoArray; QVector rpcoArray; - QVector ltdcArray; - QVector rtdcArray; - QVector lbdcArray; - QVector rbdcArray; - QVector ltpppArray; - QVector rtpppArray; - QVector lbpppArray; - QVector rbpppArray; + QVector lppbArray; + QVector rppbArray; + QVector lppeArray; + QVector rppeArray; + QVector lpppbArray; + QVector rpppbArray; + QVector lpppeArray; + QVector rpppeArray; // smoothed data QVector smoothWatts; @@ -470,8 +470,8 @@ class AllPlotObject : public QObject QVector smoothRPS; QVector smoothLPCO; QVector smoothRPCO; - QVector smoothLDC; - QVector smoothRDC; + QVector smoothLPP; + QVector smoothRPP; QVector smoothLPPP; QVector smoothRPPP; QVector smoothRelSpeed; diff --git a/src/AllPlotInterval.cpp b/src/AllPlotInterval.cpp index c089a4e01..97e4d7175 100644 --- a/src/AllPlotInterval.cpp +++ b/src/AllPlotInterval.cpp @@ -48,11 +48,12 @@ class AllPlotIntervalData : public QwtArraySeriesData IntervalItem *intervalNum(int n) const; int intervalCount() const; - RideItem *rideItem; AllPlotInterval *plot; Context *context; int level; int max; + + RideItem *rideItem; const RideFileInterval interval; virtual QwtIntervalSample sample(size_t i) const; diff --git a/src/AllPlotWindow.cpp b/src/AllPlotWindow.cpp index 44acdf20a..661eeca59 100644 --- a/src/AllPlotWindow.cpp +++ b/src/AllPlotWindow.cpp @@ -230,7 +230,7 @@ AllPlotWindow::AllPlotWindow(Context *context) : showPCO->setCheckState(Qt::Unchecked); seriesRight->addRow(new QLabel(""), showPCO); - showDC = new QCheckBox(tr("Power Phase (Death Center)"), this); + showDC = new QCheckBox(tr("Power Phase"), this); showDC->setCheckState(Qt::Unchecked); seriesRight->addRow(new QLabel(""), showDC); @@ -1084,12 +1084,12 @@ AllPlotWindow::compareChanged() s.one = RideFile::lpco; s.two = RideFile::rpco; wanted << s; } if (showDC->isChecked()) { - s.one = RideFile::ltdc; s.two = RideFile::lbdc; wanted << s; - s.one = RideFile::rtdc; s.two = RideFile::rbdc; wanted << s; + s.one = RideFile::lppb; s.two = RideFile::lppe; wanted << s; + s.one = RideFile::rppb; s.two = RideFile::rppe; wanted << s; } if (showPPP->isChecked()) { - s.one = RideFile::ltppp; s.two = RideFile::lbppp; wanted << s; - s.one = RideFile::rtppp; s.two = RideFile::rbppp; wanted << s; + s.one = RideFile::lpppb; s.two = RideFile::lpppe; wanted << s; + s.one = RideFile::rpppb; s.two = RideFile::rpppe; wanted << s; }*/ // create blank and add to gui @@ -3283,10 +3283,10 @@ AllPlotWindow::setupSeriesStackPlots() if (showPS->isChecked() && rideItem->ride()->areDataPresent()->lps) { s.one = RideFile::lps; s.two = RideFile::none; serieslist << s; s.one = RideFile::rps; s.two = RideFile::none; serieslist << s; } if (showPCO->isChecked() && rideItem->ride()->areDataPresent()->lpco) { s.one = RideFile::lpco; s.two = RideFile::rpco; serieslist << s;} - if (showDC->isChecked() && rideItem->ride()->areDataPresent()->ltdc) { s.one = RideFile::ltdc; s.two = RideFile::lbdc; serieslist << s; - s.one = RideFile::rtdc; s.two = RideFile::rbdc; serieslist << s; } - if (showPPP->isChecked() && rideItem->ride()->areDataPresent()->ltppp) { s.one = RideFile::ltppp; s.two = RideFile::lbppp; serieslist << s; - s.one = RideFile::rtppp; s.two = RideFile::rbppp; serieslist << s; } + if (showDC->isChecked() && rideItem->ride()->areDataPresent()->lppb) { s.one = RideFile::lppb; s.two = RideFile::lppe; serieslist << s; + s.one = RideFile::rppb; s.two = RideFile::rppe; serieslist << s; } + if (showPPP->isChecked() && rideItem->ride()->areDataPresent()->lpppb) { s.one = RideFile::lpppb; s.two = RideFile::lpppe; serieslist << s; + s.one = RideFile::rpppb; s.two = RideFile::rpppe; serieslist << s; } bool first = true; foreach(SeriesWanted x, serieslist) { diff --git a/src/BasicRideMetrics.cpp b/src/BasicRideMetrics.cpp index d70309b3e..067294fce 100644 --- a/src/BasicRideMetrics.cpp +++ b/src/BasicRideMetrics.cpp @@ -1869,19 +1869,19 @@ class AvgRPCO : public RideMetric { ////////////////////////////////////////////////////////////////////////////// -class AvgLTPP : public RideMetric { +class AvgLPPB : public RideMetric { - Q_DECLARE_TR_FUNCTIONS(AvgLTPP) + Q_DECLARE_TR_FUNCTIONS(AvgLPPB) public: - AvgLTPP() + AvgLPPB() { - setSymbol("average_ltpp"); + setSymbol("average_lppb"); setInternalName("Average Left Power Phase Start"); } void initialize() { - setName(tr("Average Left Top Power Phase Start")); + setName(tr("Average Left Power Phase Start")); setMetricUnits(tr("°")); setType(RideMetric::Average); setPrecision(0); @@ -1892,7 +1892,7 @@ class AvgLTPP : public RideMetric { const QHash &, const Context *) { - if (ride->areDataPresent()->ltdc) { + if (ride->areDataPresent()->lppb) { double total = 0.0f; double secs = 0.0f; @@ -1901,11 +1901,11 @@ class AvgLTPP : public RideMetric { if (point->cad) { secs += ride->recIntSecs(); - total += point->ltdc; + total += point->lppb + (point->rppb>180?-360:0); } } - if (total > 0.0f && secs > 0.0f) setValue(total / secs); + if (secs > 0.0f) setValue(total / secs); else setValue(0.0); } else { @@ -1914,24 +1914,24 @@ class AvgLTPP : public RideMetric { } } - RideMetric *clone() const { return new AvgLTPP(*this); } + RideMetric *clone() const { return new AvgLPPB(*this); } }; ////////////////////////////////////////////////////////////////////////////// -class AvgRTPP : public RideMetric { +class AvgRPPB : public RideMetric { Q_DECLARE_TR_FUNCTIONS(AvgRTPP) public: - AvgRTPP() + AvgRPPB() { - setSymbol("average_rtpp"); + setSymbol("average_rppb"); setInternalName("Average Right Power Phase Start"); } void initialize() { - setName(tr("Average Right Top Power Phase Start")); + setName(tr("Average Right Power Phase Start")); setMetricUnits(tr("°")); setType(RideMetric::Average); setPrecision(0); @@ -1942,7 +1942,7 @@ class AvgRTPP : public RideMetric { const QHash &, const Context *) { - if (ride->areDataPresent()->rtdc) { + if (ride->areDataPresent()->rppb) { double total = 0.0f; double secs = 0.0f; @@ -1951,11 +1951,11 @@ class AvgRTPP : public RideMetric { if (point->cad) { secs += ride->recIntSecs(); - total += point->rtdc; + total += point->rppb + (point->rppb>180?-360:0); } } - if (total > 0.0f && secs > 0.0f) setValue(total / secs); + if (secs > 0.0f) setValue(total / secs); else setValue(0.0); } else { @@ -1964,25 +1964,25 @@ class AvgRTPP : public RideMetric { } } - RideMetric *clone() const { return new AvgRTPP(*this); } + RideMetric *clone() const { return new AvgRPPB(*this); } }; ////////////////////////////////////////////////////////////////////////////// -class AvgLBPP : public RideMetric { +class AvgLPPE : public RideMetric { - Q_DECLARE_TR_FUNCTIONS(AvgLBPP) + Q_DECLARE_TR_FUNCTIONS(AvgLPPE) public: - AvgLBPP() + AvgLPPE() { - setSymbol("average_lbdc"); - setInternalName("Average Left Power Phase Stop"); + setSymbol("average_lppe"); + setInternalName("Average Left Power Phase End"); } void initialize() { - setName(tr("Average Left Power Phase Stop")); + setName(tr("Average Left Power Phase End")); setMetricUnits(tr("°")); setType(RideMetric::Average); setPrecision(0); @@ -1993,20 +1993,20 @@ class AvgLBPP : public RideMetric { const QHash &, const Context *) { - if (ride->areDataPresent()->lbdc) { + if (ride->areDataPresent()->lppe) { double total = 0.0f; double secs = 0.0f; foreach (const RideFilePoint *point, ride->dataPoints()) { - if (point->cad) { + if (point->cad && point->lppe>0) { secs += ride->recIntSecs(); - total += point->lbdc; + total += point->lppe; } } - if (total > 0.0f && secs > 0.0f) setValue(total / secs); + if (secs > 0.0f) setValue(total / secs); else setValue(0.0); } else { @@ -2015,24 +2015,24 @@ class AvgLBPP : public RideMetric { } } - RideMetric *clone() const { return new AvgLBPP(*this); } + RideMetric *clone() const { return new AvgLPPE(*this); } }; ////////////////////////////////////////////////////////////////////////////// -class AvgRBPP : public RideMetric { +class AvgRPPE : public RideMetric { - Q_DECLARE_TR_FUNCTIONS(AvgRBPP) + Q_DECLARE_TR_FUNCTIONS(AvgRPPE) public: - AvgRBPP() + AvgRPPE() { - setSymbol("average_rbdc"); - setInternalName("Average Right Power Phase Stop"); + setSymbol("average_rppe"); + setInternalName("Average Right Power Phase End"); } void initialize() { - setName(tr("Average Right Power Phase Stop")); + setName(tr("Average Right Power Phase End")); setMetricUnits(tr("°")); setType(RideMetric::Average); setPrecision(0); @@ -2043,20 +2043,20 @@ class AvgRBPP : public RideMetric { const QHash &, const Context *) { - if (ride->areDataPresent()->rbdc) { + if (ride->areDataPresent()->rppe) { double total = 0.0f; double secs = 0.0f; foreach (const RideFilePoint *point, ride->dataPoints()) { - if (point->cad) { + if (point->cad && point->rppe>0) { secs += ride->recIntSecs(); - total += point->rbdc; + total += point->rppe; } } - if (total > 0.0f && secs > 0.0f) setValue(total / secs); + if (secs > 0.0f) setValue(total / secs); else setValue(0.0); } else { @@ -2065,21 +2065,21 @@ class AvgRBPP : public RideMetric { } } - RideMetric *clone() const { return new AvgRBPP(*this); } + RideMetric *clone() const { return new AvgRPPE(*this); } }; ////////////////////////////////////////////////////////////////////////////// -class AvgLTPPP : public RideMetric { +class AvgLPPPB : public RideMetric { - Q_DECLARE_TR_FUNCTIONS(AvgLTPPP) + Q_DECLARE_TR_FUNCTIONS(AvgLPPPB) public: - AvgLTPPP() + AvgLPPPB() { - setSymbol("average_ltppp"); + setSymbol("average_lpppb"); setInternalName("Average Left Peak Power Phase Start"); } void initialize() { @@ -2094,20 +2094,20 @@ class AvgLTPPP : public RideMetric { const QHash &, const Context *) { - if (ride->areDataPresent()->ltppp) { + if (ride->areDataPresent()->lpppb) { double total = 0.0f; double secs = 0.0f; foreach (const RideFilePoint *point, ride->dataPoints()) { - if (point->cad) { + if (point->cad && point->lpppb>0) { secs += ride->recIntSecs(); - total += point->ltppp; + total += point->lpppb + (point->lpppb>180?-360:0); } } - if (total > 0.0f && secs > 0.0f) setValue(total / secs); + if (secs > 0.0f) setValue(total / secs); else setValue(0.0); } else { @@ -2116,20 +2116,20 @@ class AvgLTPPP : public RideMetric { } } - RideMetric *clone() const { return new AvgLTPPP(*this); } + RideMetric *clone() const { return new AvgLPPPB(*this); } }; ////////////////////////////////////////////////////////////////////////////// -class AvgRTPPP : public RideMetric { +class AvgRPPPB : public RideMetric { - Q_DECLARE_TR_FUNCTIONS(AvgRTPPP) + Q_DECLARE_TR_FUNCTIONS(AvgRPPPB) public: - AvgRTPPP() + AvgRPPPB() { - setSymbol("average_rtppp"); + setSymbol("average_rpppb"); setInternalName("Average Right Peak Power Phase Start"); } void initialize() { @@ -2144,20 +2144,20 @@ class AvgRTPPP : public RideMetric { const QHash &, const Context *) { - if (ride->areDataPresent()->rtppp) { + if (ride->areDataPresent()->rpppb) { double total = 0.0f; double secs = 0.0f; foreach (const RideFilePoint *point, ride->dataPoints()) { - if (point->cad) { + if (point->cad && point->rpppb>0) { secs += ride->recIntSecs(); - total += point->rtppp; + total += point->rpppb + (point->rpppb>180?-360:0); } } - if (total > 0.0f && secs > 0.0f) setValue(total / secs); + if (secs > 0.0f) setValue(total / secs); else setValue(0.0); } else { @@ -2166,25 +2166,25 @@ class AvgRTPPP : public RideMetric { } } - RideMetric *clone() const { return new AvgRTPPP(*this); } + RideMetric *clone() const { return new AvgRPPPB(*this); } }; ////////////////////////////////////////////////////////////////////////////// -class AvgLBPPP : public RideMetric { +class AvgLPPPE : public RideMetric { - Q_DECLARE_TR_FUNCTIONS(AvgLBPPP) + Q_DECLARE_TR_FUNCTIONS(AvgLPPPE) public: - AvgLBPPP() + AvgLPPPE() { - setSymbol("average_lbppp"); - setInternalName("Average Left Peak Power Phase Stop"); + setSymbol("average_lpppe"); + setInternalName("Average Left Peak Power Phase End"); } void initialize() { - setName(tr("Average Left Peak Power Phase Stop")); + setName(tr("Average Left Peak Power Phase End")); setMetricUnits(tr("°")); setType(RideMetric::Average); setPrecision(0); @@ -2195,16 +2195,16 @@ class AvgLBPPP : public RideMetric { const QHash &, const Context *) { - if (ride->areDataPresent()->lbppp) { + if (ride->areDataPresent()->lpppe) { double total = 0.0f; double secs = 0.0f; foreach (const RideFilePoint *point, ride->dataPoints()) { - if (point->cad) { + if (point->cad && point->lpppe>0) { secs += ride->recIntSecs(); - total += point->lbppp; + total += point->lpppe; } } @@ -2217,24 +2217,24 @@ class AvgLBPPP : public RideMetric { } } - RideMetric *clone() const { return new AvgLBPPP(*this); } + RideMetric *clone() const { return new AvgLPPPE(*this); } }; ////////////////////////////////////////////////////////////////////////////// -class AvgRBPPP : public RideMetric { +class AvgRPPPE : public RideMetric { - Q_DECLARE_TR_FUNCTIONS(AvgRBPPP) + Q_DECLARE_TR_FUNCTIONS(AvgRPPPE) public: - AvgRBPPP() + AvgRPPPE() { - setSymbol("average_rbppp"); - setInternalName("Average Right Peak Power Phase Stop"); + setSymbol("average_rpppe"); + setInternalName("Average Right Peak Power Phase End"); } void initialize() { - setName(tr("Average Right Peak Power Phase Stop")); + setName(tr("Average Right Peak Power Phase End")); setMetricUnits(tr("°")); setType(RideMetric::Average); setPrecision(0); @@ -2245,16 +2245,16 @@ class AvgRBPPP : public RideMetric { const QHash &, const Context *) { - if (ride->areDataPresent()->rbppp) { + if (ride->areDataPresent()->rpppe) { double total = 0.0f; double secs = 0.0f; foreach (const RideFilePoint *point, ride->dataPoints()) { - if (point->cad) { + if (point->cad && point->rpppe>0) { secs += ride->recIntSecs(); - total += point->rbppp; + total += point->rpppe; } } @@ -2267,7 +2267,7 @@ class AvgRBPPP : public RideMetric { } } - RideMetric *clone() const { return new AvgRBPPP(*this); } + RideMetric *clone() const { return new AvgRPPPE(*this); } }; static bool addLeftRight() @@ -2279,14 +2279,14 @@ static bool addLeftRight() RideMetricFactory::instance().addMetric(AvgRPS(), &deps); RideMetricFactory::instance().addMetric(AvgLPCO(), &deps); RideMetricFactory::instance().addMetric(AvgRPCO(), &deps); - RideMetricFactory::instance().addMetric(AvgLTPP(), &deps); - RideMetricFactory::instance().addMetric(AvgRTPP(), &deps); - RideMetricFactory::instance().addMetric(AvgLBPP(), &deps); - RideMetricFactory::instance().addMetric(AvgRBPP(), &deps); - RideMetricFactory::instance().addMetric(AvgLTPPP(), &deps); - RideMetricFactory::instance().addMetric(AvgRTPPP(), &deps); - RideMetricFactory::instance().addMetric(AvgLBPPP(), &deps); - RideMetricFactory::instance().addMetric(AvgRBPPP(), &deps); + RideMetricFactory::instance().addMetric(AvgLPPB(), &deps); + RideMetricFactory::instance().addMetric(AvgRPPB(), &deps); + RideMetricFactory::instance().addMetric(AvgLPPE(), &deps); + RideMetricFactory::instance().addMetric(AvgRPPE(), &deps); + RideMetricFactory::instance().addMetric(AvgLPPPB(), &deps); + RideMetricFactory::instance().addMetric(AvgRPPPB(), &deps); + RideMetricFactory::instance().addMetric(AvgLPPPE(), &deps); + RideMetricFactory::instance().addMetric(AvgRPPPE(), &deps); return true; } static bool leftRightAdded = addLeftRight(); diff --git a/src/ComparePane.cpp b/src/ComparePane.cpp index 1e5475cfe..5242b148a 100644 --- a/src/ComparePane.cpp +++ b/src/ComparePane.cpp @@ -719,7 +719,7 @@ ComparePane::dropEvent(QDropEvent *event) p->watts, p->alt, p->lon, p->lat, p->headwind, p->slope, p->temp, p->lrbalance, p->lte, p->rte, p->lps, p->rps, - p->lpco, p->rpco, p->ltdc, p->rtdc, p->lbdc, p->rbdc, p->ltppp, p->rtppp, p->lbppp, p->rbppp, + p->lpco, p->rpco, p->lppb, p->rppb, p->lppe, p->rppe, p->lpppb, p->rpppb, p->lpppe, p->rpppe, p->smo2, p->thb, p->rvert, p->rcad, p->rcontact, 0); // get derived data calculated diff --git a/src/Computrainer3dpFile.cpp b/src/Computrainer3dpFile.cpp index 6f12e53b9..b6216cc7a 100644 --- a/src/Computrainer3dpFile.cpp +++ b/src/Computrainer3dpFile.cpp @@ -240,7 +240,7 @@ RideFile *Computrainer3dpFileReader::openRideFile(QFile & file, altitude, 0, 0, 0.0, 0.0, RideFile::NoTemp, 0.0, 0.0, 0.0, 0.0, 0.0, // pedal torque eff / pedal smoothness 0.0, 0.0, // pedal platform offset - 0.0, 0.0, 0.0, 0.0, //pedal top and bottom death center + 0.0, 0.0, 0.0, 0.0, //pedal power phase 0.0, 0.0, 0.0, 0.0, //pedal peak power phase 0.0, 0.0, // smO2 / thb 0.0, 0.0, 0.0, // running dynamics @@ -298,7 +298,7 @@ RideFile *Computrainer3dpFileReader::openRideFile(QFile & file, 0.0, 0.0, 0.0, 0.0, 0.0, // pedal torque effectiveness / pedal smoothness 0.0, 0.0, // pedal platform offset - 0.0, 0.0, 0.0, 0.0, //pedal top and bottom death center + 0.0, 0.0, 0.0, 0.0, //pedal power phase 0.0, 0.0, 0.0, 0.0, //pedal peak power phase 0.0, 0.0, // smO2 / tHb 0.0, 0.0, 0.0, // running dynamics diff --git a/src/CriticalPowerWindow.cpp b/src/CriticalPowerWindow.cpp index 2108e91e7..a2a90f0d3 100644 --- a/src/CriticalPowerWindow.cpp +++ b/src/CriticalPowerWindow.cpp @@ -1014,7 +1014,7 @@ CriticalPowerWindow::showIntervalCurve(IntervalItem *current, int index) p->watts, p->alt, p->lon, p->lat, p->headwind, p->slope, p->temp, p->lrbalance, p->lte, p->rte, p->lps, p->rps, - p->lpco, p->rpco, p->ltdc, p->rtdc, p->lbdc, p->rbdc, p->ltppp, p->rtppp, p->lbppp, p->rbppp, + p->lpco, p->rpco, p->lppb, p->rppb, p->lppe, p->rppe, p->lpppb, p->rpppb, p->lpppe, p->rpppe, p->smo2, p->thb, p->rvert, p->rcad, p->rcontact, 0); } diff --git a/src/FitRideFile.cpp b/src/FitRideFile.cpp index a7176fef1..3445ca0ea 100644 --- a/src/FitRideFile.cpp +++ b/src/FitRideFile.cpp @@ -555,20 +555,20 @@ struct FitFileReaderState rightPedalCenterOffset = value; break; case 69: // ? Left Power Phase (Top and Bottom Dead Center) ? - leftTopDeathCenter = value; - leftBottomDeathCenter = value2; + leftTopDeathCenter = round(value * 360.0/256); + leftBottomDeathCenter = round(value2 * 360.0/256); break; case 70: // ? Left Peak Phase ? - leftTopPeakPowerPhase = value; - leftBottomPeakPowerPhase = value2; + leftTopPeakPowerPhase = round(value * 360.0/256); + leftBottomPeakPowerPhase = round(value2 * 360.0/256); break; case 71: // ? Right Power Phase (Top and Bottom Dead Center) ? - rightTopDeathCenter = value; - rightBottomDeathCenter = value2; + rightTopDeathCenter = round(value * 360.0/256); + rightBottomDeathCenter = round(value2 * 360.0/256); break; case 72: // ? Right Peak Phase ? - rightTopPeakPowerPhase = value; - rightBottomPeakPowerPhase = value2; + rightTopPeakPowerPhase = round(value * 360.0/256); + rightBottomPeakPowerPhase = round(value2 * 360.0/256); break; @@ -646,14 +646,14 @@ struct FitFileReaderState double deltaRightPS = rightPedalSmooth - prevPoint->rps; double deltaLeftPedalCenterOffset = leftPedalCenterOffset - prevPoint->lpco; double deltaRightPedalCenterOffset = rightPedalCenterOffset - prevPoint->rpco; - double deltaLeftTopDeathCenter = leftTopDeathCenter - prevPoint->ltdc; - double deltaRightTopDeathCenter = rightTopDeathCenter - prevPoint->rtdc; - double deltaLeftBottomDeathCenter = leftBottomDeathCenter - prevPoint->lbdc; - double deltaRightBottomDeathCenter = rightBottomDeathCenter - prevPoint->rbdc; - double deltaLeftTopPeakPowerPhase = leftTopPeakPowerPhase - prevPoint->ltppp; - double deltaRightTopPeakPowerPhase = rightTopPeakPowerPhase - prevPoint->rtppp; - double deltaLeftBottomPeakPowerPhase = leftBottomPeakPowerPhase - prevPoint->lbppp; - double deltaRightBottomPeakPowerPhase = rightBottomPeakPowerPhase - prevPoint->rbppp; + double deltaLeftTopDeathCenter = leftTopDeathCenter - prevPoint->lppb; + double deltaRightTopDeathCenter = rightTopDeathCenter - prevPoint->rppb; + double deltaLeftBottomDeathCenter = leftBottomDeathCenter - prevPoint->lppe; + double deltaRightBottomDeathCenter = rightBottomDeathCenter - prevPoint->rppe; + double deltaLeftTopPeakPowerPhase = leftTopPeakPowerPhase - prevPoint->lpppb; + double deltaRightTopPeakPowerPhase = rightTopPeakPowerPhase - prevPoint->rpppb; + double deltaLeftBottomPeakPowerPhase = leftBottomPeakPowerPhase - prevPoint->lpppe; + double deltaRightBottomPeakPowerPhase = rightBottomPeakPowerPhase - prevPoint->rpppe; double deltaSmO2 = smO2 - prevPoint->smo2; double deltaTHb = tHb - prevPoint->thb; double deltarvert = rvert - prevPoint->rvert; @@ -688,14 +688,14 @@ struct FitFileReaderState prevPoint->rps + (deltaRightPS * weight), prevPoint->lpco + (deltaLeftPedalCenterOffset * weight), prevPoint->rpco + (deltaRightPedalCenterOffset * weight), - prevPoint->ltdc + (deltaLeftTopDeathCenter * weight), - prevPoint->rtdc + (deltaRightTopDeathCenter * weight), - prevPoint->lbdc + (deltaLeftBottomDeathCenter * weight), - prevPoint->rbdc + (deltaRightBottomDeathCenter * weight), - prevPoint->ltppp + (deltaLeftTopPeakPowerPhase * weight), - prevPoint->rtppp + (deltaRightTopPeakPowerPhase * weight), - prevPoint->lbppp + (deltaLeftBottomPeakPowerPhase * weight), - prevPoint->rbppp + (deltaRightBottomPeakPowerPhase * weight), + prevPoint->lppb + (deltaLeftTopDeathCenter * weight), + prevPoint->rppb + (deltaRightTopDeathCenter * weight), + prevPoint->lppe + (deltaLeftBottomDeathCenter * weight), + prevPoint->rppe + (deltaRightBottomDeathCenter * weight), + prevPoint->lpppb + (deltaLeftTopPeakPowerPhase * weight), + prevPoint->rpppb + (deltaRightTopPeakPowerPhase * weight), + prevPoint->lpppe + (deltaLeftBottomPeakPowerPhase * weight), + prevPoint->rpppe + (deltaRightBottomPeakPowerPhase * weight), prevPoint->smo2 + (deltaSmO2 * weight), prevPoint->thb + (deltaTHb * weight), prevPoint->rvert + (deltarvert * weight), @@ -714,6 +714,7 @@ struct FitFileReaderState leftTopDeathCenter, rightTopDeathCenter, leftBottomDeathCenter, rightBottomDeathCenter, leftTopPeakPowerPhase, rightTopPeakPowerPhase, leftBottomPeakPowerPhase, rightBottomPeakPowerPhase, smO2, tHb, rvert, rcad, rcontact, interval); + last_time = time; last_distance = km; } diff --git a/src/FixGaps.cpp b/src/FixGaps.cpp index b3cf408d6..182f25c85 100644 --- a/src/FixGaps.cpp +++ b/src/FixGaps.cpp @@ -200,14 +200,14 @@ FixGaps::postProcess(RideFile *ride, DataProcessorConfig *config=0) double rpsdelta = (point->rps - last->rps) / (double) count; double lpcodelta = (point->lpco - last->lpco) / (double) count; double rpcodelta = (point->rpco - last->rpco) / (double) count; - double ltdcdelta = (point->ltdc - last->ltdc) / (double) count; - double rtdcdelta = (point->rtdc - last->rtdc) / (double) count; - double lbdcdelta = (point->lbdc - last->lbdc) / (double) count; - double rbdcdelta = (point->rbdc - last->rbdc) / (double) count; - double ltpppdelta = (point->ltppp - last->ltppp) / (double) count; - double rtpppdelta = (point->rtppp - last->rtppp) / (double) count; - double lbpppdelta = (point->lbppp - last->lbppp) / (double) count; - double rbpppdelta = (point->rbppp - last->rbppp) / (double) count; + double lppbdelta = (point->lppb - last->lppb) / (double) count; + double rppbdelta = (point->rppb - last->rppb) / (double) count; + double lppedelta = (point->lppe - last->lppe) / (double) count; + double rppedelta = (point->rppe - last->rppe) / (double) count; + double lpppbdelta = (point->lpppb - last->lpppb) / (double) count; + double rpppbdelta = (point->rpppb - last->rpppb) / (double) count; + double lpppedelta = (point->lpppe - last->lpppe) / (double) count; + double rpppedelta = (point->rpppe - last->rpppe) / (double) count; double smo2delta = (point->smo2 - last->smo2) / (double) count; double thbdelta = (point->thb - last->thb) / (double) count; double rcontactdelta = (point->rcontact - last->rcontact) / (double) count; @@ -237,14 +237,14 @@ FixGaps::postProcess(RideFile *ride, DataProcessorConfig *config=0) last->rps + ((i+1)*rpsdelta), last->lpco + ((i+1)*lpcodelta), last->rpco + ((i+1)*rpcodelta), - last->ltdc + ((i+1)*ltdcdelta), - last->rtdc + ((i+1)*rtdcdelta), - last->lbdc + ((i+1)*lbdcdelta), - last->rbdc + ((i+1)*rbdcdelta), - last->ltppp + ((i+1)*ltpppdelta), - last->rtppp + ((i+1)*rtpppdelta), - last->lbppp + ((i+1)*lbpppdelta), - last->rbppp + ((i+1)*rbpppdelta), + last->lppb + ((i+1)*lppbdelta), + last->rppb + ((i+1)*rppbdelta), + last->lppe + ((i+1)*lppedelta), + last->rppe + ((i+1)*rppedelta), + last->lpppb + ((i+1)*lpppbdelta), + last->rpppb + ((i+1)*rpppbdelta), + last->lpppe + ((i+1)*lpppedelta), + last->rpppe + ((i+1)*rpppedelta), last->smo2 + ((i+1)*smo2delta), last->thb + ((i+1)*thbdelta), last->rvert + ((i+1)*rvertdelta), @@ -282,7 +282,7 @@ FixGaps::postProcess(RideFile *ride, DataProcessorConfig *config=0) 0, 0.0, 0.0, 0.0, 0.0, //pedal torque / smoothness 0.0, 0.0, // pedal platform offset - 0.0, 0.0, 0.0, 0.0, //pedal top and bottom death center + 0.0, 0.0, 0.0, 0.0, //pedal power phase 0.0, 0.0, 0.0, 0.0, //pedal peak power phase 0.0, 0.0, // smO2 / thb 0.0, 0.0, 0.0, // running dynamics diff --git a/src/GpxParser.cpp b/src/GpxParser.cpp index cecd02ac9..049403e20 100644 --- a/src/GpxParser.cpp +++ b/src/GpxParser.cpp @@ -250,7 +250,7 @@ bool 0, 0.0, 0.0, 0.0, 0.0, // pedal torque/smoothness 0.0, 0.0, // pedal platform offset - 0.0, 0.0, 0.0, 0.0, //pedal top and bottom death center + 0.0, 0.0, 0.0, 0.0, //pedal power phase 0.0, 0.0, 0.0, 0.0, //pedal peak power phase 0.0, 0.0, // SmO2 / tHb 0.0, 0.0, 0.0, // running dynamics diff --git a/src/IntervalNavigator.cpp b/src/IntervalNavigator.cpp index b2c768128..3d85d6895 100644 --- a/src/IntervalNavigator.cpp +++ b/src/IntervalNavigator.cpp @@ -885,7 +885,7 @@ IntervalNavigator::selectRide(const QModelIndex &index) f->appendPoint(p->secs, p->cad, p->hr, p->km, p->kph, p->nm, p->watts, p->alt, p->lon, p->lat, p->headwind, p->slope, p->temp, p->lrbalance, p->lte, p->rte, p->lps, p->rps, - p->lpco, p->rpco, p->ltdc, p->rtdc, p->lbdc, p->rbdc, p->ltppp, p->rtppp, p->lbppp, p->rbppp, + p->lpco, p->rpco, p->lppb, p->rppb, p->lppe, p->rppe, p->lpppb, p->rpppb, p->lpppe, p->rpppe, p->smo2, p->thb, p->rvert, p->rcad, p->rcontact, 0); diff --git a/src/IntervalSummaryWindow.cpp b/src/IntervalSummaryWindow.cpp index 6c9c7f08b..3ca02f204 100644 --- a/src/IntervalSummaryWindow.cpp +++ b/src/IntervalSummaryWindow.cpp @@ -151,8 +151,8 @@ void IntervalSummaryWindow::calcInterval(QList intervals, QString p->watts, p->alt, p->lon, p->lat, p->headwind, p->slope, p->temp, p->lrbalance, p->lte, p->rte, p->lps, p->rps, p->lpco, p->rpco, - p->ltdc, p->rtdc, p->lbdc, p->rbdc, - p->ltppp, p->rtppp, p->lbppp, p->rbppp, + p->lppb, p->rppb, p->lppe, p->rppe, + p->lpppb, p->rpppb, p->lpppe, p->rpppe, p->smo2, p->thb, p->rvert, p->rcad, p->rcontact, 0); @@ -190,8 +190,8 @@ void IntervalSummaryWindow::calcInterval(IntervalItem* interval, QString& html) p->watts, p->alt, p->lon, p->lat, p->headwind, p->slope, p->temp, p->lrbalance, p->lte, p->rte, p->lps, p->rps, p->lpco, p->rpco, - p->ltdc, p->rtdc, p->lbdc, p->rbdc, - p->ltppp, p->rtppp, p->lbppp, p->rbppp, + p->lppb, p->rppb, p->lppe, p->rppe, + p->lpppb, p->rpppb, p->lpppe, p->rpppe, p->smo2, p->thb, p->rvert, p->rcad, p->rcontact, 0); @@ -276,8 +276,8 @@ void IntervalSummaryWindow::calcInterval(RideFileInterval interval, QString& htm p->watts, p->alt, p->lon, p->lat, p->headwind, p->slope, p->temp, p->lrbalance, p->lte, p->rte, p->lps, p->rps, p->lpco, p->rpco, - p->ltdc, p->rtdc, p->lbdc, p->rbdc, - p->ltppp, p->rtppp, p->lbppp, p->rbppp, + p->lppb, p->rppb, p->lppe, p->rppe, + p->lpppb, p->rpppb, p->lpppe, p->rpppe, p->smo2, p->thb, p->rvert, p->rcad, p->rcontact, 0); diff --git a/src/JsonRideFile.l b/src/JsonRideFile.l index 7a10cbc4f..825353544 100644 --- a/src/JsonRideFile.l +++ b/src/JsonRideFile.l @@ -137,14 +137,14 @@ void JsonRideFilefree (void * ptr , yyscan_t /*scanner*/) \"RPS\" return RPS; \"LPCO\" return LPCO; \"RPCO\" return RPCO; -\"LTDC\" return LTDC; -\"RTDC\" return RTDC; -\"LBDC\" return LBDC; -\"RBDC\" return RBDC; -\"LTPPP\" return LTPPP; -\"RTPPP\" return RTPPP; -\"LBPPP\" return LBPPP; -\"RBPPP\" return RBPPP; +\"LPPB\" return LPPB; +\"RPPB\" return RPPB; +\"LPPE\" return LPPE; +\"RPPE\" return RPPE; +\"LPPPB\" return LPPPB; +\"RPPPB\" return RPPPB; +\"LPPPE\" return LPPPE; +\"RPPPE\" return RPPPE; \"SMO2\" return SMO2; \"THB\" return THB; \"RCON\" return RCON; diff --git a/src/JsonRideFile.y b/src/JsonRideFile.y index ee26467a2..c3133eb5e 100644 --- a/src/JsonRideFile.y +++ b/src/JsonRideFile.y @@ -113,7 +113,7 @@ static QString protect(const QString string) %token REFERENCES %token SAMPLES SECS KM WATTS NM CAD KPH HR ALTITUDE LAT LON HEADWIND SLOPE TEMP %token LRBALANCE LTE RTE LPS RPS THB SMO2 RVERT RCAD RCON -%token LPCO RPCO LTDC RTDC LBDC RBDC LTPPP RTPPP LBPPP RBPPP +%token LPCO RPCO LPPB RPPB LPPE RPPE LPPPB RPPPB LPPPE RPPPE %start document %% @@ -241,10 +241,10 @@ sample: '{' series_list '}' { jc->JsonRide->appendPoint(jc->JsonPoin jc->JsonPoint.lte, jc->JsonPoint.rte, jc->JsonPoint.lps, jc->JsonPoint.rps, jc->JsonPoint.lpco, jc->JsonPoint.rpco, - jc->JsonPoint.ltdc, jc->JsonPoint.rtdc, - jc->JsonPoint.lbdc, jc->JsonPoint.rbdc, - jc->JsonPoint.ltppp, jc->JsonPoint.rtppp, - jc->JsonPoint.lbppp, jc->JsonPoint.rbppp, + jc->JsonPoint.lppb, jc->JsonPoint.rppb, + jc->JsonPoint.lppe, jc->JsonPoint.rppe, + jc->JsonPoint.lpppb, jc->JsonPoint.rpppb, + jc->JsonPoint.lpppe, jc->JsonPoint.rpppe, jc->JsonPoint.smo2, jc->JsonPoint.thb, jc->JsonPoint.rvert, jc->JsonPoint.rcad, jc->JsonPoint.rcontact, jc->JsonPoint.interval); @@ -272,14 +272,14 @@ series: SECS ':' number { jc->JsonPoint.secs = jc->JsonNumber; } | RPS ':' number { jc->JsonPoint.rps = jc->JsonNumber; } | LPCO ':' number { jc->JsonPoint.lpco = jc->JsonNumber; } | RPCO ':' number { jc->JsonPoint.rpco = jc->JsonNumber; } - | LTDC ':' number { jc->JsonPoint.ltdc = jc->JsonNumber; } - | RTDC ':' number { jc->JsonPoint.rtdc = jc->JsonNumber; } - | LBDC ':' number { jc->JsonPoint.lbdc = jc->JsonNumber; } - | RBDC ':' number { jc->JsonPoint.rbdc = jc->JsonNumber; } - | LTPPP ':' number { jc->JsonPoint.ltppp = jc->JsonNumber; } - | RTPPP ':' number { jc->JsonPoint.rtppp = jc->JsonNumber; } - | LBPPP ':' number { jc->JsonPoint.lbppp = jc->JsonNumber; } - | RBPPP ':' number { jc->JsonPoint.rbppp = jc->JsonNumber; } + | LPPB ':' number { jc->JsonPoint.lppb = jc->JsonNumber; } + | RPPB ':' number { jc->JsonPoint.rppb = jc->JsonNumber; } + | LPPE ':' number { jc->JsonPoint.lppe = jc->JsonNumber; } + | RPPE ':' number { jc->JsonPoint.rppe = jc->JsonNumber; } + | LPPPB ':' number { jc->JsonPoint.lpppb = jc->JsonNumber; } + | RPPPB ':' number { jc->JsonPoint.rpppb = jc->JsonNumber; } + | LPPPE ':' number { jc->JsonPoint.lpppe = jc->JsonNumber; } + | RPPPE ':' number { jc->JsonPoint.rpppe = jc->JsonNumber; } | SMO2 ':' number { jc->JsonPoint.smo2 = jc->JsonNumber; } | THB ':' number { jc->JsonPoint.thb = jc->JsonNumber; } | RVERT ':' number { jc->JsonPoint.rvert = jc->JsonNumber; } @@ -564,14 +564,14 @@ JsonFileReader::writeRideFile(Context *, const RideFile *ride, QFile &file) cons if (ride->areDataPresent()->rps) out << ", \"RPS\":" << QString("%1").arg(p->rps); if (ride->areDataPresent()->lpco) out << ", \"LPCO\":" << QString("%1").arg(p->lpco); if (ride->areDataPresent()->rpco) out << ", \"RPCO\":" << QString("%1").arg(p->rpco); - if (ride->areDataPresent()->ltdc) out << ", \"LTDC\":" << QString("%1").arg(p->ltdc); - if (ride->areDataPresent()->rtdc) out << ", \"RTDC\":" << QString("%1").arg(p->rtdc); - if (ride->areDataPresent()->lbdc) out << ", \"LBDC\":" << QString("%1").arg(p->lbdc); - if (ride->areDataPresent()->rbdc) out << ", \"RBDC\":" << QString("%1").arg(p->rbdc); - if (ride->areDataPresent()->ltppp) out << ", \"LTPPP\":" << QString("%1").arg(p->ltppp); - if (ride->areDataPresent()->rtppp) out << ", \"RTPPP\":" << QString("%1").arg(p->rtppp); - if (ride->areDataPresent()->lbppp) out << ", \"LBPPP\":" << QString("%1").arg(p->lbppp); - if (ride->areDataPresent()->rbppp) out << ", \"RBPPP\":" << QString("%1").arg(p->rbppp); + if (ride->areDataPresent()->lppb) out << ", \"LPPB\":" << QString("%1").arg(p->lppb); + if (ride->areDataPresent()->rppb) out << ", \"RPPB\":" << QString("%1").arg(p->rppb); + if (ride->areDataPresent()->lppe) out << ", \"LPPE\":" << QString("%1").arg(p->lppe); + if (ride->areDataPresent()->rppe) out << ", \"RPPE\":" << QString("%1").arg(p->rppe); + if (ride->areDataPresent()->lpppb) out << ", \"LPPPB\":" << QString("%1").arg(p->lpppb); + if (ride->areDataPresent()->rpppb) out << ", \"RPPPB\":" << QString("%1").arg(p->rpppb); + if (ride->areDataPresent()->lpppe) out << ", \"LPPPE\":" << QString("%1").arg(p->lpppe); + if (ride->areDataPresent()->rpppe) out << ", \"RPPPE\":" << QString("%1").arg(p->rpppe); if (ride->areDataPresent()->smo2) out << ", \"SMO2\":" << QString("%1").arg(p->smo2); if (ride->areDataPresent()->thb) out << ", \"THB\":" << QString("%1").arg(p->thb); if (ride->areDataPresent()->rcad) out << ", \"RCAD\":" << QString("%1").arg(p->rcad); diff --git a/src/ManualRideFile.cpp b/src/ManualRideFile.cpp index 161abe1be..a61d21366 100644 --- a/src/ManualRideFile.cpp +++ b/src/ManualRideFile.cpp @@ -128,7 +128,7 @@ RideFile *ManualFileReader::openRideFile(QFile &file, QStringList &errors, QList RideFile::NoTemp, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, // pedal platform offset - 0.0, 0.0, 0.0, 0.0, //pedal top and bottom death center + 0.0, 0.0, 0.0, 0.0, //pedal power phase 0.0, 0.0, 0.0, 0.0, //pedal peak power phase 0.0, 0.0, 0.0, 0.0, 0.0, // running dynamics diff --git a/src/PwxRideFile.cpp b/src/PwxRideFile.cpp index f8e5111f0..791c5384c 100644 --- a/src/PwxRideFile.cpp +++ b/src/PwxRideFile.cpp @@ -262,8 +262,8 @@ PwxFileReader::PwxFromDomDoc(QDomDocument doc, QStringList &errors) const add.slope, add.temp, add.lrbalance, add.lte, add.rte, add.lps, add.rps, add.lpco, add.rpco, - add.ltdc, add.rtdc, add.lbdc, add.rbdc, - add.ltppp, add.rtppp, add.lbppp, add.rbppp, + add.lppb, add.rppb, add.lppe, add.rppe, + add.lpppb, add.rpppb, add.lpppe, add.rpppe, add.smo2, add.thb, add.rvert, add.rcad, add.rcontact, add.interval); diff --git a/src/RideEditor.cpp b/src/RideEditor.cpp index 80dce256c..3d8bfaeee 100644 --- a/src/RideEditor.cpp +++ b/src/RideEditor.cpp @@ -233,13 +233,13 @@ RideEditor::whatColumns() << tr("Right PS") << tr("Left Platform Center Offset") << tr("Right Platform Center Offset") - << tr("Left Top Dead Center") - << tr("Right Top Dead Center") - << tr("Left Bottom Dead Center") - << tr("Right Bottom Dead Center") + << tr("Left Power Phase Start") + << tr("Left Power Phase End") + << tr("Right Power Phase Start") + << tr("Right Power Phase End") << tr("Left Peak Power Phase Start") - << tr("Right Peak Power Phase Start") << tr("Left Peak Power Phase End") + << tr("Right Peak Power Phase Start") << tr("Right Peak Power Phase End") << tr("SmO2") << tr("tHb") @@ -839,14 +839,14 @@ RideEditor::insColumn(QString name) if (name == tr("Right PS")) series = RideFile::rps; if (name == tr("Left Platform Center Offset")) series = RideFile::lpco; if (name == tr("Right Platform Center Offset")) series = RideFile::rpco; - if (name == tr("Left Top Dead Center")) series = RideFile::ltdc; - if (name == tr("Right Top Dead Center")) series = RideFile::rtdc; - if (name == tr("Left Bottom Dead Center")) series = RideFile::lbdc; - if (name == tr("Right Bottom Dead Center")) series = RideFile::rbdc; - if (name == tr("Left Peak Power Phase Start")) series = RideFile::ltppp; - if (name == tr("Right Peak Power Phase Start")) series = RideFile::rtppp; - if (name == tr("Left Peak Power Phase End")) series = RideFile::lbppp; - if (name == tr("Right Peak Power Phase End")) series = RideFile::rbppp; + if (name == tr("Left Power Phase Start")) series = RideFile::lppb; + if (name == tr("Right Power Phase Start")) series = RideFile::rppb; + if (name == tr("Left Power Phase End")) series = RideFile::lppe; + if (name == tr("Right Power Phase End")) series = RideFile::rppe; + if (name == tr("Left Peak Power Phase Start")) series = RideFile::lpppb; + if (name == tr("Right Peak Power Phase Start")) series = RideFile::rpppb; + if (name == tr("Left Peak Power Phase End")) series = RideFile::lpppe; + if (name == tr("Right Peak Power Phase End")) series = RideFile::rpppe; if (name == tr("SmO2")) series = RideFile::smo2; if (name == tr("tHb")) series = RideFile::thb; if (name == tr("Vertical Oscillation")) series = RideFile::rvert; diff --git a/src/RideFile.cpp b/src/RideFile.cpp index edab09c18..9811c54ff 100644 --- a/src/RideFile.cpp +++ b/src/RideFile.cpp @@ -177,14 +177,14 @@ RideFile::seriesName(SeriesType series) case RideFile::rps: return QString(tr("Righ Pedal Smoothness")); case RideFile::lpco: return QString(tr("Left Platform Center Offset")); case RideFile::rpco: return QString(tr("Right Platform Center Offset")); - case RideFile::ltdc: return QString(tr("Left Top Dead Center")); - case RideFile::rtdc: return QString(tr("Right Top Dead Center")); - case RideFile::lbdc: return QString(tr("Left Bottom Dead Center")); - case RideFile::rbdc: return QString(tr("Right Bottom Dead Center")); - case RideFile::ltppp: return QString(tr("Left Peak Power Phase Start")); - case RideFile::rtppp: return QString(tr("Right Peak Power Phase Start")); - case RideFile::lbppp: return QString(tr("Left Peak Power Phase End")); - case RideFile::rbppp: return QString(tr("Right Peak Power Phase End")); + case RideFile::lppb: return QString(tr("Left Power Phase Start")); + case RideFile::rppb: return QString(tr("Right Power Phase Start")); + case RideFile::lppe: return QString(tr("Left Power Phase End")); + case RideFile::rppe: return QString(tr("Right Power Phase End")); + case RideFile::lpppb: return QString(tr("Left Peak Power Phase Start")); + case RideFile::rpppb: return QString(tr("Right Peak Power Phase Start")); + case RideFile::lpppe: return QString(tr("Left Peak Power Phase End")); + case RideFile::rpppe: return QString(tr("Right Peak Power Phase End")); case RideFile::interval: return QString(tr("Interval")); case RideFile::vam: return QString(tr("VAM")); case RideFile::wattsKg: return QString(tr("Watts per Kilogram")); @@ -230,14 +230,14 @@ RideFile::colorFor(SeriesType series) case RideFile::rps: return GColor(CRPS); case RideFile::lpco: return GColor(CLPS); case RideFile::rpco: return GColor(CRPS); - case RideFile::ltdc: return GColor(CLPS); - case RideFile::rtdc: return GColor(CRPS); - case RideFile::lbdc: return GColor(CLPS); - case RideFile::rbdc: return GColor(CRPS); - case RideFile::ltppp: return GColor(CLPS); - case RideFile::rtppp: return GColor(CRPS); - case RideFile::lbppp: return GColor(CLPS); - case RideFile::rbppp: return GColor(CRPS); + case RideFile::lppb: return GColor(CLPS); + case RideFile::rppb: return GColor(CRPS); + case RideFile::lppe: return GColor(CLPS); + case RideFile::rppe: return GColor(CRPS); + case RideFile::lpppb: return GColor(CLPS); + case RideFile::rpppb: return GColor(CRPS); + case RideFile::lpppe: return GColor(CLPS); + case RideFile::rpppe: return GColor(CRPS); case RideFile::interval: return QColor(Qt::white); case RideFile::wattsKg: return GColor(CPOWER); case RideFile::wprime: return GColor(CWBAL); @@ -295,14 +295,14 @@ RideFile::unitName(SeriesType series, Context *context) case RideFile::rps: return QString(tr("%")); case RideFile::lpco: return QString(tr("mm")); case RideFile::rpco: return QString(tr("mm")); - case RideFile::ltdc: return QString(tr("°")); - case RideFile::rtdc: return QString(tr("°")); - case RideFile::lbdc: return QString(tr("°")); - case RideFile::rbdc: return QString(tr("°")); - case RideFile::ltppp: return QString(tr("°")); - case RideFile::rtppp: return QString(tr("°")); - case RideFile::lbppp: return QString(tr("°")); - case RideFile::rbppp: return QString(tr("°")); + case RideFile::lppb: return QString(tr("°")); + case RideFile::rppb: return QString(tr("°")); + case RideFile::lppe: return QString(tr("°")); + case RideFile::rppe: return QString(tr("°")); + case RideFile::lpppb: return QString(tr("°")); + case RideFile::rpppb: return QString(tr("°")); + case RideFile::lpppe: return QString(tr("°")); + case RideFile::rpppe: return QString(tr("°")); case RideFile::interval: return QString(tr("Interval")); case RideFile::vam: return QString(tr("meters per hour")); case RideFile::wattsKg: return QString(useMetricUnits ? tr("watts/kg") : tr("watts/kg")); // always kg ! @@ -671,22 +671,22 @@ void RideFile::updateMin(RideFilePoint* point) minPoint->lpco = point->lpco; if (point->rpcorpco) minPoint->rpco = point->rpco; - if (minPoint->ltdc == 0 || point->ltdcltdc) - minPoint->ltdc = point->ltdc; - if (minPoint->rtdc == 0 || point->rtdcrtdc) - minPoint->rtdc = point->rtdc; - if (minPoint->lbdc == 0 || point->lbdclbdc) - minPoint->lbdc = point->ltdc; - if (minPoint->rbdc == 0 || point->rbdcrbdc) - minPoint->rbdc = point->rbdc; - if (minPoint->ltppp == 0 || point->ltpppltppp) - minPoint->ltppp = point->ltppp; - if (minPoint->rtppp == 0 || point->rtppprtppp) - minPoint->rtppp = point->rtppp; - if (minPoint->lbppp == 0 || point->lbppplbppp) - minPoint->lbppp = point->ltppp; - if (minPoint->rbppp == 0 || point->rbppprbppp) - minPoint->rbppp = point->rbppp; + if (minPoint->lppb == 0 || point->lppblppb) + minPoint->lppb = point->lppb; + if (minPoint->rppb == 0 || point->rppbrppb) + minPoint->rppb = point->rppb; + if (minPoint->lppe == 0 || point->lppelppe) + minPoint->lppe = point->lppb; + if (minPoint->rppe == 0 || point->rpperppe) + minPoint->rppe = point->rppe; + if (minPoint->lpppb == 0 || point->lpppblpppb) + minPoint->lpppb = point->lpppb; + if (minPoint->rpppb == 0 || point->rpppbrpppb) + minPoint->rpppb = point->rpppb; + if (minPoint->lpppe == 0 || point->lpppelpppe) + minPoint->lpppe = point->lpppb; + if (minPoint->rpppe == 0 || point->rppperpppe) + minPoint->rpppe = point->rpppe; if (minPoint->smo2 == 0 || point->smo2smo2) minPoint->smo2 = point->smo2; if (minPoint->o2hb == 0 || point->o2hbo2hb) @@ -748,22 +748,22 @@ void RideFile::updateMax(RideFilePoint* point) maxPoint->lpco = point->lpco; if (point->rpco>maxPoint->rpco) maxPoint->rpco = point->rpco; - if (point->ltdc>maxPoint->ltdc) - maxPoint->ltdc = point->ltdc; - if (point->rtdc>maxPoint->rtdc) - maxPoint->rtdc = point->rtdc; - if (point->lbdc>maxPoint->lbdc) - maxPoint->lbdc = point->ltdc; - if (point->rbdc>maxPoint->rbdc) - maxPoint->rbdc = point->rbdc; - if (point->ltppp>maxPoint->ltppp) - maxPoint->ltppp = point->ltppp; - if (point->rtppp>maxPoint->rtppp) - maxPoint->rtppp = point->rtppp; - if (point->lbppp>maxPoint->lbppp) - maxPoint->lbppp = point->ltppp; - if (point->rbppp>maxPoint->rbppp) - maxPoint->rbppp = point->rbppp; + if (point->lppb>maxPoint->lppb) + maxPoint->lppb = point->lppb; + if (point->rppb>maxPoint->rppb) + maxPoint->rppb = point->rppb; + if (point->lppe>maxPoint->lppe) + maxPoint->lppe = point->lppb; + if (point->rppe>maxPoint->rppe) + maxPoint->rppe = point->rppe; + if (point->lpppb>maxPoint->lpppb) + maxPoint->lpppb = point->lpppb; + if (point->rpppb>maxPoint->rpppb) + maxPoint->rpppb = point->rpppb; + if (point->lpppe>maxPoint->lpppe) + maxPoint->lpppe = point->lpppb; + if (point->rpppe>maxPoint->rpppe) + maxPoint->rpppe = point->rpppe; if (point->smo2>maxPoint->smo2) maxPoint->smo2 = point->smo2; if (point->thb>maxPoint->thb) @@ -805,13 +805,13 @@ void RideFile::updateAvg(RideFilePoint* point) totalPoint->lrbalance += point->lrbalance; totalPoint->lpco += point->lpco; totalPoint->rpco += point->rpco; - totalPoint->ltdc += point->ltdc; - totalPoint->rtdc += point->rtdc; - totalPoint->rbdc += point->rbdc; - totalPoint->ltppp += point->ltppp; - totalPoint->rtppp += point->rtppp; - totalPoint->lbppp += point->lbppp; - totalPoint->rbppp += point->rbppp; + totalPoint->lppb += point->lppb; + totalPoint->rppb += point->rppb; + totalPoint->rppe += point->rppe; + totalPoint->lpppb += point->lpppb; + totalPoint->rpppb += point->rpppb; + totalPoint->lpppe += point->lpppe; + totalPoint->rpppe += point->rpppe; totalPoint->smo2 += point->smo2; totalPoint->thb += point->thb; totalPoint->o2hb += point->o2hb; @@ -845,14 +845,14 @@ void RideFile::updateAvg(RideFilePoint* point) avgPoint->rps = totalPoint->rps/totalCount; avgPoint->lpco = totalPoint->lpco/totalCount; avgPoint->rpco = totalPoint->rpco/totalCount; - avgPoint->ltdc = totalPoint->ltdc/totalCount; - avgPoint->rtdc = totalPoint->rtdc/totalCount; - avgPoint->lbdc = totalPoint->lbdc/totalCount; - avgPoint->rbdc = totalPoint->rbdc/totalCount; - avgPoint->ltppp = totalPoint->ltppp/totalCount; - avgPoint->rtppp = totalPoint->rtppp/totalCount; - avgPoint->lbppp = totalPoint->lbppp/totalCount; - avgPoint->rbppp = totalPoint->rbppp/totalCount; + avgPoint->lppb = totalPoint->lppb/totalCount; + avgPoint->rppb = totalPoint->rppb/totalCount; + avgPoint->lppe = totalPoint->lppe/totalCount; + avgPoint->rppe = totalPoint->rppe/totalCount; + avgPoint->lpppb = totalPoint->lpppb/totalCount; + avgPoint->rpppb = totalPoint->rpppb/totalCount; + avgPoint->lpppe = totalPoint->lpppe/totalCount; + avgPoint->rpppe = totalPoint->rpppe/totalCount; avgPoint->smo2 = totalPoint->smo2/totalCount; avgPoint->thb = totalPoint->thb/totalCount; avgPoint->o2hb = totalPoint->o2hb/totalCount; @@ -869,8 +869,8 @@ void RideFile::appendPoint(double secs, double cad, double hr, double km, double slope, double temp, double lrbalance, double lte, double rte, double lps, double rps, double lpco, double rpco, - double ltdc, double rtdc, double lbdc, double rbdc, - double ltppp, double rtppp, double lbppp, double rbppp, + double lppb, double rppb, double lppe, double rppe, + double lpppb, double rpppb, double lpppe, double rpppe, double smo2, double thb, double rvert, double rcad, double rcontact, int interval) @@ -889,14 +889,14 @@ void RideFile::appendPoint(double secs, double cad, double hr, double km, if (!std::isfinite(rps) || rps<0) rps=0; if (!std::isfinite(lte) || lte<0) lte=0; if (!std::isfinite(rte) || rte<0) rte=0; - if (!std::isfinite(ltdc) || ltdc<0) ltdc=0; - if (!std::isfinite(rtdc) || rtdc<0) rtdc=0; - if (!std::isfinite(lbdc) || lbdc<0) lbdc=0; - if (!std::isfinite(rbdc) || rbdc<0) rbdc=0; - if (!std::isfinite(ltppp) || ltppp<0) ltppp=0; - if (!std::isfinite(rtppp) || rtppp<0) rtppp=0; - if (!std::isfinite(lbppp) || lbppp<0) lbppp=0; - if (!std::isfinite(rbppp) || rbppp<0) rbppp=0; + if (!std::isfinite(lppb) || lppb<0) lppb=0; + if (!std::isfinite(rppb) || rppb<0) rppb=0; + if (!std::isfinite(lppe) || lppe<0) lppe=0; + if (!std::isfinite(rppe) || rppe<0) rppe=0; + if (!std::isfinite(lpppb) || lpppb<0) lpppb=0; + if (!std::isfinite(rpppb) || rpppb<0) rpppb=0; + if (!std::isfinite(lpppe) || lpppe<0) lpppe=0; + if (!std::isfinite(rpppe) || rpppe<0) rpppe=0; if (!std::isfinite(smo2) || smo2<0) smo2=0; if (!std::isfinite(thb) || thb<0) thb=0; if (!std::isfinite(rvert) || rvert<0) rvert=0; @@ -913,8 +913,8 @@ void RideFile::appendPoint(double secs, double cad, double hr, double km, lrbalance, lte, rte, lps, rps, lpco, rpco, - ltdc, rtdc, lbdc, rbdc, - ltppp, rtppp, lbppp, rbppp, + lppb, rppb, lppe, rppe, + lpppb, rpppb, lpppe, rpppe, smo2, thb, rvert, rcad, rcontact, interval); @@ -940,14 +940,14 @@ void RideFile::appendPoint(double secs, double cad, double hr, double km, dataPresent.rps |= (rps != 0); dataPresent.lpco |= (lpco != 0); dataPresent.rpco |= (rpco != 0); - //dataPresent.ltdc |= (ltdc != 0); - //dataPresent.rtdc |= (rtdc != 0); - //dataPresent.lbdc |= (lbdc != 0); - //dataPresent.rbdc |= (rbdc != 0); - //dataPresent.ltppp |= (ltppp != 0); - //dataPresent.rtppp |= (rtppp != 0); - //dataPresent.lbppp |= (lbppp != 0); - //dataPresent.rbppp |= (rbppp != 0); + dataPresent.lppb |= (lppb != 0); + dataPresent.rppb |= (rppb != 0); + dataPresent.lppe |= (lppe != 0); + dataPresent.rppe |= (rppe != 0); + dataPresent.lpppb |= (lpppb != 0); + dataPresent.rpppb |= (rpppb != 0); + dataPresent.lpppe |= (lpppe != 0); + dataPresent.rpppe |= (rpppe != 0); dataPresent.smo2 |= (smo2 != 0); dataPresent.thb |= (thb != 0); dataPresent.rvert |= (rvert != 0); @@ -967,8 +967,8 @@ void RideFile::appendPoint(const RideFilePoint &point) point.headwind, point.slope, point.temp, point.lrbalance, point.lte, point.rte, point.lps, point.rps, point.lpco, point.rpco, - point.ltdc, point.rtdc, point.lbdc, point.rbdc, - point.ltppp, point.rtppp, point.lbppp, point.rbppp, + point.lppb, point.rppb, point.lppe, point.rppe, + point.lpppb, point.rpppb, point.lpppe, point.rpppe, point.smo2, point.thb, point.rvert, point.rcad, point.rcontact, point.interval); @@ -998,14 +998,14 @@ RideFile::setDataPresent(SeriesType series, bool value) case rps : dataPresent.rps = value; break; case lpco : dataPresent.lpco = value; break; case rpco : dataPresent.rpco = value; break; - case ltdc : dataPresent.ltdc = value; break; - case rtdc : dataPresent.rtdc = value; break; - case lbdc : dataPresent.lbdc = value; break; - case rbdc : dataPresent.rbdc = value; break; - case ltppp : dataPresent.ltppp = value; break; - case rtppp : dataPresent.rtppp = value; break; - case lbppp : dataPresent.lbppp = value; break; - case rbppp : dataPresent.rbppp = value; break; + case lppb : dataPresent.lppb = value; break; + case rppb : dataPresent.rppb = value; break; + case lppe : dataPresent.lppe = value; break; + case rppe : dataPresent.rppe = value; break; + case lpppb : dataPresent.lpppb = value; break; + case rpppb : dataPresent.rpppb = value; break; + case lpppe : dataPresent.lpppe = value; break; + case rpppe : dataPresent.rpppe = value; break; case smo2 : dataPresent.smo2 = value; break; case thb : dataPresent.thb = value; break; case o2hb : dataPresent.o2hb = value; break; @@ -1048,14 +1048,14 @@ RideFile::isDataPresent(SeriesType series) case rte : return dataPresent.rte; break; case lpco : return dataPresent.lpco; break; case rpco : return dataPresent.rpco; break; - case ltdc : return false; break; //return dataPresent.ltdc; break; - case rtdc : return false; break; //return dataPresent.rtdc; break; - case lbdc : return false; break; //return dataPresent.lbdc; break; - case rbdc : return false; break; //return dataPresent.rbdc; break; - case ltppp : return false; break; //return dataPresent.ltppp; break; - case rtppp : return false; break; //return dataPresent.rtppp; break; - case lbppp : return false; break; //return dataPresent.lbppp; break; - case rbppp : return false; break; //return dataPresent.rbppp; break; + case lppb : return dataPresent.lppb; break; + case rppb : return dataPresent.rppb; break; + case lppe : return dataPresent.lppe; break; + case rppe : return dataPresent.rppe; break; + case lpppb : return dataPresent.lpppb; break; + case rpppb : return dataPresent.rpppb; break; + case lpppe : return dataPresent.lpppe; break; + case rpppe : return dataPresent.rpppe; break; case smo2 : return dataPresent.smo2; break; case thb : return dataPresent.thb; break; case o2hb : return dataPresent.o2hb; break; @@ -1094,14 +1094,14 @@ RideFile::setPointValue(int index, SeriesType series, double value) case rps : dataPoints_[index]->rps = value; break; case lpco : dataPoints_[index]->lpco = value; break; case rpco : dataPoints_[index]->rpco = value; break; - case ltdc : dataPoints_[index]->ltdc = value; break; - case rtdc : dataPoints_[index]->rtdc = value; break; - case lbdc : dataPoints_[index]->lbdc = value; break; - case rbdc : dataPoints_[index]->rbdc = value; break; - case ltppp : dataPoints_[index]->ltppp = value; break; - case rtppp : dataPoints_[index]->rtppp = value; break; - case lbppp : dataPoints_[index]->lbppp = value; break; - case rbppp : dataPoints_[index]->rbppp = value; break; + case lppb : dataPoints_[index]->lppb = value; break; + case rppb : dataPoints_[index]->rppb = value; break; + case lppe : dataPoints_[index]->lppe = value; break; + case rppe : dataPoints_[index]->rppe = value; break; + case lpppb : dataPoints_[index]->lpppb = value; break; + case rpppb : dataPoints_[index]->rpppb = value; break; + case lpppe : dataPoints_[index]->lpppe = value; break; + case rpppe : dataPoints_[index]->rpppe = value; break; case smo2 : dataPoints_[index]->smo2 = value; break; case thb : dataPoints_[index]->thb = value; break; case o2hb : dataPoints_[index]->o2hb = value; break; @@ -1145,14 +1145,14 @@ RideFilePoint::value(RideFile::SeriesType series) const case RideFile::thb : return thb; break; case RideFile::lpco : return lpco; break; case RideFile::rpco : return rpco; break; - case RideFile::ltdc : return ltdc; break; - case RideFile::rtdc : return rtdc; break; - case RideFile::lbdc : return lbdc; break; - case RideFile::rbdc : return rbdc; break; - case RideFile::ltppp : return ltppp; break; - case RideFile::rtppp : return rtppp; break; - case RideFile::lbppp : return lbppp; break; - case RideFile::rbppp : return rbppp; break; + case RideFile::lppb : return lppb; break; + case RideFile::rppb : return rppb; break; + case RideFile::lppe : return lppe; break; + case RideFile::rppe : return rppe; break; + case RideFile::lpppb : return lpppb; break; + case RideFile::rpppb : return rpppb; break; + case RideFile::lpppe : return lpppe; break; + case RideFile::rpppe : return rpppe; break; case RideFile::smo2 : return smo2; break; case RideFile::o2hb : return o2hb; break; case RideFile::hhb : return hhb; break; @@ -1203,14 +1203,14 @@ RideFilePoint::setValue(RideFile::SeriesType series, double value) case RideFile::thb : thb = value; break; case RideFile::lpco : lpco = value; break; case RideFile::rpco : rpco = value; break; - case RideFile::ltdc : ltdc = value; break; - case RideFile::rtdc : rtdc = value; break; - case RideFile::lbdc : lbdc = value; break; - case RideFile::rbdc : rbdc = value; break; - case RideFile::ltppp : ltppp = value; break; - case RideFile::rtppp : rtppp = value; break; - case RideFile::lbppp : lbppp = value; break; - case RideFile::rbppp : rbppp = value; break; + case RideFile::lppb : lppb = value; break; + case RideFile::rppb : rppb = value; break; + case RideFile::lppe : lppe = value; break; + case RideFile::rppe : rppe = value; break; + case RideFile::lpppb : lpppb = value; break; + case RideFile::rpppb : rpppb = value; break; + case RideFile::lpppe : lpppe = value; break; + case RideFile::rpppe : rpppe = value; break; case RideFile::smo2 : smo2 = value; break; case RideFile::o2hb : o2hb = value; break; case RideFile::hhb : hhb = value; break; @@ -1302,14 +1302,14 @@ RideFile::decimalsFor(SeriesType series) case rte : return 0; break; case lpco : case rpco : - case ltdc : - case rtdc : - case lbdc : - case rbdc : - case ltppp : - case rtppp : - case lbppp : - case rbppp : return 0; break; + case lppb : + case rppb : + case lppe : + case rppe : + case lpppb : + case rpppb : + case lpppe : + case rpppe : return 0; break; case smo2 : return 0; break; case thb : return 2; break; case o2hb : return 2; break; @@ -1357,14 +1357,14 @@ RideFile::maximumFor(SeriesType series) case lrbalance : return 100; break; case lpco : case rpco : return 100; break; - case ltdc : - case rtdc : - case lbdc : - case rbdc : - case ltppp : - case rtppp : - case lbppp : - case rbppp : return 360; break; + case lppb : + case rppb : + case lppe : + case rppe : + case lpppb : + case rpppb : + case lpppe : + case rpppe : return 360; break; case smo2 : return 100; break; case thb : return 20; break; case o2hb : return 20; break; @@ -1412,14 +1412,14 @@ RideFile::minimumFor(SeriesType series) case lrbalance : return 0; break; case lpco : case rpco : return -100; break; - case ltdc : - case rtdc : - case lbdc : - case rbdc : - case ltppp : - case rtppp : - case lbppp : - case rbppp : return 0; break; + case lppb : + case rppb : + case lppe : + case rppe : + case lpppb : + case rpppb : + case lpppe : + case rpppe : return 0; break; case smo2 : return 0; break; case thb : return 0; break; case o2hb : return 0; break; @@ -1492,8 +1492,8 @@ void RideFile::appendReference(const RideFilePoint &point) point.headwind, point.slope, point.temp, point.lrbalance, point.lte, point.rte, point.lps, point.rps, point.lpco, point.rpco, - point.ltdc, point.rtdc, point.lbdc, point.rbdc, - point.ltppp, point.rtppp, point.lbppp, point.rbppp, + point.lppb, point.rppb, point.lppe, point.rppe, + point.lpppb, point.rpppb, point.lpppe, point.rpppe, point.smo2, point.thb, point.rvert, point.rcad, point.rcontact, point.interval)); diff --git a/src/RideFile.h b/src/RideFile.h index f6d401d2d..8eca57ce8 100644 --- a/src/RideFile.h +++ b/src/RideFile.h @@ -60,7 +60,7 @@ struct RideFileDataPresent { // basic (te = torqueeffectiveness, ps = pedal smoothness) bool secs, cad, hr, km, kph, nm, watts, alt, lon, lat, headwind, slope, temp; - bool lrbalance, lte, rte, lps, rps, lpco, rpco, ltdc, rtdc, lbdc, rbdc, ltppp, rtppp, lbppp, rbppp; + bool lrbalance, lte, rte, lps, rps, lpco, rpco, lppb, rppb, lppe, rppe, lpppb, rpppb, lpppe, rpppe; bool smo2, thb, interval; // derived @@ -75,7 +75,7 @@ struct RideFileDataPresent kph(false), nm(false), watts(false), alt(false), lon(false), lat(false), headwind(false), slope(false), temp(false), lrbalance(false), lte(false), rte(false), lps(false), rps(false), - lpco(false), rpco(false), ltdc(false), rtdc(false), lbdc(false), rbdc(false), ltppp(false), rtppp(false), lbppp(false), rbppp(false), + lpco(false), rpco(false), lppb(false), rppb(false), lppe(false), rppe(false), lpppb(false), rpppb(false), lpppe(false), rpppe(false), smo2(false), thb(false), interval(false), np(false), xp(false), apower(false), wprime(false), atiss(false), antiss(false),gear(false),hhb(false),o2hb(false), rvert(false), rcad(false), rcontact(false) {} @@ -152,7 +152,7 @@ class RideFile : public QObject // QObject to emit signals vam, wattsKg, lrbalance, lte, rte, lps, rps, aPower, wprime, aTISS, anTISS, smo2, thb, rvert, rcad, rcontact, gear, o2hb, hhb, - lpco, rpco, ltdc, rtdc, lbdc, rbdc, ltppp, rtppp, lbppp, rbppp, + lpco, rpco, lppb, rppb, lppe, rppe, lpppb, rpppb, lpppe, rpppe, none }; enum specialValues { NoTemp = -255 }; @@ -183,8 +183,8 @@ class RideFile : public QObject // QObject to emit signals double temperature, double lrbalance, double lte, double rte, double lps, double rps, double lpco, double rpco, - double ltdc, double rtdc, double lbdc, double rbdc, - double ltppp, double rtppp, double lbppp, double rbppp, + double lppb, double rppb, double lppe, double rppe, + double lpppb, double rpppb, double lpppe, double rpppe, double smo2, double thb, double rvert, double rcad, double rcontact, int interval); @@ -331,8 +331,8 @@ struct RideFilePoint // pedals double lrbalance, lte, rte, lps, rps; double lpco, rpco; // left and right platform center offset - double ltdc, rtdc, lbdc, rbdc; // left and right top and bottom death center - double ltppp, rtppp, lbppp, rbppp; // left and right top (start) and bottom (stop) peak power phase + double lppb, rppb, lppe, rppe; // left and right power phase begin/end + double lpppb, rpppb, lpppe, rpppe; // left and right begin and end peak power phase // oxy double smo2, thb; @@ -356,8 +356,8 @@ struct RideFilePoint lrbalance(0), lte(0.0), rte(0.0), lps(0.0), rps(0.0), lpco(0.0), rpco(0.0), - ltdc(0.0), rtdc(0.0), lbdc(0.0), rbdc(0.0), - ltppp(0.0), rtppp(0.0), lbppp(0.0), rbppp(0.0), + lppb(0.0), rppb(0.0), lppe(0.0), rppe(0.0), + lpppb(0.0), rpppb(0.0), lpppe(0.0), rpppe(0.0), smo2(0.0), thb(0.0), hrd(0.0), cadd(0.0), kphd(0.0), nmd(0.0), wattsd(0.0), rvert(0.0), rcad(0.0), rcontact(0.0), @@ -371,8 +371,8 @@ struct RideFilePoint double lrbalance, double lte, double rte, double lps, double rps, double lpco, double rpco, - double ltdc, double rtdc, double lbdc, double rbdc, - double ltppp, double rtppp, double lbppp, double rbppp, + double lppb, double rppb, double lppe, double rppe, + double lpppb, double rpppb, double lpppe, double rpppe, double smo2, double thb, double rvert, double rcad, double rcontact, int interval) : @@ -382,8 +382,8 @@ struct RideFilePoint lrbalance(lrbalance), lte(lte), rte(rte), lps(lps), rps(rps), lpco(lpco), rpco(rpco), - ltdc(ltdc), rtdc(rtdc), lbdc(lbdc), rbdc(rbdc), - ltppp(ltppp), rtppp(rtppp), lbppp(lbppp), rbppp(rbppp), + lppb(lppb), rppb(rppb), lppe(lppe), rppe(rppe), + lpppb(lpppb), rpppb(rpppb), lpppe(lpppe), rpppe(rpppe), smo2(smo2), thb(thb), hrd(0.0), cadd(0.0), kphd(0.0), nmd(0.0), wattsd(0.0), rvert(rvert), rcad(rcad), rcontact(rcontact), interval(interval), diff --git a/src/RideFileTableModel.cpp b/src/RideFileTableModel.cpp index 3b2aea92e..d91066148 100644 --- a/src/RideFileTableModel.cpp +++ b/src/RideFileTableModel.cpp @@ -149,29 +149,29 @@ RideFileTableModel::setHeadings(RideFile::SeriesType series) headings_ << tr("Right Platform Center Offset"); headingsType << RideFile::rpco; } - if (series == RideFile::ltdc || ride->areDataPresent()->ltdc) { + if (series == RideFile::lppb || ride->areDataPresent()->lppb) { headings_ << tr("Left Top Dead Center"); - headingsType << RideFile::ltdc; + headingsType << RideFile::lppb; } - if (series == RideFile::rtdc || ride->areDataPresent()->rtdc) { + if (series == RideFile::rppb || ride->areDataPresent()->rppb) { headings_ << tr("Right Top Dead Center"); - headingsType << RideFile::rtdc; + headingsType << RideFile::rppb; } - if (series == RideFile::lbdc || ride->areDataPresent()->lbdc) { + if (series == RideFile::lppe || ride->areDataPresent()->lppe) { headings_ << tr("Left Bottom Dead Center"); - headingsType << RideFile::lbdc; + headingsType << RideFile::lppe; } - if (series == RideFile::rbdc || ride->areDataPresent()->rbdc) { + if (series == RideFile::rppe || ride->areDataPresent()->rppe) { headings_ << tr("Right Bottom Dead Center"); - headingsType << RideFile::rbdc; + headingsType << RideFile::rppe; } - if (series == RideFile::ltppp || ride->areDataPresent()->ltppp) { + if (series == RideFile::lpppb || ride->areDataPresent()->lpppb) { headings_ << tr("Left Peak Power Phase Start"); - headingsType << RideFile::ltppp; + headingsType << RideFile::lpppb; } - if (series == RideFile::rtppp || ride->areDataPresent()->rtppp) { + if (series == RideFile::rpppb || ride->areDataPresent()->rpppb) { headings_ << tr("Right Peak Power Phase Start"); - headingsType << RideFile::rtppp; + headingsType << RideFile::rpppb; } if (series == RideFile::smo2 || ride->areDataPresent()->smo2) { headings_ << tr("SmO2"); diff --git a/src/RideSummaryWindow.cpp b/src/RideSummaryWindow.cpp index 86c55e0de..fbf50ef3d 100644 --- a/src/RideSummaryWindow.cpp +++ b/src/RideSummaryWindow.cpp @@ -948,7 +948,7 @@ RideSummaryWindow::htmlSummary() p->watts, p->alt, p->lon, p->lat, p->headwind, p->slope, p->temp, p->lrbalance, p->lte, p->rte, p->lps, p->rps, - p->lpco, p->rpco, p->ltdc, p->rtdc, p->lbdc, p->rbdc, p->ltppp, p->rtppp, p->lbppp, p->rbppp, + p->lpco, p->rpco, p->lppb, p->rppb, p->lppe, p->rppe, p->lpppb, p->rpppb, p->lpppe, p->rpppe, p->smo2, p->thb, p->rvert, p->rcad, p->rcontact, 0); // derived data diff --git a/src/SplitActivityWizard.cpp b/src/SplitActivityWizard.cpp index a8670005e..3ff3d66d9 100644 --- a/src/SplitActivityWizard.cpp +++ b/src/SplitActivityWizard.cpp @@ -783,7 +783,7 @@ SplitConfirm::createRideFile(long start, long stop) p->nm, p->watts, p->alt, p->lon, p->lat, p->headwind, p->slope, p->temp, p->lrbalance, p->lte, p->rte, p->lps, p->rps, - p->lpco, p->rpco, p->ltdc, p->rtdc, p->lbdc, p->rbdc, p->ltppp, p->rtppp, p->lbppp, p->rbppp, + p->lpco, p->rpco, p->lppb, p->rppb, p->lppe, p->rppe, p->lpppb, p->rpppb, p->lpppe, p->rpppe, p->smo2, p->thb, p->rvert, p->rcad, p->rcontact, p->interval);