mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-18 14:31:23 +02:00
Code Issues Releases Wiki Activity

show in graph the converted values

Browse Source
This commit is contained in:
oliexdev
2020-12-13 14:40:12 +01:00
parent b5e3f1d78d
commit 50313bd59f
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android_app/app/src/main/java/com/health/openscale/gui/measurement/ChartMeasurementView.java
View File

@@ -348,6 +348,8 @@ public class ChartMeasurementView extends LineChart {
} }
public void refreshMeasurementList() { public void refreshMeasurementList() {
highlightValue(null, false); // deselect any highlighted value
if (scaleMeasurementList == null) { if (scaleMeasurementList == null) {
progressBar.setVisibility(GONE); progressBar.setVisibility(GONE);
return; return;
@@ -366,7 +368,7 @@ public class ChartMeasurementView extends LineChart {
for (int i=0; i<scaleMeasurementList.size(); i++) { for (int i=0; i<scaleMeasurementList.size(); i++) {
ScaleMeasurement measurement = scaleMeasurementList.get(i); ScaleMeasurement measurement = scaleMeasurementList.get(i);
float value = measurementView.getMeasurementValue(measurement); float value = measurementView.getConvertedMeasurementValue(measurement);
if (value == 0.0f) { if (value == 0.0f) {
continue; continue;
@@ -512,7 +514,7 @@ public class ChartMeasurementView extends LineChart {
for (int i=0; i<scaleMeasurementsAsTrendlineList.size(); i++) { for (int i=0; i<scaleMeasurementsAsTrendlineList.size(); i++) {
ScaleMeasurement measurement = scaleMeasurementsAsTrendlineList.get(i); ScaleMeasurement measurement = scaleMeasurementsAsTrendlineList.get(i);
float value = measurementView.getMeasurementValue(measurement); float value = measurementView.getConvertedMeasurementValue(measurement);
Entry entry = new Entry(); Entry entry = new Entry();
entry.setX(convertDateToInt(measurement.getDateTime())); entry.setX(convertDateToInt(measurement.getDateTime()));

24
android_app/app/src/main/java/com/health/openscale/gui/measurement/FloatMeasurementView.java
View File

@@ -241,6 +241,17 @@ public abstract class FloatMeasurementView extends MeasurementView {
protected abstract float getMeasurementValue(ScaleMeasurement measurement); protected abstract float getMeasurementValue(ScaleMeasurement measurement);
protected abstract void setMeasurementValue(float value, 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(); public abstract String getUnit();
protected abstract float getMaxValue(); protected abstract float getMaxValue();
protected int getDecimalPlaces() { protected int getDecimalPlaces() {
@@ -350,21 +361,12 @@ public abstract class FloatMeasurementView extends MeasurementView {
float newPreviousValue = NO_VALUE; float newPreviousValue = NO_VALUE;
if (!useAutoValue()) { if (!useAutoValue()) {
updateUserConvertedWeight(measurement); newValue = getConvertedMeasurementValue(measurement);
newValue = getMeasurementValue(measurement);
newValue = maybeConvertValue(newValue);
newValue = clampValue(newValue);
newValue = roundValue(newValue);
if (previousMeasurement != null) { if (previousMeasurement != null) {
float saveUserConvertedWeight = userConvertedWeight; float saveUserConvertedWeight = userConvertedWeight;
updateUserConvertedWeight(previousMeasurement);
newPreviousValue = getMeasurementValue(previousMeasurement); newPreviousValue = getConvertedMeasurementValue(previousMeasurement);
newPreviousValue = maybeConvertValue(newPreviousValue);
newPreviousValue = clampValue(newPreviousValue);
newPreviousValue = roundValue(newPreviousValue);
userConvertedWeight = saveUserConvertedWeight; userConvertedWeight = saveUserConvertedWeight;
} }