From 50313bd59fccc83b2be37ca3bb278ff6f83920d6 Mon Sep 17 00:00:00 2001
From: oliexdev <olie.xdev@googlemail.com>
Date: Sun, 13 Dec 2020 14:40:12 +0100
Subject: [PATCH] show in graph the converted values

---
 .../gui/measurement/ChartMeasurementView.java |  6 +++--
 .../gui/measurement/FloatMeasurementView.java | 24 ++++++++++---------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/android_app/app/src/main/java/com/health/openscale/gui/measurement/ChartMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/measurement/ChartMeasurementView.java
index 85b7db29..8d0cbd36 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/measurement/ChartMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/measurement/ChartMeasurementView.java
@@ -348,6 +348,8 @@ public class ChartMeasurementView extends LineChart {
     }
 
     public void refreshMeasurementList() {
+        highlightValue(null, false); // deselect any highlighted value
+
         if (scaleMeasurementList == null) {
             progressBar.setVisibility(GONE);
             return;
@@ -366,7 +368,7 @@ public class ChartMeasurementView extends LineChart {
 
                 for (int i=0; i<scaleMeasurementList.size(); i++) {
                     ScaleMeasurement measurement = scaleMeasurementList.get(i);
-                    float value = measurementView.getMeasurementValue(measurement);
+                    float value = measurementView.getConvertedMeasurementValue(measurement);
 
                     if (value == 0.0f) {
                         continue;
@@ -512,7 +514,7 @@ public class ChartMeasurementView extends LineChart {
 
                 for (int i=0; i<scaleMeasurementsAsTrendlineList.size(); i++) {
                     ScaleMeasurement measurement = scaleMeasurementsAsTrendlineList.get(i);
-                    float value = measurementView.getMeasurementValue(measurement);
+                    float value = measurementView.getConvertedMeasurementValue(measurement);
 
                     Entry entry = new Entry();
                     entry.setX(convertDateToInt(measurement.getDateTime()));
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/measurement/FloatMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/measurement/FloatMeasurementView.java
index 3aed5cdf..a4873016 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/measurement/FloatMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/measurement/FloatMeasurementView.java
@@ -241,6 +241,17 @@ public abstract class FloatMeasurementView extends MeasurementView {
     protected abstract float getMeasurementValue(ScaleMeasurement measurement);
     protected abstract void setMeasurementValue(float value, ScaleMeasurement measurement);
 
+    public float getConvertedMeasurementValue(ScaleMeasurement measurement) {
+        updateUserConvertedWeight(measurement);
+
+        float convertedValue = getMeasurementValue(measurement);
+        convertedValue = maybeConvertValue(convertedValue);
+        convertedValue = clampValue(convertedValue);
+        convertedValue = roundValue(convertedValue);
+
+        return convertedValue;
+    }
+
     public abstract String getUnit();
     protected abstract float getMaxValue();
     protected int getDecimalPlaces() {
@@ -350,21 +361,12 @@ public abstract class FloatMeasurementView extends MeasurementView {
         float newPreviousValue = NO_VALUE;
 
         if (!useAutoValue()) {
-            updateUserConvertedWeight(measurement);
-
-            newValue = getMeasurementValue(measurement);
-            newValue = maybeConvertValue(newValue);
-            newValue = clampValue(newValue);
-            newValue = roundValue(newValue);
+            newValue = getConvertedMeasurementValue(measurement);
 
             if (previousMeasurement != null) {
                 float saveUserConvertedWeight = userConvertedWeight;
-                updateUserConvertedWeight(previousMeasurement);
 
-                newPreviousValue = getMeasurementValue(previousMeasurement);
-                newPreviousValue = maybeConvertValue(newPreviousValue);
-                newPreviousValue = clampValue(newPreviousValue);
-                newPreviousValue = roundValue(newPreviousValue);
+                newPreviousValue = getConvertedMeasurementValue(previousMeasurement);
 
                 userConvertedWeight = saveUserConvertedWeight;
             }