nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 00:49: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

15
src/WorkoutPlotWindow.cpp
View File

@@ -18,9 +18,10 @@
#include "WorkoutPlotWindow.h"
#include "Context.h"
WorkoutPlotWindow::WorkoutPlotWindow(MainWindow *mainWindow) :
GcWindow(mainWindow), mainWindow(mainWindow)
WorkoutPlotWindow::WorkoutPlotWindow(Context *context) :
GcWindow(context), context(context)
{
setContentsMargins(0,0,0,0);
setInstanceName("RT Plot");
@@ -30,13 +31,13 @@ WorkoutPlotWindow::WorkoutPlotWindow(MainWindow *mainWindow) :
QVBoxLayout *layout = new QVBoxLayout(this);
layout->setSpacing(0);
layout->setContentsMargins(2,2,2,2);
ergPlot = new ErgFilePlot(mainWindow);
ergPlot = new ErgFilePlot(context);
layout->addWidget(ergPlot);
connect(mainWindow->context, SIGNAL(setNow(long)), this, SLOT(setNow(long)));
connect(mainWindow->context, SIGNAL(ergFileSelected(ErgFile*)), this, SLOT(ergFileSelected(ErgFile*)));
connect(mainWindow->context, SIGNAL(telemetryUpdate(RealtimeData)), ergPlot, SLOT(performancePlot(RealtimeData)));
connect(mainWindow->context, SIGNAL(start()), ergPlot, SLOT(start()));
connect(context, SIGNAL(setNow(long)), this, SLOT(setNow(long)));
connect(context, SIGNAL(ergFileSelected(ErgFile*)), this, SLOT(ergFileSelected(ErgFile*)));
connect(context, SIGNAL(telemetryUpdate(RealtimeData)), ergPlot, SLOT(performancePlot(RealtimeData)));
connect(context, SIGNAL(start()), ergPlot, SLOT(start()));
}
void