caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' into sens-cutoff

Browse source
This commit is contained in:
Milos Kozak 2018-06-23 18:59:33 +02:00
parent f7309c9ff1 bbfe1d2f83
commit a3c3c52249
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/info/nightscout/androidaps/data/Profile.java
View file

@ -205,7 +205,7 @@ public class Profile {
if (targetHigh_v.size() != targetLow_v.size()) isValid = false; if (targetHigh_v.size() != targetLow_v.size()) isValid = false;
else for (int i = 0; i < targetHigh_v.size(); i++) else for (int i = 0; i < targetHigh_v.size(); i++)
if (targetHigh_v.get(i) < targetLow_v.get(i)) if (targetHigh_v.valueAt(i) < targetLow_v.valueAt(i))
isValid = false; isValid = false;
isValidated = true; isValidated = true;
@ -245,16 +245,16 @@ public class Profile {
isValidated = false; isValidated = false;
} }
} }
return isValid; return isValid;
} }
protected void sendBelowMinimumNotification(String from) { protected void sendBelowMinimumNotification(String from) {
MainApp.bus().post(new EventNewNotification(new Notification(Notification.MINIMAL_BASAL_VALUE_REPLACED, String.format(MainApp.gs(R.string.minimalbasalvaluereplaced), from), Notification.NORMAL))); MainApp.bus().post(new EventNewNotification(new Notification(Notification.MINIMAL_BASAL_VALUE_REPLACED, String.format(MainApp.gs(R.string.minimalbasalvaluereplaced), from), Notification.NORMAL)));
} }
protected void sendAboveMaximumNotification(String from) { protected void sendAboveMaximumNotification(String from) {
MainApp.bus().post(new EventNewNotification(new Notification(Notification.MAXIMUM_BASAL_VALUE_REPLACED, String.format(MainApp.gs(R.string.maximumbasalvaluereplaced), from), Notification.NORMAL))); MainApp.bus().post(new EventNewNotification(new Notification(Notification.MAXIMUM_BASAL_VALUE_REPLACED, String.format(MainApp.gs(R.string.maximumbasalvaluereplaced), from), Notification.NORMAL)));
} }
private void validate(LongSparseArray array) { private void validate(LongSparseArray array) {
@ -458,12 +458,12 @@ public class Profile {
return ret; return ret;
} }
public double getTarget(){ public double getTarget() {
return getTarget(secondsFromMidnight(System.currentTimeMillis())); return getTarget(secondsFromMidnight(System.currentTimeMillis()));
} }
protected double getTarget(int timeAsSeconds) { protected double getTarget(int timeAsSeconds) {
return (getTargetLowTimeFromMidnight(timeAsSeconds) + getTargetHighTimeFromMidnight(timeAsSeconds))/2; return (getTargetLowTimeFromMidnight(timeAsSeconds) + getTargetHighTimeFromMidnight(timeAsSeconds)) / 2;
} }
public double getTargetLow() { public double getTargetLow() {
@ -559,7 +559,8 @@ public class Profile {
} }
public static String toSignedUnitsString(Double valueInMgdl, Double valueInMmol, String units) { public static String toSignedUnitsString(Double valueInMgdl, Double valueInMmol, String units) {
if (units.equals(Constants.MGDL)) return (valueInMgdl > 0 ? "+" : "") + DecimalFormatter.to0Decimal(valueInMgdl); if (units.equals(Constants.MGDL))
return (valueInMgdl > 0 ? "+" : "") + DecimalFormatter.to0Decimal(valueInMgdl);
else return (valueInMmol > 0 ? "+" : "") + DecimalFormatter.to1Decimal(valueInMmol); else return (valueInMmol > 0 ? "+" : "") + DecimalFormatter.to1Decimal(valueInMmol);
} }