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

Fixup MainWindow refactor Part 2

Browse Source 
.. fix workoutwizard context hack
.. fix modelplot (3d) code that was missed
This commit is contained in:
Mark Liversedge
2013-07-11 18:10:37 +01:00
parent 05f1d577db
commit e7935976c6
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ModelWindow.cpp
View File

@@ -18,6 +18,7 @@
#include "ModelWindow.h"
#include "ModelPlot.h"
#include "MainWindow.h"
#include "Context.h"
#include "RideItem.h"
#include "IntervalItem.h"
@@ -45,7 +46,7 @@ ModelWindow::addStandardChannels(QComboBox *box)
}
ModelWindow::ModelWindow(Context *context, const QDir &home) :
GcChartWindow(context), home(home), main(parent), ride(NULL), current(NULL)
GcChartWindow(context), home(home), context(context), ride(NULL), current(NULL)
{
setInstanceName("3D Window");
@@ -59,7 +60,7 @@ ModelWindow::ModelWindow(Context *context, const QDir &home) :
// the plot widget
QHBoxLayout *mainLayout = new QHBoxLayout;
modelPlot= new ModelPlot(main, NULL);
modelPlot= new ModelPlot(context, NULL);
zpane = new QSlider(Qt::Vertical);
zpane->setTickInterval(1);
zpane->setMinimum(0);
@@ -150,7 +151,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(main, SIGNAL(intervalSelected()), this, SLOT(intervalSelected()));
connect(context->mainWindow, 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()));
@@ -238,8 +239,8 @@ ModelWindow::setData(bool adjustPlot)
// any intervals to plot?
settings.intervals.clear();
for (int i=0; i<main->allIntervalItems()->childCount(); i++) {
IntervalItem *current = dynamic_cast<IntervalItem *>(main->allIntervalItems()->child(i));
for (int i=0; i<context->mainWindow->allIntervalItems()->childCount(); i++) {
IntervalItem *current = dynamic_cast<IntervalItem *>(context->mainWindow->allIntervalItems()->child(i));
if (current != NULL && current->isSelected() == true)
settings.intervals.append(current);
}