diff --git a/Server/server_gui.py b/Server/server_gui.py index 79532a6..a163801 100644 --- a/Server/server_gui.py +++ b/Server/server_gui.py @@ -186,10 +186,7 @@ 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(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.formLayout_4.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.flip_button) self.verticalLayout.addLayout(self.formLayout_4) self.line_4 = QtWidgets.QFrame(self.centralwidget) self.line_4.setFrameShape(QtWidgets.QFrame.HLine) @@ -381,7 +378,6 @@ 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")) diff --git a/Server/server_gui.ui b/Server/server_gui.ui index d193528..f6c70c1 100644 --- a/Server/server_gui.ui +++ b/Server/server_gui.ui @@ -367,20 +367,13 @@ - + Flip - - - - Fly to point - - - diff --git a/Server/server_qt.py b/Server/server_qt.py index cef05e1..6627a74 100644 --- a/Server/server_qt.py +++ b/Server/server_qt.py @@ -112,10 +112,6 @@ class MainWindow(QtWidgets.QMainWindow): self.init_model() - # self.statusBar = QStatusBar() - # self.setStatusBar(self.statusBar) - # self.statusBar.showMessage("Hey", 2000) - self.register_callbacks() self.player = QtMultimedia.QMediaPlayer()