Просмотр исходного кода

Changed z-order of predictions

Jonas Björkert 2 лет назад
Родитель
Сommit
8659eb7a95

+ 6 - 6
LoopFollow/Controllers/Graphs.swift

@@ -366,10 +366,10 @@ extension MainViewController {
         data.append(lineResume) // Dataset 9
         data.append(lineResume) // Dataset 9
         data.append(lineSensor) // Dataset 10
         data.append(lineSensor) // Dataset 10
         data.append(lineNote) // Dataset 11
         data.append(lineNote) // Dataset 11
-        data.append(COBlinePrediction) // Dataset 12
+        data.append(ZTlinePrediction) // Dataset 12
         data.append(IOBlinePrediction) // Dataset 13
         data.append(IOBlinePrediction) // Dataset 13
-        data.append(UAMlinePrediction) // Dataset 14
-        data.append(ZTlinePrediction) // Dataset 15
+        data.append(COBlinePrediction) // Dataset 14
+        data.append(UAMlinePrediction) // Dataset 15
 
 
         data.setValueFont(UIFont.systemFont(ofSize: 12))
         data.setValueFont(UIFont.systemFont(ofSize: 12))
         
         
@@ -1304,10 +1304,10 @@ extension MainViewController {
         data.append(lineResume) // Dataset 9
         data.append(lineResume) // Dataset 9
         data.append(lineSensor) // Dataset 10
         data.append(lineSensor) // Dataset 10
         data.append(lineNote) // Dataset 11
         data.append(lineNote) // Dataset 11
-        data.append(COBlinePrediction) // Dataset 12
+        data.append(ZTlinePrediction) // Dataset 12
         data.append(IOBlinePrediction) // Dataset 13
         data.append(IOBlinePrediction) // Dataset 13
-        data.append(UAMlinePrediction) // Dataset 14
-        data.append(ZTlinePrediction) // Dataset 15
+        data.append(COBlinePrediction) // Dataset 14
+        data.append(UAMlinePrediction) // Dataset 15
 
 
         BGChartFull.highlightPerDragEnabled = true
         BGChartFull.highlightPerDragEnabled = true
         BGChartFull.leftAxis.enabled = false
         BGChartFull.leftAxis.enabled = false

+ 3 - 3
LoopFollow/Controllers/Nightscout/DeviceStatusOpenAPS.swift

@@ -47,10 +47,10 @@ extension MainViewController {
                 if let enactdata = lastLoopRecord["enacted"] as? [String:AnyObject],
                 if let enactdata = lastLoopRecord["enacted"] as? [String:AnyObject],
                    let predbgdata = enactdata["predBGs"] as? [String: AnyObject] {
                    let predbgdata = enactdata["predBGs"] as? [String: AnyObject] {
                     let predictionTypes: [(type: String, colorName: String, dataIndex: Int)] = [
                     let predictionTypes: [(type: String, colorName: String, dataIndex: Int)] = [
-                        ("COB", "LoopYellow", 12),
+                        ("ZT", "ZT", 12),
                         ("IOB", "Insulin", 13),
                         ("IOB", "Insulin", 13),
-                        ("UAM", "UAM", 14),
-                        ("ZT", "ZT", 15)
+                        ("COB", "LoopYellow", 14),
+                        ("UAM", "UAM", 15)
                     ]
                     ]
                     
                     
                     for (type, colorName, dataIndex) in predictionTypes {
                     for (type, colorName, dataIndex) in predictionTypes {