... removing tests,... from LIBKML build
... allowing building of base functionality of LIBKML on Windows with MinGW
... covering the LIBKML functional scope used by GoldenCheetah
.. NP > 200 && IF > 0.85 didn't work because the datafilter
grammar needed fixing up for precedence of the && and || operators.
.. this has been fixed by embedding into the grammar; binary expressions
and logical expressions are now declared individually.
.. the generated tree uses the same encoding so no changes required
to the code, just the grammar
In case user borked them in setup, applies to:
- Ride Date (startTime.date)
- Ride Time (startTime.time)
- Device (deviceType)
- Recording Interval (recIntSecs)
- Identifier (Id)
Since latest update for metadata now honours user configuration.
.. change LTM trend background to same as ride plot on upgrade
as by default it will be black and look different
.. remove metal look on anything other than Mac prior to the
10.10 Yosemite look. Metal looks naff these days.
.. we have been granted permission to use the TCore algorithm
and so the attributions have been added to the code and about
box.
.. Mark Buller should be added to the contributors too.
Added RPE to metadata.xml to allow data entry in the Workout tab and
PMC (Session RPE) to charts.xml
Added Equipment to Workout tab
Added GOVSS and SwimScore to Metric tab, to allow metric override
.. move use sidebar settings to basic page and
disable the other pages if its using sidebar
settings
.. when working in the sidebar, hide the basic
page since it is not shared
.. make the add chart dialog bigger if the screen
is large enough, since it needs to show a chart
and the config pane which has grown a little
over time.
.. remove all the editing/import/export functions
from the chart settings now they have their own
sidebar.
.. this also removes some of the problems with conflicts
and bugs in the code e.g. setting the first chart name
to "" by accident in the editingFinished() method (since
that is no longer supported !)
.. if you drag a chart in the LTM chart sidebar to beyond the
end of the list the move results in a QList assert abort.
.. this small fix checks for -1 and adjusts accordingly.
.. import/export charts
.. drag/drop them in the list to reorder
.. drop a 'charts.xml' (any .xml) file onto the mainwindow
to import charts exported by someone else.
.. when resetting the layouts we first go try the default
layouts from the goldencheetah website
http://www.goldencheetah.org/defaults/<release>/xxx-layout.xml
.. this means we can update the default setup independently of
the release binary; make tweaks etc
.. the same concept will shortly be introduced for resetting the
standard charts.xml presets for the trend view
.. if you select e.g. the TriScore PMC in the Library chart
in Trends, the high/low curves get left behind because they
use the same name (Best_xxx).
.. ironically this was already worked around by creating a name
that included the symbol, but this was not used when adding to
the curve mapping.
... ensures that Month is changed to month of current ride (which fixes the missing color)
... tested also for new Athlete creation (without any Ride data)
Note: Root cause may be a sequence issue of setting the calendar month, setting the ride, setting to current ride.
So there might be a better way to fix the problem.
... fill "units" field with original "units" from Metrics if new Chart is created
... store original "unit" into LTMSettings for later reference in automatic translation
... use a new version of LTMSettings to be compatible with any written version
- Code cleanup, removing deprecated code and refactoring
- Metrics translation is now done in a method for LTMSettings
- User defined metric name (uname) is translated if it matches english name
- User defined units (uunit) is only translated if it matches saved units
.. saves time, since translation not required
.. also avoids messing up the uunits when charts are customised
to have common y-axis e.g. Stress Ae and An Stress and PMC
using Stress instead of ATL, CTL, TSB etc
.. using the Holt-Winters double exponential smoothing to avoid
low on rising and high on falling data series.
.. works best with relatively noisy and contiguous data
.. added as they are handy for quick compare of changes
in the near term, without having to add temporary
date ranges
.. we should think about an "easy" way to do this for all
years and months for quick comparisons, in v4.0
.. fixes 80% of the issues with sorting 'strings'
.. we cannot just return metric values since they
need to be formatted to have the righ precision
or conversion to pace/duration etc.
.. was skipping 2p and 3p saves because it was agressively
checking W', FTP and Pmax when they didn't apply or
for values that were possibly correct (e.g. W'/kg > 100)
.. no need to pass across weight since we maintain two
models; absolute and per kg already.
NOTE: this has highlighted a bug in the code related to
estimated w/kg bests for 2 and 3 parameter models
that will be fixed shortly.
.. to augment the existing vo2max estimate using peak 5m
data in a ridefile, this now adds it as an estimate from
the PD model estimate for 5m peak power.
Implements #1432 as an option for Edit Interval, the user must
enable it via checkbox and confirm before it modifies speed and
distance for the underlying samples.
.. to speed up extracting the mean maximals.
.. we still work at 1s intervals for very short durations
but gradually increase to longer as the duration gets
over an hour.
.. for almost all usage this will not make a difference to the
values extracted since the actual values are largely rounded
to integer values (and therefore the granularity was already
being disposed after the search).
.. the exact durations are;
Duration Increment
<120 1
<600 2
<1200 5
<3600 20
<7200 120
>= 7200 300
This reverts commit 7fdedf0bfe.
.. we will come back to look at multisport FIT files in v4.0
The main problem is related to the position of the SESSION
header within the file.
.. fit file manu:76 identified as Moxy
.. support 7 field CSV, ignore session number
NOTE: support for UTC dates is not present since we
have no way of checking what TZ the ride was
recorded in !
.. show the An / Ae stress to provide context to the
changes in peak power durations.
.. or "why my anaerobic power isn't getting any better
despite spending all my time doing sweetspot"
.. since interval discovery impacts load time (reading from backing
store) and refresh time (computing metrics for intervals) we do
not search for PEAK power/pace by default.
.. if the user wants that info (which is of limited value) then they
can switch it on in preferences/options.
.. should help to reduce performance overhead for startup and refresh
especially as an experience immediately after upgrading to v3.2
.. lots of scenarios to cause the SEGV but all related
to the CurveColors::save/restore state functions that
cast QwtPlotIntervalCurves to the wrong type and BOOM!
.. thanks to Simon Brewer for the ride file that had this data.
.. select which kind of intervals we want
.. makes it faster and also reduces the size of
the rideDB.json file quite dramatically which
may be useful for some users.
.. if you filter the ride list the reset will search for
a heading "Calendar_Text" that will not exist since it
is prettified to "Calendar Text" in the constructor.
.. seems redundant, but at least reflect the type() of
metric when deciding; if the metric is defined as
being of type RideMetric::Low then return true
otherwise false.
.. the metric can override this method if needed if
is is still only an average (e.g. weight ?)
.. New derived data series representing an estimate of core temperature
on the basis of HR changes.
* shown on AllPlot and RideSummary
* 2 new metrics; max and avg core temperature
.. This has been based upon "Estimation of human core temperature from
sequential heart rate observations" Mark J Buller, William J Tharion,
Samuel N Cheuvront, Scott J Montain, Robert W Kenefick, John
Castellani, William A Latzka, Warren S Roberts, Mark Richter,
Odest Chadwicke Jenkins and Reed W Hoyt. (2013). Physiological
Measurement. IOP Publishing 34 (2013) 781–798.
.. all features now complete, bar a couple of minor
pending changes.
.. upgrade process feature complete, bar some minor
cosmetic nits for colors/metadata
.. time to validate the code changes since February
with the user community and freeze new features
.. add W'bal Zoned to Histogram
- for a ride
- for a date range
- *NOT* for a compared ride
- for a compared date range
This makes the last of the updates for W'bal
in zone, but highlights the issues related to
W'bal being held in a different structure to
the rest of the ride data.
Need to think on how that might work better
for intervals.
.. add W'bal Zoned to Histogram
- for a ride
- for a date range
- for a compared ride
- for a compared date range
.. still need to update ridesummary to show
summary of w'bal zone distribution (3c)
.. add W'bal distribution to Histogram
- for a ride
- for a date range
- for a compared ride
- for a compared date range
.. still need to revisit to do in zones (3b)
.. still need to update ridesummary to show
summary of w'bal zone distribution (3c)
In activities it depends on selected activity, bests are automatically filtered.
In range mode it can be set by sidebar or home filters for single sport
.. based upon Fiet-type formula elevation^2 / distance.
From an idea on Dan Conelly's blog.
Some examples:
Mt Ventoux - 121
Alpe d'Huez climb - 83
Galibier - 81
Glandon - 66
.. so it's not perfect, but gives a good sense of hard
versus easy !
For multi-sport files, the bike section might record vertical oscillation or
ground contact time from the HRM-RUN sensor when moving in and out of
transition.
For single ride use sport specific base metric
For date range use sport specific base metric if filtered activity
list is homogeneous or combined otherwise.
.. pops up a dialog to ask if you want to just add this
segment (the default) or add all intervals on this
segment for a season (you can select a season).
... exception "Truncated" for the "final" read call of the FIT file
reader was not catched, causing termination of the program (problem
reported with an example file being truncated at the end)
Multisport FIT files are imported as separate activities, one for each session
in the file.
The internal storage format for multisport files was also changed form TCX to
JSON, as the TCX file would not store advanced metrics, like the left-right
balance from the Garmin Vector power meter.
.. the lazy delete was a horrible hack and memory leak.
So, now the paint delegate no longer dereferences the
IntervalItem * from the QTreeWidgetItem.
Instead we use setData for UserRole+1 to store the interval
color when constructing the trees. The paint function can
get this directly and we avoid any contention when the
intervals are deleted and created.
The lazy delete can be removed and deleted once the changes
have been notified via intervalsUpdate().
.. since they are deleted in threads and affect the gui
.. to avoid the overhead of cross-thread mutex we just
delete intervals lazily; each time we refresh them
the last lot are wiped away.
.. SEGV on setting CP when no zones configured. Since
RideItem::updateIntervals() dereferenced a range
when CP is set, but none existed.
.. fixup use of Metadata field "W'" to override settings
in Metrics tab.
.. with a sidebar indicator
.. we may need to change when we have planned workouts
as the intervals will need to match the plan.
.. but we can use the same concept of 'quality' when
comparing a full activity with what was planned.
.. to indicate how far into the zone we got, so
3.1 is 10% into zone 3, whilst 7.9 is seriously
high Neuromuscular power, but below Pmax
.. we use Pmax to bound the upper value when calculating
how deep we got into the very upper zone; so it is
possible for the metric to be 8.x when only 7 zones
are defined (when the power value is > Pmax)
.. in stack mode always start from min W'bal or 0, whichever
is smaller. This makes it easier to identify when W'bal
is (or is not) being consumed across rides.
.. when looking at a ride and working with intervals it
is sometimes useful to look at the rest of the ride
exluding the intervals selected.
.. we now show the metrics for the intervals selected,
followed by for each interval then lastly for the
rest of the activity i.e. excluding the intervals
selected.
.. we now filter sustained efforts by zone rather than picking
the very best non-overlapping effort.
.. this means that a L7 sprint mid way through a L4 climb within
a L3 ride will find find 3 sustained intervals rather than just
the sprint.
.. just place TTE, EFFORTS and SPRINTS under
the EFFORTS interval type.
.. this is getting ready for handling overlapping
efforts rather than just the very best.
.. when the URL for the webservice is created it places
a slash between the host info from preferences and the
service path:
http://wbsapi.withings.net/measure?action=getmeas ..
By default, the withings server configuration has a
trailing slash, which results in a URL of the form:
http://wbsapi.withings.net//measure?action=getmeas ..
The double slash here ----^^ used to be accepted by
the Withings servers but more recently it is rejected
so this patch removes any trailing slash before
constructing the full path.
.. Route segments are found during interval refresh
.. Config/routes.xml only holds config now
.. The fingerprint for a rideitem includes the route
fingerprint now so it will refresh automatically
when the routes config changes
.. if no routes are defined then no work is done, so the
amount of work is really defined by the user
NOTE: RouteWindow, and now, RouteItem will need to
be reworked and fixed up for v4.0
.. it optimises out setRide when it is the same ride as currently
being plotted, but the intervals will have changed since they
were reloaded
.. so we always notify of intervals changed after intervalsUpdate()
just in case other charts skip refresh when the selected ride is
the same as the one they are already showing
.. by introducing a specific signal to trigger it.
.. its very specific, but its more flexible (and a lot less
work) than adopting a model for the QTreeView that would
be a better 'architecture'.
Rebuilds the interval tree when a ride is saved and
refreshes intervals as a result.
There are a number of other scenarios that will also
need to call a sidebar refresh as a result of the
intervals being updated.
* edit ride data
* change metadata
There may be others lurking. This needs a review of
the code pathways leading to RideItem::updateIntervals()
and how we keep the sidebar in sync.
.. the integrated joules and resampling to 1sec code
was not taking into account the first sample is 0 seconds
and was incrementing 1 sample early too.
As a result the integrated series was 2seconds ahead of the
recorded data, meaning the discovered efforts and sprints
would have a start time 2 seconds ahead of where they
should have been.
.. so we can keep a reference to the user interval
in a ridefile from the rideitem and not worry about
trying to match or handle index offsets into the array
.. this is required to fixup the relationship between
an IntervalItem and a RideFileInterval in RideItem
and RideFile respectively.
.. anything over 85% of the power for duration versus the configured
CP and W' between 2mins and 1hr will be flagged as a sustained
effort via the intervals for a ride.
.. they're pretty rare, but this code will find
any TTE efforts between 1hr and 2 minutes.
.. it will be extended to find sustained efforts
but this is just to get the code started
.. wrote empty METRICS array when all metrics zero in an
interval. Its pretty rare but breaks the parser
.. this means that metric were being refreshed on every run
.. was getting lost due to cut and paste error
NOTE: you will also need to delete RideDB.json to get
the problem fixed. I didn't think it was worthwhile
updating the version number since no dev releases
are out, noone except developers will be affected.
In this part we have now reinstated the sidebar interval tree
but it is refactored out of athlete and into AnalysisSidebar
where it belongs.
* you can hover and select/deselect intervals in the sidebar
Left to do;
* All the interval operations like sort, drag and drop, find
delete etc do not work at present and will require some work
* Add a color button to the tree to let the user change the color
for USER defined intervals
* Add more types of intervals to the discovery; esp routes and
sustained intervals
In this part we have updated all the charts to reference
the RideItem::intervals() members instead of the TreeWidget
and RideFile::intervals().
The code to create/change/delete intervals is not included
so selecting and editing on charts/sidebar is disabled til
part 3 of the update, but hover should work properly.
Still left todo in future updates;
* Updates to the interval sidebar to list intervals
in a tree (by interval type) with a color selector
* Code to create, edit, delete etc the intervals via
the rideitem/intervalitem and see them reflected in
the ridefile
* Update to search for all the different types of
IntervalItems including routes and sustained intervals
Computes the metrics for an interval and creates a temporary
ridefile locally so you don't have to.
.. previous design should have pushed this into the
class instead of performing it in RideItem
.. now there should be no reason to create a ridefile
during interval discovery.
In this part we have added Intervals to RideDB.json and
are refreshed within RideItem, including interval metrics.
At present the IntervalItems are loaded from the ride file
and we ignore peaks and entire laps in favour of creating
them in the discovery code.
Still left todo in future updates;
* Updates to the interval sidebar to list intervals
in a tree (by interval type) with a color selector
* Update all the interval charts and dialogs to use IntervalItem
and the updated sidebar
* Update to search for all the different types of
IntervalItems including climbs and routes
NOTE: We will not be adding an Interval view until v4.0
.. to avoid glitch related to native widgets in toolbar and
inability to switch back from fullscreen mode on a Mac.
.. see QTBUG https://bugreports.qt.io/browse/QTBUG-43299
which doesn't look like it will be fixed any time soon.
.. we are taking a different approach for v3.2
.. the auto discovery will augment rides and maintain a cache
of all intervals across all rides
.. the discovered intervals will be selectable alongside ride
intervals in the sidebar
.. new interval views will be developed in v4.0
.. heartbeats x joules, when unfit you may generate low watts
but with a high hr, as opposed to the other way around.
.. an attempt to combine central and peripheral stress, can be
used to compare with power only stress metrics
.. when selecting intervals the points on a scatter plot
are joined when they are not being framed against the
rest of the ride
.. this is to provide some context about the order the
data was generated in.
.. would be nice if we could have arrows (vectors)
.. racermate format for VELOtron and Computrainer use
a variable rate recording, mostly due to PC interrupts
and workload (e.g. 620ms, 619ms, 624ms sample rates)
.. so we resample on import to 1s samples, the 1000ms sample
rate can be changed in the code to 500ms or whatever
.. this is needed to enable resampling and merging with other
data files, most notably from Moxy.
Fixes#1359
.. this has been added to support some data handling activity
to support a blood glucose study and is not really for general
usage.
.. the libsamplerate library is being used in ridefile::resample()
which is only used by merge and export.
.. we may choose to formalise this library later but for now it
is not required for any functionality and is not used in
release builds.
.. set when on a Windows platform, but not used.
.. when testing on a QT 5.4 release the font metrics appear
to take the scaling factor into account, but adding the code
for compatibility in the future (if we need it)
I intentionally didn't add the IndendPlotMarkers to all markings,
but only to the interval markers at the top of the plot.
NOTE: the height of the spacing is actually what Qwt tells us
is the textheight.
I think this spacing is rather big.
We might want to reduce it somehow in the future.
Signed-off-by: Simon Egli (Silzo) <smn.egli@gmail.com>
This commit is adding a new class QwtIndPlotMarker that will enable us
to indend Labels. The usage is pretty much the same,
please look at the changes in LTMPlot.cpp to see what will
change for using the new class.
So far the functionality is implemented for horizontally written labels only.
This solves the issue of all Labels (e.g. Seasons and events in LTMPlot case)
being on one line and thus being unreadable.
Signed-off-by: Simon Egli (Silzo) <smn.egli@gmail.com>
There is no official proclamation that ID 260:0 is officially assigned
to Zwift; it is simply the value observed in data files downloaded from
Zwift for the author. A support request opened with Zwift requesting
confirmation has gone unanswered.
Smart recording interpolation fills the gaps in pwx files present
when the original .fit or .tcx files had them.
Test files for running: 1 activity in .fit, .tcx and .pwx formats
Lap swimming expands the sample-per-length and pause to 1-sec sampling.
Test files for lap swimming: 2 activities in .pwx format,
one from Garmin 910xt other from Finis SwimSense.
... draw Level 1 text at the end to have full contrast (not overlapped
by level 2 brush)
... dynamically choose font size for Level 2 texts from 4 options (based
on available space in rectangle) - easier readable on big screen - still
usable on small screen
... check if the "folder-upgrade" has really taken place - if not
reset, Upgrade Flag to force the new folder structure upgrade
... (allows to revert to the pre-upgrade backup of a folder structure -
which during test already had be successfully upgraded and therefore
marked as being ok).
When Sport="Other", there is no GPS data but there is distance information
it is assumed the file cames from lap swimming.
They have one Trackpoint per length, which are expanded to one point per second
in similar way to Smart Recording and laps without Trackpoints to signal pauses
which are expanded to one point per second up to 10x Smart Recording HWM.
Added contributed Garmin FR910xt pool swim file to test/rides folder
... allow resizing of Dialog Window (if using bigger fonts/translation)
to see all texts
... allow entry of Average Speed with precision (1) - like the metric is
defined
... shift plot if start date is earlier than any Power Estimates exist
... enhance grouping (calculation of averages for month/years/all
grouping)
... adjust estimates calculation
... to calculate non-overlapping weeks data
... to not create any "infinite" data for weeks before the first Power
based actitivity exists
Display and edition in Pace units, according to sport preferrences
Pace 00:00 is used to represent 0 kph
Fixed PaceZones::read to allow non-integer limits
... problems on deleting the source files (even they have have been
successfully copied to /target) are now reported as error (which require
to be cleaned up before Upgrade is marked as "successful")
... reason is that such "orphan" files may cause problems - e.g. if the
"upgrade-successful" indicator get's lost and we want to start 3.2 with
a fully cleaned file structure.
... check for valid Activity Filename format "YY_MM_DD_HH_MM_SS" (for
non-JSON files before conversion)
... check if the Activity filename contains a valid date/time
... report if File is not readable - not just "skip" it
Distance/Duration is a better approximation for Avg Speed than 0.0
and Duration is better than Time Moving in GOVSS/SwimScore estimation
for these cases.
.. metadata only flushed when ride marked dirty, but
ride won't be marked dirty until metadata focus/edit
ends.
.. because opening a menu doesn't change focus we need to
use the flush event to trigger the focus/edit end function
.. was not refreshed previously (!)
.. need to optimise this to only recompute w/kg stuff
rather than the entire cache for the ride when its
just because the athlete weight changed.
Allows to generate data points for manual activities from series of
work/rest intervas with distance/duration information and reps count.
It is enabled once sport is entered as Swim or Run and distance units
follows pace preferences for the selected sport.
Duration and Distance for the activity are calculated from laps information,
but it can be overridden by the user.
If LapsEditor is reactivated the lap information is preserved to allow corrections,
provided the sport is not changed.
Input method for duration is selected for simplicity and easy of input using
numeric pad, tab and enter.
... fix .FIT format Smart Recording (similar logic like for .TCX)
... use the GC-Preferences Settings to determine if Gaps shall be filled
(and which Gap size)
... make Upgrade Marker release independent
... adjust the texts from 3.11 to 3.2 verson id
... this will just make the Upgrade procedure run ONCE again for
Athletes which have been converted by a DEV build - but just to
check/report sucess
.. tile mode highlights on mouse over for a more
fluid feel, and better feedback
.. can customise the trend view charts background
.. fixed a SEGV on apply preset in chart setup
.. this is part of a set of updates to update the
standard setup to be more complete so the user
can pretty much run off a standard config.
... if configuration for requested feature is missing (but not in
MainWindow - initial download)
... any network errors coming back
... to simplify error analysis - since the API call may have multiple
reasons to fail (configuration, network, proxy,ssl,...)
... adds authorization required for new Google CalDAV interface
... adds CalDAV configuration variant (Generic vs. Google)
... corrects Refresh from Google to GC (as they a using a non-complient
XML-tag prefix)
... comment unused CalDAV features - which are not enhanced for Google
CalDAV as they are not used yet
.. LTM stress curves had the same symbol name and
so some were not deleted when the date range changed
leaving curves on the plot
.. we now set the best symbol for stress curves so we
have a unique name for each curve
... remove $$replace and use the latest src.pro code from QWT lib (which
allows in-source and out-of-source/shadow build)
($$replace - for unknown reasons - creates an empty string/fails if the
input string contains mixed Upper and Lower case characters - which it
happening in many file systems)
.. will break out of source builds in QT Creator
.. means everyone else's builds will still work
.. happy to apply change if it doesn't break builds for others
Fixes#1247
.. splits into words but will allow user to escape using the quote
character (") or the backslash (\).
.. so <"hello world" \"this\" t\est> will result in three strings
<hello world> <"this"> and <test>
.. use a simple free text search against the ridecache now we
have all the texts available and in memory
.. no need to maintain an index, no dependency on a horrid lib
with nasty dependencies and its faster too
.. the free text search is very simple, will need to bolster it
over time e.g. it matches text not words
... add "Up" - "Down" function for Curves Table Items in LTM Settings
(particular useful when add a curve in Stacked View and wanting to have
that curve shown at first position)
.. on windows especially, there were issues with the call to
IndexWriter::addDocument() resulting in an exception.
.. the introduction of a QMutexLocker to manage the mutex locking
seems to have fixed things, but they only seemed to manifest
on Windows.
... change calcuation of Averages for TE/PS by using the delivered
samples with valid values (> 0) and the number of delivered data samples
> 0 as the basis
... correct the path in RideItem after updating RideCache to the final
path (since RideItem has a local buffer for the path - which is e.g.
used at "Save Ride") any manual changes after the import will create a
new .JSON in /tmpActivities and not update the original .JSON in
/activities
(Problem only occurs when using the in-memory data after an Import or
Downlaod)
... for RideImport and RideDownload the created .JSON files are firstly
stored in /tempActivities and only moved to /activities after
successfull updating RideCache (with this files with "bad data" cause
RideCache calculations to crash can be identified when starting GC again
... in GC CrashDialog the /tempActivities are documented in the Crash
Log and moved to /quarantine for further analysis
... small addition - the existence of the new directory structure is
verified when opening an Athlete - missing directories are added to
ensure a consistent structure being in place at all times
.. but to avoid being too 'opinionated' about the users
training we limit to the really obvious things and
don't offer any opinion on middling values.
.. LTS > 80 is green > 100 is blue
.. SB < 40 is red -- overtraining
.. RR < -4 or > 8 is red -- detraining or overextending
.. it borders on bollocks given each athlete is different
and training is about managing the overreaching and recovery
to push at those boundaries
.. might end up removing this altogether .. but might flag
stuff up for newbies
.. value that result in nan/inf values need to be cleansed
to ensure the metric array in the rideitem is clean
.. because we load values from json we clean anyway in
PMC data since it seriously breaks the skiba PMC and
development users will have bad data.
.. was updating as you typed which created a nasty lag
but updated the metadata and metrics constantly
.. on one hand it was reassuring to see things change as
you typed, but on the other hand it was pretty tedious
.. we now catch focus change on text edits, see if they've
been changed and then trigger an update if that is the case
.. does all labels etc and integrates in with the rest
of the LTM chart and CurveColors classes.
.. underMouse() seems weird when legend is updated, might need
to find a better way to work out if/which legend was clicked.
.. if we get measures whilst the ridecache is being refreshed
it can cause a problem - and the refresh needs to be restarted
anyway.
.. download now stops and restarts any refresh.
.. headings are already adjusted in the ridecachemodel so
need to look for new name for CalendarText
.. this is a bit of a hack, but then so is the CalendarText
metadata field - it should be a first class RideItem class
member and be maintained alongside date etc
.. and also tidy up use of isPeak() etc
.. starting to wonder if we need to a) auto find intervals on import
and then b) list them in a tree c) allow user to select a 'class'
of intervals to show (i.e. select all climbs)
Especially for Vectors new metrics
- Left and Righ Platform Center Offset - eg: -8mm and -11mm
- Left and Right Top dead Center - eg: 10° and 11°
- Left and Right Bottom dead Center - eg: 203° and 210°
- Left and Right Peak Power Phase Start - eg: 83° and 76°
- Left and Right Peak Power Phase End - eg: 115° and 125°
.. will rerun as ride selection changes.
.. but will never stop until cleared so use at your
own risk, as will run EVERY time you select a
different ride.
.. remove a missed XXXREFRESH marker to get the CP bests
curve refreshed when a ride is saved in the period of
the bests curve.
.. would be nice if we showed the current in-memory version
rather than insisting on the on-disk .. need to adjust
ridefilecache to traverse the ridecache for that !
.. the "bak" directory was added during the development cycle
and will not be present for users that worked with an early
development build
.. when deleting rides the "bak" rename will fail due to the missing
directory
.. the error message has been changed to provide the details of the
directory where the failure is occurring to help signpost users
to the problem
.. we don't save the currently cached metrics etc
for rides that we discard on exit (i.e. don't save)
.. the metrics etc will then get recomputed when you
restart GoldenCheetah.
... Help Overview Window added to MainWindow - containing
.. Info on new "Shift"+"F1" Context specific Help
.. Links to Golden Cheetah Tutorials, Science, User's Guide, FAQ
.. notify if the metadata configuration has been changed
.. also snuck in a change to take hysteresis out of the
power zones fingerprint - it should not have been there
.. Needed to move about some of the color config
methods and remove the unneeded object from
mainwindow and initialise global color settings
in main() instead.
.. notify if Athlete weight or height were changed by
the user during the config dialog
.. no longer included in zones fingerprint
.. ridecache now picks up on specific config changes
... fix problem of not visible track (Windows,...)
... use "run" data series if track isRun()
... add "start" and "end" placemark
... enable translation of texts
.. ridefilecaches return incomplete flag if data not available
when aggregating (plotting during a refresh).
.. CP plot will refresh as the background update takes place.
.. this occurs even during a comparison.
.. no need to uplift this from the old metricDB as the model
now spots changes at an individual ride item basis AND
will refresh during a background refresh too.
.. no need to uplift the code that used to call for a metric
refresh after rides were imported since the addRide function
will now refresh for individual rides.
.. when downloading withings data the cache is refreshed
.. when the cache refreshes it notifies the *current* ride
changes if it is refreshed
.. ridesummary has been updated to process rideChanged() signals.
.. it is too slow. Need to think about how to implement
this with good performance.
.. if you really want it then add
DEFINES += GC_HAVE_RANKING
to gcconfig.pri
... correct Alt/Slope behavriour in FullPlot (default = inactive)
... handle Alt/Slope status properly when switching back/forth between
Compare Mode and normal Plot view
.. to let charts etc know that the *current* ride has
changed and will need to be replotted
.. the editor / dataprocessor functions have also been
integrated into the RideItem to notify the change
.. there is a qDebug() in RideCache in lieu of updating
all the charts to refresh on this signal.
.. introduce concept of configChanged(what) to
pass details of what config has been changed
.. fixed zones changes to re-read after write
to correct the save twice to get changes to
zones bug.
.. next parts need to spot changes (part 2) and
then action appropriately (part 3)
.. rather than check if lucene index contains every ride
upon startup just force a rebuild of the index is missing.
.. if the index gets out of sync its because people are copying
data and so they should delete the index when they do so
to make sure it stays in sync
.. in sidebar, we summarise for all the selected intervals.
.. we take into account if they overlap, so two intervals
of 10 and 5 mins where the 5 min interval is wholly
contained within the 10 minute interval will be summarised
as 10 minutes not 15 minutes duration.
.. the lucene index writing during RideCache updates needed
to avoid conflicts between multiple threads writing at
the same time.
.. just added a QMutex around write operations - reading is
still thread safe and can occur in parallel.
.. when using '*' for values we autocomplete based upon
previously entered values for the field, but we didn't
take into account ranking.
.. now the autocomplete list is ranked to most popular values
complete first.
.. from RideSummaryWindow as it is no longer needed since
we moved to using a specification object to manage the
filter sets and date ranges to filter on.
.. using the GPX format they add extensions to record
power, heartrate and cadence using element names
power, heartrate and cadence ! (way to simple!)
.. thanks to Wenqi Zhang for the sample.
.. to enable queries such as;
Date > "2014/02/28"
for rides since 28th February 2014
.. might be useful to allow localised dates
but using this makes it easier to document !
.. a query like today > "1900/01/01" will pass
on all rides, but user being an idiot.
.. use "Date" and "Today" which evaluate to the number
of days since 1st Jan 1900.
.. so a filter for the last 90 days would be:
(Today - Date) < 30
.. will add date strings next.
.. removes across the code base
.. need to fixup RideFileCache and Lucene refresh
within the RideItem/RideCache framework, they will
NOT be refreshed at present
.. need to look at how charts get refreshed on data
changes now RideItem provides a more granular
mechanism (look for XXXREFRESH in code)
.. New Intervals code will definitely NOT compile
and needs to be redesigned/reimplemented to fit
in with the ride cache
.. add/remove ride now works
.. fixed metric value in data()
.. need to test (especially with the diary
window and new athlete with zero rides and
then import, add, delete, change, sort
merge, split etc and push update to
fix such bugs in Part 3
.. getting the model in and integrated with the
ride list and diary
.. next steps to connect up to ridecache methods
::addRide and ::removeCurrentRide.
.. then fix up nits/bugs with diary view etc
.. this removes the dependencies on liboauth and friends
and replaces it with a single lib.
.. the library is available from http://github.com/kypeli/kQOAuth
.. the only current feature that requires OAuth is tweet
your ride, but this lib will provide the services for
future oauth services.
.. if a filter was being applied we created a local PMC
but also filtered on dates, this caused the PMC data
that was generated to only represent the activities in
the period selected !
.. thanks to Ale Martinez for pointing this out.
lts(metric), sts(metric), sb(metric) all return the PMC
value for the metric in question for the date of the ride
and therefore allow you to select rides based upon PMC data.
e.g. sb(TSS) > -5
could be considered a way of looking for rides when you were
in a well tapered state, or at least, when you should be able
to perform well.
or, e.g. lts(TSS) > 100
could be a way of looking for rides at peak form (if 100 is
a peak CTL for you).
... separated the "out-of-source" patch from yves from original pull
request
... the patch allows to use e.g. QTCreators "Shadow-Build" feature so
that GC is build not in source, but in a different directory
.. this is useful when using QTCreator and switch between different QT
versions / 32/64 bit builds - since every build resides in a separate
directory from GC source
-- since the original commit (at least from GitHub view) is shown in a
mixed pull request with other commits - this is a seperated version of
the single commit
.. so it is shared across charts when no filtering
is applied.
.. when filtering is applied then LTMPlot manages
the PMC data itself.
.. now we use the ridecache the PMC update is really
fast anyway.
.. also uses a copy to avoid delete/insert issues when adding
and deleting rides during a refresh
.. but still need to consider the delete operation and marking
items as in process or something
.. just playing with the concept, not neccessarily how
things will pan out.
.. If you delete rideDB.json and start GC then switch
to a PMC whilst the cache is being computed and look
at all dates you will see the chart refresh as data
arrives.
.. used to create a 'specification' against which we match
a rideitem when plotting etc.
.. so rather than passing an array/vector/list of data when
calling a plot, we pass the 'specification' to use instead.
.. the plots themselves should now iterate across the shared
ride cache only plotting the items that pass the specification.
.. this should reduce memory usage and increase performance.
.. moving away from passing data when working with groups of
rides to passing constraints instead.
.. so FilterSet allows us to pass a collection of filters
that can then be applied to data.
.. in this way the plots can iterate over cached data selecting
rideitems based upon constraints applied by the user.
.. these need to be embedded into LTM, TreeMap, Histogram etc
.. still a bit funky with the filtering, there is probably
some scope to simplify that, but at least now its only
a list of pointers not objects on the stack.
.. no longer uses metricDB but traverses in memory cache
and should be a lot faster.
NOTE: the line endings for DataFilter.{cpp,h} have been
changed from dos to unix format which has resulted in
the entire file being changed, apologies but needed to
clean that up anyway.
.. the clunky old way of using a 2 month rolling window has
been reworked to use a 12 week rolling window making the
code less susceptible to jumping around esp. on 1st of the month!
... adds "What's this" to (hopefully) most of the widgets (please report
on missing ones)
... defines draft "Whats' this" texts including a
context specific WikiLink
.. Help Key for all platforms is <Shift>+<F1> + in some widgets
"RightMouse - Click"
... Tested on Win and Mac (On Mac QtMacButton seems not supporting
"What's this") - so here <Shift>+<F1> has no result.
... ToDo: Create final texts and links based on the to be updated 3.11
Wiki
.. so available for current ride
.. and refreshed() when notifyDataChanged() is called
.. but not many classes call it!
.. we are moving to having the filecache read from the
RideCache rather than straight from disk so we have an
in-memory and persisted version.
.. so ONLY change version number of a refresh is going
to be needed !!!
.. I updated rideDB version to 1.1 to ensure present gets
refreshed as it is used by the PD model estimate code
.. from DBAccess to RideCache
.. and also SummaryMetrics::getForSymbol() now available in
RideItem to access the precomputed metrics for a single
ride.
.. removing any remaining references to measures in the
code. We now use withings only and that is handled
in a non-generic manner.
.. measures and equipment are likely to get put into
v3.3 once we've done planning.
.. loads the cache/rideDB.json back on startup to avoid
any refresh of metrics etc
.. uses a lex/bison JSON parser, not because of performance
since its only run one at startup, but because;
* QtJSON support is only available in QT5
* mvjson uses a DOM model that creates a memory overhead
* the existing bison/lex parser works well and is easy to
use as a template for this
We now have a good mechanism for metrics and metadata refresh,
cache and recovery so can look at using it in the charts and
the ride navigator next !
.. moved the overwrite of the withings cached response
to when we know we got something successfully.
.. previously we overwrote regardless of what we received
which means that when we have firewall/network type issues
the cache was overwritten with blank data !
.. but only refreshes the ride added rather than looking everywhere.
So, when we are importing large numbers of activities it won't
repeatedly run a full refresh (which was bonkers).
.. if we close GC during a background refresh operation
then the refresh is cancelled and cache saved in whatever
state it is in now .. the user clearly didn't want to wait !
.. when refresh() is called for a rideitem it will
now compute the metrics for the entire ride
.. when a ride is opened the cache is also updated
at the same time.
.. added to slow things down on my developer PC as its
to fast to notice when I'm testing.
.. also left in an erroneous line clearing RideItem::isstale
which is also wrong as breaks separation of concerns
This is quite a big patch with lots of nasty interdependencies
all collected together but essentially it deprecates;
* Measures are no longer stored in SQL tables
* Zeo support has been dropped (they went bust)
To achieve this there are a large number of updates;
* Withings json is now cached in /cache and in the Athlete
class. So can be traversed in memory rather than SQL
* All "measures" on LTM have been removed and the only metric
left is "Athlete Weight" that cascades from withings to ride
"Weight" metadata value to athlete settings to a 80kg default
* RideCache is now refreshed, but only for metadata. This is needed
to cache the "Weight" metadata from rides when calculating weight.
* JsonRideFile parser is now re-entrant since it will run in parallel
during RideCache refreshes (using the QtConcurrent::map()
framework).
BUT NOTE
* This is about deprecating the Measures table more than anything
else. Functionally we are in pretty much the same place; just that
data is stored in a different place.
e.g. metric/imperial handling of weight is not fixed yet, no
metrics are in the cache yet, load/save of the cache is not done
so startup is slow etc.
.. fingerprint for range should not take into account the
start/end date as its irrelevant and will change
.. RideItem now responsible for refresh and status updating
on the rideitem
.. framework seems good now; only rides that need to be refreshed
will get asked for a refresh -- but need to look more closely
at how we derive 'Weight' for each rideitem now...
.. instead of making the caller keep rideitem up to date etc
we are going to move to it looking after itself.
.. the first part of this is to make it responsible for checking
if it is stale and computing fingerprints etc
.. the next part will be making it responsible for refreshing
the cached values.
One big thing too:
.. the fingerprint is now based upon the zone config that applies
for the date of the ride -- not all zone config. So if the config
changes but not for the date of this ride (e.g. set a new CP starting
from today) then the old data does not get marked as stale.
.. needed to clean RideItem a touch
.. needed to isolate intervals code as it has some
problems and breaks metricaggregator for normal
use.
.. found a bit of Context code in MainWindow.cpp (!!)
.. subtle, thin progress bar on tabview to notify
when background updates are in progress
.. background updating code created but does not
perform a refresh yet, just sleeps for 0.2s
.. to enable 'visibility' of the code use WANT_RIDECACHE
to the defines in gcconfig.pri
.. added /BAK subdir where all actvities .BAK files are stored
.. do not delete any original files in /imports /downloads when deleting
activity
.. copy deleted activity .JSON as .BAK into /BAK subfolder
.. adjust upgrade procedure to copy .BAK files to /BAK
# By Mark Liversedge
# Via Mark Liversedge
* 'master' of https://github.com/mtbkeith/GoldenCheetah:
Added RideCache
Introduce the RideCache
Turn off interval hover on leave
.. each metric now has an index (identifier) that can is numeric
starting at 0 and going up.
.. it can be used to offset into an array when we add a cache for
storing precomputed metrics.
.. they are in Athlete::zones() et al now
.. this refactor was missed in the 3.0 mainwindow
refactoring and is part of the prep to use RideItem
as an in memory cache instead of the old metricDB
.. so we can now call that instead of doing the conversion
and formatting all over the code !
NOTE: it still needs to be /called/ in the code, that change
will need to be applied everywhere a metric is displayed
to the user.
.. to fix long standing bug with saving whilst editing
a field. But still leaves a problem if exiting whilst
editing a field (which is a bit weird tbh).
.. its been there since the beginning at the heart of the code
as a registry of the rides (RideItem) and controlling the
selection of rides.
.. in v3.0 we stopped showing it, but it was still created and
then hidden immediately. But removing the 'spine' of the code
was seen as a step too far.
.. this is the first part of moving from SQL to a NoSQL cache
for ride metrics, metadata and measures -- RideItem is now
no longer inheriting from QTreeWidgetItem with all the issues
that brings.
.. since its right at the heart there are likely to be unforeseen
bugs as we go, especially since it affects the ride navigator.
.. add/delete has been tested a fair amount and should be reliable.
... do not process the popup if no files with the correct extensions
were found / the directories were empty
... (this does not address to skip files which were already imported !)
... make Upgrade Check Window smaller (with scrollable Text)
... only allow to proceed if Text is scrolled down to end (full read)
... in Upgrade Log, only allow to proceed to athlete if Log has been
scrolled down to the end
The ride files will now be .json.gzip
Users will also now be able to add an emergency contact phone number.
Ride logger will use that number to update the contact on the riders current
location. It will also notify them if the acceleration is above 15 or m/s^2.
If so the emergency contact will get an sms with the current location.
TODO: 15m/s^2 is easy to trip. I need to research a way to minimize false positives.
Change month format in ride headder
Make sure numbers are formatted correctly ie not scientific notation
Log all current values:
Perviously it only logged values that were measured.
However, if GC doesn't see the other values it assumes they are zero.
.. Wahoo don't do that anymore.
.. now use the same channel as the device and just send plain old
ANT+ messages to set slope etc (why they didn't do that in the
first place is absolutely beyond me)
.. getting ready to implement Kickr for the THIRD time !!!
.. when not hovering over a curve, this worked ok for power
but not for anything else. Because the signal was ignored
when not showing power in pointHover.
Fixed units selection in histogram tooltip, it is independent of pace units
NB: CV chart currently doesn't obey units setting for speed, it is fixed to kph
In LTM Plot and on Summary Windows conversion
... data already converted for the curves was converted again
... for "Best" Summary the conversion was missing
Referring to issues #1067#1071 (see also comments on issue #1069
... fixed by
...... not considering Y-Axis values in the 0 to 4.993 minutes range
which are not shown for VAM anyway
... both in standard view and in compare view / intervals and date
ranges
... handle intervals below 4.993 minutes properly (since they are not
shown in CP VAM)
... but limit what individual services are build/offered based on oauth
availability (Strava, CyclingAnalytics). Load's of ifdef... making me
think about alternative solutions - especially now that the common
uploader base class allows to stuff them in a List/map/vector/whatever.
.. added Edit for all ride data processors now we
have quite a few to select from
.. shifted a few things around to make important
options more prominent (e.g. Share) and less important
ones less prominent (e.g. Heat Map)
introduced a base clase for the individual uploaders to reduce code
duplication.
This made it possible to
- default to download a ride to a service if it wasn't uploaded, yet.
- grey out checkboxes for services without credentials
tab order defaults to the order widgets are created - and not the order
they're added to the grid widget.
Reordered code to bring creation + adding of Widgets in sync.
.. and they will hang themselves !
.. seriously, the limits to the merge offsets
added no real value but would annoy a user
where the rides needed to be aligned to a
greater proportion.
.. adjust can shift the offset for the entire
length of the ride
.. 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.
... handle Gear Ratio as part of the existing logic - just without
smoothing
... solves SEGV problem in Compare Mode (and probably other areas of
AllPlot)
.. 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)
.. 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 !!!!
.. data can be sourced from file, download or list
.. next to update the mode (join or merge) and the
merge strategy and parameters.
.. will also need to update the download dialog to
allow you to specify which downloaded rides to
process -- at present the merge tool assumes that
the download dialog will only return 1 result
.. pleased with the way the download dialog is embedded
within the wizard, will use that for other things!
.. fix json writing so that user metadata no longer conflicts
with the tokens used by GoldenCheetah, e.g. a user entered
"NM" in the workout code and that conflicted with the
token used to delimit a torque value.
.. all user strings are now saved with a space " " appended to
the value and when read, if there is a trailing space it is
removed.
... in the escape &, ' and " as special XML chars where missing
....... causing that a rule for cLucene with "&&" could be stored, but
got lost on reading
... multiple pathes per Athlete (on Athlete-Preferences - AutoImport
TAB) - option per Path if Import shall be done or not (e.g. for
temporary de-activation without removig a path)
... configuration stored in XML file in /config subdir
... no "stealth" mode any more - but full log of Rides to be imported
with option to "Abort" the import process at any time
.. the download has data in a circular buffer - when you overrun
the buffer it starts back at the beginning and then downloads
that data as-is.
.. we now sort the downloaded data before extracting it into rides
and ignoring rides < 1 minute long.
.. split into separate rides when gap is greater
than 30 minutes between samples
.. discard subsequent rides that are less than a
minute long
BUT: Does not help resolve merge challenge and really
should let the user select which rides to import
regardless of how much data they contain.
.. works for download and clear
.. is pretty basic as the downloaded data
is treated as a single ride
.. need to think about how we can split into rides
and refactor the tool to create multiple rides
with the user selecting which to download.
... create folder structure for existing and new athletes
... upgrade existing athlete to new structure when opening / incl.
logging and error handling
... convert any "Downloaded" file to .JSON directly - store source file
in /downloads
... convert any "Imported" file to .JSON directly - store source file in
/imports
"Time Riding" was only calculated when the ride had kph values - although
it's then also including time without kph but cadence. This caused it to
skip all time spent on the trainer (... if there's no sensor on the rear
wheel).
This patch makes it consistently calculate "Time Riding" if there's kph or
cad... might be worth to count time with pwr or similar running metrics,
too.
.. 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
.. added config and page decoding for Moxy
Next steps are (2) add telemetry to realtime data structure
and display on the realtime chart and telemetry
(3) add SmO2 and tHb to file format which means moving
away from powertap csv format (!)
.. get timestamp from file not line number (to make sure
drops in recordings are not lost as they are numerous)
.. duplicate each line to get 1s recording that makes it
easier to merge manually (until the merge function is
fixed to handle these kinds of issues)
... introduce new "home" Folder structure object representing the
previous flat-folder
... adjust relevant QDir home - access to use the sub-folder method of
the new object
Note: the new structure is not yet active ! - everything is written to
the main folder still
To Do:
... add upgrade procedure for existing folder content to merge to the
new folders
... option to show the datapoints depending on a gear ratio intervall
... gear-ratio 0 to 1 -> Red
... gear ratio 1.01 to 2.49 -> Yellow
... gear ratio 2.5 to 3.99 -> Green
... gear ratio 4 to max (7.00) -> Blue
.. the Moxy can be configured as a SandC sensor, so in
readiness for ANT+ support in GC just adding code to
spot it.
.. will also need to update this for when it is paired
as a muscle oxygen monitor
.. will need to add SmO2 and tHb realtime data telemetry
.. will also need to add code to device config to notify
when SandC is spotted as a moxy
.. RideFile - add rounding approach for gear values (different roundings
depending on value) - leading to discrete GearRatio values
.. AllPlot - exclude Gear Ratio from Smoothing (to keep the discrete
value) - and change curve type to "Steps"
.. ScatterPlot - specific handling for GearRatio since values between
0.01 and 1 are relevant for GearRatio and must not be filtered out
.. RideFileChache - add Distribution Data for Gear Ratio and fix
Distribution Cache for DataSeries with > 0 decimalsFor
.. Histogram - add GearRatio to Histograms (both Rides and Trends)
.. as the scales were too high when shared with things like
power and torque and made them difficult to see
.. also now color shared axis according to what are selected;
so if only one series selected it will get that color rather
than e.g. yLeft,0 always being red
.. 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)
.. metrics for time in zone
.. summary on ride summary
Still need to add to cache, histograms and allow editing
of custom zones in a sensible manner (currently edited in kph/mph)
.. in truth the code is largely a copy of Zones.{cpp,h}
written by Sean, but it seemed a bit odd to not show
that I introduced the file and the changes.
.. recognising that it doesn't /really/ matter much at all !
.. in this first part we just add the pace.zones file
and basic configuration of critical velocity history
in the configuration pane.
.. in part 2 we need to fixup custom zones and consider
how they might be adjusted for VDOT/Daniels etc etc
.. in part 3 we need to add pace zones to the ridefile
cache and then histogram and summary charts.
... import Ride Files automatically from a defined Directory per
Athlete
... runs silently/without "Import Rides" Widget if the files can be
imported/copied/... without error or warning
... Preferences->Athlete- defines
... the directory - per Athlete and- if the function is active at all
(default is OFF)
... the error handling
... report back ALL errors and warnings by opening the RideImportWizard
popup
... report back Errors and Warnings - but ignore the "File exists"
warning (so that the import directory can be continously supplied with
new files, without the need to remove the already imported ones)
Dave Waterworth has fixed my implementation of W'bal to
remove my "optimisations" and fix the math.
The W'bal is now computed in a single pass and is just
as fast as the differential form from Andy Froncioni but
has the benefit that is still uses Tau.
Many thanks to Dave, and I'll write this up shortly.
.. and interval hover on marker
.. need to also show interval on hover as gray path
but find a way of doing it without duping the code
in the webpage js.
... improved resizing by not changing other column sizes in "resizing"
... considering keeping a minimum column size of 20
... consideringkeeping all columns within the visible widget space
... 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)
... 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
.. isRun is a bool, so isRun = 0 or isRun = 1
will filter for runs.
.. note isRun does more than just look at sport
it also checks if there are running data series
in the file and may extend to more over time
Problem:
... data points of "Smoothing" settings are set to Zero in result
... this cause e.g. Zero Altitude Values when Plot Smoothing is active
Solution:
... also most left values are "smoothed" now (using only the datapoint
left of them to create the average)
... 2 new metrics (estimates) mainly relevant for MTB or Race bike steep
passes
... a) Time Carrying = moving < 8kph, gaining height, no power, no
cadence
... b) Elevation Gain carring = same criteria, but adding up the
elevation gain
Since there is a certain level of error, the metrics is named as "Est".
.. if power is already present, or alt or speed are missing
then the fix derive power postProcess won't try and derive
power for the ride
.. this is so you can add it as an 'auto' tool and derive power
values for rides that don't have power but do have speed and
altitude.
.. it seems to be working ok
.. it provides too much output, even for debugging purposes
.. it isn't relavent for 99% of users now its in the master
repository and being compiled up and used
.. remove references to aerobic and anaerobic threshold as they
are not really used in the literature anymore
.. remove talk of training interventions and just point out that
power at LT2 (CP/FTP) is a good indicator of endurance performance
.. we should add a section on MU recruitment and fatigue and
training interventions with the new features in v3.2
.. the code has been updated to support the Wahoo Kickr
via an ANT+ USB stick.
.. this requires the Kickr to be running a beta firmware
of version v1.3.15. This can only be loaded via the
Wahoo utility.
.. for those that have access to the beta firmware this
patch will work, for all others they will need to wait
for the formal release by Wahoo.
.. the code contains *lots* of debug and does not yet support
calibration and slope mode is largely untested.
.. for posts to the usual websites
* bikeradar
* weight weenies
* wattage google group
* timetriallingforum.co.uk
* golden cheetah announce, users, developers
Will require formatting into the markup each site requires
but will take the effort out of formulating text
... values in the ride plot deviate from the ride data since smoothing
takes place even if the sample time is equal to the smoothing interval
(for which the expectation is that the original samples are plotted)
... on QT5 the conversion of chars > 127 did not work (ending with ???)
when loading a .JSON ride file
... by this change the implicite type cast (char to QString) when
calling "unprotect" does not take place any more, so the lexer string
must be 'Local8Bit' to what is has been converted when reading the file
... again QT has changed behavior of locale related processing in QT5
(all this worked fine in QT4)
... wrong Axis IDs causing the following problems
... X-Axis - not considered time, but high (wrong label/wrong scale)
... Y-Axis - altitude curve not properly scaled
... use similar minimum scale for altitude like AllPlot
... attach Alt-curve first (to be in background)
(used/tested at HrPw window, Split Activity Wizard, Merge Activity
Wizard)
.. Strava now works on Windows, avoiding the QScriptEngine crash
.. the same approach has been applied to RideWithGPS, Cycling Analytics
Selfloops
.. commented out Garmin as its not supported yet
.. because QScriptEngine crashes
.. because QJsonDocument isn't available till QT5 and
we still make windows builds with QT4
.. because we're just processing small response documents
from Strava (and maybe others) that are NOT complex
This code has been snaffled up from Victor Laskin's blog
and is 100% Copyright (C) 2013 Victor Laskin (victor.laskin@gmail.com)
details available here: http://vitiy.info/?p=102
The code is slightly modified to fit in with GC and also to fix
some compiler nits; no namespaces, replace() removed as caused an
unneccessary stdlib exception and size_t used in a number of places
instead of int.
Need to be able to add parameters for users to adjust their drag factors
numbers currently work out not too bad for me but needs testing with
more ride files. I have tried it with Mark's Marmotte file and it
doesn't do too bad.
Please feel free to rip it apart and tell me it is wrong - its a good
start hopefully.
... be less restrictive for 'TextEdit' and 'LineEdit' field, jus set
'Read Only' to still allow mainly scrolling (which is otherwise blocked)
... mainly for 'Change Log' and 'Calendar Text'
.. if we cannot start due to permissions / create library folder
we now output a dialog rather than a qDebug -- this is better
for Windows or those that start from a menu etc
.. if the default athlete weight is changed then all ride
metrics need to be recalculated to reflect the new default
.. any cached values need to be invalidated so interval metrics
reflect the new weight (if needed)
It would be better for users to maintain weight either against the
ride in the "Weight" field, or via Withings !
.. attempting to fix the strava upload problems, this is
a set of changes to look at that, but not able to test
if it fixes the problem
.. also fixed the vomitlist of compiler warning messages
.. only show them on power plots
.. don't show text
.. make them /really/ faint
NOTE: This is because crank based powermeters (e.g. SRM) will send
calibration messages every time you freewheel for 3 secs or more and
modern headunits (e.g. Nav2Coach) will record and adopt them.
As you can guess, I have an N2C + SRMs and get > 20 or 30 calibrations
every ride with the latest N2C firmware, so this one is for me.
... the .toUTF8() conversion used with QT5.3.x to handle special
characters (e.g. german Umlaute) in column chooser does not work for QT
4.8.6 (at least not for the Windows) - as a result (Drag&Drop from those
fields into Columns or Search Field is not working)
... following the approach other places, changed approach to
"serialization" of the info for "Drag&Drop" - so work independent on any
QT conversions (which seem to depend on other conditions - change over
time)
... second part: 2nd part ("-Layout.XML") translation
... "Mapping Table generation" provided as a new LTMTool routine (to
avoid duplicate code)
... mapping to HomeWindow::restoreState(bool useDefault) for the LTM
Window type charts added
... metricUnit considered in getting the mapping texts for "unit"
... some more tr() (LTMTool, LTMSetting)
... for Lx/Hx in Time and unit "seconds" translation not working in
constructor, therefore moved to "initialization" for both HR and Power
(similar to the translated metric names) (HrTimeInZone, TimeInZone)
... in RC2 - Windows (name with "umlaut") not displayed in official
build (adjusted to be handled like the one name with umlauts already
defined)
.. previously we have computed below cp work as only that
work when power was at or below CP
.. since we want to track energy from CP and W' it makes more
sense to make below CP work include all work not from W' stores.
.. when computing W'bal decay -- since we know the half-life
for the decay we might as well use it rather than a pretty
big constant of 1 hour !
.. it saves about 35% of time to compute metrics
.. we can now drag and move the GProgressDialog around
.. if user hits ESC we trap and ignore it (otherwise it would
triggers a close event that causes a crash)
datacnt is 16bits so it overflows easily for large files (9 hours with
0.5sec recint).
I've also seen datacnt and block sum to be inconsistent in other cases.
To handle this more graceful, we're now taking the max of both counts and
let the EOF detection do it's job when one of them is wrong.
We do have to use one of these limits as some SRM files have junk after
their last chunk (so, just reading chunks till we get EOF retunrs this
junk, too).
code was blindly trusting datacnt... and kept reading past EOF. That's bad
as datacnt occasionally isn't matching the available data (overflow,
corruption, ...)
.. remove inverse time (but add support to Model for future reference)
.. fix x labelling for plotting Work
.. remove options for best shading, its now on or off
Fixes#924
.. it was accidentally omitted and somehow got lost and
never added back.
.. we now show w'bal in compare mode and its probably one of
the most interesting comparisons !!!!
Fixes#958
.. in an attempt to avoid the QT 5.3.1 QProgressSialog
bug and also put a bit of our own styling onto this
a GC implementation of QProgressDialog
.. it has no abort button DELIBERATELY
.. not tested on OS X .. yet
... some more AP/AM changes (hopefulyl the last ones)
... Setttings.h - the GC_DATETIMEFORMAT constant is not used anywhere
(old usages are de-activated)
... treat both Time & Duration equally (don't use QTime->toString), but
convert into seconds (since duration can be above 23:59:59 - especially
in Trends view
... table widget looses columns when dynamically adding columns in
Options->Metrics (fixed by setting columnCount to (0) first before
defining the new number of columns)
... when sorting first and adding new items, table data is partly empty
and when you next click on item GC dumps (fixed by de-activating the
sorting while refreshing the QTableWidget)
... date fields did not sort due to different formats strings used in
"toString" and "fromString" conversion / added info to translators
... duration and time fields did sometimes not sort (dependent on
time/duration having hours or not)
... sync all format strings for time input/output to 'hh:mm:ss'
... remove any 'AM/PM' time formats
... remove tr() commands from time formats (since 'hh:mm:ss' is
reasonable around the globe)
... main reason: QT5 does not follow the pure formatting rules any more
(like QT4), but considers the system.locale in formatting as well (so
for system which have no AM/PM, even if the format string is set, the QT
routines ignore that - having some side effect on GC)
.. now tested on Qt4 and Qt5 with VLC and NONE without issues.
.. but did notice a double include in GcWindowRegistry that has been removed.
NOTE: Still needs testing on Mac OS X
.. you can now select what kind of video widget you
want to build.
GC_VIDEO_NONE - No media support compiled in
GC_VIDEO_VLC - Use VLC (only on Win/Linux)
GC_VIDEO_QUICKTIME - Use Apple QuickTime (only on OS X)
GC_VIDEO_QT5 - QT5 video and associated backends (O/S dependent)
NOTE: This needs testing on non-Linux platforms.
... Font-Size for Header Texts increased to 10px (since the 8px font is
very ugly - at least on Windows 7) - since the Screen can be resized,
bigger header texts can still be read after resizing.
... show also METRIC_BEST if such a curve is available
... ignore METRICs which are not ride related (Estimates, Measures) in
the Ride Table
... add Text if such a Metric was ignored (so that User do not assume
this to be a bug)
.. segv removed caused by signalling configChanged when context has been
deleted due to all the mainwindows being closed
.. check for path being reset to blank as well as being set to a different
place.
.. its complicated .. basically, if a local directory exists it will
*always* be used for application settings.
.. when you run GC for the first time with a local Library/GoldenCheetah
then the HOMEDIR_GC will not be set as there is no config in there
.. the code checks this setting for blanks (but that fails because the
value actually returned is "0") and so the local library is set to the
value returned "0"
.. but the local library doesn't exist so it falls back to opening from
the default location but using config from Library/GoldenCheetah !
.. the next time you launch all this gets resolved and you use
Library/GoldenCheetah with the settings you set the last time.
Fixes#936
.. If you build with QT 5 then we now use the QT video widgets
instead of VLC for Windows and Linux
.. We still use QuickTime for Mac OS X
NOTE: On linux Gstreamer is used and therefore all the right
codecs and backends need to be setup for this to work.
On windows its more complicated as it depends how Qt
was compiled, see:
http://qt-project.org/wiki/Qt_Multimedia_Backends
.. no longer need to append 'GoldenCheetah' to the location
since on QT 5 the executable name is used, which is GoldenCheetah
.. by sticking with this we can rename the binary to use a different
location, which may be useful for testing
.. PM chart is deprecated, so when loading an LTM chart
with skiba curves is implemented instead.
.. we cannot easily add charts to the layout without refactoring
HomeWindow so have moved that out of scope
NOTE: The upgrade processing has not been activated -- but can
be once we build and issue our first 3.1 RC.
.. update RideMetadata to remove 'Default' color
if it exists and add 'Reverse' color
.. will also add 'TSS', 'Aerobic TISS' and 'Anaerobic
TISS' to the metric tab if needed to avoid FAQ #1.
.. getting the upgrade code going, this just adds new functions
for changing colors and themes and doesn't perform an upgrade
.. Part 2 will deal with W' and power.zones changes
.. Part 3 will deal with chart setup changes
... make window "minimumSize" - so that resize in case of many columns
works
... handle LTM_TOD when called from LTM-Chart (list the rides in the
hour, considering DateRange)
... consider HomeFilter and Search/Filter in result list
... also show Rides of only 1 ride is selected (since Rides contain
Date/Time) and the Metrics (which mostly are not part of the Summary
HTML)
... do not allow MouseSelection of only 1 Ride is shown
... some more tr()
.. wow, this has been there for at least 3 or 4 years and
never bitten us.
.. for some strange reason it bites when you have a 3d plot
in one of the layouts.
.. to reflect current code requirements
NOTE: there is a 'phantom' widget with the 3d window that
covers the left side of the chart bar and makes it
impossible to click on the summary button.
... generating HTML instead of Template File (to allow translation)
... considering the same Fields, incl. User Defined Metrics as Summary
Page HTML
... aligning Vertical Scroll bars + adding a little space between the
widgest so that Scroll Bars do not touch each other
.. when aggregating metrics across rides we were being inconsistent
with regards how we handled zero values; we sometimes included them
and sometimes didn't.
.. now added a metric method bool aggregateZero() that returns true
if aggregates need to include zero values
.. this has been implemented where averages are aggregated.
.. can see the total / average or bests for the date range selected
NOTE: Data Table mode is currently a bit broken .. need to revisit it
and fix it up, not just for ALL mode but also for Estimates
.. when averaging lr balance, pedal smoothness etc we now
ignore values when cadence is zero.
.. the zero values are not meaningful and skew the average to
render them almost useless !
.. basically where data is sketchy or doesn't have enough
representative efforts the model will produce lowball numbers
which are not meaningful and should be discarded.
This reverts commit 2fdc18b2c3.
Because we should correct at source (i.e. where the PD estimates
are being computed) and the fix breaks w/kg display because it
doesn't apply different limits for absolute vs w/kg values.
... use translated Metadata terms for Tree Dimensions (via Special
Fields)
... store the Metadaten information in Home-Layout.XML in "EN/Original
Language" and convert back/forth as needed
... fixed an issue, that Rides for a Cell are not selected in case the
resp. Metadata field is empty
.. don't rely upon ZDATA metadata, instead we add
a new 'present' field that contains the Data meta value
.. navigator defaults columns when they're all messed up
.. summary isn't so noisy when providing progress updates
.. some regressions in there (setting only saved on move)
.. will check the positioning and geometry are sensible regardless
of whether they come from appsettings or defaults.
... have the same consistent handling for (TM) at all visible places
... do not allow Translation of BikeScore (since it's a TM and might
cause unexpected behavior)
... Have (TM) sign everwhere visible - only in Searches just use
"BikeScore" as Symbol
.. LTM chart now has a 'use sidebar settings' checkbox
and will display the chart that is selected in the sidebar
.. as the sidebar selection changes the window will plot it
using data for the current date range configured / selected
.. part 3 will now come later to let you manage the charts from
the sidebar menu (it is already in the LTM tool).
Add preset charts to the LTM sidebar, and allow LTM charts
to refer to sidebar for config instead of the local config.
In this way we can have a chart that changes as we select different
charts in the sidebar and remove the need to have lots and lots of
different charts on the tabs.
But it still allows for the old way of doing things -- just adds
another type of flexibility -- for instance a user could add
charts with set date ranges but no specific curve setup so they
could havethis year, this month, last month charts that change as
charts are selected in the sidebar.
This first commit just adds the sidebar item, next we will update
the LTM chart to refer to it in part 2 and then in part 3 we
will add functions on the sidebar to manage the chart presets in
the same way as in LTMTool.
... sync handling of (TM) in all places and Do Not allow translation for
these terms any more, since it's a fixed term anyway - and there are
many dependencies (which outside EN create unexpected results). - in all
Texts/Fields use (TM) in HTML use the TM (special characters).
-- more testing in language other then EN still required - but so far
working fine
... and more tr()
.. but now a new format and the old ones will need to be
removed from the athlete directory on upgrade.
.. the new default charts.xml is exactly the same as the
old one, but in the new format.
.. but the read and write functions are so far out
of date that applying a saved chart causes a crash
.. so we need to fix the read/write functions for charts.xml
.. lots of work to do to clean this up, especially
keeping the presets updated when renaming is done.
.. also need to save away after changes.
.. also need to create a much better default set of
presets taking into account the more recent additions
such as Estimates amd Bests and new metrics
... allow/use only internal field names (delivered by Column Chooser) in
Data Filter expressions
... multipe tr()
(cherry picked from commit bc4164adab74dd82c0a0307d7d0fbb736f95ef0d)
!!! please check if this right way to do it.
... column names containing special characters (here greek "average"
sign) did not work in Drag&Drop (even though they should be part of
Latin-1 (after changing in Mime to UTF-8) not only the greek characters,
but also "TM" works without special treatment)
!!! is this valid for all platforms ?!!!
(cherry picked from commit b4d1a7d3041beec686c7262cfa65bac8cf6e2179)
... more tr() changes
... added comparison for both "seconds" OR tr("seconds") to all other
occurences found
... added "Lap" text for Intervalls imported in Garmin FIT format (this
is what Garmin delivers)
(cherry picked from commit ad790f05a386e3ae5c5b9dc129a216ac451b8cfc)
... Filter/Autofilter did not consider Translation of the Filter
Criteria - using Special Fields (to translate from internal to external
names is working for me - but do special fields cover all variants?)
(cherry picked from commit 5cc4218a2a0877a1f8ff4f36d1367bee37c34d2d)
... 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)
.. delta plot but with percentage rather than absolute differences
.. particularly useful for plotting PD curve by seasons and looking
at the gains/losses in percentage terms per season
.. also the differences in short and long durations in absolute terms
often look quite different, in percentage terms there is often not
a huge difference over seasons.
NOTE: Needs to be fixed up to do percentage differences by model.
.. apply Flat styling across all the widget painting
.. only use WHITE as the flat color for now, in part 3
we will look at user customisation and updating the
toolbar and sidebar buttons to also be flat.
.. refactor linear gradients out of the widgets
such as toolbar, chartbar, sidebaritem etc
.. GCColor::linearGradient() now returns a gradient
that is reused across the codebase
.. in Part 2 we will add a colour and flat style
for the linearGradient
.. in Part 3 we will tidy up the styling for buttons
and toolbuttons to adopt flat or metal styling too
... Translation for Season Types
... Do not allow Temporary Seasons to be edited or deleted through the
main seasons menu (in right click Popup this was already blocked by not
offering the function)
(cherry picked from commit cc7a0a7f8d0b74ca4b9d64d61291206ea58d3f94)
.. TRUE/FALSE are case sensitive on Mac
.. ride2Loaded renamed ridesLoaded
.. ridesLoaded initialisation moved to constructor
Thanks to Jorn for the fix to a P0 bug !
.. when using other languages e.g German it may be
useful to make it wider if needed.
.. the pane still appears using a minimum size that
we calculate, so should affect users.
.. the headings get resized as the mainwindow is
resized, when they shouldn't -- the sidebar is
getting resized twice - once on mainwindow
being resized and then our code fixing it back.
.. we now only set those widths on the mainwindow
when we are told to by TabView::splitterMoved()
.. a regression from the mainwindow refactoring
earlier this year.
.. when the mainwindow resizes the splitter should
stay at the same size on the left.
.. and making it easier to apply globally with a new
static member of TabView to return the style sheet.
.. we may extend this to cover the application more
broadly.
.. on Non-Mac platforms. It might be just me but the scrollbar
just looks horrible.
.. should look at a custom scrollbar that 'appears' when it
is needed (when scrolling or on hover?)
... Further enablement for translation
... some typo in EN (seen during translation)
(cherry picked from commit 50b78cec0f2fae40f9a5974d98e145d9d9d55535)
.. delta compare to use first date range as a baseline to
compare other date ranges to.
.. only works for the bests curve in date range mode
.. in part 2 will add the model and also rides/intervals.
.. its too far out of date;
the UX is terrible and flickery
its a cpu hog (deletes all objects on each replot !? wtf)
it doesn't honour colour config
it doesn't integrate with the sidebar date selection
the metric selection should be via a reveal control
can't hide the legend / set grid / use chart settings
should use a tooltip
doesn't work with compare
.. all these issues are resolved using an LTM based PMC
Fixes#880
...ConfigDialog.cpp
- -Increase overall size of window (for NON Mac only so far) - this
eases the translation as in non EN languages
... Pages.CCP
- Changed 2 fixed button sizes (to allow proper translation)
- Correction: if Directoy Browsing was Aborted without selection - the
previous value was deleted
- Chooses the 2nd column to search for "New" text in case of 2 text
colums (short and long)
- All the rest Translation enablement
...DiarySidebar.cpp
- enable translation of date formats
(cherry picked from commit 3bbc68a277e743e610630795bb60dc515ced0355)
.. all the recent work on the CP chart has focused on absolute
watts and not taken into account w/kg !
.. this fixes that up, but still need to look at w/kg on the
model parameters stuff for the CP history chart
.. the last piece of the jigsaw for the CP chart refactoring was
to use the new model class and remove the calculation in CPPlot.
.. we have now removed the ridefilecache out of CP, the model calculation
and refactored to support multiple models.
.. to include power, cadence etc
.. this is particularly relevant for colors that need to change
if we have a light background (e.g. power in yellow on white
is almost impossible to see for some people)
.. needs to account for font metrics and not just default
to 50 high. Only notice this if the user has larger fonts
which can be common on high DPI screens.
.. if you have user defined colors for the ride list but don't
choose to set as background (ITS UGLY!) then we put an accent
bar on the rhs .. which looks much nicer.
.. I guess its a matter of taste .. some don't have any ;)
.. by making the text Add and Delete rather than '+' and '-'.
I /really/ hate the way Qt enforces such an arbitrary rule
for button size and styles, when Apple doesn't.
.. aggregator will collect estimates
.. LTM will plot
.. but the model needs to be updated to reflect the intervals
are in seconds not minutes and the y() function is passed
seconds not minutes.
.. added to LTM and updated the default layout on trends view
to include a new 'CP History' chart with W', CP and p-Max
on it.
.. part 3c needs to update to include Damien's model and also
once thats done we need to refactor CPPlot to use the new
PD model classes instead of the code embedded in the class.
.. Now refreshing the model parameters is done and
stored in the athlete class.
.. added the selection of a model estimate to the
LTM chart
.. in part b and c we need to update the LTM chart
to plot the estimates (createCurveData).
.. the critical power models are now refactored to have a
base class PDModel.
.. I have implemented the 2 and 3 parameter models as well as
the veloclinic models
.. the ExtendedModel needs to be aligned
.. next steps are to put these values into a store and allow
them to be plotted on the LTM charts.
.. added the code to aggregate power data when deriving
model parameter history over time.
.. need to get a class that applies the various models to
generate the parameters we need (so we can reuse) in
part 2.
.. then need to store and turn into a metric of some kind
in part 3.
.. this is largely a checkpoint commit to enable cross platform
testing with Mac and Windows.
.. to extract just the meanmax power data from a ridefile cache
so we can aggregate and derive model parameters for new metrics
to track W', CP, FTP, max-Power.
.. see src/mac/Info.plist.app, based upon the default for
Mac with clang found in mkspecs/default/Info.plist.app
from the Qt installation directories.
.. we make our own to add build version information, which
should be placed there via the qmake 'VERSION' macro but
its not supported -- you have to edit the plist file instead.
Fixes#796
.. if users want alternative ranges, it is not for us
to enforce -- e.g. ignore zero for HR is sensible since
0 suggests loss of signal, not your heart stopped !
Fixes#815
.. needed symbol name to be unique as 'Weight' clashed with the
normal ride metadata field.
.. we now add _m to the fieldname to generate a symbol name for
measures.
Fixes#862
.. looking at the briefing from Mike on Youtube it looks
like an alpha value of 0 is a compromise between -0.1
and 0.1.
.. see the video here: http://www.youtube.com/watch?v=v57NRQ-pHps
"secs" is miscalculated for gaps between blocks: It takes the delta
between last chunks *END*time and next chunks start time - and thereby is
off by RecInt. This error adds up for each block/gap - so, the n'th block
will by off by n seconds.
fixes issue #582.
This reverts commit 80fee9d.
Since actually using showAlt, showBalance to determine if an axis
should be drawn is incorrect, since although the user has selected
it to be plotted, it might not actually be in the ride !
The real fix for this axis labels was fixed in commit 18bf28.
.. via a custom menu option on the chart menu (More...)
.. which means we also now have a mechanism for each chart
to add their own menu options to the More... menu
.. will no doubt need to add this to the LTM chart
.. no doubt we will extend and refine this but at least you
can select some basic prebuilt themes.
.. will need to add more as its a limited list but the basics
are in place for now.
Fixes#855.
Strava used other slightly other tags for it's gpx files.
Added those tags to the GpxParser.
Tested and verified.
As I don't have a Power Meter I can't verify Power is correctly imported.
Signed-off-by: Simon Egli <smn.egli@gmail.com>
.. we converted from metric to imperial TWICE for the labels
which mean't they were located correctly on the y-axis but
the label was always wrong !
Fixes#827.
.. was caused by the fact the allPlot height is not set until after the
first show, so it is zero in initial state. We just use a default value
in this case.
.. forgot to remove the threaded integrator which is no longer
needed and then found it is still being used by the minForCP()
method, so tidied that up.
.. implementation of the Veloclinic model, or at least
the first of a few potential models.
.. It may not be correct at this point, but committing
a checkpoint.
.. I know its a matter of taste, but some of the formatting in there
would win the OCCC competition. I mean FFS, who puts else clauses
after a ';' !?
.. the formatting probably reflected the different people who have
updated the code over the years.
.. no functional changes whatsoever in this commit -- just cleaning
the source code to make it more maintainable (and readable)
Using Andy Froncioni's modification to the original
formula that removes the need for Tau and also lets
the exponentials drop out.
Massive speed improvement!
I had a trainer file as the second file in my history. Opening this ride, and selecting the speed histogram made GC crash.
I narrowed it down to line 905 in src/PowerHist.cpp. The code was trying to do a resize on a QVector with a negative value. count was -7.
Making sure that count is always 0 or greater fixed the crash.
Note that opening another ride file, with speed information before this one, selecting the speed histogram and only after that selecting the ride without speed information, did not crash the application. I'm suspecting that there might be some resetting of values, perhaps in the "standards" arrays, that is not done when a data series is missing.
.. 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).
.. its in the viewport, which seems a common problem across
the Qt widgets, we need to be aware of the internal implementation
details when setting styles.
Thats a bit crappy.
.. Added the torque effectiveness and pedal smoothness
data series to the RideFile structures.
.. The only file formats that support it at this stage
are Fit and GoldenCheetah JSON.
.. As more file formats support it we will add it here.
.. The charts/editor now need to be updated to support
these new data series.
.. so at least chart adding should be easier and no more
UX issues.
.. need to look to add other menu options there; add page, athlete,
chart settings.
.. code lost and reinstated, need to write the code
to show the chart menu when it is clicked.
.. just pushing this code to get it back into the repo
as it was lost accidentally with some other recent changes
.. to GcSideBarItem.cpp as the code is very difficult to
follow. Not hugely valuable comments but they will at least
help to understand the purpose of each widget.
.. now has an overlay widget that can contain multiple widgets
and is user movable and resizable etc
.. we show the model derived values for now, but could add other
things at a later date (e.g. MU distribution etc).
Fixes#811.
The context pointer was dereferenced after the context object was deleted. This is fixed by storing a pointer to the MainWindow in QTFullScreen, so context does not have to be dereferenced.
The logic in QTFullScreen::eventFilter is also simplified a bit.
.. by checking the ride file CRC before recomputing
either the metrics or the ridefilecache.
.. this means that users that routinely copy or backup
or use dropbox to keep things in sync won't see any
unneccessary metric computations.
.. I added a CR to the end of the LINUX build document
just to be able to test push/pull/fetch/cherry-pick
across a number of different repositories
.. this is just for testing git, no functional changes
were made at all.
.. fixup ride mode, interval hover crash/bugs
.. fixup interval compare mode
.. fixup rangemode
NOTE: Compare date ranges is still broken that
will be fixed in part 3.
.. basic ride, bests and model plots all working
.. Compare mode is now BROKEN !
Will fixup the rest tomorrow, needed to checkpoint
the core refactoring work.
.. the CP plot curve is a terrible mess. Mostly from
having multiple significant updates from a number
of notable developers; Sean, Dan, Mark and Damien
have all made significant contributions.
.. But the code contains lots of 'smells' and is very
difficult to follow and update
.. this update makes no functional changes but is put
in place before overhauling the code related to
"calculating" and plotting the different curves.
.. metric of the aerobic-ness of a ride based upon the
ratio of a-TISS to an-TISS.
.. bear in mind the curves for a/an TISS are being looked
at as we speak !
.. mark the center of an interval (i.e. the average aepf/cpv
for that particular interval).
.. this is in preparation for mouse over the interval causing it
to be highlighted on hover.
.. when showing the ride as a percentage of bests on the CP
chart we need to adjust the scale when its > 100%.
.. this can happen when comparing a ride with a bests chart
for a period the ride was not part of; e.g. todays really
strong ride vs my bests for the beginning of the year.
.. hover curve clear on new ride
.. fix ride plot mode so when plotting ride it always
does. This was fixed by initialising ridePlotMode in
the CpintPlot constructor.
.. last piece of the jigsaw for compare mode. This update adds a
clear button to the compare pane bar.
.. we can still add lots more to compare mode, but for v3.1 this
is probably enough now, so closing the feature request too.
Fixes#343.
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.
.. to indicate which power-durations are getting worked hardest
.. Calculate a 'heat' score for the power duration curve.
A score that counts how many rides in the aggregate
have a power-duration best that is within 10% of the
best value calculated.
.. next step is to add it to the CP curve (when showing
power) to provide some kind of shade/heat indicator
for the area of the curve.
.. when user changes the background color for charts the
legend can be difficult to read as it is always in black.
.. we now update the legend and it's widgets to change the text
color when the chart is refreshed.
.. Further updates to the charts to honour the background
color preferences:
* Google Maps
* Ride Summary
* Scatter
* Details (Metadata)
* LTM Data View
* Editor
.. still a few left to do and not entirely happy with how
things look on the editor but we can fix this up over
time.
.. Only tested on Linux
.. Now going to check on Mac and Qt5
.. Also does not yet support re-ordering tabs
nor scrolling when there are too many to show.
This will come in future updates.
.. not because it was a bad idea, it is a great idea.
.. we need to replace the tabbar with a scopebar and
customise it for the view menu and support scrolling
left and right.
.. will sort this weekend
.. The UI spacing is a bit 'old hat' and not really in line
with modern UI's -- so reducing the amount of unneeded
spacing between widgets.
.. There is more to come on this, but for now this means there
is a little more screen estate for the charts.
.. need to think about what we're trying to achieve with this
but for assessing TT efforts we can see how far away from
a constant load the ride was.
Its just computed as average power as a percentage of max power.
.. When interval tree is rebuilt it can cause an issue in the
ride editor when clearing the selection model.
.. still trying to get to the botton of a SEGV on Mac.
.. simplified acceleration calculation to convert to m/s before calculation
.. removed distribution for deltas as they were HUGE and introduced a
terrible performance degradation where aggregation took >30s for a
ride set that previously took <5s.
.. 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
.. slider removed as it was ugly
.. handles are placed on the same side as the axis
being manipulated, since its irritating to click
on an axis then have to move mouse to the other
side of the chart
.. 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
.. Fix polarised zones being ZERO when recIntSecs is
sub-second (e.g. 0.5s with an SRM).
.. the polarised zones were being updated to hold time
rather than a count of samples. This was fine when
recIntSecs is 1s but a problem when it was 0.5
.. because is is an integer!
.. if you are building with QT5.2.1 or higher we are no
longer going to use VLC for video playback.
.. the QT Multimedia module seems to finally have made
the grade and works as advertised on Linux and Windows
.. FOR NOW we will continue to use QTKit on Mac but that
may also change soon.
This is to enable overlays -- placing the video behind the
charts etc.
.. when plotting in zones its helpful to have
data labels to show the percentage or
absolute values each bar represents rather
than having to hover over it.
.. the calculation assumed 1s recording (or was just wrong)
joules are now calculated properly, this is especially
important for SRM recordings of 0.5s samples
.. the with zero option didn't work with polarised zones
and there was a silly bug with the settings being applied
after the setData() call which mean't they were ignored!
.. now can show in zones but using the polarised zones
rather than user defined zones.
.. we may need to revisit this since it uses zone 2 rather
than estimate LT1 from CP.
NOTE: The compare mode needs updating to support this option.
.. if you build with qt 5.2.1 then the unified title and toolbar
is back, but its a hack to just change the gradient and use a
standard toolbar .. so we do that, but make the colours match.
.. 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
Rather than skip over the 'standard' interval markers because they
have such verbose names we now plot the vertical marker only.
This is to indicate there is an interval at a particular point to
signpost to the user that they can hover over this point to get an
interval summary.
When hovering over a ride if there is an interval that defines
the entire ride (typical if coming in from WKO+) then don't
hover highlight it, since it is distracting and adds no value.
.. 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.
.. reset isolation when resetting curves etc
.. added a visual cue by dulling the axis scales to grey
when isolation is active -- to let the user see what
happened when they moused over an axis.
.. we SEGV when they are removed and we use the new
'isolate' curve mechanism to hide/show curves
.. also now keep a track of the reference lines in the
CurveColors class
.. we now isolate a curve temporarily with a click on the axis
so you can mouse over / look at the curve on its own
.. it would be good to also 'dull' the other curves and their
axis labels so we have a little context .. will look at that
next .. it might not be so 'clean' though.
.. show event and season markers on the compare plot
helps to provide context against the week/month offsets
.. also fixed up how bars are lined up and that each plot
in the compare stack has the same x-axis
.. always hide the meaningless legends for trend, outlier
and best curves since they are the same color as the
curves already listed in the legend.
We should apply this to the normal view too.
.. the trend view layout default has been updated to reflect
recent updates to the capabilities of the charts, notably;
* Data Table to summarise recent key markers / indicators
* Data Labels on charts where appropriate
* Color scheme slightly altered to plot more appropriately
when in compare mode (less contrast, less vibrant palette).
You can now compare seasons / date ranges across or between
athletes on the LTM charts.
This is only shown on the stack chart as we need one chart
per data series - in a similar vein to the AllPlot chart.
There are some tidy ups left to do over the next few days;
- Data table needs updating to support compare mode
- Event markers need to be shown and in the right color
- PMC curve data is slow, needs some kind of optimisation
- The tooltip is missing and needs to be put back
- Ensure the new stack frame looks correct when using a
dark plot background (or anything other than white)
- Consider how to handle zooming when there is only one
data series and hence only one chart for compare
.. mostly in preparation for compatre date ranges
on an LTM chart, but also for plotting lots of
values at once without having too busy a chart.
NOTE: Need to sort out tooltips and optimising the
refresh as well as making it possible for the
user to set the plot height like in AllPlot.
.. to use uname not name and also to avoid duplicating units
when they are the same as the metric name (e.g. the metric
'Relative Intensity' has units 'Relative Intensity').
.. show the metric data as a table as well as a chart, its quite
useful to configure a summary table of metrics.
Ironically, the ability to configure the summary page in WKO+ was
one of the things that pissed me off and started me down the road
of extracting data from .wko files. I then found the data I wanted
wasn't even in the files and started developing for GoldenCheetah
.. the rest, as they say, is history.
.. No more cutoff of the decay. Since we use threads its
not such a big deal as before.
.. We now get a full, smooth decay till the end of the ride
which was much more noticeable when predicting W'bal for
a workout, than it was for a ride.
.. to save on computing cost the W'bal decay was only
calculated to 20mins and also bounds checked to a
decay of 0.1w, but of course, the decay is more like
25 minutes and 0.1w * 1500 samples is a lot... so
I've removed them.
.. the key optimisation is the way the decay is integrated
and that is skipped for samples where W' exp is zero ..
that optimisation reduces the amount of computing cost
to 25% of doing it for all samples.
For maximum W' capacity expended i.e. Min W'bal
expressed as a percentage of W'.
So if W' is 20 kJ and W'bal is 2kJ then 18 kJ
have been expended, which when expressed as a
percentage of W' (18/20 %) would be;
Max W' Exp of 90%
I also cleaned up a few extra instances of WPrime
being created when calculatinf metrics which was
not a big deal for the Metric refresh but would make
interval metrics painful.
.. if duration is overly large we don't want to get some
massive array, it will exhaust heap and cause a crash ..
and it is likely to just be bad data.
.. don't be so keen to add zero values interpolating gaps
in recording when the gap is less than 2 samples wide.
.. previously we were adding way too may zero values at
subsecond intervals that caused an interpolated value
returned by the spline to be /practically/ zero.
.. offset needed to be a double not an int to ensure
we handle recording gaps from powertap etc where
it is not an whole number of seconds
.. Thanks for Armando Mastracci for highlighting this
and providing a test file to recreate
Fixes#773
This reverts commit c0b38a193c.
It has introduced errors on Mac and Windows -- we need to better
understand why this is not the case on Linux and whay /exactly/
it is doing that helps on the other platforms.
.. just speeding up the autosolve by only looking in increments
of 3w, should speed up by a factor of 3 but will mean the result
is correct to +/- 3w .. which given the W' is usually only right
to +/- 2kJ should be about right.
.. don't rely on WPrime to compute it, its pretty simple
to compute as long as CP is set
.. add to the summary totals so always there to compare
against the total work
.. the optimisation was a little eager and took out
the integration step !
.. access to PCP is now hidden behind a function so
it is only computed when neccessary.
.. the calculation is still significantly faster than
the old one but not as instant as the non-integrating
version (but then it wasn't working either!).
.. 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.
Instead of just reimplementing the spreadsheet we now
implement according to the original formulas as defined
in the W'bal paper.
This means there is no longer a 1200s limit to the decay
which was not part of the original paper.
We should be able to add some W'bal metrics now.
.. SEGV caused by referencing data->isChecked when
not in range mode
.. Speed plotting broken because line setting the
array length in setData was accidentally deleted
.. on the histogram charts when comparing multiple
intervals we group using a golden ratio to make
it easier to read.
.. this is less about the histogram and more about
establishing the aesthetic in time for the LTM
updates for compare date ranges.
.. remember we can plot for a season and recognise that
when checking for isCompareIntervals in PowerHist.
.. fixes a SEGV when looking at a histogram in the trends
view whilst compare intervals is active in ride view.
.. still needs tidying up for some combinations of show/hide
tab switch and adjusting chart parameters but is 99% there
.. still need to apply the same compare update for when comparing
seasons not intervals
When an interval is added to the compare pane we now
compute the RideFileCache so it can be re-used in the
Histogram and CP charts without computing it each time.
The 4 views have been shown to be confusing -- it is not clear
to new users what their purpose is, and hence how or why they
are different.
So in an effort to reduce the confusion I've renamed a few
things to be much more explicit and specific.
.. We embrace the fact we are a cycling program and use the term
RIDES not ACTIVITIES for all files
.. HOME is confusing, renamed to TRENDS
.. the ANALYSIS view name is confusing, its all about ANALYSIS
to renamed to RIDES
There will no doubt be areas that are not renamed properly we
can fix those when the arise.
.. don't signal when adding a ride, which kicks off
all manner of updates across the code, instead
we let the metric refresh kick in at the end.
.. this is great for an initial load and mass import
of large numbers of rides, but sucks for a small number
of rides when maybe downloading
.. we could make the signalling dependent on the number of
rides being imported, so small number still updates the
CP charts etc.
THIS IS A TEMPORARY FIX TO THE MORE SIGNIFICANT PERFORMANCE
ISSUE -- BUT WE DO NEED TO CONSIDER THE ISSUE OF CHART UPDATES
.. amazingly there are still some constant values we have
not seen before. This time from files provided by
Patrick McNally.
.. optpad values we have seen now range from 0x8007 through
0x801a and crucially with only one value missing 0x8008
.. its just a matter of time before we see one of those :)
.. 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!
.. tweaked color sequencing in compare to avoid using
red/green as it should be avoided -- red/green color
blindness is relatively common.
.. this is just a hack in the absence of a good algorithm
to generate distinct hues automatically.
.. silly typo mean't allplot was being used as a refrence
when generating plots instead of fullplot
.. this manifests itself as using the wrong plot for the
'bydist' boolean -- this is fine, unless you switch
between by time and by distance whilst in compare mode.
.. I deleted the lines that actually call the data
processor when I was refactoring MainWindow.
.. this must have been an accident as there is no
possible reason for just deleting the code!
Fixes#747
RPMs needed libsrmio installed which is not available.
Change to compile against a static build of libsrmio.
Changed install instructions to use "yum" so dependencies are installed.
.. if you selected a ride and viewed on allplot then
changed tabs, entered compare mode then switched back
to allplot the display didn't get refreshed.
Array bounds checking used a double which is susceptible
to rounding issues, or at least returning values a tiny
fraction over an integer that when converted add 1.
e.g. 10.000000001 -> 11 when converted to int.
When comparing it is possible to compare across
athletes; e.g. their 2013 season vs my 2013 season --
which means we need to use the sourceContext for any
items when aggregating / fetching the data.
Basically to distinguish between the four modes
and only show what you are asking for;
* rangemode + normal - the currently highlighted season only
* rangemode + compare - the compare pane seasons only
* ridemode + normal - the current ride and left pane intervals only
* ridemode + compare - the compare pane intervals only
.. same as the normal interval display glitch.
That was caused by appending to an array that was
already resized .. making it double the size and
prepended with lot of zeroes!
Fixed a few nits that have come to light over the last
few days as lots of new features were developed.
* Fixed interval glitch where first point is zero, caused by
an off by one error in the original code
* Fixed interval creation which also had an off by one error
that mean't 5s curve was only 4s long
* Made the shading under an interval optional, as it is a bit
nasty and was there to hide the glitch in point 1 above
* Made the interval line solid, not dotted, as it looks much
better that way -- especially now its used for compare mode
* Made the title red by implementing isCompare() when in
compare mode.
* Fixed a crash on hover in season compare mode
.. if the user sorts the compare pane contents by clicking
the header the order they are stored is changed too.
NOTE: The table sort is broken since it is alpha not numeric!
This needs to be fixed too.
.. if intervals or date ranges are not checked in the
compare pane then we shouldn't summarise them
.. also fixed up compare pane so first entry ie. what we
are comparing to is always checked.
.. Connected the compare mode on/off switch in the
compare pane to Context to notify charts
.. the scope bar and chart painting now highlight in
red when compare more is active and supported by
a particular chart.
.. each chart must implement isCompare() to return
true or false if it is supporting compare mode.
We /still/ do not have a mechanism for clearing or
reordering items in the compare pane, nor a mechanism
for choosing 'delta' compare (i.e. baseline all compares
to first item in the list).
Fixed up to make the toolbar on a build on QT5 look a little
more like one on QT4 where they still have unified toolbar
and title support.
We should look at managing via the native NSToolbar in the
near future since Digia have made it clear that they are not
keen to reintroduce unified toolbars in QT5.
.. now can drag and drop any date range onto the
home view compare pane to compatre different
seasons, and even across athletes.
.. we setup the metrics and measures in the context
so the charts don't have to, but we still need to
reference the source context for bests and ridefilecache
data
NOTE: We need a mechanism for 'locking' source tabs/athletes
when they are part of a compare to avoid crashing when
a context is deleted whilst we are comparing
NOTE: We till need a way to remove entries from the compare
pane, possibly call it when an athlete is closed too
(see note above).
.. should be ok to drag and drop a standard
date range as well as a season definition
.. pass across the start, end etc to avoid having
to dereference from the source context
Now allows you to add intervals and select them and
change colors they will use.
It will maintain the data as a CompareInterval which
also includes a RideFile representation of the interval.
This is stored in Context in a QList as compareIntervals
and can therefore be re-used across all charts.
We now need to think about putting some widgets onto the
Compare 'bar' for turning compare mode on and off and
deleting / reordering / clearing items.
.. this allows us to drag and drop between athletes or
to switch athlete if dropping from outside of GC.
.. also added context to the mime data so the compare pane
will know where the dragged object has come from (ie. it
may be from a different athlete).
.. to give a visual cue as to what is happening, since it
can feel like GC has 'hung' as it loads.
.. this is especially important now we open tabs in an
existing mainwindow.
The delay between clicking open and the tab appearring
needs to have a visual indicator that something is
actually happenning.
.. the save dialogs all assumed the current tab
and current context were relevant when checking
for unsaved files etc, but this was INCORRECT.
.. when window is closed each tab is checked IN TURN
so the context should have been passed (because the
current tab/context is just one of the many to save)
.. only needed when we have >1 tabs so lets hide and
show it automatically.
.. also added a setting for remembering setting but it
doesn't do anything as we auto hide/show.
The final part (and one of the reasons) for the mainwindow
refactoring -- we now support tabbed athletes rather than
having a new mainwindow for each athlete opened.
Context is saved/restored and there are new functions for
opening and closing tabs and windows of tabs.
The tabbar itself is fugly -- the next few days will spend
some time looking at making it prettier on Linux/Win and
more native on Mac (see MMTabBar).
Gareth's build system baulked at the stackZoomWidth
class member defined as const in the class declaration.
Moved to a static member of AllPlotWindow.cpp instead.
We have two new mime data types;
application/x-gc-intervals
application/x-gc-seasons
With packing routines into QMimeData declared
in IntervalTreeView and SeasonTreeView.
To get around an issue with overwrite mode on
drag and drop from the seasons / interval trees
we DO NOT ACCEPT the drop (even though we do
actually process the data).
All we need to do now is unpack the QMimeData in
ComparePane and then add the GUI elements to it etc.
.. it was a bit shit with controls you couldn't
use, and when you did nothing happened.
.. now has a slider and 7 distinct settings for
stacks from ok to large and 5-60 mins sections.
.. should be good enough for most users.
Finish off the nits and missing pieces for the recent
update to enable plotting in a stack by data series;
* Now plots W' bal, LR Balance and headwind
* Stacks are now redrawn when settings change
* Interval marking is fixed
* Baseline is now set correctly for each plot
* Reference lines are plotted (on power plots only)
* Reference lines can be dragged
* Interval markers are not redrawn with the text
only shown on first plot
Extending the stack display to have a single plot for each
data series. This will be useful when comparing activities
and also makes it a bit easier to see the data when there
are lots of data series.
This is a checkpoint commit as I need to fixup some of the
series that have multiple curves and also reference lines
are not currently working.
But you can zoom using the fullplot and highlight intervals
etc.
This reverts commit 20739ebb29.
Qt5 has a number of issues that cannot easily be resolved.
An alternative strategy of developing a custom cocoa control
for the mac toolbar is probably a better way forward.
.. let the user choose metadata texts to filter
by value in the sidebar.
Note there are issues;
1. the value lists are not updated automatically when
rides are updated or imported and values are added
or removed.
2. it only works with shorttext metadata fields, we might
choose to add numeric etc later.
3. it would be nice to get an indication of how many
activities contain the value and maybe even sort
by count.
.. now allows the user to select the type of trend
line for a curve, only two options at present;
* linear (linear regress)
* quadratic (quadratic lsm)
..was experimenting with fewer and more points on the trend
line and accidentally committed it alongside the changes
to fix the LTM axis scale setting.
Added a quadratic least squares trend line for the LTMplot
as the linear regression was generally too blunt.
This is a hack to get the code into the repo -- will know work
on refining the LTMPlot settings to enable users to specify
the kind of trend line they want.
The new trend line might also be useful for other curve fitting
functions (e.g. realtime virtual power curve, a peak power chart
by cadence/pedal speed).
Looks at the max and min (non-zero) power values and
uses the difference between them to calculate a fatigue
index as a percentage.
i.e.
FI = (maxP - minP) / maxP * 100.00;
This is really only useful for targetted intervals as for
most riding there will always be a period of time where
the rider coasts or takes it easy.
We may look to improve it by smoothing or comparing to the
average power instead of minimum power.
.. broken on All Dates selections.
It must be time to introduce a polynomial fit or somesuch
as the linear regress is a little simplistic for most cases.
Similar to fixups to CP plot for user defined plot backgrounds
this update updates the PfPv plot to also re-use the user prefs
when setting axis / canvas and marker colors.
The recent filter bar in home view was coded without taking
into account the fact that LUCENE is an optional build component.
This caused builds to fail when LUCENE wasn't installed.
Reverted the update to the QWT 6.1 code to make QwtPlot::canvas()
return a QwtPlotCanvas -- it now returns QWidget.
This means our local copy of Qwt is the same as the published version
so we should be able to stop maintaining our own copy when Uwe pushes
the multiaxis stuff with 6.2.
Also fixed the LTM tooltip - the zoomer has been removed.
Now hide/show appropriately and are painted correctly.
There is still a problem with the x-axis disappearing
but this should be straight forward to resolve.
This is a regression to remove the metric translation
functionality from LTMPlot.
WE WILL REINTRODUCE BEFORE RELEASE!
It has been regressed because;
1. It crashes on QT5 with Win32
2. It has significant performance penalties;
It really should not instantiate an LTMTool object
(Ale did discuss this with me and I gave it the go
ahead, so my bad).
3. It should be executed on applySettings() not on
each refreshPlot().
4. It has a bug regarding uunits being lost and breaking
sharing of a common axis.
New strategy to enable build on QT5 or QT4.8 is quite
simple to enact as most of the fixes for QT5 can be
applied to earlier releases.
This patch fixes up some of the special cases for QT5 so
they will continue to build on earlier releases.
Fixup crashes and major issues created by porting
to QT5. These have included;
* Fix CP plot log scale
* AllPlot axes and tooltip
* DBAccess prepare/bind bug
* LTMSettings crash
* LTMWindow zoomer/picker crash
* LTMPlot axes hack
There are still issues remaining but we can start
working through them at leisure -- the product now
builds and runs.
Fixup all the GC code to use the QWT 6.1 code.
It needed canvas() to be patched to return a
QwtPlotCanvas and not a QWidget.
We could probably get round that with a cast.
When we switch to QWT 6.2 with the multiaxis
support formally baked in we can fix the code
as needed.
Now compiles and links without issues.
Porting the codebase to QT 5 (5.2) to get the
latest bug fixes, performance and improved platform
support.
This first part is to fixup the codebase to compile
on Qt 5, but some aspects have been broken (video).
The second part is to migrate from Qwt 6.0.1 to the
latest Qwt for multiaxis support.
The third part will be to fixup any platform specific
issues or issues identified at runtime.
If you change the plot background to black then the
CP curve is always in black too so becomes invisible.
Added a customisable color for the CP curve and fixed
up a few redraw issues in CP and Ride plot when you
change the colors.
Still need to fixup the other charts, but will do over
time. I suspect almost noone changes the plot colors from
the default values.
Let the user define the lowpoint for stress balance -- this is
so we can highlight or alert when they go below.
From a post-hoc perspective it is useful for identifying where
they went too low, but also for planning it helps to stop
planning to fail.
Will update the LTM chart to highlight it alongside SB metrics.
A bit of a compromise since really we should move the
stress calculators to the Athlete class and reuse when
no filtering is applied.
This code fix just means the SC is not recalculated for
each of the individual curves (LTS, STS etc) and pretty
much halves (or better) the time taken to refresh the
LTMPlot.
For those with very few rides (<500) this isn't much of
an issue, but for some with lots (2000 or more) it can
be quite tedious.
.. part of the refactor of mainwindow saw the sidebar
sizes independently set and therefore using different
settings.
.. we now use the old setting if first time through, or
if first time run for athlete set a sensible default.
.. if the compare pane is automatically shown or hidden
due to the user dragging and dropping the menu and toolbar
got out of sync with the status of the widget.
.. compare pane now appears and disappears on both
the analysis view and home view
.. it also is notified of drag/drop events and can
accept the objects dropped
.. it is now time to write the widget for collecting
and managing compare sets
.. when building a debug build of GC with CONFIG += debug
then we define a macros GC_DEBUG.
.. main no longer redirects to goldencheetah.log if you have
GC_DEBUG set, so developers will continue to see debug
messages on the terminal output (for mac/linux only).
.. we could use the GC_DEBUG macros to allow debug messages
to be switched on / off in the code in future
.. now the compare pane will appear and disapear
when the user drags and interval / season into
the view.
By fixing the way we handle QDragLeaveEvents in the
code in TabView.h ViewSplitter.
Introduce an hpos property on TabView::mainSplitter so we can use
an animation to make the compare pane slide up and down when
arriving and leaving.
Will add the animation shortly, just pushing to save updates.
Recent update to change the way the LTM configuration dialog
worked accidentally lost the events setting.
Show events is not being stored in the LTMsettings 'datastream'
but as a separate chart property -- but *is* stored internally in
the LTMSettings class.
it was being lost when the datastream is appled. This fix makes
sure the value is remembered and reapplied after the settings are
applied.
.. we should make it possible to display interval
data aligned via the altitude or gps data as well
as via time/distance. This really only applies to
the ride plot.
.. set to 3600 not 360 (!)
.. updated intervals causing warnings when using values
that were half baked. Now delays recalc() till all
the parameter intervals are set.
Jusst jotted down thoughts about implementing compare in v3.1
and added to the documentation folder. Will try and get some
mockups sorted too in the near future.
.. don't use toLatin1() and fopen, use QFile and full QStrings
so we can support directory names with unicode characters.
.. add unistd.h for dup() and close()
Now accepts --debug to disable redirection of stderr to
goldencheetah.log, which is handy for developers.
Also refined the way the command line is processed to enable
new arguments to be added in the future.
In the home directory of GC (platform specific or configured
by the user). This is only relevant for OpenBSD, Linux and Mac.
Windows does not support applications that are GUI and console.
The CP chart model defaults are set before the spin box step
min and max values are set, which means that the value is always
reset to 100.
Since the vast majority of users will not be aware of the settings
and/or will never think of setting them to their own 'preferences'
it is vital the default is applied correctly.
Now allows:
$ GoldenCheetah [[directory] athlete]
$ GoldenCheetah [--version|--help]
$ GoldenCheetah
Passing the athlete on its own is as before, but you can
now also pass the folder name in as well.
I've also added the option to get a help message if you
pass --version or --help.
Lastly, as before, with no command line paramaters you
open the last athlete worked on.
Since we now output the version and build info I have uplifted
the build and version numbers in GcUpgrade.h to reflect the fact
we are now developing v3.1.
When closing down we left the training database open
and this caused problems when looking to implement
a restart function.
The problems stemmed from the way the QSqlDatabase
code was implemented in TrainDB which was modelled on
code in DBAccess that was cleaned up subsequently.
TrainDB code now mirrors the approach taken in DBAccess
and relinquishes resources correctly. The TrainDB is now
closed as well as being opened in main.cpp at startup.
Also, removed reference to obsolete dbconn member in the
DBAccess class definition since it is no longer used.
Allow the user to select a directory to use for the
athlete libary. Leaving it blank will continue to use
the default location (dependent on platform).
If it is changed the user will be asked to confirm
and then GC shuts down.
Restart wouldn't work due to issues with the DBAccess
QSqlDatabase connection (which is really annoying). I
will look into this as a restart option would be much
cleaner.
Its only taken 4 years to implement this feature! (ouch).
Fixes#282.
.. accidentally left at 0s now corrected back
to truncate at tau for the 2 parameter model
and set to 25s for the 3 parameter mode where
it seems to breakdown.
Let the user define whether to use a 2 point or
3 point model (Morton et al).
In addition, let the user define the interval durations
to use; by default we set to 3 and 30 mins.
For estimating CP against good, recent data both of these
models are more than adequate for the purpose.
We'll just keep kicking the can down the road whilst we
can rely on published, verified science.
DJ Connel implemented a 3 point model, after Morton,
which was erroneously removed in a prior commit.
Our thanks to Andy Coggan for pointing this out in a
recent webinar. Nice to know he is following us closely.
.. don't refresh when not visible!
This is a side effect of the code updates added
to handle filtering in chart settings or the global
search/datafilter box.
.. another method for find intervals to find the ascents
in a ride. Uses the hysteresis as defined in options
which means a climb ends if there is a descent of that
or more (by default only 3m).
.. you can now choose to remove reference lines in the
allplot when you double click on the axis.
.. we might want to put the table and buttons for deleting
references into the chart settings too (?)
Too much going on and gets noisy, especially in stack mode.
Might extend this to the other plots, but need to live with
it for a while to see if the ticks were actually useful (!)
So you can unzoom in ride plot when you've zoomed in
to an interval -- avoiding having to show fullplot to
do the same thing manually.
There are probably other places to add functionality
for zooming out, will deal with those as they arise.
Added auto finding matches in Wprime, but there are
two areas to develop further;
1. Use the W'bal data to find matches instead of the
power above CP (which is really being used as a proxy
for the better approach).
2. Update the 'find intervals' dialog to allow you to
find matches and add them as normal intervals.
Pushing to repo as a version checkpoint, this function
will definitely need refining before 3.1 is released.
You can now plot NP, xPower and aPower on the
ride plot.
This has been done to provide transparency &
insight into the relationship between the derived
values and the recorded power values,
Peak aPower durations now computed and cached;
* updated RideFileCache to work with aPower
* CP curve now allows you to plot aPower
* LTM plot allows you to plot aPower peaks
* DataFilter allows 'best(apower, duration)' function
Added comment in ridefile.cpp to reference the book
and research paper that aPower is based upon:
// Calculate derived data series, including a new metric aPower
// aPower is based upon the models and research presented in
// "Altitude training and Athletic Performance" by Randall L. Wilber
// and Peronnet et al. (1991): Peronnet, F., G. Thibault, and D.L. Cousineau 1991.
// "A theoretical analisys of the effect of altitude on running
// performance." Journal of Applied Physiology 70:399-404
Added an average aPower metric.
I also and found and fixed a couple of bugs along the way;
* intervals create a ridefile and need to explicitly call
recalculateDerivedMetrics()
* the aPower calculation was using the calculated vo2max
percentage the wrong way around (!)
Introduce altitude adjusted power 'aPower'.
This is a new ride data series that takes into account
the effect of altitude on power output.
At present we are only adding this as a derived data series
with the intention of making it possible to plot it on
the ride chart.
We will also introduce alternate metrics for average power,
bikescore etc that are based upon the aPower value.
Calculate NP and xPower as a data series so we can
plot on the ride plot.
Have also added 'aPower' which will be coming in the
next few days - altitude adjusted power, which will also
have some associated metrics (a-xPower, a-NP, a-TSS etc).
In preferences->athlete->power you can now set
your W' in joules alongside your CP.
This is also available in the new cyclist dialog
which also defaults to 20Kj.
Fix 1s smoothing to ensure time doesn't go backwards
as when the same timestamp is used more than once the
QwtSpline used to interpolate returns all zeroes.
The implementation set tau to a constant when it
should be derived from the recovery power across
the ride.
I've also added tau to the chart so you can see
what value has been derived.
It TREBLES the amount of time required to refresh the
metrics, so will need to be optmised before 3.1 is released.
But it should only need to run once.
I've also added a 'RideMetric::Low' type which we could
also apply to weight.
Calculates the W' expenditure and reconstition during a ride.
The implementation is sub-optimal and will need to be optimised
and probably re-written to improve performance before v3.1 is
released.
This is based upon research conducted at the University of Exeter
by Philip Skiba, Weerapong Chidnok, Anni Vanhatalo, and Andrew Jones
and is used with permission.
For more information on the research please see: ""Modeling the
Expenditure and Reconstitution of Work Capacity above Critical
Power." Med Sci Sports Exerc 2012;:1.
Intervals are off by 1 sample because when the temporary
ride is created it stops short of the last sample in both
the ride and interval summary window code.
Fixes#623.
The current TIZ metrics only allow you to chart the
absolute time in zone. Over longer periods it can be
helpful to look at the overall ratio of intensities
trained at.
Updated RideFileCache and LTMWindow/Plot to
plot the user defined durations for peak power.
Actually we support all the different meanmax
measures available in the CP chart, so you can
now track peaks for user defined durations of;
* Power
* Watts per Kg
* xPower
* NP
* Heartrate
* Speed
* Cadence
* Torque
* VAM
I have not spent much time optimising for performance
but reusing the same 'seek' approach used by the recent
update for best() and tiz() functions in the datafilter.
Fixes#322.
.. to make sure the v2 LTMSettings
uses the bestSymbol.
Just pushing this (WIP) to make sure
we don't get half baked LTM settings
from people building against the previous
commit.
Update to let users specify a custom duration
to plot on LTM for peak power, vam, wpk etc.
This update is to the LTM chart settings and
the reading/writing of chart settings.
Next update will update LTMWindow/LTMPlot to
retrieve and plot the values from the CPX files.
Note: the values will not plot yet, the next
commit in this series is required.
When showing / hiding the toolbar we also show / hide
the scope bar. This is so when in train mode and you go
full screen it is possible to hide all ornamentation.
This will become a moot point when the scope bar is
replaced with 'appstore style icons' in the toolbar
to switch between home, analysis, train etc.
We know the highesst point on Earth, so any activity that
contains an altitude greater than that is definitely incorrect.
This patch truncates the altitude to the maximum possible, this
has the happy by product of curing a major mem alloc crash in QWT
when trying to plot altitudes with very large values.
Fixes#700
But saving is an issue !
The presets need to move to the athlete object as they
are in the athlete directory -- we currently have one
per LTM chart, which means they get overwritten on exit.
The definition of curves is rationalised to match the
new design mockups in readiness for introducing user
defined peak durations for power et al.
For now this patch cleans the UX and makes it much
easier to add/edit/remove curves.
Fixes#548
Kernel 3.11 exposes the Suunto ANT+ stick as a USB serial device,
this prevents GC from opening it in training mode unless the
kernel driver is detached first.
In training mode, calculations of speed using wheel size and RPM from
a speed sensor used integer division. This truncated all wheel
circumferences to an integral number of meters. 2100mm wheels were
treated as 2 meters and 1960mm wheels were treated as 1 meter,
effectively reducing calculated speeds by roughly 5% and 50%
respectively.
Fixes#585Fixes#651Fixes#669
as current tcx writer currently doesn't support laps (and tcx doesn't
allow non-linear/overlapping intervals, at all) this patch makes GC upload
exercises as pwx.
Pwx does support for arbitrary sample lengths. No need to chop off
timestamp precision and introduce bad data + jitter.
Instead we should look at fixing data import and consider resampling on
read.
Distance is defined as double, aswell - so, let's keep the precision,
aswell.
As I got it pwx by itself has no concept of recording intervals. "smart
recording" and other strange data require variable recoring intervals.
On the other hand it's not recording the duration of a sample explicitly.
This means the duration needs to be derived from the previous samples
timestamp (assuming the sample timestamps are referring to the end of the
sampled period).
This diff writes an empty timestamp at the end of each gap so that the
next real sample/ridepoint can calculate the correct duration.
Please note that this may unhide some deficiencies in GCs file reading in
exports.
Simplified selecting and managing preset charts
in the LTM chart settings.
Need to now move the 'Add' button to the custom
tab, but that is the next pending update.
When exporting files to Tcx, it's writing an ActivityExtension to the end
of the file with calculated AvgSpeed and MaxSpeed. Unfortunatly it's using
the km/h values - while Tcx is using m/sec. Schema is a bit unclear about
this, as the ActivityExtension uses "double" as type for both values, but
original Tcx v2 Schema only uses m/sec, GTC exports as m/sec and some
other software is expecting m/sec, aswell.
.. casting the sidebar in TrainView was wrong because the
controls are in the sidebar, not the trainTool. Thus
it would crash on exit .. but strangely only on Mac!
.. the code now correctly calls trainTool->Stop(), quite
why it fails on Mac only is a bit of a mystery.
.. forgot that the values are converted to
zero decimals when stored.
This fixes strange results when filtering by
wpk or speed, or any series that has decimal
places.
Added static functions to ridefilecache
to get best and tiz values for series and duration
or zones and glued them in to the datafilter code
recently added.
It uses seek (via QDataStream::skipRawData) and is
quite fast on my Linux development PC.
We now need to update the LTM settings dialogs to
the new mockups so we can plot custom durations for
peak power / NP etc too.
NOTE: Not tried on Windows / Mac, so may not be quite
so fast there, will need to check.
To try this out, in the search filter box type:
best(power, 3600) > 250
to filter only those rides where the best hour
power is greater than 250 watts. It should
return almost instantly.
Fixes the crash but the eval code is a bit of a
fuck up. It was evaluating children instead of
using recursion, and now we have lots more types
and expressions its all a bit of a mess.
Will need to rewrite to use recursion and it will
be a lot simpler!
There still some assert left in the code, but removed
a fair number of the examples where, its just as easy
to handle the condition gracefully, without crashing.
By 3.1 we will have eradicated assert from the code.
Will now allow users to specify a formula using
the * / + - ^ operators. This can be used to specify
values (e.g. TSS > 100*2) or to calculate a totally
new user metric (e.g. Average_Heart_Rate / RPE).
Also added two functions as well;
1. best (series, duration) which returns the best value
for the series of the given
duration in seconds.
Where series is one of; power,
hr, cadence, speed, torque,
xpower, np.
2. tiz (series, zone) which returns the time spent
in the given series and zone
Where series is either power
or hr and zone is 1-10.
NOTE:
We know need to add the functions for retrieving the best and
tiz values from the ridefilecache without having to read the
entire file (ie. read the header and use lseek).
.. it was not possibe to resize the window because
the blankstate page was too big.
.. blankstatepage is hidden for now until we fix the
logic for it in TabView
Split the views in MainWindow into separate classes;
* Tab is a collection of the 4 main views
* TabView is a base class for all of the 4 view types
* {Analysis,Train,Diary,Home}View are all derived from
TabView and deal with specifics of those views (e.g.
Diary/Home worry about date ranges).
We should be ready to move to tabbed athletes soon.
There are a few nits left for this part of the refactor
that will need to be resolved in some fixups over the
next few days;
* tile mode segment selector has wrong segment selected
when the view is in tile mode.
* Minimum height/width of MainWindow is large for some
reason
* the Train view controls (play, ffwd etc) have nowhere
to go at present -- need to fix that !!!
* When you resize the mainwindow width the sidebars expand
and should remain a fixed width
* not sure if it will build on Windows or Mac!
Part 4 of the MainWindow refactor is moving the code for the
4 views (Analysis, Train, Home, Diary) out of MainWindow and
into a separate set of classes.
TabView is the base class for the 4 views and the basic code
is in this commit, but now need to work on the 4 derived
classes for Analysis, Home etc and the controller class 'Tab'.
A bit of a mix of stuff, but basically the Athlete
class has sql stuff in it, that DBAccess used but
also referenced a session number in MainWindow.
Removed the interdependency and moved all code to do
with DB to DBAccess and out of MainWindow and Athlete.
At the same time needed to clean up a bit of memory
management and so introduced a MainWindow and Athlete
destructor.
We are now ready to do refactor part 4 to split MainWindow
into a new View class (that will be in each tab).
.. add some sample files with calibration messages to the
test/rides directory
.. remove the calibration marker color config (we can add it
back if needed, but was in the wrong 'sequence' and is
probably just a little bit *too* fine grained).
Further MainWindow updates, this time moving the code
for working with intervals to the AnalysisSidebar and the
associate menus.
Ultimately, the functions for working with Activities and
their Intervals will move from MainWindow and Sidebars to
the ActivityCollection classes.
This is a step as we strip out MainWindow to just GUI
aspects.
Moving the code intertwined into MainWindow for
the analysis view sidebar; activity list, intervals
and calendar into a new AnalysisSidebar class.
WARNING!
This is a work in progress checkpoint commit
as the sidebar menus and context menus have
not yet been migrated out -- this will be done
in the next commit or two.
Including:
* Fixed a type with slope mode updating the wrong byte array
* Transposed bytes in the definition of the erg and slope messages
* Added power smoothing
Note:
It appears the Fortius is supplying torque not power, some more
testing is being performed but expect to see an update shortly
once this has been fully tested.
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.
.. Minor oopsie with references to context->mainWindow->athlete
instead of simply context->athlete.
The MainWindow refactor will be complete when references to
the mainWindow class is for gui reasons only.
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
Breaking the MainWindow 'god object' into
separate classes for Athlete and Context.
Further updates will need to;
- 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
Once these are done we will be in a position to decouple
most classes from mainwindow and also introduce tabbed
athletes.
2 bugs:
- interval offset of -1 causes a crash in htmlSummary
- interval offset of form nnn e+0n parses incorrectly
Also remove silly -wreorder warning in ridefile.h
fopen() was missing 'b' flag, so that mingw and other platforms doing
LF/CR translation screwed data.
This is fixing the astronomic values of direct SRM downloads.
Playing with some ideas about how the UI will change
to support new UX features for viewing multiple athletes
in a single mainwindow and also having multiple pages
of charts in a single view.
2 Options on the drawing:
.. Having tabbed Athletes and scope bar for view pages
.. Having a source list and tabbed view pages
Can't decide which is best -or- if there are better options
we could look at.
Because the chart settings are modal its a really bad
idea to open up a column chooser from there. So, by
default, we don't have a column chooser option on the
search/filter box -- it must be explicitly requested.
We therefore explicity set the column chooser from the
mainwindow and also from the ride navigator window.
At first it seemed this was caused by setting the time to
a value greater than the length if the ridefile.
It was actually a constructor error, since the settings
class didn't initialise the ride variable.
Ridesummarywindow was using rideitem to get zones to use when
summarising for a date range which was bad because a) the ride
might not be for the date range selected and b) it might have
been deleted.
This fixes that and means we get a summary that is more accurate
and no crashing when rides are deleted.
If you delete and readd an activity after showing it on
the diary view you get a SEGV.
This is an edge case related to deleting the last activity
and going back to the blank state before importing another.
Actually there are 3 technical issues;
1. GcCalendar doesn't get notified by MainWindow when
there are no rides -- so it crashes on refresh
2. RideSummaryWindow doesn't get notified by home window
if its not visible
3. RideSummaryWindow should check rideItem isn't NULL before
trying to plot zones (but only for date range summaries)
Fixes#622
Its RC6 and we only just caught this bug!!! It was not
possible to delete or edit date ranges of type 'Cycle' due
to a cockup with the type() values.
Thanks to Martin Wifling for finding this one!
.. by only plotting the stack view if its actually
needed (i.e. user has selected stack view).
.. this performance degradation was introduced by the
axisscaling update (which is a nice update)
Fixes#616.
On Windows QFile crashes trying to close a file that has already
been closed by fclose() since it maintains its own state and doesn't
handle the return code of -1.
We just reverse the order we close via QFile and fclose() to avoid
the conflict. We need to do both since fclose needs to release the
stream buffer (they get exhausted on Mac OSX) but QFile needs to
maintain its state too!
Longer term the RawRideFile reader needs to use QFile methods. But
at this stage in the release cycle I'm not going to make such a
dramatic change.
On very short rides the array bounds checking in HrPwPlot
and HrPwWindow was missing. This meant that attempts to
find delays or apply delays that were longer than the
ridefile itself generated negative array offsets, and thus
a SEGV.
.. in interval summary
.. and workout wizard
There aren't any other computeMetrics() pieces of code
left. I also scanned for new RideFile() code and it was
limited to the RideFileReaders which are managed by the
openRideFile() base method, so all should now be well.
.. recent update to use getWeight() in the ride file
caused a SEGV as interval metric computation is done
on the fly against a 'manufactured' ride file.
.. That ridefile doesn't have a mainwindow reference in
it, so when getWeight() references mainwindow->metricDB
a SEGV occurred.
When a new athlete is created or when running v3 for the first
time for this user the sidebars shown are yucky. This just updates
the settings to make sure you start up with a simple sidebar for
the four views.
The call to RideFile::getWeight() in RideFileCache
computation ends up with a call the read the measures
table in the DB. This is BAD since it is called from
a thread.
We now call getWeight() in the metric aggregator before
launching the ridefilecache computation -- this will cache
the weight and avoid db access.
I've also removed the duplicate code in the w/kg metric code
too and it should be marginally faster at computing metrics
now.
BIG THANKS TO ILJA BOOIJ FOR HIGHLIGHTING THIS, DESPITE MY
INITIAL SCEPTICISM. I OWE HIM A PINT (OR TWO) :)
Fixes#604
Who has maintained the GoldenCheetah Linux package since v2.1.
Now added to the contributors in the About dialog and also
recognised in the release notes for v3.0
.. accidentally committed the first half of this update
alongside some changes to the documentation.
.. basically we now pass ANT messages on the stack rather than
as a pointer (fixes memory corruption issues).
.. the log file is explicitly opened and closed with status maintained
alongside that to ensure we only log messages when the logfile is open.
.. This is an alternative fixup to the fix proposed by Jon Escombe in
pull request #597.
We now use a per-athlete setting to track if the last
time the athlete was opened GC shutdown gracefully.
If it didn't then we show a dialog box with some basic
data to use to debug / diag the problem. For now it is
just limited to;
* metric.log
* athlete directory listing (by modified time)
* app settings
We explicitly DO NOT include personal information such
as DOB, Weight, Sex nor critical information such as userids
or passwords.
This is a first stab at this, and we will almost certainly
improve it to include other .xml config files as well as
automatically posting an email (or similar).
Fixes#596.
.. for different font sizes and as importantly to make the
buttons large enough for the translated button texts -- this
is particularly important for Deutsch.
.. should only be shown on developer builds. When building
releases or release candidates and GC_VERSION is being defined
then don't add the config tab -- it is too `geeky' for the average
end user and not at all useful for debugging.
Moves the early setup code so that the receive loop is already
running when these messages are transmitted. Doesn't achieve much
at this point, but can visualise the send and receive packet flow
better, and will enable the responses to these messages to be
checked in the future.
We now maintain a build id which correlates to a release
version (or development version if we want).
Most importantly, when we increment the build id we get to
run some processing when the cyclist is opened to clean/prep
for this release.
I have added V3 RC3 as the first build id and it will
remove *.cpi and *.bak files as well as removing the
clucene index and metricDBv3 file.
Fixes#584.
We now redraw whenever plot properties change so the user doesn't
have to click on the replot button. This was originally introduced
because rendering was slow, but this was more to do with the original
code and is no longer a performance issue.
.. by highlighting chart title too if a filter is
being applied.
This is important to warn users that the data being plotted
is adjusted to the search/filter (either globally or in the
chart settings).
.. webBridge crash in QtWebKit for 4.8.4 (qt-bug 30403)
.. delete GoogleMap leaves webBridge orphaned which will
crash if intervals are created or removed.
We need a proper fix for the webkit issue which we will get
when we migrate to Qt5.
.. double to int conversion rounded up and caused an
array bounds segv. just added 1 to the initial resize
of the array to avoid.
.. annoying since I performed considerable testing of the
metric histogram on Mac, but this crashed almost immediately
on Linux. Bah.
Update to the histogram plot to now plot long term metrics.
It enables you to plot distribution of say, Intensity Factor
for a season or cycle.
You can select the y-axis metric too, so rather than just
plotting duration you could plot say, TSS accumulated for
different ride intensities.
Fixes#560
.. truncating the front of the sts/lts arrays also
truncated the xday array which mean't it didn't
start from 0.
.. left code in there, but commented out with a
comment to explain in case anyone is tempted to
add it back in the future.
Search box gets a focus and the calendar highlighting uses
the default palette highlight -- only good for new installs
or if the user resets their colors but at least it now does
the right thing.
Need to test and fixup on Mac and Windows.
If you close or crash in fullscreen mode then it is
restored on startup but not in fullscreen mode. So
it is impossible to shrink -- this is particularly
relevant on Windows 8.
We now restrict the initial size to always be 60px
smaller in x and y than the actual screen size.
.. by hiding not deleting minicharts. Its better this
way since deleting and recreating them all is very
expensive and the layout code breaks as a result.
It is an edge case for optimisation anyway.
.. so if you expand out the sidebar and have lots of
minicalendars then shrink it down again then it
will be slow to update.
Fixes#550.
When the user free text searches or applies a data filter in
the top right toolbar search box it gets applied to any charts
that plot data from many rides, including;
- CP curve
- Calendar
- Histogram
- LTM
- TreeMap
- Summary
I need to update on a Mac to no longer use a Mac text search box
but now use a search filter box on the top right.
If >1 rides per day stresscalculator ignores after the first
ride, this was caused by a flawed strategy for seeding the STS
and LTS with non-zero values.
We now seed with negative values and switch signs as we pass over
the date during calculation.
Fixes#549.
It corrects removal of threading support against the 2.3.3.4
head. This is required for Windows builds at present.
I also added an INDEX in the contrib directory for all the
other things we've snaffled into the repository.
.. now we've optimised out the model resets the diary window
(calendar chart) needs to explicitly repaint when a ride is
selected because the model won't reset unless the ride selected
is for a different month to the one currently shown.
.. lots of unneccessary setting of dates and refreshing optimised out.
.. but probably more lurking coz we handle updates from all over the
place and worse to miss one than do it twice in most cases.
This reverts commit 6fdc55528f.
The performance decrease is considerable. Using mallocs across
my personal ride collection takes 5:19 to compute all the caches.
Using the QVector equivalent took 22:40.
Need to consider looking at QVector across the GC codebase.
.. will refresh after the metrics and cpx have been refreshed
.. it invalidates the data rather than refreshing immediately
since thats expensive and better wait until refresh is needed.
If an incore cache of an aggregated RideFileCache is invalidated
by a ride in the same period being edited it does not clear
until the cache array is cleared (25 of them so likely to be
never) or upon a restart.
This fixes them being invalidated by refreshCache.
When GC is restarted after being closed full screen, the saved geometry
is larger than the actual screen size - resulting in the title bar being
drawn off screen & not easily reachable.
This patch checks whether the saved geometry is larger than the current
screen size, and resizes to the screen size instead of the saved values.
.. actually it was an uninitialized variable bug introduced
by the earlier fix for the calendar model.
Caused by new code checking if an index was -1 before setting
it, but forgetting to initialise it to -1 to begin with.
Fixes#531.
.. it turns out the translation for Data and Date are both
Data!
.. we now use the first column that matches when seeking special
fields. This is a bit of a hack, but good enough for now.
Fixes#530.
When youi switch to Diary view no date range is known by the
charts because they have just been created. Since we have a
lazy create we need to resignal the date range after they
are created.
This was already in MainWindow with a call to GcCalendar::refresh
but a recent update optimised that out.
The search/filter selects in the activity list but doesn't
highlight the rides on the calendar.
This patch highlights the dates that have activities that
match with a red border and a red number.
After download fails a .strava file is left in the
athlete directory. This is picked up on restart and
causes a crash.
We now create the temporary file in a temporary
directory to avoid this issue.
Fixes#525.
.. example on the cover page of the manual
.. we need them to follow a naming convention
if section-keyword.pdf, e.g. 0-icon.pdf for
the icon on the title page (section 0).
After taking out the double refresh in the previous commit
we got a bug with the last selected date stating highlighted
when clicking on the left and right buttons.
Fixed by signalling date changes after the model has been
queried. Still lots faster than before.
.. no longer ignored in .gitignore
.. they are committed to the repo in the same
way that translation .qm files are
.. in this way those without the right tools installed
(in this case tex and texinfo tools) can still use
them.
.. So FAQ becomes GC3-FAQ
.. and Manual becomes GC3-Manual
This is just so they can be distributed and installed in their own
right and still be identifiable as GoldenCheetah v3 files.
.. restructured the doc directory to distibguish between
website content and user documentation
.. added basic content for FAQ and Manual, but neither
are complete and contain no markup
.. added to the splitter handle context menu
.. also took IntervalItem.h and IntervalTreeView.h from MainWindow.h
coz I was getting pissed with recompiling everything when changing it.
Thats why so many other files have been changed in this commit.
Fixes#338.
.. the RideFile::data member is used by the ride editor and was deleted
when a ridfefile is deleted, but we have no way of telling the editor.
.. now doesn't delete, which is a small memory leak.
.. will use entered text and append 1,2,3 etc
.. or if entry ends with a number, will start from that
.. eg; "Int#3" will result in "Int#3", "Int#4" .. "Int#n"
Fixes#513.
.. akin to the Mac look and feel
.. still needs a bit of cosmetic work, but basically sound
.. also added in fixes to native file imports
Fixes#404Fixes#504
D'oh.
The ridefile reader for JSON files spotted when a file failed
to open but then continued to try and parse it! Now returns NULL
when fopen fails.
This is particularly relevant when using foreign characters in
a filename passed to fopen(). We need to remove the fopen stuff
and replace if QFile reading to a buffer.
.. if you resize them they will show as many months
as they can fit vertically.
.. also removed the scrollbars in the summarys shown
in the diary and LTM sidebar
Fixes#503.
.. taking out last remnants in the code from previous design. This will
also remove the focus block that appears on calendar handle in diary view,
but only really visible on Linux with Gtk/Gnome.
This is the first step to reinstating the calendar on the analysis view
sidebar. Next step is to enhance it to show multiple months and then to
refactor the diary sidebar GcCalendar to use it.
The visual headings are not reset when the view is reset, for
example after startup. This means the wrong columns are offered
on the activity popup menu for group by.
The resetView() function needed to call columnsChanged() to get
the visual headings reset.
.. the start date would progressively change as you selected a
date range in the sidebar. This is because the code to set the date
range to the start of a week looked at the wrong date variable when
using a custom date range.
Fixes#500.
.. but only deletes references and db entry
.. we do not delete from the filesystem -- need to add a dialog
to ask the user to confirm deleting the file from disk.
.. akin to the NSImage 'template' function we now pre-process
the GcSplitter icons to get a shaded and embossed look. Its a bit
clunky code, but its only run at startup.
.. when switching views. It seemed like a good idea at the
time, but now it is really irritating. If I want the sidebar to
be shown I'll select it thanks.
Rather than relying on the parent to maintain the splitter sizes
and states, the GcSplitter remembers its own state and sizing.
This includes remembering if the children have been hidden via the
icon bar at the bottom of the splitter.
The icons are adjusted via utility function iconFromPNG()
which currently just adjusts the icon color to be a muted
gray as opposed to black.
This is the first pass at recreating the 'template' function
used by the cocoa image functions. Will add an emboss feature
later, but at least now they are less vibrant and when clicked
turn black giving a visual clue that they are clickable.
Moved icon bar back to the bottom and made Splitter handle
same size as scope bar.
The splitter handle paint artefacts were caused by splitter
size restore from before the "new" splitter. We will need to
rename all the settings to ensure we don't get incorrect sizes
for them in future.
Since the treeviews didn't fill the space in the sidebar.
This was because the splitter itself wasn't expanding since it
used the sizepolicy of its children.
.. not sure the class hierarchy is right for this stuff, but will
stick with it for now.
.. train tool segvs on device types that were previously
configured but are no longer supported. This fix now silently
ignores any devices that are no longer supported.
Fixes#497.
.. some cosmetic and tidy ups for the recent sidebar WIP update
from Damien. Just trying to get clean look before making the icon
bar look more like the one in XCode and make the icons use the
Cocoa "template" look.
It seems the new PowerAgent version (7.5.7.34) changed the format
of the date/time data in the csv file:
6,2011-01-02 21:22:20|2011-01-02 21:22|01/02/2011 21:22|2011-01-02 21-22-20,0,0, ...
Here are the header lines of the new PowerAgent csv file:
Version,Date/Time,Km,Minutes,RPE,Tags,"Weight, kg","Work, kJ",FTP,"Sample Rate, s",Device Type,Firmware Version,Last Updated,Category 1,Category 2
6,2011-01-02 21:22:20|2011-01-02 21:22|01/02/2011 21:22|2011-01-02 21-22-20,0,0,0,,55.8,807,227,1,CycleOps Joule,18.054,,0,0
User Name,Power Zone 1,Power Zone 2,Power Zone 3,Power Zone 4,Power Zone 5,Power Zone 6,HR Zone 1,HR Zone 2,HR Zone 3,HR Zone 4,HR Zone 5,Calc Power A,Calc Power B,Calc Power C
,0,0,0,0,0,0,148,157,167,172,250,0,-0,0
Minutes, Torq (N-m),Km/h,Watts,Km,Cadence,Hrate,ID,Altitude (m),Temperature (°C),"Grade, %",Latitude,Longitude,Power Calc'd,Calc Power,Right Pedal,Pedal Power %,Cad. Smooth
.. go back to more GC-like color defaults, which became a little
too vibrant in a recent update to introduce linear gradients to
the CP, Histogram and LTM plots.
.. in JsonRideFile.l
Because we added a call to yy_lex_destroy in the parser
but it may not exist in Flex < 2.5.9 or if we are not using
GNU Flex, e.g. good ol' ATT lex.
OK, I admit it, I am OCD when it comes to this stuff. The
handles are a WIP and Damien is working hard on it, but for
now I just wanted to get rid of;
- spacing between handle and content
- focus / height of handle toolbar
Its gonna go when Damien finishes his excellent work, but I
just needed to get rid of it temporarily, I was getting bit
of a twitch ;)
.. just upgraded to Xcode 4.6 and the project files
created by qmake 4.8 don't work. After scanning the
web I found a workaround in QTBUG-29371 and implemented
it in a little shell script: qmake-xcode.
.. to run, from the src directory invoke it with
$ sh ./qmake-xcode
Using the CompuTrainer utility to convert GPS logs to a course profile
results in lots of very small segments where the height differences are
less than 1 metre. These were incorrectly handled as the altitude was
being stored as a long.
In fact the double to long conversion was always rounding down, for
instance 200+0.01 is 200 as expected, but 200-0.01 is 199. Therefore the
course would gradually ratchet downhill with every small data point.
- none - no shading on the all curve
- derived CP - as before using the CP value derived from all curve data
- CP - the value of CP for the time of the ride
NOTE: When in rangemode (i.e. on home) the CP is set to the mean CP for
the date range selected.
.. warnings from Xcode 4.6 (still some remaining)
.. and deprecated Quarqd code (we have native ANT now)
.. and MultiWindow deprecated (it isn't finished)
.. kept allocating a new RideFileCache but didn't delete
the previous one. Given their relatively large size this
can lead large amounts of memory lost in a short amount
of time.
As a personal habit I tend to use the C pre-processor to
comment out code blocks I don't want to remove. This is in
case the code will be required in the future.
I think it is now safe to say the code commented out is not
required -- most of it is legacy and marks the transition from
earlier designs or legacy code.
I've done this in one big commit since in theory it has no
functional change, and in future can look in this commit for any
code we may want to reinstate.
.. lots of confusion about virtual power based upon speed and
using lack of cadence to show no power -- this is invalid since there
may not be a cadence sensor present!
Not sure why, but setting the text on a treewidget item seems to
cost a lot of memory. So we don't bother since it is never used.
In general the valgrind output is ok, quite surprised. There are
very few non-widget items that are alloced but never free'd in the
GC code.
Train view - race* - out of date and no used
Train view - SimpleNetwork - not used
Analysis view - WeeklySummaryWindow - not used
MainWindow - RideCalendar - deprecated 2 years ago
Removed deprecated / unused code, includes;
- racedispatcher.cpp
- simplenetworkcontroller.cpp
- simplenetworkclient.cpp
Will look at the network stuff in OpenTrainer.
.. wow, nasty memory leak fixed. Leaked memory every
time a ride was selected or calendar was refreshed!
.. tbf it was marked with a 'XXX' memory leak comment
but really lazy to leave it there.
.. was also highlighted by valgrind, which is promising,
since I've been using it to hunt down any memory managment
issues -- most of them are within 3rd party libraries tho.
Noticed when looking for memory/stack overflow issues that
the importRide function allocates an aggregator on the heap
for the lifetime of the method. No biggie, but better to use
stack for that.
Because the image representation was stored in the pixmap
which was allocated on the stack -- it should be allocated on
heap since the underlying data is never actually copied.
This seems to fix the issue, but need to keep monitoring it!
Fixes#477.
Removing and fixing 'XXX' code markers across the ANT+
code. Largely this was to confirm against specs and mark
for future support (e.g. burst data, further refactoring
of the quarqd sources).
.. the code assumes the kickr connection will always work, even
when no BTLE hardware is present.
If no BTLE hardware is available then connections fail immediately
and so do attempts to find devices.
If BTLE hardware is available but the kickr connection cannot be
established in 30 seconds in train view then it returns an error.
Also added better device descriptions to check the device subtype
so we can identify stages, inride and kickr separately.
When switching between a ride with datapoints and one
without, then back again. Editor data was being deleted
for previous ride edited when selecting a ride with no
data!
All are harmless but for the sake of clarity have
fixed them all bar a couple;
- Lucene grumbles about signed/unsigned conversion which
is/isn't valid depending upon the version of CLucene you
compile with. Either way it is harmless.
- QxtScheduleView has a bunch of issues, but since it is a
third party widget its better to leave it unchanged.
The find dialog and anomalies list are now available
from the ride editor toolbar and not hidden in the
chart controls.
As a result the ride editor no longer has any chart
controls and so they are removed altogether.
When plotting distribution for a date range instead of
for a specific activity we should not hide when the current
ride has no data (since we are plotting a range not the current
ride).
A few fixups for BT40 discovery, we now search for BT40
devices properly.
- delete BT40 properly
- scan for longer
- return count of total found
- a few fixups to logic in AddDeviceWizard
Now need to update the pair screen to let the user
select/deselect sensors that are part of this "device".
Then obviously update the BT40/Controller for runtime
activity (and filter out the RFLKT since it will have
its own device type.
Just a checkpoint before BT40 pair updates to connect with
each found sensor and display current data on the pair screen.
This is so the user can select the devices they want to be
included in this device definition (if they have lots of
BTLE devices).
I guess this is gonna mostly be dcrainmaker and wahoo employees!
Ensure the Kickr and BT40 devices can co-exist by
ignoring subtypes.
Also introduced a deviceFound signal so we can get a
device pairing page for BT40 (non-Kickr) devices.
To enable support of BTLE (BT 4.0 'smart') devices
as well as the Kickr.
Very basic skeleton code to get started. Will need
to;
- add a BTLE 'pair' in AddDeviceWizard
- use profile not portspec for the uuids
- filter out RFLKT and KICKR as they have their
own device types
- fixup BT40.cpp which is KICKR code in this commit
Changed the WF API wrapper to return a sensor connection
descriptor (int) in the same way open/close system calls
return a file descriptor.
This means we will be able to setup multiple connections
at once .. but not neccessarily in separate threads.
No need to scan first, connect directly to
the previouslt paired device uuid.
By no longer scanning we can have multiple
threads connecting at once without conflicting
with each other.
The load setting was not working properly, this update
ensures the load is set 10 times a second, but will
generate errors even though the device claims to be
connected.
Also added a few new methods to get/singal connection
status in the code.
Fixed up the Kickr code to resend the load if the
user is generating more than 50% over the load or
is only generating 50% of the load.
This is in case the last message was not processed
for some reason (connection being established, or
noise).
Just cleaning up the WF API code before adjustments to
the recent BTLE support or Kickr to also support other
BTLE devices (e.g. Speed/Cadence and HR straps).
This will mean adjusting the WF API code to use 'handles' to
reference multiple parallel connections since the existing code
assumes a single connection to the Kickr.
A number of memory management errors fixed, no doubt there
are more lurking in there.
* CocoaInitializer now sets up an application wide NSAutoreleasePool
* Kickr now init/releases an NSAutoreleasePool for its thread
* Local autorelease pools in constructors etc have been removed
* Searchbox and Button no longer release in the constructor
The icon corruption seems to be improved (I think it is a memory
management issue) but has not been totally removed.
I changed the fixed height of the allplot reveal
controls and forgot to set it back. It leaves a
little artefact on the plot when they hide.
I took out my edit and it fixed it.
After discussion with Damien;
* solid white background for the controls looks best
* CP on chart labels need to be less obtrusive
* keep the controls to a simple but useful set
I also tidied up some of the margins since they were
also wrong.
.. when plotting QA or Scatter plots we frame
intervals with all points of data. By default this
has been black.
.. this tones it down to be less high contrast. But
really we should make it a configurable color longer
term.
This finalises beta support for the Wahoo Kickr
using their WFConnector API for BTLE.
This support will only work on Mac OSX - pending
ANT+ support to be available and/or BTLE support
is made available on Windows and Linux.
Fixes#446.
.. connects and disconnects to the Kickr
.. gets instant telemetry
Still need to sort the other channels (are there
any?) and also set load and gradient.
Pretty close and need to then clean up the qDebug
messages and we have a first pass at Kickr support.
It was because the connector was still searching when
asked it to connect to a sensor. We now cancel any
search before attempting to connect.
But sadly, the connection is dropped and a bunch of
error messages popup about firmware.
.. because it blocks the event loop that hosts the WF API
class. And we definitely want it to stay on the main event
loop along with the native WF classes and delegates.
.. because we didn't maintain the currentWindow when
showing blankstate pages the drag and drop functionality
didn't work.
This is kinda key when you have no videos and workouts, its
the simplest way of providing the files needed.
.. needed to manage autorelease pool
Lets not talk about the hours wasted trying
to fixup the code whilst BT was disabled via
OSX and the Kickr wasn't actually plugged in.
Made the spacing in tile mode smaller and cleaned up
the decorations to make them cleaner and more in line
with modern UIs like Win 8 and OSX.
Also parameterised the spacing / margins in HomeWindow
in case we want to add a slidebar to adjust them or
maybe even a zooming.
First pass of using latest WF API (3.0.beta2) but
there are event exception problems within the WF API
so committing a checkpoint.
This has BTLE status and Scan functions implemented,
I also updated About dialog top include the WF version.
Just the framework for the abstraction layer. I
wanted to commit this since its the blank state
and clean.
Now to implement;
1 hasBTLESupport and friends
2 scanForDevices
3 connect/disconnect device
4 getRealtimeData
5 setLoad/setGrade
Once thats done should be easy to write a controller
and runner for TrainView.
Last step will be to add a configuration pane -- but
might wait until I have a BTLE HR strap to include
the 'multi-device' stuff.
.. black controls on a black background might
be cool if you play in a plutonium rock band
from the Gagrakacka Mind Zones, but for the
rest of us its helpful if the controls are
slightly more visible.
A bit of hacking with style sheets and the controls
now change color to contrast with whatever background
color is selected.
Provide more data to Garmin Training Center and
also makes the export compliant with the latest
TCX schema. It displays correctly in GTC.
As an avid runner and biker I use GTC to combine
the data from both sports for additional analysis.
I'm sure others would benefit from the additional
data in the TCX file when importing to other tools.
The following derived/computed metrics have been
added to the export:
1. Added MaximumSpeed
2. AverageHeartRateBPM
3. MaximumHeartRateBPM
4. MaxBikeCadence
5. AvgSpeed
6. AvgWatts
7. MaxWatts
8. HeartRateBPM defaults to 1* (if not present or zero value)
*Garmin training center won't display the HeartRate
charts if the tag isn't part of every TrackPoint and
greater than zero.
.. I broke this in an earlier commit where I set
contents margins to 0, thus making it impossible
to resize in tile mode and also making the chart
overlap with the border.
.. it needs to be applied every time a
date range is selected, so need a new bool
useToToday to flag that up.
Will need to fix the other date range charts
to do the same.
Write a valid TCX file, that conforms to its
schema, including;
- ProductId is ProductID
- Watts must be an integer
- Language ID is required
- PartNumber has a specific format
Add reveal controls to the histogram window, using
the new reveal framework.
I only added a small number of controls, we should
be careful not to overload this feature with a zillion
controls "because one user wants it".
Setup code to enable revealed chart controls. When
in tabbed mode, if the cursor is towards the title
then the chart controls are revealed, as the cursor
moves away or off the chart the controls are hidden.
Each chart, that wants revealed controls must implement;
bool hasReveal() -- return true if controls are available
void reveal() -- show controls (must be at top of chart and a single line)
void unrveal() -- hide controls
Will now work through each chart adding the controls as needed.
Will also probably end up with a 'standard' flat stylesheet for
the controls, can implement this later.
See description for this feature here:
https://github.com/GoldenCheetah/GoldenCheetah/issues/31#issuecomment-12040318
.. now closes train view blankstate when device added
and workouts have been imported.
.. and made the home and diary views have same buttons
as the analysis view. That may change in later releases
when we have planning functions.
The diary, home and analysis blank state screens will
now close if rides are added.
Still need to make the train view blank state screen
close when devices and workouts are added.
Tcx XML HR must be positive, so if there is no
value (i.e. it is zero) then don't write it.
Thanks to Dean Junk for diagnosing this and
posting his findings to them mailing list.
Bug reported by many users, should know better than to
dismiss it so out of hand. There was a bug. The ANT+
code used an old global setting and not the per device
configuration.
Fixes#441
Just wordwrap the labels gives more screen estate to
the right side image making it less likely to be out
of proportion with the text size.
Also changed disc to disk in one of the narrative
texts. Maybe its a 'British English' thing tho ;)
Set the default size of fonts and screens based upon the
screen size we're running on.
We may need to think about retrospectively adjusting the
font size for users that have not realised they can change
from the defaults (which may not be valid for their hardware).
Nothing major, just setting no focus on buttons since
it gives them a salmon pink color, which is pretty nasty
on the 'img' button.
Did I mention that I love this new feature?
Changed the second action to search for videos and workouts
rather than import. It makes more sense to setup the library
rather than import a single file.
We still need to change the conditions for the train view blank
state to no devices or no videos/workouts.
When overriding the duration, time riding and other
time based metrics in the metadata screen it asks
the user for the time in seconds.
This update offers a QTimeEdit to edit them, a little
more user friendly.
Fixes#422
Added chart date selection to the Histogram chart.
This now completes the updates to enable custom date
ranges to be defined in charts that support date
ranges.
Any further 'ideas' for setting custom ranges can be
added into the DateRangeEdit widget and will be re-used
across all the charts.
Fixes#417
To get the date settings to register user interaction
you needed to restart gc after adding the chart. This
was caused by an initialisation error, setting the active
flag to true on object creation -- it should have been
set to false.
.. added a 'This' option to choose a date range
such as this month, week, year. I also added the ability
to specift a 'prior' period.
So in July you could plot for this month prior 1 to choose
a date range for June.
This allows folks to have a static setup of charts for this
this-1 and this-2 months and data to change over time.
Updated LTM chart date range to allow the
user to specify a number of alternative
ranges;
- use current selected
- use current selected thru today
- between x and y
- last n days/weeks/months/years
- from - today
An update to allow users to define a specific date
range for a chart on the home window. This update
only applies to the LTM chart and only allows a
date range from/to to be defined.
It would be nice to also support a last 'n' 'period'
selection too (i.e. last n days/weeks/months).
Also, further updates are required to add similar
functionality to TreeMap, CP, Dist and Summary charts
when they are on the home window.
column names from xml file need to be translated to match translated headings,
other posibility would be to match before translation, but this option needed
fewer changes.
When optimising for performance the measures
refresh was lost in LTMPlot. This reinstates
them.
Additionally, measures are now shown on the
metric list with a "(m)" after their name to
help differentiate them.
For example the notes field on its own tab looks fugly
with a frame inside a tab (especially on a Mac). So this
patch removes the frame and background for a cleaner look.
For some reason when selecting a target directory
for batch export on the Mac the returned value was
always the same as the supplied value.
Fixed via temporary variables, but not sure why it
fixes the problem, tbh.
The Mac button icons would go a bit odd, this seems
to be caused by not setting an alternate image for
buttons (they have two images one for each state).
Base classes should have virtual destructors to
ensure derived classes destructor is also virtual.
This is not a major issue, since in all of the
warning cases there is no base destructor, but
its nice to shutup the compiler warnings.
It wasn't possible to add a season until a user
defined season was available!! This fixes that.
We need to make the sidebar Splitter have titled
handles with actions like this on it (ala QtCreator).
There is a feature request open for this.
I really hate the way QMacStyle changes the style of
a button based upon its size. Its really annoying, especially
since you cannot override it.
Updated last couple of commits to have no effect on Mac where
they make some of the buttons in the preferences pane look ugly.
Put a button on the scope bar to add a chart. This is more
intuitive than the right click menu. The style could be
better but ok for now.
Deprecated the right-click menu option since it is unintuitive
and hidden from the user (i.e. bad UX).
Remember the selected video or workout when refreshing list
on data change. This is particularly relevant when dragging
and dropping in videos and workouts.
- Added drag and drop dialog and functionality
- if only 1 video/workout imported it is imported and selected
- if multiple they are imported with a dialog
- now shows any references in the scan function
The use of references to avoid making copies of videos is
a touch complicated -- the workflow could be friendlier.
It's possible to use macports to install the qt dependencies and this change introduces language to that effect. It describes how to install both qt and the qt-sqllite dependencies.
As reported on the list the cu/usbserial device contains
a non-hexadecimal number (given example cu.usbserial-A2QYN3QJ)
this update changes the regexp to match.
Some fixups to recent update for the workout
library support;
- ergDB download now updates the DB
- mainwindow menu options names more consistent
- sort order in the video and workout list
- hooks for import/drag and drop
Will now write the importer for drag-n-drop and
import workouts menu option.
Always on top hint is not appropriate for the
chart settings since the LTM chart settings
open another dialog -- which then appear behind
the dialog and cannot be moved.
Fixes#401.
Linked up the training db to the train tool to
allow users to select from the db.
Further enhancements to the list could be made,
but leaving this till we move to OpenTrainer.
Still need to add drag and drop to copy into
the library or add reference to the file.
Fixes#301.
My eyes started to bleed at the burst of color
on the cp plot after the introduction of a
linear gradient there. Just toned it down a bit
for the "rainbow" all curve.
Add trainDB sqlite database of workouts and videos
found during a library search. A bit ghetto but
works well enough.
Part 3 will need to;
- update traintool to list contents from db
- allow drag-n-drop of files into db (and worry
about copy to library vs add path).
Don't ask about height/width factor, no-one knows
what they mean and ou can adjust it once added to
the view anyway.
Also, if there are not chart controls don't reserve
the space for them.
Only refresh when dateRange actually changes
within dateRangeChanged() since it is a signal
used by the HomeWindow to ask a replot when
a tab is selected.
Should speed up navigation across diary and
home view.
When dateRange was implemented in LTMSidebar and the property
dateRange was introduced to LTM charts a nasty double and
triple plot bug was introduced.
This update ensures the chart is only plotted once when it is
selected.
Implementing a workout library that keeps
track of media and workouts that can be used
in train view.
This first part implements;
- library.xml to record search paths
- search dialog to find media/workouts
Part 2 and 3 will bring:
- Sqllite libraryDB to store found details
- Update traintool to use libraryDB and display
icons, duration/distance, IF and TSS in list
- import and drag-n-drop of new media/workouts
There were a bunch of preferences that really
weren't needed; STS/LTS starting values were not
being used (and logic flawed anyway).
The mode/days to estimate bikescore were only used
in one place (manual ride dialog) so moved there
instead.
Fixes#396.
ANT.cpp now emits a signal for each ANTMessage
ANTlocalController wires up this signal to a slot in ANTLogger which
writes the message to antlog.bin
Signed-off-by: dhague <darren.hague@fortybeans.com>
Right click to add/delete a new device on the device list
in the train view sidebar.
It is temporary to bring the train view in line with the rest
of GC, but will then be updated as we remove functionality that
is hidden behind a right click.
The recent update to allow CP charts to be added to the home
view and display the cp chart for the range selected did not
update to cater for ride/add delete whilst the season combo
is not set.
As a result when a ride was added/deleted the current index for
the combo was used (-1) to reference the season array resulting
in an fatal assert on array bounds.
Tidied up and enhanced the manual ride dialog. It now
lets users add Sport, Workout Code and Notes (or leave
them blank if they don't use them).
Also added Average HR, Cad, Watts and Speed as well as
deriving TSS and Work.
If there are no rides in the last 'n' days it falls back
to the default for all rides logged.
It also now writes json format files.
Appears to be related to add/removing labels during a paint event,
which is pretty bad practice anyway. To get past this crash the
labels have been removed -- the chart still shades areas to show
the parts of the ride that will be split out, but no longer shows
the number for each segment.
Fixes#379.
The restore / set geometry for the config dialog and mainwindow
was 'adjusted' by setUnifiedTitleAndToolBarOnMac. This meant
that when restoring geometry at startup the window would gradually
decrease in size (by roughly 42 pixels).
Still defaults to the original value of 3 meters. Because
the metrics need to be recalculated when it changes we also
add the hysteresis factor to the zone fingerprint CRC.
Big refactor of the code since it was really messy
and also moved to a Mac style config dialog with
a bit of Mac UI polish.
Moved many of the pages around to make it more user
friendly.
Removed the fortius and proxy code altogether
and removed the measures config since we will need to
look at this in v3.1 and don't want to have to add
backward compatibility support for users that change it.
Fixes#358.
This patch keeps the original english name of SpecialFields and SpecialTabs
as internalName, to preserve compatibility, while it uses a translated
displayName for user interfase in other languages.
The code setting metric names and units was moved from constructors to
an initialize method, to be called after translator initialization.
English Name is preserved as InternalName for metadata.xlm compatibility
in metric override.
Q_DECLARE_TR_FUNCTIONS(class-name) macro is used to set tr() context
when class-name is not QObject sub-class.
When a cell in the treemap plot is clicked they are displayed
in the popup pane also used by the LTM charts.
We do need to tart up the popup, but at least now the treemap
plot does something meaningful.
Fixes#364.
The treemap chart was developed as a variation of an LTM
chart and as a results has the same chart settings etc.
It has now been refactored to be a standalone chart with
no need to re-use the LTM settings and code.
This is also in preparation to support click through on
the cells to show a popup of rides.
When parsing in locale's where numbers use a
',' as a decimal point, strtod fails to parse
lon/lat values.
Thanks to Horst Huschauer for the fix.
Fixes#365.
There were a few metric options on the LTM
chart that were introduced a looooong time
ago when playing with filter ideas.
They don't do anything and will confuse the
hell out of users. They are now removed.
Workaround that by putting new columns at the left
not at the right and the problem goes away. Suspect
it is related to issues with QT and expandLastColumn()
which also displayed issues.
Linker error using different TimeScaleDraw::label but
also a memory leak with unneccesary calls to create a
new ScaleDraw object.
Also applied recent fixes from qwt6 for scale draws. We
should look to pick up some of the other recent fixes
-- especially QT5 support.
Fixes#363.
When adding a chart to the home view no date range is set.
This update ensures that the last selected date range is
used, so when a chart is selected/configured some data
will be shown.
When importing a GTC export (which contains multiple ride
files in a single .TCX) the screen update stalls whilst the
file is split. The import dialog is half drawn and looks
ugly to the user for a split second.
We now delay updates until the export has been expanded
into separate files, which means there is a slightly longer
delay as the file is initially processed, but the screen
updates are cleaner.
Recent commit 8eee2ddb got some of the logic
the wrong way round for converting weight to KGs
before saving (and when switching between metric
and imperial units).
We always store weight in KGs.
Recent update to use deleteLater() when removing
a chart in the event loop /always/ deletes the chart
regardless of the user selection, this is because it
is deleted in the wrong place.
It was deleted when the user selected the close menu
option (in GoldenCheetah.cpp) rather than after the
user had confirmed (in HomeWindow.cpp).
If you press ESC on the chart settings (not add chart) dialog
then the dialog is closed and deleted, causing a SEGV. This
patch overrides reject() to ensure the dialog is just hidden.
The painting artefacts are a problem only on a Mac. Suspect
it is a QT bug. Disabling the bubble on a Mac for this reason.
Its starting to grate anyway, perhaps there is a better way
of doing this.
RideNavigator set the GCBubble to the wrong position on
screen which can be confusing when you have a narrow list
of rides. The bubble appeared to be displaying for a totally
different ride.
The last patch to show events on the LTM chart only
worked when grouping by weeks. This is because the
groupby x dimension is baselined to the starting date;
i.e. groups always start from 0.
This patch fixes displaying events when grouping by
days, months or years.
Events are now maintainable in the sidebar and this
update now plots them on the LTM plot.
Events and season markers are shown so long as they
fall within the chosen date range.
Add the ability to create and maintain events in
the LTMSidebar. This is a follow up to adding
support for Events in seasons.xml.
The last step is now to add support for annotating
charts to show the events for the date range selected
and possibly for the seasons within that date range.
When reading a PWX file we try to guess the recording interval
by looking at the first two samples. This can lead to silly
values when there are recording errors.
This patch sanity checks the recording interval and sets it to
1s recording if the derived value is unusual.
The last of a series of recent patches to address performance
degradation from the introduction of the LTMSiebar. This last
patch introduces a CPX aggregates cache to re-use aggregated
CPX data (e.g. for plotting a specific season or date range).
The cache is set to only hold 25 caches, which should be enough
for most folks list of seasons. But won't get unwieldy if they
scroll around in the diary view.
The following will be introduced in the last patch of
this series:
1. Introduce 'events' within a season and plot them on the
LTM chart -- a form of 'annotation' but also the beginning
of planned events in the future too.
2. Implement click functionality on LTM charts but decide if
we use click to annotate or to define a new date range or
both?
Don't refresh CP, LTM or Histogram plots when dateRange property
is set, if the dateRange was previously plotted anyway. Will set
to stale if a ride is added or deleted too.
This means the replot of tabs is not performed when simply switching
between tabs. But will if the date range does change or a ride is
added or deleted meaning the aggregate needs to be re-calculated.
There is still one more performance improvement required;
1. get RideFileCache to have a cache of recent aggregations.
Since (a) the same ranges will be called over and over by
different charts when a season is selected and (b) there
are only likely to be 20-30 seasons defined in total, so
lets cache them instead of recalculating every time.
Remove the double update from HomeWindow and only
update in CP and Histogram when visible.
Still need to:
1. get CP/Histogram to remember what the last update
was to not bother unless something has changed.
2. get RideFileCache to have a cache of recent aggregations.
Since (a) the same ranges will be called over and over by
different charts when a season is selected and (b) there
are only likely to be 20-30 seasons defined in total, so
lets cache them instead of recalculating every time.
We now have a date range selector in the sidebar. The
sidebar has a date range selector and summary. It is
used to set the date range for the charts in the view.
As a result we can now add summary charts to the home view
and LTM/CP/Histogram charts to the Diary view. The weekly
summary chart is now deprecated.
Creating seasons has also been disabled on metric charts. We
will need to decide what clicking on an LTM chart should do,
and look at whether we want to keep the popup bubble or
adjust it.
There are some unfortunate performance degradations as a result
of this patch when selecting date ranges and switching between
charts in tab view. This needs to be addressed as a priority.
Follow up patches, part 2 and 3 will need to;
1. address performance degradations & cache results
2. introduce events in sidebar and as annotations on charts
3. implement click functionality on LTM charts (annotate vs
define a new season/range)
NOTE: existing HOME, ANALYSIS and DIARY chart setups will need
to be rebuilt since chart ids and properties have changed
in this patch -- do not raise a bug until you have deleted
and re-added the offending chart.
Uses the QT proxy query and application wide proxy setting
to allow users behind a corporate firewall to use network
functions (maps, TP.com, ergDB etc).
Fixes#27.
When adjusting column widths take into account the
contents margins. Also shows sort indicator on the
columns when not on a mac (this was changed as part
of the recent Mac native polish commits).
The mac searchbox using a NSSearchField works a
treat on Mac, but the code accidentally removed the
searchbox on Linux and Windows.
This patch reinstates it.
The mac searchbox using a NSSearchField works a
treat on Mac, but the code accidentally removed the
searchbox on Linux and Windows.
This patch reinstates it.
The ride navigator crashed on search after the new
time column was added. This was caused by incorrectly
setting the groupBy member variable (-1 is used to
indicate no group by, it was set to -2).
In addition to fixing the code to set it to -1 the
array reference now does bounds checking to avoid
crashing for invalid values.
The menu drop down can appear on the list view. This is
now disabled via a window property "nomenu".
Also set the new attribute to set native widgets on a Mac.
There is now a little button to show and hide the sidebar
just like in Mac Mail. We now only have to add the add chart
button for the toolbar/scope bar changes to be complete.
Added a scope bar for native mac. The windows and linux
toolbar is a combined toolbar and scope bar, on a Mac it
looks much more elegant to split the two.
We will need to now add a show/hide sidebar control on the
left of the scopebar (like apple mail), the train view controls
in the centre and the add chart to the far right).
In readiness for a scope bar, the Mac unified title and toolbar height
is too large and needs to reduce. It now has very similar margins as the
Mac Mail toolbar.
The scope bar will make it look less compact when it is introduced.
Adjustment sneaked in by accident to reduce the
font size was hard to track down, but this patch
fixes it and also removes some errant (but harmless)
code in the navigator too.
To give the user a bit more feedback when hovering
over the day number in the diary sidebar it gets a
gray background to feedback it is clickable and also
to give a more fluid feel.
This mimics the same approach used in the Mac cal application.
Thanks to Claus Assmann for the fixups;
- RideNavigator double foreach loops used same name for iterator
- N_TTY line discipline is not defined on OpenBSD (possibly)
Would be nice to have a better fix for the line discipline
stuff, but 0 is usually the TTY line discipline. Bit of a
hack, but ok for now.
The left sidebar is now a stacked widget and the toolbox
has been consigned to history. We are now ready to add a
left sidebar for the metric "home" view.
Main purpose of the Performance manager is to show History up to now -
though, peeking at decline of values in next days is still interesting.
This commit makes the PM show the graph up to today, but still allows to
check the next days.
The toolbar buttons for find intervals, split and delete were
too narrow and looked oddly smaller than the buttons to the
left .. perhaps it was an optical illusion but they are now
wider and look more consistent.
Part of a series of commits to adjust the UI on a Mac to
look more native and conform better to the Mac UI design
guidelines.
This patch introduces a unified title and toolbar which hosts
a search field and buttons for commonly used functions like
import, split ride, delete etc.
Since it is not possible (or more importantly good practice) to
hide and show toolbar items the Train View controls have now been
moved to the sidebar on a Mac. This is a temporary measure and
will be resolved in future updates.
Further updates planned are;
Part 2 - fixup the preferences pane to be more Mac-like
Part 3 - Spit and Polish around the charts; drop shadows, controls etc
Hack to workaround QT webkit pretending to have gestures when
it doesn't is no longer needed. It also now breaks the grab
and navigation in the google map.
Fixes#349.
But NOT for win32 and ONLY on the sidebar and tabwidget (for
performance reasons). Since most users prefer the tabbed look
anyway this should be ok.
Performance of the graphicseffect has improved remarkably in
the 2 years since we tried it before. Worth experimenting with
since it adds a bit of polish to the look and feel.
Users turn it on and off in options, it is off by default.
The ride navigator has 0 contents margins which made
grabbing and resizing impossible in paned mode. This
was done to make it look beter when it is a ride list.
It now has a constructor argument to specify if its
being put into mainwindow as the ride list or its being
added to a view.
You can now add the summary chart to the diary
view to get a summary of the date range currently
being summarised on that view.
Once the Home view has its own sidebar that selects
date ranges you will be able to add it there too
and summarise seasons etc.
To allow charts to have a property set for the date range
to plot a new property is added. This will work in the same
manner as the "ride" property.
No functional enhancement.
The ride list / navigator gets a horizontal scrollbar
every time it is shown as the columns are resized but
not taking into account the need for a vertical scrollbar.
The reasons behind this are more complicated but this
patch fixes this annoyance.
Temporary update just to select the left sidebar whenever
a different view is selected. This will go away eventually
but starts to get closer to the finished concept.
Now need to work on the Home View sidebar.
It should be white to be in line with the rest of the
sidebars and have some semblance of coherence.
I also put a rectangle around the box so if the day
color is white you can still see there is a ride that day.
A summary ala the interval summary will come next summarising
either day, week or month for the ride selected.
The readme hasn't been updated for 3 years and needed
to reference the websites with builds and the detailed
build instructions in the INSTALL* documents.
Drop the notion of a rhs sidebar and move the calendar
from the rhs to the lhs toolbox. It will soon be the
context sidebar for the diary view, and also get a
day summary at the bottom, but for now lets just remove
the references to a rhs sidebar.
The chart settings are no longer in the side bar and can be selected
from a drop down menu on the chart. This works in tiled and tabbed
mode and allows for further enhancements e.g. custom menu options
for commonly use config options (ala Android).
This is part of a series of updates to migrate away from a sidebar
that is a toolbox of ridelist etc and move back towards a context
sensitive sidebar.
Use the wrong stylesheet and are hard to read. This adjusts
tooltip and menu to make them more readable but may not be
ideal for those with heavily customised setups.
The named search dialog box uses the same style sheet as
the search box, which looks odd in a dialog box.
This patch ensures the stylesheet is only applied to the
search box and not any children.
An annoying bug that has been around for far too long.. the ride
list headings are resizable and the user can adjust them. But
when GC restarts the sizes are lost.
This was caused by an error in the code that saved away to column
widths -- it failed to use the logical index for each column (since
columns can be re-arranged).
Now upon restart the columns will be the right size -- but for the
very first launch after this bug is fixed the sizes will still be wrong.
They will need to be reorganised and then restart GC one more time.
The sidebar elements all get a blue focus rectangle on
Mac OSX. This is a platform specific setting. This patch
removes the focus rectangle for sidebar components only.
Having used the LTM and Home View for well
over a year I am proposing this default setup
for the home view.
It is just a PMC, Power tracker, CP chart and
a time in zone histogram.
No time and distance etc. But the user can add
these, the charts.xml is there to help.
Last part of the search/filter functionality;
* SearchBox now incorporates filter and search
with a new widget. We can update this widget
to include more fancy UI/Interactions without
having to change the ride list or charts etc.
* Added search/filter widget to the relevant charts
and screens; Metrics, TreeMap, CP, Histogram,
Activity Log, Ride list (refactored out of MainWindow)
* Added namedsearches.xml and adding/selecting them
from a drop down menu on the search box.
* Fixed some performance bugs related to duplicate
signals and redraw/reprocessing. Also ensured that
CLucene remains optional -- but means no search or
filter functionality unless it is available.
Added evaluation of filters and integrated with the ride list, this
means the user can filter the rides listed.
Additionally the search box will highlight the filter in red if
it doesn't parse correctly, and a tooltip describes the errors.
A bit of tidy up to make the About dialog look a bit
like it used to in terms of size and layout. Is now
an acceptable size for those on netbooks or devices
with a small screen.
The about dialog was 800x600. This patch reduces margins and
spacing around the widgets to make it somewhat smaller. There is
still room for improvement though.
Part 1 of Data filtering, this patch adds the ability
to enter and parse filter statements in the search box
(by clicking on the magnifying glass it becomes a filter
box).
The statements can reference metrics and metadata fields
allowing the user to define boolean expressions to filter
data. An example of the syntax;
Average_Power > 200 and Duration > 3600
This references the metric Average_Power and ride Duration. But
will also support operations on metadata fields, for example;
Workout_Code endsWith "SST"
The operators are;
= <> > >= < <= matches contains endswith beginswith
( ) && and || or
Filters are syntactically and semantically validated. But at
this point the resulting tree is not evaluated, i.e. we can
parse the filters, but do not execute them.
Two further updates are pending (once written and tested):
- Part 2 of 3 : Execute filters and apply to the ride list
- Part 3 of 3 : Allow named filters and apply to LTM charts
Further updates will support a visual editor and allowing filters
to be applied to CP and Histogram charts and affect the PMC stress
calculators.
1. Use the whitespace analyzer so its easier to search for
tokens that are a mix of letters and numbers e.g. workout
codes and TT route names.
2. Search as you type. Since we have very small collections
to search across (typically no more than a couple of thousand)
there is no major overhead in searching as you type.
3. Search all texts by default not just the Notes field. This is
a more appropriate default and is less likely to confuse new
users. In addition, it is most likely what most users want to
do anyway.
The Macports lucene does not work, added instructions
to the INSTALL-MAC for getting and building the clucene
libs from their git repository.
Fixes issues with deleting rides corrupting the index.
There are some issues with document deletion and support for
the latest release of CLucene which may be related to having
concurrent IndexWriters and IndexReaders.
This refactoring works fine on Linux. Pushed for safety for
any users that may be experiencing issues when deleting rides.
Further investigation is required on mac and windows builds.
QT crashes if exceptions are raised in the event loop. This was
happenning during program exit and also when deleting rides with
a right click.
This patch traps those exceptions and also, since Macports will
install 0.9.23 we can use IndexWriter to deleteDocuments.
A bug was introduced by the new search/filter update causing the
ride list to not get refreshed when rides were imported or deleted.
This was due to signals from the source model (sql) not being propagated
upstream (groupby) in the standard implementation of qsortfilterproxymodel.
This patch fixes that.
Added virtual power calculations for a Minoura V100
with one selection for whichever gear it is set to.
Thanks to 'frenchman' on the slowtwitch forums for
working out the formulae.
When calculating TSS, BikeScore et al the user can
set a ride specific value for CP to override the
default zones set within configuration (power.zones).
This is because some users like to have a different CP
for indoor vs outdoor riding.
To use this the user will need to add an "CP" metadata
field and only enter a value when they want to override,
since by default it will be zero, causing the standard
zone CP to be used.
Last commit added a new metric but didn't increment the DBAccess
DB schema version, causing DB functions to break. This patch just
increments the version to ensure the DB is rebuilt to include
the new metric.
A few months ago I commented out the calculation of metrics
for manual ride files. This was a hack to avoid fixing the code
to handle metric calculations from overrides where there are no
data points.
This annoyingly meant that the 'rides' metric was zero for manual
ride files, and any derived metrics similarly were zero.
This patch fixes that.
Fixed up the code to use withings weight when calculating watts
per kilogram and the display on the CP chart.
There will be issues when retrospectively refreshing data from a
withings account, but that is such an edge case we can just ask
people to delete old .cpx files to ensure they are refreshed.
Re-enabled the measures feature, largely to allow donwload
from Withings for folks that track weight.
This is to provide better support ahead of showing watts/kg
on the mean max "CP" chart.
so far, the Performance manager restricted the view to the latest exercise
or today. So it wasn't possible to see predicted TSB for the upcoming
days.
This patch allows me to get a better forecast on when to do the next ride.
This might be meaningless for actual analysis, but helps to match numbers
of devices, that exclude time with zero power from the average
calculation.
While it's controversal to be usefull, this leaves the choice to the user.
Although you should not link with local compress
libraries if you are using the QT supplied ones, it
has caused a lot of problems for newbies.
We now link with compress by default, we may see some
odd / incorrect behaviour with images and TrainingPeaks
upload if the libs mismatch but the developer can fix
that should it arise.
Fixes#668.
Fixes#6.
The qollector binary warning message is not relevant to large
numbers of GC users and not sure if the qollector is even still
being sold.
The message is now removed.
power zone settings dialog allowed new entries with CP=0. This was written
to power.zones, but the parser refused to read these files, afterwards.
This patch rejects new zones with CP=0.
Find interval dialog will now allow you to add
intervals by time or distance (e.g. add interval for
every 10 minutes or every kilometer).
Since there were three menu options all doing similar
things, they have now been consolidated into a single
dialog.
- incorrect RegEx to read some CRS files
- all files were assumed to be metric - (UNITS = ENGLISH) now converts
- scaling adjusted to not clip the top when some graphs were longer
There was a unit conversion from km->miles being applied to cadence. I have
removed the offending line.
I've also changed the precision so the we report cadence as an integer.
Fixes#601.
Upgrade to QWT 6.0.1, but still uses a locally patched copy
since support for 8 axes has not been included, despite it
being a relatively simple patch.
Fixes#634.
Fixes#567.
oops, overwrote the startTime, accidently. Wondering how this passed any
testing as this resulted in all blocks being skipped.
Added explicit initialization of wanted field, aswell.
turned statusCallback into a member of Device (instead of a parameter to
download() and preview(). This allows all methods to access it, directly
and provide better feedback during open/close/erase.
The patch that was applied was missing a number of critical changes
and needs to be recreated and retested. The majority of qwt was not
uplifted and remained at Qwt 5.
This reverts commit e97aac7919.
didn't have enough precision.
Found all (most) of the gps coord to string conversions and used a constant
to insure all conversions occur with the same precision.
Signed-off-by: Greg Lonnon <greg.lonnon@gmail.com>
Andy Bryson's fixes for quarq power spikes removed
processing of standard power messages (see commit
cc0bd29).
This was because a check was performed on ANTMessage::period
which is not set for Standard power messages and will always
be zero.
This may fix processing of power2max power telemetry.
Includes:
- Resize dialog for Mac users to display all fields
- Modify display of data in fields
- Add Average HR check
- Base code formatting to remove tabs
Fixes#622
Changes to src.pro are to make it so that anything that is set in src.pro
can be overwritten out of gcconfig.pri. This hopefully means that src.pro
will never have to be changed by someone wanting to compile the code using
a different setup to the main developers or on different platform.
Changes to gcconfig.pri.in are to allow the changes in src.pro to be used.
It also adds some new tweaks and documents how to use the changes in the file.
A rudimentary calendar, not customisable or resizable
and only every selects first ride for the day selected.
But it is the beginning of the widgets needed for the
new UI "look" discussed on the list.
Need to work on font sizes for Win/Mac and refining
the whole look and feel. Especially a sidebar widget
to put it in!
Fixes#369.
Last vestiges of references to the old .notes file which
is now deprecated fully and replaced with a metadata tag
"Notes".
If a .notes file exists it will be read in and used to
initialize the Notes metadata tag -- this is pre-existing
functionality and not changed with this patch, which is
just related to LTM Popup.
There are no other know references to the old .notes file
left in the active code.
Fixes#179.
Allow the user to add a chart from the top-level
view menu, or by right clicking on the home page.
I did not implement as right click on toolbar since
there is already an add chart icon on the toolbar
and adding right click is kind of redundant in that
case.
Fixes#606.
The recent AddDeviceWizard exposed some of the
Quarq devices which are possibly experimental.
Commented them out in case they re-appear at a
later date.
A timing issue - when cancelling the background scan
it is possible for the next scan to be performed after
the controller has been deleted.
This is an edge condition and pretty rare, but since it
causes a crash pretty high impact.
The logic for the AddSearch page (which only appears
if the user did not have the device connected when the
initial scan is performed) would find the device and then
terminate without moving on to the final page.
If you define GC_WANT_ROBOT in gcconfig.pri then
we will compile with support for adding a null
device (robot), which is useful for developers
when testing.
See the last line of gcconfig.pri.in.
You will need to touch DeviceTypes.cpp after
modifying src.pro and before typing make.
The initialisation of the new 'channels' member
was being set inside LIBUSB conditionals. This
means when built without LIBUSB channels would
not get initialised.
The interval view now allows the user to drag and drop intervals
up and down in the list.
We could extend the drag and drop of intervals to support analysis
of segments/intervals from multiple rides in the future too.
Fixes#405.
ANT+ telemetry data processing in ANTChannel now
checks for previous message period values.
Fixes#607.
[Tested by author on Quarq cranks, error not recreated
on SRM or Powertap devices, but may be Quarq specific]
Introduce a wizard for adding realtime devices since it
is prone to user error, is relatively complicated and is
something most users will only ever do once or twice.
There are several logical updates within this patch:
First; Fix intermittent ANT+ not working
* LibUsb - check bufRemaining is > 0 not non-zero
* LibUsb - Always reset the USB stick on open
* ANT.cpp - Support > 4 channels on USB2
* ANTChannel - Do not use pairing, but always
* unassign, assign and set channel id.
Second; Fix device discovery
* Find and discover support in realtime controllers
* Extend Serial.cpp to cover more Serial devices
* Support for 4 or 8 ANT channels for USB1/USB2
Third; Introduce Add Device Wizard with
* General and Specific wizard pages for each device type
* Device pairing with telemetry display
* fixed compile time warnings
Fourth; Update Device Config Page
* use wizard to add new device
* remove edit fields, replaced by wizard
* remove pair, firmware buttons replaced by wizard
Fifth; Deprecate/Remove Device Types
* Null Device - used by developers only
* Quarqd client - replaced by Native ANT+
* GC Server - not implemented yet
I have also introduced a device specific wheel size
and flags for controlling the default selection and
sources for sensor data when in multi-device mode. These
are not yet supported in the code.
Fixes#611.
Fixes#497.
More complex than I had hoped for, to add
Temperature I needed to;
* introduce two new metrics Avg/Max temperature
* adjust metric conversion to include a conversionSum
for the C to F conversion
* handle temperature as a metadata field as well as a
ride data series
* handle the RideFile::noTemp value rather than just
averaging or calculating max.
Fixes#603.
Thanks to Peter Norberg for the sample data export
files. This support has been written against the
two files supplied.
if the export has imperial/metric conversion options
then this support will need to be adjusted to cater
for different units.
Fixes#322.
Recent update to support distance calculation from
speed and time erroneously assumed speed units of
kilometers per hour. The docs state that speed is
represented in Meters per Second.
Apologies, and thanks to Walter Bürki for his
perseverance with me on this one.
Fixes#598.
Low cadence values (<30) lead to very high
AEPF values. In reality, these very low
cadences are sprious, since they can occur
after freewheeling (the sensor cannot
differentiate).
We restrict the AEPF scale on the PfPvPlot
to 2,500N which should be meaningful for
most humans.
The seasons class emits signals to let
everyone know if the season config changes
at runtime.
The recent patch to add configuration of
seasons deleted and re-instantiated the
seasons member in MainWindow which breaks
updating across the code.
This patch fixes that.
Standard power messages include an instant cadence
value which we ignored. We should use this if it is
available.
Fixes previous attempt by setting Cadence rather than
wheelRPM with the instant cadence value (!)
Fixes#556.
So we can calculate speed from wheelRPM when working
with ANT+ speed sensors in realtime.
The config screen is still ugly as hell, but there is
another bug raised to resolve that.
Fixes#529.
It causes significant performance issues when
pasting complex font information, we only allow
plain text since we only serialise the plain text
elements anyway.
Fixes#599.
Allow the user to add,delete and reorder
seasons in the config dialog.
Although the user could create and manipulate
seasons / date ranges in the LTM chart, this
provides a more coherent place to do the same
but also adds the ability to re-order seasons.
Fixes#399.
It was removed when we had a serious bug
that caused a crash when adding a chart.
That turned out to be related to mouse
event processing and drop shadow graphic
effects.
We can remove this is folks don't like it.
QT-BUG 22574 suggests there is a problem with the
QMacCocoaContainer on 4.8 RC 0. This is a quick workaround
for those building against the 4.8 release candidate.
When using the fast forward and rewind buttons for
a workout we now also fast forward and rewind the
video playback on Linux/Windows.
The same feature needs to be incorporated under
Mac where we use QTKit for video playback.
Fixes#594.
Fit ride file contains samples where the distance
is set to zero, even if the previous sample is
non-zero.
The parser has been adjusted to keep the previous
distance used when a zero value is encountered.
Fixes#544.
As a precursor to more sophisticated workout
creation and config, the ergfile format and
plot now supports named intervals.
This is so we can identify blocks of the workout
and reuse them by name (rather than having to
select a section, which should also be supported).
Added a usb_init() call prior to starting a workout, this
appears to clear state inside libusb.
Also added some commented code for displaying diagnostics
when sending/receiving ANT messages.
This should make the ANT+ connection more robust on first
use, since subsequent uses are now fine.
This may be related to the state the USB host controller (stick)
is left in after we first connect, more investigation is required.
It was neccessary to reset the USB2 stick between
sessions. This was due to incorrect state data
being maintained within the ANT code.
New sessions should start without requiring a USB
device reset or running ANT agent etc.
Fixes#558.
The recent commit for multi device support cleared
the spinscan data, breaking the plot updates. This update
retrieves the spinscan data if a computrainer has been
selected for the workout.
The TCX parser ignored samples where distance
is zero even when speed and time are available.
This broke reading files from TrainerRoad.com.
Fixes#580.
The metric aggregator did not clear the "errors"
string list when refreshing metrics. This caused
the Json parser to always fail if preceding files
had warning messages.
This was quite common with fit files.
Fixes#552.
It is now possible to select multiple devices to
workout with.
To enable multi-device support a new setting in
tools->options (preferences on Mac) allows the
user to enable multi-device selections (this just
enables the user to select more than one device
in the side bar).
When a workout is started the user can select which
devices will supply which data.
This enables ANT+ devices to override information
provided by Computrainers or Fortius devices.
Fixes#578.
Allow data smoothing, which is particularly useful
during bike fit sessions to watch trends rather than
micro changes.
Also allow the user to select which data series to
plot. This allows you to open multiple plots for
each series.
Forgot to increment the power channels count, which
mean't that the alternate power device was not set.
Also now allow for scanning for same device types on
multiple channels.
The realtime plot was originally set to only show the
last 10s of activity to reduce CPU overhead.
In reality, the CPU overhead for the plot is minimal,
especially when anti-aliasing is disabled.
This update modifies the plot to show the last 60s of
data, instead of the rather restrictive 10s.
Add support for dual ANT+ power devices (in this case using
dual track SRM cranks). The two power devices are assumed to
represent power and alternative power.
The following changes have been made for this support:
* ANT+ device profile support multiple power devices
* Allow editing ANT+ device profile on Mac/Linux (it
is already available on Windows)
* When a second ANT Channel is assigned to power it is
set as alternative, and updates alternative watts
* RealtimeData now supports Watts and AltWatts
* AltWatts dial and associated color settings
* LRBalance dial to show difference between Watts and AltWatts
* Realtime plot plots watts and altWatts
Fixes#572.
Since it can be confusing to new or occasional users, the
workout directory now defaults to the top-level GC directory.
This kind of makes sense since it is shared across all cyclists
and is guaranteed to exist, and will still work when running
from a USB stick.
When we get round to implementing feature 193 and 570 we can
adjust this to suit.
Fixes#571.
Added a menu option to quit all windows rather than
just the current one.
Each window will process a close event and so give the
user the option to save changed files and cancel closing
it.
Fixes#566.
Now only shows monthly view, since;
* qxtscheduleview (weekly) has too many bugs
* rideSummary (ride) is redundant, just add that window to the view
Fixes#546.
Aside from just expanding the sidebar to show it, this update
creates a bit more space for the display of best values in
the CP chart controls.
It would be better if the tooltip also showed the date.
Fixes#565.
For expoediency the training dials used the qwtplotmarker
color but this often lead to things like lap, time being
displayed in black on a black background.
We now have a realtime dials default color setting in the
appearances pane. The default is gray, so will show up on
a black or white background.
The slider in the controls should only be shown
for HR/Power/Cadence. Additionally, it is more
of a 'smoothing' (rolling) average, so the text
has been changed to reflect that.
This is to avoid confusion with the other series
entitled Average Power. Average Cadence and
Average heart rate - which are averages for the
entire ride.
Tom Compton of AnalyticCycling.com has provided
a formula to calculate virtual speed based upon
slope, weight, power, cdA, crr and air density.
This is now implemented as 'Virtual Speed'.
It is expected that this new virtual speed will
be used to control streetview, video rendering
and future implementations of group riding over
a predefined course.
Fixes#527.
Recent fixups introduced a delay of 50ms when
reading from the Fortius controller to avoid
interrupt write errors.
The smoothing of power data was not adjusted to
take into account the reduced frequency of
telemetry updates.
We now smooth at 16hz not 60hz.
By default the TrainingPeaks.com download dialog will
fetch the last year of ride files. This can take a long
time for some users. We now only ask for the last month
by default.
Fixes#561.
When selecting the speed tab on an imported ride-file, GC exits
with the following error on the command- line: ASSERT failure in
QVector<T>::operator[]: "index out of range", file
/usr/include/qt4/QtCore/qvector.h, line 347.
File: PowerHist.cpp on line 393
low has value -5.55111512312578e-17 which is like -0.0000000000x
This caused an out of bound error on array lookup.
Fixes#551.
To work with Tacx Fortius on 32/64 bit platforms without
having to install the Tacx software (which requires the
user to pay to upgrade to TTS2/3/4).
Fixes#550.
Under Mac OSX the Tacx Fortius support needed
a few minor tweaks;
* sleep 60ms between read/write operations to
avoid interrupt errors
* clear_halt on read/write endpoints before
attempting to read/write to the device
* remove the errant usb_reset which really should
not have been called in LibUsb since it deletes
the device structure(!)
The LibUsb class has been modified to clear_halt
when opening ANT devices too -- since regression
testing on Mac showed that a) you need the latest
drivers to work with a USB2 stick on Lion (64bit)
and it now appears to mandate a clear_halt when
opening the device (but this may be related to the
Garmin ANT agent leaving it in an unknown state).
The LibUsb (and possibly other classes) need to know
what operating system we are running on at runtime. In
the past this has been achieved with lots of #ifdef pre-
processor conditionals, but this makes the code quite
difficult to read in places.
This patch introduces the variable OperatingSystem and
it can be one of WINDOWS, LINUX, OSX.
Initial support for Tacx Fortius devices.
Note this requires libusb support to be present and will
work on Linux, Mac and Windows.
The handlebar buttons up/down will increase/decrease the
load/intensity in a similar fashion to the +/- keys on
the Computrainer controller.
The cancel button will stop a workout and the enter key
is used to mark a lap.
Slope and Ergo modes are supported, but we do not set the
brake at all if the speed is below 10kph, this is to
ensure it does not get burnt out when users 'grind'.
SPECIAL NOTE:
The Fortius handlebar controller is a Ez-Usb device
and requires firmware to be loaded when it is connected.
Since this is copyrighted by Tacx BV we do not distribute
it, instead, when the user sets up a Fortius device they
must also provide the file. Full instructions on how this
should be done are given when configuring the device.
Additionally, for Linux users udev rules should be added to
ensure that the USB devices are accessible to non-root users.
Fixes#538.
Computrainer spinscan memcpy() used offsets
but failed to declare the datatype used by
pointers.
Interestingly, some compilers will assume a
void* points to a byte, whilst others will
rightly complain.
This patch adds support for temperature and slope
across the ridefile readers.
For the most part their is no functional change
although it is now possible to view and edit these
data series in the editor.
File formats that can provide temp or slope include;
.bin, .fit, .srm, .sync, .wko
Further updates will be required to display the data
in the ride plot and histograms.
When working with ANT+ devices the load dial always
showed zero, because the ANT device was not updating
the realtime data with the desired load.
In addition, the target load telemetry always showed
watts even when working in slope mode (where it should
show the gradient).
Fixes#532.
I finally got round to decoding the spinscan data
from computrainers. This is now implented in train
view.
A new chart is available 'Pedal Stroke' to show the
spinscan data returned by the computrainer.
I am unsure if the decoding is 100% on the money but
have been testing for a week and it seems ok.
Fixes#530.
Passing a filename with spaces in it causes some issues
on WinXP/2003, this patch converts all filenames to valid
URLs (which is the preferred way to reference media in VLC).
Specifically;
* The file path is prepended with file://
* backslashes in filenames are converted to forward slashes in URLs
* Spaces are converted to %20
Return value when out of bounds had a fencepost error. Annoyingly
it is exactly the same fencepost error that was fixed in a line
of code 10 lines lower in the source.
This fixes rare issues with rides where intervals start at the
end of the ride file. This can happen with rides that have been
split.
A new menu option added to download workout
files from the ErgDB. Will also need to look
at upload so we can share amongst the GC
community.
Fixes#521.
A menu option to upload ride files to the Strava website.
Original code from Justin Knotzke ported to v3 by
Damien Grauser.
If the ride has already been uploaded the upload menu
option is disabled, once uploaded a tag is set in the ride
with the strava id.
Fixes#519.
Pressing F3 on the handlebar controller now starts calibration
mode and pauses all video and recording. Pressing F3 again will
resume the workout and restart.
Fixes#392.
Eric Brandt provided a fix for the new FTDI adaptor
sold with Computrainers from late 2009. It only fixed
the problem under Windows.
This fix applies the same modification to turn off
hardware flow-control for Linux and Mac.
Fixes#523.
All the existing wpk metrics concentrate
on the wpk for a fixed period, which is great
but we should also support it for an interval
(where it is arguably most interesting).
This patch fixes that.
Fixes#467.
They are horrible. We need a better solution. The
"smart" layout was the wrong solution and everyone
hated them.
We need some ideas about how this should work.
Some users often switch between v2 and v3 of GC. Either
because they are testing or they are transitioning from
v2 stable to v3 development builds.
But at launch the metricDB is refreshed each time, since
the v2 and v3 metrics are so different.
To avoid this, from version 3 the metricDB file will be
called metricDBv3 to avoid conflicting with the original
metricDB file.
Fixes#376.
The show/hide sidebar, Toggle Tabbed Mode, FullScreen
and Add Chart buttons now have a tooltip to help explain
what they do.
We still need better icons too!
Fix compile on Mac SDK < 10.7, silly initialisation
of fullScreen in MainWindow when it doesn't exist
and fixup gcconfig.pri.in definiton of GC_HAVE_LION.
When building with the latest Xcode their is a conflict
between the QtMacSegmentedButton cocoa container and the
same declared in QtMacVideoWindow.
This patch removes QtMacSegmentedButton since we do not
use it. There appears to be a container in 4.7 anyway
so we no longer declare our own.
Video and FullScreen are fully operational now on 10.6
or higher using 4.7.4 or higher of QT.
The add chart menu had the ride plot on home
and charts were ordered in a relatively random
order.
This patch orders the charts by relevance for the
particular view and moves the 'Performance' chart
to the Analysis selection.
We have previously written a walkthrough for building
on Windows and Linux, we now have a walthrough for
building on a Mac.
INSTALL-MAC is in the top level directory is a plain text file.
The TimeScaleDraw declaration and definition in
ErgPlot.h clashes (silently) with the definition
in PerfPlot.h.
This caused a SEGV at runtime, but only with some
build tools (but notably Xcode on Lion). Not at
all sure how this has not arisen before.
ErgFilePlot now declares as HourTimeScaleDraw to
avoid the clash.
Mostly caused by the Nazi style police in Cocoa wanting
huge margins etc. Steve knows best. Now uses the Windows
style for toolbar buttons so we get control back from
you know who.
The group by model gets called by the view with a row
number -1. The code didn't check it was in bounds, which
causes a crash with Qt4.8, possibly a bug in 4.8 but a
bounds check is pretty harmless anyway.
Instead the defaut layout now has the ride summary
and details as the first chart in analysis view.
Funny how we've come full circle back to the original
layout. Kinda reassuring I suppose.
Also fixes SummaryWindow splitter handle being rather
ugly.
Fixes#518.
The drag and drop function for adding charts may
be functionally appropriate, but it is not intuitive
for new users.
This patch moves the add chart function to the toolbar
as a drop down menu. it also makes the chart selection
context sensitive - so on training view only realtime
charts are listed.
Fixes#517.
If no workout is selected (and ERGO/SLOPE mode are also not
selected) then the plot does not extend once you workout
beyond the first hour.
This was due to an uninitialised variable (ergFile) this patch
fixes that.
Fixes#515.
The .pgmf file support needed to set the workout mode but
that was missed.
Now tested the Train View with some Tacx ErgoVideos and they
work perfectly.
Added a button to toggle fullscreen on the toolbar. Not on
a Mac though since it is in the titlebar.
Also made the view buttons slightly larger. We desperately need
some nice icons / branding for the UI.
Fixes#513.
To switch between tab/tiled mode the selector has
been moved from the homewindow to the toolbar. A
menu option to select tab/tiled mode has been
added to the view menu.
I have also added icons (that change) for show/hide
sidebar and tab/tile select. The show/hide sidebar
check was not being changed when you use the toolbar
button, this has also been fixed.
The scroll view mode has been deprecated. (But the code
has been retained in case we decide to re-introduce it).
Fixes#512.
When the samples in a ride file start from a large offset
e.g. 6hrs is the timestamp for the first sample. The
ridefilecache will compute bests over the initial 6hr
gap.
This patch adjusts the timestamps so they always start
from zero, but only when calculating bests -- it does not
modify the ride data.
We may want to consider 'automatically' fixing this during
ridefile reading, but for now this fixes a nasty bug that
causes GC to hog CPU for large periods of time when computing
the cache.
Fixes#510.
VLC will disable the screensaver during playback. This patch
exploits this functionality bringing it in line with the Mac
builds.
One small nit remains; under Windows/Linux the screensaver
is only disabled if video playback is being used, whilst on
the Mac the screensaver is disabled whenever you are active
(e.g. on a basic workout or streetview).
The Tacx ergometer has a workout file format
(.pgmf) that is similar in concept to the
Racermate .CRS/.ERG/.MRC file format.
This patch adds support for this kind of
workout file.
Further work is required to support the .rlv
file format in order to support video playback
to match the user's speed (keeping the video
in sync as you ride).
In addition, for Turbos that do not support
variable load using gradient/slope we will need
to add an algorithm to approximate speed from
power/weight/slope.
Fixes#382
When compiling the Mac video stuff on Lion with SDK10.5
the code used a pre-processor directive to include code
based upon the max version allowed.
But if you are using an earlier SDK the max version allowed
is still higher, so instead we use the GC_HAVE_LION define
instead.
This change only really affects anyone on Lion or higher building
with an earlier version of the SDK.
Because black does not show up against a black background
(the default for a ride plot).
This was not a big issue, but it is used by the train view
as the color for the timer and results in black writing on
a black background.
This might be cool if you're in a band called Disaster Area
but not so cool if you want to ride your turbo.
The "tabs" of the toolbar are now offset to the right
and fixed with a specific spacing.
Similarly, the training view buttons are fixed to the
left.
This ensures that the "tabs" don't move as toolbar
buttons are added/removed.
This removes the flickery artefacts when moving away
from train view and also gets ready for more specific
buttons on the other views.
Updated the realtime view (Train) to put the
realtime controls in the toolbar and removed
the old realtime controls chart. They only
appear in Train view.
Additionally, the workout list and media list
are now in the sidebar under 'Workout Library'.
Finally, the first device configured is always
selected at startup, but this is a temporary
change until the realtime device wizard is coded
to set a default device.
A few minor fixups for Mac OS X;
* LionFullScreen.mm compile issues resolved by introducing
a new define in gcconfig.pri. This will hopefully go when
issues with Qt and AvailabilityMacros are resolved. See
DEFINES += GC_HAVE_LION in gcconfig.pri.in
* The buttons on the realtime controls are now set to GTK to
avoid Qt constraints regarding spacing and format of
QPushButtons. This will hopefully go when we move the controls
to a task bar at the bottom of the screen.
A number of new features / enhancements;
* Display IF/TSS or Elevation/Grade in the controller
when a workout is selected.
* Added buttons for forward/back which emulate the
forward/back from a computrainer controller
* Added a slider to increase and decrease intensity/grade
on-the-fly (during a workout), tied in with the
computrainer controller's + and - keys.
* Unpicked the manualOverride code previously implemented
Mostly, or at least for this release, fixes#494.
The original ErgFilePlot code used local static variables
to bridge between the selected ErgFile and the Qwt data
handlers.
This was not an issue when we only allowed one chart of this
type to be available at once. But now, with a more configurable
layout it is possible to have multiple.
The currently selected ErgFile can now be referenced from
MainWindow in the same manner as the current RideFile can.
This patch introduces no functional change for users.
The train view video/media list is constructed by attempting
to parse any file found in the workout directory. This was
a strategy to avoid missing files with odd extensions that
could be processed by VLC and also to avoid needing to
maintain a list of common extensions.
In practice, this was very slow to process and quite annoying.
VLC would load large volumes of DLLs and Codecs when trying
to parse.
In addition, the most common file types /by far/ are from
a relatively short list i.e; .mov, .avi, .mkv, .mp4 etc.
The strategy is now adjusted to search for a common list of
file types, namely;
3GP ASF AVI DIVX FLAC FLV M4V MKV MOV MP4 MPEG MPG
MXF Nut OGG OGM RM VOB WAV WMA WMV
The filename is checked without case sensitivity, i.e. files
will match regardless of whether they are in upper or lower
case (or combination of upper/lower).
The libvlc options setup used --extraintf=logger, which
causes a debug console window to be opened on Windows.
This patch removes this since debug output is only of
value to developers and should not be in released code.
When a workout file is opened, the contents are used
to calculate the NP,xPower thru TSS/Bikescore values
for the workout.
This is in preparation for on-the-fly adjustment of the
intensity of a workout and displaying the target stress
load (TSS/BikeScore) the workout will produce.
No user functional change.
The refactoring of the realtime display last year
removed the display of metrics such as BikeScore and
kJoules.
This patch adds more metrics that can be displayed;
* Averages for; power, hr, cadence, speed
* KJoules of work
* Coggan Metrics; NP, TSS, IF, VI
* Skiba Metrics; xPower, BikeScore, RI, Skiba VI
Also included is an updated default layout to
include some of these metrics.
Fixes#231
We call usb_reset between sessions on Linux/Mac
because the USB device is left in an undetermined
state after close. In the comments I noted that
it was odd this was not required on Windows.
Well, it turns out it is not available on Windows.
This patch ensures we do not try to call it when
compiling for Windows.
Add support to toggle full screen mode on Linux
and Windows, in similar fashion to the recent
update for Mac OSX Lion.
A new view menu option to toggle full screen has
been added in lieu of the Mac titlebar icon on
either Win/Linux. Additionally, hitting Function
key F11 toggles fullscreen and hitting ESC whilst
in full screen also returns to normal.
Even if the C pre-processor will remove a class definition
in a header file the QT moc utility will still create a
moc_Xxxx.cpp file which requires the class to be defined.
As a result the attempt to create an empty header for the
LionFullScreen class when compiling on earlier versions than
Lion causes issues.
The LionFullScreen class is now always declared and defined
but will be not do anything useful on earlier versions of
Mac OS X than Lion.
Temporary modification so non-OSX builds work (Linux/Windows).
The header was added to the main HEADERS += entry due to problems
with moc runs when added conditionally.
Will test on OSX and make further updates if needed.
Because of a bug in qmake we add LionFullScreen.h to the
list of headers to ensure moc is called for the include.
When adding AvailabilityMacros.h to the header it needed
to check that we were compiling for a Mac.
LionFullScreen used this macro to determine if the version
of the SDK is recent enough (Lion or higher).
Unfortunately, I forgot to also check if the OS was Mac OSX
and didn't include the correct header (AvailaibilityMacros.h)
to get the define. As a result all builds on anything other
than OSX Lion failed.
The Cocoa header defines an array called 'slots'
that conflicts with the QT macro (which replaces it
with whitespace).
Re-ordered header includes to avoid the macro clash when
compiling on SDK10.4 or earlier.
Building for versions of OSX prior to Snow Leopard
fails since QTMovieOpenForPlaybackAttribute is not
available, this patch makes this setting conditional
on build support for OS X >= 10.6.
Previous commit only cancelled fullscreen mode
when Ctrl-Cmd-F is pressed, but the common usage
is for the key sequence to toggle fullscreen
on and off.
So we can build on earlier versions of OSX. To improve
things a little since we will no get QuicktimeX without
this reference we now set QTOpenForPlaybackAttribute to
get at least some optimisation.
Mac OS X Lion introduces support for fullscreen applications
and places a fullscreen button on the title bar and animates
etc.
This patch adds support for fullscreen mode. Since there is
no standard way of exiting fullscreen mode we have adopted
pressing the 'ESC' key, since this is inline with most of the
Apple applications (e.g. Mail).
Need to call QTMovie::invalidate before QTMovieView::setMovie to
ensure the mmap is deleted before allocating for the new one. This
fixes mmap errors when scrolling up and down a list of videos.
When resizing windows in tile view the update is a bit
wonky when you have a video window on screen. The layout
code now repaints the entire homewindow when one of the
charts are resized.
Deallocate errors when scrolling through large numbers
of videos, but otherwise functional.
The redraw of the layouts needs to be looked at, since
there are some nasty artefacts when resizing the video
window that need to be fixed separately.
Ghetto code with video selection and all the basic
building blocks in place. Playback is only via the
quicktime controls, paint issues abound and there
is a problem with deallocation of the movie object.
But the basic stuff is there, time to refine and iron
out all the little bugs.
Written whilst on hols in Gran Canaria :)
If cadence is zero when calculating power then we
should set power to zero. Speed will not be zero
when freewheeling and therefore the calculation
will overstate power output.
Secondly, the NullController (for testing) did
not call the realtimeController post process
function. It does now so we can test the virtual
power calculation.
The LeMond revolution trainer has been analysed in
some depth by Tom Anhalt and as a happy by-product
idenitfied the power/speed curve.
Since Darren Hague had already added the ability to
approximate power from Speed when training on a turbo
this patch extends that to include the LeMond device.
All the analysis Tom performed can be read over on
wattagetraining.com here:
http://wattagetraining.com/forum/viewtopic.php?t=335Fixes#498.
This update completes support for USB2 sticks for ANT+ devices
in train view. The code now works on Linux and Mac as well as
Windows.
IOKit is now a required framework for builds on Mac OSX and
src.pro has been updated accordingly.
I have also added a tarball of the required version of libusb
in a new 'contrib' directory. Users may wish to use a later
version or download from an alternative source, but this
version is guaranteed to work.
Fixes#310
Fixup support for USB2 on Linux via libusb. The code
is pretty ghetto with a maze of pre-processor conditionals.
But it works.
Of special note:
* You MUST build with a very specific version of libusb, the
stock libs in Ubuntu do not work. Might pull the code into
the main repo, since its pretty darned tiny.
* On Linux access controls for the USB devices is controlled
by udev, and requires a rule adding to ensure the devie can
be read/written by users other than root. A udev rule file
has been added to a 'linux' subdirectory in src.
Some of the timeouts and usb setup/reset code has been adjusted
to ensure the device is always in a consistent state. This appears
to be more important on Linux than Windows for some reason.
Make the buttons expand to fit space, so as you resize
the controls the buttons increase in size.
This is a temporary measure as the controls are going
to move to the toolbar later anyway.
The code to select media and then start/stop/pause
playback during a workout has been implemented.
This requires libvlc to be installed at compile time
and will also require Videolan (and desired codecs)
installed at runtime.
Since the main headaches are likely to be related to
deployment rather than coding this update has been
pushed for deployment support to be enhanced and
tested before closing the feature request on the
bug tracker.
References to TrainingPeaks should never have a
space between the words Training and Peaks.
Modified at the request of our friends over at TrainingPeaks.com.
The training view has a number of improvements, most
notable of which is the workout plot now plots the
telemetry as you ride. This enables you to view
your performance against the workout as you ride.
In developing and testing this I found and fixed a
number of other minor issues;
* The workout plot didn't have any axes
* The workout plot title didn't reflect the workout selected
* The workout plot markers didn't honour preferences
* Values didn't reset on stop/start of workout
* The rolling 30 second power plot in realtime was broken
* Lap numbers were not available for display
In addition, some minor changes were made;
* Save workout is no longer optional - it always saves
* The control buttons/margins did not resize nicely
* The workout plot uses colour to distinguish between
workouts that are time or distance based.
* A new default train layout for new users to avoid
having to muck about with layouts
* Removed the race servers since they are not used
and steal screen estate. Will re-introduce when
multi-rider or internet racing is implemented.
I have also added a few workout files into the
test/workouts directory, we should think about how
we can distribute these and allow users to share and
contribute them in the future.
Fixes#493.
The realtime control background now matches the rest
of the realtime charts.
This is a temporary measure before adding view specific
controls on the toolbar (see feature request 492).
Updated the realtime plots and dials to use the colour
settings from the ride plot. So if you prefer plots of
light colours on dark backgrounds you can do this now.
The use of colour on the telemetry values makes it easier
to distinguish which value related to power et al .. especially
when you're pushing out that last max power interval.
Now we adjust the axes for large values it is helpful
to be able to zoom into areas of the chart to look
at the 'bulk' of data (or perhaps even outliers).
This patch adds a zoomer;
* mouse select to choose zoom area
* right click to zoom back out
After feedback, the wizard has been tweaked so that;
* The default minimum gap to find is 1 minute
* The default minimum segment size is 5 minutes
* It is now possible to uncheck gaps in recording
Also, on a Mac the wizard style is forced to ensure
that a cancel button is available since the Mac
assistant style did not (you needed to press ESC).
Higher values for AEPF/CPV have been observed with
track sprinters. The fixed axis on the PfPv (QA)
charts truncate the display.
This patch adjusts the axes to suit the data and will
also ensure the zone shading and labels are extended
to the new maximums.
The PfPv code also contained a lot of tab characters
and the general style was quite dense, making it
difficult to read and understand. I have adjusted
to use a 4 space tab-stop and adjusted to match the
general style of the rest of GC.
Fixes#463.
Linux build using the 4.8 qt rc uncovered a couple
of bugs in the new ride navigator code. This fixes
that, but needs to be tested in earlier versions,
e.g. 4.6, 4.7.
You can now place a ride navigator on the chart layouts, this allows
the user to configure many more columns and use the navigator to
browse and order the activity history in a log/journal format.
The default diary layout now has two tabs; one for the calendar and
another for the activity history.
There appears to be a few minor bugs related to column/chart resizing
that have been present for a while, but are more obvious now the navigator
is a chart in its own right. These will be resolved later.
Added support for.fitlog file format. The reader
was written by Mark Liversedge and the writer
was written by Damien Grauser.
There is no support for manual workout files (either
exporting or importing) this can be introduced at a
later date.
SportTracks does not export speed or distance if GPS
data is available. Speed and Distance are derived from
GPS and time. This is sub-optimal and may result in
differrent values between GC and ST.
I would recommend using a common file format to exchange
data between GC and ST (e.g. TCX) to avoid these issues
with their native file format.
Fixes#481.
Moved to the view menu and initialised 'currentWindow'
to the analysis window on startup to avoid a SEGV if
you reset the layout without having ever switched views.
The interval highlighter on the ride plot
uses the same axis as power, but if no
power is present in the activity the axis
is hidden, and therefore so is the interval
highlighter.
This patch will set the interval highlighter
curve axis to one that is in use.
By making the grid 'relatively' small snap to grid feels
quite acceptable as a standard way of resizing, alleviating
the need to make it a user preference.
The old 'smooth' resizing was a pain to get things lined up
nicely and thus is deprecated in favour of this scheme.
Added a function for Batch Export of current
activity history. The user can select files
to export, the target directory and format to
use.
This completes the updates to improve export
functionality.
Fixes#476.
The export functions in mainwindow are getting quite
cumbersome with multiple menu options.
This patch creates a single menu option "Export.." which
allows the user to select a supported format and a filename.
To support this the ridefile reader code needed to be adjusted
to allow registered readers to declare capability to write and
use a consistent (virtual) method to do so.
By modifying the base class for ride file reader we now allow
new readers to register both read and write capability.
We ask for phonon in src.pro, but it is NOT required, this
is because the video playback was rewritten to use the vlc
libraries.
Additionally, the build.pro now asks for ordered builds to
ensure the qwt libs are built before src is started. This is
useful when performing builds with multipe jobs (make -j n).
We now recognise more 'device types' in the WKO+
parser. This patch sets the devicetype for these
instead of just defaulting to 'WKO'.
* 0x00 - Powertap (for v1/v7 WKO+ files)
* 0x0E - Ergomo
* 0x1A - SRM (is actually a PC 6)
Additionally, the device type is set to WKO (xx)
when we get a device type we do not recognise to
make it easier for users to report.
Fixed the iBike import. The recent commit removing the
different pausetime length for iBike had a logic error.
The iBike files are no different to any other device
and by treating gaps in recording the same as all other
devices we can now successfully parse all iBike WKO+
files.
There are still 3 files amongst the 7,000 WKO+ files I
have received that fail to parse successfully.
I will look to validate these files with WKO+ since they
may be corrupted.
reverted after testing against more files. There is something
decidedly odd about WKO+ files from iBike computers. The scheme
used to mark pauses in recording is different, but cannot work
out why.
Two minor modifications;
* iBike files now parsed correctly (they
where handled as a special case that was
not warranted)
* Some rudimentary bounds checking whilst
parsing the raw data to reduce SEGV crashes
when parsing fails / is incorrect.
Updates to the version 3 split activity wizard to bring it
back in line with the original v2 functionality;
* Splits at markers, rather than extracting intervals
* Shows a small plot to show the split visually
* Will automatically mark gaps rather than work between gaps
This will not be backported to v2 since the functionality
is working, albeit difficult to understand for this casual user.
Issue a warning if the user changes the ride date/time
to the same as an existing ride.
They can still go ahead, but when saving it will overwrite
the existing file.
Fixing the save routines to check would require significant
refactoring and can be fixed at a later date.
Fixes#466.
Split ride is a bit of a radical change from the
original; more thought is needed to ensure the
original functionality is retained whilst making
the UI and workflow intuitive.
This patch reverts MainWindow back to using the
old SplitRideDialog.
In some instances split ride will refuse to overwrite existing
ride files (where they have the same date/time). This patch
increments the start time by one (or more) seconds to ensure
there is no conflict.
Fixes#165.
A new wizard to walk the user through the split
'ride' feature. It allows the user to control
the removal of the original and the minimum
gap size and segment size (when searching for
points at which to split the ride).
It also allows the user to select segments and
intervals to split and displays the actions that
will be performed to allow the user to confirm
processing.
if a new activity conflicts with an existing
activity the start time is incremented (by a
second or more) to avoid data loss.
Aside from removing the current ride it is now
impossible to overwrite or lose existing data.
If you select an erg file then choose ergo/slope
mode in train view the workout plot will crash
when the sidebar is hidden / window resized because
the workout plot is still referencing an ergfile
that has been deleted.
This patch ensures the workout plot is notified that
NO ergfile is selected thus clearing the plot and
also ensuring no reference to the deleted ergfile
remains.
The default train-layout.xml adds a controls widget
that references the streetview window. This patch
modifies it to reference the new window id.
In hindsight, we should not have renumbered the chart
ids when introducing the streetview patch, but its out
there now and at least this fixes it for new users.
For some reason the code for setting notes
in v1 WKO files was commented out, this patch
reinstates notes for this version, but will
not get Workout Code since it is not available
in this file format.
Also removed a duplicate switch statement where
sport was being set twice for some reason.
Fixed parsing of v12 files which contain ride graph
horizontal gridlines. This brings the code back into
line with all other versions and suggests the parsing
of v12 files is now robust.
Also added some sanity checks to avoid data integrity
problems;
* Magic number is correct 'WKO^Z'
* File isn't too small
* Start time is zero, will adjust if not
All files from a collection of 2,500 have been parsed
successfully and/or handled gracefully.
There is still a chance the parser will crash with a
malformed file or a protocol we haven't seen before,
but these checks protect other parts of the code.
Code comments have been adjusted to reflect the current
state of the code, which is much better after the
recent refactoring.
This patch removes the invariance for the graph tab and
uses the same protocol as v1 reliably. This has been
tested against 600 files without error.
All popular formats of the WKO format are now supported,
the warnings for v7 have therefore been removed.
Having just recovered almost 900 v7 files I have
improved the code to support this file format. I
now have 4 files quarantined (that cannot be
parsed successfully) from a corpus of over
2,500 WKO+ files.
With over 500 files now processed successfully for
early versions of WKO+ (Cycling Peaks) we can now
support v1 and v12 of the WKO file format.
This means we now offer full support for;
* CP 1.0 and 1.1
* WKO+ 2.2 and 3.0
The warning message has been removed and problems
related to parsing the 'graph' tab settings in v1
files is now fixed.
We need to see more v7 files (quite rate) before we
can move that version out of beta support. Looking at
the code it is unlikely that the v7 support is very
robust, but until we have more files to test this is
as good as it gets.
Re-instate Altitude bitsize for earlier version that was
undone in previous commit. This was a fixup posted in a
recent push that I reversed, but further testing showed
that the original fix was in fact valid.
Fix bug 1s time increment bug introduced in recent
commit and replaced with a safety net check for
daft values for recIntSecs which examines the ride
file looking for the most frequent recording gap
and uses that.
Refactored to improve support for files created
in earlier versions of WKO/CyclingPeaks. The
changes are largely focused on parsing charts
and caches that we don't really use, but need
to be waded through to land on the data points.
This has been tested on over 1,500 WKO+ files
and found to be ok for those. Further regression
testing would be beneficial.
Better support for;
* Running / Swimming files (different chart setup)
* Where users have customised the default charts
* Earlier versions of CP/WKO+ (esp v1 and v12 format from CP v1.1/1.2)
* Latest versions (v3.0)
Specifically;
* Better support for WKO file formats v1 and v12
* Fix parsing of distribution caches and config
* Improved parsing of MeanMax caches and config
* Support for Suunto devices added
* Support for files with no time data
Fixes#457.
No functional change, but fixed up some of the coding nits
in the WKO+ ride file reader.
References to static variables removed (for thread safety)
References to global WKO_HOME variable removed (multi athlete)
WkoParser class introduced (for further code refactoring)
Updates are pending for more robust parsing when users have
customised charts or the files contain running/pace charts
since these tend to cause a crash at present.
Following changes
* added google Map and Streetview charts.
* changed the telemetryUpdate to use a const reference instead of a value.
* RealtimeData is const correct, or more const correct than it was...
* added a new resource files to support the new charts.
* changed the NullController to return a constant speed to help with development.
then the rider is able to control the controlller manually.
When the next Lap marker is hit, the workout continues.
Signed-off-by: Greg Lonnon <greg.lonnon@gmail.com>
The tile view will now layout the charts in a more efficient
manner. It still attempts to run from top to bottom and then
left to right when laying out charts, but now, if there is
any space and the chart will fit in it, it will be moved.
This means you can layout the view with smaller charts surrounding
or to the left of right of a larger one. This is particularly
useful when looking at say a large summary window with a smaller
map and a route profile etc.
It can be a little disconcerting however, since charts will
suddenly 'disappear' when you resize them -- of course they
don't disappear they just move to a space that can accomodate
them.
We could make 'smart' layouts optional if users get thrown by it.
Lastly, fixed a bug when resizing charts -- if they move position
when resizing then the delta (size change) is miscalculated. This
is avoided now by ending any resize action when a chart moves.
Fixes#453.
A popup bubble when hovering over the activity
history or an entry on the calendar.
It is a pre-cursor for the activity bar for
selecting rides and is available for any
widget to call (it is a member of mainwindow).
To support the data series indicator icons a
new metadata field 'Data' has been added to
store a string to represent the data series
that are present.
In addition, the Sport code is used to decide
if a bike/run/swim icon should be shown instead
of a string (but needs translation support when
we get round to that).
Lastly, it has been coded for horizontal alignment
but will need to be updated for the activity bar
to support vertical alignment.
This is an experimental feature and will develop
over time, specifically;
* you cannot define which metrics are show in the
bubble -- they are hardcoded at present
* the coloring is hardcoded, as is the font size
* Only the activity list and diary use it.
Fixups for QStringList introduced a new bug
by referencing Time In Zones for HR zones
9 and 10, when in fact they do not go any
higher that 8.
They also were not computed because the
worklist used was updated to include any
HR metrics when the ride is dirty (e.g.
when selecting intervals on ride plot or
updating the metrics within metadata).
No functional enhancements, just adds the code
hooks for triggering a bubble 'popover' when
hovering on the ride list or calendar view.
Will be connected to the popup balloon once
the code for that is complete.
Original code had a bunch of char[] and we have
experienced problems with libc on Windows with
char array allocation in the past.
Since we have QStringList (which is threadsafe)
available to use then we should!
This may correct bug report 445. Will wait for
feedback before closing it.
The background color on the calendar now reflects
the color configration.
The color for each ride is precomputed and stored
in the metricDB (so we don't have to scan the ride
everytime we need to determine its color).
As a happy by-product the ride navigator no longer
scans the text to determine the row color and is an
order of magnitude faster when repainting (although
most users are unlikely to notice in practice).
Fixes#448.
The controls in the sidebar are inconsistent; the interval
selector has no spacing or border for a clean look.
This patch updates LTMTool and TrainTool to be more
efficient with the limited space.
A more extensive update is still required to unify all the
chart controls look and feel and get rid of the clunky
layouts with ugly wide buttons.
Fixups for a GC toolbar and the first pass at trying
to make the look and feel more professional. Whilst the
overall usefulness of the toolbar is moot, the grpahics
show the way for greater attention to detail.
Specifically;
* The sidebar should adopt a similar look/feel
* Chart title bars should adopt a similar look/feel
* Sidebar panes should be unified with the same look
* The style selector needs to move - it is cluttering
up the general clean look.
The code is a little ghetto in places, but will fix up
as the cosmetics are sorted.
The help options links to the wiki page but opens a
QT webkit window. This is so rudimentary it is almost
of no value.
This patch instead opens the wiki in a local browser
session. Thus it will use Firefox, Chrome, IE etc.
This is a perennial issue for new users. The default
action when click dragging on a chart is to Zoom -- this
was probably right when we had no span sliders or stack
view (and no facility for marking intervals either).
But now, most users will expect click and drag on a metric
chart or ride plot to mark an interval or date range.
We get regular feature requests and bug reports related to
this -- basically the mouse actions are not intuitive.
Where selection is not meaningful (e.g. histogram) then
left click will zoom. This should be reasonably intuitive
to most users.
Fixes#398.
The user can now define a value list for the metadata
fields. This means for codes like 'Sport' they can define
values like 'Bike', 'Run', 'Swim'.
The input box uses a popup Qcompleter and will only warn
if the entry is not one of the pre-defined values (i.e.
it is not a MANDATORY list).
Fixes#444.
The Alt-key combination for the Athlete and Activity
menus were both set to ALt-A. This patch changes them
to Alt-A for Athlete and Alt-C for aCtivity.
* Rides are now Activities
* Cyclists are now Athletes
This is just a first pass, no doubt many more
lurk within the codebase. Will raise a defect
to cover the remainder.
Although the codebase refers to 'cyclist' in a number
of different ways (classes, setting names, class members)
we should always use 'Athlete' when prompting the user.
Fixes broken controls on train view, so we can now start stop
with the sidebar hidden and also adjust the settings for the
realtime dials on the layout.
Will need to think about saving the properties of the controls
to use last used settings.
Fixes#439.
The metadata information is now shown within
the sidebar.
We need to implement a mechanism for the users
to configure the sidebar widgets etc pretty soon
now, since this update is useful, but the sidebar
is getting crowded out.
Minor changes to ridemetadata to allow a 'single
column' view, but mostly all the widgets were
already instantiated so there is no real cost
to this update.
If the model plot cannot be refreshed when data
is invalid, the plot needs to be hidden since the
qwtplot3d api does not redraw empty plots and does
not have any methods for clearing the canvas.
This workaround just hides the plot and shows a label
when the plot is invalidated.
Fixes#429.
View menu reinstated to allow users to show
or hide the toolbar and sidebar as well as
select layout views; home, analysis et al.
Also added a window menu option to switch
between the current open windows. This is
particularly useful if the other windows
are on another virtual screen.
Fixes#367.
Fixes#29.
Added a new signal to MainWindow to trigger
a zoom to interval. This signal has been trapped
in AllPlot (Ride Plot), but will also need to
be supported in;
* Ride Editor - highlight/zoom to interval data
* Aerolab - Same as ride plot
* Maps - Zoom in to section
depending on the style used on a given system the text in the tab bar for
selection of different charts (summary, ride plot...) may be elided on
screens with small resoulution. This overrides the use of scrollbars
which is was set explicitly in the v2.x code. this patch forces
the use of non-elided text in the the tabs so that scroll bars appear
regardless of the defaults for a selected style.
Fixes#433.
Amazingly, the stack plot does not honour the chart
controls. If you select ony a single data series it
will still display all series.
There was a //XXX 'todo' placeholder in the code for
this which has now been completed.
The header size in FitRideFile has increased from
12 to 14 bytes, but the new field is at the end of
the header, not in the middle.
Additionally, there is a new global record (79) which
we now silently ignore.
Enhanced ride plot;
* Curves can be shaded (this is particularly
useful when only selecting a single curve)
* Span slider can be hidden (this is useful
when you want a 'smaller' plot, e.g for a
single curve, but multiple plots on tile view)
* Curve selection is set/unset from properties.
There is a repeated 'meme' with regards the ride
plot checkboxes for data series (hr, cad etc). They
are to choose the series to display and NOT to show
which series are available.
If you choose to display HR and HR is not present in
the ride file it is still VALID to set the checkbox,
but of course nothing will be plotted. In this way, you
can define a chart for a specific data series and it
will display whatever is VALID as you select different
rides.
Aligning to recent patch to increase decimal
places when selecting an interval, this now
sets the decimal places to 2 for distance when
displaying the metric (e.g. summary, interval
summary)
When plotting HR on a histogram we set the x-axis
to only plot within the recorded heart rate range,
but the recent patch to fix up LogY settings meant
that values are always > 0 (1e-9), resulting in the
plots rarely being adjusted correctly. This patch
fixes that.
When you select an ergfile the axis for the workout
plot is not set, this often results in a plot with
large amounts of white space to the right of the plot.
Fit file format can now have a 12 and 14 byte header. This
patch adds support for 14 byte headers since this is required
by the latest 310xt firmware.
Fixes#430.
Update to a number of plots to align with
the flatter, less cluttered chart style
used elsewhere (Ride, Histogram, CP et al).
Changes made are purely cosmetic and apply
to:
* Aerolab
* HrPw
* Realtime, ErgFile
* Weekly Summary
The previous commit hide/show of QTabWidget caused
an errant incremental resize of the tab widget. Not
at all sure why, but this fixes it.
We may want to move to a QTabBar and manage the stack
of widgets separately as QTabWidget seems to be displaying
some weird behaviours.
For some strange reason, if you startup in tiled
view and switch to tabbed view then back to tiled
view QTabWidget didn't honour setUpdateEnabled
for the QTabBar.
There is a related QT BUG number 9010 that seems
related to this but was closed without being fixes.
We hide/show the QTabWidget in HomeWindow during
a style change and it seems to avoid the screen
flicker issue.
Weirdly, if you startup in Tabbed view the problem
does not occur. It is possibly caused by having a
QTabWidget with no tabs before calling show().
Either way this patch gets 'around' the issue.
When changing from tab to tile view the updates
are processed during the transition. This is ugly
and unneccessary.
This patch turns off updates during the transition
and then refreshes at the end. As a result it is
faster and you don't see nasty transitions to the tab
bar.
With v3 we have removed the sunken frames on
all the plots to make for a cleaner 'flat' feel
to the charts. The 3d plot has now been adjusted
to be in line with the rest of the plots.
If you attempt to download from a Macro device
and use wrong device or initial read fails then
it crashes, this patch fixes that.
It does not fix more general data errors but should
at least mean incorrect user selections do not result
in GC crashing.
Fixes#366.
When importing a ridefile we have never checked that the
same ride (date/time) does not already exist but in a
different ridefile format.
For example, importing a TCX file when a .RAW file already
exists for the same date/time causes conflicts with the
.cpx and .notes file (it is not possible to distinguish
which ridefile the notes/cpx file belong to).
Fixes#389.
A couple of members in mainwindow should have been
removed a while back (chartFoundry trying to fix
add chart crash) and getSplitter (hack for resizing
the sidebar).
This patch removes them. No functional change.
The AllPlot smoothing algorithm is coded to smooth
to a sample rate that is /higher/ than the sample
rate within the ride.
As a result, when a shorter smoothing rate (e.g. 1s)
is a applied to a ride with a greater sample rate (e.g. 5s)
the algorithm breaks down.
This patch ensures that smoothing is only performed when the
smoothing rate is greater than the ride sample rate.
Fixes#416.
Now uses a homewindow 'layout' for the Diary view.
This means you can drag and drop other charts onto
the diary view and resize the calendar etc.
Planning functions will belong here eventually but
this patch is just to tidy up the UI a little to
make all the views configurable.
Very basic start, this will now let you plot
VAM on the CP curve. VAM is a measure of climbing
speed and for comparative purposes should be
normalised to the slope climbed.
In this first pass of implementation the VAM metric
is not normalised in any way. It merely represents
the climbing rate, in meters per hour, that was
sustained over each time interval from 5mins to the
ride duration.
If the ride is undulating then only ascension is
included, any time on the flat or descending is
included but meters climbed will be zero. This is
akin to the way we handle power where we include time
when freewheeling.
More sophistication is needed, especially normalising
the value to a common gradient (e.g. 10%). But this
will prove challenging when VAM is comprised of
undulating elements (i.e. gradient is cumulatively
zero, but could contain segments with steep parts).
It may be more appropriate to only measure VAM for
sustained climbing i.e. ignore ride sections when
descending or on the flat.
More thought needed.
Fixes#414.
They're dog slow and looking through the QT bug
tracker no longer developed or supported on normal
QT widgets without QT Quick.
They also break drag and drop on Win7 64bit.
Fixes#324.
Control settings now have a text edit for renaming a chart
alongside all the other control settings. It might be more
intuitive to allow the user to click on the title to
rename it, that is for the future.
Fixes#397.
This patch removes the dialog box that pops up
when you drag a chart onto a layout and sets the
title of the chart to a default value (which is
the chart name).
This fixes the drag/drop crash on Windows 7.
However, when dragging and dropping on a 64bit
Windows 7 there is still a crash, this appears
to be in a different part of the code and will
require further investigation.
Also, since the title is now defaulted it is
important that the user has the ability to
rename charts once added. This is already
registed as bug no. 397.
The CP window tries to draw the current ride, even if it
has just been deleted (i.e. on delete event it tried to
calculate()) this fixes that.
Other widgets are fine, this is a consequence of trying to
redraw the aggregated curve and current curve when being
notified the ride has been deleted.
Bad form to delete an item and then pass a reference to it.. when
mainwindow removes the current ride it passed a pointer to the
rideitem just deleted, rather than emitting the signal before it is
deleted.
A distinction is made in mainwindow to emit the signal AFTER the
ride has been removed from disk (so metric/caches can clean up) and
removing it from memory (so charts can decide what to do).
Part of a number of fixes for bug 401. This ensures
the histogram chart is updated when a ride is added or
deleted when showing aggregated data (not a single
ride). Will set a 'stale' flag if not visible and then
refresh the data the next time it becomes visible.
The patch to support stacked charts inadvertently
broke the other chart types by adjusting 'count'
but at a different level of scope. This caused the
other styles to miss the last nth value. So, if
there is only 1 value in the date range you would
not see any data (for example).
The LTMPlot code is now getting a bit hairy, it is
almost an application in itself. Consider refactoring
in a later release.
Remarkably, using transactions even when querying
SQLITE databases improves performance. If you have
a lot of metric charts on the home window then this
patch will make startup a lot faster.
Additionally, as we refresh the charts as rides are
added and deleted this should help to reduce the
performance impact when lots of charts are open.
There is an SQLITE performance FAQ that provides
more background here;
http://web.utk.edu/~jplyon/sqlite/SQLite_optimization_FAQ.html
StressCalculator created a duplicate connection to
the metricDB, this was not needed since it could
reference and re-use the existing one from MainWindow.
This is a vestige from v2 code where the metricDB was
only refreshed/maintained within the metric tab.
No functional or real performance improvement here but
allows us to convert the metricDB to an in-core ":memory:"
database in the future.
Preliminary tests suggest there isn't a huge performance
gain from in-core but that may change as we do more with it.
FIT record type '253' occasionally causes time to go
backwards, this might be a decoding error, but for now
we force time to go forward anyway.
Looking at bad files GPS data with this patch suggests
this is the correct behaviour.
Fixes#104.
The LogY function for histograms was overlooked
when implementing intervals. The baseline and
start/end values of the interval curve needed to
be set to non-zero values to match the main curve.
[Folded in manually from commit #a562d2 in master]
An errant git rebase lost these changes, this is
to support the GTC export file support and updates
the Json parser to use the new call semantics and
gets the Import wizard to clear up temporary files
when it closes.
GTC will export all rides as a single TCX file so they
can be imported en-masse into another application.
We did not support >1 rides in a single ride file. This
patch adds support for reading multiple rides (if the ride
file reader supports it).
The ride import wizard will now extract and parse files from
a GTC export. Many thanks to Damien for writing the TCX file writer.
Fixes#371.
When a large number of intervals are defined (>50 or so)
then the RideSummary window crashes.
It appears to be a bug in QTextEdit. It does a double free
when setHtml is called, after a 'large' text item was
set. It may be a QString bug.
To avoid the issue we use a QWebView instead of a QTextEdit
to display the summary and then try and set fonts to match
the application.
Fixes#299.
The metricDB columns are renamed to more friendly values
in RideNavigator, and the GcCalendarModel was looking for
a columns "Filename" when it was named "File".
This mean't the call to the model to retrieve the filename
when an entry was clicked on the table view (diary) would
return "".
Strangely, this worked fine on Linux. But it is definitely
a bug. This patch fixes that.
Fixes#330.
If you save a ride and then delete it. The re-import and save
you will end up with two copies of the ride in the ride list.
This is because when we save the first time the original file
is renamed to e.g. ride.tcx.bak and the new ride.json is then
created. All is well.
But then delete the ride and it will rename ride.json to
ride.json.bak. Again, All is well.
Now, re-import the ride. We now have; ride.tcx.bak and
ride.json.bak and ride.tcx. Again, all is well.
But now, if you make changes and save it will attempt to
rename ride.tcx to ride.tcx.bak AND FAIL. This is because
the old ride.tcx.bak file is there. It will then create
ride.json. All is NOT well, since we have two rides with
the same date and time but different extensions.
This patch fixes this by unlinking ride.ext.bak before
trying to rename the file.
Fixes#348.
Metrics are refreshed immediately now, rather than waiting
for a request for them. This approach was valid when metrics
were only used on the metrics tab -- it made sense to refresh
when the user wanted them.
With release 3, we use metrics in a number of places as a cache
and also to speed up performance (e.g. RideItem::computeMetrics
was removed a long time ago).
This also fixes a related but when deleting the last ride -- it
did not disappear from the ride list (because the refresh would
only be triggered when a new ride was selected).
Dropshadows currently kill the CPU. This is caused by the way
they are implemented in GC and not QT. More work is needed to
make them fast.
For now, this patch makes the default to NOT have drop shadows.
The ride file readers will often set metadata fields
for device specific information, or just to store data
that has nowhere else to go.
In addition, when an athlete shares a ride with their
coach they would need to keep a common metadata setup.
To get around the 'hidden' nature of metadata that is
not configured and therefore not shown, the metadata
screen will show all tags, which are not shown elsewhere
in an tab labelled 'Extras'.
It is not possible to edit this data, we may change that
later. But for now the consequences of users changing
'internal' metadata is unquantified.
The overhead of creating and destroying widgets on the
extras tab mean that scrolling up and down the ridelist
with the Extra tab shown may be slow for some users. I
have optimised the refresh as much as possible (it has
zero impact if the extras tab is not selected).
In developing this I found that the homewindow
was sending two update signals when you were in tab
mode. This is fixed and tab mode should feel a tiny
bit snappier.
Fixes#385.
This is a fix for bug 205 which is registered against v2.1 but
is also present in v3. This fix will not be relevant for v2.1
since the cpi file has been replaced with the cpx file.
The WKO+ file reader still wrote to a .notes file
rather than updating the Notes metadata tag. This
patch fixes that.
Notes files are still referenced in LTMPopup, so the
current bug request for completing the notes file
deprecation cannot be closed, yet.
The find dialog expected the between values
to be small and high, this patch will find
values between regardless of whether the
search values are lo/hi or hi/lo.
Fixes#351.
Notably when you select a color in the config appearances
the dialog will have modal focus but be hidden behind the
config pane, this is tedious as hell.
I have now checked across the codebase and there are no
dialogs which insist on being on top so the OS window
manager and user is now free to manage windows as they
see fit.
Although not directly related this fixes the only possible
problems with window focus that could be related to another
bug reported by Fernando.
Fixes#117.
The ride import wizard would only allow the user to
change the ride date/time if it was a .gc .json or
.csv file. This was because (wrongly) it was because
we could not update the date/time defined within the
ride file itself.
Of course, we encode the ride date/time in the filename
and so it could be changed. However, not all the RideFile
readers supported this.
To get around this, the import wizard now does let you
change the date and time for any file type and the ride
file factory method openRideFile() will override whatever
date and time is returned by examining the filename. The
user needs to double click the date or time to edit it.
Additionally, the select date... combo would only register
when you changed the selection, it now defaults back to
the 'select date..' option after each selection.
Lastly, the 'choose date' function now works as advertised
and triggers editing the date for the ride selected.
This patch needs plenty of testing and is potentially going
to resolve the 'misleading UI' bug numer 11, but will need
to be cherry-picked back to v2 master once it has been
adequately tested.
The ride editor does a pretty good job of finding anomalies
in the ride data, and to help it underlines the anomalies with
a wiggly red line and adds a tooltip to explain.
But, you have to scroll up and down the file to look for them
and when you are scrolling at high speed the wavy lines are
difficult to spot.
This patch updates the ride editor controls (which previously
only had the find dialog) and adds a list of anomalies at the
bottom. You can click on an anomaly to jump to it in the ride
data.
The choose cyclist dialog allows you to open
a cyclist that is already open. This is not
a great idea since the two windows will conflict.
This patch introduces a global vraiable to track
open windows (mainwindows) and MainWindow maintains
it as it opens and closes.
AthleteTool still needs to be updated to refresh
as new cyclists are created (and when its written
deleted).
Some ride file formats use -1 to indicate sensor not
present or data loss (e.g. TPX) and on occasion a NaN
or Infinite value will be presented.
This patch handles this by converting negative data sample
values to zero and handling out of bounds values when
selecting zone ranges.
This is not a substitute for better handling of poor ride
data but it reduces the effect.
Also fixes#311.
Following on from the recent changes to the Google Map control
to support their new v3 API, this patch introduces an alternative
map view using the Microsoft Bing v7.0 API.
Remarkably, the MS and Google APIs are extremely similar. Porting the
original code to use the MS API was relatively trivial. It would
probably make sense to combine the two charts into a single chart
with an option to select a map provider.
However, at this point to help in code maintenance they are separate
charts. It is likely that they will diverge somewhat to take advantage
of the differing features offered.
The same functionality and basic colors/lines are available in the
Bing map as the Google one. We should look at adjusting, since the
Bing map styles are more detailed and go to a much higher resolution
than Googles. As a result the current theme looks quite clumsy on
a Bing map and could be changed to use more strident colors and
take advantage of dash polylines (for example).
The Google Map view uses a Web view which by default
attempts to handle drop events. This interferes with
the adding charts via drag and drop. This patch fixes
that.
Multiple issues fixed related to automagic
resizing of columns as the sidebar is stretched
and shrunk.
* Geometry and Columns are now cyclist specific
since the metadata config is cyclist specific.
* Multiple 'dynamic' bugs related to setWidth() and
columnsChanged() calling each other or being
triggered by a signal caused conflicts
* Column widths were incorrectly calculated when
no vertical scrollbar is visible on the ride list
(typically when the user has just created a new cyclist)
* Incorrectly including the '*' virtual column in calculations
when it should always have a width of 0px
The Ride Navigator should now be relatively bug free for
column resizing. More tests are needed on the interaction
with the old context menu (i.e. delete/add/save ride). Some
preliminary tests suggest it is pretty stable.
The WKO+ file format appears to record drops in
recording of GPS data with a latlon of 180,180. We
expect this to be 0,0.
This makes the WKO+ file reader consistent with the
GoogleMapControl and removes the need to clean data
there.
If it is found that 180,180 is the standard way of
recording drops in GPS signal then we can change the
code. We use 0,0 since it is conveniently at sea off
the west coast of Africa.
When there are no rides to select in the ride list (e.g. when
just created a new user) right click for a context menu will
crash since it assumes there will always be a ride selected.
Since a large number of user 'bug' reports and
worse, coding errors, are caused by mishandling
user setup (missing CP, HR parameters, Zones, Weight)
the new cyclist dialog now prompts the user for basic
parameters when creating a new cyclist.
There is no need to warn about seasons.xml missing, it
is quite acceptable to have none set. Worse still sending
to the console log is next to useless for users that
don't launch from the command line.
the bad timestamp initialization in PowerTapDevice showed a lack of
error handling.
This patch makes the DownloadDialog handle bad timestamps more graceful.
Actually it falls back to the current time and allows for later fixing.
startDate for the rideList returned after download wasn't set properly.
Use proper method instead of static fabric funcition.
Thanks to Eric Yoo for finding and fixing this.
fixes#365
The comm port types supported by srmio may vary depending on the build
system (no ftd2xx.h, no termios, ...).
This commit keeps GoldenCheetah from using unsupported srmio port types
based on the srmio build.
reading unsupported SRM files caused assertions. This shouldn't happen, as
it's no Programming error.
Changed the checks into graceful failures.
fixes#364
if the devices have a way to identify which CommPort they support and if
CommPorts are just for this device, this is now taken into account for the
port combo box:
Unsupported ports (i.e. currently D2xx for srm) aren't shown for the
selected device type.
Serial ports that are hard-wired to a certain device type (like built in
USB2Serial adapters in PC6/7) aren't offered for other devices, as well.
As a temporary hack, this PCV claims /dev/cu.*PL2303 to be "his". Of
course this has to go, if/when we start supporting other devices with
built in prolific usb2serial adapter or native serial interface (that
might get connected to a prolific adapter).
If we find a way to gather more details for the available ports, we can
extend this quite easily. Possible ideas:
- hald (obsolete)
- libudev (linux specific)
- kdelibs solid (linux specific?)
Previous commits turned the status/"Instructions" label into a log. This
allows to show a lot more information that simplify troubleshooting
download issues.
To make it behave a bit more as expected, this change turns the label
into a readonly QTextEdit.
The new powercontrols have a lot more memory and they allow you to
selectively download the recorded "rides". Looking at srmwin, this seems
to be the suggested way of operation. (i.e. record multiple workouts,
download only the "new" ones).
Furthermore, the SRM file format has some limits (timespan, total number
of records), that make it inapropriate to store "all rides" into one file
and split it later.
So download now
- tries to get a list of rides of the device
- if it gets any, the user can get prompted to choose which to download.
- let device download (selected/all) rides, split if necessary and return
a list with tmp filename, start time, file extension.
- download dialog builds new filename based on time, prompts user for
overwriting when file exists and renames file.
The download Dialog now stays open, so user can read the status messages
and click "cleanup". This avoids many of the anoying message boxes we had
in the Srm download.
Cleanup's user interaction (confirmation, errors) was moved from the
individual device to DownloadDialog, as well.
made srmio handles attributes of the SrmDevice class and added methods to
allocate/open/close/free these handles. So download() + cleanup() can use
the same code.
As a goodie the handles stay open after download and the second
initialization on cleanup() is skipped - saving some time. Well,
assuming the caller reuses the same SrmDevice instance.
SrmDevice destructor takes care of closing/freeing the srmio handles
automagically.
right now there's just one object for each Device type througout the whole
app. This forbids keeping actual state in the Device object during
download/cleanup.
This patch puts the list of supported Devices into a seperate class.
Actual Device objects are now created dynamically.
This is necessary for the upcoming Download changes.
JsonRideFile saved with 6 and not 11 digit precision
losing a lot of precision when saving.
Additionally, the Google Map used a similar precision
and this caused jaggies on the map.
srmio changed it's API completely. Adopted SrmDevice to use new API.
As a first step, we keep using the "simple" API to save everything into a
single file.
While this works fine for PCV, this will run into limitations of the SRM
file format, quite soon. This needs to be addressed in another step.
CommPort::name used to prefix the actual device name/path with the actual
device type to make it unique. This is used in DownloadRideDialog to map
the device dropdown list to the actual device.
This patch seperates name + device type to make the hack in SrmDevice a
bit less ugly: srmio doesn't use the built in CommPort abstraction and
needs the unmodified device names. This is still ugly, but I can't come up
with anything better (... for now).
toMSecsSinceEpoch requires QT 4.7. And as the caluclation doesnt require
msec precision, toTime_t should be sufficient.
Well, this is mostly, because I'm currently too lazy to update my QT... I
guess, this doesn't have to be merged.
Adds support for the Macro X bike computer for downloading rides
and reading/writing in the native file format (sync).
For more information on this new bike computer see:
http://www.o-synce.com/en/products/bike/macro-series/macrohigh-x.html
[git cherry-picked from master into release_3.0.0dev]
The recent update for the Google Map window reduced the
precision geo-coordinates, this patch fixes that.
Additionally, the wait time was triggered after 60s which
should be 5 minutes (left in by mistake after testing).
When metrics are refreshed the ride navigator
re-reads the metric DB and loses the currently
selected ride.
This patch causes the ride to be re-selected once
the refresh completes.
seems, the assumption for "speed" in SRM7 files being unsigned was wrong.
Powercontrol/SRMWIN seem to use negative speed as "invalid".
Furthermore altitude may become negative, as well.
To address this, QDataStream now does the bit-swapping and speed +
altitude are read as signed values.
Fixes 346.
So far the FIT parser bailed out, whenever it found something
unknown/uninterested to GC. This is quite orthogonal to the FIT design, as
it's supposed to be extended.
renamed read_<foo> functions to match the FIT base_type names.
unified handling of "unavailable/invalid" values - i.e. if sensor data is
temporary unavailable. This allows easier and consistent handling -
especially for the uintXz base_types, which only differ by a different
"invalid" value. Had to change the type of the "values" list to int64 to
fit uint32/int32, as well.
added proper support for signed integer types. I'm wondering, why lon, lat
+ temperature were decoded properly...
added support for currently unsupported base types by just skipping their
bytes. This allows us to continue reading.
... on both, big and little endian machines.
Fit reader only supported little endian data on little endian machines.
All values read from FIT files are now swapped (if neccessary) according
to file and system endianess.
fixes#287
do not bail out on unknown message types. This violates the design of the
Fit format of being extensible.
As this was the last thing using the global_msg_names QMap, I've nuked
this, aswell.
Summary window and friends now set the window title (subtitle)
to the ride date and the headings have been made slightly
smaller to reduce screen real estate. Minor cosmetic update.
Update to the Google Map window:
* Uses Google Maps API v3 (v3 is deprecated)
* Users can now select intervals on map
* Icons for start, stop, loop, pause
* Resize refresh no longer needed
Features removed or changed:
* 30s segments are now 60s segments
* Tooltip doesn't work with v3 API
Some more updates will come through later to
add greater control on what is shown on the map
and the shading to use (e.g. gradient, HR zone) and
the time interval to use.
Highlight entire route to make the route stand out
more obviously when power zone colour schemes are
subtle (or white).
Changes the window bar to the metadata field 'Route' if
it is present. This is done by introducing a new 'subtitle'
property on a GcWindow that can be set programmatically. This
is equivalent to the old 'title' above each chart.
A bit more love for tabs and other minor cosmetic tweaks.
* View now remembers style used (tab, scroll, tile)
* Allow user to re-order tabs
* Google Map border reduced
* Google Map refresh delay (to make UI snappy when resizing)
* Minor calendar cosmetics
* Use utf8 encoding on config files (language support)
Removed the horrible dock widget and uses same sidebar
as windows and linux. Removed segmented button for now
since there are a few issues, but retained the code for
the future.
More work to unify the tab view with the overall
UI look-and-feel, allowing you to remove and add
tabs via mouse over rather than the close tab
icon. Also added a number of cosmetic adjustments.
Fixed up PerformanceManager and ScatterPlot to
pick up on the chart fonts and tick size etc.
Removed some erroneous static members in the
ScatterPlot that caused a SEGV when adding multiple
charts (or cancelling an add then adding again).
New charts are created in the GUI thread and
the Dialog is not deleted until after the chart
has been reparented.
This modification will need testing on Windows.
The legend wasted screen estate and was removed, this patch
colors the axis labels/ticks so no legend is required. This
approach could be adopted for other charts.
Also includes a fix to hide realtime view controls which
left a screen glitch because they should have been hidden.
I have not been able to reproduce the crash, but reading
through the code related to the chart add dialog I have spotted
an error where the chart could be destroyed when you click the
OK button, but still referenced.
This modification also appears to fix an issue with chart
controls not working when you first add a new chart.
Requires testing before the associated defect in GoldenTracker
can be closed.
QGraphicsDropShadowEffect needs Qt 4.7.3 to
be guaranteed to work correctly. This is inline
with the statement that Qt 4.6 is mandatory
whilst later releases are desirable.
After discussion on the list the utility and popularity of
the original tab view was restated. This patch reinstates
the tab view and attempts to unify the Qt tab widget with
the general look and feel of the application.
Added a dropshadow effect for window tiles and made the
title embossed for a more professional look.
Also fixed a couple more compile time nits introduced
by recent commits.
When scrolling through the ride list the ride plot will
steal focus which means navigating up and down the ride
list by keyboard is not possible.
This was caused by an errant setFocus() in LTMCanvasPicker
which this patch removes.
The heading on the homewindow pages is superfluous since the
user is well aware what page they are on by the fact they
selected it and also the contents displayed.
This also has the effect of making tiled view the standard
and only view. Will need to add options to maximise a chart
to fullscreen later.
Less jarring UI with simple use of color and
no pixmaps to make a clean look. Will need
more work to get consistent across the code
base.
A simple and clean UI is starting to emerge.
An update to the ride list on the left hand side
to enable the user to choose and sort or group-by
metrics, metadata fields and ride information.
In addition, the sidebar has been 'improved'
cosmetically and to require less screen estate.
Also, the ticks and frames on plots have been
adjusted to be more aesthtically appealling.
There is more to come on the look-and-feel front,
but this patch heralds some work on the sidebar
which needs to be resolved.
The WKO ride file reader used wrong constants for the bit
field size of the sample data when decoding files from
Ergomo devices.
merged from v2 master.
The google map control creates a temporary file to load
which is not unique for each logged in user. This causes
permissions issues.
The use of a temporary file has been removed by replacing
the webView->load() call with a webView->setHtml() call. This
allows us to pass the contents as a string rather than a URL.
Fixes#331.
When you import the very first ride into V3 it will cause
a SEGV crash when attempting to freeMemory. This is because
the first entry added to a list does not cause any selection
to be made.
This means that the very first time someone tries to use GC
version 3 it will crash! Not the best of starts.
This bug was previously reported as being related to importing
json ride files, it occurs for ANY ride file type.
Fixes#328.
With realtime data there will often be samples with
timestamps like 940.002 and 940.998. This cuases an
issue on the ride plot, where it believes there is
no sample for 941 and therefore plots a zero value.
This patch rounds the timestamps to the nearest 100th
of a second, which is consistent with the mechanism
used in the ride editor.
Not generally useful but allows one to make the toolbar
menu and titlebar match for a more pleasing general effect.
Most users will not use this I imagine and use the default
window colors.
The MainWindow.{cpp,h} code was a bit messed up after a
few years of hacks from different devs. This non-functional
patch re-organises the source files, removes a couple of
unused methods and adds a few comments to help new devs
navigate through the code.
The HR zones code was broken by the previous commit to
remove asserts from the code, resulting in the numZones
method to always return 0. This caused the Histogram and
Summary windows to fail to display zones for a specific
ride.
This patch fixes this.
You can now configure the Analysis view to drag and drop
charts on the page and lay them out etc. A default setup
displays basic data such as ride summary, histograms and
ride plot.
MainWindow still needs a bit of a tidy-up as the basic
code has been edited and re-edited by a cast of thousands
and its a bit of a mess as a result.
If you have not compiled in support for a particular
chart (e.g. 3d) then the drag/drop event will just
create a blank chart (base GcWindow).
The constructor for a null chart did not initialise
properties and caused an intermittend crash because
the controls pointer was occassionally not NULL.
The DBAccess functions instantiate a local SpecialFields object in
almost every method. Profiling by Fredrik Lingvall has shown this
is rather expensive (and also unneccessary since they do not
change at runtime).
A specialFields member has been added to the MainWindow class
and is instantiated at startup and referenced in the DBAccess
methods instead.
Rough tests suggest a 10% speed improvement in metric refreshes.
Lots of nitty fixups, largely for uninitialised temporary
variables.
I have left the use of boost::function and boost::bind in the
DownloadRideDialog alone, so it will vomit when compiled
with boost 1.46 and gcc 4.5 or higher. Will look into this
more carefully at a later stage.
I am working up to resolving issues identified from -pedantic next.
The SQLITE database syncs (writes) to the metricDB file after
every atomic transaction. As the size of the database grows this
becomes very expensive (suspect it is writing the entire DB).
To avoid this behaviour the Metric refresh code opens and commits
a LUW for the entire refresh. This has shown to improve the performance
of the metric refresh quite dramatically (50% reduction in overall
time to complete a metric refresh).
Big props to Fredrik Lingvall for detailed analysis and profiling
of the code to identify the inefficiencies.
The training view (aka realtime) is now configurable
allowing users to drag and drop appropriate charts
and dials onto the main view.
The controls for this view are static and comprise the
old controls with start/stop buttons, device selections etc.
I have removed deprecated code too, the following are removed
from the repository;
* ViewSelection
* RealtimeWindow
* TrainWindow
* TrainTabs
Fixes#290.
As part of the ongoing preparation for training mode to support
a more configurable layout the workout (ergfile) plot is now
a window that can be dragged and dropped onto a layout.
The realtime plot is now a chart than can be dragged and dropped
onto a window layout. This is part of the preparation to move
the training view to use be configurable, aka home window.
The home window layout will soon be extended to cover
realtime and analysis views. In preparation for that
some additional charts are being created.
This patch introduces the metadatawindow which only
contains the metadata fields (i.e. no ride summary).
RideMetadata widget in mainindow is never placed into a layout
since it is not used for user entry/display.
MetricAggregator used QWidget as a base class, this should of
course have been QObject. It uses signal/slots but has no GUI.
Been chasing this down for ages. An orphaned widget in
MainWindow caused the tick for opening the drawer on Macs
to be 'unresponsive' and on Linux made the Cyclist and Ride
menubar options similarly 'unresponsive'.
When adjusting layouts for homeWindow and others a new
widget 'central' was introduced and then not used, but the
code was left behind.
This patch removes the errant code.
I guess it is a philosophical argument. HrZones is modelled on
the original power zones code. It uses assert to crash whenever
a call is made for out of bound data (e.g. range of -1).
Given these values are returned by other functions in the same
class, it seems harsh to crash when handed them back.
I have removed some of these from the critical members and am
tempted to apply to the original Power Zones code too.
Fixes#301
As pointed out by Mark Rages, GCC/G++ support auto vectorization
optimisations with this flag (amongst others). This has quite a
significant performance impact for almost all parts of GC that
loop over ride files.
It certainly improves the mean-max routine performance dramatically.
Anecdotely it seems to improve performance on most charts when
intervals are selected and make the Metric charts particularly
snappy.
More info on auto vectorization can be found at the following
url: http://gcc.gnu.org/projects/tree-ssa/vectorization.html
Tested on intel and amd hosts running Linux and Windows.
Updates the source files to add a detailed description on the new faster mean-max algorithm and a tweak to the window size to significantly improve performance.
Mark Rages has developed a super fast and innovative
approach to identifying max-mean intervals. This
approach is 20% faster than the current approach and
importantly does not require "downsampling" of data
yielding much higher resolution for longer intervals.
The code has not been 'adjusted' to adopt QT style
containers (e.g. QVector) and uses malloc/free.
The primary innovations include:
* integrating the data series to reduce the operation
for identifying an interval sum to a single subtract
operation.
* Searching for max sum via a window-search rather
than iterating over the entire series (divide / conquer)
Interestingly, now we have retained high resolution the
xPower algorithm still yields differing results to the
existing metric code. I have contacted Sean to get some
insight into why this might be the case, but suspect it
is related to the implementation of the xPower 25s EWMA.
Tip o' the hat to Mark Rages for this -- sometimes you
just have to accept that no matter how smart you think
you are, there are some folk who /really are/ smart!
The .cpx file used unsigned long to reduce storage
requirements but lost precision. This patch migrates
to using floats, which in most cases are the same size.
One side effect of this update is that mean-max charts
for HR, Speed, Cadence no longer have a 'staircase' effect
and plot more smoothly.
The recent update to plot histograms for seasons or other
date ranges did not support displaying by zone since the
cache did not contain zoned data. This patch fixes that
with an update to RideFileCache to pre-compute and to the
PowerHist class to retrieve and plot.
There are some minor issues that need to be addressed:
* Handling aggregation with different zone schemes
* Deciding which zone scheme to use for the bar labels
when multiple differing schemes have been used within
the date range selected.
* Showing a break down of time in zone by range i.e.
how much time was spent at Threshold when CP was X
as opposed to when it was Y (hint: do it like we
currently display intervals when plotting a single
ride).
* Refreshing the Time In Zone data in the .cpx file
when CP/LTHR changes is not implemented.
The RideFileCache now checks the version of the cache to
determine if it needs to be refreshed -- so no need to
delete old .cpx files before running GC with this patch.
The recent RideFileCache patches added functions to
pre-compute mean-max and distributions. This enabled
this patch to add plotting histograms for a date
range rather than a specific ride.
It supports all the same data series as before but will
allow you to select a season from a new combo box.
I have refactored a fair amount of the code, but kept the
original code in PowerHist as close to unchanged as I could
since I did not want to disturb existing functionality.
There is no support for Zoning historic data -- this requires
an update to the RideFileCache.
The metric code for calculating NP was sub-optimal (actually
it was pretty crap). This patch improves the performance of
the calculation quite substantially (>50% improved).
Additionally, the critical durations code has been adjusted
to reduce the amount of work for long rides (>3hrs or more).
A tooltip is now shown on the CP chart if you move
the cursor over a point in the chart. The old picker
ribbon is still shown when using left-click with
the dates and values shown in the controls.
The Skiba and Coggan metrics for xPower and NP
respectively can now be plotted on the CP curve.
There are two issues;
* Downsampling of data to 5s samples skews xPower's EWMA
* Setting scale to start at 30mins breaks the x-axis scale engine
Both issues need fixing, since the first skews xPower upwards and
the second suggests that xPower/NP are meaningful for durations
less than 30 minutes.
Fixes#307.
Peak 1s - 5s critical heartrate was way off the charts and did
not represent the data within the ride file.
Almost certainly caused by the WKO+ file importer, or possibly
by the WKO+ files themselves. It is possible to have ride files
with samples that are shorter than recIntSecs, e.g. where the
recording sample rate is 1s you might see:
Time HR
01:21:32.0 157
01:21:32.7 157
01:21:33.0 157
In this case there are two samples between 1:21:32 and 1:21:33 rather
than the expected one sample. The code to compute averages used the
duration and recIntSecs to determine the average. This patch now
maintains a count instead.
Fixes#319
Many thanks to Gary Smith for helping to diagnose and fix
this error. It is caused by ridefiles that have a gap in
recording at the very start of the ride (i.e. the first
sample is > recIntSecs).
Hopefully this means the CP code is now robust. It is also
worth noting that after fixing the erroneous copy/paste
code in compute() it is now 5 times faster than the original
code and computes 5 times more data series.
Fixes#316.
When you clicked on 'All Rides' mainwindow emits a rideSelected
signal with a ridefile of NULL. When then selecting a valid ride
a SEGV occurred.
This temporary fix removes that signal, but the underlying issue
related to actions after a NULL ride is selected need to be resolved.
Fixes#318.
The new implementation of CP calculation uses a different
approach to identifying critical power/cadence etc which
makes it sensitive to gaps in recording (it assumes all
samples are temporally contiguous).
This patch ensures the data series are pre-processed to
add 0 values for any gaps in recording -- it does NOT
try to smooth data, since there are tools available to
do this, and if the data as presented has gaps we will
not attempt to 'correct' them -- the user can do this
themselves.
It leaves ride data intact.
Fixes SEGV in RideFileCache caused by incorrect recIntSecs setting
for a ridefile. Other reported issues with high power values for
short intervals was data related and not a bug.
Fixes#314.
This patch enables more data series to be plotted on a CP plot.
We can now show curves for heartrate, cadence, speed and torque
as well as the original power and energy.
The CP code is refactored into the plotting functions and a new
RideFileCache that precomputes the mean-max as well as distribution
data (for a later patch to show histograms across date ranges).
The code for computing mean-max values has been re-written and
significantly optimised by;
* computing 1s intervals up to 5mins only
* computing 20s intervals for the remainder of the ride
* downsampling data to 5s samples for longer durations
* using a binary file format (cpx) for faster read/aggregation
* using multiple threads
Testing on an old Athlon dual-core showed an increase in performance
over the old cpi code of approximately x20, but since new data series
are now computed it is only x4 faster. Quad/Octo core systems will
show a greater performance increase though.
Fixes#312.
Fixes#285.
This patch enables more data series to be plotted on a CP plot.
We can now show curves for heartrate, cadence, speed and torque
as well as the original power and energy.
The CP code is refactored into the plotting functions and a new
RideFileCache that precomputes the mean-max as well as distribution
data (for a later patch to show histograms across date ranges).
The code for computing mean-max values has been re-written and
significantly optimised by;
* computing 1s intervals up to 5mins only
* computing 20s intervals for the remainder of the ride
* downsampling data to 5s samples for longer durations
* using a binary file format (cpx) for faster read/aggregation
* using multiple threads
Testing on an old Athlon dual-core showed an increase in performance
over the old cpi code of approximately x20, but since new data series
are now computed it is only x4 faster. Quad/Octo core systems will
show a greater performance increase though.
The controls for the RideEditor (find) and AllPlotWindow
still try and do their thing when the current ride item
is NULL. This was either because it wasn't checked (or
expected) or the widgets in question were not notified. This
patch fixes this.
When I get a chance the whole codebase needs to be refactored
to gracefully handle NULL rideItems -- each plot/window should
clear state when it is notified that NO ride is selected.
If you delete the last ride and then select an interval in the
interval widget Interval summary window crashes. This patch fixes
this. It should have been picked up in the Null ride files tests
from last week, but slipped through.
I discovered a crash of GC when doing the following:
* Load two rides (you can load the same ride for 2 different days)
* Go to the Ride Plot tab
* At the bottom, choose "x-Axis shows distance"
* Switch rides in the "All Rides" widget
* GoldenCheetah should crash. At least, it does for me when I load the attached ride file.
Fixes#242
Fixups to compile video on WIN32 and added more configurability
in the realtime screens, but still not the chart and video use-case
needs to be decided.
The refactoring of the weekly summary window to use metricDB
and the introduction of HR zone config in options removed
the hr time in zone table on weekly summary.
This patch re-introduces it.
The refactoring of the summary window to use metricDB and the
introduction of HR zone config in options removed (temporarily)
the table on ride summary.
This patch re-introduces it.
GoogleMapControl crashes when the sidebar is hidden then shown
before a map has been drawn. This is because the resize event
attempts to redraw the map before all private data has been
initialised (in this case rideData is empty).
When no ridefiles are available (new cyclist) or the last ridefile
is deleted the current ride will be null. In addition the ride
importer deletes the memory for a ride imported to ensure VM is not
exhausted on large imports.
This patch fixes a whole host of null errors across the codebase. They
were identified by creating a new cyclist, executing every menu option
and tab/chart and then importing a file choosing everything and then
deleting the file and choosing every option again.
This negative testing should be performed before every stable release since
it has identified at least 6 bugs which are almost certainly present in the
current V2 code.
Refactoring of WeeklySummary to use the metricDB (speed optimisation)
introduced a bug where the ridefile iterator was erroneously used
whilst computing daily averages. This patch fixes this by using the
daily iterator instead.
Many thanks to John Ehrlinger for identifying, reporting and helping
to diagnose this defect.
Update to training mode to improve the UI and overall
user experience. This initial patch introduces:
* Video Window - but ghetto and not fully functional
* Congigurable - drag and drop 'dials' onto homewindow
In future updates we need to:
* Support Video fully - Only Linux in this patch
* HomeWindow - Make Training mode the same as HomeWindow
* More Dials - Support metrics (e.g. BikeScore)
* RT Charts - Make RT plot drag/drop and support other
types of charts (e.g. Time In Zone)
* Controls - Add more controls for FFWD/REW, Skip etc
This patch has been tested on Linux ONLY. It is being committed
to support further build/deployment work for Win32 and Mac OSX.
This means that libusb0.dll does not have to be included in the
Golden Cheetah distribution - the code will load it automatically
from windows\system32 on demand when realtime mode is invoked in
Native ANT+ mode. Insertion of a USB2 ANT+ stick will cause Windows
to download and install libusb0 automatically.
This patch adds support for the Garmin USB2 stick using
libusb-win library. Instructions are included in gcconfig.pri.in
for configuring and installing the neccessary libs.
To enable support for USB1 and USB2 support in the same binary
stubs are created when UsbXpress/Libusb are not available and the
device i/o attempts to use USB2 before falling back to USB1.
Since I was also in the middle of some coding changes I merged
my developments (Mark) with Darren's patch whilst fixing it up
for commit, namely:
1. the configuration screen no longer demands a COMx port
when using Native ANT+ on Windows.
2. new signals in ANTChannel notify the ANT class when info is
stale or lost (but they are not used at present).
3. The previous debug messages have been removed, although new
debug messages are added for stale/drop/timeout signals.
A patch to create an 'antlog.bin' in the current working
directory when working with ANT+ devices. This is to enable
users to test the ANT+ support and share the received messages
to diagnose issues related to parsing messages and displaying
telemetry.
This 'antlog.bin' will ultimately become a native ant file format
and have an associated extension (.ant) and a ridefile reader.
For now it just writes a stream of fixed length messages (12 bytes)
of all received messages.
Fix SRM power decoding to stop requiring a new message
pair whenever a zero change occurs - this was erroneous
and severely limited the update rate. Power and Cadence
updates for SRM are now immediate.
Desk check of support for Standard Power messages showed
that the code was interfering with normal cranktorque or
wheeltorque power calculations. This did not show up with
SRM cranks since they do not send standard power messages.
This should help to resolve issues with erratic/incorrect
power readings from Powertaps. I am not sure if Quarq cranks
send standard power messages, but if they do then this should
improve power readings for those too.
If you have no valid zones configured for the week being
displayed the weekly summary window crashes on an assert.
This was caused by new code for v3 which uses the metricDB
to avoid unneccessary computation -- but introduced this
error.
This patch provides support for Garmin USB1 sticks under
Windows. Since the device does not present a serial port
this code uses the USBXpress API from SiLabs that the
Garmin device uses.
Support for USB2 sticks is pending.
To build you will need to download and install the SiLabs
development kit from http://www.silabs.com/products/mcu/Pages/USBXpress.aspx
and set USBXPRESS_INSTALL appropriately in gcconfig.pri. I
have provided instructions in gcconfig.pri.in.
At runtime the SiUSBXp.dll will need to be in the path, I will
assume that Gareth will fix up the windows installer for this, but
for now just copy the file manually.
Tested with a GARMIN USB1 stick on Windows 7 with SRM, Garmin HR and
a GSC-10 dual speed/cadence device.
There are other minor fixes to the ANTMessage code in this patch
related to decoding of calibration messages.
Couple of little tweaks to the Native ANT support. Firstly,
data channels such as watts, hr and cadence are now rounded
to an integer (lots of grid lines in ride plot looked nasty).
Secondly, basic support for calibration messages; this has been
limited to SRM messages, but will add support for other devices
as we start to debug them.
Part 3 of this work is still pending, this patch only contains
adjustments to part 2. I suspect there will be further adjustments
as we squash bugs for Quarq and PT users.
Second stage of development, refactored the quarqd sources and introduced
an ANTChannel and ANTMessage class.
This is a functional patch and should work with known ANT+ devices, but
has only been tested with a Garmin HR strap, GSC-10 dual speed/cadence
and SRM wireless cranks. It has only been tested with a first generation
Garmin ANT+ USB stick.
It *should* work with other devices (e.g. Powertap, Quarq) but this has
not been tested.
The configuration pane has not been fixed yet, so you can either add a
Native ANT+ device and leave the profile blank (it will autodiscover
whatever it can when you run) or you can copy the profile from a Quarqd
device and use that.
There are lots of bugs;
* Calibration is not supported, uses a static srm_offset
* Wheel circumference is fixed at 2100mm for speed calculations
* Timeouts are hit and miss and need to be completed
* Sensor loss / timeouts are not managed yet
* Burst data and Acks are not handled
* Device descriptions, versions and battery messages are not handled
Aside from the bugs above part 3 wil also need to include;
* Configuration screen fixups and device pairing
* Add a calibration button to the realtime window
Lastly, the refactoring of the quarqd code is incomplete, there is still
a need to use ANTMessage across the code, especially within the ANTChannel
code which still does a bit of decoding locally.
When an interval (or intervals) are selected in the
interval tree, the new window below the tree now shows
summary information for the selected interval(s). This
is beneficial for example when the Ride Plot tab is shown
and the user also wishes to see summary info about the
intervals. This fixes#77.
I think there is still room for improvement on the fields
displayed and the formatting of the summary window. For now
the fields are the same as those displayed in the Ride Summary
page.
1. Allow FIT reader to recognise the file comes from a Garmin Edge 800
This is Garmin product ID 1169 in the decodeFileId routine.
2. Ignore global_msg_type = 72
This message appeared with the introduction of the Garmin Edge 800.
There is no FIT SDK that tells us what this message is.
It appears only once and has timestamp/device serial number.
Code now recognises the msg_type as valid but we don't process it.
3. Add all decodeEvent types and work only with "timer" events
Not all event_types were present. They are now all in the function.
Previously the decodeEvent would look at all "events"
We now only decode event_types if the event is of type "timer".
Fixes: #250
SRM5 basically is the same as SRM6, but lacks "blocks". This means, it
only has the date of the exercise and no further absolute time info.
Furthermore it can't flag periods of time, where no data was collected.
Due to lack of absolute time, Exercises start at 0:00, by default.
Fixes#208
The load timer was simply being accumulated with each firing
of the timer. This resulted in inaccuracies. The fix is to
accumulate using a timer that measures the duration between loadUpdate
calls.
The speed, average speed, gradient, and distance LCDs ought to always
display 1 significant digit to avoid bouncing. This is now fixed.
This commit fixes#262 and fixes#263.
The recent fix for date range selection was not applied to the
TreeMap plot and caused a SEGV on restart (when placed on home
window). This fixes that.
It also fixes a minor cosmetic related to QFrame margins.
A previous commit stopped disk updating from working, i.e. saving
workout data to a .csv file. This patch fixes that.
Fix supplied by Greg Lonnon, Fixes#254.
The newer Racermate FTDI based USB adaptor (USB-StereoJack) failed
to receive data from the Computrainer, this was due to incorrect
flow control settings.
Fix supplied by Eric Brandt.
The newer Racermate FTDI based USB adaptor (USB-StereoJack) failed
to receive data from the Computrainer, this was due to incorrect
flow control settings.
Fix supplied by Eric Brandt.
First stage of development, folding together the
quarqd sources and creating an ANT+ worker and controller
to work with realtime window.
The basic code is folded together and compiles fine. The next
step is to address the channel management code, device discovery
channel assignment and channel event handling. This will be pushed
as part of the next commit.
The third commit will need to fixup the configuration pages to
support selection of device/baudrate, fix native discovery/pairing
in config and lastly, fix a long standing issue with the config pane
to allow editing of existing device configurations.
This is NOT a functional patch yet, but compiles and runs fine. Committed
as a checkpoint before refactoring quarqd supplied code.
This fixes issues with date range editing in the Metrics controls
and provides support for Season load planning (under development).
Creating and selecting seasons is largely managed within the
Metrics tool. This has not been changed with this patch. Athlete
seasons are now managed as a member of the MainWindow class (although
this will move to an Athlete/Cyclist class when MainWindow is
refactored).
A Season identifier (UUID) has been introduced to enable Seasons to
be referenced independently of their name or date ranges. The LTM
tool now keeps track of changes to Seasons (when new seasons are
created, changed, deleted). Additionally, the Season XML file now
supports storage of a Season Load Plan.
toMSecsSinceEpoch() is from Qt 4.7. Replaced with an implementation
based on QTime:start() and QTime.elapsed() from Qt 4.6.
There is now a theoretical upper limit on turbo sessions of 24 hrs :-)
Fixes#247.
A wizard to create workouts based on absolute wattage and time
relative wattage and time (to CP60) slope and distance and import
an existing ride, and provide some smoothing to the ride data.
Also fixes NP calculation SEGV when recIntSecs is negative.
Fixes#249
Instead of adding 200ms to the elapsed time on every gui update,
this patch records the timestamp of when the Start/Pause buttons
are clicked and subtracts these from the current hardware clock time
to calculate elapsed total & lap times. Fixes bug #235.
Russian Translation from Gwelu
Czech Translation from Beeda
Updated Japanese Translation courtesy of Key
Updated German Translation courtesy of Luke
Golden Cheetah now supports 7 languages!
Fixes previous CalDAV support, as MobileMe based calendars
now work ok. Additionally, a new 'id' field has been created
to provide a persistent and immutable identifier for a ride
file (regardless of changes to date/filename).
The URL provided in the Calendar config pane can now include
'@' symbols (they are translated to %40).
The CalDAV URL should be provided for a calendar collection and
not for a principal. Examples being (trailing slash is significant):
Google : https://www.google.com/calendar/dav/xxxx@gmail.com/events/
MobileMe: https://cal.me.com:8443/calendars/users/x.xxxxxxxxxx/home/
A new menu option and associated config to integrate the
diary window (and ridefile history) with a calendar server
that supports CalDAV (iCal, Google, MobileMe).
This patch introduces an upload to calendar function and is the
first step towards adding calendar based planning functions.
It is important to note that no local calendar is maintained, we
are simply integrating with an existing calendar service.
It has been tested with Google Calendar, further testing and
enhancements are ongoing for users of Apple's MobileMe.
A couple of nits in the code were picked up by
gcc-4.5; const in a function returning non-const
and an unneccessary initialisation of a QList calling
the constructor directly.
Fixes#236.
A new menu option to export the ride metric data
as a CSV format file for manipulation in tools like
Excel.
It exports all rides (no date range) and outputs the
date in US format month/day/year, with time in 24hr format.
Additionally, a 'hack' to export all rides in GC format has
been removed since it was erroneously included in the initial
v3 branch.
If you click on a title bar to stick the controls
for a window it was getting moved to the end of the
charts (the default action for move chart).
This patch fixes this.
- German translation update
- Virtual power in realtime
Conflicts:
src/DeviceConfiguration.cpp - needed to adjust
to use appsettings for read/write of application
settings.
Virtual Power - included patch from Mark Liversedge & corrected bug
with his help.
GSC-10: Check dual sensor 4th and speed-only sensor (which is rare) as
5th.
This means that an all-Garmin setup (ANT+ stick, GSC-10 sensor) will
always work. A speed-only sensor is almost useless in GC real-time
mode anyway, because speed-only sensors tend to run off the front
wheel which will be stationary on a trainer. Fix pointer problems with
device controller/config.
Fixes#219
The previous commit enabling tile 'bumping' as
you move them around proved impractical with
charts that largely filled the screen.
This patch replaces this approach (original code
is retained though) by using a 'cursor' to show
where charts will be dropped / moved to and moving
or dropping to this position.
This means the layout code is complete, except for
potentially adding support for multiple layouts (e.g.
have saved layouts for different purposes like
LTM charts for last 6 months or 28 days or an
agenda view that shows past week next week calendar).
kJoules : take the avg power and multiple it by the number of seconds.
bikescore, xpower : added a rideFile object to calculate the bikescore, xpower on a 5 second
period. It has it's own timer.
fixed display of speed and avgSpeed:
old aglorithm would not display the tenths place if it was zero. New aglorithm
always displays the tenths place.
Signed-off-by: Greg Lonnon <greg.lonnon@gmail.com>
More work to support moving tiles on HomeWindow. This update
adds tile movement and 'pushing' other tiles out the way as
you move them around.
Tile ordering/positioning is still todo, but this introduces
the visual feedback during a move for the user.
Simple, but oh my, what a difference. This two line
patch removes the nasty line artefacts on a bar chart.
Those are the lines that get 'left behind' when a bar
is drawn next to another one.
If ICAL_INSTALL is not defined in gcconfig.pri
then diary/calendar functions are not compiled. This makes
libical an optional dependency, like libkml, libqwtplot3d et al.
blue marker = start of ride
red marker = end of ride
green markers = interval markers.
interval markers has the interval metrics displayed.
end marker has the ride summary displayed.
Fixes#169.
Provides 100% coverage of language texts*
* a couple of texts for WeeklySummary window containing html
codes (gt,lt et al) had not retained their encoding using
>, <, whilst I edited a few of them in the file, these
two were particularly complex and challenging. We can fix
them later. [Mark Liversedge]
This patch plots bars next to each other, rather than overlaying
them making the data much easier to interpret. The code is inspired
from Robert Carlsen's weekly summary.
The "transparency" for the bar colors has been adjusted to make
the coloring more vobrant since we no longer need to 'see through'
bars to see what is underneath.
The CSV ride parser now checks for empty rides and returns
a NULL ride if there are no samples. In addition, the rideEditor
tries to set editorData even if the ride is NULL. Lastly, the
RideItem code for lazy reads of RideFile data didn't check for
NULL values (!).
The signal/slot connection in RealtimeWindow for the 'stop'
button fails. The code wants to pass DEVICE_OK to the slot
but the QWidget connect method wants a SLOT signature.
This patch sets a default of DEVICE_OK for the newly
introduced 'status' parameter to the Stop() method and
corrects the signature used in the connect statement. As
a result, if the Stop() button is pressed the status will
be 0 (DEVICE_OK).
If you press start then stop really quickly and there *is*
a device error then it will still create a CSV file with no
samples. The CsvRideFileReader should be fixed to parse
these files correctly.
The bar charts on the metrics tab are a bit on the
quirky side. This is an artefact of the qwt library's
lack of a bar chart style.
This patch adopts the same approach used in weekly
summary charts and the histogram 'by zone' plots.
Fixes#185.
TRIMP was using time_riding to calculate points
even though the HR average is for the entire ride.
In addition, time_riding may be zero when only
HR data is present (there is no way of determining
time spent or not spent riding).
Fixes#187.
Ride files may be created as hidden files in some
instances on Windows 32. This patch ensures that
they are subsequently included in the ride list
(i.e. ride files can be hidden files).
Fixes#176
While the last patch for misaligned SRM Intervals did fix the out of
bounds indices (and thereby fixed the crash), it got the start/end
swapping wrong. In other words: It swapped start/end where it shouldn't
and therefore broke all interval handling.
Tacx HRM exporter does not create an [IntTimes] section.
When the [HRDate] section is encountered, This patch creates
a single interval in the intervals list, which has the
length of the complete ride.
Fixes#23
The code in HistogramWindow::rideSelected() to check
HR and Power zones have been configured for the
ride just selected contained a typo; the power range
would be set to HR and the hr range would be set to
power. This resulted in the wrong options being shown
in the drop down box.
This patch fixes this behaviour.
Last piece of the TRIMP/HR enhancemens to the
hisogram plot; enables HR zone shading, HR zone
colors in options and also fixes the axis to
start at the lowest HR value present rather than
zero.
The logic in the WKO+ ridefile parser tried to
re-use code blocks for working with alt, wind
and slope but as a result ended up overwriting
variables and losing data as a result.
It also mishandled negative values for those
data series.
It also falsely reported iBike files as Ergomo.
Fixes#164
This patch introduces new functionality for working with
Heartrate based data.
* HR Zones can be defined, from Resting, Maximum and Lactate HR
* TRIMP metrics are calculated; TRIMP, TRIMP100 and Zonal TRIMP
* TRIMP metrics can be used to drive the PMC
* Time In Zone metrics for HR have been added
* Histogram window will now work with Power/HR zones
* User Settings have been added to record gender, weight and others
* RideFile has a new tag "Athlete" which is set to the athlete name
Fixes#140
The caf parser now checks what version the file is (100 or 110) and
handles data records accordingly. Files with version 100 have 10
bytes per data record, all of which are known. For version 110, the
first 10 bytes are the same as version 100, followed by 8 bytes per
data record.
The FIT parser will attempt to interpolate data when filling in for smart
recording or if a record is missed. A problem occurs if one of the lat/long
points is missing or 0,0.
This patch will record a 0,0 lat,long if the record is missing in the FIT
file and when interpolating, will set any interpolated data points to 0,0
if the start or end record is also 0,0.
A 0,0 record is not plotted on the MAP tab.
Fixes#111
The patch changes the behavior of the "fix gaps in rides" function. This
now fills stops in rides with the last recorded altitude rather than zeros
as was previous behavior.
fixes#158
Files kindly supplied by Alex Simmons have demonstrated a bug in the
parsing of WKO+ files that contain data downloaded from an SRM
Powercontrol VI. The files are parsed incorrectly and often lead
to crashes or absurdly high summary values.
This might be version specific, since the files were WKO v3 files, we
should watch for WKO+ v2.2 files that contain Powercontrol VI data and
potentially make this version specific if needed.
Improve fix of #132 so that it doesn't require you to enter
a bikescore or daniels point or distance if you do not want to.
Add hints to the appropriate values for the entries.
Fixes#132Fixes#146
in certain circumstances srmwin seems to (have?) written bad files: The
first/last data chunks referenced by a marker were swapped plus the "real"
start index was 0 - although chunks are counted from 1.
This patch checks for this defect and interprets the data in the same way
as recent srmwin versions do when reading files with this defect.
Though the way marker are stored in PCV makes me guess, the refernce the
bad chunk index 0 really means "last" chunk in the recording.
Adds error checking to Tweet Ride. Checks to make sure that oauth
credentials exist, that tweet is under 140 characters, and that
oauth_http_post received a reply indicating a successful post.
Move addition of hashtag to getTwitterMessage() to cleanup length
calculations.
Fixed warning on Bike score estimate label not being used.
Added validators to Bikescore and daniels points manual entry to allow
more than 3 digits.
Added dialog which enforced validator on distance, bikescore and
daniels points.
This fixes#132
Initial version of Tacx Caf file importer. TacxCafRideFile.cpp added to qmake file.
Fixed parsing of heart rate value, Heart rate and cadence should have used quint8
instead of qint8, because they're unsigned.
Fixed#143.
On mac systems, when copying data from excel and pasting into the ride
editor GC would complain about the data ranges not being the same size.
This is a result of the fact that excel mac terminates lines with a CR
(\r) rather than a NL (\n). This patch changes the behavior so that we
check for all three commonly occurring line endings CR, NL and CRNL.
fixes#135
Currently, GC interpolates time gaps in all TCX files as a result of smart
recording. However, this overlooks periods of inactivity (stopped at a light
for instance).
1. Provide a configuration option, that if enabled, will tell GC to interpolate
time gaps in TCX files as if they were a result of smart recording. If the
option is not enabled, then interpolation will not occur.
2. Provide a maximum "high water mark" (in seconds) for these time gaps. The
default HWM is 25 seconds, but is user configurable.
Any time gaps that exceed the high water mark can be fixed via the Fix Gaps
tool under the toolbar.
Fixes#74.
This patch adds an 'Export to KML' option to the ride
menu. It will create a .kml file including power, hr,
torque etc. These can be viewed alongside the map view
in Google Earth 5.2.
Please note this requires libkml. The features of libkml
that are required were introduced in revision 852 which
means that as of Aug 2010 you will need to checkout from
the SVN source repo and build;
svn checkout http://libkml.googlecode.com/svn/trunk/ libkml-read-only
and the ./configure mantra that worked successfully for
me on Mac OS X was;
./configure CC="gcc -arch i386" CXX="g++ -arch i386" --disable-swig
Building on WIN32 is currently fraught with issues, unless
you build via MSVC 2010. Linux is straight forward but you will
need to install / apt-get libcurl.
Fixes#133.
Support for Training peaks new .pwx file format. This
is an XML format (and is particularly verbose). Support
has been added to enable interoperability with WKO+ v3,
TrainingPeaks.com and Device Agent.
When a manual ride is selected whilst on allplot
it will refresh the plots, but computes invalid
offsets into the ride data. this patch fixes this
crash.
Fixes#128.
Gcc 4.5 considers explicit calls to object constructors to
be errors. This patch corrects these to enable building using
this current release of the GNU C++ compiler. This is required
to support building on Windows with the current Qt 4.6 sdk
since it includes gcc 4.5.
It is worth noting that this relese of the GNU compiler also
spots two or three uninitialised variables too, I will correct
these at a later date.
The recent data processor / ride editor patch added some
post-processing actions after a ride file is opened. The
functions are called without checking for an open ride
failure. This patch fixes that stupid error.
The recent patch for allPlot zooming does not display the full plot
properly when the user has selected imperial units and is displaying
by distance (not time). This minor fix corrects this.
Introduce a span-slider on the normal Ride Plot chart to enable
users to select a range to plot and scroll left and right. The
zoom to interval function now uses this slider rather than setting
a zoom range. Tooltips are now displayed on the normal and stacked
views to assist in reviewing specific data points.
Old style zooming still works as expected, but scrolling at a zoom
level is not yet implemented.
The qxt widget 'QxtSpanSlider' has been placed in the top
level directory (GoldenCheetah/qxt) alongside the qwt widgets to
avoid adding another dependency.
A number of optimizations have also been introduced to speed up
plotting in general. A new color setting for the thumbnail plot
has also been introduced. Refresh of the plot when data is changed
in the editor has been fixed. The zoom scale up/down widgets are
also disabled when in normal mode to avoid the bug highlighted by
Robert Carlsen.
Fixes#122.
A new tab 'Editor' for manually editing ride file data points and
associated menu options under 'Tools' for fixing spikes, gaps, GPS
errors and adjusting torque values. A revert to saved ride option
is also included to 'undo' all changes.
The ride editor supports undo/redo as well as cut and paste and
"paste special" (to append points or swap columns/overwrite
selected data series). The editor also supports search and will
automatically highlight anomalous data.
When a file is saved, the changes are recorded in a new metadata
special field called "Change History" which can be added as a
Textbox in the metadata config.
The data processors can be run manually or automatically when a
ride is opened - these are configured on the ride data tab in
the config pane.
Significant changes have been introduced in the codebase, the most
significant of which are; a RideFileCommand class for modifying
ride data has been introduced (as a member of RideFile) and the
RideItem class is now a QObject as well as QTreeWidgetItem to
enable signalling. The Ride Editor uses a RideFileTableModel that
can be re-used in other parts of the code. LTMoutliers class has been
introduced in support of anomaly detection in the editor (which
highlights anomalies with a wiggly red line).
Fixes#103.
Removed redundant assert in BestIntervalDialog.cpp. It is redundant
because it is executed prior to a logic check for the same condition.
The assert check has been shown to be unreliable due to inherent
inaccuracies in float arithmetic and comparisons for example, according
to the IEEE specs 1000.2 - 1000.0 will be stored as 0.200012. This
inherent problem with floats is particularly relevant in this
code since it is dealing with interval durations and recording intervals
which are expressed to a precision of 100th or even 1000th of a second.
Fixes#99.
When viewing the maps tab it is possible to drag and drop
the slider causing a file import dialog to pop-up and fail.
This patch rejects any drop events where the url is http.
Fixes#97.
Three related issues fixes; firstly lat/lon values lose precision when
being read from .tcx files by Qt's QString::toDouble(). This
has been replaced with the stdc strtod() function in TcxParser.
Secondly, when writing to .gc format precision was also lost, this
has been fixed for lat/lon values.
Thirdly, when writing to .gc format precision of seconds was lost,
this is particularly relevant to Powertap files which have a sample
rate of 1.26 seconds.
Fixes#83.
The zone ranges configuration page caused a SEGV when deleting the
last zone. On inspection the zone configuration needed to be
revised since the UI was confusing and didn't allow fine grained
user editing (relying upon manual editing of the power.zones file).
The UI has been redesigned and fine grained editing of ranges, zones
and default zones is now supported.
The Zones class has been slightly modified to support the new UI and
existing members are better commented. In addition, the read/write
functions have been updated to always include the DEFAULTS section and
to set defaults according to manual zone setups when it is not present
(legacy support).
There are now 10 TimeInZone metrics to match the maximum of 10 zones
the user can define.
Fixes#78.
Fixes#34.
TCX files exported from Garmin Connect have power as follows:
<Extensions>
<ns3:TPX>
<ns3:Speed>2.236999988555908</ns3:Speed>
<ns3:Watts>68</ns3:Watts>
</ns3:TPX>
</Extensions>
Fixed parser to read this as a valid power reading.
Fixes#65
Patch changes the valid latitude/longitdue selection alogrithm.
Ensures that the data points are valid (-90<=Lat<=90, -180<=Long<=180)
Tightens up .WKO file import issues.
Allows for missed GPS data points of 0/0 in Garmin FIT files.
Changes mapping function to not plot invalid lat/long values.
Fixes#75
A ridefile reader for Polar .srd format files. The code is
largely based upon code from the "s710" project.
Since "s710" is dependant upon GD and a number of deployment tools
and the fact that the code hasn't changed since May 2007 the
workout code has been included directly into the SrdRideFile.h
and SrdRideFile.cpp source files.
2 sample SRD files have been included in the test/rides directory
which were kindly supplied by Ian Charles.
If no results are returned from metricDB the stress calculator will
SEGV. This will occur when the DBVersion is out of sync with the
metricfactory (and this should not occur).
The new metrics feature requires the SQLITE plugins to be
deployed alongside the binary and the forthcoming Google
Maps patch requires QtWebKit, Phonon, Xml and Xmlpatterns
deployed. Additionally, the terrain view requires the
jpeg image formats deplyed.
This patch updates the win32 NSI script to include these
new dependencies and has been tested for Win 7, Vista and
XP SP3.
fixes#51
The recent patch to reduce redraws when rides are selected
causes each tab to redraw whenever the tab IS selected. This
patch reduces this by remembering the current ride plotted.
It also fixes the "double draw" in GoogleMapControl and AllPlot
when selected for the first time.
A new config pane for defining color preferences for chart
curves, shading, background and grid lines et al. Default values
echo the current hard-coded values.
User configurable data entry for recording information about
each workout.
FEATURES:
* Config UI for defining tabs and fields to maintain
* Config UI for defining keywords and colors
* Data maintenance UI on RideSummaryWindow
* "Special" Metadata fields are related to current variables
* Read/Write new fields/metric overrides via GcRideFile
* Metadata extraction in WKO files
* Calendar uses keyword and color config
* Numeric metadata is plottable on the Metric charts
*Metric refresh has been optimised
Save manual files in .gc format (using overrides) instead
of writing in csv format to a .man file. The .man file is
still supported via ManualRideFile but no longer created
by ManualRideDialog.
RideItem or RideFile or dataPoints() may be null or empty. This
is especially true of manual ridefiles. This patch adds some
checks for this situation and acts accordingly. Additionally, the
disable/enable of tabs depending upon ridefile type has been
adjusted to also include files with not dataPoints.
When saving the value of startTime should be checked to see
if the filename/notes need to be renamed. In addition, RideItem
now allows the startTime to be modified and reflected in the
ride list. When importing .gc ridefiles the file is serialized
with the correct startTime if the user edited it during import.
Primarily to make override() a base class function that can be
used for any metric rather than expecting each metric to provide
a local version.
Also, add explicit notion of "average" vs "total" ride metrics, as
it will let us improve how the metrics DB handles averages later.
New idea: only linearly interpolate between two consecutive "record"
messages. I don't know what else to do. My FIT files have all sorts
of weirdness I can't explain. One, for example, has two consecutive
start events with the same timestamp. What does that mean?
This is all proof that just having the file "format" isn't really
enough. What you need is the file *semantics*, and we don't have that
for FIT yet.
And pay attention to MainWindow::activeTab, such that only the active
tab redraws itself when changing rides. This change really increases
GC's responsiveness when scrolling through the ride list.
I'm not really sure what these are doing in the FIT file Jamie sent
to the list, but there's only one of them, and it's at the end of a
long rest period, so it seems safe to ignore it for now.
The metrics plot did not honour the metric precision setting
when displaying a hover tooltip. This resulted in BikeScore and
other values being rounded inappropriately and inconsistently.
This patch utilises the metric->precision() setting and displays
values consistently when compared to the ride summary. In addition,
the precision for LTS/STS on the LTM PM has been set to 1 decimal
place where previously it was zero.
fixes#50
The Racermate MRC file format for workout files did not
honor TIME/PERCENT format files correcty. The code is a
little confusing because it mixes the device mode and
workout file format. Ideally, the file format and device
mode would be kept as separate state settings, but this
patch at least fixed the bug.
fixes#40
The none option for data selection on the 3d plot is a
misnomer. It suggests that dimensions can be removed. For
example plotting x/y only. In reality, the 3d libs and the
code for managing the plot go to great lengths to ensure a
plot is rendered across all dimensions.
The None option has been removed for this reason. A 2d
scatter plot with user selectable data series should be
coded specifically to render 2d scatter plots.
fixes#30
The GcRideFile stores the ride start datetime in UTC, on write the
datetime is correctly converted to UTC.
This patch fixes the GcRideFile reader to convert in the oposite
direction. Currently the code reads the UTC date as a local format
date - as a result the convert to localtime call does nothing.
SrmRideFile was setting RideFilePoint::interval correctly for
each RideFilePoint, but it was setting the start and stop of each
RideFileInterval it created to 1 RideFilePoint later than they
should be. This patch fixes things so that RideFilePoint::interval
and RideFileInterval::start|stop agree about the interval bounds.
fixed the avg speed and alt
added a possible change for the maps issue
Maps tab is always showing, it will either show the ride data, or No GPS Data Present
Page loading is async with the ride being selected.
Weird WKO gps data issue reported by Mark L is fixed (hopefully) I see different results than Mark L
moved Sean's cp patch to the new location
Signed-off-by: Greg Lonnon <greg.lonnon@gmail.com>
The check in the maps code for whether a CP is set was backwards, causing
a segfault on the subsequent call to Zones::getCP(). To reproduce, create
a new cyclist and import a ride with lat/lng data. The import succeeds, but
GC crashes when you click "Save" and on all subsequent restarts.
Added a headwind data field, which is available when using
an iAero head unit, to dramatically improve the calculation
of Chung analysis for users of more recent iAero devices.
All other data files than the iAero have the headwind term set to
zero when they append a point.
The WKO+ file format version is changing version numbers
at a fairly accelerated pace, but the general structure of
the files are still readable by the WkoRideFile reader.
This patch issues a warning rather than an error on new
files. Recent v29, v30 and v31 of the WKO+ file format have
all been parsed successfully.
fixes#47
A user configurable chart for showing ride metrics and
other calculated values over time.
* Uses SQLITE database to store metrics
* Supports any metric available from the metric factory
* Adds new MaxHr, VI, Peak Power and Time In Zone metric
* Also includes LTS/STS/SB for PM charting
* Aggregates in days, weeks, months or years
* Reads and Updates seasons.xml
* Adds cycles and adhoc date ranges in seasons.xml
* Date ranges can be selected on the plot with shift-left click
* Allows users to customise preferences for color, symbols et al
* Allows user to customise metric names and unit names
* Supports smooth curves and topN highlighting
* Has a linear regress trend line function
* Allows users to save charts to charts.xml
* A default charts.xml is built-in
* A chart manager to import/export/rename/delete charts etc
* Provides a tooltip to provide basic datapoint information
* Performance Manager adjusted to use the MetricDB
* User configurable setting for SB calculation (today/tomorrow)
Fixed a number of issues with data from quarqd inf and nan values where
inserted as valid data points and thus destoying all plotting in the
realtime window and in later analysis.
The unit was used to distinguish between the entities, thus rpm was
erroneously used as a cadence, rpm is used as the unit for wheel
rotation and for cadence. This made the cadence useless together with a
PowerTap hub which reports both cadence and wheel rotation.
No error checking was performed on the received data, bad data is
ignored now.
This patch adds Aerolab, a virtual elevation module. A
new tab is added in which the user can perform virtual
elevation analysis. This version is a manual Aerolab,
where user can use the following sliders to elevation-match
to a known elevation profile:
Crr -coefficient of rolling resistance
CdA -aero coefficient of drag * frontal area
Eta -drivetrain efficiency (to be used when using a crank-
or bottom-brack-based power meter)
Mass -total mass of bike + rider
Rho -density of air
E_offset -an elevation offset to align elevations
GC supports two download port types: serial ports and D2XX. Before, if
either of these failed to load, the download dialog wouldn't show either
port type. With this patch, if both fail, GC displays a warning, but if
either one succeeds, GC will proceed with only that port type. This
change should fix the problem that users were having to download and
install both the FTDI drivers and the PL2303 ones in order to download
from the SRM PCV.
There is a possibility that ride metrics may become unavailable yet
remain requested by QSettings (stored in
~/Library/Preferences/org.goldencheetah.GoldenCheetah.plist on OS X).
This patch ignores any metrics listed in the preferences yet are not
supported by the running version of Golden Cheetah.
Before, we checked them during addMetric, and that left us vulnerable
link-order errors. With this patch, we wait until someone actually asks
for an instance of a metric, and then we check all metrics' dependencies.
That way, since the Ride Summary always creates at least one metric, we'll
still check the dependencies of them all. We just do it a little later in
the program's execution than before.
When working with smaller intervals it is difficult to see the
highlighted points when all the points are shown in black. This
patch adds a 'Frame Intervals' checkbox to enable the user to
turn off all the points when looking at specific intervals.
If no intervals are selected then this setting has no net effect.
All datapoints are shown.
In other words, we're no longer going to support files from broken 705
firmware in GC. However, GC 1.2 contains the check, so people with bad
files can open them in 1.2, export to CSV, and then import into a more
recent build.
Alternatively, if someone comes up with a good way to distinguish files that
need this check from those that don't, I'd be happy to use that.
Added cyclist-info.png to the install directive.
Edited the rsync path to reflect the absolute rather than relative path
to the www root for the goldencheetah website.
The best interval dialog rounded intervals to the nearest second
due to a casting of a double to int. This was introduced by Mark L
during the intervals code patch and is an error.
All the plots have now been adjusted to correctly determine if a ride
point is within an interval. Related cropping and binning issues in
3d plot an Histogram plot have also been corrected.
fixes#15
This is almost a complete rewrite of the functional part of the dialog.
I've tested it on both test files (2010_01_13_*.gc in test/rides).
Thanks to Mark L for pointing out a number of the problems.
When building an installer the nsi file needed to be
updated to reflect new DLL dependencies introduced by
the Model plot.
Additionally, Qt 4.6 is built using gcc 4.4 and now
requires the associated runtime dll.
fixes#21
Scrolling up and down the ride files is painfully slow when
3d is compiled in. This patch uses a setActive mechanism in
the same fashion as the pfpv and performance manager tabs.
Additionally, a recent patch to support user preferences for
units added a settings lookup that was called for every point.
This is also fixed.
fixes#16
When you're trying to download data from an empty PCV, srmpc_get_data()
returns a data structure without chunks. This will cause srm_data_write()
to fail.
While SrmDevice is catching errors returned by srmpc_get_data, it doesn't
decode + report what kind of error (errno).
Adjusted message to include the returned error.
Minor change to handle how duplicate records in tcx files are handled.
This allows for power and cadence to be properly displayed for rides
with no distance information (e.g. trainer rides).
The serial code was Linux/Mac only and utilised termio/tcsetattr
functions that were not available on Windows platforms. This patch
ports the serial code to the Windows APIs using the same approach
as the Computrainer.cpp code. It allows us to support old-style
serial download cables on Windows. (We already supported them on
Mac and Linux.)
The pedal force channel was incorrectly named - it should have been
the torque value. The AEPF/CPV values are derived from the power
cadence and cranklength. This is corrected with this patch.
Additionally, the axis labels positioning has been amended to be
more appealling and position more appropriately.
The bodge to manage so-called 'optional padding' which led to the
need to keep updating constants like 0x8014 et al was caused by a
misunderstanding of how Distribution Charts are recorded in a WKO
file.
This patch correctly decodes these segments of a WKO file and as
a result remove the need for the optpad2 function. There are still
some 'weird' constants that are parsed, but these are limited to
the artefacts resulting from the fact that the WKO software uses
MFC persistent object format to write the file data and these
constants reflect the POF Archive PIDs.
This file relies on Qt's QDataStream to handle the parsing
of primitive C types from Computrainer .3dp files, including
floats. In Qt4.5 and earlier, Qt defaulted to 32 bit
floats. In Qt4.6 and later, Qt started using 64 bit
floats by default. As a side-effect, parsing broke on
Qt4.6, leading to a crash when importing or using .3dp files.
This patch fixes the issue by using QDataStream's
"setVersion()" method to tell Qt to use the Qt4.0 serialization
format for the QDataStream used in this file. This
patch does not affect any other files. This patch
should make the formatting assumptions both backwards
and forwards compatible.
I think the previous implementation could have referenced already-deleted
RideItem objects during calls to Split Ride.
This commit removes the calendar's own map of RideItems, and instead
uses the list of rides in MainWindow::allRideItems. Because I use
binary search on that list, this implementation should be just as fast
as the old one. But because I don't hang on to any RideItem pointers
beyond a single call to RideCalendar::paintCell, it shouldn't be
vulnerable to referencing already-deleted RideItem objects.
Since the daily stress values are readily available
from the stress calculator this patch shows them on the
chart to show the make-up of the training that has resulted
in th short term and long term stress scores.
Ideally, we would also show the relative intensity for each day
too so you can view, at a glance, the intensity AND volume of the
ongoing training load -- but the intensity is not readily available
in the calculator or the stress.cache file.
Need to call item->ride() in order to load the ride, and should ignore those
for which the result is NULL. Do this after checking the date, though, so
that we don't load older rides into memory.
Before, if distance and speed were both zero, time_riding was set
to zero, and the manual ride time would not be included in the
weekly summary. This patch fixes that by overriding time_riding.
Fernando Maldonado pointed out that if he deselected, for example, Cadence on
the Ride Plot, then switched to another ride, the Cadence check box remained
unchecked but the Cadence curve showed back up on the plot. To hide the
curve, he had to check and uncheck the box again. This commit fixes that bug.
I'm not entirely happy with this fix. I'd rather AllPlot had access to the
QCheckBox objects in AllPlotWindow, but I can't think of a clean way to do
that. This patch at least seems to work.
A new tab on the ride analysis view for analysing ride data in three
dimensions. Interval selection is supported and a z-axis slider is
available for helping to identify data in the z-plane. A color legend
is displayed since coloring is independent of x/y/z values.
Coloring and Z axis values are averages for associated values of x/y.
The code requires qwtplot3d to be installed (see gcconfig.pri.in) and
with older Mac dev envs you will need to add -lz to LIBS too. (LIBS += -lz).
On Linux qwt3d_function.h needs a #include <stdio.h> added to compile.
Greg Steele helped design and test.
There are 2 open issues x/y/z axis labels occasionally appear in the
wrong place. lastly, the bin selection is for X&Y bin sizes and it
would be better to have separate sliders.
This commit adds a page to the config dialog in which the user can choose
which metrics GC will show for intervals. The GUI design could use some work,
but the functionality is there. All implemented metrics are available to
choose, and choices are saved across restarts.
Move the logic for how to compute RideMetrics from a RideFile, including
dependency tracking, out of RideItem and into RideMetric. I'm going to start
using them for intervals as well as rides, and I don't want to construct a
RideItem for each interval. It also seems more natural here. For
performance, RideItem still caches the computed metrics for a RideFile.
In the average column of the RideSummary, we don't need to re-emphasize that
the averages names' start with "Average ". I hope this doesn't cause
problems for translation.
Instead, just list the symbols of the RideMetrics for each column, then get
the name and precision of each metric from the RideMetric object. This change
builds the groundwork to letting the user specify which metrics to show.
The symbol of a ride metric is the string by which we refer to it in the
code, configuration files, and caches (like stress.cache). It should not
be translated, and it should never be shown to the user.
If the user forgot to end an interval before downloading a ride, GC
would crash due to an assertion failure. The included ride file
demonstrates the bug.
Another rightclick menu for intervals, adding a bring to front and send to
back option but only when viewing the pfPvPlot, additionally the algorithm in
PfPv plot for determining which interval a point is used for has been adjusted
to fully populate every interval curve where appropriate (and incorrect
comments and redundant code have been removed).
IntervalItems now have a display sequence number so when you have
overlapping intervals you can bring to front and send to back on the
PfPv plot. The display sequence could be used on other plots if/when
they distinguish between intervals.
Previously, the coloring of intervals on PfPvPlot was determined solely
by the order they were defined which could be quite confusing.
This patch removes the QToolBox from commit e93970 and replaces it with
a QComboBox instead. A new object ViewSelection can be included in any
new views and will manage the interaction with MainWindow to switch
between views. It is essentially a QComboBox with some code to interact
with MainWindow.
A new signal viewChanged(int) has been implemented in MainWindow to
notify of a view change. The parameter will be set to VIEW_ANALYSIS
or VIEW_TRAIN depending upon which view was selected.
In addition, a new TrainWindow object has been created which implements
the Realtime code and is comprised of the TrainTool and TrainTabs
implemented in e93970. It also sets its splitters from remembered values
in the same fashion as the central splitter on the Analysis view.
Summary analysis suggests the new (v29) of the WKO 3.0 file format does
not contain any differences (or noticeable) to the previous version.
This patch enables files to be imported using the existing code instead
of being rejected because they are 'newer than the supported format'.
Further testing and analysis will be performed on the WKO 3.0 file formats
but this patch should enable users of v3 to import there files into GC.
The left side of MainWindow is now a toolbox which contains
Ride Analysis and Racing and Training options. The Right side
tabs have been reorganised and associated with the toolbox.
To support the population of the Racing and Training left tool
the config dialog has been updated to enable the user to configure
the location of their workouts.
In addition, the config dialog now calls upon MainWindow to issue
a configUpdate() signal to notify widgets when config has been
updated. This is a refactoring of the existing mechanism that
only called realtimeWindow->updateConfig, now any widget can
connect to the MainWindow signal and re-read its config appropriately.
Currently, the TrainTool and RealtimeWindow widgets have been coded to
use this.
This commit allows every ride file to specify a set of "metric overrides":
values to use in place of those for RideMetrics we would otherwise compute.
The most gratifying immediate result of this change is that we can associate a
"skiba_bike_score" metric override with each Manual CSV file, thereby
eliminating the need for a bogus "bs" parameter in RideFilePoint.
In the future, though, we can also save these overrides to a GcRideFile using
a syntax something like this:
<override>
<metric name="skiba_bike_score" value="100"/>
<metric name="average_speed" secs="3600" km="30"/>
</override>
(Note that average_speed needs to store time and distance in order to
aggregate properly.)
Then we can add a dialog that allows the user to override the computed value
of a metric for any given ride. For example, if my HRM was on the fritz
during a ride, I could estimate my average HR and override that metric.
(We might want to show these overrided metrics in a different color, so that
it was clear they weren't the computed values.)
Finally, I think we could actually use this feature to eliminate the Manual
CSV format altogether, and just use GcRideFiles without any samples or
intervals, but with metric overrides for all the available metrics.
The stress calculator works through every ride and updates stress.cache.
After each file is processed its details are wiped with a freeMemory, this
causes unsaved changes to be lost (isDirty is ignored).
This patch adds a check to make sure the file is not dirty before the
in-core values are deleted.
The docs for CreateFile indicate that to open a comm port above
COM9 you must use a filespec of "\\.\COMX". The original code
did not apply this rule and failed to open ports above COM9 as a
result. This is especially important since it is quite common for
the USB->Serial converters to assign an assignable comm port number.
When setting up the CP for a new cyclist the code for inserting
ranges called setCP with an unitialised range number variable. This
fix sets it to 0 for the very first range.
Also fixed the indentation of the code around the fix to make it
easier to follow.
With the introduction of the rideSelected signal the RideFile was
opened (as previously) by the RideSummaryWindow::htmlSummary()
member. In some cases, this signal was processed by RideSummary window
AFTER the other charts (AllPlot etc) this results in 'No data' being
shown on other charts.
This patch moves the file reading to RideItem::ride() which was previously
a public RideFile * (that is now a protected member ride_). As a happy by
product it removes the need to check if the file has already been read
across all other functions ensuring in-core values are not accidentally
overwritten. The read errors are made available by a new RideItem::errors()
member.
This modification is required to support the RideImportWizard in freeing
loaded RideFiles during batch import to ensure virtual memory is not
exhausted when large numbers of files are imported at once. This modification
is also included in this patch.
The commit replaces the erroneous commit a3ae0ee. I thought the problem with
the zones file that motivated that commit was that some of the zones were of
length zero. In fact, the problem was just that the CP is zero in the first
zone range, and a CP of zero leads to a RI of inf.
The code to set the critical power for the cyclist page in the
config dialog calls zones->getCP(currentRange) when currentRange
is -1 (out of bounds). This caused a SEGV. This patch checks for
a -1 value and sets CP to 0 rather than calling zones->getCP.
Hack: SRM PCV download cables use the PL2203 chipset. If the
first device name contains "PL2303", then, we're probably dealing
with an SRM, so go ahead and select the SRM device. Generalize?
The find peak intervals added intervals with 0km for start and stop. They
now get set appropriately, so peak intervals display correctly when viewed
in byDistance on AllPlot.
RideFile data points now include lon and lat members for the longitude
degrees and latitute degrees from the source ride files. As a result
most of the RideFile readers now set longitude and latitude to zero for
each data point, except for:
* Gc Format Files - now support read/write
* Wko Format Files - now support read
* Tcx Format Files - now support read (smoothed if smart recording)
Although there are no features within GC at this point in time that use
positioning data this may change over time. Critically, as users save
files to the new GC file format whilst adding interval data it is
important that this positioning data is not discarded before new
features arrive.
The find peak powers functions was previously adding peak intervals for
durations that were longer than the entire ride, for example a 20 minute
ride would still have a 30min and 60min peak power interval added.
The duration of the ride is now checked and only peak intervals that
are shorter or equal to the length of the ride are added.
When a user creates a new interval by selecting a section of a ride
on AllPlotWindow the newly created selection now has the average power
for the selection placed at the end of the selection name in brackets.
Replace handcoded binary search in RideFiletimeToDistance() method
in RideFile with lower_bounds, since it is more efficient. The
distanceToTime() method has been removed since it is not used.
The class member IntervalItem::name is redundant since it is a duplicate
of the text() member of the base class QTreeWidgetItem. By removing it
we both simplify the code and remove the need to keep name and text in
sync when renaming and creating intervals.
As a result the itemChanged signal that was connected for renames and
then disconnected when the items are cleared can be connected once
and no disconnect is neccessary.
This connect/disconnect oddity was originally to avoid a SEGV that
resulted from accessing text() whilst the QTreeWidgetItem was being
destroyed. The code for removing intervals when a new ride is selected
no longer destroys and recreats MainWindow::allIntervals (which was also an
artefact of the original code to avoid a SEGV).
The ConfigDialog is modal, so it needs to delete itself. However, the
existing code contained a bunch of destructors with calls to delete on
widgets. That's wrong. Widgets are automatically parented on being added to
layouts, the parent widgets delete their children in their own destructors.
So remove all the explicit deletes.
The new intervals code removed some replots() to stop flickering but
they also removed critical refreshes after CP and Cadence values
are updated by the user using the entry fields on PfPvWindow.
Additionally, the setData() function was used to refresh all curves
when intervals were selected which caused user entries to be reset.
This patch introduces PfPvPlot::showIntervals() to only refresh the
intervals curve and fixes replots() to a) replot when neccessary
after a user entry but b) to not replot mid-refresh in the zones
background function.
The PfpvPlot::setData() function only sets the main curve (all the
black points).
When the user changes CP, CAD, CL in the window dialog they call
replot() explicitly rather than assuming the utility functions will
do it for them, since the utility functions are called within
setData (amongst others) and results in multiple replots() that are
ugly, but more importantly make it difficult to spot the deltas on
the plot as new intervals are overlayed because they all disappear
for a split second.
This change allows us to connect the zonesChanged signal to the ride summary,
so that we don't have to call ride->htmlSummary as a special case whenever
we call zonesChanged. It will also come in useful later when I introduce a
rideSelected signal.
Computrainer 3D software lets you start your ride partway into
a course. But, if you do this, the first distance recorded
in the log file is the distance you started at, rather than zero.
GC expects the first data point to be at distance zero, however,
and therefore this causes total distance to be reported incorrectly.
This patch fixes the bug by remembering the distance of the
first data point, and subtracting that from all distances
reported to GC, so that distances are zero-based (i.e.,
so that the first data point is always at distance zero.)
Fixed a crash due to threading of the socket.
Improved performance of discovery()
Improved ability to recover from a lost channel
Fixed bug where channel ID's weren't being correctly sent.
GC wasn't waiting for Qt to return from connecting to the host. It now is.
Fixed When the user hit stop then start, the realtime thread did not start.
Specifically:
1. The previous code assumed the wrong units while extracting
speed and distance from a .3dp file. Computrainer stores
speed in (miles per hour / 160), and distance in kilometers.
This patch converts .3dp speed/distance data points into
kph and km correctly. As a side-effect, speed and distance
are displayed correctly in GC windows and calculations.
2. This patch adds code to extract altitude data from a .3dp
file and include it in a ride.
3. .3dp files do not have a consistent inter-datapoint time
interval. Since GC expects one, the earlier version of this
code averaged 1000 data points from the middle of the ride to
estimate this interval. Unfortunately, this approach caused
a bunch of problems for various calculations that GC does,
such as calculating the riding time (vs. workout time),
average speed, xPower, critical power plot and FTP, and so
on. [GC assumes that # data points * inter-datapoint-interval
= workout time, but this isn't true when you used an estimated
interval.]
To fix this, this patch adds averaging and interpolation code
to covert the data point sequence in the .3dp file to an
averaged sequence with a data point every 250ms. Since the
inter-data-point interval is now fixed, these calculation bugs
went away, and correct values are now calculated and displayed
by GC.
4. Fix (3.) has another useful side-effect: the number of data
points per ride given to GC goes down by 10x. (Raw .3dp files
have a data point every 30-50ms. This averaging/smoothing
code emits a data point every 250ms.) Since the critical
power calculation is an O(n^2) calculation, the time for
this calculation is reduced by 100x. Instead of an hour
to do the calculation for a typical 2hr ride, it now takes
less than a minute.
5. The code was cleaned up in several regards: comments
were added to help document the .3dp format and explain
the averaging/smoothing code, and types from boost/cstdint.hpp
were used instead of native C types when using a variable
of a specific size (e.g., the code now uses uint16_t instead
of unsigned short, etc.).
This patch was built by Steve Gribble and Daniel Stark.
I want to add Daniels Points to the ManualRideFile format, but until then,
simply estimate them from the BikeScore based on a weighting I took from some
of my long rides. It's mostly on long steady rides that I estimate BikeScore
as part of a ManualRideFile, so hopefully this isn't too terrible as a
temporary patch. A better fix is in the works.
Commit 420b2b6 introduced a bug whereby it used the total workout time,
rather than the time riding, to compute xPower. This should only affect
your data if you take long breaks during rides, like to stop for brunch,
or if you store multiple rides in the same ride file--i.e., you don't
use the split ride feature. Nonetheless, it's worth deleting your
stress.cache file after applying this commit, just in case.
I've also added three rides, notes, and a zones file to the test directory to
illustrate the differences discussed above. The first ride is just an hour at
CP/FTP. It should have a BikeScore of very close to 100, and Daniels Points
very close to 33. The next ride is the same as the first, but followed by 20
minutes of coasting. Its Daniels Points should be the same as the former,
but its BikeScore should be a good bit higher. The final ride is the same as
the first, but interrupted partway through by 30 minutes of no riding at all,
as though the cyclist stopped for coffee and a pastry. It should have
nearly identical BikeScore and Daniels Points to the first ride. In the
broken implementation of xPower that this commit fixes, it did not.
Dan C: I reverted your changes to the xPower calculation in this commit and
went back to my implementation. It's just easier for me to think about the
code that way. My apologies. I kept the other changes you made, though.
Fit a curve to the points system in Table 2.2 of "Daniel's Running Formula",
Second Edition, assume that power at VO2Max is 1.2 * FTP, further assume that
pace is proportional to power (which is not too far off in running), and scale
so that one hour at FTP is worth 33 points (which is the arbirary value
Daniels chose).
Just attribute all earlier rides to the first zone. We should do better in
the future, maybe by complaining to the user in a dialog, but for now,
not crashing definitely seems better than crashing.
This seems like the right call to me. If I'm doing an interval and I stop
riding for some reason, I'm resting, and that should affect my average power.
I thought it was always this way, but apparently not.
The default position of the power combo box in the Ride Plot is to shade
power. Change the default value of the shade_power variable to match. This
didn't matter before 79ced76, since prior to that commit we (mostly
redundantly) called showPower from setAllPlotWidgets, whereas now we only call
showPower after a change in the combo box.
I don't like disabling the ride plot tab when I select a manual ride,
because I frequently scroll through the ride list to search for a ride
by the shape of its ride plot, and every time I hit a manual ride I get
bounced to the CP plot tab. So rather than disable the ride plot tab,
just make it show an empty plot.
This mode is fun because the "CP Curve" is a straight line,
just like in the model:
work = CP * time + AWC
You can also see that the AWC is the y-intercept.
Anchoring this regexp (i.e., making it start with a "^") reduces the time
it takes to load the first CP plot from 10 seconds to 6.5 seconds on
Sean's three years of rides. Unbelievable, but repeatable.
Rob Carlsen suggested that the htmlSummary should use the same colors as in
the ride list. I agree, but they're a little to light, so bump the saturation
a bit. While we're at it, go ahead and do the zones list, too.
Eventually, I'm going to remove interval as a member of RideFilePoint, and
only use RideFileIntervals. But I have to rework a bunch of other code first,
so for now the two will coexist.
These were part of an earlier attempt at a GC-specific ride file
format. They aren't in use now, and they'll be replaced by the new
one when it's done.
After processing each RideItem, call freeMemory to deallocate the RideFile
object inside it, since we're done with the RideFile once we have the
BikeScore. Also call computeMetrics instead of htmlSummary, since we only
need the BikeScore and computeMetrics is faster.
After computing the stress cache from scratch on Sean's ride library
(3 years of rides), this change reduces the process virtual memory size
(VSIZE) from 769 MB to 412 MB. Even more dramatically, it reduces the
resident set size (RSIZE) from 389 MB to 36 MB!
On Sean's MacBook, which has 4 GB of RAM, this change results in a modest
reduction in the time to compute the stress cache, from 17 seconds down to
14. On machines with more limited memory footprints, or when dealing with
a larger ride library, the speedup could be very dramatic. (Once the
process starts paging, it's going to crawl.)
Now that it only takes 14 seconds to calculate, it's really not clear to
me that we need store the stress cache on the filesystem at all.
This old compatibility mode was only used to verify that we could match the
output of an old version of PowerAgent, and it hasn't been used in GC in a
long time. I can't see us ever using it again, either.
I don't think that our zones or CP changing should require re-opening the
notes file. Only changing which ride is selected should do so.
This commit is the follow-on to a85c4f. Please review.
I have no idea why we were saving the current notes file and opening a new one
every time we called generateWeeklySummary, but it seems totally wrong to me.
This commit merely separates the two concerns into two separate functions,
generateWeeklySummary and saveAndOpenNotes, and calls the latter everywhere
the former is already called. As such, there should be no functional change.
We can work out whether we should really be saving (possibly empty) notes
files in all these places as part of a future commit.
...so that the intervals summary is "above the fold". That may be a little on
the wide side for small screens, but it's still less wide than the intervals
summary, so it's not the worst offender in that regard.
The recording interval can vary. If the recording interval is not 1
second, then the data is linearly interpolated for the time period at
1 second intervals. This allows for smart recording or garmin 705 data
drops to work correctly with GC.
Powertap .raw file containing data for speed, cadence, hr, and power.
It also has a few intervals markers which may be useful for verifying
that we handle intervals correctly.
Without this patch, it will occationally be the case that a ride won't appear
in the weekly summary until the ride is itself selected (as opposed to just
selecting some other ride in the same week).
This is a partial patch based on code from Eric Murray. It changes just
enough of ManyalRideDialog to fix a crash that otherwise occurs when the
user doesn't have a zones file.
The previous version of this code contained a memory corruption bug.
QwtPlot deletes all of the items that are attached to it in its
destructor, but the QwtPlotMarkers for intervals were being allocated as a
group with array new. If we deleted an AllPlot object, then, it would
have tried to delete each of the marker objects individually, rather than
with array delete, which causes memory corruption. We haven't seen this
bug before because we don't ever delete AllPlot objects (which is a memory
leak in MainWindow).
Use gcc macros for __TIME__ and __DATE__ to compute build date. This has the
advantage that we don't have to shell out to find the date, though it has the
disadvantage that it doesn't give us any control over format, nor does it
report the time zone.
By default, set GC_VERSION to "(developer build)". For release versions,
specify GC_VERSION explicitly in gcconfig.pri like this:
QMAKE_CXXFLAGS += -DGC_VERSION="'\"1.2.0\"'"
It would be nice to specify the git commit id in developer builds. On the
other hand, the developer could always have uncommitted changes, so the git
commit id doesn't really make for a completely reproducible build. It's also
a pain to get ahold of in Windows.
created a method to find QSettings (settings.h) and stopped it from leaking.
The leak looked like this...
==7800== at 0x4C2726C: operator new(unsigned long) (vg_replace_malloc.c:230)
==7800== by 0x64FD232: (within /usr/lib/libQtCore.so.4.5.0)
==7800== by 0x64FDB62: QSettings::QSettings(QString const&, QString const&, Q
Object*) (in /usr/lib/libQtCore.so.4.5.0)
==7800== by 0x4738E5: PfPvPlot::setData(RideItem*) (PfPvPlot.cpp:361)
With some versions of Qt/Qwt, tooltips cause an infinite recursion. We don't
know why this happens yet, but this patch at least prevents crashes while we
figure it out.
Revert "Revert "First line of Notes in WKO imported file now has sport followed by workout code. Improves Calendar display.""
This reverts commit 3567012046.
The Quarq ANT+ log contains a hex dump of raw ANT+ messages. This
importer uses the closed-source program "qollector_interpret" to convert
the ANT+ log file into an XML format, then parses that into a RideFile.
qollector_interpret binaries for several platforms may be downloaded from
http://opensource.quarq.us/qollector_interpret
If the qollector_interpret program is not available, the menu selection
for importing Quarq ANT+ will not appear, nor will .qla files be
imported.
This patch unifies the way in which we handle negative values in the Power
Histogram by ignoring all values (speed, hr, cadence, power, and torque)
less than zero.
I'm not sure if this is the right way to handle such values long term, but
it sure beats dumping core.
QVector::resize() already does exponential capacity growth and zero fills new
elements, so there's no reason for us to be doing either by hand. This change
simplifies our code substantially.
This cvs file from Phil Skiba contains -1 values for hr that were
crashing the power histogram plot.
This is also the first entry into the test/rides directory, in which I
hope to store all ride files that have ever crashed any version of GC.
Use class wrappers around the srmio library to insure that we always
close every opened device and free all allocated data. Includes other
little bits of stylistic cleanup.
Rather than committing the srmio code to the GC repository, let the user
download and build it on their own. It can be found at
http://www.zuto.de/project/file/srmio/
or
git://github.com/rclasen/srmio.git
The ghetto part is that we just read the device path out of the device name,
then pass that path directly to Rainer's srmpc_get_data, rather than passing
it an abstraction of a serial port. As such, this code will only work on
Unix-like operating systems. But it does work, and that's a good start.
fix to use last N days worth of rides for BiksScore estimates
fix for skipping some rides in BikeScore estimates
skips rides with zero Bikescore for BikeScore estimates
hitting enter on ManualRide entry dialog doesn't write file
better checking for inputs on ManualRide dialog
Signed-off-by: Robert Carlsen <robert@robertcarlsen.net>
I hate to change so many lines of code just for a little rename, but I want to
distinguish between "devices", like the PowerTap and SRM, and "communications
ports", like the serial port and the native D2XX drivers. This work is in
preparation for adding direct download support for the SRM.
at column 10.
The TIME (L_SEC) field appears to always increment one recording
interval at a time -- however it always increment consistently. When
there is a pause, the TIME field increments as if there was NO pause.
For example:
11, 0.015, 0, 0, 12.7, 0,1350.2, 11.7, 0, 0
12, 0.015, 0, 0, 12.7, 0,1350.0, 11.7, 0, 0
13, 0.015, 0, 0, 12.7, 0,1350.0, 11.7, 0, 35607
14, 0.015, 0, 0, 2.9, 70,1095.2, 4.7, 0, 0
15, 0.021, 0, 0, 2.9, 70,1094.0, 4.7, 0, 0
At the 13th second, there was a pause for 35607 seconds. The 14th
second is actually the 14+35607 second.
The attached patch loads those files correctly. This allows the "Ride
-> Split Ride..." menu option to work as expected.
Thanks Berend De Schouwer
It was lame that I had to add the "xml" suffix to this regex. It should be
enough to add a RideFile subclass. This patch also does a more robust job of
setting the notesFileName.
The current RideFile type associates a unique interval number with each sample
point, meaning that intervals can't overlap. It also names intervals as
integers, not strings. So for now, XmlRideFile just orders intervals by their
order in the xml file and names them by their order in this list (starting
with zero, to match convention). It then associates each sample with the
lowest-named interval into which the sample falls. This strategy means that a
raw file exported to xml will have the same interval locations and names when
read back in as xml.
It offers to split at any time gap over 30 seconds and also at any interval.
If the time gap is over 5 minutes it defaults to checked, otherwise it
defaults to unchecked.
Anywhere you check, it will split the ride at that point overwriting the or
original ride with a shorter one and creating new rides after the split points
The original would get renamed with a .bak so it could be recovered.
I have made changes to the Import CSV dialog box; the new (proposed)
behaviour is as follows:
At first, the datePicker widget and OK button are disabled.
The datePicker is preset to today's date (no longer really
necessary, but the code is there).
User clicks 'choose a file' and the usual file browser appears.
If a file is selected, its creation date is stuffed into the
datePicker.
On return from the browser, the datePicker and OK buttons are re-
enabled.
User can modify the ride date, in case the file upload was not done
on ride day.
User clicks OK, the file is imported as before.
data type instead of dynamically allocating and freeing arrays. No
memory leak here, but it's an low hanging fruit type of example of
what kind of changes we can do to reduce the amount of explicit
dynamic memory management.
--jtc
in total time riding, which previously only included hours and minutes.
A few seconds over a week shouldn't account for much, but I think it's
desirable to use the same resultion for data values across the product
for consistancy if nothing else.
--jtc
bucket sizes, the power histogram often looks short and squat with a
lot of whitespace at the top because the largest bucket may be 3 - 5
minutes, but the y-axis is scaled by adding a constant 10 (minutes) to
the max.
The attached patch scales the y-axis by a factor of 1.1 (The ride plot
does the same scaling, and it appears to work well there). Now you're
able to see more detail in histogram plots as the curve is not all
squashed along the bottom of the graph.
-jtc
"about" dialog is formatted, with "GoldenCheetah is Licenced under
the GNU General Public Licence." and "Source code can be obtained
from http://goldencheetah.org/" run together in a single paragraph
because the way the line is broken after "Source".
The attached patch splits the two sentences into two separate
paragraphs, and centers the entire dialog text.
While this is subjective, I think it looks a lot better.
--jtc
This update changes the plot to use a right y axis for speed. This makes it easier to see speed differences.
Some other packages use separate y axes for each data type, but as far as I can tell, this is not available with the qwt library used by GC.
--jtc
regardless of the Units preference. This patch checks the preference
and displays it in the appropriate units.
Unlike some of the other cases, I'm checking the value of the Units
setting each time the plot/panel is displayed.
The patch also pulls the 0.62137119 magic constant into a #define
MILES_PER_KM. This constant (and it's inverse, KMS_PER_MILE), occurs
in several files, and (IMHO) really deserves to be pulled into a
separate header, but again, that's work for another day.
--jtc
deletion of the Tools (CP Calculator) Dialog, nor was the attribute
set that tells the framework to delete the dialog when it's dismissed.
Since the other dialogs use the attribute, this patch does the same.
--jtc
someone sets the date on their PT and doesn't reset the device before going
for a ride. This fix will keep GC working until the user splits the ride
(and until we add a ride-splitting function).
rename, since Windows won't rename an open file. Call remove before rename on
Windows, since Windows rename won't overwrite. Call setPermissions with
previous value plus all read flags, rather than using write flags explicitly.
Replace lots of asserts with QMessageBox::criticals.
previous data point (i.e., q->secs - p->secs), the duration to multiply
the wattage value by SHOULD NOT be. Instead, should multiply by
rec_int. (My ride from Jul 31, 2007 demonstrates the problem. I
started an interval with a 1-sec wattage of 773 after a ~48 second rest.
Using the old code, that gets credited as 773 watts for 48 secs!)
the user's directory. Ride summary, ride plot, and power histogram all work
fine, but opening the CP intervals graph causes a crash if any such files
exist. Also need to add a menu item to import .srm files that renames them to
the proper form (date-time.srm).
result of a version request, triggered by writing 'V', is the string "VER...".
Sometimes, this was preceeded by a zero byte, in which case hardware echo
detection worked, but other times it wasn't, and we stripped the 'V' from
"VER...", only to wait forever for one extra byte that wasn't coming. The new
approach is to read until we get the "\r\n", then search for "VER", then see
if any other 'V's preceed it, in which case we assume we're dealing with
hardware echo.
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
