nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 08:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor MainWindow Part 2 of 5

Browse Source 
Decoupled classes from MainWindow to reference Context
and Athlete (and introduced a couple of new headers).

We no longer pass around a MainWindow pointer to children
but pass a context instead.

There are still a few pieces left in MainWindow that need
to move to a better place;
    * Setting/clearing filter selection
    * Working with Intervals
    * Adding/Deleting Rides
    * Save on Exit

As mentioned previously there are lots of other parts to
this refactor left to do;
    * break MainWindow Gui elements into Toolbar and Views

    * migrate from RideItem and Ridelist to ActivityCollection
      and Activity classes that are not tied into gui elements.

    * introduce Application Context and AthleteCollection
This commit is contained in:
Mark Liversedge
2013-07-10 13:57:30 +01:00
parent cd54ce16c8
commit 05f1d577db
235 changed files with 2196 additions and 1948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/AddIntervalDialog.cpp
View File

@@ -18,14 +18,15 @@
#include "AddIntervalDialog.h"
#include "MainWindow.h"
#include "Context.h"
#include "IntervalItem.h"
#include "RideFile.h"
#include <QMap>
#include <assert.h>
#include <math.h>
AddIntervalDialog::AddIntervalDialog(MainWindow *mainWindow) :
mainWindow(mainWindow)
AddIntervalDialog::AddIntervalDialog(Context *context) :
context(context)
{
setAttribute(Qt::WA_DeleteOnClose);
setWindowTitle(tr("Add Intervals"));
@@ -303,7 +304,7 @@ struct CompareBests {
void
AddIntervalDialog::createClicked()
{
const RideFile *ride = mainWindow->context->currentRide();
const RideFile *ride = context->currentRide();
if (!ride) {
QMessageBox::critical(this, tr("Select Ride"), tr("No ride selected!"));
return;
@@ -642,9 +643,9 @@ AddIntervalDialog::addClicked()
double start = resultsTable->item(i,3)->text().toDouble();
double stop = resultsTable->item(i,4)->text().toDouble();
QString name = resultsTable->item(i,2)->text();
const RideFile *ride = mainWindow->context->currentRide();
const RideFile *ride = context->currentRide();
QTreeWidgetItem *allIntervals = mainWindow->mutableIntervalItems();
QTreeWidgetItem *allIntervals = context->mainWindow->mutableIntervalItems();
QTreeWidgetItem *last =
new IntervalItem(ride, name, start, stop,
ride->timeToDistance(start),
@@ -655,5 +656,5 @@ AddIntervalDialog::addClicked()
allIntervals->addChild(last);
}
}
mainWindow->updateRideFileIntervals();
context->mainWindow->updateRideFileIntervals();
}