fix XPRESS/XRD2

FRTND_E/active_frntd_e.py

@@ -299,7 +299,8 @@ class active_frntd_e(Ui_frntd_e, QtCore.QObject):
         self.redbrush = QtGui.QBrush(QtGui.QColor("red"))
         self.graybrush = QtGui.QBrush(QtGui.QColor("gray"))
         n = self.BL.nentries
-        self.tableWidget.setRowCount(n + 11)
+        print("BL entires", n)
+        self.tableWidget.setRowCount(n + 22)
         row = 0
         for entry in self.BL.bltable:
             bname = entry[2]
@@ -429,9 +430,10 @@ class active_frntd_e(Ui_frntd_e, QtCore.QObject):
         #----------------------------------------------------------
         bname = "11.2 F.E. XPRESS/XRD2"
         objname = "geco/STP_S11-04-F.01"
-        col0 = QtGui.QTableWidgetItem(bname, 0)
-        col1 = QtGui.QTableWidgetItem(objname, 1)
-        col2 = QtGui.QTableWidgetItem(stname, 2)
+        print(bname, row)
+        col0 = QtWidgets.QTableWidgetItem(bname, 0)
+        col1 = QtWidgets.QTableWidgetItem(objname, 1)
+        col2 = QtWidgets.QTableWidgetItem(stname, 2)
         col2.setBackground(self.graybrush)
         self.tableWidget.setItem(row, 0, col0)
         self.tableWidget.setItem(row, 1, col1)
@@ -443,9 +445,9 @@ class active_frntd_e(Ui_frntd_e, QtCore.QObject):
         
         bname = "11.2 F.E. XPRESS/XRD2"
         objname = "geco/SHT_S11-04-F.01"
-        col0 = QtGui.QTableWidgetItem(bname, 0)
-        col1 = QtGui.QTableWidgetItem(objname, 1)
-        col2 = QtGui.QTableWidgetItem(stname, 2)
+        col0 = QtWidgets.QTableWidgetItem(bname, 0)
+        col1 = QtWidgets.QTableWidgetItem(objname, 1)
+        col2 = QtWidgets.QTableWidgetItem(stname, 2)
         col2.setBackground(self.graybrush)
         self.tableWidget.setItem(row, 0, col0)
         self.tableWidget.setItem(row, 1, col1)
@@ -457,9 +459,9 @@ class active_frntd_e(Ui_frntd_e, QtCore.QObject):
         #----------------------------------------------------------
         bname = "11.2 XRD2"
         objname = "geco/STP_E11-04-R.01"
-        col0 = QtGui.QTableWidgetItem(bname, 0)
-        col1 = QtGui.QTableWidgetItem(objname, 1)
-        col2 = QtGui.QTableWidgetItem(stname, 2)
+        col0 = QtWidgets.QTableWidgetItem(bname, 0)
+        col1 = QtWidgets.QTableWidgetItem(objname, 1)
+        col2 = QtWidgets.QTableWidgetItem(stname, 2)
         col2.setBackground(self.graybrush)
         self.tableWidget.setItem(row, 0, col0)
         self.tableWidget.setItem(row, 1, col1)
@@ -471,9 +473,9 @@ class active_frntd_e(Ui_frntd_e, QtCore.QObject):
         
         bname = "11.2 XPRESS"
         objname = "geco/SHP_E11-04-C.01"
-        col0 = QtGui.QTableWidgetItem(bname, 0)
-        col1 = QtGui.QTableWidgetItem(objname, 1)
-        col2 = QtGui.QTableWidgetItem(stname, 2)
+        col0 = QtWidgets.QTableWidgetItem(bname, 0)
+        col1 = QtWidgets.QTableWidgetItem(objname, 1)
+        col2 = QtWidgets.QTableWidgetItem(stname, 2)
         col2.setBackground(self.graybrush)
         self.tableWidget.setItem(row, 0, col0)
         self.tableWidget.setItem(row, 1, col1)
@@ -680,7 +682,7 @@ class active_frntd_e(Ui_frntd_e, QtCore.QObject):
         fe114_closed = self.thread.fe114_stopper_value == 0 and self.thread.fe114_shutter_value and self.thread.xrd2_shutter_value == 0 and self.thread.xpress_stopper_value == 0
         vuv_closed =   self.thread.vuvphotemission_shutter_value == 0 and self.thread.vuvphotemission_shutter_value == 0
         palette = self.label.palette()
-        if mybl.allclosed() == 1 and all_tango_closed and vuv_closed and self.fe114_stopper_value :
+        if mybl.allclosed() == 1 and all_tango_closed and vuv_closed :
             palette.setBrush(QtGui.QPalette.Window, self.greenbrush)
             self.label.setText("ALL CLOSED")
         else: