nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-14 16:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Merge Tool Part 1 of 2

Browse Source 
.. 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!
This commit is contained in:
Mark Liversedge
2014-11-12 12:55:35 +00:00
parent 1e29ff0465
commit 1f21434f1f
8 changed files with 471 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SmallPlot.cpp
View File

@@ -104,7 +104,7 @@ SmallPlot::recalc()
if (!timeArray.size()) return;
int rideTimeSecs = (long) ceil(timeArray[arrayLength - 1]);
if (rideTimeSecs > 7*24*60*60) {
if (rideTimeSecs < 0 || rideTimeSecs > 7*24*60*60) {
QwtArray<double> data;
wattsCurve->setSamples(data, data);
hrCurve->setSamples(data, data);