Skip to content

Enforce a fixed number of fractional digits per unit type. #356

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 3 commits into from
Jan 5, 2017
Merged

Enforce a fixed number of fractional digits per unit type. #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
555aaf0
Enforce a fixed number of fractional digits per unit type.
Jan 2, 2017
6b924d4
Merge branch 'dev' into dev-fix-digits
Jan 2, 2017
0034256
Pass the glucose NumberFormatter directly into the chart
Jan 5, 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
2 changes: 1 addition & 1 deletion Common/Extensions/HKUnit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import HealthKit
// to avoid pulling in the LoopKit extension since it's not extension-API safe.
extension HKUnit {
// A formatting helper for determining the preferred decimal style for a given unit
var preferredMinimumFractionDigits: Int {
var preferredFractionDigits: Int {
if self.unitString == "mg/dL" {
return 0
} else {
Expand Down
10 changes: 6 additions & 4 deletions Loop/Managers/StatusChartManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ final class StatusChartsManager {
var glucoseValues: [GlucoseValue] = [] {
didSet {
let unitString = glucoseUnit.glucoseUnitDisplayString

let glucoseFormatter = NumberFormatter.glucoseFormatter(for: glucoseUnit)
glucosePoints = glucoseValues.map {
return ChartPoint(
x: ChartAxisValueDate(date: $0.startDate, formatter: dateFormatter),
y: ChartAxisValueDoubleUnit($0.quantity.doubleValue(for: glucoseUnit), unitString: unitString)
y: ChartAxisValueDoubleUnit($0.quantity.doubleValue(for: glucoseUnit), unitString: unitString, formatter: glucoseFormatter)
)
}
}
Expand All @@ -115,11 +115,12 @@ final class StatusChartsManager {
var predictedGlucoseValues: [GlucoseValue] = [] {
didSet {
let unitString = glucoseUnit.glucoseUnitDisplayString
let glucoseFormatter = NumberFormatter.glucoseFormatter(for: glucoseUnit)

predictedGlucosePoints = predictedGlucoseValues.map {
return ChartPoint(
x: ChartAxisValueDate(date: $0.startDate, formatter: dateFormatter),
y: ChartAxisValueDoubleUnit($0.quantity.doubleValue(for: glucoseUnit), unitString: unitString, formatter: integerFormatter)
y: ChartAxisValueDoubleUnit($0.quantity.doubleValue(for: glucoseUnit), unitString: unitString, formatter: glucoseFormatter)
)
}
}
Expand All @@ -128,11 +129,12 @@ final class StatusChartsManager {
var alternatePredictedGlucoseValues: [GlucoseValue] = [] {
didSet {
let unitString = glucoseUnit.glucoseUnitDisplayString
let glucoseFormatter = NumberFormatter.glucoseFormatter(for: glucoseUnit)

alternatePredictedGlucosePoints = alternatePredictedGlucoseValues.map {
return ChartPoint(
x: ChartAxisValueDate(date: $0.startDate, formatter: dateFormatter),
y: ChartAxisValueDoubleUnit($0.quantity.doubleValue(for: glucoseUnit), unitString: unitString, formatter: integerFormatter)
y: ChartAxisValueDoubleUnit($0.quantity.doubleValue(for: glucoseUnit), unitString: unitString, formatter: glucoseFormatter)
)
}
}
Expand Down
2 changes: 1 addition & 1 deletion Loop/Managers/StatusExtensionDataManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ final class StatusExtensionDataManager {
context.batteryPercentage = 0.25
context.reservoir = ReservoirContext(startDate: Date(), unitVolume: 42.5, capacity: 200)
context.netBasal = NetBasalContext(rate: 2.1, percentage: 0.6, startDate: Date() - TimeInterval(250))
context.eventualGlucose = HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 119.123)
context.eventualGlucose = HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 89.123)
.doubleValue(for: preferredUnit)
#endif

Expand Down
6 changes: 2 additions & 4 deletions LoopUI/Extensions/NSNumberFormatter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@ extension NumberFormatter {
public static func glucoseFormatter(for unit: HKUnit) -> NumberFormatter {
let numberFormatter = NumberFormatter()
numberFormatter.numberStyle = .decimal
numberFormatter.minimumFractionDigits = unit.preferredMinimumFractionDigits
numberFormatter.maximumSignificantDigits = 3
numberFormatter.usesSignificantDigits = true

numberFormatter.minimumFractionDigits = unit.preferredFractionDigits
numberFormatter.maximumFractionDigits = unit.preferredFractionDigits
return numberFormatter
}
}