From bf5070ed60605ad136312d0746b092556a3e79bd Mon Sep 17 00:00:00 2001 From: chrin Date: Tue, 20 Feb 2024 11:38:02 +0100 Subject: [PATCH] elog enum --- hush.py | 13 ++++++------- src/gui.py | 6 ++++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/hush.py b/hush.py index b194acc..b4ca6b4 100644 --- a/hush.py +++ b/hush.py @@ -53,15 +53,15 @@ class StartMain(BaseWindow): self.appname = _appname self.title = _title + self.elog_enum = ElogPROSCAN() self.gui = AppGui(self) def prepare_elog_message(self): - elog = ElogPROSCAN() - - self.system_idx = elog.system.NONE - self.eintrag_idx = elog.eintrag.INFO - self.effekt_idx = elog.effekt.NO + + self.system_idx = self.elog_enum.system.NONE + self.eintrag_idx = self.elog_enum.eintrag.INFO + self.effekt_idx = self.elog_enum.effekt.NO self.attach_files = [] @@ -76,8 +76,7 @@ class StartMain(BaseWindow): pass self.logbook = "Sandkasten" if simulation else "Proscan" - self.title = _title - + sector = ["
G1: ", "
SH: ", "
G2: ", "
O2: ", "
PIF: ", "
G3: ", "
------------------
Tot: "] pvlist = ["PG1-HUSH:TOTSAVE", "PSH-HUSH:TOTSAVE", "PG2-HUSH:TOTSAVE", diff --git a/src/gui.py b/src/gui.py index 334f856..b3e3346 100644 --- a/src/gui.py +++ b/src/gui.py @@ -35,6 +35,8 @@ class AppGui(QWidget): self.cyca = self.parent.cyca self.check_status = self.parent.check_status self.check_status_list = self.parent.check_status_list + self.elog_enum = self.parent.elog_enum + # Required for caqtwidgets self.settings = self.parent.settings self.show_log_message = self.parent.show_log_message @@ -975,8 +977,8 @@ class AppGui(QWidget): if "Sandkasten" in self.parent.logbook: attributes["Eintrag"] = "Anregung" else: - attributes["Eintrag"] = "Info" - attributes["Effekt"] = "keiner" + attributes["Eintrag"] = self.elog_enum.eintrag.INFO.name + attributes["Effekt"] = self.elog_enum.effekt.NO,name #"keiner" log_mess = self.parent.message.replace("
", "\n")