caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

wear painting temps

Browse source
This commit is contained in:
AdrianLxM 2016-11-18 01:35:46 +01:00
parent 70c3969f85
commit 2b17fc5155
2 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -250,36 +250,38 @@ public class WatchUpdaterService extends WearableListenerService implements
long startTime = System.currentTimeMillis() - (long)(60000 * 60 * 5.5); long startTime = System.currentTimeMillis() - (long)(60000 * 60 * 5.5);
ArrayList<DataMap> basals = new ArrayList<>(); ArrayList<DataMap> basals = new ArrayList<>();
//TODO: Adrian: replace fake data //TODO: Adrian: replace fake data
long from = startTime; long from = startTime;
long to = (System.currentTimeMillis()+ startTime)/2; long now = System.currentTimeMillis();
long to = (now + from)/2;
double amount = 0.5; double amount = 0.5;
double afterwards = 0.8; double afterwards = 0.8;
basals.add(basalMap(from, to, amount, afterwards)); basals.add(basalMap(from, to, amount, afterwards));
from = to; from = to;
to = System.currentTimeMillis(); to = now;
amount = 0.8; amount = 0.8;
basals.add(basalMap(from, to, amount, amount)); basals.add(basalMap(from, to, amount, amount));
ArrayList<DataMap> temps = new ArrayList<>(); ArrayList<DataMap> temps = new ArrayList<>();
from = (long)(startTime + (1/8d)*(to - startTime)); from = (long)(startTime + (1/8d)*(now - startTime));
double fromBasal = 0.5; double fromBasal = 0.5;
to = (long)(startTime + (2/8d)*(to - startTime)); to = (long)(startTime + (2/8d)*(now - startTime));
double toBasal = 0.5; double toBasal = 0.5;
amount = 3; amount = 3;
temps.add(tempDatamap(from, fromBasal, to, toBasal, amount)); temps.add(tempDatamap(from, fromBasal, to, toBasal, amount));
from = (long)(startTime + (6/8d)*(to - startTime)); from = (long)(startTime + (6/8d)*(now - startTime));
fromBasal = 0; fromBasal = 0.8;
to = (long)(startTime + (7/8d)*(to - startTime)); to = (long)(startTime + (7/8d)*(now - startTime));
toBasal = 0; toBasal = 0.8;
amount = 0; amount = 0;
temps.add(tempDatamap(from, fromBasal, to, toBasal, amount)); temps.add(tempDatamap(from, fromBasal, to, toBasal, amount));

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

@ -116,9 +116,11 @@ public class BgGraphBuilder {
double factor = (maxChart-minChart)/maxTemp; double factor = (maxChart-minChart)/maxTemp;
// in case basal is the highest, don't paint it totally at the top. // in case basal is the highest, don't paint it totally at the top.
factor = Math.min(factor, ((maxChart-minChart)/maxTemp)*(2/3d)); factor = Math.min(factor, ((maxChart-minChart)/maxTemp)*(2/3d));
for (TempWatchData twd: tempWatchDataList) {
lines.add(tempValuesLine((float) minChart, factor)); if(twd.endTime > start_time) {
lines.add(tempValuesLine(twd, (float) minChart, factor));
}
}
return lines; return lines;
} }
@ -157,16 +159,15 @@ public class BgGraphBuilder {
} }
public Line tempValuesLine(float offset, double factor) { public Line tempValuesLine(TempWatchData twd, float offset, double factor) {
List<PointValue> lineValues = new ArrayList<PointValue>(); List<PointValue> lineValues = new ArrayList<PointValue>();
long begin = (long) Math.max(start_time, twd.startTime);
for (TempWatchData twd: tempWatchDataList) { lineValues.add(new PointValue(fuzz(begin), offset + (float)(factor*twd.startBasal)));
lineValues.add(new PointValue(fuzz(twd.startTime), offset + (float)(factor*twd.startBasal))); lineValues.add(new PointValue(fuzz(begin), offset +(float)(factor*twd.amount)));
lineValues.add(new PointValue(fuzz(twd.startTime), offset +(float)(factor*twd.amount)));
lineValues.add(new PointValue(fuzz(twd.endTime), offset + (float)(factor*twd.amount))); lineValues.add(new PointValue(fuzz(twd.endTime), offset + (float)(factor*twd.amount)));
lineValues.add(new PointValue(fuzz(twd.endTime), offset + (float)(factor*twd.endBasal))); lineValues.add(new PointValue(fuzz(twd.endTime), offset + (float)(factor*twd.endBasal)));
}
Line valueLine = new Line(lineValues); Line valueLine = new Line(lineValues);
valueLine.setHasPoints(false); valueLine.setHasPoints(false);