Skip to content

Bugfix: phantom ZT prediction dot intercepting latest BG dot on graph… #652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aug0211 wants to merge 1 commit into
base: dev
Choose a base branch
from
+16 −11
Open

Bugfix: phantom ZT prediction dot intercepting latest BG dot on graph… #652

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions LoopFollow/Controllers/Graphs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,11 @@ extension MainViewController {
if autoScrollPauseUntil == nil || Date() > autoScrollPauseUntil! {
BGChart.moveViewToAnimated(xValue: dateTimeUtils.getNowTimeIntervalUTC() - (BGChart.visibleXRange * 0.7), yValue: 0.0, axis: .right, duration: 1, easingOption: .easeInBack)
}

// Re-render OpenAPS predictions so any entry now at-or-before the latest BG
// is dropped from the dataset (otherwise the stale dot stays hit-testable
// beneath the new BG dot and steals the popup).
updateOpenAPSPredictionDisplay()
}

func updatePredictionGraph(color: UIColor? = nil) {
Expand Down Expand Up @@ -1971,6 +1976,12 @@ extension MainViewController {
let displayType: PredictionDisplayType = Storage.shared.device.value == "Loop" ? .lines : Storage.shared.predictionDisplayType.value
let toLoad = Int(Storage.shared.predictionToLoad.value * 12)
let predictionStart = openAPSPredUpdatedTime ?? Date().timeIntervalSince1970
// Drop prediction entries within ~1 min of the latest BG. Anything closer
// either (a) is a stale entry sitting at-or-before the new BG and would
// steal the chart's hit-test, or (b) is the loop's "now" prediction that
// visually duplicates the BG dot. The first kept entry is always cleanly
// separated from the BG dot.
let predictionMinTime = bgData.last.map { $0.date + 60 }

let predictionTypes: [(type: String, colorName: String, dataIndex: Int)] = [
("ZT", "ZT", GraphDataIndex.ztPrediction.rawValue),
Expand Down Expand Up @@ -1998,7 +2009,7 @@ extension MainViewController {
for arr in allArrays where i < arr.count {
valuesAtIndex.append(arr[i])
}
if !valuesAtIndex.isEmpty {
if !valuesAtIndex.isEmpty, predictionMinTime.map({ t > $0 }) ?? true {
var yMin = max(valuesAtIndex.min()!, Double(globalVariables.minDisplayGlucose))
var yMax = min(valuesAtIndex.max()!, Double(globalVariables.maxDisplayGlucose))
// Ensure minimum ±1 mg/dL range so the cone is visible when predictions agree
Expand Down Expand Up @@ -2031,7 +2042,9 @@ extension MainViewController {
if i < graphdata.count {
let v = graphdata[i]
let clamped = min(max(Int(round(v)), globalVariables.minDisplayGlucose), globalVariables.maxDisplayGlucose)
predictionData.append(ShareGlucoseData(sgv: clamped, date: t, direction: "flat"))
if predictionMinTime.map({ t > $0 }) ?? true {
predictionData.append(ShareGlucoseData(sgv: clamped, date: t, direction: "flat"))
}
t += 300
}
}
Expand Down Expand Up @@ -2062,15 +2075,7 @@ extension MainViewController {
topPredictionBG = predictionVal + maxBGOffset
}

if i == 0 {
if Storage.shared.showDots.value {
colors.append(color.withAlphaComponent(0.0))
} else {
colors.append(color.withAlphaComponent(1.0))
}
} else {
colors.append(color)
}
colors.append(color)

let value = ChartDataEntry(
x: predictionData[i].date,
Expand Down
Loading