Revert "Remove unused fingerprint field from UserMetricSettings"

This reverts commit 92d1244.
GoldenCheetah · Mar 7, 2021 · e1b8293 · e1b8293
1 parent 92d1244
commit e1b8293
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/src/Gui/EditUserMetricDialog.cpp b/src/Gui/EditUserMetricDialog.cpp
@@ -317,6 +317,7 @@ EditUserMetricDialog::setSettings(UserMetricSettings &here)
     here.istime = istime->isChecked();
     here.precision = precision->value();
     here.program = formulaEdit->document()->toPlainText();
+    here.fingerprint = here.symbol + DataFilter::fingerprint(here.program);
 }
 
 void

diff --git a/src/Metrics/UserMetric.cpp b/src/Metrics/UserMetric.cpp
@@ -324,6 +324,7 @@ UserMetric::addCompatibility(QList<UserMetricSettings>&metrics)
         c1.precision = 0;
         c1.istime = false;
         c1.aggzero = true;
+        c1.fingerprint = c1.symbol + DataFilter::fingerprint(c1.program);
         metrics.insert(0, c1);
         f.compatibilitymetrics << "TSS";
     }
@@ -344,6 +345,7 @@ UserMetric::addCompatibility(QList<UserMetricSettings>&metrics)
         c2.precision = 3;
         c2.istime = false;
         c2.aggzero = true;
+        c2.fingerprint = c2.symbol + DataFilter::fingerprint(c2.program);
         metrics.insert(0, c2);
         f.compatibilitymetrics << "IF";
     }
@@ -364,6 +366,7 @@ UserMetric::addCompatibility(QList<UserMetricSettings>&metrics)
         c3.precision = 0;
         c3.istime = false;
         c3.aggzero = true;
+        c3.fingerprint = c3.symbol + DataFilter::fingerprint(c3.program);
         metrics.insert(0, c3);
         f.compatibilitymetrics << "NP";
     }

diff --git a/src/Metrics/UserMetricParser.cpp b/src/Metrics/UserMetricParser.cpp
@@ -72,6 +72,7 @@ bool UserMetricParser::startElement( const QString&, const QString&, const QStri
         if (attrs.qName(i) == "unitsImperial") add.unitsImperial=Utils::unprotect(attrs.value(i));
         if (attrs.qName(i) == "conversion") add.conversion=Utils::unprotect(attrs.value(i)).toDouble();
         if (attrs.qName(i) == "conversionSum") add.conversionSum=Utils::unprotect(attrs.value(i)).toDouble();
+        if (attrs.qName(i) == "fingerprint") add.fingerprint=Utils::unprotect(attrs.value(i));
     }
 
     return true;
@@ -142,6 +143,7 @@ UserMetricParser::serializeToQTextStream(QTextStream& out, QList<UserMetricSetti
         out <<"type=\"" << metric.type << "\" ";
         out <<"conversion=\"" << metric.conversion << "\" ";
         out <<"conversionSum=\"" << metric.conversionSum << "\" ";
+        out <<"fingerprint=\"" << Utils::xmlprotect(metric.fingerprint) << "\" ";
 
         out << ">\n";
         out << Utils::xmlprotect(metric.program);

diff --git a/src/Metrics/UserMetricSettings.h b/src/Metrics/UserMetricSettings.h
@@ -78,7 +78,8 @@ class UserMetricSettings {
         double  conversion,
                 conversionSum;
 
-        QString program;
+        QString program,
+                fingerprint; // condensed form of program
 };
 
 class EditUserMetricDialog : public QDialog {