pull/604/head
Holger Müller 2023-02-01 11:38:34 +01:00
rodzic e4bd720160
commit 4cebe94b87
4 zmienionych plików z 25 dodań i 14 usunięć

Wyświetl plik

@ -36,7 +36,7 @@ logger = logging.getLogger(__name__)
class ChartColors: # pylint: disable=too-many-instance-attributes
background: QColor = field(default_factory=lambda: QColor(QtCore.Qt.white))
foreground: QColor = field(
default_factory=lambda: QColor(QtCore.Qt.lightGray))
default_factory=lambda: QColor(QtCore.Qt.lightGray))
reference: QColor = field(default_factory=lambda: QColor(0, 0, 255, 64))
reference_secondary: QColor = field(
default_factory=lambda: QColor(0, 0, 192, 48))

Wyświetl plik

@ -19,10 +19,9 @@
from setuptools import setup
setup(
data_files=[
( "share/doc/nanovnasaver/", [ "LICENSE", "README.md" ] ),
( "share/applications/", [ "NanoVNASaver.desktop" ] ),
( "share/icons/hicolor/48x48/apps/", [ "NanoVNASaver_48x48.png" ] ),
]
data_files=[
("share/doc/nanovnasaver/", ["LICENSE", "README.md", ]),
("share/applications/", ["NanoVNASaver.desktop", ]),
("share/icons/hicolor/48x48/apps/", ["NanoVNASaver_48x48.png", ]),
]
)

Wyświetl plik

@ -23,7 +23,7 @@ import numpy as np
# Import targets to be tested
import NanoVNASaver.AnalyticTools as at
SINEWAVE = [math.sin(x/45 * math.pi) for x in range(360)]
SINEWAVE = [math.sin(x / 45 * math.pi) for x in range(360)]
class AnalyticsTools(unittest.TestCase):

Wyświetl plik

@ -139,12 +139,24 @@ class TestCases(unittest.TestCase):
self.assertEqual(fmt.format_phase(-3.1416), '-180.00°')
def test_format_complex_imp(self):
self.assertEqual(fmt.format_complex_imp(complex(1, 0)), '1+j0 \N{OHM SIGN}')
self.assertEqual(fmt.format_complex_imp(complex(1234, 1234)), '1.23k+j1.23k \N{OHM SIGN}')
self.assertEqual(fmt.format_complex_imp(complex(1234, -1234)), '1.23k-j1.23k \N{OHM SIGN}')
self.assertEqual(fmt.format_complex_imp(complex(1.234, 1234)), '1.23+j1.23k \N{OHM SIGN}')
self.assertEqual(fmt.format_complex_imp(complex(-1, 1.23e-3)), '- +j1.23m \N{OHM SIGN}')
self.assertEqual(fmt.format_complex_imp(complex(-1, 1.23e-3), True), '-1+j1.23m \N{OHM SIGN}')
self.assertEqual(
fmt.format_complex_imp(complex(1, 0)),
'1+j0 \N{OHM SIGN}')
self.assertEqual(
fmt.format_complex_imp(complex(1234, 1234)),
'1.23k+j1.23k \N{OHM SIGN}')
self.assertEqual(
fmt.format_complex_imp(complex(1234, -1234)),
'1.23k-j1.23k \N{OHM SIGN}')
self.assertEqual(
fmt.format_complex_imp(complex(1.234, 1234)),
'1.23+j1.23k \N{OHM SIGN}')
self.assertEqual(
fmt.format_complex_imp(complex(-1, 1.23e-3)),
'- +j1.23m \N{OHM SIGN}')
self.assertEqual(
fmt.format_complex_imp(complex(-1, 1.23e-3), True),
'-1+j1.23m \N{OHM SIGN}')
def test_format_wavelength(self):
self.assertEqual(fmt.format_wavelength(12.3456), '12.35 m')