From bd9287b9b9082281522fe08eb36eca25674c6455 Mon Sep 17 00:00:00 2001 From: Holger Mueller Date: Sun, 8 Dec 2019 18:25:15 +0100 Subject: [PATCH] bugfix: use under and over uprintable strings --- NanoVNASaver/SITools.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/NanoVNASaver/SITools.py b/NanoVNASaver/SITools.py index f67d734..8345750 100644 --- a/NanoVNASaver/SITools.py +++ b/NanoVNASaver/SITools.py @@ -81,19 +81,18 @@ class Value: abs(self._value) >= 10 ** ((fmt.max_offset + 1) * 3): return (("-" if self._value < 0 else "") + "\N{INFINITY}" + fmt.space_str + self._unit) - if (self._value < fmt.printable_min or - self._value > fmt.printable_max): - return fmt.unprintable_str + self._unit + if self._value < fmt.printable_min: + return fmt.unprintable_under + self._unit + if self._value > fmt.printable_max: + return fmt.unprintable_over + self._unit if self._value == 0: offset = 0 else: - offset = int(math.log10(abs(self._value)) // 3) - - if offset < fmt.min_offset: - offset = fmt.min_offset - elif offset > fmt.max_offset: - offset = fmt.max_offset + offset = clamp_value( + int(math.log10(abs(self._value)) // 3), + fmt.min_offset, + fmt.max_offset) real = float(self._value) / (10 ** (offset * 3))