MatthiasQuintern/cpdctrl-gui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add plot update interval setting

Browse Source
This commit is contained in:
CPD 2025-03-17 10:18:05 +01:00
parent f506d4310c
commit 5e3d4a4328
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cpdctrl_gui/ui/main_window.py
View File

@ -1,7 +1,7 @@
''' cpdctrl_gui/ui/main_window.py ''' ''' cpdctrl_gui/ui/main_window.py '''
import os.path import os.path
from PyQt6.QtCore import Qt, QTimer from PyQt6.QtCore import Qt, QTimer, QFileSystemWatcher
from PyQt6.QtWidgets import QMainWindow, QWidget, QHBoxLayout, QLabel, QStatusBar, QFileDialog, \ from PyQt6.QtWidgets import QMainWindow, QWidget, QHBoxLayout, QLabel, QStatusBar, QFileDialog, \
QVBoxLayout QVBoxLayout
from PyQt6.QtWidgets import QTabWidget from PyQt6.QtWidgets import QTabWidget
@ -127,6 +127,7 @@ class MainWindow(QMainWindow):
# Measurement # Measurement
self.measurement_timer = None self.measurement_timer = None
self.led_script = None self.led_script = None
self.led_script_watcher = None
self.data_collector = None self.data_collector = None
self.data_queue = None self.data_queue = None
self.proc_measure = None self.proc_measure = None
@ -307,7 +308,7 @@ class MainWindow(QMainWindow):
self.proc_measure.start() self.proc_measure.start()
self.measurement_timer = QTimer(self) self.measurement_timer = QTimer(self)
self.measurement_timer.timeout.connect(self.measure_update) self.measurement_timer.timeout.connect(self.measure_update)
self.measurement_timer.start(300) # TODO: set interval self.measurement_timer.start(AppConfig.MAIN_CFG.get_or("plot_update_interval_ms", 200))
# the time left estimation might be a little to short, since the actual measurement is started a few lines of # the time left estimation might be a little to short, since the actual measurement is started a few lines of
# code later # code later
@ -323,7 +324,7 @@ class MainWindow(QMainWindow):
self.measurement_timer.stop() self.measurement_timer.stop()
self.proc_measure.join() self.proc_measure.join()
self.set_status("Saving data...") self.set_status("Saving data...")
self.data_collector.save_csv(verbose=True) self.data_collector.save_csv_in_dir()
self.proc_measure = None self.proc_measure = None
# dont update w_led_script, keep displaying the last values # dont update w_led_script, keep displaying the last values
self.led_script.reset() self.led_script.reset()
@ -369,7 +370,7 @@ class MainWindow(QMainWindow):
ext = "csv" ext = "csv"
# data_collector.dirname gets the name, not path # data_collector.dirname gets the name, not path
init_path = os.path.join(last_dir, self.data_collector.dirname + "." + ext) init_path = os.path.join(last_dir, self.data_collector.dirname + "." + ext)
file_path, _ = QFileDialog.getOpenFileName(self, "Save File", init_path, "CSV Files (*.csv);;Pickle Files (*.pkl)") file_path, _ = QFileDialog.getSaveFileName(self, "Save File", init_path, "CSV Files (*.csv);;Pickle Files (*.pkl)")
if file_path: if file_path:
AppConfig.MAIN_CFG.set("tmp_last_measurement_load_dir", os.path.dirname(file_path)) AppConfig.MAIN_CFG.set("tmp_last_measurement_load_dir", os.path.dirname(file_path))
if file_path.endswith(".csv"): if file_path.endswith(".csv"):
@ -418,15 +419,35 @@ class MainWindow(QMainWindow):
def led_script_load(self): def led_script_load(self):
script = self.w_measurement_settings.get_value("led_script") script = self.w_measurement_settings.get_value("led_script")
script_type = self.w_measurement_settings.get_value("led_script_type")
auto_update = AppConfig.MAIN_CFG.get_or("led_script_watch_file", False)
try: try:
self.led_script = LedScript(script=script, auto_update=AppConfig.MAIN_CFG.get_or("led_script_watch_file", False), verbose=True) self.led_script = LedScript(script=script, auto_update=False, verbose=True)
except ValueError as e: except ValueError as e:
# show qt error # show qt error
QMessageBox.critical(self, "LED script error", str(e)) QMessageBox.critical(self, "LED script error", str(e))
return return
self.led_script_updated() if auto_update and script_type == "file":
# can not use "integrated" auto update funciton because we cant receive qtsignals
# from the watchdog thread -> use Qfilesystemwatcher
self.led_script_watcher = QFileSystemWatcher()
self.led_script_watcher.addPath(script)
self.led_script_watcher.fileChanged.connect(self._led_script_update_from_file)
else:
self.led_script_watcher = None
self._led_script_updated()
def led_script_updated(self): def _led_script_update_from_file(self):
"""
Update the led script when its file has changed
"""
self.led_script.update_from_file()
self._led_script_updated()
def _led_script_updated(self):
"""
Send the new led script to the measurement thread and update the gui widget.
"""
# update the measurement led script # update the measurement led script
if self.measurement_is_running(): if self.measurement_is_running():
self.command_queue.put(("led_script", self.led_script.copy())) self.command_queue.put(("led_script", self.led_script.copy()))

5
cpdctrl_gui/ui/widgets/settings/app_settings.py
View File

@ -19,5 +19,10 @@ class AppSettings(QWidget):
w_plot_n.setMaximum(200000) w_plot_n.setMaximum(200000)
w_plot_n.setSingleStep(1000) w_plot_n.setSingleStep(1000)
self.w_form.add_form_row("plot_max_data_points", "Max datapoints in the plot", 20000, w_plot_n, "Maximum number of datapoints in the live plot.\nThis value is limited to ensure performance is not degraded in long measurements") self.w_form.add_form_row("plot_max_data_points", "Max datapoints in the plot", 20000, w_plot_n, "Maximum number of datapoints in the live plot.\nThis value is limited to ensure performance is not degraded in long measurements")
w_plot_dt = QSpinBox()
w_plot_dt.setMinimum(10)
w_plot_dt.setMaximum(200000)
w_plot_dt.setSingleStep(100)
self.w_form.add_form_row("plot_update_interval_ms", "Plot update interval (ms)", 200, w_plot_dt, "Number of milliseconds to wait before updating the live plot")
self.w_form.add_form_row("led_script_watch_file", "Watch Led Script File", False, QCheckBox(), "Watch the LED script file for changes and reload it automatically") self.w_form.add_form_row("led_script_watch_file", "Watch Led Script File", False, QCheckBox(), "Watch the LED script file for changes and reload it automatically")