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

fix bug in weight evaluation sheet that the limit units are not correctly converted to the user scale unit.

Browse Source
This commit is contained in:
OliE
2018-01-24 18:52:49 +01:00
parent 9eb07b3279
commit 2fedf25cad
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
android_app/app/src/main/java/com/health/openscale/core/evaluation/EvaluationSheet.java
View File

@@ -16,6 +16,7 @@
package com.health.openscale.core.evaluation; package com.health.openscale.core.evaluation;
import com.health.openscale.core.datatypes.ScaleUser; import com.health.openscale.core.datatypes.ScaleUser;
import com.health.openscale.core.utils.Converters;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@@ -179,11 +180,11 @@ public class EvaluationSheet {
} }
if (weight < lowLimit) { // low if (weight < lowLimit) { // low
return new EvaluationResult(weight, Math.round(lowLimit), Math.round(highLimit), EvaluationResult.EVAL_STATE.LOW); return new EvaluationResult(weight, Converters.fromKilogram(Math.round(lowLimit), evalUser.getScaleUnit()), Converters.fromKilogram(Math.round(highLimit), evalUser.getScaleUnit()), EvaluationResult.EVAL_STATE.LOW);
} else if (weight >= lowLimit && weight <= highLimit) { // normal } else if (weight >= lowLimit && weight <= highLimit) { // normal
return new EvaluationResult(weight, Math.round(lowLimit), Math.round(highLimit), EvaluationResult.EVAL_STATE.NORMAL); return new EvaluationResult(weight, Converters.fromKilogram(Math.round(lowLimit), evalUser.getScaleUnit()), Converters.fromKilogram(Math.round(highLimit), evalUser.getScaleUnit()), EvaluationResult.EVAL_STATE.NORMAL);
} else if (weight > highLimit) { //high } else if (weight > highLimit) { //high
return new EvaluationResult(weight, Math.round(lowLimit), Math.round(highLimit), EvaluationResult.EVAL_STATE.HIGH); return new EvaluationResult(weight, Converters.fromKilogram(Math.round(lowLimit), evalUser.getScaleUnit()), Converters.fromKilogram(Math.round(highLimit), evalUser.getScaleUnit()), EvaluationResult.EVAL_STATE.HIGH);
} }
return new EvaluationResult(0, -1, -1, EvaluationResult.EVAL_STATE.UNDEFINED); return new EvaluationResult(0, -1, -1, EvaluationResult.EVAL_STATE.UNDEFINED);

4
android_app/app/src/main/java/com/health/openscale/gui/views/WeightMeasurementView.java
View File

@@ -21,9 +21,9 @@ import android.support.v4.content.ContextCompat;
import com.health.openscale.R; import com.health.openscale.R;
import com.health.openscale.core.datatypes.ScaleMeasurement; import com.health.openscale.core.datatypes.ScaleMeasurement;
import com.health.openscale.core.datatypes.ScaleUser;
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 WeightMeasurementView extends FloatMeasurementView { public class WeightMeasurementView extends FloatMeasurementView {
@@ -53,7 +53,7 @@ public class WeightMeasurementView extends FloatMeasurementView {
@Override @Override
protected float getMaxValue() { protected float getMaxValue() {
return 300; return Converters.fromKilogram(300.0f, getScaleUser().getScaleUnit());
} }
@Override @Override