From db3f14525051a2937b3ca6217a9f0458200b7382 Mon Sep 17 00:00:00 2001 From: Ruidy Nemausat Date: Tue, 17 Dec 2019 18:15:15 +0100 Subject: [PATCH] Interface v0 done --- main.ui | 223 ++++++++++++++++++++++++---------------------------- main_gui.py | 81 ++++++++++--------- 2 files changed, 148 insertions(+), 156 deletions(-) diff --git a/main.ui b/main.ui index 397aa63..7a9e33e 100644 --- a/main.ui +++ b/main.ui @@ -26,7 +26,7 @@ P65 XAFS Scan Manager - 0 + 1 @@ -43,68 +43,72 @@ Scan Parameters - + - - - - 75 - 16777215 - - - - Add - - + + + + + + 16777215 + 16777215 + + + + Add + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Copy + + + + + + + + 16777215 + 16777215 + + + + Remove + + + + + + + + 16777215 + 16777215 + + + + Clear + + + + - - - - - 0 - 0 - - - - - 75 - 16777215 - - - - Copy - - - - - - - - 75 - 16777215 - - - - Remove - - - - - - - - 16777215 - 16777215 - - - - Clear - - - - + @@ -113,19 +117,23 @@ - - - - Start - - - - - - - Pause - - + + + + + + Start + + + + + + + Pause + + + + @@ -143,16 +151,6 @@ Data Storage - - - - 420 - 60 - 48 - 24 - - - @@ -163,27 +161,6 @@ - - - - - 0 - 0 - - - - - 20 - 75 - true - true - - - - Data Storage - - - @@ -238,6 +215,27 @@ + + + + + 0 + 0 + + + + + 20 + 75 + true + true + + + + Data Storage + + + @@ -246,22 +244,5 @@ - - - pushButton_6 - clicked() - spinBox - stepUp() - - - 174 - 231 - - - 448 - 158 - - - - + diff --git a/main_gui.py b/main_gui.py index 335021c..f04922d 100644 --- a/main_gui.py +++ b/main_gui.py @@ -1,3 +1,12 @@ +# -*- coding: utf-8 -*- + +# Form implementation generated from reading ui file 'main.ui' +# +# Created by: PyQt5 UI code generator 5.13.2 +# +# WARNING! All changes made in this file will be lost! + + from PyQt5 import QtCore, QtGui, QtWidgets @@ -13,68 +22,55 @@ class MainGui(object): self.scanParameterPage.setGeometry(QtCore.QRect(0, 0, 774, 483)) self.scanParameterPage.setAccessibleName("") self.scanParameterPage.setObjectName("scanParameterPage") - self.horizontalLayout = QtWidgets.QHBoxLayout(self.scanParameterPage) - self.horizontalLayout.setObjectName("horizontalLayout") + self.horizontalLayout_4 = QtWidgets.QHBoxLayout(self.scanParameterPage) + self.horizontalLayout_4.setObjectName("horizontalLayout_4") self.gridLayout = QtWidgets.QGridLayout() self.gridLayout.setObjectName("gridLayout") + self.horizontalLayout = QtWidgets.QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") self.pushButton = QtWidgets.QPushButton(self.scanParameterPage) - self.pushButton.setMaximumSize(QtCore.QSize(75, 16777215)) + self.pushButton.setMaximumSize(QtCore.QSize(16777215, 16777215)) self.pushButton.setObjectName("pushButton") - self.gridLayout.addWidget(self.pushButton, 0, 0, 1, 1) + self.horizontalLayout.addWidget(self.pushButton) self.pushButton_3 = QtWidgets.QPushButton(self.scanParameterPage) self.pushButton_3.setMinimumSize(QtCore.QSize(0, 0)) - self.pushButton_3.setMaximumSize(QtCore.QSize(75, 16777215)) + self.pushButton_3.setMaximumSize(QtCore.QSize(16777215, 16777215)) self.pushButton_3.setObjectName("pushButton_3") - self.gridLayout.addWidget(self.pushButton_3, 0, 1, 1, 1) + self.horizontalLayout.addWidget(self.pushButton_3) self.pushButton_2 = QtWidgets.QPushButton(self.scanParameterPage) - self.pushButton_2.setMaximumSize(QtCore.QSize(75, 16777215)) + self.pushButton_2.setMaximumSize(QtCore.QSize(16777215, 16777215)) self.pushButton_2.setObjectName("pushButton_2") - self.gridLayout.addWidget(self.pushButton_2, 0, 2, 1, 1) + self.horizontalLayout.addWidget(self.pushButton_2) self.pushButton_7 = QtWidgets.QPushButton(self.scanParameterPage) self.pushButton_7.setMaximumSize(QtCore.QSize(16777215, 16777215)) self.pushButton_7.setObjectName("pushButton_7") - self.gridLayout.addWidget(self.pushButton_7, 0, 3, 1, 1) + self.horizontalLayout.addWidget(self.pushButton_7) + self.gridLayout.addLayout(self.horizontalLayout, 0, 0, 1, 1) self.listWidget = QtWidgets.QListWidget(self.scanParameterPage) self.listWidget.setObjectName("listWidget") item = QtWidgets.QListWidgetItem() self.listWidget.addItem(item) - self.gridLayout.addWidget(self.listWidget, 1, 0, 1, 4) + self.gridLayout.addWidget(self.listWidget, 1, 0, 1, 1) + self.horizontalLayout_3 = QtWidgets.QHBoxLayout() + self.horizontalLayout_3.setObjectName("horizontalLayout_3") self.pushButton_4 = QtWidgets.QPushButton(self.scanParameterPage) self.pushButton_4.setObjectName("pushButton_4") - self.gridLayout.addWidget(self.pushButton_4, 2, 0, 1, 2) + self.horizontalLayout_3.addWidget(self.pushButton_4) self.pushButton_5 = QtWidgets.QPushButton(self.scanParameterPage) self.pushButton_5.setObjectName("pushButton_5") - self.gridLayout.addWidget(self.pushButton_5, 2, 2, 1, 2) - self.horizontalLayout.addLayout(self.gridLayout) + self.horizontalLayout_3.addWidget(self.pushButton_5) + self.gridLayout.addLayout(self.horizontalLayout_3, 2, 0, 1, 1) + self.horizontalLayout_4.addLayout(self.gridLayout) self.toolBox.addItem(self.scanParameterPage, "") self.DataStoragePage = QtWidgets.QWidget() self.DataStoragePage.setGeometry(QtCore.QRect(0, 0, 774, 483)) self.DataStoragePage.setObjectName("DataStoragePage") - self.spinBox = QtWidgets.QSpinBox(self.DataStoragePage) - self.spinBox.setGeometry(QtCore.QRect(420, 60, 48, 24)) - self.spinBox.setObjectName("spinBox") self.widget = QtWidgets.QWidget(self.DataStoragePage) self.widget.resize(192, 157) self.widget.setObjectName("widget") self.gridLayout_2 = QtWidgets.QGridLayout(self.widget) self.gridLayout_2.setContentsMargins(0, 0, 0, 0) self.gridLayout_2.setObjectName("gridLayout_2") - self.label_2 = QtWidgets.QLabel(self.widget) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth( - self.label_2.sizePolicy().hasHeightForWidth()) - self.label_2.setSizePolicy(sizePolicy) - font = QtGui.QFont() - font.setPointSize(20) - font.setBold(True) - font.setWeight(75) - font.setKerning(True) - self.label_2.setFont(font) - self.label_2.setObjectName("label_2") - self.gridLayout_2.addWidget(self.label_2, 0, 0, 1, 1) self.tableWidget_2 = QtWidgets.QTableWidget(self.widget) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Maximum) @@ -102,12 +98,27 @@ class MainGui(object): self.pushButton_6 = QtWidgets.QPushButton(self.widget) self.pushButton_6.setObjectName("pushButton_6") self.gridLayout_2.addWidget(self.pushButton_6, 2, 0, 1, 1) + self.label_2 = QtWidgets.QLabel(self.widget) + sizePolicy = QtWidgets.QSizePolicy( + QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth( + self.label_2.sizePolicy().hasHeightForWidth()) + self.label_2.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setPointSize(20) + font.setBold(True) + font.setWeight(75) + font.setKerning(True) + self.label_2.setFont(font) + self.label_2.setObjectName("label_2") + self.gridLayout_2.addWidget(self.label_2, 0, 0, 1, 1) self.toolBox.addItem(self.DataStoragePage, "") self.horizontalLayout_2.addWidget(self.toolBox) self.retranslateUi(widget) - self.toolBox.setCurrentIndex(0) - self.pushButton_6.clicked.connect(self.spinBox.stepUp) + self.toolBox.setCurrentIndex(1) QtCore.QMetaObject.connectSlotsByName(widget) def retranslateUi(self, widget): @@ -132,7 +143,6 @@ class MainGui(object): self.pushButton_5.setText(_translate("widget", "Pause")) self.toolBox.setItemText(self.toolBox.indexOf( self.scanParameterPage), _translate("widget", "Scan Parameters")) - self.label_2.setText(_translate("widget", "Data Storage")) item = self.tableWidget_2.verticalHeaderItem(0) item.setText(_translate("widget", "Location")) item = self.tableWidget_2.verticalHeaderItem(1) @@ -147,5 +157,6 @@ class MainGui(object): item.setText(_translate("widget", "P.I.")) self.tableWidget_2.setSortingEnabled(__sortingEnabled) self.pushButton_6.setText(_translate("widget", "Save")) + self.label_2.setText(_translate("widget", "Data Storage")) self.toolBox.setItemText(self.toolBox.indexOf( self.DataStoragePage), _translate("widget", "Data Storage"))