Selaa lähdekoodia

fixes in TTcalcs as targetValues are now always md/dL

Robert 1 vuosi sitten
vanhempi
commit
7aed1ecfd7

+ 2 - 2
FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -248,8 +248,8 @@ extension Home {
                 0
             )
             var durationString = ""
-
-            let target = latestTempTarget.target
+            var target = (latestTempTarget.target ?? 100) as Decimal
+            target = state.units == .mmolL ? target.asMmolL : target
             var targetString = target == 0 ? "" : (fetchedTargetFormatter.string(from: (target ?? 0) as NSNumber) ?? "") + " " +
                 state.units
                 .rawValue

+ 3 - 7
FreeAPS/Sources/Modules/OverrideConfig/OverrideStateModel.swift

@@ -789,7 +789,7 @@ extension OverrideConfig.StateModel {
     func computeHalfBasalTarget() -> Double {
         let adjustmentRatio = Decimal(percentage / 100)
         let normalTarget: Decimal = 100
-        var tempTargetValue: Decimal = tempTargetTarget
+        let tempTargetValue: Decimal = tempTargetTarget
         var halfBasalTargetValue = halfBasalTarget
         if adjustmentRatio != 1 {
             halfBasalTargetValue = ((2 * adjustmentRatio * normalTarget) - normalTarget - (adjustmentRatio * tempTargetValue)) /
@@ -800,9 +800,7 @@ extension OverrideConfig.StateModel {
 
     func computeSliderLow() -> Double {
         var minSens: Double = 15
-        var tempTargetValue = tempTargetTarget
-        if units == .mmolL {
-            tempTargetValue = Decimal(round(Double(tempTargetTarget.asMgdL))) }
+        let tempTargetValue = tempTargetTarget
         if tempTargetValue == 0 { return minSens }
         if tempTargetValue < 100 ||
             (
@@ -815,10 +813,8 @@ extension OverrideConfig.StateModel {
 
     func computeSliderHigh() -> Double {
         var maxSens = Double(maxValue * 100)
-        var tempTargetValue = tempTargetTarget
+        let tempTargetValue = tempTargetTarget
         if tempTargetValue == 0 { return maxSens }
-        if units == .mmolL {
-            tempTargetValue = Decimal(round(Double(tempTargetTarget.asMgdL))) }
         if tempTargetValue > 100 || !settingsManager.preferences.lowTemptargetLowersSensitivity { maxSens = 100 }
         return maxSens
     }