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

Don't show disabled measurements in pie chart

Browse Source
This commit is contained in:
Erik Johansson
2018-04-29 22:26:15 +02:00
parent 2689aea89a
commit aa880e679d
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java
View File

@@ -272,20 +272,19 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
List<SliceValue> arcValuesLast = new ArrayList<>(); List<SliceValue> arcValuesLast = new ArrayList<>();
for (MeasurementView view : measurementViews) { for (MeasurementView view : measurementViews) {
if (view instanceof FloatMeasurementView) { if (!view.isVisible()
FloatMeasurementView measurementView = (FloatMeasurementView) view; || !(view instanceof FloatMeasurementView)
|| view instanceof BMRMeasurementView) {
if (measurementView instanceof BMRMeasurementView) {
continue; continue;
} }
FloatMeasurementView measurementView = (FloatMeasurementView) view;
measurementView.loadFrom(lastScaleMeasurement, null); measurementView.loadFrom(lastScaleMeasurement, null);
if (measurementView.getValue() != 0) { if (measurementView.getValue() != 0) {
arcValuesLast.add(new SliceValue(measurementView.getValue(), measurementView.getColor())); arcValuesLast.add(new SliceValue(measurementView.getValue(), measurementView.getColor()));
} }
} }
}
final Converters.WeightUnit unit = currentScaleUser.getScaleUnit(); final Converters.WeightUnit unit = currentScaleUser.getScaleUnit();
PieChartData pieChartData = new PieChartData(arcValuesLast); PieChartData pieChartData = new PieChartData(arcValuesLast);