Skip to content

Fix range for mmol #529

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

Merged
merged 2 commits into from
Jul 24, 2017
Merged

Fix range for mmol #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4ac1df
Fix range for mmol
ps2 Jul 24, 2017
faf5aea
localization
ps2 Jul 24, 2017
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
17 changes: 9 additions & 8 deletions DoseMathTests/DoseMathTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,15 @@ extension XCTestCase {
public typealias JSONDictionary = [String: Any]


extension DateFormatter {
static func ISO8601LocalTimeDateFormatter() -> Self {
let dateFormatter = self.init()
extension ISO8601DateFormatter {
static func localTimeDateFormatter() -> Self {
let formatter = self.init()

dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
dateFormatter.locale = Locale(identifier: "en_US_POSIX")
formatter.formatOptions = .withInternetDateTime
formatter.formatOptions.subtract(.withTimeZone)
formatter.timeZone = .current

return dateFormatter
return formatter
}
}

Expand All @@ -56,7 +57,7 @@ class RecommendTempBasalTests: XCTestCase {

func loadGlucoseValueFixture(_ resourceName: String) -> [GlucoseValue] {
let fixture: [JSONDictionary] = loadFixture(resourceName)
let dateFormatter = DateFormatter.ISO8601LocalTimeDateFormatter()
let dateFormatter = ISO8601DateFormatter.localTimeDateFormatter()

return fixture.map {
return GlucoseFixtureValue(
Expand Down Expand Up @@ -460,7 +461,7 @@ class RecommendBolusTests: XCTestCase {

func loadGlucoseValueFixture(_ resourceName: String) -> [GlucoseValue] {
let fixture: [JSONDictionary] = loadFixture(resourceName)
let dateFormatter = DateFormatter.ISO8601LocalTimeDateFormatter()
let dateFormatter = ISO8601DateFormatter.localTimeDateFormatter()

return fixture.map {
return GlucoseFixtureValue(
Expand Down
2 changes: 1 addition & 1 deletion Loop/Managers/StatusChartsManager+LoopKit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ extension StatusChartsManager {
let dateFormatter = self.dateFormatter
let decimalFormatter = self.doseFormatter
let unit = glucoseUnit.unitDivided(by: .minute())
let unitString = unit.unitString
let unitString = String(format: NSLocalizedString("%1$@/min", comment: "Format string describing glucose units per minute (1: glucose unit string)"), glucoseUnit.glucoseUnitDisplayString)

var insulinCounteractionEffectPoints: [ChartPoint] = []
var allCarbEffectPoints: [ChartPoint] = []
Expand Down
16 changes: 8 additions & 8 deletions LoopUI/Managers/StatusChartsManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,14 +645,6 @@ public final class StatusChartsManager {
}
}

/// The minimum range to display for COB values.
private var carbEffectDisplayRangePoints: [ChartPoint] = [0, 1].map {
return ChartPoint(
x: ChartAxisValue(scalar: 0),
y: ChartAxisValueInt($0)
)
}

private var carbEffectChart: Chart?

private var carbEffectChartCache: ChartPointsTouchHighlightLayerViewCache?
Expand All @@ -674,6 +666,14 @@ public final class StatusChartsManager {
return nil
}

/// The minimum range to display for carb effect values.
let carbEffectDisplayRangePoints: [ChartPoint] = [0, glucoseUnit.glucoseUnitYAxisSegmentSize / 25.0].map {
return ChartPoint(
x: ChartAxisValue(scalar: 0),
y: ChartAxisValueDouble($0)
)
}

let yAxisValues = ChartAxisValuesStaticGenerator.generateYAxisValuesWithChartPoints(carbEffectPoints + allCarbEffectPoints + carbEffectDisplayRangePoints,
minSegmentCount: 2,
maxSegmentCount: 4,
Expand Down