1
0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-19 23:12:12 +02:00

enabled evaluation of fat caliper measurement and enabled percent option

This commit is contained in:
OliE
2018-05-13 15:26:03 +02:00
parent d20a824f51
commit d8c052a63b

View File

@@ -41,6 +41,11 @@ public class FatCaliperMeasurementView extends FloatMeasurementView {
return false; return false;
} }
@Override
protected boolean supportsPercentageToAbsoluteWeightConversion() {
return true;
}
@Override @Override
protected float getMeasurementValue(ScaleMeasurement measurement) { protected float getMeasurementValue(ScaleMeasurement measurement) {
return measurement.getFatCaliper(getScaleUser()); return measurement.getFatCaliper(getScaleUser());
@@ -53,12 +58,16 @@ public class FatCaliperMeasurementView extends FloatMeasurementView {
@Override @Override
public String getUnit() { public String getUnit() {
if (shouldConvertPercentageToAbsoluteWeight()) {
return getScaleUser().getScaleUnit().toString();
}
return "%"; return "%";
} }
@Override @Override
protected float getMaxValue() { protected float getMaxValue() {
return 80; return maybeConvertPercentageToAbsoluteWeight(80);
} }
@Override @Override
@@ -68,6 +77,6 @@ public class FatCaliperMeasurementView extends FloatMeasurementView {
@Override @Override
protected EvaluationResult evaluateSheet(EvaluationSheet evalSheet, float value) { protected EvaluationResult evaluateSheet(EvaluationSheet evalSheet, float value) {
return null; return evalSheet.evaluateBodyFat(value);
} }
} }