karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Bugfix: previous total elevation gain was added twice.

Browse Source
This commit is contained in:
Dennis Guse
2020-06-28 08:27:23 +02:00
parent c7db4f528e
commit be7eb41cf3
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
+6 -16
View File
@@ -430,7 +430,7 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
setCadenceSensorData(sensorDataSet); setCadenceSensorData(sensorDataSet);
setSpeedSensorData(sensorDataSet, isSelectedTrackRecording()); setSpeedSensorData(sensorDataSet, isSelectedTrackRecording());
setElevationGainFromSensor(elevationGain_m); setTotalElevationGain(elevationGain_m);
} }
private void setHeartRateSensorData(SensorDataSet sensorDataSet) { private void setHeartRateSensorData(SensorDataSet sensorDataSet) {
@@ -480,22 +480,9 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
} }
// Set elevation gain // Set elevation gain
public void setTotalElevationGain(Float elevationGain_m) { private void setTotalElevationGain(Float elevationGain_m) {
boolean metricUnits = PreferencesUtils.isMetricUnits(getContext()); boolean metricUnits = PreferencesUtils.isMetricUnits(getContext());
if (elevationGain_m == null) {
elevationGain_m = 0f;
}
if (lastTrackStatistics != null) {
elevationGain_m += (float) lastTrackStatistics.getTotalElevationGain();
}
Pair<String, String> parts = StringUtils.formatElevation(getContext(), elevationGain_m, metricUnits);
elevationTotalGainValue.setText(parts.first);
elevationTotalGainUnit.setText(parts.second);
}
public void setElevationGainFromSensor(Float elevationGain_m) {
float totalElevationGain = 0; float totalElevationGain = 0;
if (elevationGain_m != null) { if (elevationGain_m != null) {
totalElevationGain = elevationGain_m; totalElevationGain = elevationGain_m;
@@ -503,7 +490,10 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
if (lastTrackStatistics != null) { if (lastTrackStatistics != null) {
totalElevationGain += (float) lastTrackStatistics.getTotalElevationGain(); totalElevationGain += (float) lastTrackStatistics.getTotalElevationGain();
} }
setTotalElevationGain(totalElevationGain);
Pair<String, String> parts = StringUtils.formatElevation(getContext(), totalElevationGain, metricUnits);
elevationTotalGainValue.setText(parts.first);
elevationTotalGainUnit.setText(parts.second);
} }
/** /**