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

Merge pull request #1458 from Joern-R/LTMTranslatePrep

Browse Source 
LTM Translation Preparation
This commit is contained in:
Mark Liversedge
2015-07-20 15:36:20 +01:00
parent 170ec5f634 ea55ba06e1
commit 47d91cbaaa
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/LTMSettings.cpp
View File

@@ -181,7 +181,7 @@ QDataStream &operator<<(QDataStream &out, const LTMSettings &settings)
out<<settings.field1;
out<<settings.field2;
out<<int(-1);
out<<int(12);
out<<int(13);
out<<settings.metrics.count();
foreach(MetricDetail metric, settings.metrics) {
bool discard = false;
@@ -222,6 +222,7 @@ QDataStream &operator<<(QDataStream &out, const LTMSettings &settings)
out<<metric.estimateDuration_units;
out<<metric.wpk;
out<<metric.stressType;
out<<metric.units;
}
out<<settings.showData;
out<<settings.stack;
@@ -332,6 +333,9 @@ while(counter-- && !in.atEnd()) {
if (version >= 12) {
in >> m.stressType;
}
if (version >= 13) {
in >> m.units;
}
bool keep=true;
// check for deprecated things and set keep=false if

4
src/LTMTool.cpp
View File

@@ -210,8 +210,8 @@ LTMTool::LTMTool(Context *context, LTMSettings *settings) : QWidget(context->mai
// set default for the user overiddable fields
adds.uname = adds.name;
adds.units = "";
adds.uunits = adds.metric->units(context->athlete->useMetricUnits);
adds.units = adds.metric->units(context->athlete->useMetricUnits);
adds.uunits = adds.units;
// default units to metric name if it is blank
if (adds.uunits == "") adds.uunits = adds.name;