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

Convert bone to scale unit

Browse Source
This commit is contained in:
Erik Johansson
2018-04-19 22:05:11 +02:00
parent 01ed276c7c
commit af79227891
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/BoneMeasurementView.java
View File

@@ -23,6 +23,7 @@ import com.health.openscale.R;
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 BoneMeasurementView extends FloatMeasurementView { public class BoneMeasurementView 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
@@ -39,22 +40,22 @@ public class BoneMeasurementView extends FloatMeasurementView {
@Override @Override
protected float getMeasurementValue(ScaleMeasurement measurement) { protected float getMeasurementValue(ScaleMeasurement measurement) {
return measurement.getBone(); return Converters.fromKilogram(measurement.getBone(), getScaleUser().getScaleUnit());
} }
@Override @Override
protected void setMeasurementValue(float value, ScaleMeasurement measurement) { protected void setMeasurementValue(float value, ScaleMeasurement measurement) {
measurement.setBone(value); measurement.setBone(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 50; return Converters.fromKilogram(50, getScaleUser().getScaleUnit());
} }
@Override @Override