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

MergeActivityWizard - preserve XDATA series order on join

Browse Source 
and add the remaining ones to the end
Fixes #3183
This commit is contained in:
Ale Martinez
2019-10-16 10:21:24 -03:00
parent d01fdf55a7
commit f9694775d3
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Gui/MergeActivityWizard.cpp
View File

@@ -457,12 +457,33 @@ MergeActivityWizard::combine()
// and XData from second ride, append if series already present
foreach (XDataSeries *xdata, ride2->xdata()) {
if (combined->xdata().contains(xdata->name)) {
// Reorder to match the series present in the first activity
QStringList names = combined->xdata()[xdata->name]->valuename;
QVector<int> indexMap;
for (int i=0; i<names.count() && i<XDATA_MAXVALUES; i++)
if (xdata->valuename.contains(names[i]))
indexMap << xdata->valuename.indexOf(names[i]);
// Add the remaining ones to the end only if there is space
for (int i=0; i<xdata->valuename.count(); i++)
if (!names.contains(xdata->valuename[i]) && combined->xdata().count()<XDATA_MAXVALUES) {
combined->xdata()[xdata->name]->valuename << xdata->valuename[i];
indexMap << i;
}
// finally copy the data
foreach (XDataPoint *point, xdata->datapoints) {
XDataPoint *pt = new XDataPoint(*point);
XDataPoint *pt = new XDataPoint();
pt->secs = point->secs + timeOffset;
pt->km = point->km + distanceOffset;
for (int i=0; i<indexMap.count(); i++) {
pt->number[i] = point->number[indexMap[i]];
pt->string[i] = point->string[indexMap[i]];
}
combined->xdata(xdata->name)->datapoints.append(pt);
}
} else {
XDataSeries *xd = new XDataSeries(*xdata);
xd->datapoints.clear();