Merge pull request #1039 from jonbev/PercentagePowerAdjustTool

Add power adjustment tool

src/FixPower.cpp

@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2014 Jon Beverley (jon@csdl.biz)
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "DataProcessor.h"
+#include "LTMOutliers.h"
+#include "Settings.h"
+#include "Units.h"
+#include <algorithm>
+#include <QVector>
+
+// Config widget used by the Preferences/Options config panes
+class FixPower;
+class FixPowerConfig : public DataProcessorConfig
+{
+    Q_DECLARE_TR_FUNCTIONS(FixPowerConfig)
+
+    friend class ::FixPower;
+    protected:
+        QHBoxLayout *layout;
+        QLabel *paLabel;
+        QLabel *percentLabel;
+        QLineEdit *pa;
+
+    public:
+        FixPowerConfig(QWidget *parent) : DataProcessorConfig(parent) {
+
+            layout = new QHBoxLayout(this);
+
+            layout->setContentsMargins(0,0,0,0);
+            setContentsMargins(0,0,0,0);
+
+            paLabel = new QLabel(tr("Power Adjustment"));
+
+            pa = new QLineEdit();
+
+            percentLabel = new QLabel(tr("%"));
+
+            layout->addWidget(paLabel);
+            layout->addWidget(pa);
+            layout->addStretch();
+            layout->addWidget(percentLabel);
+        }
+
+        //~FixPowerConfig() {} // deliberately not declared since Qt will delete
+                              // the widget and its children when the config pane is deleted
+
+        QString explain() {
+            return(QString(tr("Adjusting power values allows you to "
+                           "uplift or degrade the power values by a "
+                           "percentage. It takes a single parameter:\n\n"
+                           "Power Adjustment - this defines percentage "
+                           " to modify values by. Negative values are supported."
+                           )));
+        }
+
+        void readConfig() {
+            pa->setText(appsettings->value(NULL, GC_DPPA, "0").toString());
+        }
+
+        void saveConfig() {
+            appsettings->setValue(GC_DPPA, pa->text());
+        }
+};
+
+
+// RideFile Dataprocessor -- used to handle gaps in recording
+//                           by inserting interpolated/zero samples
+//                           to ensure dataPoints are contiguous in time
+//
+class FixPower : public DataProcessor {
+    Q_DECLARE_TR_FUNCTIONS(FixPower)
+
+    public:
+        FixPower() {}
+        ~FixPower() {}
+
+        // the processor
+        bool postProcess(RideFile *, DataProcessorConfig* config);
+
+        // the config widget
+        DataProcessorConfig* processorConfig(QWidget *parent) {
+            return new FixPowerConfig(parent);
+        }
+
+        // Localized Name
+        QString name() {
+            return (tr("Adjust Power Values"));
+        }
+};
+
+static bool FixPowerAdded = DataProcessorFactory::instance().registerProcessor(QString("Adjust Power Values"), new FixPower());
+
+bool
+FixPower::postProcess(RideFile *ride, DataProcessorConfig *config=0)
+{
+    // Lets do it then!
+    QString tp;
+    double percentageAdjust = 0;
+
+    if (config == NULL) { // being called automatically
+        tp = appsettings->value(NULL, GC_DPPA, "0").toString();
+    } else { // being called manually
+        tp = ((FixPowerConfig*)(config))->pa->text();
+    }
+
+    percentageAdjust = tp.toDouble();
+
+    // does this ride have power?
+    if (ride->areDataPresent()->watts == false) return false;
+
+    // no adjustment required
+    if (percentageAdjust == 0) return false;
+
+    // apply the change
+    ride->command->startLUW("Adjust Power");
+    for (int i=0; i<ride->dataPoints().count(); i++) {
+        RideFilePoint *point = ride->dataPoints()[i];
+
+        if (point->watts != 0 && percentageAdjust != 0) {
+            ride->command->setPointValue(i, RideFile::watts, point->watts + (point->watts * (percentageAdjust / 100)));
+        }
+
+    }
+    ride->command->endLUW();
+
+    double currentta = ride->getTag("Power Adjust", "0.0").toDouble();
+    ride->setTag("Power Adjust", QString("%1").arg(currentta + percentageAdjust));
+
+    return true;
+}

src/Settings.h

@@ -146,6 +146,7 @@
 #define GC_DPFS_MAX       "dataprocess/fixspikes/max"
 #define GC_DPFS_VARIANCE  "dataprocess/fixspikes/variance"
 #define GC_DPTA           "dataprocess/torqueadjust/adjustment"
+#define GC_DPPA           "dataprocess/poweradjust/adjustment"
 #define GC_DPFHRS_MAX     "dataprocess/fixhrspikes/max"
 
 // ride navigator

src/src.pro

@@ -513,6 +513,7 @@ SOURCES += \
         FixElevation.cpp \
         FixGaps.cpp \
         FixGPS.cpp \
+        FixPower.cpp \
         FixSpikes.cpp \
         FixTorque.cpp \
         FixHRSpikes.cpp \