From d4d51231b3d8b8227627e2a1b40053603444202e Mon Sep 17 00:00:00 2001
From: Arthur Golubtsov <goldartt@gmail.com>
Date: Sun, 31 May 2020 09:23:08 +0300
Subject: [PATCH] Server: Update UI to implement fly to point button and send
 animation action

---
 Server/server_gui.py | 45 ++++++++++++++++-----------
 Server/server_gui.ui | 72 ++++++++++++++++++++++++++------------------
 2 files changed, 70 insertions(+), 47 deletions(-)

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 @@
     <x>0</x>
     <y>0</y>
     <width>1360</width>
-    <height>816</height>
+    <height>869</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -71,7 +71,7 @@
         <item>
          <layout class="QFormLayout" name="formLayout">
           <property name="labelAlignment">
-           <set>Qt::AlignHCenter|Qt::AlignTop</set>
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
           </property>
           <property name="formAlignment">
            <set>Qt::AlignHCenter|Qt::AlignTop</set>
@@ -85,7 +85,7 @@
              <string>  Start after</string>
             </property>
             <property name="alignment">
-             <set>Qt::AlignCenter</set>
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
             </property>
            </widget>
           </item>
@@ -96,16 +96,6 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="music_text">
-            <property name="layoutDirection">
-             <enum>Qt::RightToLeft</enum>
-            </property>
-            <property name="text">
-             <string>  Music after</string>
-            </property>
-           </widget>
-          </item>
           <item row="1" column="1">
            <widget class="QDoubleSpinBox" name="music_delay_spin">
             <property name="suffix">
@@ -119,16 +109,6 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="music_play_text">
-            <property name="layoutDirection">
-             <enum>Qt::RightToLeft</enum>
-            </property>
-            <property name="text">
-             <string>  Play music</string>
-            </property>
-           </widget>
-          </item>
           <item row="2" column="1">
            <widget class="QCheckBox" name="music_checkbox">
             <property name="sizePolicy">
@@ -157,6 +137,26 @@
             </property>
            </widget>
           </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="music_text">
+            <property name="layoutDirection">
+             <enum>Qt::RightToLeft</enum>
+            </property>
+            <property name="text">
+             <string>  Music after</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="music_play_text">
+            <property name="layoutDirection">
+             <enum>Qt::RightToLeft</enum>
+            </property>
+            <property name="text">
+             <string>  Play music</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>
         <item>
@@ -367,13 +367,20 @@
             </item>
            </layout>
           </item>
-          <item row="3" column="1">
+          <item row="4" column="1">
            <widget class="QPushButton" name="flip_button">
             <property name="text">
              <string>Flip</string>
             </property>
            </widget>
           </item>
+          <item row="3" column="1">
+           <widget class="QPushButton" name="fly_button">
+            <property name="text">
+             <string>Fly to point</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>
         <item>
@@ -426,7 +433,7 @@
      <x>0</x>
      <y>0</y>
      <width>1360</width>
-     <height>25</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuOptions">
@@ -470,10 +477,12 @@
       <string>Send</string>
      </property>
      <addaction name="action_send_animations"/>
+     <addaction name="action_send_calibrations"/>
+     <addaction name="separator"/>
+     <addaction name="action_send_aruco_map"/>
+     <addaction name="action_send_animation"/>
      <addaction name="action_send_configurations"/>
      <addaction name="action_send_launch_file"/>
-     <addaction name="action_send_aruco_map"/>
-     <addaction name="action_send_calibrations"/>
      <addaction name="action_send_fcu_parameters"/>
      <addaction name="separator"/>
      <addaction name="action_send_any_file"/>
@@ -538,7 +547,7 @@
   </action>
   <action name="action_send_launch_file">
    <property name="text">
-    <string>Launch files</string>
+    <string>Launch files folder</string>
    </property>
   </action>
   <action name="action_restart_clever">
@@ -639,7 +648,7 @@
   </action>
   <action name="action_send_fcu_parameters">
    <property name="text">
-    <string>FCU parameters</string>
+    <string>FCU parameters file</string>
    </property>
   </action>
   <action name="action_toggle_select">
@@ -707,6 +716,11 @@
     <string>something</string>
    </property>
   </action>
+  <action name="action_send_animation">
+   <property name="text">
+    <string>Animation</string>
+   </property>
+  </action>
  </widget>
  <tabstops>
   <tabstop>start_delay_spin</tabstop>