RELEASE CANDIDATE 3X

.. re-issue of RC3 without Fix Elevation

src/AboutDialog.cpp

@@ -79,8 +79,6 @@ AboutPage::AboutPage(Context *context, QDir home) : context(context), home(home)
                 "Physfarm Training Systems</a>.<br>"
                 "Virtual Speed courtesy of Tom Compton <a href=\"http://www.analyticcycling.com\">"
                 "AnalyticCycling</a>.<br>"
-                "Elevation data courtesy of <a href=\"http://www.mapquest.com\">"
-                "MapQuest</a>."
                 "</center>"
                 )
                 .arg(QString(QUrl::fromLocalFile(home.absolutePath()).toEncoded()))

src/AllPlotWindow.cpp

@@ -2455,6 +2455,7 @@ AllPlotWindow::setByDistance(int value)
     setAllPlotWidgets(fullPlot->rideItem);
 
     // refresh
+    setupSeriesStack = setupStack = false;
     redrawFullPlot();
     redrawAllPlot();
     setupStackPlots();

src/FixElevation.cpp

@@ -1,230 +0,0 @@
-/*
- * 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 "Settings.h"
-#include "Units.h"
-#include <algorithm>
-#include <QVector>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-
-struct elevationGPSPoint {
-    int rideFileIndex;
-    double lon;
-    double lat;
-};
-
-QStringList FetchElevationDataFromMapQuest(QString latLngCollection);
-
-// Config widget used by the Preferences/Options config panes
-class FixElevation;
-class FixElevationConfig : public DataProcessorConfig
-{
-    Q_DECLARE_TR_FUNCTIONS(FixElevationConfig)
-    friend class ::FixElevation;
-    protected:
-    public:
-        // there is no config
-        FixElevationConfig(QWidget *parent) : DataProcessorConfig(parent) {}
-
-        QString explain() {
-            return(QString(tr("Fix or add elevation data. If elevation data is "
-                           "present it will be removed and overwritten."
-                           "\n\nINTERNET CONNECTION REQUIRED.")));
-        }
-
-        void readConfig() {}
-        void saveConfig() {}
-
-};
-
-
-// RideFile Dataprocessor -- used to handle gaps in recording
-//                           by inserting interpolated/zero samples
-//                           to ensure dataPoints are contiguous in time
-//
-class FixElevation : public DataProcessor {
-    Q_DECLARE_TR_FUNCTIONS(FixElevation)
-
-    public:
-        FixElevation() {}
-        ~FixElevation() {}
-
-        // the processor
-        bool postProcess(RideFile *, DataProcessorConfig* config);
-
-        // the config widget
-        DataProcessorConfig* processorConfig(QWidget *parent) {
-            return new FixElevationConfig(parent);
-        }
-
-        // Localized Name
-        QString name() {
-            return (tr("Fix Elevation errors"));
-        }
-};
-
-static bool fixElevationAdded = DataProcessorFactory::instance().registerProcessor(QString("Fix Elevation errors"), new FixElevation());
-
-bool
-FixElevation::postProcess(RideFile *ride, DataProcessorConfig *)
-{
-    // Cannot process without without GPS data
-    if (!ride || ride->areDataPresent()->lat == false || ride->areDataPresent()->lon == false)
-        return false;
-
-    int errors=0;
-
-    std::vector<elevationGPSPoint> elvPoints;
-
-    ride->command->startLUW("Fix Elevation Data");
-
-    int lastDistance = 0;
-    for (int i=0; i<ride->dataPoints().count(); i++) {
-        // is the gps point any good?
-        if (ride->dataPoints()[i]->lat && ride->dataPoints()[i]->lat >= double(-56) && ride->dataPoints()[i]->lat <= double(60) &&
-            ride->dataPoints()[i]->lon && ride->dataPoints()[i]->lon >= double(-180) && ride->dataPoints()[i]->lon <= double(180)) {
-            if (lastDistance < (int) (ride->dataPoints()[i]->km * 1000)) {
-                elevationGPSPoint elvPoint;
-
-                elvPoint.lat = (double) ((int) (ride->dataPoints()[i]->lat*100000))/ (double) 100000;
-                elvPoint.lon = (double) ((int) (ride->dataPoints()[i]->lon*100000))/ (double) 100000;
-                elvPoint.rideFileIndex = i;
-
-                elvPoints.push_back(elvPoint);
-
-                //grab a gps point every 20 meters
-                lastDistance = (int) (ride->dataPoints()[i]->km * 1000) + 20;
-            }
-            ride->command->setPointValue(i, RideFile::alt, 0);
-        }
-    }
-
-    //loop through points and build a string to sent to MapQuest
-    QStringList elevationPoints;
-    QString latLngCollection = "";
-    int pointCount = 0;
-    for( std::vector<elevationGPSPoint>::iterator point = elvPoints.begin() ; point != elvPoints.end() ; ++point ) {
-        if (latLngCollection.length()!=0) {
-            latLngCollection.append(',');
-        }
-        latLngCollection.append(QString::number(point->lat));
-        latLngCollection.append(',');
-        latLngCollection.append(QString::number(point->lon));
-        if (pointCount == 200) {
-            elevationPoints = elevationPoints + FetchElevationDataFromMapQuest(latLngCollection);
-            latLngCollection = "";
-            pointCount = 0;
-        } else {
-            ++pointCount;
-        }
-    }
-
-    if (pointCount > 0) {
-        elevationPoints = elevationPoints + FetchElevationDataFromMapQuest(latLngCollection);
-    }
-
-    if (elevationPoints.length() > 0) {
-        int loopCount = 0;
-
-        for( std::vector<elevationGPSPoint>::iterator point = elvPoints.begin() ; point != elvPoints.end() ; ++point ) {
-            double elev = QString(elevationPoints.at(loopCount).mid(elevationPoints.at(loopCount).indexOf("|")+1)).toDouble();
-            ride->command->setPointValue(point->rideFileIndex, RideFile::alt, elev);
-            ++loopCount;
-        }
-
-        // set data present if not currently so
-        if (ride->areDataPresent()->alt == false) ride->command->setDataPresent(RideFile::alt, true);
-
-
-        int lastgood = -1;  // where did we last have decent GPS data?
-        for (int i=0; i<ride->dataPoints().count(); i++) {
-            // is this one decent?
-            if (ride->dataPoints()[i]->alt != double(0)) {
-
-                if (lastgood != -1 && (lastgood+1) != i) {
-                    // interpolate from last good to here
-                    // then set last good to here
-                    double deltaAlt = (ride->dataPoints()[i]->alt - ride->dataPoints()[lastgood]->alt) / double(i-lastgood);
-                    for (int j=lastgood+1; j<i; j++) {
-                        ride->command->setPointValue(j, RideFile::alt, ride->dataPoints()[lastgood]->alt + (double(j-lastgood)*deltaAlt));
-                        errors++;
-                    }
-                } else if (lastgood == -1) {
-                    // fill to front
-                    for (int j=0; j<i; j++) {
-                        ride->command->setPointValue(j, RideFile::alt, ride->dataPoints()[i]->alt);
-                        errors++;
-                    }
-                }
-                lastgood = i;
-            }
-        }
-
-        // fill to end...
-        if (lastgood != -1 && lastgood != (ride->dataPoints().count()-1)) {
-           // fill from lastgood to end with lastgood
-            for (int j=lastgood+1; j<ride->dataPoints().count(); j++) {
-                ride->command->setPointValue(j, RideFile::alt, ride->dataPoints()[lastgood]->alt);
-                errors++;
-            }
-        }
-    }
-
-    // close LUW
-    ride->command->endLUW();
-
-    if (errors) {
-        ride->setTag("GPS errors", QString("%1").arg(errors));
-        return true;
-    } else
-        return false;
-}
-
-QStringList
-FetchElevationDataFromMapQuest(QString latLngCollection)
-{
-    // http://open.mapquestapi.com/elevation/v1/profile?key=Fmjtd%7Cluur20uznu%2Ca2%3Do5-9ayshw&shapeFormat=raw&latLngCollection=52.677,0.94589,52.6769,0.94565,52.6767,0.94545,52.6765,0.94529,52.6764,0.94511,52.6762,0.94488,52.6761,0.94466,52.6759,0.94453,52.6758,0.9447,52.6756,0.94497,52.6756,0.94527,52.6758,0.94553,52.6759,0.94572,52.6761,0.94594,52.6763,0.94611,52.6765,0.94627,52.6766,0.94635,52.6768,0.94639,52.6771,0.9464,52.6772,0.94639,52.6775,0.94637,52.6777,0.94638,52.6779,0.9464,52.6781,0.94645,52.6783,0.94652,52.6784,0.9466,52.6786,0.94672,52.6788,0.94686,52.679,0.94701,52.6792,0.94713,52.6794,0.94721,52.6796,0.94724
-    QStringList elevationPoints;
-    QNetworkAccessManager *networkMgr = new QNetworkAccessManager();
-    QNetworkReply *reply = networkMgr->get( QNetworkRequest( QUrl( "http://open.mapquestapi.com/elevation/v1/profile?key=Fmjtd%7Cluur20uznu%2Ca2%3Do5-9ayshw&shapeFormat=raw&latLngCollection=" + latLngCollection ) ) );
-
-    QEventLoop loop;
-    QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
-
-    // Execute the event loop here, now we will wait here until readyRead() signal is emitted
-    // which in turn will trigger event loop quit.
-    loop.exec();
-
-    QString elevationJSON;
-    elevationJSON = reply->readAll();
-
-    if (!elevationJSON.contains("Bad Request")) {
-
-        elevationJSON = elevationJSON.mid(elevationJSON.indexOf("elevationProfile")+19);
-        elevationJSON = elevationJSON.mid(0, elevationJSON.indexOf("]"));
-        elevationJSON.replace("{\"distance\":", "");
-        elevationJSON.replace(",\"height\":", "|");
-        elevationJSON.replace("}", "");
-        elevationPoints = elevationJSON.split(",");
-    }
-
-    return elevationPoints;
-}

src/GcUpgrade.h

@@ -40,18 +40,19 @@
 // 3055 - V3.1 RC1
 // 3056 - V3.1 RC2
 // 3057 - V3.1 RC3
+// 3058 - V3.1 RC3X
 
 #define VERSION3_BUILD 3010 // released
 #define VERSION3_SP1   3030 // released
 #define VERSION3_SP2   3032 // released
-#define VERSION31_UPG  3057 // first build with 3.1 upgrade process
+#define VERSION31_UPG  3058 // first build with 3.1 upgrade process
 
 // will keep changing during testing and before final release
 #define VERSION31_BUILD VERSION31_UPG
 
 // these three will change until we release
-#define VERSION_LATEST 3057
-#define VERSION_STRING "V3.1 RC3"
+#define VERSION_LATEST 3058
+#define VERSION_STRING "V3.1 RC3X"
 
 class GcUpgrade
 {

src/src.pro

@@ -507,7 +507,6 @@ SOURCES += \
         FitlogRideFile.cpp \
         FitlogParser.cpp \
         FitRideFile.cpp \
-        FixElevation.cpp \
         FixGaps.cpp \
         FixGPS.cpp \
         FixSpikes.cpp \