mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-21 16:02:04 +02:00
Code Issues Releases Wiki Activity

Convert LBM to scale unit

Browse Source
This commit is contained in:
Erik Johansson
2018-04-19 22:02:45 +02:00
parent 354574a0c6
commit 01ed276c7c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
android_app/app/src/main/java/com/health/openscale/gui/views/LBMMeasurementView.java
View File

@@ -25,6 +25,7 @@ import com.health.openscale.core.bodymetric.EstimatedLBMMetric;
import com.health.openscale.core.datatypes.ScaleMeasurement; import com.health.openscale.core.datatypes.ScaleMeasurement;
import com.health.openscale.core.evaluation.EvaluationResult; import com.health.openscale.core.evaluation.EvaluationResult;
import com.health.openscale.core.evaluation.EvaluationSheet; import com.health.openscale.core.evaluation.EvaluationSheet;
import com.health.openscale.core.utils.Converters;
public class LBMMeasurementView extends FloatMeasurementView { public class LBMMeasurementView extends FloatMeasurementView {
// Don't change key value, it may be stored persistent in preferences // Don't change key value, it may be stored persistent in preferences
@@ -41,22 +42,22 @@ public class LBMMeasurementView extends FloatMeasurementView {
@Override @Override
protected float getMeasurementValue(ScaleMeasurement measurement) { protected float getMeasurementValue(ScaleMeasurement measurement) {
return measurement.getLbm(); return Converters.fromKilogram(measurement.getLbm(), getScaleUser().getScaleUnit());
} }
@Override @Override
protected void setMeasurementValue(float value, ScaleMeasurement measurement) { protected void setMeasurementValue(float value, ScaleMeasurement measurement) {
measurement.setLbm(value); measurement.setLbm(Converters.toKilogram(value, getScaleUser().getScaleUnit()));
} }
@Override @Override
public String getUnit() { public String getUnit() {
return "kg"; return getScaleUser().getScaleUnit().toString();
} }
@Override @Override
protected float getMaxValue() { protected float getMaxValue() {
return 300; return Converters.fromKilogram(300, getScaleUser().getScaleUnit());
} }
@Override @Override