1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-30 15:52:12 +01:00

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
This commit is contained in:
Oleg Semyonov 2013-03-10 00:57:41 +02:00
parent ffbb0a5a8e
commit f1214df633
3 changed files with 4 additions and 21 deletions

View File

@ -38,8 +38,7 @@ HEADERS += configplugin.h \
configrevowidget.h \ configrevowidget.h \
config_global.h \ config_global.h \
mixercurve.h \ mixercurve.h \
dblspindelegate.h \ dblspindelegate.h
configautotunewidget.h
SOURCES += configplugin.cpp \ SOURCES += configplugin.cpp \
configgadgetconfiguration.cpp \ configgadgetconfiguration.cpp \
configgadgetwidget.cpp \ configgadgetwidget.cpp \
@ -72,8 +71,7 @@ SOURCES += configplugin.cpp \
outputchannelform.cpp \ outputchannelform.cpp \
cfg_vehicletypes/vehicleconfig.cpp \ cfg_vehicletypes/vehicleconfig.cpp \
mixercurve.cpp \ mixercurve.cpp \
dblspindelegate.cpp \ dblspindelegate.cpp
configautotunewidget.cpp
FORMS += airframe.ui \ FORMS += airframe.ui \
cc_hw_settings.ui \ cc_hw_settings.ui \
pro_hw_settings.ui \ pro_hw_settings.ui \
@ -90,13 +88,5 @@ FORMS += airframe.ui \
revosensors.ui \ revosensors.ui \
txpid.ui \ txpid.ui \
pipxtreme.ui \ pipxtreme.ui \
mixercurve.ui \ mixercurve.ui
autotune.ui
RESOURCES += configgadget.qrc RESOURCES += configgadget.qrc

View File

@ -32,7 +32,6 @@
#include "configinputwidget.h" #include "configinputwidget.h"
#include "configoutputwidget.h" #include "configoutputwidget.h"
#include "configstabilizationwidget.h" #include "configstabilizationwidget.h"
#include "configautotunewidget.h"
#include "configcamerastabilizationwidget.h" #include "configcamerastabilizationwidget.h"
#include "configtxpidwidget.h" #include "configtxpidwidget.h"
#include "config_pro_hw_widget.h" #include "config_pro_hw_widget.h"
@ -103,12 +102,6 @@ ConfigGadgetWidget::ConfigGadgetWidget(QWidget *parent) : QWidget(parent)
qwd = new ConfigStabilizationWidget(this); qwd = new ConfigStabilizationWidget(this);
ftw->insertTab(ConfigGadgetWidget::stabilization, qwd, *icon, QString("Stabilization")); 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 = new QIcon();
icon->addFile(":/configgadget/images/camstab_normal.png", QSize(), QIcon::Normal, QIcon::Off); icon->addFile(":/configgadget/images/camstab_normal.png", QSize(), QIcon::Normal, QIcon::Off);
icon->addFile(":/configgadget/images/camstab_selected.png", QSize(), QIcon::Selected, QIcon::Off); icon->addFile(":/configgadget/images/camstab_selected.png", QSize(), QIcon::Selected, QIcon::Off);

View File

@ -48,7 +48,7 @@ class ConfigGadgetWidget: public QWidget
public: public:
ConfigGadgetWidget(QWidget *parent = 0); ConfigGadgetWidget(QWidget *parent = 0);
~ConfigGadgetWidget(); ~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(); void startInputWizard();
public slots: public slots: