morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-15 00:34:08 +09:00
Code Issues Packages Projects Releases Wiki Activity

- round sensor value to integer when more than 100 (#139)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2020-11-08 16:34:57 +01:00
parent 516fdb301e
commit 66738cc010
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Modules/Sensors/values.swift
View File

@@ -31,6 +31,8 @@ struct Sensor_t {
var key: String
var name: String
var value: Double = 0
var group: SensorGroup_t
var type: SensorType_t
var unit: String {
@@ -47,18 +49,18 @@ struct Sensor_t {
}
}
var value: Double? = nil
var formattedValue: String {
get {
switch self.type {
case SensorType.Temperature.rawValue:
return Temperature(value ?? 0)
return Temperature(value)
case SensorType.Voltage.rawValue:
return String(format: "%.3f \(unit)", value ?? 0)
let val = value >= 100 ? "\(Int(value))" : String(format: "%.3f", value)
return "\(val)\(unit)"
case SensorType.Power.rawValue:
return String(format: "%.2f \(unit)", value ?? 0)
default: return String(format: "%.2f", value ?? 0)
let val = value >= 100 ? "\(Int(value))" : String(format: "%.2f", value)
return "\(val)\(unit)"
default: return String(format: "%.2f", value)
}
}
}
@@ -66,12 +68,14 @@ struct Sensor_t {
get {
switch self.type {
case SensorType.Temperature.rawValue:
return Temperature(value ?? 0).replacingOccurrences(of: "C", with: "").replacingOccurrences(of: "F", with: "")
return Temperature(value).replacingOccurrences(of: "C", with: "").replacingOccurrences(of: "F", with: "")
case SensorType.Voltage.rawValue:
return String(format: "%.1f\(unit)", value ?? 0)
let val = value >= 100 ? "\(Int(value))" : String(format: "%.1f", value)
return "\(val)\(unit)"
case SensorType.Power.rawValue:
return String(format: "%.1f\(unit)", value ?? 0)
default: return String(format: "%.1f", value ?? 0)
let val = value >= 100 ? "\(Int(value))" : String(format: "%.1f", value)
return "\(val)\(unit)"
default: return String(format: "%.1f", value)
}
}
}