mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-21 11:54:15 +01:00
Moved framework to its own plugin
This commit is contained in:
parent
32ebdb63a3
commit
6d6111b9ac
@ -10,5 +10,6 @@
|
|||||||
<dependency name="UAVTalk" version="1.0.0"/>
|
<dependency name="UAVTalk" version="1.0.0"/>
|
||||||
<dependency name="UAVObjectUtil" version="1.0.0"/>
|
<dependency name="UAVObjectUtil" version="1.0.0"/>
|
||||||
<dependency name="UAVSettingsImportExport" version="1.0.0"/>
|
<dependency name="UAVSettingsImportExport" version="1.0.0"/>
|
||||||
|
<dependency name="UAVObjectWidgetUtils" version="1.0.0"/>
|
||||||
</dependencyList>
|
</dependencyList>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
7
ground/openpilotgcs/src/plugins/config/config.pri
Normal file
7
ground/openpilotgcs/src/plugins/config/config.pri
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
#include(config_dependencies.pri)
|
||||||
|
include(../../plugins/uavsettingsimportexport/uavsettingsimportexport.pri)
|
||||||
|
include(../../plugins/uavtalk/uavtalk.pri)
|
||||||
|
# Add the include path to the built-in uavobject include files.
|
||||||
|
INCLUDEPATH += $$PWD
|
||||||
|
|
||||||
|
LIBS *= -l$$qtLibraryName(Config)
|
@ -1,13 +1,8 @@
|
|||||||
TEMPLATE = lib
|
TEMPLATE = lib
|
||||||
TARGET = Config
|
TARGET = Config
|
||||||
|
DEFINES += CONFIG_LIBRARY
|
||||||
QT += svg
|
QT += svg
|
||||||
include(../../openpilotgcsplugin.pri)
|
include(config_dependencies.pri)
|
||||||
include(../../libs/utils/utils.pri)
|
|
||||||
include(../../plugins/uavtalk/uavtalk.pri)
|
|
||||||
include(../../plugins/coreplugin/coreplugin.pri)
|
|
||||||
include(../../plugins/uavobjects/uavobjects.pri)
|
|
||||||
include(../../plugins/uavobjectutil/uavobjectutil.pri)
|
|
||||||
include(../../plugins/uavsettingsimportexport/uavsettingsimportexport.pri)
|
|
||||||
INCLUDEPATH += ../../libs/eigen
|
INCLUDEPATH += ../../libs/eigen
|
||||||
OTHER_FILES += Config.pluginspec
|
OTHER_FILES += Config.pluginspec
|
||||||
HEADERS += configplugin.h \
|
HEADERS += configplugin.h \
|
||||||
@ -19,25 +14,21 @@ HEADERS += configplugin.h \
|
|||||||
fancytabwidget.h \
|
fancytabwidget.h \
|
||||||
configinputwidget.h \
|
configinputwidget.h \
|
||||||
configoutputwidget.h \
|
configoutputwidget.h \
|
||||||
configtaskwidget.h \
|
|
||||||
configairframewidget.h \
|
configairframewidget.h \
|
||||||
config_pro_hw_widget.h \
|
config_pro_hw_widget.h \
|
||||||
config_cc_hw_widget.h \
|
config_cc_hw_widget.h \
|
||||||
configahrswidget.h \
|
configahrswidget.h \
|
||||||
configccattitudewidget.h \
|
configccattitudewidget.h \
|
||||||
mixercurvewidget.h \
|
|
||||||
mixercurvepoint.h \
|
|
||||||
mixercurveline.h \
|
|
||||||
configccpmwidget.h \
|
configccpmwidget.h \
|
||||||
configstabilizationwidget.h \
|
configstabilizationwidget.h \
|
||||||
assertions.h \
|
assertions.h \
|
||||||
calibration.h \
|
calibration.h \
|
||||||
defaultattitudewidget.h \
|
defaultattitudewidget.h \
|
||||||
smartsavebutton.h \
|
|
||||||
defaulthwsettingswidget.h \
|
defaulthwsettingswidget.h \
|
||||||
inputchannelform.h \
|
inputchannelform.h \
|
||||||
configcamerastabilizationwidget.h \
|
configcamerastabilizationwidget.h \
|
||||||
outputchannelform.h
|
outputchannelform.h \
|
||||||
|
config_global.h
|
||||||
SOURCES += configplugin.cpp \
|
SOURCES += configplugin.cpp \
|
||||||
configgadgetconfiguration.cpp \
|
configgadgetconfiguration.cpp \
|
||||||
configgadgetwidget.cpp \
|
configgadgetwidget.cpp \
|
||||||
@ -45,7 +36,6 @@ SOURCES += configplugin.cpp \
|
|||||||
configgadgetoptionspage.cpp \
|
configgadgetoptionspage.cpp \
|
||||||
configgadget.cpp \
|
configgadget.cpp \
|
||||||
fancytabwidget.cpp \
|
fancytabwidget.cpp \
|
||||||
configtaskwidget.cpp \
|
|
||||||
configinputwidget.cpp \
|
configinputwidget.cpp \
|
||||||
configoutputwidget.cpp \
|
configoutputwidget.cpp \
|
||||||
configairframewidget.cpp \
|
configairframewidget.cpp \
|
||||||
@ -53,9 +43,6 @@ SOURCES += configplugin.cpp \
|
|||||||
config_cc_hw_widget.cpp \
|
config_cc_hw_widget.cpp \
|
||||||
configahrswidget.cpp \
|
configahrswidget.cpp \
|
||||||
configccattitudewidget.cpp \
|
configccattitudewidget.cpp \
|
||||||
mixercurvewidget.cpp \
|
|
||||||
mixercurvepoint.cpp \
|
|
||||||
mixercurveline.cpp \
|
|
||||||
configccpmwidget.cpp \
|
configccpmwidget.cpp \
|
||||||
configstabilizationwidget.cpp \
|
configstabilizationwidget.cpp \
|
||||||
twostep.cpp \
|
twostep.cpp \
|
||||||
@ -63,7 +50,6 @@ SOURCES += configplugin.cpp \
|
|||||||
gyro-calibration.cpp \
|
gyro-calibration.cpp \
|
||||||
alignment-calibration.cpp \
|
alignment-calibration.cpp \
|
||||||
defaultattitudewidget.cpp \
|
defaultattitudewidget.cpp \
|
||||||
smartsavebutton.cpp \
|
|
||||||
defaulthwsettingswidget.cpp \
|
defaulthwsettingswidget.cpp \
|
||||||
inputchannelform.cpp \
|
inputchannelform.cpp \
|
||||||
configcamerastabilizationwidget.cpp \
|
configcamerastabilizationwidget.cpp \
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#define CONFIGCCHWWIDGET_H
|
#define CONFIGCCHWWIDGET_H
|
||||||
|
|
||||||
#include "ui_cc_hw_settings.h"
|
#include "ui_cc_hw_settings.h"
|
||||||
#include "configtaskwidget.h"
|
#include "../uavobjectwidgetutils/configtaskwidget.h"
|
||||||
#include "extensionsystem/pluginmanager.h"
|
#include "extensionsystem/pluginmanager.h"
|
||||||
#include "uavobjectmanager.h"
|
#include "uavobjectmanager.h"
|
||||||
#include "uavobject.h"
|
#include "uavobject.h"
|
||||||
|
@ -0,0 +1,8 @@
|
|||||||
|
include(../../openpilotgcsplugin.pri)
|
||||||
|
include(../../libs/utils/utils.pri)
|
||||||
|
include(../../plugins/uavtalk/uavtalk.pri)
|
||||||
|
include(../../plugins/coreplugin/coreplugin.pri)
|
||||||
|
include(../../plugins/uavobjects/uavobjects.pri)
|
||||||
|
include(../../plugins/uavobjectutil/uavobjectutil.pri)
|
||||||
|
include(../../plugins/uavsettingsimportexport/uavsettingsimportexport.pri)
|
||||||
|
include(../../plugins/uavobjectwidgetutils/uavobjectwidgetutils.pri)
|
41
ground/openpilotgcs/src/plugins/config/config_global.h
Normal file
41
ground/openpilotgcs/src/plugins/config/config_global.h
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
/**
|
||||||
|
******************************************************************************
|
||||||
|
*
|
||||||
|
* @file config_global.h
|
||||||
|
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||||
|
* @see The GNU Public License (GPL) Version 3
|
||||||
|
* @addtogroup GCSPlugins GCS Plugins
|
||||||
|
* @{
|
||||||
|
* @addtogroup Congig Plugin
|
||||||
|
* @{
|
||||||
|
* @brief The Congig GCS plugin
|
||||||
|
*****************************************************************************/
|
||||||
|
/*
|
||||||
|
* 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 CONFIG_GLOBAL_H
|
||||||
|
#define CONFIG_GLOBAL_H
|
||||||
|
|
||||||
|
#include <QtCore/qglobal.h>
|
||||||
|
|
||||||
|
#if defined(CONFIG_LIBRARY)
|
||||||
|
# define CONFIG_EXPORT Q_DECL_EXPORT
|
||||||
|
#else
|
||||||
|
# define CONFIG_EXPORT Q_DECL_IMPORT
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#endif // CONFIG_GLOBAL_H
|
@ -28,7 +28,7 @@
|
|||||||
#define CONFIGPROHWWIDGET_H
|
#define CONFIGPROHWWIDGET_H
|
||||||
|
|
||||||
#include "ui_pro_hw_settings.h"
|
#include "ui_pro_hw_settings.h"
|
||||||
#include "configtaskwidget.h"
|
#include "../uavobjectwidgetutils/configtaskwidget.h"
|
||||||
#include "extensionsystem/pluginmanager.h"
|
#include "extensionsystem/pluginmanager.h"
|
||||||
#include "uavobjectmanager.h"
|
#include "uavobjectmanager.h"
|
||||||
#include "uavobject.h"
|
#include "uavobject.h"
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
#include <Eigen/StdVector>
|
#include <Eigen/StdVector>
|
||||||
|
|
||||||
#include "ui_ahrs.h"
|
#include "ui_ahrs.h"
|
||||||
#include "configtaskwidget.h"
|
#include "../uavobjectwidgetutils/configtaskwidget.h"
|
||||||
#include "extensionsystem/pluginmanager.h"
|
#include "extensionsystem/pluginmanager.h"
|
||||||
#include "uavobjectmanager.h"
|
#include "uavobjectmanager.h"
|
||||||
#include "uavobject.h"
|
#include "uavobject.h"
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#define CONFIGAIRFRAMEWIDGET_H
|
#define CONFIGAIRFRAMEWIDGET_H
|
||||||
|
|
||||||
#include "ui_airframe.h"
|
#include "ui_airframe.h"
|
||||||
#include "configtaskwidget.h"
|
#include "../uavobjectwidgetutils/configtaskwidget.h"
|
||||||
#include "extensionsystem/pluginmanager.h"
|
#include "extensionsystem/pluginmanager.h"
|
||||||
#include "uavobjectmanager.h"
|
#include "uavobjectmanager.h"
|
||||||
#include "uavobject.h"
|
#include "uavobject.h"
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#define CONFIGCAMERASTABILIZATIONWIDGET_H
|
#define CONFIGCAMERASTABILIZATIONWIDGET_H
|
||||||
|
|
||||||
#include "ui_camerastabilization.h"
|
#include "ui_camerastabilization.h"
|
||||||
#include "configtaskwidget.h"
|
#include "../uavobjectwidgetutils/configtaskwidget.h"
|
||||||
#include "extensionsystem/pluginmanager.h"
|
#include "extensionsystem/pluginmanager.h"
|
||||||
#include "uavobjectmanager.h"
|
#include "uavobjectmanager.h"
|
||||||
#include "uavobject.h"
|
#include "uavobject.h"
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#define CCATTITUDEWIDGET_H
|
#define CCATTITUDEWIDGET_H
|
||||||
|
|
||||||
#include "ui_ccattitude.h"
|
#include "ui_ccattitude.h"
|
||||||
#include "configtaskwidget.h"
|
#include "../uavobjectwidgetutils/configtaskwidget.h"
|
||||||
#include "extensionsystem/pluginmanager.h"
|
#include "extensionsystem/pluginmanager.h"
|
||||||
#include "uavobjectmanager.h"
|
#include "uavobjectmanager.h"
|
||||||
#include "uavobject.h"
|
#include "uavobject.h"
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#define CONFIGccpmWIDGET_H
|
#define CONFIGccpmWIDGET_H
|
||||||
|
|
||||||
#include "ui_ccpm.h"
|
#include "ui_ccpm.h"
|
||||||
#include "configtaskwidget.h"
|
#include "../uavobjectwidgetutils/configtaskwidget.h"
|
||||||
#include "extensionsystem/pluginmanager.h"
|
#include "extensionsystem/pluginmanager.h"
|
||||||
#include "uavobjectmanager.h"
|
#include "uavobjectmanager.h"
|
||||||
#include "uavobject.h"
|
#include "uavobject.h"
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#define CONFIGGADGET_H
|
#define CONFIGGADGET_H
|
||||||
|
|
||||||
#include <coreplugin/iuavgadget.h>
|
#include <coreplugin/iuavgadget.h>
|
||||||
#include "configgadgetwidget.h"
|
#include "../uavobjectwidgetutils/configtaskwidget.h"
|
||||||
|
|
||||||
class IUAVGadget;
|
class IUAVGadget;
|
||||||
//class QList<int>;
|
//class QList<int>;
|
||||||
@ -46,7 +46,7 @@ public:
|
|||||||
ConfigGadget(QString classId, ConfigGadgetWidget *widget, QWidget *parent = 0);
|
ConfigGadget(QString classId, ConfigGadgetWidget *widget, QWidget *parent = 0);
|
||||||
~ConfigGadget();
|
~ConfigGadget();
|
||||||
|
|
||||||
QWidget *widget() { return m_widget; }
|
QWidget *widget() { return (QWidget*)m_widget; }
|
||||||
void loadConfiguration(IUAVGadgetConfiguration* config);
|
void loadConfiguration(IUAVGadgetConfiguration* config);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
//#include "fancytabwidget.h"
|
//#include "fancytabwidget.h"
|
||||||
#include "utils/mytabbedstackwidget.h"
|
#include "utils/mytabbedstackwidget.h"
|
||||||
#include "configtaskwidget.h"
|
#include "../uavobjectwidgetutils/configtaskwidget.h"
|
||||||
|
|
||||||
class ConfigGadgetWidget: public QWidget
|
class ConfigGadgetWidget: public QWidget
|
||||||
{
|
{
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#define CONFIGINPUTWIDGET_H
|
#define CONFIGINPUTWIDGET_H
|
||||||
|
|
||||||
#include "ui_input.h"
|
#include "ui_input.h"
|
||||||
#include "configtaskwidget.h"
|
#include "../uavobjectwidgetutils/configtaskwidget.h"
|
||||||
#include "extensionsystem/pluginmanager.h"
|
#include "extensionsystem/pluginmanager.h"
|
||||||
#include "uavobjectmanager.h"
|
#include "uavobjectmanager.h"
|
||||||
#include "uavobject.h"
|
#include "uavobject.h"
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#define CONFIGOUTPUTWIDGET_H
|
#define CONFIGOUTPUTWIDGET_H
|
||||||
|
|
||||||
#include "ui_output.h"
|
#include "ui_output.h"
|
||||||
#include "configtaskwidget.h"
|
#include "../uavobjectwidgetutils/configtaskwidget.h"
|
||||||
#include "extensionsystem/pluginmanager.h"
|
#include "extensionsystem/pluginmanager.h"
|
||||||
#include "uavobjectmanager.h"
|
#include "uavobjectmanager.h"
|
||||||
#include "uavobject.h"
|
#include "uavobject.h"
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#define CONFIGSTABILIZATIONWIDGET_H
|
#define CONFIGSTABILIZATIONWIDGET_H
|
||||||
|
|
||||||
#include "ui_stabilization.h"
|
#include "ui_stabilization.h"
|
||||||
#include "configtaskwidget.h"
|
#include "../uavobjectwidgetutils/configtaskwidget.h"
|
||||||
#include "extensionsystem/pluginmanager.h"
|
#include "extensionsystem/pluginmanager.h"
|
||||||
#include "uavobjectmanager.h"
|
#include "uavobjectmanager.h"
|
||||||
#include "uavobject.h"
|
#include "uavobject.h"
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#define DEFAULTATTITUDEWIDGET_H
|
#define DEFAULTATTITUDEWIDGET_H
|
||||||
|
|
||||||
#include "ui_defaultattitude.h"
|
#include "ui_defaultattitude.h"
|
||||||
#include "configtaskwidget.h"
|
#include "../uavobjectwidgetutils/configtaskwidget.h"
|
||||||
#include "extensionsystem/pluginmanager.h"
|
#include "extensionsystem/pluginmanager.h"
|
||||||
#include "uavobjectmanager.h"
|
#include "uavobjectmanager.h"
|
||||||
#include "uavobject.h"
|
#include "uavobject.h"
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#define DEFAULTHWSETTINGSt_H
|
#define DEFAULTHWSETTINGSt_H
|
||||||
|
|
||||||
#include "ui_defaulthwsettings.h"
|
#include "ui_defaulthwsettings.h"
|
||||||
#include "configtaskwidget.h"
|
#include "../uavobjectwidgetutils/configtaskwidget.h"
|
||||||
#include "extensionsystem/pluginmanager.h"
|
#include "extensionsystem/pluginmanager.h"
|
||||||
#include "uavobjectmanager.h"
|
#include "uavobjectmanager.h"
|
||||||
#include "uavobject.h"
|
#include "uavobject.h"
|
||||||
|
@ -3,7 +3,6 @@ TARGET = DebugGadget
|
|||||||
|
|
||||||
include(../../openpilotgcsplugin.pri)
|
include(../../openpilotgcsplugin.pri)
|
||||||
include(../../plugins/coreplugin/coreplugin.pri)
|
include(../../plugins/coreplugin/coreplugin.pri)
|
||||||
include(../../libs/libqxt/core/logengines.pri)
|
|
||||||
HEADERS += debugplugin.h \
|
HEADERS += debugplugin.h \
|
||||||
debugengine.h
|
debugengine.h
|
||||||
HEADERS += debuggadget.h
|
HEADERS += debuggadget.h
|
||||||
|
@ -112,6 +112,7 @@ SUBDIRS += plugin_systemhealth
|
|||||||
plugin_config.subdir = config
|
plugin_config.subdir = config
|
||||||
plugin_config.depends = plugin_coreplugin
|
plugin_config.depends = plugin_coreplugin
|
||||||
plugin_config.depends += plugin_uavobjects
|
plugin_config.depends += plugin_uavobjects
|
||||||
|
plugin_config.depends += plugin_uavobjectwidgetutils
|
||||||
plugin_config.depends += plugin_uavsettingsimportexport
|
plugin_config.depends += plugin_uavsettingsimportexport
|
||||||
SUBDIRS += plugin_config
|
SUBDIRS += plugin_config
|
||||||
|
|
||||||
@ -183,6 +184,12 @@ plugin_uavobjectutil.depends = plugin_coreplugin
|
|||||||
plugin_uavobjectutil.depends += plugin_uavobjects
|
plugin_uavobjectutil.depends += plugin_uavobjects
|
||||||
SUBDIRS += plugin_uavobjectutil
|
SUBDIRS += plugin_uavobjectutil
|
||||||
|
|
||||||
|
# UAV Object Widget Utility plugin
|
||||||
|
plugin_uavobjectwidgetutils.subdir = uavobjectwidgetutils
|
||||||
|
plugin_uavobjectwidgetutils.depends = plugin_coreplugin
|
||||||
|
plugin_uavobjectwidgetutils.depends += plugin_uavobjects
|
||||||
|
SUBDIRS += plugin_uavobjectwidgetutils
|
||||||
|
|
||||||
# Magic Waypoint gadget
|
# Magic Waypoint gadget
|
||||||
plugin_magicwaypoint.subdir = magicwaypoint
|
plugin_magicwaypoint.subdir = magicwaypoint
|
||||||
plugin_magicwaypoint.depends = plugin_coreplugin
|
plugin_magicwaypoint.depends = plugin_coreplugin
|
||||||
|
@ -0,0 +1,13 @@
|
|||||||
|
<plugin name="UAVObjectWidgetUtils" version="1.0.0" compatVersion="1.0.0">
|
||||||
|
<vendor>The OpenPilot Project</vendor>
|
||||||
|
<copyright>(C) 2010 OpenPilot Project</copyright>
|
||||||
|
<license>The GNU Public License (GPL) Version 3</license>
|
||||||
|
<description>Utils classes for UAVObjects to Widget relations</description>
|
||||||
|
<url>http://www.openpilot.org</url>
|
||||||
|
<dependencyList>
|
||||||
|
<dependency name="Core" version="1.0.0"/>
|
||||||
|
<dependency name="UAVObjects" version="1.0.0"/>
|
||||||
|
<dependency name="UAVObjectUtil" version="1.0.0"/>
|
||||||
|
<dependency name="UAVSettingsImportExport" version="1.0.0"/>
|
||||||
|
</dependencyList>
|
||||||
|
</plugin>
|
@ -27,14 +27,14 @@
|
|||||||
#include "configtaskwidget.h"
|
#include "configtaskwidget.h"
|
||||||
#include <QtGui/QWidget>
|
#include <QtGui/QWidget>
|
||||||
#include "uavsettingsimportexport/uavsettingsimportexportfactory.h"
|
#include "uavsettingsimportexport/uavsettingsimportexportfactory.h"
|
||||||
#include "configgadgetwidget.h"
|
|
||||||
|
|
||||||
ConfigTaskWidget::ConfigTaskWidget(QWidget *parent) : QWidget(parent),isConnected(false),smartsave(NULL),dirty(false),outOfLimitsStyle("background-color: rgb(255, 0, 0);")
|
ConfigTaskWidget::ConfigTaskWidget(QWidget *parent) : QWidget(parent),isConnected(false),smartsave(NULL),dirty(false),outOfLimitsStyle("background-color: rgb(255, 0, 0);")
|
||||||
{
|
{
|
||||||
pm = ExtensionSystem::PluginManager::instance();
|
pm = ExtensionSystem::PluginManager::instance();
|
||||||
objManager = pm->getObject<UAVObjectManager>();
|
objManager = pm->getObject<UAVObjectManager>();
|
||||||
connect((ConfigGadgetWidget*)parent, SIGNAL(autopilotConnected()),this, SLOT(onAutopilotConnect()));
|
TelemetryManager* telMngr = pm->getObject<TelemetryManager>();
|
||||||
connect((ConfigGadgetWidget*)parent, SIGNAL(autopilotDisconnected()),this, SLOT(onAutopilotDisconnect()));
|
connect(telMngr, SIGNAL(connected()), this, SLOT(onAutopilotConnect()));
|
||||||
|
connect(telMngr, SIGNAL(disconnected()), this, SLOT(onAutopilotDisconnect()));
|
||||||
UAVSettingsImportExportFactory * importexportplugin = pm->getObject<UAVSettingsImportExportFactory>();
|
UAVSettingsImportExportFactory * importexportplugin = pm->getObject<UAVSettingsImportExportFactory>();
|
||||||
connect(importexportplugin,SIGNAL(importAboutToBegin()),this,SLOT(invalidateObjects()));
|
connect(importexportplugin,SIGNAL(importAboutToBegin()),this,SLOT(invalidateObjects()));
|
||||||
}
|
}
|
||||||
@ -397,6 +397,7 @@ bool ConfigTaskWidget::addShadowWidget(QString object, QString field, QWidget *w
|
|||||||
connectWidgetUpdatesToSlot(widget,SLOT(widgetsContentsChanged()));
|
connectWidgetUpdatesToSlot(widget,SLOT(widgetsContentsChanged()));
|
||||||
if(defaultReloadGroups)
|
if(defaultReloadGroups)
|
||||||
addWidgetToDefaultReloadGroups(widget,defaultReloadGroups);
|
addWidgetToDefaultReloadGroups(widget,defaultReloadGroups);
|
||||||
|
loadWidgetLimits(widget,oTw->field,oTw->index,isLimited,scale);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -804,6 +805,8 @@ void ConfigTaskWidget::checkWidgetsLimits(QWidget * widget,UAVObjectField * fiel
|
|||||||
}
|
}
|
||||||
void ConfigTaskWidget::loadWidgetLimits(QWidget * widget,UAVObjectField * field,int index,bool hasLimits,float scale)
|
void ConfigTaskWidget::loadWidgetLimits(QWidget * widget,UAVObjectField * field,int index,bool hasLimits,float scale)
|
||||||
{
|
{
|
||||||
|
if(!widget || !field)
|
||||||
|
return;
|
||||||
if(QComboBox * cb=qobject_cast<QComboBox *>(widget))
|
if(QComboBox * cb=qobject_cast<QComboBox *>(widget))
|
||||||
{
|
{
|
||||||
cb->clear();
|
cb->clear();
|
@ -43,8 +43,9 @@
|
|||||||
#include <QSpinBox>
|
#include <QSpinBox>
|
||||||
#include <QCheckBox>
|
#include <QCheckBox>
|
||||||
#include <QPushButton>
|
#include <QPushButton>
|
||||||
|
#include "uavobjectwidgetutils_global.h"
|
||||||
|
|
||||||
class ConfigTaskWidget: public QWidget
|
class UAVOBJECTWIDGETUTILS_EXPORT ConfigTaskWidget: public QWidget
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
@ -33,9 +33,9 @@
|
|||||||
#include <QtSvg/QGraphicsSvgItem>
|
#include <QtSvg/QGraphicsSvgItem>
|
||||||
#include "mixercurvepoint.h"
|
#include "mixercurvepoint.h"
|
||||||
#include "mixercurveline.h"
|
#include "mixercurveline.h"
|
||||||
|
#include "uavobjectwidgetutils_global.h"
|
||||||
|
|
||||||
|
class UAVOBJECTWIDGETUTILS_EXPORT MixerCurveWidget : public QGraphicsView
|
||||||
class MixerCurveWidget : public QGraphicsView
|
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
@ -0,0 +1,6 @@
|
|||||||
|
include(uavobjectwidgetutils_dependencies.pri)
|
||||||
|
|
||||||
|
# Add the include path to the built-in uavobject include files.
|
||||||
|
INCLUDEPATH += $$PWD
|
||||||
|
|
||||||
|
LIBS *= -l$$qtLibraryName(UAVObjectWidgetUtils)
|
@ -0,0 +1,22 @@
|
|||||||
|
TEMPLATE = lib
|
||||||
|
TARGET = UAVObjectWidgetUtils
|
||||||
|
DEFINES += UAVOBJECTWIDGETUTILS_LIBRARY
|
||||||
|
QT += svg
|
||||||
|
include(../../openpilotgcsplugin.pri)
|
||||||
|
include(uavobjectwidgetutils_dependencies.pri)
|
||||||
|
HEADERS += uavobjectwidgetutils_global.h \
|
||||||
|
uavobjectwidgetutilsplugin.h \
|
||||||
|
configtaskwidget.h \
|
||||||
|
mixercurvewidget.h \
|
||||||
|
mixercurvepoint.h \
|
||||||
|
mixercurveline.h \
|
||||||
|
smartsavebutton.h
|
||||||
|
SOURCES += uavobjectwidgetutilsplugin.cpp \
|
||||||
|
configtaskwidget.cpp \
|
||||||
|
mixercurvewidget.cpp \
|
||||||
|
mixercurvepoint.cpp \
|
||||||
|
mixercurveline.cpp \
|
||||||
|
smartsavebutton.cpp
|
||||||
|
|
||||||
|
|
||||||
|
OTHER_FILES += UAVObjectWidgetUtils.pluginspec
|
@ -0,0 +1,6 @@
|
|||||||
|
include(../../plugins/coreplugin/coreplugin.pri)
|
||||||
|
include(../../libs/utils/utils.pri)
|
||||||
|
include(../../plugins/uavobjects/uavobjects.pri)
|
||||||
|
include(../uavobjectutil/uavobjectutil.pri)
|
||||||
|
include(../uavsettingsimportexport/uavsettingsimportexport.pri)
|
||||||
|
include(../uavtalk/uavtalk.pri)
|
@ -0,0 +1,40 @@
|
|||||||
|
/**
|
||||||
|
******************************************************************************
|
||||||
|
*
|
||||||
|
* @file uavobjectwidgetutils_global.h
|
||||||
|
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||||
|
* @see The GNU Public License (GPL) Version 3
|
||||||
|
* @addtogroup GCSPlugins GCS Plugins
|
||||||
|
* @{
|
||||||
|
* @addtogroup UAVObjectWidgetUtilsPlugin
|
||||||
|
* @{
|
||||||
|
* @brief The UAVUObjectWidgetUtils GCS plugin
|
||||||
|
*****************************************************************************/
|
||||||
|
/*
|
||||||
|
* 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 UAVOBJECTWIDGETUTILS_GLOBAL_H
|
||||||
|
#define UAVOBJECTWIDGETUTILS_GLOBAL_H
|
||||||
|
|
||||||
|
#include <QtCore/qglobal.h>
|
||||||
|
|
||||||
|
#if defined(UAVOBJECTWIDGETUTILS_LIBRARY)
|
||||||
|
# define UAVOBJECTWIDGETUTILS_EXPORT Q_DECL_EXPORT
|
||||||
|
#else
|
||||||
|
# define UAVOBJECTWIDGETUTILS_EXPORT Q_DECL_IMPORT
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
@ -0,0 +1,55 @@
|
|||||||
|
/**
|
||||||
|
******************************************************************************
|
||||||
|
*
|
||||||
|
* @file uavobjectutilplugin.cpp
|
||||||
|
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||||
|
* @see The GNU Public License (GPL) Version 3
|
||||||
|
* @addtogroup GCSPlugins GCS Plugins
|
||||||
|
* @{
|
||||||
|
* @addtogroup UAVObjectUtilPlugin UAVObjectUtil Plugin
|
||||||
|
* @{
|
||||||
|
* @brief The UAVUObjectUtil GCS plugin
|
||||||
|
*****************************************************************************/
|
||||||
|
/*
|
||||||
|
* 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 "uavobjectwidgetutilsplugin.h"
|
||||||
|
|
||||||
|
UAVObjectWidgetUtilsPlugin::UAVObjectWidgetUtilsPlugin()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
UAVObjectWidgetUtilsPlugin::~UAVObjectWidgetUtilsPlugin()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void UAVObjectWidgetUtilsPlugin::extensionsInitialized()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
bool UAVObjectWidgetUtilsPlugin::initialize(const QStringList & arguments, QString * errorString)
|
||||||
|
{
|
||||||
|
Q_UNUSED(arguments)
|
||||||
|
Q_UNUSED(errorString)
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void UAVObjectWidgetUtilsPlugin::shutdown()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
Q_EXPORT_PLUGIN(UAVObjectWidgetUtilsPlugin)
|
@ -0,0 +1,48 @@
|
|||||||
|
/**
|
||||||
|
******************************************************************************
|
||||||
|
*
|
||||||
|
* @file uavobjectutilplugin.h
|
||||||
|
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||||
|
* @see The GNU Public License (GPL) Version 3
|
||||||
|
* @addtogroup GCSPlugins GCS Plugins
|
||||||
|
* @{
|
||||||
|
* @addtogroup UAVObjectUtilPlugin UAVObjectUtil Plugin
|
||||||
|
* @{
|
||||||
|
* @brief The UAVUObjectUtil GCS plugin
|
||||||
|
*****************************************************************************/
|
||||||
|
/*
|
||||||
|
* 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 UAVOBJECTWIDGETUTILSPLUGIN_H
|
||||||
|
#define UAVOBJECTWIDGETUTILSPLUGIN_H
|
||||||
|
|
||||||
|
#include "uavobjectwidgetutils_global.h"
|
||||||
|
#include <extensionsystem/iplugin.h>
|
||||||
|
#include <QtPlugin>
|
||||||
|
|
||||||
|
class UAVOBJECTWIDGETUTILS_EXPORT UAVObjectWidgetUtilsPlugin: public ExtensionSystem::IPlugin
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
UAVObjectWidgetUtilsPlugin();
|
||||||
|
~UAVObjectWidgetUtilsPlugin();
|
||||||
|
|
||||||
|
void extensionsInitialized();
|
||||||
|
bool initialize(const QStringList & arguments, QString * errorString);
|
||||||
|
void shutdown();
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
Loading…
x
Reference in New Issue
Block a user