performance and UI enhancements

Author: jnj256

configs/exp_config_EDA.json

@@ -6,6 +6,7 @@
         "channels": ["EDA"],
         "channel_types": ["eda"],
         "timed_acquisition": true,
+        "assess_signal_quality": false,
         "max_time_seconds": [180, 180],
         "datapath": "data",
         "event_codes": {

configs/exp_config_EDA_Resp_PPG.json

@@ -6,6 +6,7 @@
         "channels": ["EDA", "Resp", "PPG Ear"],
         "channel_types": ["eda", "resp", "ppg"],
         "timed_acquisition": true,
+        "assess_signal_quality": true,
         "max_time_seconds": [180, 180],
         "datapath": "data",
         "event_codes": {

configs/exp_config_EDA_Resp_PPG1_PPG2.json

@@ -6,6 +6,7 @@
         "channels": ["EDA", "Resp", "PPG Finger", "PPG Ear"],
         "channel_types": ["eda", "resp", "ppg", "ppg"],
         "timed_acquisition": true,
+        "assess_signal_quality": true,
         "max_time_seconds": [180, 180],
         "datapath": "data",
         "event_codes": {

configs/exp_config_PPG.json

@@ -6,6 +6,7 @@
         "channels": ["PPG Finger"],
         "channel_types": ["ppg"],
         "timed_acquisition": true,
+        "assess_signal_quality": true,
         "max_time_seconds": [180, 180],
         "datapath": "data",
         "event_codes": {

configs/exp_config_PPG1_PPG2.json

@@ -6,6 +6,7 @@
         "channels": ["PPG Finger", "PPG Ear"],
         "channel_types": ["ppg", "ppg"],
         "timed_acquisition": true,
+        "assess_signal_quality": true,
         "max_time_seconds": [180, 180],
         "datapath": "data",
         "event_codes": {

configs/exp_config_Resp.json

@@ -6,6 +6,7 @@
         "channels": ["Resp"],
         "channel_types": ["resp"],
         "timed_acquisition": true,
+        "assess_signal_quality": false,
         "max_time_seconds": [180, 180],
         "datapath": "data",
         "event_codes": {

configs/exp_config_Resp_PPG.json

@@ -6,6 +6,7 @@
         "channels": ["Resp", "PPG Ear"],
         "channel_types": ["resp", "ppg"],
         "timed_acquisition": true,
+        "assess_signal_quality": true,
         "max_time_seconds": [180, 180],
         "datapath": "data",
         "event_codes": {

configs/exp_config_phys.json

@@ -6,6 +6,7 @@
         "channels": ["EDA", "Resp", "PPG Finger", "PPG Ear"],
         "channel_types": ["eda", "resp", "ppg", "ppg"],
         "timed_acquisition": true,
+        "assess_signal_quality": true,
         "max_time_seconds": [180, 180, 180, 180],
         "datapath": "data",
         "event_codes":{

src/PhysioKit2/form.ui

@@ -638,9 +638,18 @@ Conditions</string>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>40</height>
+          </size>
+         </property>
          <property name="text">
           <string/>
          </property>
+         <property name="scaledContents">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>

src/PhysioKit2/form_ui.py

@@ -312,6 +312,8 @@ def setupUi(self, PPG):
         self.label_sq_legend.setObjectName(u"label_sq_legend")
         sizePolicy4.setHeightForWidth(self.label_sq_legend.sizePolicy().hasHeightForWidth())
         self.label_sq_legend.setSizePolicy(sizePolicy4)
+        self.label_sq_legend.setMaximumSize(QSize(16777215, 40))
+        self.label_sq_legend.setScaledContents(True)
 
         self.gridLayout.addWidget(self.label_sq_legend, 1, 0, 1, 1)
 

src/PhysioKit2/main.py

@@ -18,7 +18,7 @@
 from copy import deepcopy
 
 from PySide6.QtWidgets import QApplication, QWidget, QGraphicsScene, QFileDialog
-from PySide6.QtCore import QFile, QObject, Signal, QThread
+from PySide6.QtCore import QFile, QObject, Signal, QThread, Qt
 from PySide6.QtUiTools import QUiLoader
 from PySide6.QtGui import QPixmap, QImage
 
@@ -53,7 +53,7 @@ def load_ui(self, args_parser):
         ui_file = QFile(path)
         ui_file.open(QFile.ReadOnly)
         self.ui = loader.load(ui_file, self)
-
+        self.ui.graphicsView.viewport().setAttribute(Qt.WidgetAttribute.WA_AcceptTouchEvents, False)
 
         pixmap = QPixmap(files('PhysioKit2.images').joinpath('banner.png'))
         self.ui.label.setPixmap(pixmap)
@@ -69,13 +69,6 @@ def load_ui(self, args_parser):
         self.ext_sync_flag = False
         self.ui.baudrate = 115200
 
-        self.resp_lowcut = 0.1
-        self.resp_highcut = 0.5
-        self.ppg_lowcut = 0.5
-        self.ppg_highcut = 5.0
-        self.filt_order = 1
-        self.eda_moving_average_window_size = int(config.SAMPLING_RATE/4.0)
-
         self.ui.spObj = serialPort()
         self.ui.ser_port_names = []
         self.ui.ser_ports_desc = []
@@ -341,17 +334,6 @@ def load_exp_params(self):
             self.csv_header = self.ui.channels + ["event_code"]
             self.writer.writerow(self.csv_header)
 
-            self.filt_objs = {}
-            self.eda_moving_average_window_size = int(config.SAMPLING_RATE/4.0)
-
-            for nCh in range(config.NCHANNELS):
-                if self.ui.channel_types[nCh] == 'eda':
-                    self.filt_objs[str(nCh)] = lFilter_moving_average(window_size=self.eda_moving_average_window_size)
-                elif self.ui.channel_types[nCh] == 'resp':
-                    self.filt_objs[str(nCh)] = lFilter(self.resp_lowcut, self.resp_highcut, config.SAMPLING_RATE, order=self.filt_order)
-                elif self.ui.channel_types[nCh] == 'ppg':
-                    self.filt_objs[str(nCh)] = lFilter(self.ppg_lowcut, self.ppg_highcut, config.SAMPLING_RATE, order=self.filt_order)
-
             # # Place the matplotlib figure
             gv_rect = self.ui.graphicsView.viewport().rect()
             gv_width = gv_rect.width()
@@ -362,7 +344,7 @@ def load_exp_params(self):
                                        ch_colors = self.ui.channel_plot_colors, 
                                        sq_flag = self.ui.params_dict["exp"]["assess_signal_quality"], 
                                        width = gv_width, height = gv_height)
-            self.myAnim = PlotAnimation(config=config, figCanvas=self.figCanvas)
+            self.myAnim = PlotAnimation(figCanvas=self.figCanvas)
             self.graphic_scene = QGraphicsScene()
             self.graphic_scene.addWidget(self.figCanvas)
             self.ui.graphicsView.setScene(self.graphic_scene)
@@ -649,6 +631,22 @@ def __init__(self, uiObj, parent):
 
         self.ui = uiObj
         self.stop_flag = False
+        self.filt_objs = {}
+        self.eda_moving_average_window_size = int(config.SAMPLING_RATE/4.0)
+
+        self.resp_lowcut = 0.1
+        self.resp_highcut = 0.5
+        self.ppg_lowcut = 0.5
+        self.ppg_highcut = 5.0
+        self.filt_order = 1
+
+        for nCh in range(config.NCHANNELS):
+            if self.ui.channel_types[nCh] == 'eda':
+                self.filt_objs[str(nCh)] = lFilter_moving_average(window_size=self.eda_moving_average_window_size)
+            elif self.ui.channel_types[nCh] == 'resp':
+                self.filt_objs[str(nCh)] = lFilter(self.resp_lowcut, self.resp_highcut, config.SAMPLING_RATE, order=self.filt_order)
+            elif self.ui.channel_types[nCh] == 'ppg':
+                self.filt_objs[str(nCh)] = lFilter(self.ppg_lowcut, self.ppg_highcut, config.SAMPLING_RATE, order=self.filt_order)
 
 
     def stop(self):