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

Cleanup: adjusted Interval uses constructor.

Browse Source 
Fixes #1320.
This commit is contained in:
Dennis Guse
2022-07-07 23:36:04 +02:00
parent 21d1852505
commit 04e1496084
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java
+1 -8
View File
@@ -49,8 +49,7 @@ public class IntervalStatistics {
interval.add(trackStatisticsUpdater.getTrackStatistics(), trackPoint); interval.add(trackStatisticsUpdater.getTrackStatistics(), trackPoint);
double adjustFactor = distanceInterval.dividedBy(interval.distance); double adjustFactor = distanceInterval.dividedBy(interval.distance);
Interval adjustedInterval = new Interval(interval); Interval adjustedInterval = new Interval(interval, adjustFactor);
adjustedInterval.adjust(adjustFactor);
intervalList.set(intervalList.size() - 1, adjustedInterval); intervalList.set(intervalList.size() - 1, adjustedInterval);
@@ -116,7 +115,6 @@ public class IntervalStatistics {
public Interval(Interval i, double adjustFactor) { public Interval(Interval i, double adjustFactor) {
distance = i.distance.multipliedBy(adjustFactor); distance = i.distance.multipliedBy(adjustFactor);
time = Duration.ofMillis((long) (i.time.toMillis() * adjustFactor)); time = Duration.ofMillis((long) (i.time.toMillis() * adjustFactor));
time = i.time;
gain_m = i.gain_m; gain_m = i.gain_m;
loss_m = i.loss_m; loss_m = i.loss_m;
avgHeartRate = i.avgHeartRate; avgHeartRate = i.avgHeartRate;
@@ -130,11 +128,6 @@ public class IntervalStatistics {
avgHeartRate = i.avgHeartRate; avgHeartRate = i.avgHeartRate;
} }
private void adjust(double adjustFactor) {
distance = distance.multipliedBy(adjustFactor);
time = Duration.ofMillis((long) (time.toMillis() * adjustFactor));
}
public Distance getDistance() { public Distance getDistance() {
return distance; return distance;
} }