Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 20 additions & 14 deletions Kit/Widgets/BarChart.swift
Original file line number Diff line number Diff line change
Expand Up @@ -223,27 +223,33 @@ public class BarChart: WidgetWrapper {
}

public func setValue(_ newValue: [[ColorValue]]) {
let tolerance: CGFloat = 0.01
let isDifferent = self._value.count != newValue.count || zip(self._value, newValue).contains { row1, row2 in
row1.count != row2.count || zip(row1, row2).contains { val1, val2 in
abs(val1.value - val2.value) > tolerance || val1.color != val2.color
DispatchQueue.main.async(execute: {
let tolerance: CGFloat = 0.01
let isDifferent = self._value.count != newValue.count || zip(self._value, newValue).contains { row1, row2 in
row1.count != row2.count || zip(row1, row2).contains { val1, val2 in
abs(val1.value - val2.value) > tolerance || val1.color != val2.color
}
}
}
guard isDifferent else { return }
self._value = newValue
self.redraw()
guard isDifferent else { return }
self._value = newValue
self.redraw()
})
}

public func setPressure(_ newPressureLevel: RAMPressure) {
guard self._pressureLevel != newPressureLevel else { return }
self._pressureLevel = newPressureLevel
self.redraw()
DispatchQueue.main.async(execute: {
guard self._pressureLevel != newPressureLevel else { return }
self._pressureLevel = newPressureLevel
self.redraw()
})
}

public func setColorZones(_ newColorZones: colorZones) {
guard self._colorZones != newColorZones else { return }
self._colorZones = newColorZones
self.redraw()
DispatchQueue.main.async(execute: {
guard self._colorZones != newColorZones else { return }
self._colorZones = newColorZones
self.redraw()
})
}

// MARK: - Settings
Expand Down
6 changes: 3 additions & 3 deletions Kit/Widgets/LineChart.swift
Original file line number Diff line number Diff line change
Expand Up @@ -249,17 +249,17 @@ public class LineChart: WidgetWrapper {
}

public func setValue(_ newValue: Double) {
self._value = newValue
DispatchQueue.main.async(execute: {
self._value = newValue
self.chart.addValue(newValue)
self.display()
})
}

public func setPressure(_ newPressureLevel: RAMPressure) {
guard self._pressureLevel != newPressureLevel else { return }
self._pressureLevel = newPressureLevel
DispatchQueue.main.async(execute: {
guard self._pressureLevel != newPressureLevel else { return }
self._pressureLevel = newPressureLevel
self.display()
})
}
Expand Down
6 changes: 3 additions & 3 deletions Kit/Widgets/NetworkChart.swift
Original file line number Diff line number Diff line change
Expand Up @@ -263,10 +263,10 @@ public class NetworkChart: WidgetWrapper {
}

public func setValue(upload: Double, download: Double) {
self.points.remove(at: 0)
self.points.append((upload, download))

DispatchQueue.main.async(execute: {
self.points.remove(at: 0)
self.points.append((upload, download))

if self.window?.isVisible ?? false {
self.display()
}
Expand Down
34 changes: 17 additions & 17 deletions Kit/Widgets/Stack.swift
Original file line number Diff line number Diff line change
Expand Up @@ -226,24 +226,24 @@ public class StackWidget: WidgetWrapper {
}

public func setValues(_ values: [Stack_t]) {
var tableNeedsToBeUpdated: Bool = false

values.forEach { (p: Stack_t) in
if let idx = self.values.firstIndex(where: { $0.key == p.key }) {
self.values[idx].value = p.value
return
}
tableNeedsToBeUpdated = true
self.values.append(p)
}

let diff = self.values.filter({ v in values.contains(where: { $0.key == v.key }) })
if diff.count != self.values.count {
tableNeedsToBeUpdated = true
}
self.values = diff.sorted(by: { $0.index < $1.index })

DispatchQueue.main.async(execute: {
var tableNeedsToBeUpdated: Bool = false

values.forEach { (p: Stack_t) in
if let idx = self.values.firstIndex(where: { $0.key == p.key }) {
self.values[idx].value = p.value
return
}
tableNeedsToBeUpdated = true
self.values.append(p)
}

let diff = self.values.filter({ v in values.contains(where: { $0.key == v.key }) })
if diff.count != self.values.count {
tableNeedsToBeUpdated = true
}
self.values = diff.sorted(by: { $0.index < $1.index })

if tableNeedsToBeUpdated {
self.orderTableView.update()
}
Expand Down