Skip to content

Commit 6dadff1

Browse files
authored
Fix carb data display in chart by updating marker line formatting (#587)
1 parent 2564f97 commit 6dadff1

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

LoopFollow/Controllers/Graphs.swift

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,12 +1111,15 @@ extension MainViewController {
11111111
formatter.maximumFractionDigits = 2
11121112
formatter.minimumIntegerDigits = 1
11131113

1114-
var valueString: String = formatter.string(from: NSNumber(value: carbData[i].value))!
1114+
let carbAmountString = formatter.string(from: NSNumber(value: carbData[i].value))!
1115+
var valueString = carbAmountString
1116+
var markerLine1 = carbAmountString + "g"
11151117

11161118
var hours = 3
11171119
if carbData[i].absorptionTime > 0, Storage.shared.showAbsorption.value {
11181120
hours = carbData[i].absorptionTime / 60
11191121
valueString += " " + String(hours) + "h"
1122+
markerLine1 += " " + String(hours) + "h"
11201123
}
11211124

11221125
// Check overlapping carbs to shift left if needed
@@ -1133,7 +1136,7 @@ extension MainViewController {
11331136
dateTimeStamp = dateTimeStamp - 250
11341137
}
11351138

1136-
let dot = ChartDataEntry(x: Double(dateTimeStamp), y: Double(carbData[i].sgv), data: valueString + "\r\r" + formatPillText(line1: valueString + " g", time: carbData[i].date))
1139+
let dot = ChartDataEntry(x: Double(dateTimeStamp), y: Double(carbData[i].sgv), data: valueString + "\r\r" + formatPillText(line1: markerLine1, time: carbData[i].date))
11371140
BGChart.data?.dataSets[dataIndex].addEntry(dot)
11381141
if Storage.shared.smallGraphTreatments.value {
11391142
BGChartFull.data?.dataSets[dataIndex].addEntry(dot)

0 commit comments

Comments
 (0)