Commit Graph

157 Commits

Author SHA1 Message Date
Mark Liversedge
39ce98a959 HACK: AllPlot SEGV Fix
.. line 1289 of AllPlotWindow was updated to rebuild the
   plots when the ride was dirty, but it looks like there is
   a strange interaction when rideItem doesn't change and
   rideItem->ride() does.

NOTE: rides will not be refreshed after merge wizard completes
      until this is fixed up in AllPlotWindow.
2014-11-15 09:06:34 +00:00
Mark Liversedge
7d1b59d0a4 Fix AllPlot Fill setting
.. was not always set, lost when removing the reference
   to parent->paintbrush in recent update.
2014-11-14 22:10:51 +00:00
Mark Liversedge
d56bd21156 Updated Merge Tool Part 2c (last part)
.. UX to adjust now complete.

We may need to tidy a few things up, but this
is now good for working with the Moxy at the
very least.
2014-11-14 18:45:40 +00:00
Mark Liversedge
75886a70af Updated Merge Tool Part 2b of 2abc
.. need to save away with analyse() and combine()
   now complete, and working pretty well on my data

.. now to work on the last piece, the 'adjust' page
   to shift data-series left and right manually (for
   cases where the calculated offsets are wrong or
   need to be tweaked by the user)
2014-11-14 11:26:20 +00:00
Mark Liversedge
f80427d98e Updated Merge Tool Part 2a of 2a/b
.. page flow and join sorted

.. committing before resolving the merging code
   - analyse() to identify offsets
   - combine() to merge into a working copy
   - ux for sliding offsets on a fullplot

.. next commit will complete this update to the
   merge tool

NOTE: MERGE IS NOT CURRENTLY WORKING SO PLEASE
      DO NOT USE IT !!!!
2014-11-13 20:02:25 +00:00
Mark Liversedge
7e2542b915 Always show span slider on ride plot
.. the left/right scrolling is useful and takes very little
   screen estate so always enable it

.. the full plot can still be show/hidden with the chart
   controls
2014-11-01 09:42:02 +00:00
Mark Liversedge
1d398be89e Add HHb and O2Hb to Allplot
.. so you can now look at oxy v deoxy as a time
   series against hr and power.
2014-10-23 21:52:31 +01:00
Mark Liversedge
f583de0801 O2Hb and HHb added to AllPlot Controls
.. now for the slog to add to the charts !
2014-10-23 20:36:57 +01:00
Mark Liversedge
243923c135 Ride Plot Running Dynamics and Moxy (2 of 2)
.. added to the ride plot, but now need to think
   about customising and setting a default color
   for the six (!) data series.
2014-10-16 17:23:35 +01:00
Mark Liversedge
e62259f5ca AllPlotWindow Settings
.. still too big !
2014-10-16 11:54:53 +01:00
Mark Liversedge
3d00475450 Gear Ratio Derived Data Series
.. added to code but not displayed on allplot etc

.. will add to allplot when doing running dynamics and moxy
   data series (next couple of days)
2014-10-16 11:26:01 +01:00
Mark Liversedge
10b5d4a589 Ride Plot Running Dynamics and Moxy (1 of 2)
.. plotting the new running dynamics data series;
   ground contact time, vertical oscillation and cadence

.. plotting the moxy data;
   muscle oxygen (absolute) and haemoglobin mass (relative)

.. just added to the controls (AllPlotWindow)

.. part 2 is the slog to add to the plots (ugh)
2014-10-16 10:15:43 +01:00
Mark Liversedge
0eeb434bef Ride Plot Settings
.. restructure to make some space for running dynamics
   and moxy muscle oxygen and haemoglobin mass
2014-10-16 09:51:25 +01:00
Mark Liversedge
71a7323a40 Merge pull request #1079 from Joern-R/pull1
AllPlotWindow - Alt/Slope - improve texts
2014-10-10 21:33:01 +02:00
Joern
8ba99d9907 AllPlot: in Stacked View = yes / By Series = no - Curves missing
... NP, AP, XP and TE, PS curve are not shown as indicated by "Checked"

when changing between rides, "Checked" settings are ignored
2014-10-10 19:38:17 +02:00
Damien
dc56efd4bd AllPlot: show balance in stack view only if checked 2014-10-10 16:42:11 +02:00
Joern
e09e2a3ba9 AllPlotWindow - Alt/Slope - improve texts
... improve texts for Imperial unit setting
2014-10-02 12:53:26 +02:00
Joern
4b1a62d68f AllPlot - Alt/Slope - switching between views
... the Alt/Plot settings were not in sync between standard anc compare
view (changes in compare view had not impact on standard view - when
de-activating compare)
... Alt/Plot is now also visible in "fullPlot" as this helps to find
sections to zoom in (by checking the color coding)
2014-09-30 17:33:48 +02:00
Joern
b6d4f3fa2b All-Plot - Add "Slope" and "Alt/Slope" curves
... add "Slope" curve based on Slope Data in Ride Files (with separate
new color)
... add "Alt/Slope" curve based on "Altitude" data series
... sections on "Alt/Slope" have 3 options -  1min/100 m OR 5min/500 m
OR 10min/1000 m
... color / slope assignments are defined in AllPlotSlopeCurve (to look
it up)
... if a plotted section is wide enough the slope % (distance) / VAM
(time) value is shown above
2014-09-30 12:41:06 +02:00
Mark Liversedge
1fede60001 Refresh Series Stack when ByDistance changes
.. Fixes #990
2014-07-28 07:55:39 +01:00
Mark Liversedge
fb67dad4a8 Ride Plot Refresh Bug
.. when compare switched off when not visible we need to
   refresh when we become visible
2014-07-05 11:18:05 +01:00
Mark Liversedge
bb5fdb094d Zoom AllPlot a bit bigger 2014-07-02 15:48:20 +01:00
Joern
21b6b4993a Translation Enablement & consider "seconds" translation
... multiple tr() added for Intervals. Compare Pane
... in Compare Pane - in time metrics check for both "seconds" and
translated tr(seconds) (following the concept for time as at most other
places where units == "seconds" are checked

(cherry picked from commit 6c78b00b65a1d794eb99038f21d6e705d119d29e)
2014-06-07 19:52:24 +02:00
Mark Liversedge
6e52284c39 Fix Overlay Widget
.. easier to grab and resize
.. move when it goes off screen
2014-06-01 18:48:16 +01:00
Mark Liversedge
f77eb5c14f Another Scrollbar ..
.. AllPlot IntervalSummary overlay needs its
   scrollbar styled.
2014-05-30 21:14:37 +01:00
Joern
5b8a98003a Translation Enablement
... some tr(...) missing - nothing else

(cherry picked from commit 12056261bc04269bbd723d7f0049cf193d950847)
2014-05-29 19:25:35 +02:00
Mark Liversedge
09ab79f221 Fix stylesheet/palette gotcha on AllPlot
.. mucked up the reset of the palettes for all
   the widgets when setting the stylesheet for
   the scrollareas.
2014-05-26 20:50:31 +01:00
Mark Liversedge
894c23287a Scrollbars on AllPlotWindow
.. made to look the same as everywhere else
   i.e. not clunky and ugly.
2014-05-26 20:05:04 +01:00
Mark Liversedge
a47420198a Fix compare all plot smoothing of 0
.. always make it non-zero to get the arrays initialised
2014-05-26 14:47:37 +01:00
Mark Liversedge
76afdc6e6c Be consistent - 'Overlay' not 'Show Overlay' 2014-05-18 13:17:39 +01:00
Mark Liversedge
008d64e618 Add Overlay to AllPlot
.. show interval details when hovering over them on the ride
   plot using the new overlay widget
2014-05-18 13:11:51 +01:00
Mark Liversedge
b1516dc438 Fix blank ride plot in compare mode
.. when you switch tabs to ride plot having never
   displayed any ride at all.

.. also fixes switching to compare mode when the currently
   selected ride is blank (has no data).
2014-04-19 20:43:51 +01:00
Mark Liversedge
7b93b374f5 Fix AllPlot colour changes
.. frame now updates when the colours change.
2014-04-18 13:35:16 +01:00
Mark Liversedge
9592f39d6a Add Vector data series to ride plot
.. Torque Effectiveness and Pedal Smoothness now
   added to the ride plot.
2014-04-13 19:47:21 +01:00
Mark Liversedge
9bca3cc44b Changing colors in Ride Plot
.. stack plots respond when colors change
.. need to work out whats wrong with allplot and fullplot
2014-03-29 12:27:25 +00:00
Mark Liversedge
d69ebddb1d Anaerobic TISS
Added Anaerobic TISS from Dr Skiba to complement
the Aerobic TISS added recently.

Added to;
* Metrics
* Ride Plot
* PMC metrics
2014-03-22 10:47:44 +00:00
Mark Liversedge
89017fe2a5 Stress Metric Prototypes
Added a few new training stress metrics whilst discussing
and working on a multicomponent view of training stress.

This is all a wip falling out of discussions around stress
metrics beyond the old TSS/BikeScore models.

For now this just includes;
1. Aerobic Training Impact Scoring System on PM/PMC
2. Work (Kj) above/below CP on PM/PMC
3. Aerobic TISS on the Ride Plot

There is lots more to come; specifically around Anaerobic TISS,
looking again at polarised training and personalised training stress
based upon the individual's CP model.
2014-03-17 20:51:57 +00:00
Mark Liversedge
a073acc78d UX Fixups
.. chart bar scroll left and right when too many charts
.. set background in ride plot
.. chart menu says 'More...' instead of down tick
2014-03-10 19:40:22 +00:00
Mark Liversedge
0144a3016e Fixup Unicode 'Delta' character
.. it didn't display properly on Linux (and possibly
   Windows).
2014-02-26 21:28:44 +00:00
Mark Liversedge
b6c2df1131 Small Tidy up of AllPlot Settings 2014-02-26 12:00:21 +00:00
Mark Liversedge
4e9d26d2e0 Delta Watts, Torque, Cadence and HR
.. Following on from the recent update to add acceleration
   this update adds other derived data series based upon the
   rate of change.

.. Added to the ride plot and the CP plot.

Not sure of the overall utility of these updates but bear in
mind that they are targetting sprinting and track users and
analysis.

As well as the positive side of this (development of power
cadence etc) we also want to think about and collect data
on fatigue rate (possibly only power and torque)
- fatigue over time
- fatigue over pedal stroke
2014-02-25 18:44:53 +00:00
Mark Liversedge
ec3ddfaaca Add Acceleration Data Series
.. to ride plot only at this point, but will add to
   CP curve etc later

.. will also need to add rate of change for HR, Cadence
   Power as well too.
2014-02-21 20:04:07 +00:00
Mark Liversedge
48ef0bc75c Scale Y-Axis on Ride Plot
.. When you click on the axis to isolate it a spanslider
   appears to let you manually adjust the axis.

.. it looks naff .. but we can tidy that up separately
2014-02-20 23:21:33 +00:00
Mark Liversedge
6305943559 QwtPicker SEGV possibly on missing axis
.. the series plot has no yLeft axis yet the plot picker
   is always attached to it.

.. Since we do ALWAYS have a yLeft,2 axis for the highlighter
   I've attached the picker to that instead.

.. This should hopefully stop the SEGV in qwtplotpicker::updateDisplay()

.. Will watch and monitor
2014-02-11 21:29:12 +00:00
Mark Liversedge
d590e58e41 Ride Plot Highlight Interval on Hover
.. As you mouse over the ride plot it will now highlight
   the shortest interval that that point is within.

.. If an interval has been selected in the sidebar it will
   refrain from hover highlighting as it is distracting

.. Also fixed up the way the highlight curve works so it
   has its own axis and works regardless of the data series
   selected.
2014-02-10 19:24:04 +00:00
Mark Liversedge
d4ff56031a AllPlot Series Stack Sizes
.. now set to the user preference when a ride is selectred where
   previously it would set to 200px.
2014-02-06 23:32:04 +00:00
Mark Liversedge
121a4c691a Minimum CP for W'bal going negative
.. on ride plot, when W'bal is plotted we put a mesage to say
   that CP is wrong, and autosolve for W'bal to zero.

.. this patch also optimises WPrime to make it a member of the
   ridefile class and this always available (even for intervals).

.. fixed a SEGV when computing metrics for intervals by shifting
   the timestamps to always start from zero.
2014-01-22 20:48:42 +00:00
Mark Liversedge
2ac02e7b0b Hide empty series plots in compare mode
.. check the curves are empty!
2014-01-06 18:25:52 +00:00
Mark Liversedge
37d8e7a603 AllPlot Paint Zones in Compare Mode
.. we should actually paint a zoned background if
   power shade zones is selected, when in compare mode.

.. but /only/ for charts that have power on them!
2014-01-06 17:51:15 +00:00
Mark Liversedge
dc5cfc7e76 Fix Ride plot zone shading for series stack
.. the setting wasn't being set/unset according to
   user preferences properly.
2014-01-06 17:01:43 +00:00