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

feat: change value type from Double to ColorValue in the BarChart (#441)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2021-08-02 20:11:48 +02:00
parent 83e6e21ec2
commit 918a07150b
8 changed files with 69 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
Kit/Widgets/BarChart.swift
View File

@@ -18,7 +18,7 @@ public class BarChart: WidgetWrapper {
private var colorState: Color = .systemAccent
private var colors: [Color] = Color.allCases
private var value: [Double] = []
private var value: [[ColorValue]] = [[]]
private var pressureLevel: Int = 0
private var colorZones: colorZones = (0.6, 0.8)
@@ -38,7 +38,7 @@ public class BarChart: WidgetWrapper {
if let previewConfig = config!["Preview"] as? NSDictionary {
configuration = previewConfig
if let value = configuration["Value"] as? String {
self.value = value.split(separator: ",").map{ (Double($0) ?? 0) }
self.value = value.split(separator: ",").map{ ([ColorValue(Double($0) ?? 0)]) }
}
}
}
@@ -77,7 +77,7 @@ public class BarChart: WidgetWrapper {
if preview {
if self.value.isEmpty {
self.value = [0.72, 0.38]
self.value = [[ColorValue(0.72)], [ColorValue(0.38)]]
}
self.setFrameSize(NSSize(width: 36, height: self.frame.size.height))
self.invalidateIntrinsicContentSize()
@@ -124,10 +124,10 @@ public class BarChart: WidgetWrapper {
NSAttributedString.Key.foregroundColor: NSColor.textColor,
NSAttributedString.Key.paragraphStyle: style
]
let letterHeight = self.frame.height / 3
let letterWidth: CGFloat = 6.0
var yMargin: CGFloat = 0
for char in String(self.title.prefix(3)).uppercased().reversed() {
let rect = CGRect(x: x, y: yMargin, width: letterWidth, height: letterHeight)
@@ -135,7 +135,7 @@ public class BarChart: WidgetWrapper {
str.draw(with: rect)
yMargin += letterHeight
}
width += letterWidth + Constants.Widget.spacing
x = letterWidth + Constants.Widget.spacing
}
@@ -161,26 +161,35 @@ public class BarChart: WidgetWrapper {
x += offset
for i in 0..<self.value.count {
let partitionValue = self.value[i]
let partitonHeight = maxPartitionHeight * CGFloat(partitionValue)
let partition = NSBezierPath(rect: NSRect(x: x, y: offset, width: partitionWidth, height: partitonHeight))
switch self.colorState {
case .systemAccent: controlAccentColor.set()
case .utilization: partitionValue.usageColor(zones: self.colorZones).setFill()
case .pressure: self.pressureLevel.pressureColor().setFill()
case .monochrome:
if self.boxState {
(isDarkMode ? NSColor.black : NSColor.white).set()
var y = offset
for a in 0..<self.value[i].count {
let partitionValue = self.value[i][a]
let partitonHeight = maxPartitionHeight * CGFloat(partitionValue.value)
let partition = NSBezierPath(rect: NSRect(x: x, y: y, width: partitionWidth, height: partitonHeight))
if partitionValue.color == nil {
switch self.colorState {
case .systemAccent: controlAccentColor.set()
case .utilization: partitionValue.value.usageColor(zones: self.colorZones).setFill()
case .pressure: self.pressureLevel.pressureColor().setFill()
case .monochrome:
if self.boxState {
(isDarkMode ? NSColor.black : NSColor.white).set()
} else {
(isDarkMode ? NSColor.white : NSColor.black).set()
}
default: (self.colorState.additional as? NSColor ?? controlAccentColor).set()
}
} else {
(isDarkMode ? NSColor.white : NSColor.black).set()
partitionValue.color?.set()
}
default: (self.colorState.additional as? NSColor ?? controlAccentColor).set()
partition.fill()
partition.close()
y += partitonHeight
}
partition.fill()
partition.close()
x += partitionWidth + partitionMargin
}
@@ -193,7 +202,7 @@ public class BarChart: WidgetWrapper {
self.setWidth(width)
}
public func setValue(_ value: [Double]) {
public func setValue(_ value: [[ColorValue]]) {
guard self.value != value else {
return
}
@@ -229,42 +238,33 @@ public class BarChart: WidgetWrapper {
// MARK: - Settings
public override func settings(width: CGFloat) -> NSView {
let rowHeight: CGFloat = 30
let settingsNumber: CGFloat = 4
let height: CGFloat = ((rowHeight + Constants.Settings.margin) * settingsNumber) + Constants.Settings.margin
let view = SettingsContainerView(width: width)
let view: NSView = NSView(frame: NSRect(
x: Constants.Settings.margin,
y: Constants.Settings.margin,
width: width - (Constants.Settings.margin*2),
height: height
))
view.addSubview(toggleTitleRow(
frame: NSRect(x: 0, y: (rowHeight + Constants.Settings.margin) * 3, width: view.frame.width, height: rowHeight),
view.addArrangedSubview(toggleTitleRow(
frame: NSRect(x: 0, y: 0, width: view.frame.width, height: Constants.Settings.row),
title: localizedString("Label"),
action: #selector(toggleLabel),
state: self.labelState
))
self.boxSettingsView = toggleTitleRow(
frame: NSRect(x: 0, y: (rowHeight + Constants.Settings.margin) * 2, width: view.frame.width, height: rowHeight),
frame: NSRect(x: 0, y: 0, width: view.frame.width, height: Constants.Settings.row),
title: localizedString("Box"),
action: #selector(toggleBox),
state: self.boxState
)
view.addSubview(self.boxSettingsView!)
view.addArrangedSubview(self.boxSettingsView!)
self.frameSettingsView = toggleTitleRow(
frame: NSRect(x: 0, y: (rowHeight + Constants.Settings.margin) * 1, width: view.frame.width, height: rowHeight),
frame: NSRect(x: 0, y: 0, width: view.frame.width, height: Constants.Settings.row),
title: localizedString("Frame"),
action: #selector(toggleFrame),
state: self.frameState
)
view.addSubview(self.frameSettingsView!)
view.addArrangedSubview(self.frameSettingsView!)
view.addSubview(selectRow(
frame: NSRect(x: 0, y: (rowHeight + Constants.Settings.margin) * 0, width: view.frame.width, height: rowHeight),
view.addArrangedSubview(selectRow(
frame: NSRect(x: 0, y: 0, width: view.frame.width, height: Constants.Settings.row),
title: localizedString("Color"),
action: #selector(toggleColor),
items: self.colors,

15
Kit/types.swift
View File

@@ -11,6 +11,21 @@
import Cocoa
public struct ColorValue: Equatable {
public let value: Double
public let color: NSColor?
public init(_ value: Double, color: NSColor? = nil) {
self.value = value
self.color = color
}
// swiftlint:disable operator_whitespace
public static func ==(lhs: ColorValue, rhs: ColorValue) -> Bool {
return lhs.value == rhs.value
}
}
public enum AppUpdateInterval: String {
case atStart = "At start"
case separator1 = "separator_1"

2
Modules/Battery/main.swift
View File

@@ -112,7 +112,7 @@ public class Battery: Module {
self.widgets.filter{ $0.isActive }.forEach { (w: Widget) in
switch w.item {
case let widget as Mini: widget.setValue(abs(value.level))
case let widget as BarChart: widget.setValue([value.level])
case let widget as BarChart: widget.setValue([[ColorValue(value.level)]])
case let widget as BatterykWidget:
widget.setValue(
percentage: value.level ,

7
Modules/CPU/main.swift
View File

@@ -128,7 +128,12 @@ public class CPU: Module {
switch w.item {
case let widget as Mini: widget.setValue(value.totalUsage)
case let widget as LineChart: widget.setValue(value.totalUsage)
case let widget as BarChart: widget.setValue(self.usagePerCoreState ? value.usagePerCore : [value.totalUsage])
case let widget as BarChart:
var val: [[ColorValue]] = [[ColorValue(value.totalUsage)]]
if self.usagePerCoreState {
val = value.usagePerCore.map({ [ColorValue($0)] })
}
widget.setValue(val)
case let widget as PieChart:
widget.setValue([
circle_segment(value: value.systemLoad, color: NSColor.systemRed),

2
Modules/Disk/main.swift
View File

@@ -200,7 +200,7 @@ public class Disk: Module {
self.widgets.filter{ $0.isActive }.forEach { (w: Widget) in
switch w.item {
case let widget as Mini: widget.setValue(percentage)
case let widget as BarChart: widget.setValue([percentage])
case let widget as BarChart: widget.setValue([[ColorValue(percentage)]])
case let widget as MemoryWidget: widget.setValue((DiskSize(free).getReadableMemory(), DiskSize(usedSpace).getReadableMemory()))
default: break
}

4
Modules/Fans/main.swift
View File

@@ -89,12 +89,12 @@ public class Fans: Module {
let label: Bool = Store.shared.bool(key: "Fans_label", defaultValue: false)
var list: [KeyValue_t] = []
var flatList: [Double] = []
var flatList: [[ColorValue]] = []
value.forEach { (f: Fan) in
if f.state {
let str = label ? "\(f.name.prefix(1).uppercased()): \(Int(f.value))" : f.formattedValue
list.append(KeyValue_t(key: "Fan#\(f.id)", value: str))
flatList.append(((f.value*100)/f.maxSpeed)/100)
flatList.append([ColorValue(((f.value*100)/f.maxSpeed)/100)])
}
}

2
Modules/GPU/main.swift
View File

@@ -133,7 +133,7 @@ public class GPU: Module {
widget.setValue(utilization)
widget.setTitle(self.showType ? "\(selectedGPU.type)GPU" : nil)
case let widget as LineChart: widget.setValue(utilization)
case let widget as BarChart: widget.setValue([utilization])
case let widget as BarChart: widget.setValue([[ColorValue(utilization)]])
default: break
}
}

4
Modules/RAM/main.swift
View File

@@ -110,6 +110,7 @@ public class RAM: Module {
self.popupView.loadCallback(value)
let total: Double = value.total == 0 ? 1 : value.total
self.widgets.filter{ $0.isActive }.forEach { (w: Widget) in
switch w.item {
case let widget as Mini:
@@ -119,11 +120,10 @@ public class RAM: Module {
widget.setValue(value.usage)
widget.setPressure(value.pressureLevel)
case let widget as BarChart:
widget.setValue([value.usage])
widget.setValue([[ColorValue(value.usage)]])
widget.setColorZones((0.8, 0.95))
widget.setPressure(value.pressureLevel)
case let widget as PieChart:
let total: Double = value.total == 0 ? 1 : value.total
widget.setValue([
circle_segment(value: value.app/total, color: NSColor.systemBlue),
circle_segment(value: value.wired/total, color: NSColor.systemOrange),