Datapoint class imported from RFTools

NanoVNASaver/Calibration.py

@@ -20,14 +20,12 @@ import math
 
 from PyQt5 import QtWidgets, QtCore
 from typing import List
+from .RFTools import Datapoint
 import numpy as np
 
 logger = logging.getLogger(__name__)
 
 
-Datapoint = collections.namedtuple('Datapoint', 'freq re im')
-
-
 class CalibrationWindow(QtWidgets.QWidget):
     nextStep = -1
 

NanoVNASaver/Hardware.py

@@ -18,11 +18,10 @@ import logging
 import re
 from time import sleep
 from typing import List
+from NanoVNASaver.RFTools import Datapoint
 
 import serial
 
-Datapoint = collections.namedtuple('Datapoint', 'freq re im')
-
 logger = logging.getLogger(__name__)
 
 

NanoVNASaver/NanoVNASaver.py

@@ -28,8 +28,8 @@ from PyQt5 import QtWidgets, QtCore, QtGui
 from PyQt5.QtCore import QModelIndex
 from serial.tools import list_ports
 
-from NanoVNASaver.Hardware import VNA, InvalidVNA, Version
-from NanoVNASaver.RFTools import RFTools
+from .Hardware import VNA, InvalidVNA, Version
+from .RFTools import RFTools, Datapoint
 from .Chart import Chart, PhaseChart, VSWRChart, PolarChart, SmithChart, LogMagChart, QualityFactorChart, TDRChart, \
     RealImaginaryChart, MagnitudeChart, MagnitudeZChart
 from .Calibration import CalibrationWindow, Calibration
@@ -39,8 +39,6 @@ from .Touchstone import Touchstone
 from .Analysis import Analysis, LowPassAnalysis, HighPassAnalysis, BandPassAnalysis, BandStopAnalysis
 from .about import version as ver
 
-Datapoint = collections.namedtuple('Datapoint', 'freq re im')
-
 VID = 1155
 PID = 22336
 

NanoVNASaver/SweepWorker.py

@@ -25,12 +25,10 @@ import NanoVNASaver
 import logging
 
 from NanoVNASaver.Hardware import VNA, InvalidVNA
-from NanoVNASaver.RFTools import RFTools
+from NanoVNASaver.RFTools import RFTools, Datapoint
 
 logger = logging.getLogger(__name__)
 
-Datapoint = collections.namedtuple('Datapoint', 'freq re im')
-
 
 class WorkerSignals(QtCore.QObject):
     updated = pyqtSignal()

NanoVNASaver/Touchstone.py

@@ -18,8 +18,7 @@ import logging
 import math
 import re
 from typing import List
-
-Datapoint = collections.namedtuple('Datapoint', 'freq re im')
+from .RFTools import Datapoint
 
 logger = logging.getLogger(__name__)