From 15e0edc0e1fb47a1b5ba32417f0161d9e29c114d Mon Sep 17 00:00:00 2001
From: Guenter Quast <guenter.quast@online.de>
Date: Sun, 18 Feb 2024 19:38:50 +0100
Subject: [PATCH] directly change to osc tab if connection established
---
mcpha.py | 3 +--
rpOsci.py | 18 +++++++++++-------
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/mcpha.py b/mcpha.py
index 03af545..59263ca 100755
--- a/mcpha.py
+++ b/mcpha.py
@@ -126,8 +126,7 @@ class MCPHA(QMainWindow, Ui_MCPHA):
else:
self.addrValue.setStyleSheet("color: darkorange")
# !gq end
-
-
+
# !gq get command line arguments
def parse_args(self):
parser =argparse.ArgumentParser(description=__doc__)
diff --git a/rpOsci.py b/rpOsci.py
index f57edc0..279995c 100755
--- a/rpOsci.py
+++ b/rpOsci.py
@@ -65,7 +65,6 @@ else:
Ui_MCPHA, QMainWindow = loadUiType("rpControl.ui")
Ui_LogDisplay, QWidget = loadUiType("mcpha_log.ui")
-#Ui_HstDisplay, QWidget = loadUiType("mcpha_hst.ui")
Ui_OscDisplay, QWidget = loadUiType("mcpha_osc.ui")
Ui_GenDisplay, QWidget = loadUiType("mcpha_gen.ui")
@@ -95,9 +94,9 @@ class rpControl(QMainWindow, Ui_MCPHA):
self.log = LogDisplay()
self.osc = OscDisplay(self, self.log)
self.gen = GenDisplay(self, self.log)
- self.tabWidget.addTab(self.log, "Messages")
- self.tabWidget.addTab(self.osc, "Oscilloscope")
- self.tabWidget.addTab(self.gen, "Pulse generator")
+ self.tabindex_log = self.tabWidget.addTab(self.log, "Messages")
+ self.tabindex_osc = self.tabWidget.addTab(self.osc, "Oscilloscope")
+ self.tabindex_gen = self.tabWidget.addTab(self.gen, "Pulse generator")
# configure controls
self.connectButton.clicked.connect(self.start)
self.neg1Check.toggled.connect(partial(self.set_negator, 0))
@@ -180,7 +179,7 @@ class rpControl(QMainWindow, Ui_MCPHA):
# !gq end
def start(self):
- self.socket.connectToHost(self.addrValue.text(), 1001) # connect to port 1001 (mcpha_server.c on RP)
+ self.socket.connectToHost(self.addrValue.text(), 1001) # connect to port 1001 (mcpha_server on RP)
self.startTimer.start(1000) # shorter time-out
self.connectButton.setText("Disconnect")
self.connectButton.clicked.disconnect()
@@ -212,16 +211,21 @@ class rpControl(QMainWindow, Ui_MCPHA):
self.stop()
def connected(self):
+ # coming here when connection is established
self.startTimer.stop()
- self.readTimer.start(self.readInterval)
- self.addrValue.setStyleSheet("color: green")
self.log.print("IO started")
+ self.addrValue.setStyleSheet("color: green")
+ self.tabWidget.setCurrentIndex(self.tabindex_osc)
+ # initialize variables for readout
self.idle = False
self.osc_waiting = False
self.state = 0
self.set_rate(self.rateValue.currentIndex())
self.set_negator(0, self.neg1Check.isChecked())
self.set_negator(1, self.neg2Check.isChecked())
+ #
+ # finally, start readout timer calling read_osci()
+ self.readTimer.start(self.readInterval)
def command(self, code, number, value):
self.socket.write(struct.pack("<Q", code << 56 | number << 52 | (int(value) & 0xFFFFFFFFFFFFF)))
--
GitLab