mirror of
https://github.com/GoldenCheetah/GoldenCheetah.git
synced 2026-02-14 08:38:45 +00:00
Refactor MainWindow Part 2 of 5
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:
@@ -45,7 +45,7 @@ class AverageWPK : public RideMetric {
|
||||
void compute(const RideFile *ride, const Zones *, int,
|
||||
const HrZones *, int,
|
||||
const QHash<QString,RideMetric*> &deps,
|
||||
const MainWindow *) {
|
||||
const Context *) {
|
||||
|
||||
// unconst naughty boy
|
||||
RideFile *uride = const_cast<RideFile*>(ride);
|
||||
@@ -81,7 +81,7 @@ class PeakWPK : public RideMetric {
|
||||
void compute(const RideFile *ride, const Zones *, int,
|
||||
const HrZones *, int,
|
||||
const QHash<QString,RideMetric*> &,
|
||||
const MainWindow *) {
|
||||
const Context *) {
|
||||
|
||||
// unconst naughty boy
|
||||
RideFile *uride = const_cast<RideFile*>(ride);
|
||||
@@ -300,7 +300,7 @@ class Vo2max : public RideMetric {
|
||||
void compute(const RideFile *, const Zones *, int,
|
||||
const HrZones *, int,
|
||||
const QHash<QString,RideMetric*> &deps,
|
||||
const MainWindow *) {
|
||||
const Context *) {
|
||||
|
||||
PeakWPK5m *wpk5m = dynamic_cast<PeakWPK5m*>(deps.value("5m_peak_wpk"));
|
||||
setValue(wpk5m->value(false) * 12 + 3.5);
|
||||
|
||||
Reference in New Issue
Block a user