diff --git a/mcpha_daq.ui b/mcpha_daq.ui index 170b6e67d2856698a4877106c5e7d52a79cc2aa0..2ca6bef5bb9a766eed4e1a799b3cbf67dd28c676 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 5dddd8e6d2a25e5b9aad446cdf34e79387847117..73513ecaa45bf298994517697abcf3df5c01ba35 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: