Merge pull request #428 from rjordans/Development

Some minor fixes in plotting
NanoVNA-Saver · Sep 20, 2021 · cced02e · cced02e
2 parents 0cee90b + 01c58b8
commit cced02e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/NanoVNASaver/Charts/Capacitance.py b/NanoVNASaver/Charts/Capacitance.py
@@ -34,7 +34,7 @@
 class CapacitanceChart(FrequencyChart):
     def __init__(self, name=""):
         super().__init__(name)
-        self.leftMargin = 30
+        self.leftMargin = 45
         self.dim.width = 250
         self.dim.height = 250
         self.minDisplayValue = 0
@@ -121,7 +121,7 @@ def drawValues(self, qp: QtGui.QPainter):
         self.span = span
 
         target_ticks = math.floor(self.dim.height / 60)
-        fmt = Format(max_nr_digits=1)
+        fmt = Format(max_nr_digits=3)
         for i in range(target_ticks):
             val = minValue + (i / target_ticks) * span
             try:
@@ -258,7 +258,7 @@ def drawValues(self, qp: QtGui.QPainter):
         self.span = span
 
         target_ticks = math.floor(self.dim.height / 60)
-        fmt = Format(max_nr_digits=1)
+        fmt = Format(max_nr_digits=3)
         for i in range(target_ticks):
             val = minValue + (i / target_ticks) * span
             y = self.topMargin + round((self.maxValue - val) / self.span * self.dim.height)

diff --git a/NanoVNASaver/Charts/Inductance.py b/NanoVNASaver/Charts/Inductance.py
@@ -33,7 +33,7 @@
 class InductanceChart(FrequencyChart):
     def __init__(self, name=""):
         super().__init__(name)
-        self.leftMargin = 30
+        self.leftMargin = 45
         self.dim.width = 250
         self.dim.height = 250
         self.minDisplayValue = 0
@@ -120,7 +120,7 @@ def drawValues(self, qp: QtGui.QPainter):
         self.span = span
 
         target_ticks = math.floor(self.dim.height / 60)
-        fmt = Format(max_nr_digits=1)
+        fmt = Format(max_nr_digits=3)
         for i in range(target_ticks):
             val = minValue + (i / target_ticks) * span
             y = self.topMargin + round((self.maxValue - val) / self.span * self.dim.height)

diff --git a/NanoVNASaver/Charts/RI.py b/NanoVNASaver/Charts/RI.py
@@ -230,7 +230,7 @@ def drawValues(self, qp: QtGui.QPainter):
         # We want one horizontal tick per 50 pixels, at most
         horizontal_ticks = math.floor(self.dim.height/50)
 
-        fmt = Format(max_nr_digits=4)
+        fmt = Format(max_nr_digits=3)
         for i in range(horizontal_ticks):
             y = self.topMargin + round(i * self.dim.height / horizontal_ticks)
             qp.setPen(QtGui.QPen(Chart.color.foreground))