caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

show boluses on bigchart

Browse source
This commit is contained in:
AdrianLxM 2018-02-20 15:39:02 +01:00
parent 126322053e
commit f6253284de
2 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -403,12 +403,12 @@ public class BIGChart extends WatchFace implements SharedPreferences.OnSharedPre
ArrayList<DataMap> boluses = dataMap.getDataMapArrayList("boluses"); ArrayList<DataMap> boluses = dataMap.getDataMapArrayList("boluses");
if (boluses != null) { if (boluses != null) {
bolusWatchDataList = new ArrayList<>(); bolusWatchDataList = new ArrayList<>();
for (DataMap basal : basals) { for (DataMap bolus : boluses) {
BolusWatchData bwd = new BolusWatchData(); BolusWatchData bwd = new BolusWatchData();
bwd.date = basal.getLong("date"); bwd.date = bolus.getLong("date");
bwd.bolus = basal.getDouble("bolus"); bwd.bolus = bolus.getDouble("bolus");
bwd.carbs = basal.getDouble("carbs"); bwd.carbs = bolus.getDouble("carbs");
bwd.isSMB = basal.getBoolean("isSMB"); bwd.isSMB = bolus.getBoolean("isSMB");
bolusWatchDataList.add(bwd); bolusWatchDataList.add(bwd);
} }
} }

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

@ -158,6 +158,7 @@ public class BgGraphBuilder {
} }
lines.add(basalLine((float) minChart, factor, highlight)); lines.add(basalLine((float) minChart, factor, highlight));
lines.add(bolusLine((float) minChart, factor));
return lines; return lines;
} }
@ -184,6 +185,31 @@ public class BgGraphBuilder {
} }
private Line bolusLine(float offset, double factor) {
List<PointValue> pointValues = new ArrayList<PointValue>();
for (BolusWatchData bwd: bolusWatchDataList) {
if(bwd.date > start_time) {
pointValues.add(new PointValue(fuzz(bwd.date), (float) offset+2));
}
}
Line line = new Line(pointValues);
line.setColor(basalCenterColor);
line.setHasLines(false);
line.setPointRadius(pointSize);
line.setHasPoints(true);
return line;
}
public Line highValuesLine() { public Line highValuesLine() {
Line highValuesLine = new Line(highValues); Line highValuesLine = new Line(highValues);
highValuesLine.setColor(highColor); highValuesLine.setColor(highColor);