From 0b29b2fa0145740c80c40a1108adb95c5702db7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Quast?= <guenter.quast@online.de>
Date: Sun, 16 Jun 2024 11:09:36 +0200
Subject: [PATCH] improved gui labellkng and function naming
---
mcpha_daq.ui | 4 ++--
redPoscdaq.py | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/mcpha_daq.ui b/mcpha_daq.ui
index 170b6e6..2ca6bef 100644
--- a/mcpha_daq.ui
+++ b/mcpha_daq.ui
@@ -305,14 +305,14 @@
<item>
<widget class="QPushButton" name="startButton">
<property name="text">
- <string>Start</string>
+ <string>Start monitor</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="startDAQButton">
<property name="text">
- <string>Start DAQ</string>
+ <string>Start DAQ mode</string>
</property>
</widget>
</item>
diff --git a/redPoscdaq.py b/redPoscdaq.py
index 5dddd8e..73513ec 100755
--- a/redPoscdaq.py
+++ b/redPoscdaq.py
@@ -163,7 +163,7 @@ class rpControl(QMainWindow, Ui_MCPHA):
self.startTimer = QTimer(self) # timer for network connectin
self.startTimer.timeout.connect(self.start_timeout)
self.readTimer = QTimer(self) # for readout
- self.readTimer.timeout.connect(self.update_oscDisplay)
+ self.readTimer.timeout.connect(self.update_oscData)
# transfer command-line arguments to gui
self.osc_daq.levelValue.setValue(self.trigger_level)
@@ -303,7 +303,7 @@ class rpControl(QMainWindow, Ui_MCPHA):
self.set_negator(0, self.neg1Check.isChecked())
self.set_negator(1, self.neg2Check.isChecked())
#
- # finally, start readout timer calling update_oscDisplay()
+ # finally, start readout timer calling update_oscData()
self.readTimer.start(self.readInterval)
#### start oscilloscope in DAQ mode
@@ -325,7 +325,7 @@ class rpControl(QMainWindow, Ui_MCPHA):
view[:] = np.frombuffer(self.socket.read(size), np.uint8)
return True
- def update_oscDisplay(self):
+ def update_oscData(self):
"""get new data from RP and update oscilloscope display (triggered by QTimer:readTimer)
"""
if not self.osc_waiting:
--
GitLab