Adding retrospection info to the prediction view, removing it from status.

Also removing Bolus IOB to avoid further confusion.

Fixes #155

Author: loudnate

Loop.xcodeproj/project.pbxproj

@@ -52,6 +52,7 @@
 		4354003A1C9FB81100D5819C /* UIColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DE92501C541832001FFDE1 /* UIColor.swift */; };
 		43649A631C7A347F00523D7F /* CollectionType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43649A621C7A347F00523D7F /* CollectionType.swift */; };
 		436A0DA51D236A2A00104B24 /* LoopError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436A0DA41D236A2A00104B24 /* LoopError.swift */; };
+		436A0E7B1D7DE13400D6475D /* NSNumberFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436A0E7A1D7DE13400D6475D /* NSNumberFormatter.swift */; };
 		436FACEE1D0BA636004E2427 /* InsulinDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436FACED1D0BA636004E2427 /* InsulinDataSource.swift */; };
 		43776F901B8022E90074EA36 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43776F8F1B8022E90074EA36 /* AppDelegate.swift */; };
 		43776F971B8022E90074EA36 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 43776F951B8022E90074EA36 /* Main.storyboard */; };
@@ -274,6 +275,7 @@
 		435400331C9F878D00D5819C /* SetBolusUserInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetBolusUserInfo.swift; sourceTree = "<group>"; };
 		43649A621C7A347F00523D7F /* CollectionType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionType.swift; sourceTree = "<group>"; };
 		436A0DA41D236A2A00104B24 /* LoopError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoopError.swift; sourceTree = "<group>"; };
+		436A0E7A1D7DE13400D6475D /* NSNumberFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSNumberFormatter.swift; sourceTree = "<group>"; };
 		436FACED1D0BA636004E2427 /* InsulinDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InsulinDataSource.swift; sourceTree = "<group>"; };
 		43776F8C1B8022E90074EA36 /* Loop.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Loop.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		43776F8F1B8022E90074EA36 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = AppDelegate.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
@@ -606,6 +608,7 @@
 		43E344A01B9E144300C85C07 /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
+				C17884621D51A7A400405663 /* BatteryIndicator.swift */,
 				4331E0771C85302200FBE832 /* CGPoint.swift */,
 				4346D1F51C78501000ABAFE3 /* ChartPoint.swift */,
 				43649A621C7A347F00523D7F /* CollectionType.swift */,
@@ -616,13 +619,13 @@
 				4302F4DA1D4D6E9F00F0FCAF /* NSData.swift */,
 				43CE7CDD1CA8B63E003CC1B0 /* NSDate.swift */,
 				4398973A1CD2FC2000223065 /* NSDateFormatter.swift */,
+				436A0E7A1D7DE13400D6475D /* NSNumberFormatter.swift */,
 				439897341CD2F7DE00223065 /* NSTimeInterval.swift */,
 				43E344A31B9E1B1C00C85C07 /* NSUserDefaults.swift */,
 				43F41C361D3BF32400C11ED6 /* UIAlertController.swift */,
 				43DE92501C541832001FFDE1 /* UIColor.swift */,
 				437CEEE31CDE5C0A003C8C80 /* UIImage.swift */,
 				434FF1ED1CF27EEF000DB779 /* UITableViewCell.swift */,
-				C17884621D51A7A400405663 /* BatteryIndicator.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -1043,6 +1046,7 @@
 				437D9BA31D7BC977007245E8 /* PredictionTableViewController.swift in Sources */,
 				43F41C371D3BF32400C11ED6 /* UIAlertController.swift in Sources */,
 				437CEEBC1CD6DE6A003C8C80 /* HUDView.swift in Sources */,
+				436A0E7B1D7DE13400D6475D /* NSNumberFormatter.swift in Sources */,
 				434F545F1D288345002A9274 /* ShareService.swift in Sources */,
 				43FBEDD81D73843700B21F22 /* LevelMaskView.swift in Sources */,
 				4354003A1C9FB81100D5819C /* UIColor.swift in Sources */,

Loop/Extensions/NSNumberFormatter.swift

@@ -0,0 +1,23 @@
+//
+//  NSNumberFormatter.swift
+//  Loop
+//
+//  Created by Nate Racklyeft on 9/5/16.
+//  Copyright © 2016 Nathan Racklyeft. All rights reserved.
+//
+
+import Foundation
+import HealthKit
+
+
+extension NSNumberFormatter {
+    static func glucoseFormatter(for unit: HKUnit) -> NSNumberFormatter {
+        let numberFormatter = NSNumberFormatter()
+        numberFormatter.numberStyle = .DecimalStyle
+        numberFormatter.minimumFractionDigits = unit.preferredMinimumFractionDigits
+        numberFormatter.maximumSignificantDigits = 3
+        numberFormatter.usesSignificantDigits = true
+
+        return numberFormatter
+    }
+}

Loop/Managers/LoopDataManager.swift

@@ -228,14 +228,14 @@ final class LoopDataManager {
 
      - parameter resultsHandler: A closure called once the values have been retrieved. The closure takes the following arguments:
         - predictedGlucose:     The calculated timeline of predicted glucose values
-        - reflectedGlucose:     The retrospective prediction over a recent period of glucose samples
+        - retrospectivePredictedGlucose: The retrospective prediction over a recent period of glucose samples
         - recommendedTempBasal: The recommended temp basal based on predicted glucose
         - lastTempBasal:        The last set temp basal
         - lastLoopCompleted:    The last date at which a loop completed, from prediction to dose (if dosing is enabled)
         - insulinOnBoard        Current insulin on board
         - error:                An error in the current state of the loop, or one that happened during the last attempt to loop.
      */
-    func getLoopStatus(resultsHandler: (predictedGlucose: [GlucoseValue]?, reflectedGlucose: [GlucoseValue]?, recommendedTempBasal: TempBasalRecommendation?, lastTempBasal: DoseEntry?, lastLoopCompleted: NSDate?, insulinOnBoard: InsulinValue?, error: ErrorType?) -> Void) {
+    func getLoopStatus(resultsHandler: (predictedGlucose: [GlucoseValue]?, retrospectivePredictedGlucose: [GlucoseValue]?, recommendedTempBasal: TempBasalRecommendation?, lastTempBasal: DoseEntry?, lastLoopCompleted: NSDate?, insulinOnBoard: InsulinValue?, error: ErrorType?) -> Void) {
         dispatch_async(dataAccessQueue) {
             var error: ErrorType?
 
@@ -245,7 +245,7 @@ final class LoopDataManager {
                 error = updateError
             }
 
-            resultsHandler(predictedGlucose: self.predictedGlucose, reflectedGlucose: self.retrospectivePredictedGlucose, recommendedTempBasal: self.recommendedTempBasal, lastTempBasal: self.lastTempBasal, lastLoopCompleted: self.lastLoopCompleted, insulinOnBoard: self.insulinOnBoard, error: error ?? self.lastLoopError)
+            resultsHandler(predictedGlucose: self.predictedGlucose, retrospectivePredictedGlucose: self.retrospectivePredictedGlucose, recommendedTempBasal: self.recommendedTempBasal, lastTempBasal: self.lastTempBasal, lastLoopCompleted: self.lastLoopCompleted, insulinOnBoard: self.insulinOnBoard, error: error ?? self.lastLoopError)
         }
     }
 
@@ -294,7 +294,7 @@ final class LoopDataManager {
         didSet {
             predictedGlucose = nil
 
-            // Carb data may be back-dated, so re-calculate the reflected glucose.
+            // Carb data may be back-dated, so re-calculate the retrospective glucose.
             retrospectivePredictedGlucose = nil
         }
     }
@@ -512,7 +512,7 @@ final class LoopDataManager {
             )
         }
 
-        self.predictedGlucose = predictionWithRetrospectiveEffect
+        self.predictedGlucose = retrospectiveCorrectionEnabled ? predictionWithRetrospectiveEffect : prediction
 
         guard let
             maxBasal = deviceDataManager.maximumBasalRatePerHour,

Loop/Managers/NightscoutDataManager.swift

@@ -34,17 +34,15 @@ class NightscoutDataManager {
                 return
         }
 
-        deviceDataManager.loopManager.getLoopStatus { (predictedGlucose, _, recommendedTempBasal, lastTempBasal, lastLoopCompleted, insulinOnBoard, loopError) in
+        deviceDataManager.loopManager.getLoopStatus { (predictedGlucose, _, recommendedTempBasal, lastTempBasal, _, insulinOnBoard, loopError) in
 
             self.deviceDataManager.loopManager.getRecommendedBolus { (bolusUnits, getBolusError) in
-                if getBolusError != nil {
-                    self.deviceDataManager.logger.addError(getBolusError!, fromSource: "NightscoutDataManager")
+                if let getBolusError = getBolusError {
+                    self.deviceDataManager.logger.addError(getBolusError, fromSource: "NightscoutDataManager")
                 }
                 self.uploadLoopStatus(insulinOnBoard, predictedGlucose: predictedGlucose, recommendedTempBasal: recommendedTempBasal, recommendedBolus: bolusUnits, lastTempBasal: lastTempBasal, loopError: loopError ?? getBolusError)
             }
         }
-
-        
     }
 
     private var lastTempBasalUploaded: DoseEntry?

Loop/Models/PredictionInputEffect.swift

@@ -36,9 +36,9 @@ enum PredictionInputEffect {
         case .insulin:
             return String(format: NSLocalizedString("Insulin Absorbed (U) × Insulin Sensitivity (%1$@/U)", comment: "Description of the prediction input effect for insulin"), unit.glucoseUnitDisplayString)
         case .momentum:
-            return NSLocalizedString("15-min Glucose Regression Coefficient (b₁), continued with decay over 30min", comment: "Description of the prediction input effect for glucose momentum")
+            return NSLocalizedString("15 min glucose regression coefficient (b₁), continued with decay over 30 min", comment: "Description of the prediction input effect for glucose momentum")
         case .retrospection:
-            return NSLocalizedString("30-min Retrospective Correction of Glucose Prediction vs Actual, continued with decay over 60min", comment: "Description of the prediction input effect for retrospective correction")
+            return NSLocalizedString("30 mim comparison of glucose prediction vs actual, continued with decay over 60 min", comment: "Description of the prediction input effect for retrospective correction")
         }
     }
 }

Loop/View Controllers/StatusTableViewController.swift

@@ -136,7 +136,7 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
             needsRefresh = false
             reloading = true
 
-            tableView.reloadSections(NSIndexSet(indexesInRange: NSMakeRange(Section.Pump.rawValue, Section.count - Section.Pump.rawValue)
+            tableView.reloadSections(NSIndexSet(indexesInRange: NSMakeRange(Section.Sensor.rawValue, Section.count - Section.Sensor.rawValue)
             ), withRowAnimation: visible ? .Automatic : .None)
 
             let calendar = NSCalendar.currentCalendar()
@@ -171,14 +171,13 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
             }
 
             dispatch_group_enter(reloadGroup)
-            dataManager.loopManager.getLoopStatus { (predictedGlucose, reflectedGlucose, recommendedTempBasal, lastTempBasal, lastLoopCompleted, insulinOnBoard, error) -> Void in
+            dataManager.loopManager.getLoopStatus { (predictedGlucose, _, recommendedTempBasal, lastTempBasal, lastLoopCompleted, _, error) -> Void in
                 if error != nil {
                     self.needsRefresh = true
                 }
 
                 self.charts.predictedGlucoseValues = predictedGlucose ?? []
                 self.recommendedTempBasal = recommendedTempBasal
-                self.reflectedGlucose = reflectedGlucose
                 self.lastTempBasal = lastTempBasal
                 self.lastLoopCompleted = lastLoopCompleted
 
@@ -266,10 +265,9 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
     private enum Section: Int {
         case Charts = 0
         case Status
-        case Pump
         case Sensor
 
-        static let count = 4
+        static let count = 3
     }
 
     // MARK: - Chart Section Data
@@ -289,15 +287,12 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
 
     private enum StatusRow: Int {
         case RecommendedBasal = 0
-        case ReflectedGlucose
 
-        static let count = 2
+        static let count = 1
     }
 
     private var recommendedTempBasal: LoopDataManager.TempBasalRecommendation?
 
-    private var reflectedGlucose: [GlucoseValue]?
-
     private var lastTempBasal: DoseEntry? {
         didSet {
             guard let scheduledBasal = dataManager.basalRateSchedule?.between(NSDate(), NSDate()).first else {
@@ -372,12 +367,6 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
 
     // MARK: - Pump/Sensor Section Data
 
-    private enum PumpRow: Int {
-        case InsulinOnBoard = 0
-
-        static let count = 1
-    }
-
     private enum SensorRow: Int {
         case State
 
@@ -424,8 +413,6 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
             return ChartRow.count
         case .Status:
             return StatusRow.count
-        case .Pump:
-            return PumpRow.count
         case .Sensor:
             return SensorRow.count
         }
@@ -494,35 +481,6 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
                 } else {
                     cell.accessoryView = nil
                 }
-            case .ReflectedGlucose:
-                cell.textLabel?.text = "Predicted 30m ago"
-
-                if let startGlucose = reflectedGlucose?.first, let endGlucose = reflectedGlucose?.last, let currentGlucose = self.dataManager.glucoseStore?.latestGlucose {
-                    let startValue = Int(startGlucose.quantity.doubleValueForUnit(charts.glucoseUnit))
-                    let predictedValue = Int(endGlucose.quantity.doubleValueForUnit(charts.glucoseUnit))
-                    let currentValue = Int(currentGlucose.quantity.doubleValueForUnit(charts.glucoseUnit))
-
-                    cell.detailTextLabel?.text = "\(startValue) → \(predictedValue) @ \(timeFormatter.stringFromDate(endGlucose.startDate)) \(currentValue - predictedValue)"
-                } else {
-                    cell.detailTextLabel?.text = emptyValueString
-                }
-            }
-
-            return cell
-        case .Pump:
-            let cell = tableView.dequeueReusableCellWithIdentifier(UITableViewCell.className, forIndexPath: indexPath)
-            cell.selectionStyle = .None
-
-            switch PumpRow(rawValue: indexPath.row)! {
-            case .InsulinOnBoard:
-                cell.textLabel?.text = NSLocalizedString("Bolus Insulin on Board", comment: "The title of the cell containing the estimated amount of active bolus insulin in the body")
-
-                if let iob = dataManager.latestPumpStatusFromMySentry?.iob {
-                    let numberValue = NSNumber(double: iob).descriptionWithLocale(locale)
-                    cell.detailTextLabel?.text = "\(numberValue) Units"
-                } else {
-                    cell.detailTextLabel?.text = emptyValueString
-                }
             }
 
             return cell
@@ -552,7 +510,7 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
             case .IOB, .Dose, .COB:
                 return 85
             }
-        case .Status, .Pump, .Sensor:
+        case .Status, .Sensor:
             return UITableViewAutomaticDimension
         }
     }
@@ -562,13 +520,6 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
         case .Charts:
             switch ChartRow(rawValue: indexPath.row)! {
             case .Glucose:
-//                if let URL = NSURL(string: "dexcomcgm://") where UIApplication.sharedApplication().canOpenURL(URL) {
-//                    UIApplication.sharedApplication().openURL(URL)
-//                }
-//                else if let URL = NSURL(string: "dexcomshare://") where UIApplication.sharedApplication().canOpenURL(URL) {
-//                    UIApplication.sharedApplication().openURL(URL)
-//                }
-
                 performSegueWithIdentifier(PredictionTableViewController.className, sender: indexPath)
             case .IOB, .Dose:
                 performSegueWithIdentifier(InsulinDeliveryTableViewController.className, sender: indexPath)
@@ -596,15 +547,11 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
                         }
                     }
                 }
-            case .ReflectedGlucose:
-                break
             }
         case .Sensor:
             if let URL = NSURL(string: "dexcomcgm://") {
                 UIApplication.sharedApplication().openURL(URL)
             }
-        case .Pump:
-            break
         }
     }
 
@@ -744,7 +691,21 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
 
     @IBOutlet var loopCompletionHUD: LoopCompletionHUDView!
 
-    @IBOutlet var glucoseHUD: GlucoseHUDView!
+    @IBOutlet var glucoseHUD: GlucoseHUDView! {
+        didSet {
+            let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(openCGMApp(_:)))
+            glucoseHUD.addGestureRecognizer(tapGestureRecognizer)
+        }
+    }
+
+    @objc private func openCGMApp(_: AnyObject) {
+        if let URL = NSURL(string: "dexcomcgm://") where UIApplication.sharedApplication().canOpenURL(URL) {
+            UIApplication.sharedApplication().openURL(URL)
+        }
+        else if let URL = NSURL(string: "dexcomshare://") where UIApplication.sharedApplication().canOpenURL(URL) {
+            UIApplication.sharedApplication().openURL(URL)
+        }
+    }
 
     @IBOutlet var basalRateHUD: BasalRateHUDView!