Skip to content
This repository was archived by the owner on Feb 21, 2021. It is now read-only.

[issue #775] Updated ui_gui.ui of uav_viewer_py #790

Merged
aitormf merged 1 commit into from
Apr 27, 2017
Merged

[issue #775] Updated ui_gui.ui of uav_viewer_py #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 20 additions & 34 deletions src/tools/uav_viewer_py/gui/ui_gui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,47 +17,34 @@ def setupUi(self, MainWindow):
self.centralwidget = QtWidgets.QWidget(MainWindow)
self.centralwidget.setObjectName("centralwidget")
self.takeoffButton = QtWidgets.QPushButton(self.centralwidget)
self.takeoffButton.setGeometry(QtCore.QRect(80, 380, 220, 41))
self.takeoffButton.setGeometry(QtCore.QRect(80, 370, 161, 41))
self.takeoffButton.setObjectName("takeoffButton")

self.stopButton = QtWidgets.QPushButton(self.centralwidget)
self.stopButton.setGeometry(QtCore.QRect(80, 425, 220, 51))
icon1 = QtGui.QIcon()
icon1.addPixmap(QtGui.QPixmap(":/images/stop.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.stopButton.setIcon(icon1)
self.stopButton.setGeometry(QtCore.QRect(80, 420, 161, 41))
icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap(":/images/stop.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.stopButton.setIcon(icon)
self.stopButton.setObjectName("stopButton")

self.windowsLabel = QtWidgets.QLabel(self.centralwidget)
self.windowsLabel.setGeometry(QtCore.QRect(350, 380, 71, 21))
self.windowsLabel.setGeometry(QtCore.QRect(280, 390, 71, 21))
self.windowsLabel.setObjectName("windowsLabel")
self.cameraCheck = QtWidgets.QCheckBox(self.centralwidget)
self.cameraCheck.setGeometry(QtCore.QRect(350, 410, 94, 26))
self.cameraCheck.setGeometry(QtCore.QRect(280, 420, 94, 26))
self.cameraCheck.setObjectName("cameraCheck")
self.sensorsCheck = QtWidgets.QCheckBox(self.centralwidget)
self.sensorsCheck.setGeometry(QtCore.QRect(350, 440, 94, 26))
self.sensorsCheck.setGeometry(QtCore.QRect(280, 450, 94, 26))
self.sensorsCheck.setObjectName("sensorsCheck")

self.altdLabel = QtWidgets.QLabel(self.centralwidget)
self.altdLabel.setGeometry(QtCore.QRect(220, 340, 61, 21))
self.altdLabel.setGeometry(QtCore.QRect(410, 340, 51, 21))
self.altdLabel.setObjectName("altdLabel")

self.verticalLayoutWidget = QtWidgets.QWidget(self.centralwidget)
self.verticalLayoutWidget.setGeometry(QtCore.QRect(20, 30, 361, 301))
self.verticalLayoutWidget.setObjectName("verticalLayoutWidget")
self.tlLayout = QtWidgets.QVBoxLayout(self.verticalLayoutWidget)
self.tlLayout.setObjectName("tlLayout")
####################NUEVO####################
self.verticalLayoutWidget_1 = QtWidgets.QWidget(self.centralwidget)
self.verticalLayoutWidget_1.setGeometry(QtCore.QRect(400, 30, 361, 301))
self.verticalLayoutWidget_1.setObjectName("verticalLayoutWidget_1")
self.tlLayout_1 = QtWidgets.QVBoxLayout(self.verticalLayoutWidget_1)
self.tlLayout_1.setObjectName("tlLayout_1")
#######################

self.rotationLabel = QtWidgets.QLabel(self.centralwidget)
self.rotationLabel.setGeometry(QtCore.QRect(350, 340, 65, 21))
self.rotationLabel.setGeometry(QtCore.QRect(540, 340, 65, 21))
self.rotationLabel.setObjectName("rotationLabel")

self.XLabel = QtWidgets.QLabel(self.centralwidget)
self.XLabel.setGeometry(QtCore.QRect(20, 340, 21, 21))
self.XLabel.setObjectName("XLabel")
Expand All @@ -73,31 +60,30 @@ def setupUi(self, MainWindow):
self.YValue.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
self.YValue.setObjectName("YValue")
self.altdValue = QtWidgets.QLabel(self.centralwidget)
self.altdValue.setGeometry(QtCore.QRect(280, 340, 41, 21))
self.altdValue.setAlignment(QtCore.Qt.AlignCenter)
self.altdValue.setGeometry(QtCore.QRect(460, 340, 41, 21))
self.altdValue.setLayoutDirection(QtCore.Qt.LeftToRight)
self.altdValue.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
self.altdValue.setObjectName("altdValue")
self.rotValue = QtWidgets.QLabel(self.centralwidget)
self.rotValue.setGeometry(QtCore.QRect(430, 340, 41, 21))
self.rotValue.setAlignment(QtCore.Qt.AlignCenter)
self.rotValue.setGeometry(QtCore.QRect(590, 340, 41, 21))
self.rotValue.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
self.rotValue.setObjectName("rotValue")

self.resetButton = QtWidgets.QPushButton(self.centralwidget)
self.resetButton.setGeometry(QtCore.QRect(80, 480, 220, 41))
self.resetButton.setGeometry(QtCore.QRect(80, 470, 161, 41))
self.resetButton.setObjectName("resetButton")
self.verticalLayoutWidget_2 = QtWidgets.QWidget(self.centralwidget)
self.verticalLayoutWidget_2.setGeometry(QtCore.QRect(480, 380, 150, 150))
self.verticalLayoutWidget_2.setGeometry(QtCore.QRect(410, 30, 361, 301))
self.verticalLayoutWidget_2.setObjectName("verticalLayoutWidget_2")
self.logoLayout = QtWidgets.QVBoxLayout(self.verticalLayoutWidget_2)
self.logoLayout.setSpacing(0)
self.logoLayout.setObjectName("logoLayout")
self.tlLayout_1 = QtWidgets.QVBoxLayout(self.verticalLayoutWidget_2)
self.tlLayout_1.setObjectName("tlLayout_1")
MainWindow.setCentralWidget(self.centralwidget)

self.retranslateUi(MainWindow)
QtCore.QMetaObject.connectSlotsByName(MainWindow)

def retranslateUi(self, MainWindow):
_translate = QtCore.QCoreApplication.translate
MainWindow.setWindowTitle(_translate("MainWindow", "UAV Viewer"))
MainWindow.setWindowTitle(_translate("MainWindow", "UAV_Viewer"))
self.takeoffButton.setText(_translate("MainWindow", "Take off"))
self.stopButton.setText(_translate("MainWindow", "Stop"))
self.windowsLabel.setText(_translate("MainWindow", "Windows:"))
Expand Down
109 changes: 44 additions & 65 deletions src/tools/uav_viewer_py/gui/ui_gui.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@
<rect>
<x>0</x>
<y>0</y>
<width>660</width>
<height>370</height>
<width>790</width>
<height>550</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>660</width>
<height>370</height>
<width>790</width>
<height>550</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>660</width>
<height>370</height>
<width>790</width>
<height>550</height>
</size>
</property>
<property name="windowTitle">
<string>Introrob_py</string>
<string>UAV_Viewer</string>
</property>
<widget class="QWidget" name="centralwidget">
<widget class="QPushButton" name="takeoffButton">
<property name="geometry">
<rect>
<x>470</x>
<y>30</y>
<x>80</x>
<y>370</y>
<width>161</width>
<height>41</height>
</rect>
Expand All @@ -39,30 +39,11 @@
<string>Take off</string>
</property>
</widget>
<widget class="QSlider" name="altdSlider">
<property name="geometry">
<rect>
<x>400</x>
<y>30</y>
<width>19</width>
<height>311</height>
</rect>
</property>
<property name="maximum">
<number>100</number>
</property>
<property name="value">
<number>49</number>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
<widget class="QPushButton" name="stopButton">
<property name="geometry">
<rect>
<x>470</x>
<y>80</y>
<x>80</x>
<y>420</y>
<width>161</width>
<height>41</height>
</rect>
Expand All @@ -78,8 +59,8 @@
<widget class="QLabel" name="windowsLabel">
<property name="geometry">
<rect>
<x>540</x>
<y>190</y>
<x>280</x>
<y>390</y>
<width>71</width>
<height>21</height>
</rect>
Expand All @@ -91,8 +72,8 @@
<widget class="QCheckBox" name="cameraCheck">
<property name="geometry">
<rect>
<x>540</x>
<y>220</y>
<x>280</x>
<y>420</y>
<width>94</width>
<height>26</height>
</rect>
Expand All @@ -104,8 +85,8 @@
<widget class="QCheckBox" name="sensorsCheck">
<property name="geometry">
<rect>
<x>540</x>
<y>250</y>
<x>280</x>
<y>450</y>
<width>94</width>
<height>26</height>
</rect>
Expand All @@ -117,14 +98,14 @@
<widget class="QLabel" name="altdLabel">
<property name="geometry">
<rect>
<x>390</x>
<x>410</x>
<y>340</y>
<width>51</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Altitude</string>
<string>Altitude:</string>
</property>
</widget>
<widget class="QWidget" name="verticalLayoutWidget">
Expand All @@ -138,33 +119,17 @@
</property>
<layout class="QVBoxLayout" name="tlLayout"/>
</widget>
<widget class="QDial" name="rotationDial">
<property name="geometry">
<rect>
<x>440</x>
<y>220</y>
<width>50</width>
<height>64</height>
</rect>
</property>
<property name="maximum">
<number>100</number>
</property>
<property name="value">
<number>49</number>
</property>
</widget>
<widget class="QLabel" name="rotationLabel">
<property name="geometry">
<rect>
<x>440</x>
<y>280</y>
<x>540</x>
<y>340</y>
<width>65</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Rotation</string>
<string>Rotation:</string>
</property>
</widget>
<widget class="QLabel" name="XLabel">
Expand Down Expand Up @@ -228,24 +193,27 @@
<widget class="QLabel" name="altdValue">
<property name="geometry">
<rect>
<x>390</x>
<y>10</y>
<x>460</x>
<y>340</y>
<width>41</width>
<height>21</height>
</rect>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="rotValue">
<property name="geometry">
<rect>
<x>445</x>
<y>200</y>
<x>590</x>
<y>340</y>
<width>41</width>
<height>21</height>
</rect>
Expand All @@ -254,14 +222,14 @@
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QPushButton" name="resetButton">
<property name="geometry">
<rect>
<x>470</x>
<y>130</y>
<x>80</x>
<y>470</y>
<width>161</width>
<height>41</height>
</rect>
Expand All @@ -270,6 +238,17 @@
<string>Reset</string>
</property>
</widget>
<widget class="QWidget" name="verticalLayoutWidget_2">
<property name="geometry">
<rect>
<x>410</x>
<y>30</y>
<width>361</width>
<height>301</height>
</rect>
</property>
<layout class="QVBoxLayout" name="tlLayout_1"/>
</widget>
</widget>
</widget>
<resources>
Expand Down
Loading