caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

wear timeframe bolus

Browse source
This commit is contained in:
AdrianLxM 2018-03-04 14:47:30 +01:00
parent a4eb82c524
commit b98dc5c72f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -206,12 +206,12 @@ 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 && bwd.isValid && bwd.bolus > 0) { if(bwd.date > start_time && bwd.date <= end_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(bolusInvalidColor); line.setColor(basalCenterColor);
line.setHasLines(false); line.setHasLines(false);
line.setPointRadius(pointSize*2); line.setPointRadius(pointSize*2);
line.setHasPoints(true); line.setHasPoints(true);
@ -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 && bwd.isValid && bwd.bolus > 0) { if(bwd.date > start_time && bwd.date <= end_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));
} }
} }
@ -240,7 +240,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.isValid && bwd.bolus > 0)) { if(bwd.date > start_time && bwd.date <= end_time && !(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));
} }
} }