diff --git a/Server/server_gui.py b/Server/server_gui.py
index 448c60a..79532a6 100644
--- a/Server/server_gui.py
+++ b/Server/server_gui.py
@@ -13,7 +13,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_MainWindow(object):
def setupUi(self, MainWindow):
MainWindow.setObjectName("MainWindow")
- MainWindow.resize(1360, 816)
+ MainWindow.resize(1360, 869)
self.centralwidget = QtWidgets.QWidget(MainWindow)
self.centralwidget.setEnabled(True)
self.centralwidget.setObjectName("centralwidget")
@@ -44,30 +44,22 @@ class Ui_MainWindow(object):
self.verticalLayout.setSizeConstraint(QtWidgets.QLayout.SetMaximumSize)
self.verticalLayout.setObjectName("verticalLayout")
self.formLayout = QtWidgets.QFormLayout()
- self.formLayout.setLabelAlignment(QtCore.Qt.AlignHCenter|QtCore.Qt.AlignTop)
+ self.formLayout.setLabelAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
self.formLayout.setFormAlignment(QtCore.Qt.AlignHCenter|QtCore.Qt.AlignTop)
self.formLayout.setObjectName("formLayout")
self.start_text = QtWidgets.QLabel(self.centralwidget)
self.start_text.setLayoutDirection(QtCore.Qt.RightToLeft)
- self.start_text.setAlignment(QtCore.Qt.AlignCenter)
+ self.start_text.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
self.start_text.setObjectName("start_text")
self.formLayout.setWidget(0, 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(0, QtWidgets.QFormLayout.FieldRole, self.start_delay_spin)
- self.music_text = QtWidgets.QLabel(self.centralwidget)
- self.music_text.setLayoutDirection(QtCore.Qt.RightToLeft)
- self.music_text.setObjectName("music_text")
- self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.music_text)
self.music_delay_spin = QtWidgets.QDoubleSpinBox(self.centralwidget)
self.music_delay_spin.setDecimals(1)
self.music_delay_spin.setMaximum(1000.0)
self.music_delay_spin.setObjectName("music_delay_spin")
self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.music_delay_spin)
- self.music_play_text = QtWidgets.QLabel(self.centralwidget)
- self.music_play_text.setLayoutDirection(QtCore.Qt.RightToLeft)
- self.music_play_text.setObjectName("music_play_text")
- self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.music_play_text)
self.music_checkbox = QtWidgets.QCheckBox(self.centralwidget)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
@@ -82,6 +74,14 @@ class Ui_MainWindow(object):
self.music_checkbox.setChecked(False)
self.music_checkbox.setObjectName("music_checkbox")
self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.music_checkbox)
+ self.music_text = QtWidgets.QLabel(self.centralwidget)
+ self.music_text.setLayoutDirection(QtCore.Qt.RightToLeft)
+ self.music_text.setObjectName("music_text")
+ self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.music_text)
+ self.music_play_text = QtWidgets.QLabel(self.centralwidget)
+ self.music_play_text.setLayoutDirection(QtCore.Qt.RightToLeft)
+ self.music_play_text.setObjectName("music_play_text")
+ self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.music_play_text)
self.verticalLayout.addLayout(self.formLayout)
self.line = QtWidgets.QFrame(self.centralwidget)
self.line.setFrameShape(QtWidgets.QFrame.HLine)
@@ -186,7 +186,10 @@ class Ui_MainWindow(object):
self.formLayout_4.setLayout(2, QtWidgets.QFormLayout.FieldRole, self.horizontalLayout_2)
self.flip_button = QtWidgets.QPushButton(self.centralwidget)
self.flip_button.setObjectName("flip_button")
- self.formLayout_4.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.flip_button)
+ self.formLayout_4.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.flip_button)
+ self.fly_button = QtWidgets.QPushButton(self.centralwidget)
+ self.fly_button.setObjectName("fly_button")
+ self.formLayout_4.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.fly_button)
self.verticalLayout.addLayout(self.formLayout_4)
self.line_4 = QtWidgets.QFrame(self.centralwidget)
self.line_4.setFrameShape(QtWidgets.QFrame.HLine)
@@ -212,7 +215,7 @@ class Ui_MainWindow(object):
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, 1360, 25))
+ self.menubar.setGeometry(QtCore.QRect(0, 0, 1360, 22))
self.menubar.setObjectName("menubar")
self.menuOptions = QtWidgets.QMenu(self.menubar)
self.menuOptions.setObjectName("menuOptions")
@@ -301,6 +304,8 @@ class Ui_MainWindow(object):
self.action_configure_columns.setObjectName("action_configure_columns")
self.actionSomething = QtWidgets.QAction(MainWindow)
self.actionSomething.setObjectName("actionSomething")
+ self.action_send_animation = QtWidgets.QAction(MainWindow)
+ self.action_send_animation.setObjectName("action_send_animation")
self.menuMusic_2.addAction(self.action_select_music_file)
self.menuMusic_2.addAction(self.action_play_music)
self.menuMusic_2.addAction(self.action_stop_music)
@@ -319,10 +324,12 @@ class Ui_MainWindow(object):
self.menuTable.addSeparator()
self.menuTable.addAction(self.action_configure_columns)
self.menuSend.addAction(self.action_send_animations)
+ self.menuSend.addAction(self.action_send_calibrations)
+ self.menuSend.addSeparator()
+ self.menuSend.addAction(self.action_send_aruco_map)
+ self.menuSend.addAction(self.action_send_animation)
self.menuSend.addAction(self.action_send_configurations)
self.menuSend.addAction(self.action_send_launch_file)
- self.menuSend.addAction(self.action_send_aruco_map)
- self.menuSend.addAction(self.action_send_calibrations)
self.menuSend.addAction(self.action_send_fcu_parameters)
self.menuSend.addSeparator()
self.menuSend.addAction(self.action_send_any_file)
@@ -357,8 +364,8 @@ class Ui_MainWindow(object):
MainWindow.setWindowTitle(_translate("MainWindow", "Clever Drone Show"))
self.start_text.setText(_translate("MainWindow", " Start after"))
self.start_delay_spin.setSuffix(_translate("MainWindow", " s"))
- self.music_text.setText(_translate("MainWindow", " Music after"))
self.music_delay_spin.setSuffix(_translate("MainWindow", " s"))
+ self.music_text.setText(_translate("MainWindow", " Music after"))
self.music_play_text.setText(_translate("MainWindow", " Play music"))
self.check_button.setText(_translate("MainWindow", "Preflight check"))
self.start_button.setText(_translate("MainWindow", "Start animation"))
@@ -374,6 +381,7 @@ class Ui_MainWindow(object):
self.z_checkbox.setText(_translate("MainWindow", " Z ="))
self.z_spin.setSuffix(_translate("MainWindow", " m"))
self.flip_button.setText(_translate("MainWindow", "Flip"))
+ self.fly_button.setText(_translate("MainWindow", "Fly to point"))
self.reboot_fcu.setText(_translate("MainWindow", "Reboot FCU"))
self.calibrate_gyro.setText(_translate("MainWindow", "Calibrate gyro"))
self.calibrate_level.setText(_translate("MainWindow", "Calibrate level"))
@@ -389,7 +397,7 @@ class Ui_MainWindow(object):
self.action_send_aruco_map.setText(_translate("MainWindow", "Aruco map"))
self.action_update_client_repo.setText(_translate("MainWindow", "Update clever-show git"))
self.actionSend_launch_file_for_clever.setText(_translate("MainWindow", "Send launch file for clever"))
- self.action_send_launch_file.setText(_translate("MainWindow", "Launch files"))
+ self.action_send_launch_file.setText(_translate("MainWindow", "Launch files folder"))
self.action_restart_clever.setText(_translate("MainWindow", "clever"))
self.action_restart_clever_show.setText(_translate("MainWindow", "clever-show"))
self.action_select_all_rows.setText(_translate("MainWindow", "Select all drones"))
@@ -410,7 +418,7 @@ class Ui_MainWindow(object):
self.action_send_calibrations.setText(_translate("MainWindow", "Camera calibrations"))
self.action_reboot_all.setText(_translate("MainWindow", "Reboot"))
self.action_restart_chrony.setText(_translate("MainWindow", "chrony"))
- self.action_send_fcu_parameters.setText(_translate("MainWindow", "FCU parameters"))
+ self.action_send_fcu_parameters.setText(_translate("MainWindow", "FCU parameters file"))
self.action_toggle_select.setText(_translate("MainWindow", "Toggle select"))
self.action_toggle_select.setShortcut(_translate("MainWindow", "Ctrl+A"))
self.action_select_all.setText(_translate("MainWindow", "Select all"))
@@ -424,3 +432,4 @@ class Ui_MainWindow(object):
self.action_restart_server.setText(_translate("MainWindow", "Restart server"))
self.action_configure_columns.setText(_translate("MainWindow", "Configure columns"))
self.actionSomething.setText(_translate("MainWindow", "something"))
+ self.action_send_animation.setText(_translate("MainWindow", "Animation"))
diff --git a/Server/server_gui.ui b/Server/server_gui.ui
index e00e6f4..d193528 100644
--- a/Server/server_gui.ui
+++ b/Server/server_gui.ui
@@ -7,7 +7,7 @@
0
0
1360
- 816
+ 869
@@ -71,7 +71,7 @@
-
- Qt::AlignHCenter|Qt::AlignTop
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
Qt::AlignHCenter|Qt::AlignTop
@@ -85,7 +85,7 @@
Start after
- Qt::AlignCenter
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
@@ -96,16 +96,6 @@
- -
-
-
- Qt::RightToLeft
-
-
- Music after
-
-
-
-
@@ -119,16 +109,6 @@
- -
-
-
- Qt::RightToLeft
-
-
- Play music
-
-
-
-
@@ -157,6 +137,26 @@
+ -
+
+
+ Qt::RightToLeft
+
+
+ Music after
+
+
+
+ -
+
+
+ Qt::RightToLeft
+
+
+ Play music
+
+
+
-
@@ -367,13 +367,20 @@
- -
+
-
Flip
+ -
+
+
+ Fly to point
+
+
+
-
@@ -426,7 +433,7 @@
0
0
1360
- 25
+ 22
start_delay_spin