Added ability to change more advanced settings (see Settings.py)

DataManager.py

@@ -1,17 +1,21 @@
 import math
+import threading
 import time
 
 import scipy
 
-from PyQt6.QtCore import pyqtSignal, QThread
+from PyQt6.QtCore import pyqtSignal, QObject
 
 
-class DataManager(QThread):
+
+class DataManager(QObject):
     _TIME_SCALE_FACTOR = 1.0
 
     _IIR_ALPHA = .999
 
-    _SAMPLE_RATE = 64
+    _SAMPLE_RATE = 32
+
+    _MOD_VAL = 12.56637061
 
     _FUNCTION_MAP = {
         "sin": "math.sin",
@@ -42,25 +46,29 @@ def __init__(self):
 
         self.functions = dict()
 
+        self.dataThread = threading.Thread(target=self.startDataGather)
+        self.dataThread.daemon = True
+        self.dataThread.start()
+
         self.dataList = [[], []]
 
         self.iirData = []
 
         self.timeList = []
 
-    def startGatherData(self):
+        self.prevCaptureFlag = False
 
-        """
-        The startGatherData function is a thread that runs in the background and continuously gathers data.
-        It does this by calling gatherData() every 1/SAMPLE_RATE seconds, where SAMPLE_RATE is defined above.
-        The while loop continues to run until continueFlag becomes False.
+    def setSpeed(self, speed):
+        self._TIME_SCALE_FACTOR = speed
 
-        :param self: Access the attributes and methods of the class in python
-        :return: Nothing
-        """
+    def setMod(self, mod):
+        self._MOD_VAL = mod
+    def startDataGather(self):
         while (self.continueFlag):
-                time.sleep(1.0 / self._SAMPLE_RATE)
-                self.gatherData()
+            time.sleep(float(1 / self._SAMPLE_RATE))
+            self.gatherData()
+            while not self.prevCaptureFlag:
+                pass
 
     def gatherData(self):
 
@@ -72,34 +80,37 @@ def gatherData(self):
         :param self: Access the class attributes
         :return: None - emits new data signal
         """
-        now = time.time()
+        now = time.time() - self.startTime
         curVal = 1
         for fn in self.functions.values():
-            curVal = eval(str(curVal) + fn[0] + str(fn[1](now * self._TIME_SCALE_FACTOR)))
-        if len(self.dataList[0]) == 4 * self._SAMPLE_RATE:
+            curVal = eval(str(curVal) + fn[0] + str(fn[1]((now % self._MOD_VAL) * (self._TIME_SCALE_FACTOR))))
+        if len(self.dataList[0]) == self._SAMPLE_RATE:
             self.dataList[0].pop(0)
             self.timeList.pop(0)
         self.dataList[0] += [curVal]
-        self.timeList += [now - self.startTime]
+        self.timeList += [now]
 
         self.dataList[1] = scipy.fft.fftshift(scipy.fft.fft(self.dataList[0]))
-        self.dataList[1] = [math.log10((v.real * v.real) + (v.imag * v.imag)) if (v.real != 0 and v.imag != 0) else 1 for v in self.dataList[1]]
-        if len(self.iirData) <= 4 * self._SAMPLE_RATE:
+        self.dataList[1] = [10 * math.log10((v.real * v.real) + (v.imag * v.imag)) if (v.real != 0 and v.imag != 0) else 1
+                            for v in self.dataList[1]]
+        if len(self.iirData) <= self._SAMPLE_RATE:
             self.iirData = self.dataList[1]
         else:
             for i in range(len(self.iirData)):
                 self.iirData[i] = (self.iirData[i] * self._IIR_ALPHA) + (self.dataList[1][i] * (1 - self._IIR_ALPHA))
 
-        self.newFFTData.emit(self.iirData,
-                             [(i - (len(self.dataList[1]) / 2)) for i in range(len(self.dataList[1]))],
+        self.newFFTData.emit(self.iirData[1:],
+                             [(i - (self._SAMPLE_RATE / 2)) for i in range(len(self.dataList[1]))][1:],
                              self._SAMPLE_RATE)
 
         self.newTimeData.emit(self.dataList[0], self.timeList, self._SAMPLE_RATE)
 
+        self.prevCaptureFlag = True
+
     def addSignal(self, data):
         """
         The addSignal function takes a dictionary as an argument. The dictionary must contain the following keys:
-        name - A string that will be used to identify the signal.
+        name - A string that will be used to id             entify the signal.
         operator - A string representing one of the four basic arithmetic operators (+, -, *, /). This is how this signal will interact with others.
         alpha - A float or integer value that scales this function's output by some factor (e.g., 2*sin(x) would have an alpha of 2).
         beta  - A float or integer value that scales this function's input by some factor (e.g., sin(2x) would have a beta of 2).
@@ -110,8 +121,9 @@ def addSignal(self, data):
         :return: A list of the operator, and a lambda function that is used to calculate the value
         """
         self.functions[data["name"]] = [data["operator"],
-                                            lambda t: eval(str(data["alpha"]) + "*" + self._FUNCTION_MAP[data["function"]] \
-                                                           + "(" + str(data["beta"]) + "*" + str(t) + "+" + str(data["gamma"]) + ")")]
+                                        lambda t: eval(str(data["alpha"]) + "*" + self._FUNCTION_MAP[data["function"]] \
+                                                       + "(" + str(data["beta"]) + "*" + str(t) + "+" + str(
+                                            data["gamma"]) + ")")]
 
     def removeSignal(self, signalName):
 
@@ -122,6 +134,7 @@ def removeSignal(self, signalName):
         :param signalName: Identify the signal to be removed
         :return: None
         """
-        for fnName in self.functions.keys():
-                if fnName == signalName:
-                    self.functions.pop(fnName)
+        functions = self.functions.keys()
+        for fnName in functions:
+            if fnName == signalName:
+                self.functions.pop(fnName)