Datapoint class imported from RFTools

pull/55/head
Rune B. Broberg 2019-10-20 12:19:05 +02:00
rodzic 86ec4af8f1
commit 7d58c1e777
5 zmienionych plików z 6 dodań i 14 usunięć

Wyświetl plik

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

Wyświetl plik

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

Wyświetl plik

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

Wyświetl plik

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

Wyświetl plik

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