From 9e5de3947e8a8413e2391c58b116c9a701c7ce13 Mon Sep 17 00:00:00 2001 From: chrin Date: Thu, 24 Apr 2025 09:31:54 +0200 Subject: [PATCH] use apps4ops v1.13.0 where stylesheet added for skin view --- hush_g1.sh | 5 +---- hush_g2.sh | 7 ++----- hush_g3.sh | 4 +--- hush_o2.sh | 6 ++---- hush_pif.sh | 7 ++----- src/gui.py | 36 ++++++++++++++++++++++-------------- 6 files changed, 30 insertions(+), 35 deletions(-) diff --git a/hush_g1.sh b/hush_g1.sh index 11571b5..691848d 100755 --- a/hush_g1.sh +++ b/hush_g1.sh @@ -58,14 +58,11 @@ echo "PYTHON_VERSION $PYTHON_VERSION" . /opt/gfa/python $PYTHON_VERSION -#/sf/bd/applications/OnlineModel/current/PythonModule:/sf/bd/applications/OnlineModel/current -#/sf/bd/applications/OnlineModel/default/scripts/VA: - #C_EXT version for Py 3.7: export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.13.0 if [ "${EXTRA_PYTHON_PATH_FLAG}" -gt "0" ] ; then - export PYTHONPATH=$PYTHONPATH:/proscan/bd/applications/deps/apps4ops/v1.10.0/common/python${PYTHON_VERSION_DIR} + export PYTHONPATH=$PYTHONPATH:/proscan/bd/applications/deps/apps4ops/v1.13.0/common/python${PYTHON_VERSION_DIR} fi echo $PYTHONPATH diff --git a/hush_g2.sh b/hush_g2.sh index 90ec7db..f4ab775 100755 --- a/hush_g2.sh +++ b/hush_g2.sh @@ -23,7 +23,7 @@ fi _EPICS_HOST_ARCH=${RHREL}-x86_64 _EPICS_BASE=base-7.0.8 -# Select Python Version here. Currently one of 3.5, 3.7 +# Select Python Version here. Currently one of 3.5, 3.7, 3.8, 3.10 PYTHON_VERSION=3.10 # Only neede for verison-specific packages, e.g., bigtree- @@ -59,14 +59,11 @@ echo "PYTHON_VERSION $PYTHON_VERSION" . /opt/gfa/python $PYTHON_VERSION -#/sf/bd/applications/OnlineModel/current/PythonModule:/sf/bd/applications/OnlineModel/current -#/sf/bd/applications/OnlineModel/default/scripts/VA: - #C_EXT version for Py 3.7: export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.13.0 if [ "${EXTRA_PYTHON_PATH_FLAG}" -gt "0" ] ; then - export PYTHONPATH=$PYTHONPATH:/proscan/bd/applications/deps/apps4ops/v1.10.0/common/python${PYTHON_VERSION_DIR} + export PYTHONPATH=$PYTHONPATH:/proscan/bd/applications/deps/apps4ops/v1.13.0/common/python${PYTHON_VERSION_DIR} fi echo $PYTHONPATH diff --git a/hush_g3.sh b/hush_g3.sh index 8fb2e72..06c47f6 100755 --- a/hush_g3.sh +++ b/hush_g3.sh @@ -59,14 +59,12 @@ echo "PYTHON_VERSION $PYTHON_VERSION" . /opt/gfa/python $PYTHON_VERSION -#/sf/bd/applications/OnlineModel/current/PythonModule:/sf/bd/applications/OnlineModel/current -#/sf/bd/applications/OnlineModel/default/scripts/VA: #C_EXT version for Py 3.7: export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.13.0 if [ "${EXTRA_PYTHON_PATH_FLAG}" -gt "0" ] ; then - export PYTHONPATH=$PYTHONPATH:/proscan/bd/applications/deps/apps4ops/v1.10.0/common/python${PYTHON_VERSION_DIR} + export PYTHONPATH=$PYTHONPATH:/proscan/bd/applications/deps/apps4ops/v1.13.0/common/python${PYTHON_VERSION_DIR} fi echo $PYTHONPATH diff --git a/hush_o2.sh b/hush_o2.sh index 9fb43ab..b17bec1 100755 --- a/hush_o2.sh +++ b/hush_o2.sh @@ -23,7 +23,7 @@ fi _EPICS_HOST_ARCH=${RHREL}-x86_64 _EPICS_BASE=base-7.0.8 -# Select Python Version here. Currently one of 3.5, 3.7 +# Select Python Version here. Currently one of 3.5, 3.7, 3,8, 3.10 PYTHON_VERSION=3.10 # Only neede for verison-specific packages, e.g., bigtree- @@ -60,11 +60,9 @@ echo "PYTHON_VERSION $PYTHON_VERSION" . /opt/gfa/python $PYTHON_VERSION -#/sf/bd/applications/OnlineModel/current/PythonModule:/sf/bd/applications/OnlineModel/current -#/sf/bd/applications/OnlineModel/default/scripts/VA: #C_EXT version for Py 3.7: -export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0 +export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.13.0 if [ "${EXTRA_PYTHON_PATH_FLAG}" -gt "0" ] ; then diff --git a/hush_pif.sh b/hush_pif.sh index 7c96f99..7a57cb0 100755 --- a/hush_pif.sh +++ b/hush_pif.sh @@ -61,15 +61,12 @@ echo "PYTHON_VERSION $PYTHON_VERSION" . /opt/gfa/python $PYTHON_VERSION -#/sf/bd/applications/OnlineModel/current/PythonModule:/sf/bd/applications/OnlineModel/current -#/sf/bd/applications/OnlineModel/default/scripts/VA: - #C_EXT version for Py 3.7: -export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0 +export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.13.0 if [ "${EXTRA_PYTHON_PATH_FLAG}" -gt "0" ] ; then - export PYTHONPATH=$PYTHONPATH:/proscan/bd/applications/deps/apps4ops/v1.10.0/common/python${PYTHON_VERSION_DIR} + export PYTHONPATH=$PYTHONPATH:/proscan/bd/applications/deps/apps4ops/v1.13.0/common/python${PYTHON_VERSION_DIR} fi echo $PYTHONPATH diff --git a/src/gui.py b/src/gui.py index d26e452..a814d77 100644 --- a/src/gui.py +++ b/src/gui.py @@ -58,12 +58,18 @@ class AppGui(QWidget): self.simple_awake = None self.simple_status = None self.simple_groupbox = None - self.groupbox_awake_sss = self.settings.data['statusStyleSheet']['awake-qgroupbox'] - self.groupbox_standby_sss = self.settings.data['statusStyleSheet']['standby-qgroupbox'] - self.label_awake_sss = self.settings.data['statusStyleSheet']['awake-qlabel'] - self.label_standby_sss = self.settings.data['statusStyleSheet']['standby-qlabel'] - self.awake_text = self.settings.data['statusStyleSheet']['awake-text'] - self.standby_text = self.settings.data['statusStyleSheet']['standby-text'] + self.groupbox_awake_sss = self.settings.data[ + 'statusStyleSheet']['awake-qgroupbox'] + self.groupbox_standby_sss = self.settings.data[ + 'statusStyleSheet']['standby-qgroupbox'] + self.label_awake_sss = self.settings.data[ + 'statusStyleSheet']['awake-qlabel'] + self.label_standby_sss = self.settings.data[ + 'statusStyleSheet']['standby-qlabel'] + self.awake_text = self.settings.data[ + 'statusStyleSheet']['awake-text'] + self.standby_text = self.settings.data[ + 'statusStyleSheet']['standby-text'] self.font_gui = self.parent.gui_frame.font_gui self.input_parameters = self.parent.input_parameters @@ -250,8 +256,7 @@ class AppGui(QWidget): qwgt.setFixedHeight(800) - self.gui_frame.central_tab_widget.insertTab( - 0, qwgt, "Skin") + self.gui_frame.central_tab_widget.insertTab(0, qwgt, "Skin") # self.gui_frame.measurement_layout.addWidget( # self.groupbox_simple_mode, _row, _column, 1, 1, # Qt.AlignTop|Qt.AlignHCenter) @@ -439,9 +444,9 @@ class AppGui(QWidget): print('simple_sector_line', self.simple_sector_list) for sector in reversed(sector_line): - idx1 = sector_line.index(sector) + idx = self.simple_sector_list.index(sector) - print("sector and indices", sector, idx, idx1) + if "Geschlossen" not in self.sector_disruptor_dict[ sector] or not is_submaster(sector, sector_line): #not self.gui_header.is_master(): #print("sector/value", sector, value, flush=True) @@ -867,7 +872,7 @@ class AppGui(QWidget): line = QHLine() line.setFixedHeight(10) row = qgrid.rowCount() - qgrid.addWidget(line, row, 1, 1, 6) + qgrid.addWidget(line, row, 1, 1, 7) qtot = QLabel("Total:") @@ -1131,9 +1136,9 @@ class AppGui(QWidget): self.simple_status[idx].setText('Status: AWAKE') self.status_dict[sector].setStyleSheet(self.label_awake_sss) self.status_dict[sector].setText(self.awake_text) #self.settings.data['statusStyleSheet']['awake-text']) + def paint_asleep(): - sss = ('QGroupBox {background-color:#546bab; font-weight: bold; ' + text_color_str + '}') self.simple_groupbox[idx].setStyleSheet(sss) @@ -1860,11 +1865,14 @@ class AppGui(QWidget): if i%2 == endpt: sss = ('QGroupBox {background-color:#ffe87c; font-weight: bold; ' + text_color_str + '}') - + self.simple_status[idx].setStyleSheet( + 'QLabel{color:black; font-weight: bold;}') else: sss = ('QGroupBox {background-color:#546bab;; font-weight: bold; ' + text_color_str + '}') - + self.simple_status[idx].setStyleSheet( + 'QLabel{color:white; font-weight: bold;}') + self.simple_groupbox[idx].setStyleSheet(sss) #self.simple_status[idx].setText('Status: AWAKE') #self.simple_status[idx].setStyleSheet(