caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

optimize overview graph drawing

Browse source
This commit is contained in:
Milos Kozak 2017-06-08 22:14:55 +02:00
parent a39f61284a
commit 74268675af
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/AutosensData.java
View file

@ -12,7 +12,7 @@ public class AutosensData {
public double deviation = 0d; public double deviation = 0d;
boolean calculateWithDeviation = false; boolean calculateWithDeviation = false;
double absorbed = 0d; double absorbed = 0d;
double carbsFromBolus = 0d; public double carbsFromBolus = 0d;
public double cob = 0; public double cob = 0;
public double bgi = 0d; public double bgi = 0d;
public double delta = 0d; public double delta = 0d;

23
app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
View file

@ -1296,17 +1296,30 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
List<DataPoint> iobArray = new ArrayList<>(); List<DataPoint> iobArray = new ArrayList<>();
List<DataPoint> cobArray = new ArrayList<>(); List<DataPoint> cobArray = new ArrayList<>();
List<DeviationDataPoint> devArray = new ArrayList<>(); List<DeviationDataPoint> devArray = new ArrayList<>();
double lastIob = -1000;
int lastCob = 0;
for (long time = fromTime; time <= now; time += 5 * 60 * 1000L) { for (long time = fromTime; time <= now; time += 5 * 60 * 1000L) {
if (showIobView.isChecked()) { if (showIobView.isChecked()) {
IobTotal iob = IobCobCalculatorPlugin.calulateFromTreatmentsAndTemps(time); double iob = IobCobCalculatorPlugin.calulateFromTreatmentsAndTemps(time).iob;
iobArray.add(new DataPoint(time, iob.iob)); if (Math.abs(lastIob - iob) > 0.02) {
maxIobValueFound = Math.max(maxIobValueFound, Math.abs(iob.iob)); if (Math.abs(lastIob - iob) > 0.2)
iobArray.add(new DataPoint(time, lastIob));
iobArray.add(new DataPoint(time, iob));
maxIobValueFound = Math.max(maxIobValueFound, Math.abs(iob));
lastIob = iob;
}
} }
if (showCobView.isChecked() || showDeviationsView.isChecked()) { if (showCobView.isChecked() || showDeviationsView.isChecked()) {
AutosensData autosensData = IobCobCalculatorPlugin.getAutosensData(time); AutosensData autosensData = IobCobCalculatorPlugin.getAutosensData(time);
if (autosensData != null && showCobView.isChecked()) { if (autosensData != null && showCobView.isChecked()) {
cobArray.add(new DataPoint(time, autosensData.cob)); int cob = (int) autosensData.cob;
maxCobValueFound = Math.max(maxCobValueFound, autosensData.cob); if (cob != lastCob) {
if (autosensData.carbsFromBolus > 0)
cobArray.add(new DataPoint(time, lastCob));
cobArray.add(new DataPoint(time, cob));
maxCobValueFound = Math.max(maxCobValueFound, cob);
lastCob = cob;
}
} }
if (autosensData != null && showDeviationsView.isChecked()) { if (autosensData != null && showDeviationsView.isChecked()) {
int color = Color.BLACK; // "=" int color = Color.BLACK; // "="