diff --git a/guiheader.py b/guiheader.py index 2c20fdc..0e76a56 100644 --- a/guiheader.py +++ b/guiheader.py @@ -3,7 +3,7 @@ import os from qtpy.QtCore import Qt, QTimer -from qtpy.QtGui import QFont +from qtpy.QtGui import QFont, QPixmap from qtpy.QtWidgets import ( QApplication, QFrame, QGridLayout, QGroupBox, QHBoxLayout, QLabel, QVBoxLayout, QWidget) @@ -209,41 +209,64 @@ class GUIHeader(QWidget): j += 1 self.shift_type = CAQLabel(self, pv_name="PRO-HUSH:SHIFT-TYPE") - self.grid_layout.addWidget(self.shift_type, 1, 0, 1, 2, Qt.AlignBottom | Qt.AlignLeft) + self.grid_layout.addWidget(self.shift_type, 1, 0, 1, 2, + Qt.AlignBottom | Qt.AlignLeft) + + ''' + label = QLabel() + pixmap = QPixmap(":/Hush.jpg") + pixmap.scaled(80, 80, Qt.KeepAspectRatio) + label.setFixedWidth(80) + label.setFixedHeight(80) + label.setPixmap(pixmap) + label.setScaledContents(True) + self.grid_layout.addWidget(label, 2, 0, 3, 1, + Qt.AlignHCenter | Qt.AlignVCenter) + ''' hbox1 = QHBoxLayout() ama1_label = QLabel("AMA1:") ama1 = CAQLabel(self, pv_name="AMA1:SOL:2", show_units=True) hbox1.addWidget(ama1_label) hbox1.addWidget(ama1) - self.grid_layout.addLayout(hbox1, 1, 2, 1, 2, Qt.AlignTop | Qt.AlignRight) + self.grid_layout.addLayout(hbox1, 1, 2, 1, 2, + Qt.AlignTop | Qt.AlignRight) hbox = QHBoxLayout() ama3_label = QLabel("AMA3:") ama3 = CAQLabel(self, pv_name="AMA3:SOL:2", show_units=True) hbox.addWidget(ama3_label) hbox.addWidget(ama3) - self.grid_layout.addLayout(hbox, 1, 6, 1, 3, Qt.AlignTop | Qt.AlignHCenter) + self.grid_layout.addLayout(hbox, 1, 6, 1, 3, + Qt.AlignTop | Qt.AlignHCenter) hbox2 = QHBoxLayout() amd2_label = QLabel("AMD2:") amd2 = CAQLabel(self, pv_name="AMD2:SOL:2", show_units=True) hbox2.addWidget(amd2_label) hbox2.addWidget(amd2) - self.grid_layout.addLayout(hbox2, 1, 9, 1, 2, Qt.AlignTop | Qt.AlignRight) + self.grid_layout.addLayout(hbox2, 1, 9, 1, 2, + Qt.AlignTop | Qt.AlignRight) b1_label = QLabel("B1") - self.grid_layout.addWidget(b1_label, 4+offset, 1, 1, 1, Qt.AlignVCenter | Qt.AlignHCenter) + self.grid_layout.addWidget(b1_label, 4+offset, 1, 1, 1, + Qt.AlignVCenter | Qt.AlignHCenter) b2_label = QLabel("B2 B3-B6") - self.grid_layout.addWidget(b2_label, 4+offset, 3, 1, 1, Qt.AlignVCenter | Qt.AlignHCenter) + self.grid_layout.addWidget(b2_label, 4+offset, 3, 1, 1, + Qt.AlignVCenter | Qt.AlignHCenter) b7_label = QLabel("B7-B9") - self.grid_layout.addWidget(b7_label, 2+offset, 5, 1, 1, Qt.AlignTop | Qt.AlignHCenter) + self.grid_layout.addWidget(b7_label, 2+offset, 5, 1, 1, + Qt.AlignTop | Qt.AlignHCenter) b10_label = QLabel("B10-B12") - self.grid_layout.addWidget(b10_label, 3+offset, 7, 1, 1, Qt.AlignTop | Qt.AlignHCenter) + self.grid_layout.addWidget(b10_label, 3+offset, 7, 1, 1, + Qt.AlignTop | Qt.AlignHCenter) b13_label = QLabel("B13-B15 ") - self.grid_layout.addWidget(b13_label, 2+offset, 9, 1, 1, Qt.AlignTop | Qt.AlignHCenter) + self.grid_layout.addWidget(b13_label, 2+offset, 9, 1, 1, + Qt.AlignTop | Qt.AlignHCenter) b16_label = QLabel("B16-B18 ") - self.grid_layout.addWidget(b16_label, 0+offset, 10, 1, 1, Qt.AlignTop| Qt.AlignRight) + self.grid_layout.addWidget(b16_label, 0+offset, 10, 1, 1, + Qt.AlignTop| Qt.AlignRight) b19_label = QLabel("B19 B20 ") - self.grid_layout.addWidget(b19_label, 0+offset, 12, 1, 1, Qt.AlignTop | Qt.AlignRight) + self.grid_layout.addWidget(b19_label, 0+offset, 12, 1, 1, + Qt.AlignTop | Qt.AlignRight) if has_hbox_layout: self.grid_layout.setSpacing(6)