Merge branch 'release_3.0.0dev' of github.com:/srhea/GoldenCheetah into release_3.0.0dev

src/GcCalendarModel.h

@@ -202,7 +202,7 @@ public:
             if (arr) {
                 foreach (int i, *arr)
                 // we have rides on this day...
-                    if (sourceModel()->data(index(i, dateIndex, QModelIndex())).toDateTime() == mainWindow->rideItem()->dateTime)
+                    if (mainWindow->rideItem() && sourceModel()->data(index(i, dateIndex, QModelIndex())).toDateTime() == mainWindow->rideItem()->dateTime)
                         colors.append(GColor(CCALCURRENT));
                     else
                         colors.append(GColor(CCALACTUAL));

src/GoogleMapControl.cpp

@@ -291,7 +291,7 @@ void GoogleMapControl::createHtml()
         }
     }
     RideItem * ride = myRideItem;
-    if(!ride->ride() || ride->ride()->areDataPresent()->lat == false ||
+    if(!ride || !ride->ride() || ride->ride()->areDataPresent()->lat == false ||
                         ride->ride()->areDataPresent()->lon == false)
     {
         currentPage << tr("No GPS Data Present").toStdString();

src/MainWindow.cpp

@@ -1054,8 +1054,10 @@ MainWindow::exportKML()
 void
 MainWindow::uploadTP()
 {
-    TPUploadDialog uploader(cyclist, currentRide(), this);
-    uploader.exec();
+    if (ride) {
+        TPUploadDialog uploader(cyclist, currentRide(), this);
+        uploader.exec();
+    }
 }
 
 void
@@ -1158,6 +1160,9 @@ MainWindow::addIntervalForPowerPeaksForSecs(RideFile *ride, int windowSizeSecs,
 void
 MainWindow::findPowerPeaks()
 {
+
+    if (!ride) return;
+
     QTreeWidgetItem *which = treeWidget->selectedItems().first();
     if (which->type() != RIDE_TYPE) {
         return;
@@ -1644,7 +1649,14 @@ void MainWindow::showWorkoutWizard()
 void
 MainWindow::saveRide()
 {
-    saveRideSingleDialog(ride); // will signal save to everyone
+    if (ride)
+        saveRideSingleDialog(ride); // will signal save to everyone
+    else {
+        QMessageBox oops(QMessageBox::Critical, tr("No Ride To Save"),
+                         tr("There is no currently selected ride to save."));
+        oops.exec();
+        return;
+    }
 }
 
 void
@@ -1661,7 +1673,7 @@ MainWindow::revertRide()
 void
 MainWindow::splitRide()
 {
-    (new SplitRideDialog(this))->exec();
+    if (ride) (new SplitRideDialog(this))->exec();
 }
 
 void

src/RideEditor.cpp

@@ -256,7 +256,7 @@ RideEditor::isColumnSelected()
 void
 RideEditor::saveFile()
 {
-    if (ride->isDirty()) {
+    if (ride && ride->isDirty()) {
         main->saveRideSingleDialog(ride);
     }
 }
@@ -264,13 +264,15 @@ RideEditor::saveFile()
 void
 RideEditor::undo()
 {
-    ride->ride()->command->undoCommand();
+    if (ride && ride->ride() && ride->ride()->command)
+        ride->ride()->command->undoCommand();
 }
 
 void
 RideEditor::redo()
 {
-    ride->ride()->command->redoCommand();
+    if (ride && ride->ride() && ride->ride()->command)
+        ride->ride()->command->redoCommand();
 }
 
 void
@@ -1080,7 +1082,10 @@ void
 RideEditor::rideSelected()
 {
     RideItem *current = myRideItem;
-    if (!current || !current->ride()) return;
+    if (!current || !current->ride()) {
+        model->setRide(NULL);
+        return;
+    }
 
     ride = current;
 
@@ -1092,7 +1097,6 @@ RideEditor::rideSelected()
         data = ride->ride()->editorData();
         data->found.clear(); // search is not active, so clear
     }
-
     model->setRide(ride->ride());
 
     // reset the save icon on the toolbar

src/RideFile.cpp

@@ -50,6 +50,7 @@ RideFile::RideFile() : recIntSecs_(0.0), deviceType_("unknown"), data(NULL)
 
 RideFile::~RideFile()
 {
+    emit deleted();
     foreach(RideFilePoint *point, dataPoints_)
         delete point;
     delete command;

src/RideFile.h

@@ -174,6 +174,7 @@ class RideFile : public QObject // QObject to emit signals
         void saved();
         void reverted();
         void modified();
+        void deleted();
 
     protected:
         void emitSaved();

src/RideFileTableModel.cpp

@@ -45,12 +45,20 @@ RideFileTableModel::setRide(RideFile *newride)
         connection = ride->command;
         connect(ride->command, SIGNAL(beginCommand(bool,RideCommand*)), this, SLOT(beginCommand(bool,RideCommand*)));
         connect(ride->command, SIGNAL(endCommand(bool,RideCommand*)), this, SLOT(endCommand(bool,RideCommand*)));
+        connect(ride, SIGNAL(deleted()), this, SLOT(deleted()));
 
         // refresh
         emit layoutChanged();
     }
 }
 
+void
+RideFileTableModel::deleted()
+{
+    // we don't need to disconnect since they're free'd up by QT
+    ride = NULL;
+}
+
 void
 RideFileTableModel::setHeadings(RideFile::SeriesType series)
 {

src/RideFileTableModel.h

@@ -83,6 +83,12 @@ class RideFileTableModel : public QAbstractTableModel
         void beginCommand(bool undo, RideCommand *);
         void endCommand(bool undo, RideCommand *);
 
+        // Import wizard frees the ridefile memory to
+        // stop exhausting memory, but we need to know
+        // coz we reference the ride file and not the 
+        // ride item. long story.
+        void deleted();
+
         // force redraw - used by anomaly detection and find
         void forceRedraw();
 

src/RideImportWizard.cpp

@@ -687,7 +687,6 @@ RideImportWizard::abortClicked()
             }
 
         } else {
-
             // for native file formats the filename IS the ride date time so
             // no need to write -- we just copy
 
@@ -725,6 +724,9 @@ RideImportWizard::abortClicked()
                         mainWindow->addRide(QFileInfo(fulltarget).fileName(), true); // add to tree view
                         // free immediately otherwise all imported rides are cached
                         // and with large imports this can lead to memory exhaustion
+                        // BUT! Some charts/windows will hava snaffled away the ridefile
+                        // pointer which is now invalid so once all the rides have been imported
+                        // we need to select the last one... see below
                         mainWindow->rideItem()->freeMemory();
                     } else
                         tableWidget->item(i,5)->setText(tr("Error - copy failed"));

src/RideNavigator.cpp

@@ -536,7 +536,12 @@ RideNavigator::rideTreeSelectionChanged()
     if (active == true) return;
     else active = true;
 
-    QTreeWidgetItem *which = main->rideTreeWidget()->selectedItems().first();
+    QTreeWidgetItem *which;
+    if (main->rideTreeWidget()->selectedItems().count())
+        which = main->rideTreeWidget()->selectedItems().first();
+    else // no rides slected
+        which = NULL;
+
     if (which && which->type() == RIDE_TYPE) {
         RideItem *rideItem = static_cast<RideItem *>(which);
 

src/WeeklySummaryWindow.cpp

@@ -216,7 +216,7 @@ WeeklySummaryWindow::refresh()
 
             // average RI for the day
             if (dailyRides[day] > 1)
-                dailyRI[day] = ((dailyRI[day] * (dailyRides[i]-1))
+                dailyRI[day] = ((dailyRI[day] * (dailyRides[day]-1))
                                 + metrics.getForSymbol("skiba_relative_intensity")) / dailyRides[day];
             else
                 dailyRI[day] = metrics.getForSymbol("skiba_relative_intensity");