From 416886228740860e9e5131cae1919c45d8b50da8 Mon Sep 17 00:00:00 2001 From: Serhiy Mytrovtsiy Date: Wed, 13 Oct 2021 18:27:31 +0200 Subject: [PATCH] feat: added Tachometer widget to the CPU, GPU, and RAM module (#631) --- Modules/CPU/config.plist | 7 +++++++ Modules/CPU/main.swift | 5 +++++ Modules/GPU/config.plist | 7 +++++++ Modules/GPU/main.swift | 4 ++++ Modules/RAM/config.plist | 7 +++++++ Modules/RAM/main.swift | 6 ++++++ 6 files changed, 36 insertions(+) diff --git a/Modules/CPU/config.plist b/Modules/CPU/config.plist index 8b8e3f05..6115ecd1 100644 --- a/Modules/CPU/config.plist +++ b/Modules/CPU/config.plist @@ -69,6 +69,13 @@ Order 4 + tachometer + + Default + + Order + 5 + diff --git a/Modules/CPU/main.swift b/Modules/CPU/main.swift index 4b40db40..47adcfb3 100644 --- a/Modules/CPU/main.swift +++ b/Modules/CPU/main.swift @@ -175,6 +175,11 @@ public class CPU: Module { circle_segment(value: value.systemLoad, color: NSColor.systemRed), circle_segment(value: value.userLoad, color: NSColor.systemBlue) ]) + case let widget as Tachometer: + widget.setValue([ + circle_segment(value: value.systemLoad, color: NSColor.systemRed), + circle_segment(value: value.userLoad, color: NSColor.systemBlue) + ]) default: break } } diff --git a/Modules/GPU/config.plist b/Modules/GPU/config.plist index 267b19c5..b74060ed 100644 --- a/Modules/GPU/config.plist +++ b/Modules/GPU/config.plist @@ -62,6 +62,13 @@ Order 3 + tachometer + + Default + + Order + 4 + diff --git a/Modules/GPU/main.swift b/Modules/GPU/main.swift index b77434f7..a6df467d 100644 --- a/Modules/GPU/main.swift +++ b/Modules/GPU/main.swift @@ -134,6 +134,10 @@ public class GPU: Module { widget.setTitle(self.showType ? "\(selectedGPU.type)GPU" : nil) case let widget as LineChart: widget.setValue(utilization) case let widget as BarChart: widget.setValue([[ColorValue(utilization)]]) + case let widget as Tachometer: + widget.setValue([ + circle_segment(value: utilization, color: NSColor.systemBlue) + ]) default: break } } diff --git a/Modules/RAM/config.plist b/Modules/RAM/config.plist index a42b927b..e400c4c0 100644 --- a/Modules/RAM/config.plist +++ b/Modules/RAM/config.plist @@ -79,6 +79,13 @@ Order 5 + tachometer + + Default + + Order + 6 + diff --git a/Modules/RAM/main.swift b/Modules/RAM/main.swift index 4f466d95..32b28184 100644 --- a/Modules/RAM/main.swift +++ b/Modules/RAM/main.swift @@ -150,6 +150,12 @@ public class RAM: Module { let free = Units(bytes: Int64(value.free)).getReadableMemory() let used = Units(bytes: Int64(value.used)).getReadableMemory() widget.setValue((free, used)) + case let widget as Tachometer: + widget.setValue([ + circle_segment(value: value.app/total, color: NSColor.systemBlue), + circle_segment(value: value.wired/total, color: NSColor.systemOrange), + circle_segment(value: value.compressed/total, color: NSColor.systemPink) + ]) default: break } }