apps4ops/bdbase
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base and guiframe

Browse Source
This commit is contained in:
chrin
2023-05-01 09:48:14 +02:00
parent 7cac3da421
commit 051e361c9f
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
base.py
View File

@@ -453,7 +453,8 @@ class BaseWindow(QMainWindow):
from src.analysis import AnalysisProcedure
self.analysis_procedure = AnalysisProcedure(self)
except ImportError as e:
print("Import Error:", e)
print(("Base class without user supplied AnalysisProcedure class."
+ " mport Error:"), e)
##self.trigger_elog_entry.connect(self.receive_elog_notification)
##self.trigger_hdf_save.connect(self.save_to_hdf)
@@ -508,7 +509,9 @@ class BaseWindow(QMainWindow):
elif self.facility == Facility.SLS:
from pyqtacc.sls.guiheader import GUIHeader
from pyqtacc.sls.sendelogsls import QSendToELOG
elif self.facility == Facility.HIPA:
from pyqtacc.hipa.guiheader import GUIHeader
from pyqtacc.hipa.sendeloghipa import QSendToELOG
self.gui_header = GUIHeader(self, user_mode=self.user_mode,
extended=extended)
@@ -1864,6 +1867,9 @@ class BaseWindow(QMainWindow):
elif facility == Facility.SLS:
from pyqtacc.qrc_resources.facility.sls.pyrcc5 import qrc_resources
print("FACILITY SLS")
elif facility == Facility.HIPA:
from pyqtacc.qrc_resources.facility.hipa.pyrcc5 import qrc_resources
print("FACILITY HIPA")
else:
print("Unknown Facility; assuming SLS")
from pyqtacc.qrc_resources.facility.sls.pyrcc5 import qrc_resources
@@ -1950,7 +1956,8 @@ class BaseWindow(QMainWindow):
int_seconds_remaining = int(delay - (now-start1))
seconds_remaining = '{:2d}'.format(int_seconds_remaining)
self.splash_progressbar.setValue(val)
self.processEvents()
#self.processEvents()
self.flush()
sec_str = "s" if abs(int_seconds_remaining) != 1 else ""
mess = """
<br><p style='color:black; font-weight:bold;

27
guiframe.py
View File

@@ -141,21 +141,25 @@ class GUIFrame(QWidget):
self.save_all_wgt = QWidget()
if "GUI" in self.settings.data:
self.results_tab_wgt_titles = self.settings.data[
"GUI"]["subResultsTabTitle"]
if "subResultsTabTitle" in self.settings.data["GUI"]:
self.results_tab_wgt_titles = self.settings.data[
"GUI"]["subResultsTabTitle"]
self.sub_results_wgt = [None] * len(self.results_tab_wgt_titles)
self.sub_results_layout = [None] * len(self.results_tab_wgt_titles)
self.sub_results_wgt = [None] * len(self.results_tab_wgt_titles)
self.sub_results_layout = [None] * len(self.results_tab_wgt_titles)
for i in range(0, len(self.results_tab_wgt_titles)):
self.sub_results_wgt[i] = QWidget(self.results_tab_wgt)
for i in range(0, len(self.results_tab_wgt_titles)):
self.sub_results_wgt[i] = QWidget(self.results_tab_wgt)
self.canvas = [None] * len(self.results_tab_wgt_titles)
self.nav = [None] * len(self.results_tab_wgt_titles)
self.canvas = [None] * len(self.results_tab_wgt_titles)
self.nav = [None] * len(self.results_tab_wgt_titles)
self.arrow_button_widget = [None] * len(self.results_tab_wgt_titles)
self.canvas_current_idx = [0] * len(self.results_tab_wgt_titles)
self.init_results_tab_wgt()
self.arrow_button_widget = [None] * len(self.results_tab_wgt_titles)
self.canvas_current_idx = [0] * len(self.results_tab_wgt_titles)
self.init_results_tab_wgt()
self.slice_orientation = "vertical" #horizontal/vertical for SATMA02
@@ -347,6 +351,7 @@ class GUIFrame(QWidget):
def init_measurement_tab_wgt(self):
""" Add tabs to measurement widget
"""
self.measurement_tab_wgt.setFont(self.font_gui)
self.measurement_tab_wgt.addTab(self.operator_wgt, "Operator")
self.measurement_tab_wgt.addTab(self.expert_wgt, "Expert")