nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 08:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Merge Tool Part 2a of 2a/b

Browse Source 
.. 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 !!!!
This commit is contained in:
Mark Liversedge
2014-11-13 20:02:25 +00:00
parent 4f2a4179bb
commit f80427d98e
8 changed files with 614 additions and 1204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/AllPlotWindow.cpp
View File

@@ -1286,7 +1286,7 @@ AllPlotWindow::rideSelected()
setIsBlank(false);
// we already plotted it!
if (ride == current && stale == false) return;
if (!ride->isDirty() && ride == current && stale == false) return;
// ok, its now the current ride
current = ride;