rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

GCS/empty,map,scope: Updates to gadgets from interface changes.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@380 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
ephy 2010-03-24 19:50:09 +00:00 committed by ephy
parent 0516034897
commit 9c042a35f4
17 changed files with 260 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ground/src/plugins/emptygadget/emptygadget.cpp
View File

@ -1,19 +1,36 @@
/*
* emptygadget.cpp
/**
******************************************************************************
*
* Created on: Mar 11, 2010
* Author: peter
* @file emptygadget.cpp
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief
* @see The GNU Public License (GPL) Version 3
* @defgroup emptygadget
* @{
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "emptygadget.h"
#include "emptygadgetwidget.h"
#include <QtGui/QToolBar>
EmptyGadget::EmptyGadget(EmptyGadgetWidget *widget) :
IUAVGadget(widget),
m_widget(widget),
m_toolbar(new QToolBar())
EmptyGadget::EmptyGadget(QString classId, QList<IUAVGadgetConfiguration*> *configurations, EmptyGadgetWidget *widget) :
IUAVGadget(classId, configurations, widget),
m_widget(widget)
{
m_gadgetKind = QString("EmptyGadget");
}
EmptyGadget::~EmptyGadget()

33
ground/src/plugins/emptygadget/emptygadget.h
View File

@ -1,8 +1,28 @@
/*
* emptygadget.h
/**
******************************************************************************
*
* Created on: Mar 11, 2010
* Author: peter
* @file emptygadget.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief
* @see The GNU Public License (GPL) Version 3
* @defgroup emptygadget
* @{
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef EMPTYGADGET_H_
@ -11,7 +31,6 @@
#include <coreplugin/iuavgadget.h>
class IUAVGadget;
//class QList<int>;
class QWidget;
class QString;
class EmptyGadgetWidget;
@ -22,17 +41,15 @@ class EmptyGadget : public Core::IUAVGadget
{
Q_OBJECT
public:
EmptyGadget(EmptyGadgetWidget *widget = 0);
EmptyGadget(QString classId, QList<IUAVGadgetConfiguration*> *configurations, EmptyGadgetWidget *widget = 0);
~EmptyGadget();
QList<int> context() const { return m_context; }
QWidget *widget() { return m_widget; }
QString contextHelpId() const { return QString(); }
QWidget *toolBar() { return m_toolbar; }
private:
QWidget *m_widget;
QWidget *m_toolbar;
QList<int> m_context;
};

39
ground/src/plugins/emptygadget/emptygadgetfactory.cpp
View File

@ -1,18 +1,39 @@
/*
* emptygadgetfactory.cpp
/**
******************************************************************************
*
* Created on: Mar 11, 2010
* Author: peter
* @file emptygadgetfactory.cpp
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief
* @see The GNU Public License (GPL) Version 3
* @defgroup emptygadget
* @{
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "emptygadgetfactory.h"
#include "emptygadgetwidget.h"
#include "emptygadget.h"
#include <coreplugin/iuavgadget.h>
EmptyGadgetFactory::EmptyGadgetFactory(QObject *parent) : IUAVGadgetFactory(parent)
EmptyGadgetFactory::EmptyGadgetFactory(QObject *parent) :
IUAVGadgetFactory(QString("EmptyGadget"),
tr("Choose Gadget..."),
parent)
{
m_name = tr("Choose gadget...");
m_gadgetKind = QString("EmptyGadget");
}
EmptyGadgetFactory::~EmptyGadgetFactory()
@ -20,7 +41,7 @@ EmptyGadgetFactory::~EmptyGadgetFactory()
}
Core::IUAVGadget* EmptyGadgetFactory::createUAVGadget(QWidget *parent) {
Core::IUAVGadget* EmptyGadgetFactory::createUAVGadget(QList<IUAVGadgetConfiguration*> *configurations, QWidget *parent) {
EmptyGadgetWidget* gadgetWidget = new EmptyGadgetWidget(parent);
return new EmptyGadget(gadgetWidget);
return new EmptyGadget(QString("EmptyGadget"), configurations, gadgetWidget);
}

30
ground/src/plugins/emptygadget/emptygadgetfactory.h
View File

@ -1,8 +1,28 @@
/*
* emptygadgetfactory.h
/**
******************************************************************************
*
* Created on: Mar 6, 2010
* Author: peter
* @file emptygadgetfactory.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief
* @see The GNU Public License (GPL) Version 3
* @defgroup emptygadget
* @{
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef EMPTYGADGETFACTORY_H_
@ -21,7 +41,7 @@ public:
EmptyGadgetFactory(QObject *parent = 0);
~EmptyGadgetFactory();
Core::IUAVGadget *createUAVGadget(QWidget *parent);
Core::IUAVGadget *createUAVGadget(QList<IUAVGadgetConfiguration*> *configurations, QWidget *parent);
};
#endif // EMPTYGADGETFACTORY_H_

28
ground/src/plugins/emptygadget/emptygadgetwidget.cpp
View File

@ -1,8 +1,28 @@
/*
* emptygadgetwidget.cpp
/**
******************************************************************************
*
* Created on: Mar 6, 2010
* Author: peter
* @file emptygadgetwidget.cpp
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief
* @see The GNU Public License (GPL) Version 3
* @defgroup emptygadget
* @{
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "emptygadgetwidget.h"

28
ground/src/plugins/emptygadget/emptygadgetwidget.h
View File

@ -1,8 +1,28 @@
/*
* emptygadgetwidget.h
/**
******************************************************************************
*
* Created on: Mar 6, 2010
* Author: peter
* @file emptygadgetwidget.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief
* @see The GNU Public License (GPL) Version 3
* @defgroup emptygadget
* @{
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef EMPTYGADGETWIDGET_H_

28
ground/src/plugins/emptygadget/emptyplugin.cpp
View File

@ -1,8 +1,28 @@
/*
* emptyplugin.cpp
/**
******************************************************************************
*
* Created on: Mar 6, 2010
* Author: peter
* @file emptyplugin.cpp
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief
* @see The GNU Public License (GPL) Version 3
* @defgroup emptygadget
* @{
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "emptyplugin.h"
#include "emptygadgetfactory.h"

28
ground/src/plugins/emptygadget/emptyplugin.h
View File

@ -1,8 +1,28 @@
/*
* emptyplugin.h
/**
******************************************************************************
*
* Created on: Mar 6, 2010
* Author: peter
* @file emptyplugin.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief
* @see The GNU Public License (GPL) Version 3
* @defgroup emptygadget
* @{
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef EMPTYPLUGIN_H_

12
ground/src/plugins/map/map.pro
View File

@ -1,18 +1,18 @@
TEMPLATE = lib
TARGET = MapGadget
include(../../openpilotgcsplugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../libs/qmapcontrol/qmapcontrol.pri)
HEADERS += mapplugin.h
HEADERS += mapplugin.h \
mapgadgetconfiguration.h
HEADERS += mapgadget.h
HEADERS += mapgadgetwidget.h
HEADERS += mapgadgetfactory.h
SOURCES += mapplugin.cpp
HEADERS += mapgadgetoptionspage.h
SOURCES += mapplugin.cpp \
mapgadgetconfiguration.cpp
SOURCES += mapgadget.cpp
SOURCES += mapgadgetfactory.cpp
SOURCES += mapgadgetwidget.cpp
SOURCES += mapgadgetoptionspage.cpp
OTHER_FILES += MapGadget.pluginspec

9
ground/src/plugins/map/mapgadget.cpp
View File

@ -6,14 +6,11 @@
*/
#include "mapgadget.h"
#include "mapgadgetwidget.h"
#include <QtGui/QToolBar>
MapGadget::MapGadget(MapGadgetWidget *widget) :
IUAVGadget(widget),
m_widget(widget),
m_toolbar(new QToolBar())
MapGadget::MapGadget(QString classId, QList<IUAVGadgetConfiguration*> *configurations, MapGadgetWidget *widget) :
IUAVGadget(classId, configurations, widget),
m_widget(widget)
{
m_gadgetKind = QString("MapGadget");
}
MapGadget::~MapGadget()

4
ground/src/plugins/map/mapgadget.h
View File

@ -22,17 +22,15 @@ class MapGadget : public Core::IUAVGadget
{
Q_OBJECT
public:
MapGadget(MapGadgetWidget *widget = 0);
MapGadget(QString classId, QList<IUAVGadgetConfiguration*> *configurations, MapGadgetWidget *widget = 0);
~MapGadget();
QList<int> context() const { return m_context; }
QWidget *widget() { return m_widget; }
QString contextHelpId() const { return QString(); }
QWidget *toolBar() { return m_toolbar; }
private:
QWidget *m_widget;
QWidget *m_toolbar;
QList<int> m_context;
};

26
ground/src/plugins/map/mapgadgetfactory.cpp
View File

@ -7,12 +7,15 @@
#include "mapgadgetfactory.h"
#include "mapgadgetwidget.h"
#include "mapgadget.h"
#include "mapgadgetconfiguration.h"
#include "mapgadgetoptionspage.h"
#include <coreplugin/iuavgadget.h>
MapGadgetFactory::MapGadgetFactory(QObject *parent) : IUAVGadgetFactory(parent)
MapGadgetFactory::MapGadgetFactory(QObject *parent) :
IUAVGadgetFactory(QString("MapGadget"),
tr("Map Gadget"),
parent)
{
m_name = tr("Map Gadget");
m_gadgetKind = QString("MapGadget");
}
MapGadgetFactory::~MapGadgetFactory()
@ -20,7 +23,20 @@ MapGadgetFactory::~MapGadgetFactory()
}
Core::IUAVGadget* MapGadgetFactory::createUAVGadget(QWidget *parent) {
Core::IUAVGadget* MapGadgetFactory::createUAVGadget(QList<IUAVGadgetConfiguration*> *configurations, QWidget *parent) {
MapGadgetWidget* gadgetWidget = new MapGadgetWidget(parent);
return new MapGadget(gadgetWidget);
return new MapGadget(QString("MapGadget"), configurations, gadgetWidget);
}
IUAVGadgetConfiguration *MapGadgetFactory::createUAVGadgetConfiguration(bool locked,
const QString configName,
const QByteArray &state)
{
return new MapGadgetConfiguration(locked, QString("MapGadget"), configName, state);
}
UAVGadgetOptionsPage *MapGadgetFactory::createUAVGadgetOptionsPage(IUAVGadgetConfiguration *config)
{
return new MapGadgetOptionsPage(config);
}

11
ground/src/plugins/map/mapgadgetfactory.h
View File

@ -10,9 +10,12 @@
#include <coreplugin/iuavgadgetfactory.h>
using namespace Core;
namespace Core {
class IUAVGadget;
class IUAVGadgetFactory;
}
using namespace Core;
class MapGadgetFactory : public Core::IUAVGadgetFactory
{
@ -21,7 +24,11 @@ public:
MapGadgetFactory(QObject *parent = 0);
~MapGadgetFactory();
Core::IUAVGadget *createUAVGadget(QWidget *parent);
Core::IUAVGadget *createUAVGadget(QList<IUAVGadgetConfiguration*> *configurations, QWidget *parent);
IUAVGadgetConfiguration *createUAVGadgetConfiguration(bool locked,
const QString configName,
const QByteArray &state);
UAVGadgetOptionsPage *createUAVGadgetOptionsPage(IUAVGadgetConfiguration *config);
};
#endif // MAPGADGETFACTORY_H_

9
ground/src/plugins/scope/scopegadget.cpp
View File

@ -6,14 +6,11 @@
*/
#include "scopegadget.h"
#include "scopegadgetwidget.h"
#include <QtGui/QToolBar>
ScopeGadget::ScopeGadget(ScopeGadgetWidget *widget) :
IUAVGadget(widget),
m_widget(widget),
m_toolbar(new QToolBar())
ScopeGadget::ScopeGadget(QString classId, QList<IUAVGadgetConfiguration*> *configurations, ScopeGadgetWidget *widget) :
IUAVGadget(classId, configurations, widget),
m_widget(widget)
{
m_gadgetKind = QString("ScopeGadget");
}
ScopeGadget::~ScopeGadget()

4
ground/src/plugins/scope/scopegadget.h
View File

@ -22,17 +22,15 @@ class ScopeGadget : public Core::IUAVGadget
{
Q_OBJECT
public:
ScopeGadget(ScopeGadgetWidget *widget = 0);
ScopeGadget(QString classId, QList<IUAVGadgetConfiguration*> *configurations, ScopeGadgetWidget *widget = 0);
~ScopeGadget();
QList<int> context() const { return m_context; }
QWidget *widget() { return m_widget; }
QString contextHelpId() const { return QString(); }
QWidget *toolBar() { return m_toolbar; }
private:
QWidget *m_widget;
QWidget *m_toolbar;
QList<int> m_context;
};

11
ground/src/plugins/scope/scopegadgetfactory.cpp
View File

@ -9,10 +9,11 @@
#include "scopegadget.h"
#include <coreplugin/iuavgadget.h>
ScopeGadgetFactory::ScopeGadgetFactory(QObject *parent) : IUAVGadgetFactory(parent)
ScopeGadgetFactory::ScopeGadgetFactory(QObject *parent) :
IUAVGadgetFactory(QString("ScopeGadget"),
tr("Scope Gadget"),
parent)
{
m_name = tr("Scope Gadget");
m_gadgetKind = QString("ScopeGadget");
}
ScopeGadgetFactory::~ScopeGadgetFactory()
@ -20,7 +21,7 @@ ScopeGadgetFactory::~ScopeGadgetFactory()
}
Core::IUAVGadget* ScopeGadgetFactory::createUAVGadget(QWidget *parent) {
Core::IUAVGadget* ScopeGadgetFactory::createUAVGadget(QList<IUAVGadgetConfiguration*> *configurations, QWidget *parent) {
ScopeGadgetWidget* gadgetWidget = new ScopeGadgetWidget(parent);
return new ScopeGadget(gadgetWidget);
return new ScopeGadget(QString("ScopeGadget"), configurations, gadgetWidget);
}

2
ground/src/plugins/scope/scopegadgetfactory.h
View File

@ -21,7 +21,7 @@ public:
ScopeGadgetFactory(QObject *parent = 0);
~ScopeGadgetFactory();
Core::IUAVGadget *createUAVGadget(QWidget *parent);
Core::IUAVGadget *createUAVGadget(QList<IUAVGadgetConfiguration*> *configurations, QWidget *parent);
};
#endif // SCOPEGADGETFACTORY_H_