elog enum

This commit is contained in:
2024-02-20 11:38:02 +01:00
parent 912724c3ec
commit bf5070ed60
2 changed files with 10 additions and 9 deletions
+6 -7
View File
@@ -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 = ["<br>G1: ", "<br>SH: ", "<br>G2: ", "<br>O2: ", "<br>PIF: ",
"<br>G3: ", "<br>------------------<br>Tot: "]
pvlist = ["PG1-HUSH:TOTSAVE", "PSH-HUSH:TOTSAVE", "PG2-HUSH:TOTSAVE",
+4 -2
View File
@@ -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("<br>", "\n")