mirror of
https://github.com/GoldenCheetah/GoldenCheetah.git
synced 2026-02-16 17:39:58 +00:00
MainWindow Refactor Part 3 of 5
Slowly migrating code and data from the MainWindow class to Athlete and Context classes. This update moves the ride and interval lists and data structures from MainWindow to Athlete.
This commit is contained in:
@@ -20,6 +20,7 @@
|
||||
#include "ModelPlot.h"
|
||||
#include "MainWindow.h"
|
||||
#include "Context.h"
|
||||
#include "Athlete.h"
|
||||
#include "RideItem.h"
|
||||
#include "IntervalItem.h"
|
||||
#include "math.h"
|
||||
@@ -151,7 +152,7 @@ ModelWindow::ModelWindow(Context *context, const QDir &home) :
|
||||
// now connect up the widgets
|
||||
//connect(main, SIGNAL(rideSelected()), this, SLOT(rideSelected()));
|
||||
connect(this, SIGNAL(rideItemChanged(RideItem*)), this, SLOT(rideSelected()));
|
||||
connect(context->mainWindow, SIGNAL(intervalSelected()), this, SLOT(intervalSelected()));
|
||||
connect(context, SIGNAL(intervalSelected()), this, SLOT(intervalSelected()));
|
||||
connect(presetValues, SIGNAL(currentIndexChanged(int)), this, SLOT(applyPreset(int)));
|
||||
connect(xSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(setDirty()));
|
||||
connect(ySelector, SIGNAL(currentIndexChanged(int)), this, SLOT(setDirty()));
|
||||
@@ -239,8 +240,8 @@ ModelWindow::setData(bool adjustPlot)
|
||||
|
||||
// any intervals to plot?
|
||||
settings.intervals.clear();
|
||||
for (int i=0; i<context->mainWindow->allIntervalItems()->childCount(); i++) {
|
||||
IntervalItem *current = dynamic_cast<IntervalItem *>(context->mainWindow->allIntervalItems()->child(i));
|
||||
for (int i=0; i<context->athlete->allIntervalItems()->childCount(); i++) {
|
||||
IntervalItem *current = dynamic_cast<IntervalItem *>(context->athlete->allIntervalItems()->child(i));
|
||||
if (current != NULL && current->isSelected() == true)
|
||||
settings.intervals.append(current);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user