mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-13 04:04:25 +02:00
Code Issues Releases Wiki Activity

Merge pull request #33 from jflesch/wip-strip-zero

Browse Source 
Graphs: Ignore 0 values
This commit is contained in:
OliE
2017-05-03 17:23:08 +02:00
committed by GitHub
parent ae6e4addae 94e4a47a45
commit 4ca8934015
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());
valuesWeight.add(new PointValue(calDB.get(field)-1, scaleEntry.getConvertedWeight(openScale.getSelectedScaleUser().scale_unit)));
valuesFat.add(new PointValue(calDB.get(field)-1, scaleEntry.getFat()));
valuesWater.add(new PointValue(calDB.get(field)-1, scaleEntry.getWater()));
valuesMuscle.add(new PointValue(calDB.get(field)-1, scaleEntry.getMuscle()));
valuesWaist.add(new PointValue(calDB.get(field)-1, scaleEntry.getWaist()));
valuesHip.add(new PointValue(calDB.get(field)-1, scaleEntry.getHip()));
if (scaleEntry.getFat() != 0.0f)
valuesFat.add(new PointValue(calDB.get(field)-1, scaleEntry.getFat()));
if (scaleEntry.getWater() != 0.0f)
valuesWater.add(new PointValue(calDB.get(field)-1, scaleEntry.getWater()));
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

@@ -258,11 +258,16 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
scaleDataLastDays.add(histData);
valuesWeight.add(new PointValue(i, histData.getConvertedWeight(currentScaleUser.scale_unit)));
valuesFat.add(new PointValue(i, histData.getFat()));
valuesWater.add(new PointValue(i, histData.getWater()));
valuesMuscle.add(new PointValue(i, histData.getMuscle()));
valuesWaist.add(new PointValue(i, histData.getWaist()));
valuesHip.add(new PointValue(i, histData.getHip()));
if (histData.getFat() != 0.0f)
valuesFat.add(new PointValue(i, histData.getFat()));
if (histData.getWater() != 0.0f)
valuesWater.add(new PointValue(i, histData.getWater()));
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());