mirror of
https://github.com/GoldenCheetah/GoldenCheetah.git
synced 2026-04-15 05:32:21 +00:00
Fix disappearing userchart content when changing the type (#4848)
Removing the explicit copy-constructor and operator= from GenericSeriesInfo introduced by #4841. Instead setting user1-4 explicitly to nullptr when duplicating a series. [publish binaries]
This commit is contained in:
committed by
GitHub
parent
7437e82a5f
commit
19ad8699d3
@@ -83,43 +83,6 @@ class GenericSeriesInfo {
|
|||||||
color("red"), opacity(100.0), opengl(true), legend(true), datalabels(false), fill(false)
|
color("red"), opacity(100.0), opengl(true), legend(true), datalabels(false), fill(false)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
GenericSeriesInfo(const GenericSeriesInfo &other) {
|
|
||||||
*this = other;
|
|
||||||
}
|
|
||||||
|
|
||||||
GenericSeriesInfo &operator=(const GenericSeriesInfo &other) {
|
|
||||||
if (this == &other) return *this;
|
|
||||||
|
|
||||||
name = other.name;
|
|
||||||
group = other.group;
|
|
||||||
xseries = other.xseries;
|
|
||||||
yseries = other.yseries;
|
|
||||||
fseries = other.fseries;
|
|
||||||
xname = other.xname;
|
|
||||||
yname = other.yname;
|
|
||||||
labels = other.labels;
|
|
||||||
colors = other.colors;
|
|
||||||
line = other.line;
|
|
||||||
symbol = other.symbol;
|
|
||||||
size = other.size;
|
|
||||||
color = other.color;
|
|
||||||
opacity = other.opacity;
|
|
||||||
opengl = other.opengl;
|
|
||||||
legend = other.legend;
|
|
||||||
datalabels = other.datalabels;
|
|
||||||
fill = other.fill;
|
|
||||||
aggregateby = other.aggregateby;
|
|
||||||
annotations = other.annotations;
|
|
||||||
string1 = other.string1;
|
|
||||||
string2 = other.string2;
|
|
||||||
string3 = other.string3;
|
|
||||||
string4 = other.string4;
|
|
||||||
|
|
||||||
user1 = user2 = user3 = user4 = nullptr;
|
|
||||||
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
// available for use (e.g. UserChartSettings)
|
// available for use (e.g. UserChartSettings)
|
||||||
void *user1, *user2, *user3, *user4;
|
void *user1, *user2, *user3, *user4;
|
||||||
QString string1, string2, string3, string4;
|
QString string1, string2, string3, string4;
|
||||||
|
|||||||
@@ -1089,6 +1089,7 @@ UserChartSettings::duplicateSeries()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} while (duplicate);
|
} while (duplicate);
|
||||||
|
seriesInfo.user1 = seriesInfo.user2 = seriesInfo.user3 = seriesInfo.user4 = nullptr;
|
||||||
seriesinfo.append(seriesInfo);
|
seriesinfo.append(seriesInfo);
|
||||||
refreshSeriesTab();
|
refreshSeriesTab();
|
||||||
emit chartConfigChanged();
|
emit chartConfigChanged();
|
||||||
|
|||||||
Reference in New Issue
Block a user