devl

hush.sh

@@ -46,7 +46,7 @@ _EPICS_HOST_ARCH=${RHREL}-x86_64
 #/sf/bd/applications/OnlineModel/default/scripts/VA:
 
 #C_EXT version for Py 3.7:
-export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.20.0-gcc-7.3.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.9.0
+export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.19.3/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.9.0
 
 
 echo $PYTHONPATH

src/gui.py

@@ -6,13 +6,13 @@ import random
 import time
 from datetime import timedelta
 
-from qtpy.QtGui import QColor
+from qtpy.QtGui import QColor, QPixmap
 from qtpy.QtCore import __version__ as QT_VERSION_STR
 from qtpy.QtCore import QEventLoop, Qt, Slot
 from qtpy.QtWidgets import (
     QApplication, QFrame, QGridLayout, QGroupBox, QHBoxLayout, QLabel,
-    QMessageBox, QPushButton, QTabBar, QTabWidget, QTableWidgetItem, QTextEdit,
-    QWidget)
+    QMessageBox, QPushButton, QTabBar, QTabWidget, QTableWidgetItem,
+    QTextEdit, QWidget)
 
 import elog
 
@@ -77,7 +77,7 @@ class AppGui(QWidget):
             self.gui_frame.operator_parameters_group.layout().insertWidget(
                 1, shift_type)
 
-            self.gui_frame.results_wgt.setFixedWidth(1200)
+            self.gui_frame.results_wgt.setFixedWidth(1400)
             self.gui_frame.results_wgt.setFixedHeight(400)
             self.gui_frame.results_wgt.setLayout(self.gui_frame.results_layout)
 
@@ -89,7 +89,18 @@ class AppGui(QWidget):
 
         self.gui_frame.results_layout.addWidget(
             self.reset_ioc_saving(sec_prefix_list), 0, 1, 1, 1)
-        self.gui_frame.results_layout.setContentsMargins(40, 40, 40, 40)
+    
+        label = QLabel()
+        pixmap = QPixmap(":/Hush.jpg")
+        pixmap.scaled(180, 180, Qt.KeepAspectRatio)
+        label.setFixedWidth(180)
+        label.setFixedHeight(180)
+        label.setPixmap(pixmap)
+        label.setScaledContents(True)
+        
+        self.gui_frame.results_layout.addWidget(label, 0, 2, 1, 1, Qt.AlignTop)
+       
+        self.gui_frame.results_layout.setContentsMargins(15, 15, 15, 15)
 
         self.expert_labels = self.parent.expert_labels
         self.settings = self.parent.settings
@@ -256,8 +267,8 @@ class AppGui(QWidget):
             #Enable Only on shutdown and if there is no current in the machine
             comet_I = self.cafe.getCache("MMAC3:STR:2")
             if comet_I is None:
-                comet_I = 0.001
-            if value != "Shutdown" or comet_I > 0.001 or \
+                comet_I = 0.002
+            if value != "Shutdown" or comet_I > 0.002 or \
                not self.gui_header.is_master():
                 if self.table_sol_dict["B1B2"].standby_value_button.isEnabled():
                     self.table_sol_dict[
@@ -1053,7 +1064,7 @@ class AppGui(QWidget):
         qgrid.addWidget(qpb, 1, 0, 1, 1, Qt.AlignHCenter)
 
         qw = QGroupBox("HUSH! Accounting")
-        qw.setContentsMargins(5, 10, 5, 0)
+        qw.setContentsMargins(2, 10, 2, 0)
         qw.setAlignment(Qt.AlignTop)
         qw.setObjectName("OUTER")
         qw.setLayout(qgrid)