Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| bdad077350 | |||
| 051e361c9f | |||
| 7cac3da421 | |||
| cb7a74d189 | |||
| 9c2c5d7d37 | |||
| 3640082b59 |
17
base.py
17
base.py
@@ -398,7 +398,7 @@ class BaseWindow(QMainWindow):
|
|||||||
|
|
||||||
self.logging = logging
|
self.logging = logging
|
||||||
#self.logging.basicConfig(filename=self.stdlog_dest, level=logging.DEBUG)
|
#self.logging.basicConfig(filename=self.stdlog_dest, level=logging.DEBUG)
|
||||||
self.logging.basicConfig(level=logging.DEBUG)
|
self.logging.basicConfig(level=logging.NOTSET)
|
||||||
self.logger = self.logging.getLogger(__name__)
|
self.logger = self.logging.getLogger(__name__)
|
||||||
self.logger.info("Logging activated")
|
self.logger.info("Logging activated")
|
||||||
|
|
||||||
@@ -453,7 +453,8 @@ class BaseWindow(QMainWindow):
|
|||||||
from src.analysis import AnalysisProcedure
|
from src.analysis import AnalysisProcedure
|
||||||
self.analysis_procedure = AnalysisProcedure(self)
|
self.analysis_procedure = AnalysisProcedure(self)
|
||||||
except ImportError as e:
|
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_elog_entry.connect(self.receive_elog_notification)
|
||||||
##self.trigger_hdf_save.connect(self.save_to_hdf)
|
##self.trigger_hdf_save.connect(self.save_to_hdf)
|
||||||
@@ -508,7 +509,9 @@ class BaseWindow(QMainWindow):
|
|||||||
elif self.facility == Facility.SLS:
|
elif self.facility == Facility.SLS:
|
||||||
from pyqtacc.sls.guiheader import GUIHeader
|
from pyqtacc.sls.guiheader import GUIHeader
|
||||||
from pyqtacc.sls.sendelogsls import QSendToELOG
|
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,
|
self.gui_header = GUIHeader(self, user_mode=self.user_mode,
|
||||||
extended=extended)
|
extended=extended)
|
||||||
@@ -533,7 +536,7 @@ class BaseWindow(QMainWindow):
|
|||||||
self.mainwindow.setMinimumWidth(SLS_CENTRAL_WIDGET_MINIMUM_WIDTH)
|
self.mainwindow.setMinimumWidth(SLS_CENTRAL_WIDGET_MINIMUM_WIDTH)
|
||||||
|
|
||||||
self.setCentralWidget(self.mainwindow)
|
self.setCentralWidget(self.mainwindow)
|
||||||
self.show_log_message(MsgSeverity.INFO, _pymodule, _line(),
|
self.show_log_message(MsgSeverity.INFO.name, _pymodule, _line(),
|
||||||
"Application configured")
|
"Application configured")
|
||||||
|
|
||||||
|
|
||||||
@@ -1864,6 +1867,9 @@ class BaseWindow(QMainWindow):
|
|||||||
elif facility == Facility.SLS:
|
elif facility == Facility.SLS:
|
||||||
from pyqtacc.qrc_resources.facility.sls.pyrcc5 import qrc_resources
|
from pyqtacc.qrc_resources.facility.sls.pyrcc5 import qrc_resources
|
||||||
print("FACILITY SLS")
|
print("FACILITY SLS")
|
||||||
|
elif facility == Facility.HIPA:
|
||||||
|
from pyqtacc.qrc_resources.facility.hipa.pyrcc5 import qrc_resources
|
||||||
|
print("FACILITY HIPA")
|
||||||
else:
|
else:
|
||||||
print("Unknown Facility; assuming SLS")
|
print("Unknown Facility; assuming SLS")
|
||||||
from pyqtacc.qrc_resources.facility.sls.pyrcc5 import qrc_resources
|
from pyqtacc.qrc_resources.facility.sls.pyrcc5 import qrc_resources
|
||||||
@@ -1950,7 +1956,8 @@ class BaseWindow(QMainWindow):
|
|||||||
int_seconds_remaining = int(delay - (now-start1))
|
int_seconds_remaining = int(delay - (now-start1))
|
||||||
seconds_remaining = '{:2d}'.format(int_seconds_remaining)
|
seconds_remaining = '{:2d}'.format(int_seconds_remaining)
|
||||||
self.splash_progressbar.setValue(val)
|
self.splash_progressbar.setValue(val)
|
||||||
self.processEvents()
|
#self.processEvents()
|
||||||
|
self.flush()
|
||||||
sec_str = "s" if abs(int_seconds_remaining) != 1 else ""
|
sec_str = "s" if abs(int_seconds_remaining) != 1 else ""
|
||||||
mess = """
|
mess = """
|
||||||
<br><p style='color:black; font-weight:bold;
|
<br><p style='color:black; font-weight:bold;
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ class UserMode(IntEnum):
|
|||||||
OPERATION = 1
|
OPERATION = 1
|
||||||
EXPERT = 2
|
EXPERT = 2
|
||||||
SIMULATION = 3
|
SIMULATION = 3
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
1150
guiframe.py
1150
guiframe.py
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user