diff --git a/Server/convert_ui.sh b/Server/convert_ui.sh
new file mode 100644
index 0000000..4a97bac
--- /dev/null
+++ b/Server/convert_ui.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+python -m PyQt5.uic.pyuic -x server_gui.ui -o server_gui.py
\ No newline at end of file
diff --git a/Server/server_gui.py b/Server/server_gui.py
index 0371724..143a3d1 100644
--- a/Server/server_gui.py
+++ b/Server/server_gui.py
@@ -2,59 +2,83 @@
# Form implementation generated from reading ui file 'server_gui.ui'
#
-# Created by: PyQt5 UI code generator 5.12
+# Created by: PyQt5 UI code generator 5.10.1
#
# WARNING! All changes made in this file will be lost!
from PyQt5 import QtCore, QtGui, QtWidgets
-
class Ui_MainWindow(object):
def setupUi(self, MainWindow):
MainWindow.setObjectName("MainWindow")
- MainWindow.resize(850, 479)
+ MainWindow.resize(1257, 770)
self.centralwidget = QtWidgets.QWidget(MainWindow)
+ self.centralwidget.setEnabled(True)
self.centralwidget.setObjectName("centralwidget")
+ self.gridLayout = QtWidgets.QGridLayout(self.centralwidget)
+ self.gridLayout.setObjectName("gridLayout")
+ self.horizontalLayout = QtWidgets.QHBoxLayout()
+ self.horizontalLayout.setSizeConstraint(QtWidgets.QLayout.SetMaximumSize)
+ self.horizontalLayout.setObjectName("horizontalLayout")
+ self.tableView = QtWidgets.QTableView(self.centralwidget)
+ sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ sizePolicy.setHeightForWidth(self.tableView.sizePolicy().hasHeightForWidth())
+ self.tableView.setSizePolicy(sizePolicy)
+ self.tableView.setObjectName("tableView")
+ self.horizontalLayout.addWidget(self.tableView)
+ self.verticalLayout = QtWidgets.QVBoxLayout()
+ self.verticalLayout.setSizeConstraint(QtWidgets.QLayout.SetMaximumSize)
+ self.verticalLayout.setObjectName("verticalLayout")
+ self.formLayout = QtWidgets.QFormLayout()
+ self.formLayout.setObjectName("formLayout")
self.check_button = QtWidgets.QPushButton(self.centralwidget)
- self.check_button.setEnabled(False)
- self.check_button.setGeometry(QtCore.QRect(680, 20, 150, 40))
+ self.check_button.setEnabled(True)
self.check_button.setObjectName("check_button")
+ self.formLayout.setWidget(1, QtWidgets.QFormLayout.SpanningRole, self.check_button)
+ self.start_text = QtWidgets.QLabel(self.centralwidget)
+ self.start_text.setObjectName("start_text")
+ self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.start_text)
+ self.start_delay_spin = QtWidgets.QSpinBox(self.centralwidget)
+ self.start_delay_spin.setObjectName("start_delay_spin")
+ self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.start_delay_spin)
self.start_button = QtWidgets.QPushButton(self.centralwidget)
self.start_button.setEnabled(True)
- self.start_button.setGeometry(QtCore.QRect(680, 120, 150, 40))
self.start_button.setFlat(False)
self.start_button.setObjectName("start_button")
- self.start_delay_spin = QtWidgets.QSpinBox(self.centralwidget)
- self.start_delay_spin.setGeometry(QtCore.QRect(760, 70, 50, 40))
- self.start_delay_spin.setObjectName("start_delay_spin")
+ self.formLayout.setWidget(3, QtWidgets.QFormLayout.SpanningRole, self.start_button)
self.pause_button = QtWidgets.QPushButton(self.centralwidget)
- self.pause_button.setGeometry(QtCore.QRect(680, 170, 150, 40))
self.pause_button.setObjectName("pause_button")
+ self.formLayout.setWidget(4, QtWidgets.QFormLayout.SpanningRole, self.pause_button)
self.stop_button = QtWidgets.QPushButton(self.centralwidget)
- self.stop_button.setGeometry(QtCore.QRect(680, 220, 150, 40))
self.stop_button.setObjectName("stop_button")
+ self.formLayout.setWidget(5, QtWidgets.QFormLayout.SpanningRole, self.stop_button)
+ self.verticalLayout.addLayout(self.formLayout)
+ self.line = QtWidgets.QFrame(self.centralwidget)
+ self.line.setFrameShape(QtWidgets.QFrame.HLine)
+ self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+ self.line.setObjectName("line")
+ self.verticalLayout.addWidget(self.line)
+ self.formLayout_2 = QtWidgets.QFormLayout()
+ self.formLayout_2.setObjectName("formLayout_2")
self.takeoff_button = QtWidgets.QPushButton(self.centralwidget)
self.takeoff_button.setEnabled(True)
- self.takeoff_button.setGeometry(QtCore.QRect(680, 280, 150, 40))
self.takeoff_button.setObjectName("takeoff_button")
+ self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.SpanningRole, self.takeoff_button)
self.land_button = QtWidgets.QPushButton(self.centralwidget)
- self.land_button.setGeometry(QtCore.QRect(680, 330, 150, 40))
self.land_button.setObjectName("land_button")
+ self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.SpanningRole, self.land_button)
self.disarm_button = QtWidgets.QPushButton(self.centralwidget)
- self.disarm_button.setGeometry(QtCore.QRect(680, 380, 150, 40))
self.disarm_button.setObjectName("disarm_button")
- self.start_text = QtWidgets.QLabel(self.centralwidget)
- self.start_text.setGeometry(QtCore.QRect(680, 70, 71, 40))
- self.start_text.setObjectName("start_text")
- self.secs_text = QtWidgets.QLabel(self.centralwidget)
- self.secs_text.setGeometry(QtCore.QRect(820, 70, 10, 40))
- self.secs_text.setObjectName("secs_text")
- self.tableView = QtWidgets.QTableView(self.centralwidget)
- self.tableView.setGeometry(QtCore.QRect(20, 20, 640, 400))
- self.tableView.setObjectName("tableView")
+ self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.SpanningRole, self.disarm_button)
+ self.verticalLayout.addLayout(self.formLayout_2)
+ self.horizontalLayout.addLayout(self.verticalLayout)
+ self.horizontalLayout.setStretch(0, 1)
+ self.gridLayout.addLayout(self.horizontalLayout, 0, 0, 1, 1)
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(MainWindow)
- self.menubar.setGeometry(QtCore.QRect(0, 0, 850, 25))
+ self.menubar.setGeometry(QtCore.QRect(0, 0, 1257, 39))
self.menubar.setObjectName("menubar")
self.menuOptions = QtWidgets.QMenu(self.menubar)
self.menuOptions.setObjectName("menuOptions")
@@ -74,16 +98,25 @@ class Ui_MainWindow(object):
_translate = QtCore.QCoreApplication.translate
MainWindow.setWindowTitle(_translate("MainWindow", "Clever Drone Animation Player"))
self.check_button.setText(_translate("MainWindow", "Preflight check"))
+ self.start_text.setText(_translate("MainWindow", "Start after"))
+ self.start_delay_spin.setSuffix(_translate("MainWindow", " seconds"))
self.start_button.setText(_translate("MainWindow", "Start animation"))
self.pause_button.setText(_translate("MainWindow", "Pause"))
self.stop_button.setText(_translate("MainWindow", "Stop"))
self.takeoff_button.setText(_translate("MainWindow", "Takeoff"))
self.land_button.setText(_translate("MainWindow", "Land"))
self.disarm_button.setText(_translate("MainWindow", "Disarm"))
- self.start_text.setText(_translate("MainWindow", "Start after"))
- self.secs_text.setText(_translate("MainWindow", "s"))
self.menuOptions.setTitle(_translate("MainWindow", "Actions"))
self.action_send_animations.setText(_translate("MainWindow", "Send Animations"))
self.action_send_configurations.setText(_translate("MainWindow", "Send Configurations"))
+if __name__ == "__main__":
+ import sys
+ app = QtWidgets.QApplication(sys.argv)
+ MainWindow = QtWidgets.QMainWindow()
+ ui = Ui_MainWindow()
+ ui.setupUi(MainWindow)
+ MainWindow.show()
+ sys.exit(app.exec_())
+
diff --git a/Server/server_gui.ui b/Server/server_gui.ui
index b1e4bdc..6060942 100644
--- a/Server/server_gui.ui
+++ b/Server/server_gui.ui
@@ -6,171 +6,141 @@
0
0
- 850
- 479
+ 1257
+ 770
Clever Drone Animation Player
-
-
- false
-
-
-
- 680
- 20
- 150
- 40
-
-
-
- Preflight check
-
-
-
-
- true
-
-
-
- 680
- 120
- 150
- 40
-
-
-
- Start animation
-
-
- false
-
-
-
-
-
- 760
- 70
- 50
- 40
-
-
-
-
-
-
- 680
- 170
- 150
- 40
-
-
-
- Pause
-
-
-
-
-
- 680
- 220
- 150
- 40
-
-
-
- Stop
-
-
-
-
- true
-
-
-
- 680
- 280
- 150
- 40
-
-
-
- Takeoff
-
-
-
-
-
- 680
- 330
- 150
- 40
-
-
-
- Land
-
-
-
-
-
- 680
- 380
- 150
- 40
-
-
-
- Disarm
-
-
-
-
-
- 680
- 70
- 71
- 40
-
-
-
- Start after
-
-
-
-
-
- 820
- 70
- 10
- 40
-
-
-
- s
-
-
-
-
-
- 20
- 20
- 640
- 400
-
-
-
+
+ true
+
+
+ -
+
+
+ QLayout::SetMaximumSize
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+ QLayout::SetMaximumSize
+
+
-
+
+
-
+
+
+ true
+
+
+ Preflight check
+
+
+
+ -
+
+
+ Start after
+
+
+
+ -
+
+
+ seconds
+
+
+
+ -
+
+
+ true
+
+
+ Start animation
+
+
+ false
+
+
+
+ -
+
+
+ Pause
+
+
+
+ -
+
+
+ Stop
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
-
+
+
+ true
+
+
+ Takeoff
+
+
+
+ -
+
+
+ Land
+
+
+
+ -
+
+
+ Disarm
+
+
+
+
+
+
+
+
+
+