From d642b4a0121392b76d3b8f05faf8bbee2849e02b Mon Sep 17 00:00:00 2001 From: ephy Date: Fri, 26 Mar 2010 21:04:41 +0000 Subject: [PATCH] GCS/empty,map,scope: Cleanup of uav gadget interface. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@394 ebee16cc-31ac-478f-84a7-5cbb03baadba --- ground/src/plugins/emptygadget/emptygadget.cpp | 4 ++-- ground/src/plugins/emptygadget/emptygadget.h | 8 +++++--- ground/src/plugins/emptygadget/emptygadgetfactory.cpp | 6 +++--- ground/src/plugins/emptygadget/emptygadgetfactory.h | 9 ++++++--- ground/src/plugins/map/mapgadget.cpp | 6 ++---- ground/src/plugins/map/mapgadget.h | 7 ++----- ground/src/plugins/map/mapgadgetfactory.cpp | 10 ++++------ ground/src/plugins/map/mapgadgetfactory.h | 2 +- ground/src/plugins/scope/scopegadget.cpp | 4 ++-- ground/src/plugins/scope/scopegadget.h | 2 +- ground/src/plugins/scope/scopegadgetfactory.cpp | 6 +++--- ground/src/plugins/scope/scopegadgetfactory.h | 9 ++++++--- 12 files changed, 37 insertions(+), 36 deletions(-) diff --git a/ground/src/plugins/emptygadget/emptygadget.cpp b/ground/src/plugins/emptygadget/emptygadget.cpp index e48b624a6..7278024bc 100644 --- a/ground/src/plugins/emptygadget/emptygadget.cpp +++ b/ground/src/plugins/emptygadget/emptygadget.cpp @@ -27,8 +27,8 @@ #include "emptygadget.h" #include "emptygadgetwidget.h" -EmptyGadget::EmptyGadget(QString classId, QList *configurations, EmptyGadgetWidget *widget) : - IUAVGadget(classId, configurations, widget), +EmptyGadget::EmptyGadget(QString classId, EmptyGadgetWidget *widget, QWidget *parent) : + IUAVGadget(classId, parent), m_widget(widget) { } diff --git a/ground/src/plugins/emptygadget/emptygadget.h b/ground/src/plugins/emptygadget/emptygadget.h index 08b2cf14a..7c620d527 100644 --- a/ground/src/plugins/emptygadget/emptygadget.h +++ b/ground/src/plugins/emptygadget/emptygadget.h @@ -30,9 +30,11 @@ #include +namespace Core { class IUAVGadget; -class QWidget; -class QString; +} +//class QWidget; +//class QString; class EmptyGadgetWidget; using namespace Core; @@ -41,7 +43,7 @@ class EmptyGadget : public Core::IUAVGadget { Q_OBJECT public: - EmptyGadget(QString classId, QList *configurations, EmptyGadgetWidget *widget = 0); + EmptyGadget(QString classId, EmptyGadgetWidget *widget, QWidget *parent = 0); ~EmptyGadget(); QList context() const { return m_context; } diff --git a/ground/src/plugins/emptygadget/emptygadgetfactory.cpp b/ground/src/plugins/emptygadget/emptygadgetfactory.cpp index 9f96f2a30..1206509e9 100644 --- a/ground/src/plugins/emptygadget/emptygadgetfactory.cpp +++ b/ground/src/plugins/emptygadget/emptygadgetfactory.cpp @@ -41,7 +41,7 @@ EmptyGadgetFactory::~EmptyGadgetFactory() } -Core::IUAVGadget* EmptyGadgetFactory::createGadget(QList *configurations, QWidget *parent) { - EmptyGadgetWidget* gadgetWidget = new EmptyGadgetWidget(parent); - return new EmptyGadget(QString("EmptyGadget"), configurations, gadgetWidget); +IUAVGadget* EmptyGadgetFactory::createGadget(QWidget *parent) { + EmptyGadgetWidget* gadgetWidget = new EmptyGadgetWidget(parent); + return new EmptyGadget(QString("EmptyGadget"), gadgetWidget, parent); } diff --git a/ground/src/plugins/emptygadget/emptygadgetfactory.h b/ground/src/plugins/emptygadget/emptygadgetfactory.h index d652e3cc7..93451a6f4 100644 --- a/ground/src/plugins/emptygadget/emptygadgetfactory.h +++ b/ground/src/plugins/emptygadget/emptygadgetfactory.h @@ -30,18 +30,21 @@ #include -using namespace Core; +namespace Core { class IUAVGadget; class IUAVGadgetFactory; +} -class EmptyGadgetFactory : public Core::IUAVGadgetFactory +using namespace Core; + +class EmptyGadgetFactory : public IUAVGadgetFactory { Q_OBJECT public: EmptyGadgetFactory(QObject *parent = 0); ~EmptyGadgetFactory(); - Core::IUAVGadget *createGadget(QList *configurations, QWidget *parent); + IUAVGadget *createGadget(QWidget *parent); }; #endif // EMPTYGADGETFACTORY_H_ diff --git a/ground/src/plugins/map/mapgadget.cpp b/ground/src/plugins/map/mapgadget.cpp index 4d11746e1..2ee7d1911 100644 --- a/ground/src/plugins/map/mapgadget.cpp +++ b/ground/src/plugins/map/mapgadget.cpp @@ -28,8 +28,8 @@ #include "mapgadgetwidget.h" #include "mapgadgetconfiguration.h" -MapGadget::MapGadget(QString classId, QList *configurations, MapGadgetWidget *widget) : - IUAVGadget(classId, configurations, widget), +MapGadget::MapGadget(QString classId, MapGadgetWidget *widget, QWidget *parent) : + IUAVGadget(classId, parent), m_widget(widget) { } @@ -41,8 +41,6 @@ MapGadget::~MapGadget() void MapGadget::loadConfiguration(IUAVGadgetConfiguration* config) { - setActiveConfiguration(config); - MapGadgetConfiguration *m = qobject_cast(config); m_widget->setZoom(m->zoom()); m_widget->setPosition(QPointF(m->longitude(), m->latitude())); diff --git a/ground/src/plugins/map/mapgadget.h b/ground/src/plugins/map/mapgadget.h index 8f372af77..eedaec42b 100644 --- a/ground/src/plugins/map/mapgadget.h +++ b/ground/src/plugins/map/mapgadget.h @@ -43,17 +43,14 @@ class MapGadget : public Core::IUAVGadget { Q_OBJECT public: - MapGadget(QString classId, QList *configurations, MapGadgetWidget *widget = 0); + MapGadget(QString classId, MapGadgetWidget *widget, QWidget *parent = 0); ~MapGadget(); - QList context() const { return m_context; } QWidget *widget() { return m_widget; } - QString contextHelpId() const { return QString(); } void loadConfiguration(IUAVGadgetConfiguration* config); private: - MapGadgetWidget *m_widget; - QList m_context; + MapGadgetWidget *m_widget; }; diff --git a/ground/src/plugins/map/mapgadgetfactory.cpp b/ground/src/plugins/map/mapgadgetfactory.cpp index 695216bef..2ec3e510d 100644 --- a/ground/src/plugins/map/mapgadgetfactory.cpp +++ b/ground/src/plugins/map/mapgadgetfactory.cpp @@ -29,7 +29,6 @@ #include "mapgadget.h" #include "mapgadgetconfiguration.h" #include "mapgadgetoptionspage.h" -#include #include MapGadgetFactory::MapGadgetFactory(QObject *parent) : @@ -41,10 +40,10 @@ MapGadgetFactory::~MapGadgetFactory() { } -Core::IUAVGadget* MapGadgetFactory::createGadget(QList *configurations, QWidget *parent) +Core::IUAVGadget* MapGadgetFactory::createGadget(QWidget *parent) { - MapGadgetWidget* gadgetWidget = new MapGadgetWidget(parent); - return new MapGadget(QString("MapGadget"), configurations, gadgetWidget); + MapGadgetWidget* gadgetWidget = new MapGadgetWidget(parent); + return new MapGadget(QString("MapGadget"), gadgetWidget, parent); } IUAVGadgetConfiguration *MapGadgetFactory::createConfiguration(bool locked, @@ -56,7 +55,6 @@ IUAVGadgetConfiguration *MapGadgetFactory::createConfiguration(bool locked, IOptionsPage *MapGadgetFactory::createOptionsPage(IUAVGadgetConfiguration *config) { - MapGadgetOptionsPage *page = new MapGadgetOptionsPage(config); - return new UAVGadgetOptionsPageDecorator(page, config); + return new MapGadgetOptionsPage(config); } diff --git a/ground/src/plugins/map/mapgadgetfactory.h b/ground/src/plugins/map/mapgadgetfactory.h index 0fce3fa15..640dcc5ea 100644 --- a/ground/src/plugins/map/mapgadgetfactory.h +++ b/ground/src/plugins/map/mapgadgetfactory.h @@ -44,7 +44,7 @@ public: MapGadgetFactory(QObject *parent = 0); ~MapGadgetFactory(); - Core::IUAVGadget *createGadget(QList *configurations, QWidget *parent); + Core::IUAVGadget *createGadget(QWidget *parent); IUAVGadgetConfiguration *createConfiguration(bool locked, const QString configName, const QByteArray &state); diff --git a/ground/src/plugins/scope/scopegadget.cpp b/ground/src/plugins/scope/scopegadget.cpp index 5a40558a5..15ff5d870 100644 --- a/ground/src/plugins/scope/scopegadget.cpp +++ b/ground/src/plugins/scope/scopegadget.cpp @@ -7,8 +7,8 @@ #include "scopegadget.h" #include "scopegadgetwidget.h" -ScopeGadget::ScopeGadget(QString classId, QList *configurations, ScopeGadgetWidget *widget) : - IUAVGadget(classId, configurations, widget), +ScopeGadget::ScopeGadget(QString classId, ScopeGadgetWidget *widget, QWidget *parent) : + IUAVGadget(classId, parent), m_widget(widget) { } diff --git a/ground/src/plugins/scope/scopegadget.h b/ground/src/plugins/scope/scopegadget.h index 08509c0b7..c5a15d3aa 100644 --- a/ground/src/plugins/scope/scopegadget.h +++ b/ground/src/plugins/scope/scopegadget.h @@ -22,7 +22,7 @@ class ScopeGadget : public Core::IUAVGadget { Q_OBJECT public: - ScopeGadget(QString classId, QList *configurations, ScopeGadgetWidget *widget = 0); + ScopeGadget(QString classId, ScopeGadgetWidget *widget, QWidget *parent = 0); ~ScopeGadget(); QList context() const { return m_context; } diff --git a/ground/src/plugins/scope/scopegadgetfactory.cpp b/ground/src/plugins/scope/scopegadgetfactory.cpp index b4d3d7814..b093fc380 100644 --- a/ground/src/plugins/scope/scopegadgetfactory.cpp +++ b/ground/src/plugins/scope/scopegadgetfactory.cpp @@ -21,7 +21,7 @@ ScopeGadgetFactory::~ScopeGadgetFactory() } -Core::IUAVGadget* ScopeGadgetFactory::createGadget(QList *configurations, QWidget *parent) { - ScopeGadgetWidget* gadgetWidget = new ScopeGadgetWidget(parent); - return new ScopeGadget(QString("ScopeGadget"), configurations, gadgetWidget); +Core::IUAVGadget* ScopeGadgetFactory::createGadget(QWidget *parent) { + ScopeGadgetWidget* gadgetWidget = new ScopeGadgetWidget(parent); + return new ScopeGadget(QString("ScopeGadget"), gadgetWidget, parent); } diff --git a/ground/src/plugins/scope/scopegadgetfactory.h b/ground/src/plugins/scope/scopegadgetfactory.h index 53bbba91e..a2c1e3e6b 100644 --- a/ground/src/plugins/scope/scopegadgetfactory.h +++ b/ground/src/plugins/scope/scopegadgetfactory.h @@ -10,18 +10,21 @@ #include -using namespace Core; +namespace Core { class IUAVGadget; class IUAVGadgetFactory; +} -class ScopeGadgetFactory : public Core::IUAVGadgetFactory +using namespace Core; + +class ScopeGadgetFactory : public IUAVGadgetFactory { Q_OBJECT public: ScopeGadgetFactory(QObject *parent = 0); ~ScopeGadgetFactory(); - Core::IUAVGadget *createGadget(QList *configurations, QWidget *parent); + IUAVGadget *createGadget(QWidget *parent); }; #endif // SCOPEGADGETFACTORY_H_