kopia lustrzana https://github.com/NanoVNA-Saver/nanovna-saver
Refactored the code into modules
Rune B. Broberg
rodzic
19da60f411
commit
9a19310585
|
|
@ -0,0 +1,422 @@
|
|||
# Copyright (c) 2019 Rune B. Broberg
|
||||
import collections
|
||||
import math
|
||||
import threading
|
||||
from time import sleep
|
||||
from typing import List
|
||||
|
||||
import serial
|
||||
from PyQt5 import QtWidgets, QtCore, QtGui
|
||||
|
||||
from SmithChart import SmithChart
|
||||
from SweepWorker import SweepWorker
|
||||
|
||||
Datapoint = collections.namedtuple('Datapoint', 'freq re im')
|
||||
|
||||
|
||||
class NanoVNASaver(QtWidgets.QWidget):
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
|
||||
self.threadpool = QtCore.QThreadPool()
|
||||
print("Max thread count " + str(self.threadpool.maxThreadCount()))
|
||||
|
||||
self.noSweeps = 1 # Number of sweeps to run
|
||||
|
||||
self.serialLock = threading.Lock()
|
||||
self.serial = serial.Serial()
|
||||
|
||||
self.values = []
|
||||
self.frequencies = []
|
||||
self.data : List[Datapoint] = []
|
||||
|
||||
self.serialPort = "COM11"
|
||||
# self.serialSpeed = "115200"
|
||||
|
||||
self.setWindowTitle("NanoVNA Saver")
|
||||
layout = QtWidgets.QGridLayout()
|
||||
self.setLayout(layout)
|
||||
|
||||
self.smithChart = SmithChart()
|
||||
|
||||
left_column = QtWidgets.QVBoxLayout()
|
||||
right_column = QtWidgets.QVBoxLayout()
|
||||
|
||||
layout.addLayout(left_column, 0, 0)
|
||||
layout.addLayout(right_column, 0, 1)
|
||||
|
||||
################################################################################################################
|
||||
# Sweep control
|
||||
################################################################################################################
|
||||
|
||||
sweep_control_box = QtWidgets.QGroupBox()
|
||||
sweep_control_box.setMaximumWidth(400)
|
||||
sweep_control_box.setTitle("Sweep control")
|
||||
sweep_control_layout = QtWidgets.QFormLayout(sweep_control_box)
|
||||
|
||||
self.sweepStartInput = QtWidgets.QLineEdit("")
|
||||
self.sweepStartInput.setAlignment(QtCore.Qt.AlignRight)
|
||||
|
||||
sweep_control_layout.addRow(QtWidgets.QLabel("Sweep start"), self.sweepStartInput)
|
||||
|
||||
self.sweepEndInput = QtWidgets.QLineEdit("")
|
||||
self.sweepEndInput.setAlignment(QtCore.Qt.AlignRight)
|
||||
|
||||
sweep_control_layout.addRow(QtWidgets.QLabel("Sweep end"), self.sweepEndInput)
|
||||
|
||||
self.sweepCountInput = QtWidgets.QLineEdit("")
|
||||
self.sweepCountInput.setAlignment(QtCore.Qt.AlignRight)
|
||||
self.sweepCountInput.setText("1")
|
||||
|
||||
sweep_control_layout.addRow(QtWidgets.QLabel("Sweep count"), self.sweepCountInput)
|
||||
|
||||
self.sweepProgressBar = QtWidgets.QProgressBar()
|
||||
|
||||
sweep_control_layout.addRow(self.sweepProgressBar)
|
||||
|
||||
self.btnSweep = QtWidgets.QPushButton("Sweep")
|
||||
self.btnSweep.clicked.connect(self.sweep)
|
||||
sweep_control_layout.addRow(self.btnSweep)
|
||||
|
||||
left_column.addWidget(sweep_control_box)
|
||||
|
||||
################################################################################################################
|
||||
# Marker control
|
||||
################################################################################################################
|
||||
|
||||
marker_control_box = QtWidgets.QGroupBox()
|
||||
marker_control_box.setTitle("Markers")
|
||||
marker_control_box.setMaximumWidth(400)
|
||||
marker_control_layout = QtWidgets.QFormLayout(marker_control_box)
|
||||
|
||||
self.marker1FrequencyInput = QtWidgets.QLineEdit("")
|
||||
self.marker1FrequencyInput.setAlignment(QtCore.Qt.AlignRight)
|
||||
self.marker1FrequencyInput.returnPressed.connect(lambda: self.smithChart.setMarker1(self.marker1FrequencyInput.text()))
|
||||
|
||||
self.btnMarker1ColorPicker = QtWidgets.QPushButton("█")
|
||||
self.btnMarker1ColorPicker.setFixedWidth(20)
|
||||
p = self.btnMarker1ColorPicker.palette()
|
||||
p.setColor(QtGui.QPalette.ButtonText, self.smithChart.marker1Color)
|
||||
self.btnMarker1ColorPicker.setPalette(p)
|
||||
self.btnMarker1ColorPicker.clicked.connect(lambda: self.setMarker1Color(QtWidgets.QColorDialog.getColor()))
|
||||
|
||||
marker1layout = QtWidgets.QHBoxLayout()
|
||||
marker1layout.addWidget(self.marker1FrequencyInput)
|
||||
marker1layout.addWidget(self.btnMarker1ColorPicker)
|
||||
|
||||
marker_control_layout.addRow(QtWidgets.QLabel("Marker 1"), marker1layout)
|
||||
|
||||
self.marker2FrequencyInput = QtWidgets.QLineEdit("")
|
||||
self.marker2FrequencyInput.setAlignment(QtCore.Qt.AlignRight)
|
||||
self.marker2FrequencyInput.returnPressed.connect(lambda: self.smithChart.setMarker2(self.marker2FrequencyInput.text()))
|
||||
|
||||
self.btnMarker2ColorPicker = QtWidgets.QPushButton("█")
|
||||
self.btnMarker2ColorPicker.setFixedWidth(20)
|
||||
p = self.btnMarker2ColorPicker.palette()
|
||||
p.setColor(QtGui.QPalette.ButtonText, self.smithChart.marker2Color)
|
||||
self.btnMarker2ColorPicker.setPalette(p)
|
||||
self.btnMarker2ColorPicker.clicked.connect(lambda: self.setMarker2Color(QtWidgets.QColorDialog.getColor()))
|
||||
|
||||
marker2layout = QtWidgets.QHBoxLayout()
|
||||
marker2layout.addWidget(self.marker2FrequencyInput)
|
||||
marker2layout.addWidget(self.btnMarker2ColorPicker)
|
||||
|
||||
marker_control_layout.addRow(QtWidgets.QLabel("Marker 2"), marker2layout)
|
||||
|
||||
self.marker1label = QtWidgets.QLabel("")
|
||||
marker_control_layout.addRow(QtWidgets.QLabel("Marker 1: "), self.marker1label)
|
||||
|
||||
self.marker2label = QtWidgets.QLabel("")
|
||||
marker_control_layout.addRow(QtWidgets.QLabel("Marker 2: "), self.marker2label)
|
||||
|
||||
left_column.addWidget(marker_control_box)
|
||||
|
||||
left_column.addSpacerItem(QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Expanding))
|
||||
|
||||
################################################################################################################
|
||||
# Serial control
|
||||
################################################################################################################
|
||||
|
||||
serial_control_box = QtWidgets.QGroupBox()
|
||||
serial_control_box.setMaximumWidth(400)
|
||||
serial_control_box.setTitle("Serial port control")
|
||||
serial_control_layout = QtWidgets.QFormLayout(serial_control_box)
|
||||
self.serialPortInput = QtWidgets.QLineEdit(self.serialPort)
|
||||
self.serialPortInput.setAlignment(QtCore.Qt.AlignRight)
|
||||
# self.serialSpeedInput = QtWidgets.QLineEdit(str(self.serialSpeed))
|
||||
# self.serialSpeedInput.setValidator(QtGui.QIntValidator())
|
||||
# self.serialSpeedInput.setAlignment(QtCore.Qt.AlignRight)
|
||||
serial_control_layout.addRow(QtWidgets.QLabel("Serial port"), self.serialPortInput)
|
||||
# serial_control_layout.addRow(QtWidgets.QLabel("Speed"), self.serialSpeedInput)
|
||||
|
||||
self.btnSerialToggle = QtWidgets.QPushButton("Open serial")
|
||||
self.btnSerialToggle.clicked.connect(self.serialButtonClick)
|
||||
serial_control_layout.addRow(self.btnSerialToggle)
|
||||
|
||||
left_column.addWidget(serial_control_box)
|
||||
|
||||
################################################################################################################
|
||||
# File control
|
||||
################################################################################################################
|
||||
|
||||
file_control_box = QtWidgets.QGroupBox()
|
||||
file_control_box.setTitle("Export file")
|
||||
file_control_box.setMaximumWidth(400)
|
||||
file_control_layout = QtWidgets.QFormLayout(file_control_box)
|
||||
self.fileNameInput = QtWidgets.QLineEdit("")
|
||||
self.fileNameInput.setAlignment(QtCore.Qt.AlignRight)
|
||||
|
||||
file_control_layout.addRow(QtWidgets.QLabel("Filename"), self.fileNameInput)
|
||||
|
||||
self.btnExportFile = QtWidgets.QPushButton("Export data")
|
||||
self.btnExportFile.clicked.connect(self.exportFile)
|
||||
file_control_layout.addRow(self.btnExportFile)
|
||||
|
||||
left_column.addWidget(file_control_box)
|
||||
|
||||
################################################################################################################
|
||||
# Right side
|
||||
################################################################################################################
|
||||
|
||||
self.lister = QtWidgets.QPlainTextEdit()
|
||||
self.lister.setFixedHeight(200)
|
||||
right_column.addWidget(self.lister)
|
||||
right_column.addWidget(self.smithChart)
|
||||
|
||||
def exportFile(self):
|
||||
print("Save file to " + self.fileNameInput.text())
|
||||
filename = self.fileNameInput.text()
|
||||
# TODO: Make some proper file handling here?
|
||||
file = open(filename, "w+")
|
||||
self.lister.clear()
|
||||
self.lister.appendPlainText("# Hz S RI R 50")
|
||||
file.write("# Hz S RI R 50\n")
|
||||
for i in range(len(self.values)):
|
||||
if i > 0 and self.frequencies[i] != self.frequencies[i-1]:
|
||||
self.lister.appendPlainText(self.frequencies[i] + " " + self.values[i])
|
||||
file.write(self.frequencies[i] + " " + self.values[i] + "\n")
|
||||
file.close()
|
||||
|
||||
def serialButtonClick(self):
|
||||
if self.serial.is_open:
|
||||
self.stopSerial()
|
||||
else:
|
||||
self.startSerial()
|
||||
return
|
||||
|
||||
def startSerial(self):
|
||||
self.lister.appendPlainText("Opening serial port " + self.serialPort)
|
||||
|
||||
if self.serialLock.acquire():
|
||||
self.serialPort = self.serialPortInput.text()
|
||||
try:
|
||||
self.serial = serial.Serial(port=self.serialPort, baudrate=115200)
|
||||
except serial.SerialException as exc:
|
||||
self.lister.appendPlainText("Tried to open " + self.serialPort + " and failed.")
|
||||
self.serialLock.release()
|
||||
return
|
||||
self.btnSerialToggle.setText("Close serial")
|
||||
self.serial.timeout = 0.05
|
||||
|
||||
self.serialLock.release()
|
||||
sleep(0.25)
|
||||
self.sweep()
|
||||
return
|
||||
|
||||
def stopSerial(self):
|
||||
if self.serialLock.acquire():
|
||||
self.serial.close()
|
||||
self.serialLock.release()
|
||||
self.btnSerialToggle.setText("Open serial")
|
||||
|
||||
def writeSerial(self, command):
|
||||
if not self.serial.is_open:
|
||||
print("Warning: Writing without serial port being opened (" + command + ")")
|
||||
return
|
||||
if self.serialLock.acquire():
|
||||
try:
|
||||
self.serial.write(str(command + "\r").encode('ascii'))
|
||||
self.serial.readline()
|
||||
except serial.SerialException as exc:
|
||||
print("Exception received")
|
||||
self.serialLock.release()
|
||||
return
|
||||
|
||||
def setSweep(self, start, stop):
|
||||
print("Sending: " + "sweep " + str(start) + " " + str(stop) + " 101")
|
||||
self.writeSerial("sweep " + str(start) + " " + str(stop) + " 101")
|
||||
|
||||
def sweep(self):
|
||||
# Run the serial port update
|
||||
if not self.serial.is_open:
|
||||
return
|
||||
|
||||
self.sweepProgressBar.setValue(0)
|
||||
|
||||
worker = SweepWorker(self)
|
||||
self.threadpool.start(worker)
|
||||
|
||||
self.btnSweep.setDisabled(True)
|
||||
|
||||
if int(self.sweepCountInput.text()) > 0:
|
||||
self.noSweeps = int(self.sweepCountInput.text())
|
||||
|
||||
print("### Updating... ### ")
|
||||
|
||||
if len(self.frequencies) > 1:
|
||||
# We've already run at least once
|
||||
print("### Run at least once ###")
|
||||
if (self.sweepStartInput.text() != self.frequencies[0]
|
||||
or self.sweepEndInput.text() != self.frequencies[100]):
|
||||
# Need to set frequency span
|
||||
print("### Setting span ###")
|
||||
# TODO: Set up for multiple sweeps
|
||||
print("Setting sweep to run " + self.sweepStartInput.text() + " to " + self.sweepEndInput.text())
|
||||
self.setSweep(self.sweepStartInput.text(), self.sweepEndInput.text())
|
||||
sleep(0.5)
|
||||
|
||||
if self.noSweeps > 1 and self.sweepStartInput.text() != "" and self.sweepEndInput.text() != "":
|
||||
# We're going to run multiple sweeps
|
||||
print("### Multisweep ###")
|
||||
span = int(self.sweepEndInput.text()) - int(self.sweepStartInput.text())
|
||||
start = int(self.sweepStartInput.text())
|
||||
end = int(self.sweepEndInput.text())
|
||||
stepsize = int(span / (100 + (self.noSweeps-1)*101))
|
||||
print("Doing " + str(100 + (self.noSweeps-1)*101) + " steps of size " + str(stepsize))
|
||||
values = []
|
||||
frequencies = []
|
||||
for i in range(self.noSweeps):
|
||||
self.setSweep(start + i*101*stepsize, start+(100+i*101)*stepsize)
|
||||
QtWidgets.QApplication.processEvents() # TODO: Make this multithreaded using the QT threads instead
|
||||
sleep(0.2)
|
||||
QtWidgets.QApplication.processEvents() # This is a really stupid way to limit UI sleeps to 0.2 seconds
|
||||
sleep(0.2)
|
||||
QtWidgets.QApplication.processEvents()
|
||||
sleep(0.2)
|
||||
QtWidgets.QApplication.processEvents()
|
||||
sleep(0.2)
|
||||
tmpdata = []
|
||||
done = False
|
||||
while not done:
|
||||
done = True
|
||||
tmpdata = self.readValues("data 0")
|
||||
for d in tmpdata:
|
||||
a, b = d.split(" ")
|
||||
try:
|
||||
if float(a) < -1.5 or float(a) > 1.5:
|
||||
print("Warning: Got a non-float data value: " + d + " (" + a + ")")
|
||||
done = False
|
||||
if float(b) < -1.5 or float(b) > 1.5:
|
||||
print("Warning: Got a non-float data value: " + d + " (" + b + ")")
|
||||
done = False
|
||||
except Exception:
|
||||
done = False
|
||||
|
||||
values += tmpdata
|
||||
|
||||
# TODO: Figure out why frequencies sometimes arrive as non-numbers
|
||||
tmpfreq = []
|
||||
done = False
|
||||
while not done:
|
||||
done = True
|
||||
tmpfreq = self.readValues("frequencies")
|
||||
for f in tmpfreq:
|
||||
if not f.isdigit():
|
||||
print("Warning: Got a non-digit frequency: " + f)
|
||||
done = False
|
||||
|
||||
frequencies += tmpfreq
|
||||
self.smithChart.setValues(values, frequencies)
|
||||
self.sweepProgressBar.setValue(round(100*(i+1)/self.noSweeps))
|
||||
|
||||
self.values = values
|
||||
self.frequencies = frequencies
|
||||
# Test code which sets up an array of tuples of parsed values
|
||||
self.data = []
|
||||
for i in range(len(values)):
|
||||
reStr, imStr = values[i].split(" ")
|
||||
re = float(reStr)
|
||||
im = float(imStr)
|
||||
freq = int(frequencies[i])
|
||||
self.data += [Datapoint(freq, re, im)]
|
||||
|
||||
# Reset the device to show the full range
|
||||
self.setSweep(self.sweepStartInput.text(), self.sweepEndInput.text())
|
||||
else:
|
||||
print("### Reading values ###")
|
||||
self.values = self.readValues("data 0")
|
||||
print("### Reading frequencies ###")
|
||||
self.frequencies = self.readValues("frequencies")
|
||||
if self.sweepStartInput.text() == "":
|
||||
self.sweepStartInput.setText(self.frequencies[0])
|
||||
if self.sweepEndInput.text() == "":
|
||||
self.sweepEndInput.setText(self.frequencies[100])
|
||||
self.sweepProgressBar.setValue(100)
|
||||
|
||||
print("### Outputting values in textbox ###")
|
||||
for line in self.values:
|
||||
self.lister.appendPlainText(line)
|
||||
print("### Displaying Smith chart ###")
|
||||
self.smithChart.setValues(self.values, self.frequencies)
|
||||
if self.smithChart.marker1Location != -1:
|
||||
reStr, imStr = self.values[self.smithChart.marker1Location].split(" ")
|
||||
re = float(reStr)
|
||||
im = float(imStr)
|
||||
|
||||
re50 = 50*(1-re*re-im*im)/(1+re*re+im*im-2*re)
|
||||
im50 = 50*(2*im)/(1+re*re+im*im-2*re)
|
||||
|
||||
mag = math.sqrt(re*re+im*im)
|
||||
vswr = (1+mag)/(1-mag)
|
||||
self.marker1label.setText(str(round(re50, 3)) + " + j" + str(round(im50, 3)) + " VSWR: 1:" + str(round(vswr, 3)))
|
||||
|
||||
if self.smithChart.marker2Location != -1:
|
||||
reStr, imStr = self.values[self.smithChart.marker2Location].split(" ")
|
||||
re = float(reStr)
|
||||
im = float(imStr)
|
||||
|
||||
re50 = 50*(1-re*re-im*im)/(1+re*re+im*im-2*re)
|
||||
im50 = 50*(2*im)/(1+re*re+im*im-2*re)
|
||||
|
||||
mag = math.sqrt(re*re+im*im)
|
||||
vswr = (1+mag)/(1-mag)
|
||||
self.marker2label.setText(str(round(re50, 3)) + " + j" + str(round(im50, 3)) + " VSWR: 1:" + str(round(vswr, 3)))
|
||||
|
||||
self.btnSweep.setDisabled(False)
|
||||
return
|
||||
|
||||
def readValues(self, value):
|
||||
if self.serialLock.acquire():
|
||||
print("### Reading " + str(value) + " ###")
|
||||
try:
|
||||
data = "a"
|
||||
while data != "":
|
||||
data = self.serial.readline().decode('ascii')
|
||||
|
||||
# Then send the command to read data
|
||||
self.serial.write(str(value + "\r").encode('ascii'))
|
||||
except serial.SerialException as exc:
|
||||
print("Exception received")
|
||||
result = ""
|
||||
data = ""
|
||||
sleep(0.01)
|
||||
while "ch>" not in data:
|
||||
data = self.serial.readline().decode('ascii')
|
||||
result += data
|
||||
print("### Done reading ###")
|
||||
values = result.split("\r\n")
|
||||
print("Total values: " + str(len(values) - 2))
|
||||
self.serialLock.release()
|
||||
return values[1:102]
|
||||
|
||||
def setMarker1Color(self, color):
|
||||
self.smithChart.marker1Color = color
|
||||
p = self.btnMarker1ColorPicker.palette()
|
||||
p.setColor(QtGui.QPalette.ButtonText, color)
|
||||
self.btnMarker1ColorPicker.setPalette(p)
|
||||
|
||||
def setMarker2Color(self, color):
|
||||
self.smithChart.marker2Color = color
|
||||
p = self.btnMarker2ColorPicker.palette()
|
||||
p.setColor(QtGui.QPalette.ButtonText, color)
|
||||
self.btnMarker2ColorPicker.setPalette(p)
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
# Copyright (c) Rune B. Broberg
|
||||
|
||||
from PyQt5 import QtCore
|
||||
from PyQt5.QtCore import pyqtSlot
|
||||
|
||||
from NanoVNASaver import NanoVNASaver
|
||||
|
||||
|
||||
class SweepWorker(QtCore.QRunnable):
|
||||
def __init__(self, app: NanoVNASaver):
|
||||
super().__init__()
|
||||
self.app = app
|
||||
self.serial = app.serial
|
||||
self.serialLock = app.serialLock
|
||||
|
||||
@pyqtSlot()
|
||||
def run(self):
|
||||
print("I am thread")
|
||||
# TODO: Set up multithreading contents
|
||||
# Fetch all the parameters before starting
|
||||
# Optionally split the sweep into subsweeps
|
||||
# For each sweep:
|
||||
# - Fetch data
|
||||
# - Process data
|
||||
# - Store data
|
||||
# - Signal update
|
||||
# Signal finishing
|
||||
404
nanovna-saver.py
404
nanovna-saver.py
|
|
@ -1,409 +1,9 @@
|
|||
# Copyright 2019 Rune B. Broberg
|
||||
import collections
|
||||
import math
|
||||
from time import sleep
|
||||
from typing import List
|
||||
|
||||
from PyQt5 import QtWidgets, QtCore, QtGui
|
||||
import serial
|
||||
import threading
|
||||
|
||||
from SmithChart import SmithChart
|
||||
|
||||
Datapoint = collections.namedtuple('Datapoint', 'freq re im')
|
||||
|
||||
|
||||
class NanoVNASaver(QtWidgets.QWidget):
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
|
||||
self.noSweeps = 2 # Number of sweeps to run
|
||||
|
||||
self.serialLock = threading.Lock()
|
||||
self.serial = serial.Serial()
|
||||
|
||||
self.values = []
|
||||
self.frequencies = []
|
||||
self.data : List[Datapoint] = []
|
||||
|
||||
self.serialPort = "COM11"
|
||||
# self.serialSpeed = "115200"
|
||||
|
||||
self.setWindowTitle("NanoVNA Saver")
|
||||
layout = QtWidgets.QGridLayout()
|
||||
self.setLayout(layout)
|
||||
|
||||
self.smithChart = SmithChart()
|
||||
|
||||
left_column = QtWidgets.QVBoxLayout()
|
||||
right_column = QtWidgets.QVBoxLayout()
|
||||
|
||||
layout.addLayout(left_column, 0, 0)
|
||||
layout.addLayout(right_column, 0, 1)
|
||||
|
||||
################################################################################################################
|
||||
# Sweep control
|
||||
################################################################################################################
|
||||
|
||||
sweep_control_box = QtWidgets.QGroupBox()
|
||||
sweep_control_box.setMaximumWidth(400)
|
||||
sweep_control_box.setTitle("Sweep control")
|
||||
sweep_control_layout = QtWidgets.QFormLayout(sweep_control_box)
|
||||
|
||||
self.sweepStartInput = QtWidgets.QLineEdit("")
|
||||
self.sweepStartInput.setAlignment(QtCore.Qt.AlignRight)
|
||||
|
||||
sweep_control_layout.addRow(QtWidgets.QLabel("Sweep start"), self.sweepStartInput)
|
||||
|
||||
self.sweepEndInput = QtWidgets.QLineEdit("")
|
||||
self.sweepEndInput.setAlignment(QtCore.Qt.AlignRight)
|
||||
|
||||
sweep_control_layout.addRow(QtWidgets.QLabel("Sweep end"), self.sweepEndInput)
|
||||
|
||||
self.sweepCountInput = QtWidgets.QLineEdit("")
|
||||
self.sweepCountInput.setAlignment(QtCore.Qt.AlignRight)
|
||||
self.sweepCountInput.setText("1")
|
||||
|
||||
sweep_control_layout.addRow(QtWidgets.QLabel("Sweep count"), self.sweepCountInput)
|
||||
|
||||
self.btnSweep = QtWidgets.QPushButton("Sweep")
|
||||
self.btnSweep.clicked.connect(self.sweep)
|
||||
sweep_control_layout.addRow(self.btnSweep)
|
||||
|
||||
left_column.addWidget(sweep_control_box)
|
||||
|
||||
################################################################################################################
|
||||
# Marker control
|
||||
################################################################################################################
|
||||
|
||||
marker_control_box = QtWidgets.QGroupBox()
|
||||
marker_control_box.setTitle("Markers")
|
||||
marker_control_box.setMaximumWidth(400)
|
||||
marker_control_layout = QtWidgets.QFormLayout(marker_control_box)
|
||||
|
||||
self.marker1FrequencyInput = QtWidgets.QLineEdit("")
|
||||
self.marker1FrequencyInput.setAlignment(QtCore.Qt.AlignRight)
|
||||
self.marker1FrequencyInput.returnPressed.connect(lambda: self.smithChart.setMarker1(self.marker1FrequencyInput.text()))
|
||||
|
||||
self.btnMarker1ColorPicker = QtWidgets.QPushButton("█")
|
||||
self.btnMarker1ColorPicker.setFixedWidth(20)
|
||||
p = self.btnMarker1ColorPicker.palette()
|
||||
p.setColor(QtGui.QPalette.ButtonText, self.smithChart.marker1Color)
|
||||
self.btnMarker1ColorPicker.setPalette(p)
|
||||
self.btnMarker1ColorPicker.clicked.connect(lambda: self.setMarker1Color(QtWidgets.QColorDialog.getColor()))
|
||||
|
||||
marker1layout = QtWidgets.QHBoxLayout()
|
||||
marker1layout.addWidget(self.marker1FrequencyInput)
|
||||
marker1layout.addWidget(self.btnMarker1ColorPicker)
|
||||
|
||||
marker_control_layout.addRow(QtWidgets.QLabel("Marker 1"), marker1layout)
|
||||
|
||||
self.marker2FrequencyInput = QtWidgets.QLineEdit("")
|
||||
self.marker2FrequencyInput.setAlignment(QtCore.Qt.AlignRight)
|
||||
self.marker2FrequencyInput.returnPressed.connect(lambda: self.smithChart.setMarker2(self.marker2FrequencyInput.text()))
|
||||
|
||||
self.btnMarker2ColorPicker = QtWidgets.QPushButton("█")
|
||||
self.btnMarker2ColorPicker.setFixedWidth(20)
|
||||
p = self.btnMarker2ColorPicker.palette()
|
||||
p.setColor(QtGui.QPalette.ButtonText, self.smithChart.marker2Color)
|
||||
self.btnMarker2ColorPicker.setPalette(p)
|
||||
self.btnMarker2ColorPicker.clicked.connect(lambda: self.setMarker2Color(QtWidgets.QColorDialog.getColor()))
|
||||
|
||||
marker2layout = QtWidgets.QHBoxLayout()
|
||||
marker2layout.addWidget(self.marker2FrequencyInput)
|
||||
marker2layout.addWidget(self.btnMarker2ColorPicker)
|
||||
|
||||
marker_control_layout.addRow(QtWidgets.QLabel("Marker 2"), marker2layout)
|
||||
|
||||
self.marker1label = QtWidgets.QLabel("")
|
||||
marker_control_layout.addRow(QtWidgets.QLabel("Marker 1: "), self.marker1label)
|
||||
|
||||
self.marker2label = QtWidgets.QLabel("")
|
||||
marker_control_layout.addRow(QtWidgets.QLabel("Marker 2: "), self.marker2label)
|
||||
|
||||
left_column.addWidget(marker_control_box)
|
||||
|
||||
left_column.addSpacerItem(QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Expanding))
|
||||
|
||||
################################################################################################################
|
||||
# Serial control
|
||||
################################################################################################################
|
||||
|
||||
serial_control_box = QtWidgets.QGroupBox()
|
||||
serial_control_box.setMaximumWidth(400)
|
||||
serial_control_box.setTitle("Serial port control")
|
||||
serial_control_layout = QtWidgets.QFormLayout(serial_control_box)
|
||||
self.serialPortInput = QtWidgets.QLineEdit(self.serialPort)
|
||||
self.serialPortInput.setAlignment(QtCore.Qt.AlignRight)
|
||||
# self.serialSpeedInput = QtWidgets.QLineEdit(str(self.serialSpeed))
|
||||
# self.serialSpeedInput.setValidator(QtGui.QIntValidator())
|
||||
# self.serialSpeedInput.setAlignment(QtCore.Qt.AlignRight)
|
||||
serial_control_layout.addRow(QtWidgets.QLabel("Serial port"), self.serialPortInput)
|
||||
# serial_control_layout.addRow(QtWidgets.QLabel("Speed"), self.serialSpeedInput)
|
||||
|
||||
self.btnSerialToggle = QtWidgets.QPushButton("Open serial")
|
||||
self.btnSerialToggle.clicked.connect(self.serialButtonClick)
|
||||
serial_control_layout.addRow(self.btnSerialToggle)
|
||||
|
||||
left_column.addWidget(serial_control_box)
|
||||
|
||||
################################################################################################################
|
||||
# File control
|
||||
################################################################################################################
|
||||
|
||||
file_control_box = QtWidgets.QGroupBox()
|
||||
file_control_box.setTitle("Export file")
|
||||
file_control_box.setMaximumWidth(400)
|
||||
file_control_layout = QtWidgets.QFormLayout(file_control_box)
|
||||
self.fileNameInput = QtWidgets.QLineEdit("")
|
||||
self.fileNameInput.setAlignment(QtCore.Qt.AlignRight)
|
||||
|
||||
file_control_layout.addRow(QtWidgets.QLabel("Filename"), self.fileNameInput)
|
||||
|
||||
self.btnExportFile = QtWidgets.QPushButton("Export data")
|
||||
self.btnExportFile.clicked.connect(self.exportFile)
|
||||
file_control_layout.addRow(self.btnExportFile)
|
||||
|
||||
left_column.addWidget(file_control_box)
|
||||
|
||||
################################################################################################################
|
||||
# Right side
|
||||
################################################################################################################
|
||||
|
||||
self.lister = QtWidgets.QPlainTextEdit()
|
||||
self.lister.setFixedHeight(200)
|
||||
right_column.addWidget(self.lister)
|
||||
right_column.addWidget(self.smithChart)
|
||||
|
||||
def exportFile(self):
|
||||
print("Save file to " + self.fileNameInput.text())
|
||||
filename = self.fileNameInput.text()
|
||||
# TODO: Make some proper file handling here?
|
||||
file = open(filename, "w+")
|
||||
self.lister.clear()
|
||||
self.lister.appendPlainText("# Hz S RI R 50")
|
||||
file.write("# Hz S RI R 50\n")
|
||||
for i in range(len(self.values)):
|
||||
if i > 0 and self.frequencies[i] != self.frequencies[i-1]:
|
||||
self.lister.appendPlainText(self.frequencies[i] + " " + self.values[i])
|
||||
file.write(self.frequencies[i] + " " + self.values[i] + "\n")
|
||||
file.close()
|
||||
|
||||
def serialButtonClick(self):
|
||||
if self.serial.is_open:
|
||||
self.stopSerial()
|
||||
else:
|
||||
self.startSerial()
|
||||
return
|
||||
|
||||
def startSerial(self):
|
||||
self.lister.appendPlainText("Opening serial port " + self.serialPort)
|
||||
|
||||
if self.serialLock.acquire():
|
||||
self.serialPort = self.serialPortInput.text()
|
||||
try:
|
||||
self.serial = serial.Serial(port=self.serialPort, baudrate=115200)
|
||||
except serial.SerialException as exc:
|
||||
self.lister.appendPlainText("Tried to open " + self.serialPort + " and failed.")
|
||||
self.serialLock.release()
|
||||
return
|
||||
self.btnSerialToggle.setText("Close serial")
|
||||
self.serial.timeout = 0.05
|
||||
|
||||
self.serialLock.release()
|
||||
sleep(0.25)
|
||||
self.sweep()
|
||||
return
|
||||
|
||||
def stopSerial(self):
|
||||
if self.serialLock.acquire():
|
||||
self.serial.close()
|
||||
self.serialLock.release()
|
||||
self.btnSerialToggle.setText("Open serial")
|
||||
|
||||
def writeSerial(self, command):
|
||||
if not self.serial.is_open:
|
||||
print("Warning: Writing without serial port being opened (" + command + ")")
|
||||
return
|
||||
if self.serialLock.acquire():
|
||||
try:
|
||||
self.serial.write(str(command + "\r").encode('ascii'))
|
||||
self.serial.readline()
|
||||
except serial.SerialException as exc:
|
||||
print("Exception received")
|
||||
self.serialLock.release()
|
||||
return
|
||||
|
||||
def setSweep(self, start, stop):
|
||||
print("Sending: " + "sweep " + str(start) + " " + str(stop) + " 101")
|
||||
self.writeSerial("sweep " + str(start) + " " + str(stop) + " 101")
|
||||
|
||||
def sweep(self):
|
||||
# Run the serial port update
|
||||
if not self.serial.is_open:
|
||||
return
|
||||
|
||||
self.btnSweep.setDisabled(True)
|
||||
|
||||
if int(self.sweepCountInput.text()) > 0:
|
||||
self.noSweeps = int(self.sweepCountInput.text())
|
||||
|
||||
print("### Updating... ### ")
|
||||
|
||||
if len(self.frequencies) > 1:
|
||||
# We've already run at least once
|
||||
print("### Run at least once ###")
|
||||
if (self.sweepStartInput.text() != self.frequencies[0]
|
||||
or self.sweepEndInput.text() != self.frequencies[100]):
|
||||
# Need to set frequency span
|
||||
print("### Setting span ###")
|
||||
# TODO: Set up for multiple sweeps
|
||||
print("Setting sweep to run " + self.sweepStartInput.text() + " to " + self.sweepEndInput.text())
|
||||
self.setSweep(self.sweepStartInput.text(), self.sweepEndInput.text())
|
||||
sleep(0.5)
|
||||
|
||||
if self.noSweeps > 1 and self.sweepStartInput.text() != "" and self.sweepEndInput.text() != "":
|
||||
# We're going to run multiple sweeps
|
||||
print("### Multisweep ###")
|
||||
span = int(self.sweepEndInput.text()) - int(self.sweepStartInput.text())
|
||||
start = int(self.sweepStartInput.text())
|
||||
end = int(self.sweepEndInput.text())
|
||||
stepsize = int(span / (100 + (self.noSweeps-1)*101))
|
||||
print("Doing " + str(100 + (self.noSweeps-1)*101) + " steps of size " + str(stepsize))
|
||||
values = []
|
||||
frequencies = []
|
||||
for i in range(self.noSweeps):
|
||||
self.setSweep(start + i*101*stepsize, start+(100+i*101)*stepsize)
|
||||
QtWidgets.QApplication.processEvents() # TODO: Make this multithreaded using the QT threads instead
|
||||
sleep(0.2)
|
||||
QtWidgets.QApplication.processEvents() # This is a really stupid way to limit UI sleeps to 0.2 seconds
|
||||
sleep(0.2)
|
||||
QtWidgets.QApplication.processEvents()
|
||||
sleep(0.2)
|
||||
QtWidgets.QApplication.processEvents()
|
||||
sleep(0.2)
|
||||
done = False
|
||||
while not done:
|
||||
done = True
|
||||
tmpdata = self.readValues("data 0")
|
||||
for d in tmpdata:
|
||||
a, b = d.split(" ")
|
||||
try:
|
||||
if float(a) < -1.5 or float(a) > 1.5:
|
||||
print("Warning: Got a non-float data value: " + d + " (" + a + ")")
|
||||
done = False
|
||||
if float(b) < -1.5 or float(b) > 1.5:
|
||||
print("Warning: Got a non-float data value: " + d + " (" + b + ")")
|
||||
done = False
|
||||
except Exception:
|
||||
done = False
|
||||
|
||||
values += tmpdata
|
||||
|
||||
# TODO: Figure out why frequencies sometimes arrive as non-numbers
|
||||
done = False
|
||||
while not done:
|
||||
done = True
|
||||
tmpfreq = self.readValues("frequencies")
|
||||
for f in tmpfreq:
|
||||
if not f.isdigit():
|
||||
print("Warning: Got a non-digit frequency: " + f)
|
||||
done = False
|
||||
|
||||
frequencies += tmpfreq
|
||||
self.smithChart.setValues(values, frequencies)
|
||||
|
||||
self.values = values
|
||||
self.frequencies = frequencies
|
||||
# Test code which sets up an array of tuples of parsed values
|
||||
self.data = []
|
||||
for i in range(len(values)):
|
||||
reStr, imStr = values[i].split(" ")
|
||||
re = float(reStr)
|
||||
im = float(imStr)
|
||||
freq = int(frequencies[i])
|
||||
self.data += [Datapoint(freq, re, im)]
|
||||
|
||||
# Reset the device to show the full range
|
||||
self.setSweep(self.sweepStartInput.text(), self.sweepEndInput.text())
|
||||
else:
|
||||
print("### Reading values ###")
|
||||
self.values = self.readValues("data 0")
|
||||
print("### Reading frequencies ###")
|
||||
self.frequencies = self.readValues("frequencies")
|
||||
if self.sweepStartInput.text() == "":
|
||||
self.sweepStartInput.setText(self.frequencies[0])
|
||||
if self.sweepEndInput.text() == "":
|
||||
self.sweepEndInput.setText(self.frequencies[100])
|
||||
|
||||
print("### Outputting values in textbox ###")
|
||||
for line in self.values:
|
||||
self.lister.appendPlainText(line)
|
||||
print("### Displaying Smith chart ###")
|
||||
self.smithChart.setValues(self.values, self.frequencies)
|
||||
if self.smithChart.marker1Location != -1:
|
||||
reStr, imStr = self.values[self.smithChart.marker1Location].split(" ")
|
||||
re = float(reStr)
|
||||
im = float(imStr)
|
||||
|
||||
re50 = 50*(1-re*re-im*im)/(1+re*re+im*im-2*re)
|
||||
im50 = 50*(2*im)/(1+re*re+im*im-2*re)
|
||||
|
||||
mag = math.sqrt(re*re+im*im)
|
||||
vswr = (1+mag)/(1-mag)
|
||||
self.marker1label.setText(str(round(re50, 3)) + " + j" + str(round(im50, 3)) + " VSWR: 1:" + str(round(vswr, 3)))
|
||||
|
||||
if self.smithChart.marker2Location != -1:
|
||||
reStr, imStr = self.values[self.smithChart.marker2Location].split(" ")
|
||||
re = float(reStr)
|
||||
im = float(imStr)
|
||||
|
||||
re50 = 50*(1-re*re-im*im)/(1+re*re+im*im-2*re)
|
||||
im50 = 50*(2*im)/(1+re*re+im*im-2*re)
|
||||
|
||||
mag = math.sqrt(re*re+im*im)
|
||||
vswr = (1+mag)/(1-mag)
|
||||
self.marker2label.setText(str(round(re50, 3)) + " + j" + str(round(im50, 3)) + " VSWR: 1:" + str(round(vswr, 3)))
|
||||
|
||||
self.btnSweep.setDisabled(False)
|
||||
return
|
||||
|
||||
def readValues(self, value):
|
||||
if self.serialLock.acquire():
|
||||
print("### Reading " + str(value) + " ###")
|
||||
try:
|
||||
data = "a"
|
||||
while data != "":
|
||||
data = self.serial.readline().decode('ascii')
|
||||
|
||||
# Then send the command to read data
|
||||
self.serial.write(str(value + "\r").encode('ascii'))
|
||||
except serial.SerialException as exc:
|
||||
print("Exception received")
|
||||
result = ""
|
||||
data = ""
|
||||
sleep(0.01)
|
||||
while "ch>" not in data:
|
||||
data = self.serial.readline().decode('ascii')
|
||||
result += data
|
||||
print("### Done reading ###")
|
||||
values = result.split("\r\n")
|
||||
print("Total values: " + str(len(values) - 2))
|
||||
self.serialLock.release()
|
||||
return values[1:102]
|
||||
|
||||
def setMarker1Color(self, color):
|
||||
self.smithChart.marker1Color = color
|
||||
p = self.btnMarker1ColorPicker.palette()
|
||||
p.setColor(QtGui.QPalette.ButtonText, color)
|
||||
self.btnMarker1ColorPicker.setPalette(p)
|
||||
|
||||
def setMarker2Color(self, color):
|
||||
self.smithChart.marker2Color = color
|
||||
p = self.btnMarker2ColorPicker.palette()
|
||||
p.setColor(QtGui.QPalette.ButtonText, color)
|
||||
self.btnMarker2ColorPicker.setPalette(p)
|
||||
from PyQt5 import QtWidgets
|
||||
|
||||
from NanoVNASaver import NanoVNASaver
|
||||
|
||||
if __name__ == '__main__':
|
||||
# Main code goes here
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue