mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-05 16:27:43 +02:00
Code Issues Releases Wiki Activity

Graphs: Ignore 0 values. They are meaningless and just indicate a lack of data

Browse Source 
Signed-off-by: Jerome Flesch <jflesch@kwain.net>
This commit is contained in:
Jerome Flesch
2017-05-02 23:56:30 +02:00
parent 91abd9dcd0
commit 94e4a47a45
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java
View File

@@ -214,12 +214,16 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
calDB.setTime(scaleEntry.getDateTime()); calDB.setTime(scaleEntry.getDateTime());
valuesWeight.add(new PointValue(calDB.get(field)-1, scaleEntry.getConvertedWeight(openScale.getSelectedScaleUser().scale_unit))); valuesWeight.add(new PointValue(calDB.get(field)-1, scaleEntry.getConvertedWeight(openScale.getSelectedScaleUser().scale_unit)));
valuesFat.add(new PointValue(calDB.get(field)-1, scaleEntry.getFat())); if (scaleEntry.getFat() != 0.0f)
valuesWater.add(new PointValue(calDB.get(field)-1, scaleEntry.getWater())); valuesFat.add(new PointValue(calDB.get(field)-1, scaleEntry.getFat()));
valuesMuscle.add(new PointValue(calDB.get(field)-1, scaleEntry.getMuscle())); if (scaleEntry.getWater() != 0.0f)
valuesWaist.add(new PointValue(calDB.get(field)-1, scaleEntry.getWaist())); valuesWater.add(new PointValue(calDB.get(field)-1, scaleEntry.getWater()));
valuesHip.add(new PointValue(calDB.get(field)-1, scaleEntry.getHip())); if (scaleEntry.getMuscle() != 0.0f)
valuesMuscle.add(new PointValue(calDB.get(field)-1, scaleEntry.getMuscle()));
if (scaleEntry.getWaist() != 0.0f)
valuesWaist.add(new PointValue(calDB.get(field)-1, scaleEntry.getWaist()));
if (scaleEntry.getHip() != 0.0f)
valuesHip.add(new PointValue(calDB.get(field)-1, scaleEntry.getHip()));
} }

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

@@ -267,11 +267,16 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
scaleDataLastDays.add(histData); scaleDataLastDays.add(histData);
valuesWeight.add(new PointValue(i, histData.getConvertedWeight(currentScaleUser.scale_unit))); valuesWeight.add(new PointValue(i, histData.getConvertedWeight(currentScaleUser.scale_unit)));
valuesFat.add(new PointValue(i, histData.getFat())); if (histData.getFat() != 0.0f)
valuesWater.add(new PointValue(i, histData.getWater())); valuesFat.add(new PointValue(i, histData.getFat()));
valuesMuscle.add(new PointValue(i, histData.getMuscle())); if (histData.getWater() != 0.0f)
valuesWaist.add(new PointValue(i, histData.getWaist())); valuesWater.add(new PointValue(i, histData.getWater()));
valuesHip.add(new PointValue(i, histData.getHip())); if (histData.getMuscle() != 0.0f)
valuesMuscle.add(new PointValue(i, histData.getMuscle()));
if (histData.getWaist() != 0.0f)
valuesWaist.add(new PointValue(i, histData.getWaist()));
if (histData.getHip() != 0.0f)
valuesHip.add(new PointValue(i, histData.getHip()));
histDate.setTime(histData.getDateTime()); histDate.setTime(histData.getDateTime());