From aa880e679d5c990242d3478ba23e6a199cb2d49a Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Sun, 29 Apr 2018 22:26:15 +0200 Subject: [PATCH] Don't show disabled measurements in pie chart --- .../gui/fragments/OverviewFragment.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java index 1c5ed8c6..c6041bf5 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java @@ -272,18 +272,17 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener List arcValuesLast = new ArrayList<>(); for (MeasurementView view : measurementViews) { - if (view instanceof FloatMeasurementView) { - FloatMeasurementView measurementView = (FloatMeasurementView) view; + if (!view.isVisible() + || !(view instanceof FloatMeasurementView) + || view instanceof BMRMeasurementView) { + continue; + } - if (measurementView instanceof BMRMeasurementView) { - continue; - } + FloatMeasurementView measurementView = (FloatMeasurementView) view; + measurementView.loadFrom(lastScaleMeasurement, null); - measurementView.loadFrom(lastScaleMeasurement, null); - - if (measurementView.getValue() != 0) { - arcValuesLast.add(new SliceValue(measurementView.getValue(), measurementView.getColor())); - } + if (measurementView.getValue() != 0) { + arcValuesLast.add(new SliceValue(measurementView.getValue(), measurementView.getColor())); } }