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

cpu chart mvp

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2019-06-14 22:53:05 +02:00
parent 98d90f58a7
commit 102ab549f3
6 changed files with 136 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Stats.xcodeproj/project.pbxproj
View File

@@ -15,6 +15,7 @@
9A5B1CBF229E78F0008B9D3C /* Observable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A5B1CBE229E78F0008B9D3C /* Observable.swift */; };
9A5B1CC5229E7B40008B9D3C /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A5B1CC4229E7B40008B9D3C /* Extensions.swift */; };
9A6CFC0122A1C9F5001E782D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9A6CFC0022A1C9F5001E782D /* Assets.xcassets */; };
9A74D59422B4315C004FE1FA /* CPUView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A74D59322B4315C004FE1FA /* CPUView.swift */; };
9A7B8F5E22A2A57600DEB352 /* CPUReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A7B8F5D22A2A57600DEB352 /* CPUReader.swift */; };
9A7B8F6522A2C19D00DEB352 /* Memory.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9A7B8F6422A2C19D00DEB352 /* Memory.xib */; };
9A7B8F6722A2C1B900DEB352 /* Disk.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9A7B8F6622A2C1B900DEB352 /* Disk.xib */; };
@@ -54,6 +55,7 @@
9A5B1CBE229E78F0008B9D3C /* Observable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Observable.swift; sourceTree = "<group>"; };
9A5B1CC4229E7B40008B9D3C /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
9A6CFC0022A1C9F5001E782D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
9A74D59322B4315C004FE1FA /* CPUView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CPUView.swift; sourceTree = "<group>"; };
9A7B8F5D22A2A57600DEB352 /* CPUReader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CPUReader.swift; sourceTree = "<group>"; };
9A7B8F6422A2C19D00DEB352 /* Memory.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Memory.xib; sourceTree = "<group>"; };
9A7B8F6622A2C1B900DEB352 /* Disk.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Disk.xib; sourceTree = "<group>"; };
@@ -155,6 +157,7 @@
isa = PBXGroup;
children = (
9A57A19C22A1E3270033E318 /* CPU.swift */,
9A74D59322B4315C004FE1FA /* CPUView.swift */,
9A7B8F5D22A2A57600DEB352 /* CPUReader.swift */,
);
path = CPU;
@@ -307,6 +310,7 @@
9A7B8F6F22A2C57000DEB352 /* DiskReader.swift in Sources */,
9A7B8F6922A2C3A100DEB352 /* Memory.swift in Sources */,
9A7B8F5E22A2A57600DEB352 /* CPUReader.swift in Sources */,
9A74D59422B4315C004FE1FA /* CPUView.swift in Sources */,
9A7B8F6D22A2C3D600DEB352 /* MemoryReader.swift in Sources */,
9A57A18522A1D26D0033E318 /* MenuBar.swift in Sources */,
9A57A19D22A1E3270033E318 /* CPU.swift in Sources */,

124
Stats/Modules/CPU/CPU.swift
View File

@@ -8,144 +8,30 @@
import Cocoa
class ChartView: NSView {
var valueLabel: NSTextField = NSTextField()
var label: Bool = false
var points: [Double] {
didSet {
setNeedsDisplay(self.frame)
}
}
override init(frame: NSRect) {
self.points = Array(repeating: 0.0, count: 50)
super.init(frame: frame)
self.wantsLayer = true
if self.label {
let valueLabel = NSTextField(frame: NSMakeRect(2, MODULE_HEIGHT - 11, self.frame.size.width, 10))
valueLabel.textColor = NSColor.red
valueLabel.isEditable = false
valueLabel.isSelectable = false
valueLabel.isBezeled = false
valueLabel.wantsLayer = true
valueLabel.textColor = .labelColor
valueLabel.backgroundColor = .controlColor
valueLabel.canDrawSubviewsIntoLayer = true
valueLabel.alignment = .natural
valueLabel.font = NSFont.systemFont(ofSize: 8, weight: .ultraLight)
valueLabel.stringValue = ""
valueLabel.addSubview(NSView())
self.valueLabel = valueLabel
self.addSubview(self.valueLabel)
} else {
self.addSubview(NSView())
}
}
required init?(coder decoder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
override func draw(_ dirtyRect: NSRect) {
super.draw(dirtyRect)
if (self.points.count < 2) {
return
}
let xOffset: CGFloat = 4.0
let yOffset: CGFloat = 3.0
var height: Double = Double(self.frame.size.height) - Double((yOffset * 2))
if self.label {
height = 7.0
}
let xRatio = Double(self.frame.size.width - (xOffset * 2)) / (Double(self.points.count) - 1)
let chartLine = NSBezierPath()
chartLine.lineWidth = 0.5
for i in 0..<self.points.count {
let x: CGFloat = CGFloat((Double(i) * xRatio)) + xOffset
let y: CGFloat = CGFloat((Double(truncating: points[i] as NSNumber) * height)) + yOffset
let point = CGPoint(x: x, y: y)
if i == 0 {
chartLine.move(to: point)
} else {
chartLine.line(to: point)
}
}
// chartLine.close()
NSColor.blue.setStroke()
chartLine.stroke()
// let gradient: NSGradient = NSGradient(starting: NSColor(red: 0.0, green: 0.0, blue: 0.0, alpha: 1.0), ending: NSColor(red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0))!
// gradient.draw(in: chartLine, angle: 0.0)
}
func addValue(value: Double) {
if self.label {
self.valueLabel.stringValue = "\(Int(Float(Float(value).roundTo(decimalPlaces: 2))! * 100))%"
self.valueLabel.textColor = Float(value).usageColor()
}
if self.points.count < 50 {
self.points.append(value)
return
}
for (i, _) in self.points.enumerated() {
if i+1 < self.points.count {
self.points[i] = self.points[i+1]
} else {
self.points[i] = value
}
}
}
}
class CPU: Module {
let name: String = "CPU"
var view: NSView = NSView()
var chart: ChartView = ChartView()
let defaults = UserDefaults.standard
var active: Observable<Bool>
var reader: Reader = CPUReader()
@IBOutlet weak var value: NSTextField!
init() {
self.active = Observable(defaults.object(forKey: name) != nil ? defaults.bool(forKey: name) : true)
self.chart = ChartView(frame: NSMakeRect(0, 0, MODULE_WIDTH + 7, MODULE_HEIGHT))
self.view.wantsLayer = true
self.view = self.chart
self.view = ChartView(frame: NSMakeRect(0, 0, MODULE_WIDTH + 7, MODULE_HEIGHT))
}
func start() {
if !self.reader.usage.value.isNaN {
self.chart.addValue(value: Double(self.reader.usage!.value))
// self.value.stringValue = "\(Int(Float(self.reader.usage.value.roundTo(decimalPlaces: 2))! * 100))%"
// self.value.textColor = self.reader.usage.value.usageColor()
(self.view as! ChartView).value(value: self.reader.usage!.value)
}
//
self.reader.start()
self.reader.usage.subscribe(observer: self) { (value, _) in
if !value.isNaN {
self.chart.addValue(value: Double(self.reader.usage!.value))
// self.value.stringValue = "\(Int(Float(value.roundTo(decimalPlaces: 2))! * 100))%"
// self.value.textColor = value.usageColor()
(self.view as! ChartView).value(value: value)
}
}
//
// colors.subscribe(observer: self) { (value, _) in
// self.value.textColor = self.reader.usage.value.usageColor()
// }
}
func menu() -> NSMenuItem {
@@ -156,13 +42,11 @@ class CPU: Module {
menu.state = NSControl.StateValue.on
}
menu.target = self
menu.isEnabled = true
return menu
}
@objc func toggle(_ sender: NSMenuItem) {
let state = sender.state != NSControl.StateValue.on
sender.state = sender.state == NSControl.StateValue.on ? NSControl.StateValue.off : NSControl.StateValue.on
self.defaults.set(state, forKey: name)
self.active << state

125
Stats/Modules/CPU/CPUView.swift Normal file
View File

@@ -0,0 +1,125 @@
//
// CPUView.swift
// Stats
//
// Created by Serhiy Mytrovtsiy on 14.06.2019.
// Copyright © 2019 Serhiy Mytrovtsiy. All rights reserved.
//
import Cocoa
class ChartView: NSView {
var valueLabel: NSTextField = NSTextField()
var label: Bool = true
var points: [Float] {
didSet {
self.needsDisplay = true
setNeedsDisplay(self.frame)
}
}
override init(frame: NSRect) {
self.points = Array(repeating: 0.0, count: 50)
super.init(frame: frame)
self.wantsLayer = true
if self.label {
let valueLabel = NSTextField(frame: NSMakeRect(2, MODULE_HEIGHT - 11, self.frame.size.width, 10))
valueLabel.textColor = NSColor.red
valueLabel.isEditable = false
valueLabel.isSelectable = false
valueLabel.isBezeled = false
valueLabel.wantsLayer = true
valueLabel.textColor = .labelColor
valueLabel.backgroundColor = .controlColor
valueLabel.canDrawSubviewsIntoLayer = true
valueLabel.alignment = .natural
valueLabel.font = NSFont.systemFont(ofSize: 8, weight: .ultraLight)
valueLabel.stringValue = ""
valueLabel.addSubview(NSView())
self.valueLabel = valueLabel
self.addSubview(self.valueLabel)
} else {
self.addSubview(NSView())
}
}
required init?(coder decoder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
override func draw(_ dirtyRect: NSRect) {
super.draw(dirtyRect)
let lineColor: NSColor = NSColor.selectedMenuItemColor
let gradientColor: NSColor = NSColor(red: (26/255.0), green: (126/255.0), blue: (252/255.0), alpha: 0.5)
let context = NSGraphicsContext.current!.cgContext
let xOffset: CGFloat = 4.0
let yOffset: CGFloat = 3.0
var height: CGFloat = self.frame.size.height - CGFloat((yOffset * 2))
if self.label {
height = 7.0
}
let xRatio = Double(self.frame.size.width - (xOffset * 2)) / (Double(self.points.count) - 1)
let columnXPoint = { (point: Int) -> CGFloat in
return CGFloat((Double(point) * xRatio)) + xOffset
}
let columnYPoint = { (point: Int) -> CGFloat in
return CGFloat((CGFloat(truncating: self.points[point] as NSNumber) * height)) + yOffset
}
let graphPath = NSBezierPath()
let x: CGFloat = columnXPoint(0)
let y: CGFloat = columnYPoint(0)
graphPath.move(to: CGPoint(x: x, y: y))
for i in 1..<self.points.count {
graphPath.line(to: CGPoint(x: columnXPoint(i), y: columnYPoint(i)))
}
lineColor.setStroke()
graphPath.stroke()
context.saveGState()
let clippingPath = graphPath.copy() as! NSBezierPath
clippingPath.line(to: CGPoint(x: columnXPoint(self.points.count - 1), y: yOffset - 0.5))
clippingPath.line(to: CGPoint(x: columnXPoint(0), y: yOffset - 0.5))
clippingPath.close()
clippingPath.addClip()
gradientColor.setFill()
let rectPath = NSBezierPath(rect: dirtyRect)
rectPath.fill()
context.restoreGState()
graphPath.lineWidth = 1.0
graphPath.stroke()
}
func value(value: Float) {
if self.label {
self.valueLabel.stringValue = "\(Int(Float(Float(value).roundTo(decimalPlaces: 2))! * 100))%"
self.valueLabel.textColor = Float(value).usageColor()
}
if self.points.count < 50 {
self.points.append(value)
return
}
for (i, _) in self.points.enumerated() {
if i+1 < self.points.count {
self.points[i] = self.points[i+1]
} else {
self.points[i] = value
}
}
}
}

5
Stats/Modules/Disk/Disk.swift
View File

@@ -10,6 +10,7 @@ import Cocoa
class Disk: Module {
let name: String = "Disk"
var colors: Bool = false
var view: NSView = NSView()
let defaults = UserDefaults.standard
@@ -36,10 +37,6 @@ class Disk: Module {
self.value.textColor = value.usageColor()
}
}
colors.subscribe(observer: self) { (value, _) in
self.value.textColor = self.reader.usage.value.usageColor()
}
}
func menu() -> NSMenuItem {

5
Stats/Modules/Memory/Memory.swift
View File

@@ -10,6 +10,7 @@ import Cocoa
class Memory: Module {
let name: String = "Memory"
var colors: Bool = false
var view: NSView = NSView()
let defaults = UserDefaults.standard
@@ -36,10 +37,6 @@ class Memory: Module {
self.value.textColor = value.usageColor()
}
}
colors.subscribe(observer: self) { (value, _) in
self.value.textColor = self.reader.usage.value.usageColor()
}
}
func menu() -> NSMenuItem {

2
Stats/libs/Module.swift
View File

@@ -10,9 +10,9 @@ import Cocoa
protocol Module {
var name: String { get }
var view: NSView { get }
var active: Observable<Bool> { get }
var reader: Reader { get }
var view: NSView { get }
func menu() -> NSMenuItem
func start()