Store data as tuples (not used yet)

pull/1/head
Rune B. Broberg 2019-08-28 15:43:02 +02:00
rodzic 26e4c8d52b
commit 19da60f411
1 zmienionych plików z 14 dodań i 0 usunięć

Wyświetl plik

@ -1,12 +1,17 @@
# Copyright 2019 Rune B. Broberg # Copyright 2019 Rune B. Broberg
import collections
import math import math
from time import sleep from time import sleep
from typing import List
from PyQt5 import QtWidgets, QtCore, QtGui from PyQt5 import QtWidgets, QtCore, QtGui
import serial import serial
import threading import threading
from SmithChart import SmithChart from SmithChart import SmithChart
Datapoint = collections.namedtuple('Datapoint', 'freq re im')
class NanoVNASaver(QtWidgets.QWidget): class NanoVNASaver(QtWidgets.QWidget):
def __init__(self): def __init__(self):
@ -19,6 +24,7 @@ class NanoVNASaver(QtWidgets.QWidget):
self.values = [] self.values = []
self.frequencies = [] self.frequencies = []
self.data : List[Datapoint] = []
self.serialPort = "COM11" self.serialPort = "COM11"
# self.serialSpeed = "115200" # self.serialSpeed = "115200"
@ -309,6 +315,14 @@ class NanoVNASaver(QtWidgets.QWidget):
self.values = values self.values = values
self.frequencies = frequencies 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 # Reset the device to show the full range
self.setSweep(self.sweepStartInput.text(), self.sweepEndInput.text()) self.setSweep(self.sweepStartInput.text(), self.sweepEndInput.text())