Commit 2269cf24 authored by Tong Zhang's avatar Tong Zhang
Browse files

UI: Update UI.

parent c4fc694e
This diff is collapsed.
......@@ -12,7 +12,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_MainWindow(object):
def setupUi(self, MainWindow):
MainWindow.setObjectName("MainWindow")
MainWindow.resize(1337, 692)
MainWindow.resize(1429, 861)
icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap(":/icons/default.png"),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
......@@ -25,8 +25,8 @@ class Ui_MainWindow(object):
self.tabWidget.setObjectName("tabWidget")
self.tab = QtWidgets.QWidget()
self.tab.setObjectName("tab")
self.verticalLayout = QtWidgets.QVBoxLayout(self.tab)
self.verticalLayout.setObjectName("verticalLayout")
self.gridLayout_4 = QtWidgets.QGridLayout(self.tab)
self.gridLayout_4.setObjectName("gridLayout_4")
self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
self.label_3 = QtWidgets.QLabel(self.tab)
......@@ -62,10 +62,16 @@ class Ui_MainWindow(object):
self.family_lineEdit.setReadOnly(True)
self.family_lineEdit.setObjectName("family_lineEdit")
self.horizontalLayout_2.addWidget(self.family_lineEdit)
self.verticalLayout.addLayout(self.horizontalLayout_2)
self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
self.horizontalLayout_4.setObjectName("horizontalLayout_4")
self.x_ellipse_plot = MatplotlibBaseWidget(self.tab)
self.gridLayout_4.addLayout(self.horizontalLayout_2, 0, 0, 1, 1)
self.scrollArea = QtWidgets.QScrollArea(self.tab)
self.scrollArea.setWidgetResizable(True)
self.scrollArea.setObjectName("scrollArea")
self.ellipse_area = QtWidgets.QWidget()
self.ellipse_area.setGeometry(QtCore.QRect(0, 0, 1379, 571))
self.ellipse_area.setObjectName("ellipse_area")
self.gridLayout_2 = QtWidgets.QGridLayout(self.ellipse_area)
self.gridLayout_2.setObjectName("gridLayout_2")
self.x_ellipse_plot = MatplotlibBaseWidget(self.ellipse_area)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed,
QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
......@@ -97,8 +103,8 @@ class Ui_MainWindow(object):
self.x_ellipse_plot.setFigureXYticksFont(font)
self.x_ellipse_plot.setProperty("figureToolbarToggle", False)
self.x_ellipse_plot.setObjectName("x_ellipse_plot")
self.horizontalLayout_4.addWidget(self.x_ellipse_plot)
self.y_ellipse_plot = MatplotlibBaseWidget(self.tab)
self.gridLayout_2.addWidget(self.x_ellipse_plot, 0, 0, 1, 1)
self.y_ellipse_plot = MatplotlibBaseWidget(self.ellipse_area)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed,
QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
......@@ -129,8 +135,52 @@ class Ui_MainWindow(object):
self.y_ellipse_plot.setFigureXYticksFont(font)
self.y_ellipse_plot.setProperty("figureToolbarToggle", False)
self.y_ellipse_plot.setObjectName("y_ellipse_plot")
self.horizontalLayout_4.addWidget(self.y_ellipse_plot)
self.verticalLayout.addLayout(self.horizontalLayout_4)
self.gridLayout_2.addWidget(self.y_ellipse_plot, 0, 1, 1, 1)
self.scrollArea.setWidget(self.ellipse_area)
self.gridLayout_4.addWidget(self.scrollArea, 1, 0, 1, 1)
self.figure_ctls_gbox = QtWidgets.QGridLayout()
self.figure_ctls_gbox.setObjectName("figure_ctls_gbox")
self.grid_on_chkbox = QtWidgets.QCheckBox(self.tab)
self.grid_on_chkbox.setObjectName("grid_on_chkbox")
self.figure_ctls_gbox.addWidget(self.grid_on_chkbox, 1, 0, 1, 1)
self.label_6 = QtWidgets.QLabel(self.tab)
self.label_6.setObjectName("label_6")
self.figure_ctls_gbox.addWidget(self.label_6, 0, 3, 1, 1)
self.label_7 = QtWidgets.QLabel(self.tab)
self.label_7.setObjectName("label_7")
self.figure_ctls_gbox.addWidget(self.label_7, 0, 5, 1, 1)
self.mticks_on_chkbox = QtWidgets.QCheckBox(self.tab)
self.mticks_on_chkbox.setObjectName("mticks_on_chkbox")
self.figure_ctls_gbox.addWidget(self.mticks_on_chkbox, 1, 1, 1, 1)
self.label_4 = QtWidgets.QLabel(self.tab)
self.label_4.setObjectName("label_4")
self.figure_ctls_gbox.addWidget(self.label_4, 0, 0, 1, 1)
self.label_5 = QtWidgets.QLabel(self.tab)
self.label_5.setObjectName("label_5")
self.figure_ctls_gbox.addWidget(self.label_5, 0, 1, 1, 1)
self.tight_layout_on_chkbox = QtWidgets.QCheckBox(self.tab)
self.tight_layout_on_chkbox.setObjectName("tight_layout_on_chkbox")
self.figure_ctls_gbox.addWidget(self.tight_layout_on_chkbox, 1, 2, 1,
1)
self.xlim_x2_lineEdit = QtWidgets.QLineEdit(self.tab)
self.xlim_x2_lineEdit.setObjectName("xlim_x2_lineEdit")
self.figure_ctls_gbox.addWidget(self.xlim_x2_lineEdit, 0, 4, 1, 1)
self.ylim_y1_lineEdit = QtWidgets.QLineEdit(self.tab)
self.ylim_y1_lineEdit.setObjectName("ylim_y1_lineEdit")
self.figure_ctls_gbox.addWidget(self.ylim_y1_lineEdit, 0, 7, 1, 1)
self.xlim_x1_lineEdit = QtWidgets.QLineEdit(self.tab)
self.xlim_x1_lineEdit.setObjectName("xlim_x1_lineEdit")
self.figure_ctls_gbox.addWidget(self.xlim_x1_lineEdit, 0, 2, 1, 1)
self.ylim_y2_lineEdit = QtWidgets.QLineEdit(self.tab)
self.ylim_y2_lineEdit.setObjectName("ylim_y2_lineEdit")
self.figure_ctls_gbox.addWidget(self.ylim_y2_lineEdit, 0, 9, 1, 1)
self.label_8 = QtWidgets.QLabel(self.tab)
self.label_8.setObjectName("label_8")
self.figure_ctls_gbox.addWidget(self.label_8, 0, 6, 1, 1)
self.label_9 = QtWidgets.QLabel(self.tab)
self.label_9.setObjectName("label_9")
self.figure_ctls_gbox.addWidget(self.label_9, 0, 8, 1, 1)
self.gridLayout_4.addLayout(self.figure_ctls_gbox, 2, 0, 1, 1)
self.tabWidget.addTab(self.tab, "")
self.tab_2 = QtWidgets.QWidget()
self.tab_2.setObjectName("tab_2")
......@@ -205,7 +255,7 @@ class Ui_MainWindow(object):
self.gridLayout.addLayout(self.horizontalLayout, 1, 0, 1, 1)
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(MainWindow)
self.menubar.setGeometry(QtCore.QRect(0, 0, 1337, 30))
self.menubar.setGeometry(QtCore.QRect(0, 0, 1429, 30))
self.menubar.setObjectName("menubar")
self.menu_File = QtWidgets.QMenu(self.menubar)
self.menu_File.setObjectName("menu_File")
......@@ -249,6 +299,20 @@ class Ui_MainWindow(object):
self.y_ellipse_plot.setFigureXlabel(_translate("MainWindow", "Y (mm)"))
self.y_ellipse_plot.setFigureYlabel(
_translate("MainWindow", "Y\' (mrad)"))
self.grid_on_chkbox.setText(_translate("MainWindow", "Grid"))
self.label_6.setText(_translate("MainWindow", "To"))
self.label_7.setText(_translate("MainWindow", "Y Limit:"))
self.mticks_on_chkbox.setText(_translate("MainWindow", "Minor Ticks"))
self.label_4.setText(_translate("MainWindow", "X Limit:"))
self.label_5.setText(_translate("MainWindow", "From"))
self.tight_layout_on_chkbox.setText(_translate("MainWindow",
"Compact"))
self.xlim_x2_lineEdit.setText(_translate("MainWindow", "1"))
self.ylim_y1_lineEdit.setText(_translate("MainWindow", "0"))
self.xlim_x1_lineEdit.setText(_translate("MainWindow", "0"))
self.ylim_y2_lineEdit.setText(_translate("MainWindow", "1"))
self.label_8.setText(_translate("MainWindow", "From"))
self.label_9.setText(_translate("MainWindow", "To"))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab),
_translate("MainWindow", "Beam Ellipse"))
self.envelope_plot.setFigureXlabel(_translate("MainWindow", "s [m]"))
......
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1337</width>
<height>692</height>
<width>1429</width>
<height>861</height>
</rect>
</property>
<property name="windowTitle">
......@@ -28,8 +28,8 @@
<attribute name="title">
<string>Beam Ellipse</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label_3">
......@@ -92,100 +92,210 @@
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="MatplotlibBaseWidget" name="x_ellipse_plot">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="figureXlabel">
<string>X (mm)</string>
</property>
<property name="figureYlabel">
<string>X' (mrad)</string>
<item row="1" column="0">
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="ellipse_area">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>1379</width>
<height>571</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="MatplotlibBaseWidget" name="x_ellipse_plot">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="figureXlabel">
<string>X (mm)</string>
</property>
<property name="figureYlabel">
<string>X' (mrad)</string>
</property>
<property name="figureTitle">
<string/>
</property>
<property name="figureXYlabelFont">
<font>
<family>sans-serif</family>
<pointsize>14</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font>
</property>
<property name="figureTitleFont">
<font>
<family>sans-serif</family>
<pointsize>16</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font>
</property>
<property name="figureXYticksFont">
<font>
<family>sans-serif</family>
<pointsize>12</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font>
</property>
<property name="figureToolbarToggle" stdset="0">
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="MatplotlibBaseWidget" name="y_ellipse_plot">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="figureXlabel">
<string>Y (mm)</string>
</property>
<property name="figureYlabel">
<string>Y' (mrad)</string>
</property>
<property name="figureXYlabelFont">
<font>
<family>sans-serif</family>
<pointsize>14</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font>
</property>
<property name="figureTitleFont">
<font>
<family>sans-serif</family>
<pointsize>16</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font>
</property>
<property name="figureXYticksFont">
<font>
<family>sans-serif</family>
<pointsize>12</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font>
</property>
<property name="figureToolbarToggle" stdset="0">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item row="2" column="0">
<layout class="QGridLayout" name="figure_ctls_gbox">
<item row="1" column="0">
<widget class="QCheckBox" name="grid_on_chkbox">
<property name="text">
<string>Grid</string>
</property>
<property name="figureTitle">
<string/>
</widget>
</item>
<item row="0" column="3">
<widget class="QLabel" name="label_6">
<property name="text">
<string>To</string>
</property>
<property name="figureXYlabelFont">
<font>
<family>sans-serif</family>
<pointsize>14</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font>
</widget>
</item>
<item row="0" column="5">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Y Limit:</string>
</property>
<property name="figureTitleFont">
<font>
<family>sans-serif</family>
<pointsize>16</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="mticks_on_chkbox">
<property name="text">
<string>Minor Ticks</string>
</property>
<property name="figureXYticksFont">
<font>
<family>sans-serif</family>
<pointsize>12</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>X Limit:</string>
</property>
<property name="figureToolbarToggle" stdset="0">
<bool>false</bool>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_5">
<property name="text">
<string>From</string>
</property>
</widget>
</item>
<item>
<widget class="MatplotlibBaseWidget" name="y_ellipse_plot">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<item row="1" column="2">
<widget class="QCheckBox" name="tight_layout_on_chkbox">
<property name="text">
<string>Compact</string>
</property>
<property name="figureXlabel">
<string>Y (mm)</string>
</widget>
</item>
<item row="0" column="4">
<widget class="QLineEdit" name="xlim_x2_lineEdit">
<property name="text">
<string>1</string>
</property>
<property name="figureYlabel">
<string>Y' (mrad)</string>
</widget>
</item>
<item row="0" column="7">
<widget class="QLineEdit" name="ylim_y1_lineEdit">
<property name="text">
<string>0</string>
</property>
<property name="figureXYlabelFont">
<font>
<family>sans-serif</family>
<pointsize>14</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font>
</widget>
</item>
<item row="0" column="2">
<widget class="QLineEdit" name="xlim_x1_lineEdit">
<property name="text">
<string>0</string>
</property>
<property name="figureTitleFont">
<font>
<family>sans-serif</family>
<pointsize>16</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font>
</widget>
</item>
<item row="0" column="9">
<widget class="QLineEdit" name="ylim_y2_lineEdit">
<property name="text">
<string>1</string>
</property>
<property name="figureXYticksFont">
<font>
<family>sans-serif</family>
<pointsize>12</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font>
</widget>
</item>
<item row="0" column="6">
<widget class="QLabel" name="label_8">
<property name="text">
<string>From</string>
</property>
<property name="figureToolbarToggle" stdset="0">
<bool>false</bool>
</widget>
</item>
<item row="0" column="8">
<widget class="QLabel" name="label_9">
<property name="text">
<string>To</string>
</property>
</widget>
</item>
......@@ -334,7 +444,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>1337</width>
<width>1429</width>
<height>30</height>
</rect>
</property>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment