Commit b5c754fc authored by Pedro Henrique Kopper's avatar Pedro Henrique Kopper

Resolver problemas de UI (de novo2)

parent 3d6767d9
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1000</width> <width>1024</width>
<height>700</height> <height>700</height>
</rect> </rect>
</property> </property>
...@@ -105,11 +105,11 @@ QGroupBox { ...@@ -105,11 +105,11 @@ QGroupBox {
</string> </string>
</property> </property>
<property name="title"> <property name="title">
<string>Valores Absolutos</string> <string/>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0"> <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0">
<property name="topMargin"> <property name="topMargin">
<number>25</number> <number>9</number>
</property> </property>
<item> <item>
<widget class="QGroupBox" name="calibratorGBox"> <widget class="QGroupBox" name="calibratorGBox">
...@@ -273,7 +273,7 @@ font: 10pt &quot;Liberation Mono&quot;;</string> ...@@ -273,7 +273,7 @@ font: 10pt &quot;Liberation Mono&quot;;</string>
<property name="title"> <property name="title">
<string/> <string/>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="QComboBox" name="samplingCBox"> <widget class="QComboBox" name="samplingCBox">
<property name="sizePolicy"> <property name="sizePolicy">
...@@ -343,78 +343,63 @@ font: 10pt &quot;Liberation Mono&quot;;</string> ...@@ -343,78 +343,63 @@ font: 10pt &quot;Liberation Mono&quot;;</string>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="scaleGBox"> <layout class="QGridLayout" name="grid_2">
<property name="title"> <item row="1" column="0">
<string>Escala</string> <widget class="QSpinBox" name="min_pressao_2">
</property> <property name="suffix">
<widget class="QWidget" name="gridLayoutWidget"> <string> bar</string>
<property name="geometry"> </property>
<rect> <property name="prefix">
<x>10</x> <string/>
<y>30</y> </property>
<width>381</width> <property name="maximum">
<height>91</height> <number>400</number>
</rect> </property>
</property> </widget>
<layout class="QGridLayout" name="grid"> </item>
<item row="1" column="0"> <item row="0" column="0">
<widget class="QSpinBox" name="min_pressao"> <widget class="QSpinBox" name="min_amostra_2">
<property name="suffix"> <property name="suffix">
<string> bar</string> <string> mV</string>
</property> </property>
<property name="prefix"> <property name="prefix">
<string/> <string/>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>400</number> <number>255</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="0" column="1">
<widget class="QSpinBox" name="min_amostra"> <widget class="QSpinBox" name="max_amostra_2">
<property name="suffix"> <property name="suffix">
<string> mV</string> <string> mV</string>
</property> </property>
<property name="prefix"> <property name="maximum">
<string/> <number>256</number>
</property> </property>
<property name="maximum"> <property name="value">
<number>255</number> <number>256</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="1" column="1">
<widget class="QSpinBox" name="max_amostra"> <widget class="QSpinBox" name="max_pressao_2">
<property name="suffix"> <property name="suffix">
<string> mV</string> <string> bar</string>
</property> </property>
<property name="maximum"> <property name="prefix">
<number>256</number> <string/>
</property> </property>
<property name="value"> <property name="maximum">
<number>256</number> <number>400</number>
</property> </property>
</widget> <property name="value">
</item> <number>100</number>
<item row="1" column="1"> </property>
<widget class="QSpinBox" name="max_pressao"> </widget>
<property name="suffix"> </item>
<string> bar</string> </layout>
</property>
<property name="prefix">
<string/>
</property>
<property name="maximum">
<number>400</number>
</property>
<property name="value">
<number>100</number>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
...@@ -429,7 +414,7 @@ font: 10pt &quot;Liberation Mono&quot;;</string> ...@@ -429,7 +414,7 @@ font: 10pt &quot;Liberation Mono&quot;;</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1000</width> <width>1024</width>
<height>28</height> <height>28</height>
</rect> </rect>
</property> </property>
......
...@@ -13,7 +13,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets ...@@ -13,7 +13,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_Generico(object): class Ui_Generico(object):
def setupUi(self, Generico): def setupUi(self, Generico):
Generico.setObjectName("Generico") Generico.setObjectName("Generico")
Generico.resize(1000, 700) Generico.resize(1024, 700)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
...@@ -82,9 +82,10 @@ class Ui_Generico(object): ...@@ -82,9 +82,10 @@ class Ui_Generico(object):
self.absValGBox.setFont(font) self.absValGBox.setFont(font)
self.absValGBox.setStyleSheet("border: 2px solid rgb(26, 149, 172);\n" self.absValGBox.setStyleSheet("border: 2px solid rgb(26, 149, 172);\n"
"") "")
self.absValGBox.setTitle("")
self.absValGBox.setObjectName("absValGBox") self.absValGBox.setObjectName("absValGBox")
self.verticalLayout = QtWidgets.QVBoxLayout(self.absValGBox) self.verticalLayout = QtWidgets.QVBoxLayout(self.absValGBox)
self.verticalLayout.setContentsMargins(11, 25, 11, 11) self.verticalLayout.setContentsMargins(11, 9, 11, 11)
self.verticalLayout.setSpacing(6) self.verticalLayout.setSpacing(6)
self.verticalLayout.setObjectName("verticalLayout") self.verticalLayout.setObjectName("verticalLayout")
self.calibratorGBox = QtWidgets.QGroupBox(self.absValGBox) self.calibratorGBox = QtWidgets.QGroupBox(self.absValGBox)
...@@ -175,10 +176,10 @@ class Ui_Generico(object): ...@@ -175,10 +176,10 @@ class Ui_Generico(object):
"") "")
self.samplingBox.setTitle("") self.samplingBox.setTitle("")
self.samplingBox.setObjectName("samplingBox") self.samplingBox.setObjectName("samplingBox")
self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.samplingBox) self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.samplingBox)
self.verticalLayout_3.setContentsMargins(11, 11, 11, 11) self.verticalLayout_2.setContentsMargins(11, 11, 11, 11)
self.verticalLayout_3.setSpacing(6) self.verticalLayout_2.setSpacing(6)
self.verticalLayout_3.setObjectName("verticalLayout_3") self.verticalLayout_2.setObjectName("verticalLayout_2")
self.samplingCBox = QtWidgets.QComboBox(self.samplingBox) self.samplingCBox = QtWidgets.QComboBox(self.samplingBox)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
...@@ -196,41 +197,35 @@ class Ui_Generico(object): ...@@ -196,41 +197,35 @@ class Ui_Generico(object):
self.samplingCBox.addItem("") self.samplingCBox.addItem("")
self.samplingCBox.addItem("") self.samplingCBox.addItem("")
self.samplingCBox.addItem("") self.samplingCBox.addItem("")
self.verticalLayout_3.addWidget(self.samplingCBox) self.verticalLayout_2.addWidget(self.samplingCBox)
self.playPause = QtWidgets.QPushButton(self.samplingBox) self.playPause = QtWidgets.QPushButton(self.samplingBox)
self.playPause.setObjectName("playPause") self.playPause.setObjectName("playPause")
self.verticalLayout_3.addWidget(self.playPause) self.verticalLayout_2.addWidget(self.playPause)
self.scaleGBox = QtWidgets.QGroupBox(self.samplingBox) self.grid_2 = QtWidgets.QGridLayout()
self.scaleGBox.setObjectName("scaleGBox") self.grid_2.setSpacing(6)
self.gridLayoutWidget = QtWidgets.QWidget(self.scaleGBox) self.grid_2.setObjectName("grid_2")
self.gridLayoutWidget.setGeometry(QtCore.QRect(10, 30, 381, 91)) self.min_pressao_2 = QtWidgets.QSpinBox(self.samplingBox)
self.gridLayoutWidget.setObjectName("gridLayoutWidget") self.min_pressao_2.setPrefix("")
self.grid = QtWidgets.QGridLayout(self.gridLayoutWidget) self.min_pressao_2.setMaximum(400)
self.grid.setContentsMargins(11, 11, 11, 11) self.min_pressao_2.setObjectName("min_pressao_2")
self.grid.setSpacing(6) self.grid_2.addWidget(self.min_pressao_2, 1, 0, 1, 1)
self.grid.setObjectName("grid") self.min_amostra_2 = QtWidgets.QSpinBox(self.samplingBox)
self.min_pressao = QtWidgets.QSpinBox(self.gridLayoutWidget) self.min_amostra_2.setPrefix("")
self.min_pressao.setPrefix("") self.min_amostra_2.setMaximum(255)
self.min_pressao.setMaximum(400) self.min_amostra_2.setObjectName("min_amostra_2")
self.min_pressao.setObjectName("min_pressao") self.grid_2.addWidget(self.min_amostra_2, 0, 0, 1, 1)
self.grid.addWidget(self.min_pressao, 1, 0, 1, 1) self.max_amostra_2 = QtWidgets.QSpinBox(self.samplingBox)
self.min_amostra = QtWidgets.QSpinBox(self.gridLayoutWidget) self.max_amostra_2.setMaximum(256)
self.min_amostra.setPrefix("") self.max_amostra_2.setProperty("value", 256)
self.min_amostra.setMaximum(255) self.max_amostra_2.setObjectName("max_amostra_2")
self.min_amostra.setObjectName("min_amostra") self.grid_2.addWidget(self.max_amostra_2, 0, 1, 1, 1)
self.grid.addWidget(self.min_amostra, 0, 0, 1, 1) self.max_pressao_2 = QtWidgets.QSpinBox(self.samplingBox)
self.max_amostra = QtWidgets.QSpinBox(self.gridLayoutWidget) self.max_pressao_2.setPrefix("")
self.max_amostra.setMaximum(256) self.max_pressao_2.setMaximum(400)
self.max_amostra.setProperty("value", 256) self.max_pressao_2.setProperty("value", 100)
self.max_amostra.setObjectName("max_amostra") self.max_pressao_2.setObjectName("max_pressao_2")
self.grid.addWidget(self.max_amostra, 0, 1, 1, 1) self.grid_2.addWidget(self.max_pressao_2, 1, 1, 1, 1)
self.max_pressao = QtWidgets.QSpinBox(self.gridLayoutWidget) self.verticalLayout_2.addLayout(self.grid_2)
self.max_pressao.setPrefix("")
self.max_pressao.setMaximum(400)
self.max_pressao.setProperty("value", 100)
self.max_pressao.setObjectName("max_pressao")
self.grid.addWidget(self.max_pressao, 1, 1, 1, 1)
self.verticalLayout_3.addWidget(self.scaleGBox)
self.gridLayout_2.addWidget(self.samplingBox, 3, 1, 1, 3) self.gridLayout_2.addWidget(self.samplingBox, 3, 1, 1, 3)
self.gridLayout_2.setColumnStretch(0, 1) self.gridLayout_2.setColumnStretch(0, 1)
self.gridLayout_2.setColumnStretch(1, 1) self.gridLayout_2.setColumnStretch(1, 1)
...@@ -242,7 +237,7 @@ class Ui_Generico(object): ...@@ -242,7 +237,7 @@ class Ui_Generico(object):
self.gridLayout_6.addWidget(self.widget, 0, 0, 1, 1) self.gridLayout_6.addWidget(self.widget, 0, 0, 1, 1)
Generico.setCentralWidget(self.centralWidget) Generico.setCentralWidget(self.centralWidget)
self.menuBar = QtWidgets.QMenuBar(Generico) self.menuBar = QtWidgets.QMenuBar(Generico)
self.menuBar.setGeometry(QtCore.QRect(0, 0, 1000, 28)) self.menuBar.setGeometry(QtCore.QRect(0, 0, 1024, 28))
self.menuBar.setObjectName("menuBar") self.menuBar.setObjectName("menuBar")
Generico.setMenuBar(self.menuBar) Generico.setMenuBar(self.menuBar)
self.menuStatusBar = QtWidgets.QStatusBar(Generico) self.menuStatusBar = QtWidgets.QStatusBar(Generico)
...@@ -275,7 +270,6 @@ class Ui_Generico(object): ...@@ -275,7 +270,6 @@ class Ui_Generico(object):
def retranslateUi(self, Generico): def retranslateUi(self, Generico):
_translate = QtCore.QCoreApplication.translate _translate = QtCore.QCoreApplication.translate
Generico.setWindowTitle(_translate("Generico", "SADAMAP - Análise de Dados: Etapa 1 - Calibração de Pressão")) Generico.setWindowTitle(_translate("Generico", "SADAMAP - Análise de Dados: Etapa 1 - Calibração de Pressão"))
self.absValGBox.setTitle(_translate("Generico", "Valores Absolutos"))
self.calibratorGBox.setTitle(_translate("Generico", "Amostra")) self.calibratorGBox.setTitle(_translate("Generico", "Amostra"))
self.calibratorLabel.setText(_translate("Generico", "0 mV")) self.calibratorLabel.setText(_translate("Generico", "0 mV"))
self.forceGBox.setTitle(_translate("Generico", "Pressão")) self.forceGBox.setTitle(_translate("Generico", "Pressão"))
...@@ -290,11 +284,10 @@ class Ui_Generico(object): ...@@ -290,11 +284,10 @@ class Ui_Generico(object):
self.samplingCBox.setItemText(7, _translate("Generico", "5 seg")) self.samplingCBox.setItemText(7, _translate("Generico", "5 seg"))
self.samplingCBox.setItemText(8, _translate("Generico", "10 seg")) self.samplingCBox.setItemText(8, _translate("Generico", "10 seg"))
self.playPause.setText(_translate("Generico", "PAUSA")) self.playPause.setText(_translate("Generico", "PAUSA"))
self.scaleGBox.setTitle(_translate("Generico", "Escala")) self.min_pressao_2.setSuffix(_translate("Generico", " bar"))
self.min_pressao.setSuffix(_translate("Generico", " bar")) self.min_amostra_2.setSuffix(_translate("Generico", " mV"))
self.min_amostra.setSuffix(_translate("Generico", " mV")) self.max_amostra_2.setSuffix(_translate("Generico", " mV"))
self.max_amostra.setSuffix(_translate("Generico", " mV")) self.max_pressao_2.setSuffix(_translate("Generico", " bar"))
self.max_pressao.setSuffix(_translate("Generico", " bar"))
self.alternaCalibraP.setText(_translate("Generico", "Calibração P")) self.alternaCalibraP.setText(_translate("Generico", "Calibração P"))
self.alternaCalibraT.setText(_translate("Generico", "Calibração T")) self.alternaCalibraT.setText(_translate("Generico", "Calibração T"))
self.alternaProc.setText(_translate("Generico", "Processamento")) self.alternaProc.setText(_translate("Generico", "Processamento"))
......
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