From f1214df633d8cbd19ddf42036541ea27fdf722d0 Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Sun, 10 Mar 2013 00:57:41 +0200 Subject: [PATCH] OP-792: Remove unused yet GUI in addition to flight modes This reverts commit 0e9d7137ff671ee9ec44f59914ba1d695a4139b0. Conflicts: ground/openpilotgcs/src/plugins/config/configgadgetwidget.h OP-792 #comment Now this feature is removed from GUI too --- .../openpilotgcs/src/plugins/config/config.pro | 16 +++------------- .../src/plugins/config/configgadgetwidget.cpp | 7 ------- .../src/plugins/config/configgadgetwidget.h | 2 +- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/config.pro b/ground/openpilotgcs/src/plugins/config/config.pro index 0bb6cdbcc..af6f3e1ed 100644 --- a/ground/openpilotgcs/src/plugins/config/config.pro +++ b/ground/openpilotgcs/src/plugins/config/config.pro @@ -38,8 +38,7 @@ HEADERS += configplugin.h \ configrevowidget.h \ config_global.h \ mixercurve.h \ - dblspindelegate.h \ - configautotunewidget.h + dblspindelegate.h SOURCES += configplugin.cpp \ configgadgetconfiguration.cpp \ configgadgetwidget.cpp \ @@ -72,8 +71,7 @@ SOURCES += configplugin.cpp \ outputchannelform.cpp \ cfg_vehicletypes/vehicleconfig.cpp \ mixercurve.cpp \ - dblspindelegate.cpp \ - configautotunewidget.cpp + dblspindelegate.cpp FORMS += airframe.ui \ cc_hw_settings.ui \ pro_hw_settings.ui \ @@ -90,13 +88,5 @@ FORMS += airframe.ui \ revosensors.ui \ txpid.ui \ pipxtreme.ui \ - mixercurve.ui \ - autotune.ui + mixercurve.ui RESOURCES += configgadget.qrc - - - - - - - diff --git a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp index 6aea1ce17..ad2b9ed8a 100644 --- a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp @@ -32,7 +32,6 @@ #include "configinputwidget.h" #include "configoutputwidget.h" #include "configstabilizationwidget.h" -#include "configautotunewidget.h" #include "configcamerastabilizationwidget.h" #include "configtxpidwidget.h" #include "config_pro_hw_widget.h" @@ -103,12 +102,6 @@ ConfigGadgetWidget::ConfigGadgetWidget(QWidget *parent) : QWidget(parent) qwd = new ConfigStabilizationWidget(this); ftw->insertTab(ConfigGadgetWidget::stabilization, qwd, *icon, QString("Stabilization")); - icon = new QIcon(); - icon->addFile(":/configgadget/images/autotune_normal.png", QSize(), QIcon::Normal, QIcon::Off); - icon->addFile(":/configgadget/images/autotune_selected.png", QSize(), QIcon::Selected, QIcon::Off); - qwd = new ConfigAutotuneWidget(this); - ftw->insertTab(ConfigGadgetWidget::autotune, qwd, *icon, QString("Autotune")); - icon = new QIcon(); icon->addFile(":/configgadget/images/camstab_normal.png", QSize(), QIcon::Normal, QIcon::Off); icon->addFile(":/configgadget/images/camstab_selected.png", QSize(), QIcon::Selected, QIcon::Off); diff --git a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.h b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.h index 304c557b4..24209e1cf 100644 --- a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.h +++ b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.h @@ -48,7 +48,7 @@ class ConfigGadgetWidget: public QWidget public: ConfigGadgetWidget(QWidget *parent = 0); ~ConfigGadgetWidget(); - enum widgetTabs {hardware=0, aircraft, input, output, sensors, stabilization, camerastabilization, txpid, oplink, autotune}; + enum widgetTabs {hardware=0, aircraft, input, output, sensors, stabilization, camerastabilization, txpid, oplink}; void startInputWizard(); public slots: