From 8d21facf8162aa22e5a07ef8d9136d1090bf3670 Mon Sep 17 00:00:00 2001 From: chrin Date: Thu, 6 Oct 2022 08:30:40 +0200 Subject: [PATCH] v1.4.0 --- guiheader.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/guiheader.py b/guiheader.py index 8965069..089f097 100644 --- a/guiheader.py +++ b/guiheader.py @@ -34,6 +34,9 @@ class GUIHeader(QWidget): self.aramis_status = None self.athos_status = None self.porthos_status = None + self.show_porthos = False + self.porthos_text = "Honest and extrovert!" \ + if random.randint(1, 10) > 9 else "Arriving 2032" self.font_gui = QFont("sans serif") self.font_gui.setPointSize(11) @@ -63,11 +66,11 @@ class GUIHeader(QWidget): for pv in self.settings.data["OpMsg"].values(): pvlist.append(pv) - print(datetime.now()) + self.cafe.openPrepare() self.cafe.open(pvlist) self.cafe.openNowAndWait(0.4) - print(datetime.now()) + self.cafe.printDisconnected() self.station_width = 200 #default @@ -80,15 +83,15 @@ class GUIHeader(QWidget): show_porthos = False try: if self.settings.data["showPorthos"]: - show_porthos = True + self.show_porthos = True else: if random.randint(2, 12) > yr_diff: - show_porthos = True + self.show_porthos = True except KeyError as error: print("KeyError in guiheader.py initialization:", str(error)) if random.randint(2, 12) > yr_diff: - show_porthos = True - if show_porthos: + self.show_porthos = True + if self.show_porthos: self.hor_layout.addWidget(self.porthos_widget()) self.hor_layout.setSpacing(10) self.hor_layout.setAlignment(Qt.AlignLeft) @@ -274,9 +277,7 @@ class GUIHeader(QWidget): station.setFlat(False) station.setTitle("Porthos") grid_layout = QGridLayout() - text = "Honest and extrovert!" \ - if random.randint(1, 10) > 9 else "Arriving 2032" - qlabel = QLabel(text) + qlabel = QLabel(self.porthos_text) qlabel.setFont(self.font_pts10) qlabel.setAlignment(Qt.AlignCenter) grid_layout.addWidget(qlabel, 0, 0) @@ -332,7 +333,7 @@ class GUIHeader(QWidget): target_list = ["Aramis", "Athos"] self.radiobutton = [QRadioButton("Aramis"), QRadioButton("Athos")] try: - if self.settings.data["showPorthos"]: + if self.show_porthos: target_list.append("Porthos") self.radiobutton.append(QRadioButton("Porthos")) except KeyError as error: