caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

wear only print valid boluses

Browse source
This commit is contained in:
AdrianLxM 2018-02-24 18:10:59 +01:00
parent 6d3048a9b1
commit 436e03aa03
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java
View file

@ -459,7 +459,7 @@ public class WatchUpdaterService extends WearableListenerService implements
List<Treatment> treatments = MainApp.getConfigBuilder().getTreatmentsFromHistory(); List<Treatment> treatments = MainApp.getConfigBuilder().getTreatmentsFromHistory();
for (Treatment treatment:treatments) { for (Treatment treatment:treatments) {
if(treatment.date > startTimeWindow){ if(treatment.date > startTimeWindow){
boluses.add(treatmentMap(treatment.date, treatment.insulin, treatment.carbs, treatment.isSMB)); boluses.add(treatmentMap(treatment.date, treatment.insulin, treatment.carbs, treatment.isSMB, treatment.isValid));
} }
} }
@ -503,12 +503,13 @@ public class WatchUpdaterService extends WearableListenerService implements
return dm; return dm;
} }
private DataMap treatmentMap(long date, double bolus, double carbs, boolean isSMB) { private DataMap treatmentMap(long date, double bolus, double carbs, boolean isSMB, boolean isValid) {
DataMap dm = new DataMap(); DataMap dm = new DataMap();
dm.putLong("date", date); dm.putLong("date", date);
dm.putDouble("bolus", bolus); dm.putDouble("bolus", bolus);
dm.putDouble("carbs", carbs); dm.putDouble("carbs", carbs);
dm.putBoolean("isSMB", isSMB); dm.putBoolean("isSMB", isSMB);
dm.putBoolean("isValid", isValid);
return dm; return dm;
} }

1
wear/src/main/java/info/nightscout/androidaps/data/BolusWatchData.java
View file

@ -9,4 +9,5 @@ public class BolusWatchData {
public double bolus; public double bolus;
public double carbs; public double carbs;
public boolean isSMB; public boolean isSMB;
public boolean isValid;
} }

1
wear/src/main/java/info/nightscout/androidaps/watchfaces/BIGChart.java
View file

@ -412,6 +412,7 @@ public class BIGChart extends WatchFace implements SharedPreferences.OnSharedPre
bwd.bolus = bolus.getDouble("bolus"); bwd.bolus = bolus.getDouble("bolus");
bwd.carbs = bolus.getDouble("carbs"); bwd.carbs = bolus.getDouble("carbs");
bwd.isSMB = bolus.getBoolean("isSMB"); bwd.isSMB = bolus.getBoolean("isSMB");
bwd.isValid = bolus.getBoolean("isValid");
bolusWatchDataList.add(bwd); bolusWatchDataList.add(bwd);
} }
} }

6
wear/src/main/java/info/nightscout/androidaps/watchfaces/BgGraphBuilder.java
View file

@ -206,14 +206,14 @@ public class BgGraphBuilder {
List<PointValue> pointValues = new ArrayList<PointValue>(); List<PointValue> pointValues = new ArrayList<PointValue>();
for (BolusWatchData bwd: bolusWatchDataList) { for (BolusWatchData bwd: bolusWatchDataList) {
if(bwd.date > start_time && !bwd.isSMB) { if(bwd.date > start_time && !bwd.isSMB && !bwd.isValid && bwd.bolus > 0) {
pointValues.add(new PointValue(fuzz(bwd.date), (float) offset-2)); pointValues.add(new PointValue(fuzz(bwd.date), (float) offset-2));
} }
} }
Line line = new Line(pointValues); Line line = new Line(pointValues);
line.setColor(bolusColor); line.setColor(bolusColor);
line.setHasLines(false); line.setHasLines(false);
line.setPointRadius(pointSize); line.setPointRadius(pointSize*2);
line.setHasPoints(true); line.setHasPoints(true);
return line; return line;
} }
@ -223,7 +223,7 @@ public class BgGraphBuilder {
List<PointValue> pointValues = new ArrayList<PointValue>(); List<PointValue> pointValues = new ArrayList<PointValue>();
for (BolusWatchData bwd: bolusWatchDataList) { for (BolusWatchData bwd: bolusWatchDataList) {
if(bwd.date > start_time && bwd.isSMB) { if(bwd.date > start_time && bwd.isSMB && !bwd.isValid && bwd.bolus > 0) {
pointValues.add(new PointValue(fuzz(bwd.date), (float) offset-2)); pointValues.add(new PointValue(fuzz(bwd.date), (float) offset-2));
} }
} }