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

29
src/ErgFile.cpp
View File

@@ -17,6 +17,7 @@
*/
#include "ErgFile.h"
#include "Athlete.h"
#include <stdint.h>
#include "Units.h"
@@ -40,21 +41,21 @@ bool ErgFile::isWorkout(QString name)
}
return false;
}
ErgFile::ErgFile(QString filename, int &mode, MainWindow *main) :
filename(filename), main(main), mode(mode)
ErgFile::ErgFile(QString filename, int &mode, Context *context) :
filename(filename), context(context), mode(mode)
{
if (main->athlete->zones()) {
int zonerange = main->athlete->zones()->whichRange(QDateTime::currentDateTime().date());
if (zonerange >= 0) CP = main->athlete->zones()->getCP(zonerange);
if (context->athlete->zones()) {
int zonerange = context->athlete->zones()->whichRange(QDateTime::currentDateTime().date());
if (zonerange >= 0) CP = context->athlete->zones()->getCP(zonerange);
}
reload();
}
ErgFile::ErgFile(MainWindow *main) : main(main), mode(nomode)
ErgFile::ErgFile(Context *context) : context(context), mode(nomode)
{
if (main->athlete->zones()) {
int zonerange = main->athlete->zones()->whichRange(QDateTime::currentDateTime().date());
if (zonerange >= 0) CP = main->athlete->zones()->getCP(zonerange);
if (context->athlete->zones()) {
int zonerange = context->athlete->zones()->whichRange(QDateTime::currentDateTime().date());
if (zonerange >= 0) CP = context->athlete->zones()->getCP(zonerange);
} else {
CP = 300;
}
@@ -62,9 +63,9 @@ ErgFile::ErgFile(MainWindow *main) : main(main), mode(nomode)
}
ErgFile *
ErgFile::fromContent(QString contents, MainWindow *main)
ErgFile::fromContent(QString contents, Context *context)
{
ErgFile *p = new ErgFile(main);
ErgFile *p = new ErgFile(context);
p->parseComputrainer(contents);
return p;
}
@@ -719,9 +720,9 @@ ErgFile::calculateMetrics()
AP = apsum / count;
// CP
if (main->athlete->zones()) {
int zonerange = main->athlete->zones()->whichRange(QDateTime::currentDateTime().date());
if (zonerange >= 0) CP = main->athlete->zones()->getCP(zonerange);
if (context->athlete->zones()) {
int zonerange = context->athlete->zones()->whichRange(QDateTime::currentDateTime().date());
if (zonerange >= 0) CP = context->athlete->zones()->getCP(zonerange);
}
// IF