Skip to content

Fix issue with negative predictions; treat nil COB as zero. #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
elnjensen wants to merge 2 commits into from
Closed

Fix issue with negative predictions; treat nil COB as zero. #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1260d1a
Treat nil COB as zero
elnjensen Aug 6, 2018
16faff1
Use signed integers for predicted glucose values.
elnjensen Aug 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Common/Models/WatchPredictedGlucose.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ extension WatchPredictedGlucose: RawRepresentable {
var rawValue: RawValue {

return [
"v": values.map { UInt16($0.quantity.doubleValue(for: .milligramsPerDeciliter)) },
"v": values.map { Int16($0.quantity.doubleValue(for: .milligramsPerDeciliter)) },
"d": values[0].startDate,
"i": values[1].startDate.timeIntervalSince(values[0].startDate)
]
}

init?(rawValue: RawValue) {
guard
let values = rawValue["v"] as? [UInt16],
let values = rawValue["v"] as? [Int16],
let firstDate = rawValue["d"] as? Date,
let interval = rawValue["i"] as? TimeInterval
else {
Expand Down
19 changes: 7 additions & 12 deletions WatchApp Extension/Controllers/ChartHUDController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,13 @@ final class ChartHUDController: HUDInterfaceController, WKCrownDelegate {
}

cobLabel.setHidden(true)
if let carbsOnBoard = activeContext.COB {
let carbFormatter = NumberFormatter()
carbFormatter.numberStyle = .decimal
carbFormatter.maximumFractionDigits = 0
let valueStr = carbFormatter.string(from:NSNumber(value:carbsOnBoard))

cobLabel.setText(String(format: NSLocalizedString(
"COB %1$@ g",
comment: "The subtitle format describing grams of active carbs. (1: localized carb value description)"),
valueStr!))
cobLabel.setHidden(false)
}
let carbsOnBoard = activeContext.COB ?? 0
let carbFormatter = NumberFormatter()
carbFormatter.numberStyle = .decimal
carbFormatter.maximumFractionDigits = 0
let valueStr = carbFormatter.string(from:NSNumber(value:carbsOnBoard))
cobLabel.setText(String(format: NSLocalizedString("COB %1$@ g", comment: "The subtitle format describing grams of active carbs. (1: localized carb value description)"), valueStr!))
cobLabel.setHidden(false)

basalLabel.setHidden(true)
if let tempBasal = activeContext.lastNetTempBasalDose {
Expand Down