nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-14 08:38:45 +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

16
src/PfPvWindow.cpp
View File

@@ -18,6 +18,8 @@
#include "PfPvWindow.h"
#include "MainWindow.h"
#include "Context.h"
#include "Athlete.h"
#include "PfPvPlot.h"
#include "RideItem.h"
#include "Settings.h"
@@ -63,8 +65,8 @@ PfPvDoubleClickPicker::trackerTextF( const QPointF &pos ) const
return QwtText( text );
}
PfPvWindow::PfPvWindow(MainWindow *mainWindow) :
GcChartWindow(mainWindow), mainWindow(mainWindow), current(NULL)
PfPvWindow::PfPvWindow(Context *context) :
GcChartWindow(context), context(context), current(NULL)
{
setInstanceName("Pf/Pv Window");
@@ -108,7 +110,7 @@ PfPvWindow::PfPvWindow(MainWindow *mainWindow) :
// the plot
QVBoxLayout *vlayout = new QVBoxLayout;
pfPvPlot = new PfPvPlot(mainWindow);
pfPvPlot = new PfPvPlot(context);
vlayout->addWidget(pfPvPlot);
setChartLayout(vlayout);
@@ -190,10 +192,10 @@ PfPvWindow::PfPvWindow(MainWindow *mainWindow) :
//connect(mainWindow, SIGNAL(rideSelected()), this, SLOT(rideSelected()));
connect(doubleClickPicker, SIGNAL(doubleClicked(int, int)), this, SLOT(doubleClicked(int, int)));
connect(this, SIGNAL(rideItemChanged(RideItem*)), this, SLOT(rideSelected()));
connect(mainWindow, SIGNAL(intervalSelected()), this, SLOT(intervalSelected()));
connect(mainWindow, SIGNAL(intervalsChanged()), this, SLOT(intervalSelected()));
connect(mainWindow->athlete, SIGNAL(zonesChanged()), this, SLOT(zonesChanged()));
connect(mainWindow->context, SIGNAL(configChanged()), pfPvPlot, SLOT(configChanged()));
connect(context->mainWindow, SIGNAL(intervalSelected()), this, SLOT(intervalSelected()));
connect(context->mainWindow, SIGNAL(intervalsChanged()), this, SLOT(intervalSelected()));
connect(context->athlete, SIGNAL(zonesChanged()), this, SLOT(zonesChanged()));
connect(context, SIGNAL(configChanged()), pfPvPlot, SLOT(configChanged()));
}
void