From da4ab07db12fa91122a67b164e243bb62b2e2ad6 Mon Sep 17 00:00:00 2001
From: Serhiy Mytrovtsiy <mitrovtsiy@ukr.net>
Date: Thu, 27 Mar 2025 20:15:49 +0100
Subject: [PATCH] fix: fixed logarithmic scaling in different than Network
 charts (#2418)

---
 Kit/Widgets/NetworkChart.swift |  4 ++--
 Kit/plugins/Charts.swift       | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Kit/Widgets/NetworkChart.swift b/Kit/Widgets/NetworkChart.swift
index 92b01e78..fa9269c0 100644
--- a/Kit/Widgets/NetworkChart.swift
+++ b/Kit/Widgets/NetworkChart.swift
@@ -177,11 +177,11 @@ public class NetworkChart: WidgetWrapper {
         
         let topYPoint = { (point: Int) -> CGFloat in
             let value = self.reverseOrderState ? points[point].1 : points[point].0
-            return scaleValue(scale: self.scaleState, value: value, maxValue: topMax, maxHeight: chartFrame.height/2, limit: 1) + xCenter
+            return scaleValue(scale: self.scaleState, value: value, maxValue: topMax, zeroValue: 256.0, maxHeight: chartFrame.height/2, limit: 1) + xCenter
         }
         let bottomYPoint = { (point: Int) -> CGFloat in
             let value = self.reverseOrderState ? points[point].0 : points[point].1
-            return xCenter - scaleValue(scale: self.scaleState, value: value, maxValue: bottomMax, maxHeight: chartFrame.height/2, limit: 1)
+            return xCenter - scaleValue(scale: self.scaleState, value: value, maxValue: bottomMax, zeroValue: 256.0, maxHeight: chartFrame.height/2, limit: 1)
         }
         
         let topLinePath = NSBezierPath()
diff --git a/Kit/plugins/Charts.swift b/Kit/plugins/Charts.swift
index 42aaed68..74371307 100644
--- a/Kit/plugins/Charts.swift
+++ b/Kit/plugins/Charts.swift
@@ -21,7 +21,7 @@ public struct circle_segment {
     }
 }
 
-internal func scaleValue(scale: Scale = .linear, value: Double, maxValue: Double, maxHeight: CGFloat, limit: Double) -> CGFloat {
+internal func scaleValue(scale: Scale = .linear, value: Double, maxValue: Double, zeroValue: Double, maxHeight: CGFloat, limit: Double) -> CGFloat {
     var value = value
     if scale == .none && value > 1 && maxValue != 0 {
         value /= maxValue
@@ -45,12 +45,11 @@ internal func scaleValue(scale: Scale = .linear, value: Double, maxValue: Double
             localMaxValue = cbrt(maxValue)
         }
     case .logarithmic:
-        let zeroVal = 256.0
         if value > 0 {
-            value = log(value/zeroVal)
+            value = log(value/zeroValue)
         }
         if localMaxValue > 0 {
-            localMaxValue = log(maxValue/zeroVal)
+            localMaxValue = log(maxValue/zeroValue)
         }
     case .fixed:
         if value > limit {
@@ -132,16 +131,18 @@ public class LineChartView: NSView {
     
     private var scale: Scale
     private var fixedScale: Double
+    private var zeroValue: Double
     
     private var cursor: NSPoint? = nil
     private var stop: Bool = false
     
-    public init(frame: NSRect, num: Int, suffix: String = "%", color: NSColor = .controlAccentColor, scale: Scale = .none, fixedScale: Double = 1) {
+    public init(frame: NSRect, num: Int, suffix: String = "%", color: NSColor = .controlAccentColor, scale: Scale = .none, fixedScale: Double = 1, zeroValue: Double = 0.01) {
         self.points = Array(repeating: nil, count: num)
         self.suffix = suffix
         self.color = color
         self.scale = scale
         self.fixedScale = fixedScale
+        self.zeroValue = zeroValue
         
         super.init(frame: frame)
         
@@ -194,7 +195,7 @@ public class LineChartView: NSView {
                 continue
             }
             
-            var y = scaleValue(scale: self.scale, value: v.value, maxValue: maxValue, maxHeight: height, limit: self.fixedScale)
+            var y = scaleValue(scale: self.scale, value: v.value, maxValue: maxValue, zeroValue: self.zeroValue, maxHeight: height, limit: self.fixedScale)
             if self.flipY {
                 y = height - y
             }
@@ -400,8 +401,8 @@ public class NetworkChartView: NSView {
         let bottomFrame = NSRect(x: 0, y: 0, width: frame.width, height: frame.height/2)
         let inFrame = self.reversedOrder ? topFrame : bottomFrame
         let outFrame = self.reversedOrder ? bottomFrame : topFrame
-        self.inChart = LineChartView(frame: inFrame, num: num, color: inColor, scale: scale, fixedScale: fixedScale)
-        self.outChart = LineChartView(frame: outFrame, num: num, color: outColor, scale: scale, fixedScale: fixedScale)
+        self.inChart = LineChartView(frame: inFrame, num: num, color: inColor, scale: scale, fixedScale: fixedScale, zeroValue: 256.0)
+        self.outChart = LineChartView(frame: outFrame, num: num, color: outColor, scale: scale, fixedScale: fixedScale, zeroValue: 256.0)
         
         super.init(frame: frame)