From 19da60f411ebf8943b38fa77100db1fc04645bdb Mon Sep 17 00:00:00 2001 From: "Rune B. Broberg" Date: Wed, 28 Aug 2019 15:43:02 +0200 Subject: [PATCH] Store data as tuples (not used yet) --- nanovna-saver.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nanovna-saver.py b/nanovna-saver.py index 080f8f6..18ac9c6 100644 --- a/nanovna-saver.py +++ b/nanovna-saver.py @@ -1,12 +1,17 @@ # 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): @@ -19,6 +24,7 @@ class NanoVNASaver(QtWidgets.QWidget): self.values = [] self.frequencies = [] + self.data : List[Datapoint] = [] self.serialPort = "COM11" # self.serialSpeed = "115200" @@ -309,6 +315,14 @@ class NanoVNASaver(QtWidgets.QWidget): 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())