Complete re-write of the flow path for functions to draw and update the graph

LoopFollow/Controllers/Alarms.swift

@@ -172,52 +172,47 @@ extension MainViewController {
            }
         
         // check for missed bolus - Only checks within 1 hour of carb entry
-        if UserDefaultsRepository.alertMissedBolusActive.value && !UserDefaultsRepository.alertMissedBolusIsSnoozed.value {
-            if carbData.count > 0  {
-                let lastCarb = carbData[carbData.count - 1].value
-                let lastCarbTime = carbData[carbData.count - 1].date
-                let now = dateTimeUtils.getNowTimeIntervalUTC()
-                
-                if lastCarbTime > (now - (60 * 60)) {
-                    // If low grams is active, the carbs and BG must both be higher
-                    if (UserDefaultsRepository.alertMissedBolusLowGramsActive.value &&
-                        lastCarb >= Double(UserDefaultsRepository.alertMissedBolusLowGrams.value) &&
-                        currentBG >= UserDefaultsRepository.alertMissedBolusLowGramsBG.value) ||
-                        !UserDefaultsRepository.alertMissedBolusLowGramsActive.value {
+        if UserDefaultsRepository.alertMissedBolusActive.value && !UserDefaultsRepository.alertMissedBolusIsSnoozed.value && carbData.count > 0{
+            let lastCarb = carbData[carbData.count - 1].value
+            let lastCarbTime = carbData[carbData.count - 1].date
+            let now = dateTimeUtils.getNowTimeIntervalUTC()
+            
+            
+            //Only check carbs from last 1 hour
+            if lastCarbTime > (now - (60 * 60)) {
+                // If low grams is active, the carbs and BG must both be higher
+                if (UserDefaultsRepository.alertMissedBolusLowGramsActive.value &&
+                    lastCarb >= Double(UserDefaultsRepository.alertMissedBolusLowGrams.value) &&
+                    currentBG >= UserDefaultsRepository.alertMissedBolusLowGramsBG.value) ||
+                    !UserDefaultsRepository.alertMissedBolusLowGramsActive.value {
+                    
+                    // There is a current carb but no boluses at all
+                    if bolusData.count < 1 {
+                        AlarmSound.whichAlarm = "Missed Bolus Alert"
+                        triggerAlarm(sound: UserDefaultsRepository.alertMissedBolusSound.value, snooozedBGReadingTime: nil)
+                        return
+                    } else {
+                        // Get the latest bolus over the small bolus exclusion
+                        var lastBolus = 0.0
+                        var lastBolusTime = 0.0
+                        var i = 1
+                        while lastBolus < UserDefaultsRepository.alertMissedBolusIgnoreBolus.value {
+                            lastBolus = bolusData[bolusData.count - i].value
+                            lastBolusTime = bolusData[bolusData.count - i].date
+                            i += 1
+                        }
                         
-                        // There is a current carb but no boluses at all
-                        if bolusData.count < 1 {
+                        // Calclulate the prebolus by moving the carbs back in time the allowed amount.
+                        // This lets us only need to check that the recent bolus is after it.
+                        if ((lastCarbTime - Double(UserDefaultsRepository.alertMissedBolusPrebolus.value * 60)) > lastBolusTime) &&
+                            lastCarbTime + Double(UserDefaultsRepository.alertMissedBolusPrebolus.value * 60) > (dateTimeUtils.getNowTimeIntervalUTC()) {
                             AlarmSound.whichAlarm = "Missed Bolus Alert"
                             triggerAlarm(sound: UserDefaultsRepository.alertMissedBolusSound.value, snooozedBGReadingTime: nil)
                             return
-                        } else {
-                            
-                            // Get the latest bolus over the small bolus exclusion
-                            var lastBolus = 0.0
-                            var lastBolusTime = 0.0
-                            var i = 1
-                            while lastBolus > UserDefaultsRepository.alertMissedBolusIgnoreBolus.value {
-                                lastBolus = bolusData[bolusData.count - i].value
-                                lastBolusTime = bolusData[bolusData.count - i].date
-                                i += 1
-                            }
-                            
-                            // Calclulate the prebolus by moving the carbs back in time the allowed amount.
-                            // This lets us only need to check that the recent bolus is after it.
-                            if ((lastCarbTime - Double(UserDefaultsRepository.alertMissedBolusPrebolus.value * 60)) > lastBolusTime) &&
-                                lastCarbTime + Double(UserDefaultsRepository.alertMissedBolusPrebolus.value * 60) > (dateTimeUtils.getNowTimeIntervalUTC()) {
-                                AlarmSound.whichAlarm = "Missed Bolus Alert"
-                               triggerAlarm(sound: UserDefaultsRepository.alertMissedBolusSound.value, snooozedBGReadingTime: nil)
-                               return
-                            }
-                            
                         }
+                        
                     }
                 }
-                
-                
-                
-                
             }
         }
            

LoopFollow/Controllers/Graphs.swift

@@ -28,7 +28,305 @@ extension MainViewController {
         }
     }
 
+    // data.addDataSet(lineBG) // Dataset 0
+    // data.addDataSet(lineBasal) // Dataset 1
+    // data.addDataSet(lineBolus) // Dataset 2
+    // data.addDataSet(lineCarbs) // Dataset 3
+    func createGraph(){
+        self.BGChart.clear()
+        // Create the BG Graph Data
+        let entries = bgData
+        var bgChartEntry = [ChartDataEntry]()
+        var colors = [NSUIColor]()
+        var maxBG: Int = UserDefaultsRepository.minBGScale.value
+        
+        // Setup BG line details
+        let lineBG = LineChartDataSet(entries:bgChartEntry, label: "")
+        lineBG.circleRadius = 3
+        lineBG.circleColors = [NSUIColor.systemGreen]
+        lineBG.drawCircleHoleEnabled = false
+        lineBG.axisDependency = YAxis.AxisDependency.right
+        lineBG.highlightEnabled = false
+        lineBG.drawValuesEnabled = false
+        
+        if UserDefaultsRepository.showLines.value {
+            lineBG.lineWidth = 2
+        } else {
+            lineBG.lineWidth = 0
+        }
+        if UserDefaultsRepository.showDots.value {
+            lineBG.drawCirclesEnabled = true
+        } else {
+            lineBG.drawCirclesEnabled = false
+        }
+        lineBG.setDrawHighlightIndicators(false)
+        lineBG.valueFont.withSize(50)
+        
+        
+
+        // create Basal graph data
+        var chartEntry = [ChartDataEntry]()
+        var maxBasal = UserDefaultsRepository.minBasalScale.value
+        let lineBasal = LineChartDataSet(entries:chartEntry, label: "")
+        lineBasal.setDrawHighlightIndicators(false)
+        lineBasal.setColor(NSUIColor.systemBlue, alpha: 0.5)
+        lineBasal.lineWidth = 0
+        lineBasal.drawFilledEnabled = true
+        lineBasal.fillColor = NSUIColor.systemBlue.withAlphaComponent(0.8)
+        lineBasal.drawCirclesEnabled = false
+        lineBasal.axisDependency = YAxis.AxisDependency.left
+        lineBasal.highlightEnabled = false
+        lineBasal.drawValuesEnabled = false
+        
+        // Boluses
+        var chartEntryBolus = [ChartDataEntry]()
+        let lineBolus = LineChartDataSet(entries:chartEntryBolus, label: "")
+        lineBolus.circleRadius = 7
+        lineBolus.circleColors = [NSUIColor.systemBlue.withAlphaComponent(0.75)]
+        lineBolus.drawCircleHoleEnabled = false
+        lineBolus.setDrawHighlightIndicators(false)
+        lineBolus.setColor(NSUIColor.systemBlue, alpha: 1.0)
+        lineBolus.drawCirclesEnabled = true
+        lineBolus.lineWidth = 0
+        lineBolus.axisDependency = YAxis.AxisDependency.right
+        lineBolus.valueFormatter = ChartYDataValueFormatter()
+        lineBolus.drawValuesEnabled = true
+        lineBolus.valueTextColor = NSUIColor.label
+
+        
+        // Carbs
+        var chartEntryCarbs = [ChartDataEntry]()
+        let lineCarbs = LineChartDataSet(entries:chartEntryCarbs, label: "")
+        lineCarbs.circleRadius = 7
+        lineCarbs.circleColors = [NSUIColor.systemOrange.withAlphaComponent(0.75)]
+        lineCarbs.drawCircleHoleEnabled = false
+        lineCarbs.setDrawHighlightIndicators(false)
+        lineCarbs.setColor(NSUIColor.systemBlue, alpha: 1.0)
+        lineCarbs.drawCirclesEnabled = true
+        lineCarbs.lineWidth = 0
+        lineCarbs.axisDependency = YAxis.AxisDependency.right
+        lineCarbs.valueFormatter = ChartYDataValueFormatter()
+        lineCarbs.drawValuesEnabled = true
+        lineCarbs.valueTextColor = NSUIColor.label
+        
+        // Setup the chart data of all lines
+        let data = LineChartData()
+        data.addDataSet(lineBG) // Dataset 0
+        data.addDataSet(lineBasal) // Dataset 1
+        data.addDataSet(lineBolus) // Dataset 2
+        data.addDataSet(lineCarbs) // Dataset 3
+        data.setValueFont(UIFont.systemFont(ofSize: 12))
+        
+        // Clear limit lines so they don't add multiples when changing the settings
+        BGChart.rightAxis.removeAllLimitLines()
+        
+        //Add lower red line based on low alert value
+        let ll = ChartLimitLine()
+        ll.limit = Double(UserDefaultsRepository.lowLine.value)
+        ll.lineColor = NSUIColor.systemRed.withAlphaComponent(0.5)
+        BGChart.rightAxis.addLimitLine(ll)
+        
+        //Add upper yellow line based on low alert value
+        let ul = ChartLimitLine()
+        ul.limit = Double(UserDefaultsRepository.highLine.value)
+        ul.lineColor = NSUIColor.systemYellow.withAlphaComponent(0.5)
+        BGChart.rightAxis.addLimitLine(ul)
+        
+        // Setup the main graph overall details
+        BGChart.xAxis.valueFormatter = ChartXValueFormatter()
+        BGChart.xAxis.granularity = 1800
+        BGChart.xAxis.labelTextColor = NSUIColor.label
+        BGChart.xAxis.labelPosition = XAxis.LabelPosition.bottom
+        
+        BGChart.leftAxis.enabled = true
+        BGChart.leftAxis.labelPosition = YAxis.LabelPosition.insideChart
+        BGChart.leftAxis.axisMaximum = maxBasal
+        BGChart.leftAxis.axisMinimum = 0.0
+        BGChart.leftAxis.drawGridLinesEnabled = false
+        
+        BGChart.rightAxis.labelTextColor = NSUIColor.label
+        BGChart.rightAxis.labelPosition = YAxis.LabelPosition.insideChart
+        BGChart.rightAxis.axisMinimum = 40
+        BGChart.rightAxis.axisMaximum = Double(maxBG)
+        
+        BGChart.legend.enabled = false
+        BGChart.scaleYEnabled = false
+        BGChart.drawGridBackgroundEnabled = false
+        //BGChart.gridBackgroundColor = NSUIColor.secondarySystemBackground
+        
+        BGChart.data = data
+        BGChart.setExtraOffsets(left: 10, top: 10, right: 10, bottom: 10)
+        BGChart.setVisibleXRangeMinimum(10)
+       
+        
+    }
     
+    func updateBGGraphSettings() {
+        let dataIndex = 0
+        let lineBG = BGChart.lineData!.dataSets[dataIndex] as! LineChartDataSet
+        if UserDefaultsRepository.showLines.value {
+                   lineBG.lineWidth = 2
+               } else {
+                   lineBG.lineWidth = 0
+               }
+               if UserDefaultsRepository.showDots.value {
+                   lineBG.drawCirclesEnabled = true
+               } else {
+                   lineBG.drawCirclesEnabled = false
+               }
+        
+        // Clear limit lines so they don't add multiples when changing the settings
+        BGChart.rightAxis.removeAllLimitLines()
+        
+        //Add lower red line based on low alert value
+        let ll = ChartLimitLine()
+        ll.limit = Double(UserDefaultsRepository.lowLine.value)
+        ll.lineColor = NSUIColor.systemRed.withAlphaComponent(0.5)
+        BGChart.rightAxis.addLimitLine(ll)
+        
+        //Add upper yellow line based on low alert value
+        let ul = ChartLimitLine()
+        ul.limit = Double(UserDefaultsRepository.highLine.value)
+        ul.lineColor = NSUIColor.systemYellow.withAlphaComponent(0.5)
+        BGChart.rightAxis.addLimitLine(ul)
+    }
+    
+    func updateBGGraph() {
+        let dataIndex = 0
+        let entries = bgData
+        var mainChart = BGChart.lineData!.dataSets[dataIndex] as! LineChartDataSet
+        var smallChart = BGChartFull.lineData!.dataSets[dataIndex] as! LineChartDataSet
+        mainChart.clear()
+        smallChart.clear()
+        var maxBG = UserDefaultsRepository.minBGScale.value
+        var colors = [NSUIColor]()
+        for i in 0..<entries.count{
+            if entries[i].sgv > maxBG - 40 {
+                maxBG = entries[i].sgv + 40
+            }
+            let value = ChartDataEntry(x: Double(entries[i].date), y: Double(entries[i].sgv))
+            mainChart.addEntry(value)
+            smallChart.addEntry(value)
+            
+            if Double(entries[i].sgv) >= Double(UserDefaultsRepository.highLine.value) {
+                colors.append(NSUIColor.systemYellow)
+            } else if Double(entries[i].sgv) <= Double(UserDefaultsRepository.lowLine.value) {
+               colors.append(NSUIColor.systemRed)
+            } else {
+                colors.append(NSUIColor.systemGreen)
+            }
+        }
+        
+        // Add Prediction Data
+        if predictionData.count > 0 && bgData.count > 0 && UserDefaultsRepository.graphPrediction.value {
+            print("graph prediction")
+            var startingTime = entries[entries.count - 1].date + 300
+            var i = 0
+            // Add 1 hour of predictions
+            while i < 12 {
+                var predictionVal = Double(predictionData[i])
+                // Below can be turned on to prevent out of range on the graph if desired.
+                // It currently just drops them out of view
+                if predictionVal > 400 {
+               //     predictionVal = 400
+                } else if predictionVal < 0 {
+                //    predictionVal = 0
+                }
+                let value = ChartDataEntry(x: startingTime + 5, y: predictionVal)
+                mainChart.addEntry(value)
+                smallChart.addEntry(value)
+                colors.append(NSUIColor.systemPurple)
+                startingTime += 300
+                i += 1
+            }
+        }
+        
+        // Set Colors
+        let lineBG = BGChart.lineData!.dataSets[dataIndex] as! LineChartDataSet
+        lineBG.resetColors()
+        if colors.count > 0 {
+            print("graph colors")
+            for i in 1..<colors.count{
+                mainChart.addColor(colors[i])
+                mainChart.circleColors.append(colors[i])
+                smallChart.addColor(colors[i])
+                smallChart.circleColors.append(colors[i])
+            }
+        }
+        
+        BGChart.rightAxis.axisMaximum = Double(maxBG)
+       
+        
+        BGChart.data?.dataSets[dataIndex].notifyDataSetChanged()
+        BGChart.data?.notifyDataChanged()
+        BGChart.notifyDataSetChanged()
+        BGChartFull.data?.dataSets[dataIndex].notifyDataSetChanged()
+        BGChartFull.data?.notifyDataChanged()
+        BGChartFull.notifyDataSetChanged()
+        
+        if firstGraphLoad {
+            BGChart.zoom(scaleX: 18, scaleY: 1, x: 1, y: 1)
+            firstGraphLoad = false
+        }
+        BGChart.moveViewToAnimated(xValue: dateTimeUtils.getNowTimeIntervalUTC() - (BGChart.visibleXRange * 0.7), yValue: 0.0, axis: .right, duration: 1, easingOption: .easeInBack)
+    }
+    
+    func updateBasalGraph() {
+        var dataIndex = 1
+        BGChart.lineData?.dataSets[dataIndex].clear()
+        var maxBasal = UserDefaultsRepository.minBasalScale.value
+        for i in 0..<basalData.count{
+            let value = ChartDataEntry(x: Double(basalData[i].date), y: Double(basalData[i].basalRate))
+            BGChart.data?.dataSets[dataIndex].addEntry(value)
+            if basalData[i].basalRate  > maxBasal {
+                maxBasal = basalData[i].basalRate
+            }
+        }
+        
+        BGChart.leftAxis.axisMaximum = maxBasal
+        
+        BGChart.data?.dataSets[dataIndex].notifyDataSetChanged()
+        BGChart.data?.notifyDataChanged()
+        BGChart.notifyDataSetChanged()
+    }
+    
+    func updateBolusGraph() {
+        var dataIndex = 2
+        BGChart.lineData?.dataSets[dataIndex].clear()
+        for i in 0..<bolusData.count{
+            let formatter = NumberFormatter()
+            formatter.minimumFractionDigits = 0
+            formatter.maximumFractionDigits = 2
+            formatter.minimumIntegerDigits = 1
+            let value = ChartDataEntry(x: Double(bolusData[i].date), y: Double(bolusData[i].sgv + 10), data: formatter.string(from: NSNumber(value: bolusData[i].value)))
+            BGChart.data?.dataSets[dataIndex].addEntry(value)
+
+        }
+        
+        BGChart.data?.dataSets[dataIndex].notifyDataSetChanged()
+        BGChart.data?.notifyDataChanged()
+        BGChart.notifyDataSetChanged()
+    }
+    
+    func updateCarbGraph() {
+        var dataIndex = 3
+        BGChart.lineData?.dataSets[dataIndex].clear()
+        for i in 0..<carbData.count{
+            let formatter = NumberFormatter()
+            formatter.minimumFractionDigits = 0
+            formatter.maximumFractionDigits = 2
+            formatter.minimumIntegerDigits = 1
+             let value = ChartDataEntry(x: Double(carbData[i].date), y: Double(carbData[i].sgv + 30), data: formatter.string(from: NSNumber(value: carbData[i].value)))
+            BGChart.data?.dataSets[dataIndex].addEntry(value)
+
+        }
+        
+        BGChart.data?.dataSets[dataIndex].notifyDataSetChanged()
+        BGChart.data?.notifyDataChanged()
+        BGChart.notifyDataSetChanged()
+    }
+    
+    /*
     func createGraph(){
         self.BGChart.clear()
         print("enter graph")
@@ -260,27 +558,25 @@ extension MainViewController {
         }
         
     }
+    */
     
-    
-    func createSmallBGGraph(bgChartEntry: [ChartDataEntry], colors: [NSUIColor]){
-        print("small graph")
-        //24 Hour Small Graph
-        let line2 = LineChartDataSet(entries:bgChartEntry, label: "Number")
-        line2.drawCirclesEnabled = false
+    func createSmallBGGraph(){
+        let entries = bgData
+       var bgChartEntry = [ChartDataEntry]()
+       var colors = [NSUIColor]()
+
+        let lineBG = LineChartDataSet(entries:bgChartEntry, label: "")
+        lineBG.drawCirclesEnabled = false
         //line2.setDrawHighlightIndicators(false)
-        line2.highlightEnabled = true
-        line2.drawHorizontalHighlightIndicatorEnabled = false
-        line2.drawVerticalHighlightIndicatorEnabled = false
-        line2.highlightColor = NSUIColor.label
-        line2.drawValuesEnabled = false
-        line2.lineWidth = 2
-        for i in 1..<colors.count{
-            line2.addColor(colors[i])
-            line2.circleColors.append(colors[i])
-        }
-        
+        lineBG.highlightEnabled = true
+        lineBG.drawHorizontalHighlightIndicatorEnabled = false
+        lineBG.drawVerticalHighlightIndicatorEnabled = false
+        lineBG.highlightColor = NSUIColor.label
+        lineBG.drawValuesEnabled = false
+        lineBG.lineWidth = 2
+
         let data2 = LineChartData()
-        data2.addDataSet(line2)
+        data2.addDataSet(lineBG)
         BGChartFull.highlightPerDragEnabled = true
         BGChartFull.leftAxis.enabled = false
         BGChartFull.rightAxis.enabled = false
@@ -292,5 +588,39 @@ extension MainViewController {
         BGChartFull.data = data2
     }
     
+    /*  func createSmallBGGraph(bgChartEntry: [ChartDataEntry], colors: [NSUIColor]){
+           let entries = bgData
+                  var bgChartEntry = [ChartDataEntry]()
+                  var colors = [NSUIColor]()
+           print("small graph")
+           //24 Hour Small Graph
+           let line2 = LineChartDataSet(entries:bgChartEntry, label: "Number")
+           line2.drawCirclesEnabled = false
+           //line2.setDrawHighlightIndicators(false)
+           line2.highlightEnabled = true
+           line2.drawHorizontalHighlightIndicatorEnabled = false
+           line2.drawVerticalHighlightIndicatorEnabled = false
+           line2.highlightColor = NSUIColor.label
+           line2.drawValuesEnabled = false
+           line2.lineWidth = 2
+           for i in 1..<colors.count{
+               line2.addColor(colors[i])
+               line2.circleColors.append(colors[i])
+           }
+           
+           let data2 = LineChartData()
+           data2.addDataSet(line2)
+           BGChartFull.highlightPerDragEnabled = true
+           BGChartFull.leftAxis.enabled = false
+           BGChartFull.rightAxis.enabled = false
+           BGChartFull.xAxis.enabled = false
+           BGChartFull.legend.enabled = false
+           BGChartFull.scaleYEnabled = false
+           BGChartFull.scaleXEnabled = false
+           BGChartFull.drawGridBackgroundEnabled = false
+           BGChartFull.data = data2
+       }
+       */
+    
  
 }

LoopFollow/ViewControllers/MainViewController.swift

@@ -60,7 +60,7 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
     
     // View Delay Timer
     var viewTimer = Timer()
-    let viewTimeInterval: TimeInterval = 5.0
+    let viewTimeInterval: TimeInterval = 15.0
     
     // Check Alarms Timer
     // Don't check within 1 minute of alarm triggering to give the snoozer time to save data
@@ -120,6 +120,10 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
         infoTable.rowHeight = 25
         infoTable.dataSource = self
         
+        // Setup the Graph
+        createGraph()
+        createSmallBGGraph()
+        
         startTimer(time: timeInterval)
         // Load Data
         if UserDefaultsRepository.url.value != "" {
@@ -178,18 +182,17 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
         
     }
     
-    // Check for new data when timer ends
+    // This delays a few things to hopefully all all data to arrive.
        @objc func viewTimerDidEnd(_ timer:Timer) {
         print("view timer ended")
         if bgData.count > 0 {
                 self.checkAlarms(bgs: bgData)
                 self.updateMinAgo()
-            self.updateBadge(val: bgData[bgData.count - 1].sgv)
-               self.viewUpdateNSBG()
+                // self.updateBadge(val: bgData[bgData.count - 1].sgv)
+               //self.viewUpdateNSBG()
                if UserDefaultsRepository.writeCalendarEvent.value {
                    self.writeCalendar()
                }
-               self.createGraph()
            }
        }
     
@@ -230,15 +233,19 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
     // Check for new data when timer ends
     @objc func timerDidEnd(_ timer:Timer) {
         print("main timer ended")
-        self.clearOldSnoozes()
         nightscoutLoader()
     }
 
     //update Min Ago Text. We need to call this separately because it updates between readings
     func updateMinAgo(){
-        let deltaTime = (TimeInterval(Date().timeIntervalSince1970)-bgData[bgData.count - 1].date) / 60
-        minAgoBG = Double(TimeInterval(Date().timeIntervalSince1970)-bgData[bgData.count - 1].date)
-        MinAgoText.text = String(Int(deltaTime)) + " min ago"
+        if bgData.count > 0 {
+            let deltaTime = (TimeInterval(Date().timeIntervalSince1970)-bgData[bgData.count - 1].date) / 60
+            minAgoBG = Double(TimeInterval(Date().timeIntervalSince1970)-bgData[bgData.count - 1].date)
+            MinAgoText.text = String(Int(deltaTime)) + " min ago"
+        } else {
+            MinAgoText.text = ""
+        }
+        
     }
     
     //Clear the info data before next pull. This ensures we aren't displaying old data if something fails.

LoopFollow/ViewControllers/SettingsViewController.swift

@@ -192,7 +192,7 @@ class SettingsViewController: FormViewController {
                     UserDefaultsRepository.showDots.value = value
                 // Force main screen update
                 guard let mainScreen = self?.tabBarController!.viewControllers?[0] as? MainViewController else { return }
-                mainScreen.nightscoutLoader(forceLoad: true)
+                mainScreen.updateBGGraphSettings()
             }
         <<< SwitchRow("switchRowLines"){ row in
             row.title = "Display Lines"
@@ -202,7 +202,7 @@ class SettingsViewController: FormViewController {
                     UserDefaultsRepository.showLines.value = value
             // Force main screen update
             guard let mainScreen = self?.tabBarController!.viewControllers?[0] as? MainViewController else { return }
-            mainScreen.nightscoutLoader(forceLoad: true)
+            mainScreen.updateBGGraphSettings()
                     
         }
         <<< StepperRow("minBGScale") { row in
@@ -244,7 +244,7 @@ class SettingsViewController: FormViewController {
                 UserDefaultsRepository.lowLine.value = Int(value)
             // Force main screen update
             guard let mainScreen = self?.tabBarController!.viewControllers?[0] as? MainViewController else { return }
-            mainScreen.nightscoutLoader(forceLoad: true)
+            mainScreen.updateBGGraphSettings()
         }
         <<< StepperRow("highLine") { row in
             row.title = "High BG Display Value"
@@ -261,7 +261,7 @@ class SettingsViewController: FormViewController {
                 UserDefaultsRepository.highLine.value = Int(value)
             // Force main screen update
             guard let mainScreen = self?.tabBarController!.viewControllers?[0] as? MainViewController else { return }
-            mainScreen.nightscoutLoader(forceLoad: true)
+            mainScreen.updateBGGraphSettings()
         }
     }