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

24
src/TreeMapWindow.cpp
View File

@@ -20,7 +20,9 @@
#include "LTMTool.h"
#include "TreeMapPlot.h"
#include "LTMSettings.h"
#include "MainWindow.h"
#include "Context.h"
#include "Context.h"
#include "Athlete.h"
#include "SummaryMetrics.h"
#include "Settings.h"
#include "math.h"
@@ -34,14 +36,14 @@
#include <qwt_plot_picker.h>
#include <qwt_plot_marker.h>
TreeMapWindow::TreeMapWindow(MainWindow *parent) :
GcWindow(parent), main(parent), active(false), dirty(true), useCustom(false), useToToday(false)
TreeMapWindow::TreeMapWindow(Context *context) :
GcWindow(context), context(context), active(false), dirty(true), useCustom(false), useToToday(false)
{
setInstanceName("Treemap Window");
// the plot
mainLayout = new QVBoxLayout;
ltmPlot = new TreeMapPlot(this, main);
ltmPlot = new TreeMapPlot(this, context);
mainLayout->addWidget(ltmPlot);
mainLayout->setSpacing(0);
mainLayout->setContentsMargins(0,0,0,0);
@@ -53,7 +55,7 @@ TreeMapWindow::TreeMapWindow(MainWindow *parent) :
setControls(c);
// read metadata.xml
QString filename = main->athlete->home.absolutePath()+"/metadata.xml";
QString filename = context->athlete->home.absolutePath()+"/metadata.xml";
QString colorfield;
if (!QFile(filename).exists()) filename = ":/xml/metadata.xml";
RideMetadata::readXML(filename, keywordDefinitions, fieldDefinitions, colorfield);
@@ -70,7 +72,7 @@ TreeMapWindow::TreeMapWindow(MainWindow *parent) :
// setup the popup widget
popup = new GcPane();
ltmPopup = new LTMPopup(main);
ltmPopup = new LTMPopup(context);
QVBoxLayout *popupLayout = new QVBoxLayout();
popupLayout->addWidget(ltmPopup);
popup->setLayout(popupLayout);
@@ -133,11 +135,11 @@ TreeMapWindow::TreeMapWindow(MainWindow *parent) :
// config changes or ride file activities cause a redraw/refresh (but only if active)
connect(this, SIGNAL(rideItemChanged(RideItem*)), this, SLOT(rideSelected()));
connect(main, SIGNAL(rideAdded(RideItem*)), this, SLOT(refresh(void)));
connect(main, SIGNAL(rideDeleted(RideItem*)), this, SLOT(refresh(void)));
connect(main, SIGNAL(filterChanged(QStringList&)), this, SLOT(refresh(void)));
connect(context->mainWindow, SIGNAL(rideAdded(RideItem*)), this, SLOT(refresh(void)));
connect(context->mainWindow, SIGNAL(rideDeleted(RideItem*)), this, SLOT(refresh(void)));
connect(context->mainWindow, SIGNAL(filterChanged(QStringList&)), this, SLOT(refresh(void)));
connect(main->context, SIGNAL(configChanged()), this, SLOT(refresh()));
connect(context, SIGNAL(configChanged()), this, SLOT(refresh()));
// user clicked on a cell in the plot
connect(ltmPlot, SIGNAL(clicked(QString,QString)), this, SLOT(cellClicked(QString,QString)));
@@ -228,7 +230,7 @@ TreeMapWindow::refresh()
// get the data
results.clear(); // clear any old data
results = main->athlete->metricDB->getAllMetricsFor(QDateTime(settings.from, QTime(0,0,0)),
results = context->athlete->metricDB->getAllMetricsFor(QDateTime(settings.from, QTime(0,0,0)),
QDateTime(settings.to, QTime(0,0,0)));
refreshPlot();