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

11
src/FitlogRideFile.cpp
View File

@@ -20,7 +20,8 @@
#include "FitlogParser.h"
#include <QDomDocument>
#include "MainWindow.h"
#include "Context.h"
#include "Athlete.h"
#include "RideMetric.h"
#ifndef GC_VERSION
@@ -50,7 +51,7 @@ RideFile *FitlogFileReader::openRideFile(QFile &file, QStringList &errors, QList
}
bool
FitlogFileReader::writeRideFile(MainWindow *mainWindow, const RideFile *ride, QFile &file) const
FitlogFileReader::writeRideFile(Context *context, const RideFile *ride, QFile &file) const
{
QDomText text;
QDomDocument doc;
@@ -69,7 +70,7 @@ FitlogFileReader::writeRideFile(MainWindow *mainWindow, const RideFile *ride, QF
fitnessWorkbook.appendChild(athleteLog);
QDomElement athlete = doc.createElement("Athlete");
athlete.setAttribute("athlete",mainWindow->athlete->cyclist);
athlete.setAttribute("athlete",context->athlete->cyclist);
athleteLog.appendChild(athlete);
QDomElement activity = doc.createElement("Activity");
@@ -100,7 +101,7 @@ FitlogFileReader::writeRideFile(MainWindow *mainWindow, const RideFile *ride, QF
QStringList worklist = QStringList();
for (int i=0; metrics[i];i++) worklist << metrics[i];
QHash<QString, RideMetricPtr> computed = RideMetric::computeMetrics(mainWindow, ride, mainWindow->athlete->zones(), mainWindow->athlete->hrZones(), worklist);
QHash<QString, RideMetricPtr> computed = RideMetric::computeMetrics(context, ride, context->athlete->zones(), context->athlete->hrZones(), worklist);
QDomElement duration = doc.createElement("Duration");
duration.setAttribute("TotalSeconds", QString("%1").arg(computed.value("workout_time")->value(true)));
@@ -157,7 +158,7 @@ FitlogFileReader::writeRideFile(MainWindow *mainWindow, const RideFile *ride, QF
}
computed =
RideMetric::computeMetrics(mainWindow, &f, mainWindow->athlete->zones(), mainWindow->athlete->hrZones(), worklist);
RideMetric::computeMetrics(context, &f, context->athlete->zones(), context->athlete->hrZones(), worklist);
QDomElement lap = doc.createElement("Lap");
lap.setAttribute("StartTime", ride->startTime().addSecs(interval.start).toString(Qt::ISODate)+"Z");