diff --git a/src/Aerolab.cpp b/src/Aerolab.cpp index 78f198d09..2544dd733 100644 --- a/src/Aerolab.cpp +++ b/src/Aerolab.cpp @@ -62,7 +62,7 @@ Aerolab::Aerolab(QWidget *parent): insertLegend(new QwtLegend(), QwtPlot::BottomLegend); setCanvasBackground(Qt::white); - setXTitle(); + setXTitle(); setAxisTitle(yLeft, "Elevation (m)"); setAxisScale(yLeft, -300, 300); setAxisTitle(xBottom, "Distance (km)"); @@ -88,7 +88,7 @@ Aerolab::Aerolab(QWidget *parent): } void -Aerolab::setData(RideItem *_rideItem, bool new_zoom) { +Aerolab::setData(RideItem *_rideItem, bool new_zoom) { // HARD-CODED DATA: p1->kph double vfactor = 3.600; @@ -149,13 +149,13 @@ Aerolab::setData(RideItem *_rideItem, bool new_zoom) { foreach(const RideFilePoint *p1, ride->dataPoints()) { if ( arrayLength == 0 ) e = eoffset; - + timeArray[arrayLength] = p1->secs; if ( have_recorded_alt_curve ) altArray[arrayLength] = (useMetricUnits ? p1->alt : p1->alt * FEET_PER_METER); - + // Unpack: double power = max(0, p1->watts); double v = p1->kph/vfactor; @@ -163,25 +163,25 @@ Aerolab::setData(RideItem *_rideItem, bool new_zoom) { double a = 0.0; d += v * dt; distanceArray[arrayLength] = d/1000; - - + + if( v > small_number ) { f = power/v; a = ( v*v - vlast*vlast ) / ( 2.0 * dt * v ); } else { a = ( v - vlast ) / dt; } - + f *= eta; // adjust for drivetrain efficiency if using a crank-based meter double s = slope( f, a, m, crr, cda, rho, v ); double de = s * v * dt; - + e += de; t += dt; veArray[arrayLength] = e; - + vlast = v; - + ++arrayLength; } @@ -305,7 +305,7 @@ Aerolab::slope( // Small angle version of slope calculation: double s = f/(m*g) - crr - cda*rho*v*v/(2.0*m*g) - a/g; - return s; + return s; } // At slider 1000, we want to get max Crr=0.1000 @@ -337,7 +337,7 @@ Aerolab::setIntTotalMass( int value ) { - totalMass = (double) value / 100.0; + totalMass = (double) value / 100.0; recalc(false); } @@ -359,7 +359,7 @@ Aerolab::setIntRho( void Aerolab::setIntEta( int value - ) { + ) { eta = (double) value / 10000.0; recalc(false); diff --git a/src/AerolabWindow.cpp b/src/AerolabWindow.cpp index 1d4c3044d..dd05ee39a 100644 --- a/src/AerolabWindow.cpp +++ b/src/AerolabWindow.cpp @@ -57,7 +57,7 @@ AerolabWindow::AerolabWindow(MainWindow *mainWindow) : crrSlider->setValue(aerolab->intCrr()); crrLayout->addWidget( crrLabel ); crrLayout->addWidget( crrQLCDNumber ); - crrLayout->addWidget( crrSlider ); + crrLayout->addWidget( crrSlider ); // CdA: QHBoxLayout *cdaLayout = new QHBoxLayout; @@ -77,7 +77,7 @@ AerolabWindow::AerolabWindow(MainWindow *mainWindow) : cdaSlider->setValue(aerolab->intCda()); cdaLayout->addWidget( cdaLabel ); cdaLayout->addWidget( cdaQLCDNumber ); - cdaLayout->addWidget( cdaSlider ); + cdaLayout->addWidget( cdaSlider ); // Eta: QHBoxLayout *etaLayout = new QHBoxLayout; @@ -97,7 +97,7 @@ AerolabWindow::AerolabWindow(MainWindow *mainWindow) : etaSlider->setValue(aerolab->intEta()); etaLayout->addWidget( etaLabel ); etaLayout->addWidget( etaQLCDNumber ); - etaLayout->addWidget( etaSlider ); + etaLayout->addWidget( etaSlider ); // Add to leftControls: leftControls->addLayout( crrLayout ); @@ -126,7 +126,7 @@ AerolabWindow::AerolabWindow(MainWindow *mainWindow) : mSlider->setValue(aerolab->intTotalMass()); mLayout->addWidget( mLabel ); mLayout->addWidget( mQLCDNumber ); - mLayout->addWidget( mSlider ); + mLayout->addWidget( mSlider ); // Rho: QHBoxLayout *rhoLayout = new QHBoxLayout; @@ -146,7 +146,7 @@ AerolabWindow::AerolabWindow(MainWindow *mainWindow) : rhoSlider->setValue(aerolab->intRho()); rhoLayout->addWidget( rhoLabel ); rhoLayout->addWidget( rhoQLCDNumber ); - rhoLayout->addWidget( rhoSlider ); + rhoLayout->addWidget( rhoSlider ); // Elevation offset: QHBoxLayout *eoffsetLayout = new QHBoxLayout; @@ -166,7 +166,7 @@ AerolabWindow::AerolabWindow(MainWindow *mainWindow) : eoffsetSlider->setValue(aerolab->intEoffset()); eoffsetLayout->addWidget( eoffsetLabel ); eoffsetLayout->addWidget( eoffsetQLCDNumber ); - eoffsetLayout->addWidget( eoffsetSlider ); + eoffsetLayout->addWidget( eoffsetSlider ); // Add to leftControls: rightControls->addLayout( mLayout ); @@ -231,7 +231,7 @@ AerolabWindow::setCdaFromSlider() { if (aerolab->intCda() != cdaSlider->value()) { aerolab->setIntCda(cdaSlider->value()); - cdaQLCDNumber->display(QString("%1").arg(aerolab->getCda())); + cdaQLCDNumber->display(QString("%1").arg(aerolab->getCda())); RideItem *ride = mainWindow->rideItem(); aerolab->setData(ride, false); } diff --git a/src/AerolabWindow.h b/src/AerolabWindow.h index e19cc6231..bd55e8823 100644 --- a/src/AerolabWindow.h +++ b/src/AerolabWindow.h @@ -40,7 +40,7 @@ class AerolabWindow : public QWidget { void zoomInterval(IntervalItem *); // zoom into a specified interval - public slots: + public slots: void setCrrFromSlider(); void setCdaFromSlider(); void setTotalMassFromSlider();