rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

remove global widgets dependency from plugins.pri

Browse Source 
cleanup related pro files and includes
This commit is contained in:
Philippe Renon 2016-01-21 01:03:14 +01:00
parent f4b3b89953
commit 9d2d90e44d
107 changed files with 846 additions and 598 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ground/gcs/gcs.pri
View File

@ -193,7 +193,6 @@ macx {
}
}
INCLUDEPATH += \
$$GCS_SOURCE_TREE/src/libs

7
ground/gcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.h
View File

@ -27,19 +27,18 @@
#ifndef MAPGRAPHICITEM_H
#define MAPGRAPHICITEM_H
#include <QGraphicsItem>
#include "../internals/core.h"
// #include "../internals/point.h"
#include "../core/diagnostics.h"
#include "configuration.h"
#include "waypointitem.h"
#include <QGraphicsItem>
#include <QtGui>
#include <QTransform>
#include <QWidget>
#include <QBrush>
#include <QFont>
#include <QObject>
#include "waypointitem.h"
// #include "uavitem.h"
namespace mapcontrol {
class WayPointItem;

5
ground/gcs/src/plugin.pri
View File

@ -7,8 +7,6 @@ LIBS += -L$$DESTDIR
INCLUDEPATH += $$GCS_SOURCE_TREE/src/plugins
DEPENDPATH += $$GCS_SOURCE_TREE/src/plugins
QT += widgets
# copy the plugin spec
isEmpty(TARGET) {
error("qtcreatorplugin.pri: You must provide a TARGET")
@ -26,7 +24,7 @@ QMAKE_EXTRA_COMPILERS += copy2build
TARGET = $$qtLibraryName($$TARGET)
macx {
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Plugins/$${PROVIDER}/
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Plugins/$${PROVIDER}/
} else:linux-* {
QMAKE_RPATHDIR = $$shell_quote(\$$ORIGIN)
QMAKE_RPATHDIR += $$shell_quote(\$$ORIGIN/$$relative_path($$GCS_LIBRARY_PATH, $$DESTDIR))
@ -34,7 +32,6 @@ macx {
include(rpath.pri)
}
contains(QT_CONFIG, reduce_exports):CONFIG += hGCS_symbols
CONFIG += plugin plugin_with_soname

45
ground/gcs/src/plugins/antennatrack/antennatrack.pro
View File

@ -1,26 +1,35 @@
TEMPLATE = lib
TARGET = AntennaTrack
QT += serialport
include(../../plugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(antennatrack_dependencies.pri)
include(../../libs/qwt/qwt.pri)
HEADERS += antennatrackplugin.h
HEADERS += gpsparser.h
HEADERS += telemetryparser.h
HEADERS += antennatrackgadget.h
HEADERS += antennatrackwidget.h
HEADERS += antennatrackgadgetfactory.h
HEADERS += antennatrackgadgetconfiguration.h
HEADERS += antennatrackgadgetoptionspage.h
SOURCES += antennatrackplugin.cpp
SOURCES += gpsparser.cpp
SOURCES += telemetryparser.cpp
SOURCES += antennatrackgadget.cpp
SOURCES += antennatrackgadgetfactory.cpp
SOURCES += antennatrackwidget.cpp
SOURCES += antennatrackgadgetconfiguration.cpp
SOURCES += antennatrackgadgetoptionspage.cpp
HEADERS += \
antennatrackplugin.h \
gpsparser.h \
telemetryparser.h \
antennatrackgadget.h \
antennatrackwidget.h \
antennatrackgadgetfactory.h \
antennatrackgadgetconfiguration.h \
antennatrackgadgetoptionspage.h
SOURCES += \
antennatrackplugin.cpp \
gpsparser.cpp \
telemetryparser.cpp \
antennatrackgadget.cpp \
antennatrackgadgetfactory.cpp \
antennatrackwidget.cpp \
antennatrackgadgetconfiguration.cpp \
antennatrackgadgetoptionspage.cpp
OTHER_FILES += AntennaTrack.pluginspec
FORMS += antennatrackgadgetoptionspage.ui
FORMS += antennatrackwidget.ui
FORMS += \
antennatrackgadgetoptionspage.ui \
antennatrackwidget.ui

6
ground/gcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.cpp
View File

@ -26,6 +26,9 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "configccpmwidget.h"
#include "ui_airframe_ccpm.h"
#include "mixersettings.h"
#include "systemsettings.h"
#include "actuatorcommand.h"
@ -38,6 +41,9 @@
#include <QPushButton>
#include <QBrush>
#include <QMessageBox>
#include <QSpinBox>
#include <QtSvg/QGraphicsSvgItem>
#include <QGraphicsEllipseItem>
#include <math.h>

17
ground/gcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.h
View File

@ -29,22 +29,23 @@
#define CONFIGccpmWIDGET_H
#include "cfg_vehicletypes/vehicleconfig.h"
#include "ui_airframe_ccpm.h"
#include "../uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include <QtSvg/QSvgRenderer>
#include <QtSvg/QGraphicsSvgItem>
#include <QGraphicsEllipseItem>
#include <QWidget>
#include <QList>
class Ui_CcpmConfigWidget;
class QWidget;
class QSpinBox;
class QGraphicsSvgItem;
class QGraphicsEllipseItem;
class QGraphicsLineItem;
class QGraphicsTextItem;
#define CCPM_MAX_SWASH_SERVOS 4
class Ui_Widget;
typedef struct {
int ServoChannels[CCPM_MAX_SWASH_SERVOS];
int Used[CCPM_MAX_SWASH_SERVOS];

3
ground/gcs/src/plugins/config/cfg_vehicletypes/configcustomwidget.cpp
View File

@ -26,6 +26,9 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "configcustomwidget.h"
#include "ui_airframe_custom.h"
#include "mixersettings.h"
#include <QDebug>

4
ground/gcs/src/plugins/config/cfg_vehicletypes/configcustomwidget.h
View File

@ -28,7 +28,7 @@
#define CONFIGCUSTOMWIDGET_H
#include "cfg_vehicletypes/vehicleconfig.h"
#include "ui_airframe_custom.h"
#include "../uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
@ -38,7 +38,7 @@
#include <QList>
#include <QItemDelegate>
class Ui_Widget;
class Ui_CustomConfigWidget;
class ConfigCustomWidget : public VehicleConfig {
Q_OBJECT

3
ground/gcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp
View File

@ -26,6 +26,9 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "configfixedwingwidget.h"
#include "ui_airframe_fixedwing.h"
#include "mixersettings.h"
#include "systemsettings.h"
#include "actuatorsettings.h"

9
ground/gcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.h
View File

@ -28,17 +28,18 @@
#define CONFIGFIXEDWINGWIDGET_H
#include "cfg_vehicletypes/vehicleconfig.h"
#include "ui_airframe_fixedwing.h"
#include "../uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include <QWidget>
#include <QList>
#include <QItemDelegate>
class Ui_Widget;
class Ui_FixedWingConfigWidget;
class QWidget;
class QGraphicsSvgItem;
class ConfigFixedWingWidget : public VehicleConfig {
Q_OBJECT

3
ground/gcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.cpp
View File

@ -26,6 +26,9 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "configgroundvehiclewidget.h"
#include "ui_airframe_ground.h"
#include "mixersettings.h"
#include "systemsettings.h"
#include "actuatorsettings.h"

9
ground/gcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.h
View File

@ -28,17 +28,16 @@
#define CONFIGGROUNDVEHICLEWIDGET_H
#include "cfg_vehicletypes/vehicleconfig.h"
#include "ui_airframe_ground.h"
#include "../uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include <QWidget>
#include <QList>
#include <QItemDelegate>
class Ui_GroundConfigWidget;
class Ui_Widget;
class QWidget;
class QGraphicsSvgItem;
class ConfigGroundVehicleWidget : public VehicleConfig {
Q_OBJECT

3
ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
View File

@ -26,6 +26,9 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "configmultirotorwidget.h"
#include "ui_airframe_multirotor.h"
#include "mixersettings.h"
#include "systemsettings.h"
#include "actuatorsettings.h"

11
ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.h
View File

@ -28,17 +28,18 @@
#define CONFIGMULTIROTORWIDGET_H
#include "cfg_vehicletypes/vehicleconfig.h"
#include "ui_airframe_multirotor.h"
#include "../uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include <QtCore/QList>
#include <QWidget>
#include <QItemDelegate>
#include <QList>
class Ui_Widget;
class Ui_MultiRotorConfigWidget;
class QWidget;
class QGraphicsSvgItem;
class ConfigMultiRotorWidget : public VehicleConfig {
Q_OBJECT

9
ground/gcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp
View File

@ -25,13 +25,18 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "cfg_vehicletypes/vehicleconfig.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include "systemsettings.h"
#include <QtCore/qmath.h>
#include "systemsettings.h"
#include <QtCore/qmath.h>
#include <QDebug>
#include <QComboBox>
#include <QPushButton>
#include <QPointer>
VehicleConfig::VehicleConfig(QWidget *parent) : ConfigTaskWidget(parent)
{

10
ground/gcs/src/plugins/config/config.pro
View File

@ -2,16 +2,12 @@ TEMPLATE = lib
TARGET = Config
DEFINES += CONFIG_LIBRARY
QT += svg opengl qml quick
QT += widgets svg opengl qml quick
include(config_dependencies.pri)
INCLUDEPATH += ../../libs/eigen
OTHER_FILES += \
Config.pluginspec \
calibration/WizardStepIndicator.qml
HEADERS += \
configplugin.h \
configgadgetwidget.h \
@ -129,4 +125,8 @@ FORMS += \
configrevonanohwwidget.ui \
failsafechannelform.ui
OTHER_FILES += \
Config.pluginspec \
calibration/WizardStepIndicator.qml
RESOURCES += configgadget.qrc

11
ground/gcs/src/plugins/config/config_cc_hw_widget.cpp
View File

@ -25,8 +25,16 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "config_cc_hw_widget.h"
#include "ui_cc_hw_settings.h"
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/generalsettings.h>
#include "hwsettings.h"
#include <QDebug>
#include <QStringList>
#include <QWidget>
@ -35,9 +43,6 @@
#include <QPushButton>
#include <QDesktopServices>
#include <QUrl>
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/generalsettings.h>
ConfigCCHWWidget::ConfigCCHWWidget(QWidget *parent) : ConfigTaskWidget(parent)
{

7
ground/gcs/src/plugins/config/config_cc_hw_widget.h
View File

@ -27,14 +27,17 @@
#ifndef CONFIGCCHWWIDGET_H
#define CONFIGCCHWWIDGET_H
#include "ui_cc_hw_settings.h"
#include "../uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include "smartsavebutton.h"
#include <QWidget>
#include <QList>
#include "smartsavebutton.h"
#include <QSvgRenderer>
class Ui_CC_HW_Widget;
class ConfigCCHWWidget : public ConfigTaskWidget {
Q_OBJECT

21
ground/gcs/src/plugins/config/configautotunewidget.cpp
View File

@ -1,19 +1,22 @@
#include "configautotunewidget.h"
#include <QDebug>
#include <QStringList>
#include <QtWidgets/QWidget>
#include <QtWidgets/QTextEdit>
#include <QtWidgets/QVBoxLayout>
#include <QtWidgets/QPushButton>
#include <QDesktopServices>
#include <QUrl>
#include <QList>
#include "ui_autotune.h"
#include "relaytuningsettings.h"
#include "relaytuning.h"
#include "stabilizationsettings.h"
#include "hwsettings.h"
#include <QDebug>
#include <QStringList>
#include <QWidget>
#include <QTextEdit>
#include <QVBoxLayout>
#include <QPushButton>
#include <QDesktopServices>
#include <QUrl>
#include <QList>
ConfigAutotuneWidget::ConfigAutotuneWidget(QWidget *parent) :
ConfigTaskWidget(parent)
{

7
ground/gcs/src/plugins/config/configautotunewidget.h
View File

@ -27,17 +27,20 @@
#ifndef CONFIGAUTOTUNE_H
#define CONFIGAUTOTUNE_H
#include "ui_autotune.h"
#include "../uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include "stabilizationsettings.h"
#include "relaytuningsettings.h"
#include "relaytuning.h"
#include <QtWidgets/QWidget>
#include <QWidget>
#include <QTimer>
class Ui_AutotuneWidget;
class ConfigAutotuneWidget : public ConfigTaskWidget {
Q_OBJECT
public:

8
ground/gcs/src/plugins/config/configcamerastabilizationwidget.cpp
View File

@ -35,12 +35,16 @@
*/
#include "configcamerastabilizationwidget.h"
#include "ui_camerastabilization.h"
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/generalsettings.h>
#include "camerastabsettings.h"
#include "hwsettings.h"
#include "mixersettings.h"
#include "actuatorcommand.h"
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/generalsettings.h>
ConfigCameraStabilizationWidget::ConfigCameraStabilizationWidget(QWidget *parent) : ConfigTaskWidget(parent)
{

4
ground/gcs/src/plugins/config/configcamerastabilizationwidget.h
View File

@ -27,13 +27,15 @@
#ifndef CONFIGCAMERASTABILIZATIONWIDGET_H
#define CONFIGCAMERASTABILIZATIONWIDGET_H
#include "ui_camerastabilization.h"
#include "../uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include "camerastabsettings.h"
class Ui_CameraStabilizationWidget;
class ConfigCameraStabilizationWidget : public ConfigTaskWidget {
Q_OBJECT

17
ground/gcs/src/plugins/config/configccattitudewidget.cpp
View File

@ -26,20 +26,25 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "configccattitudewidget.h"
#include "ui_ccattitude.h"
#include "utils/coordinateconversions.h"
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/generalsettings.h>
#include <calibration/calibrationutils.h>
#include "attitudesettings.h"
#include "accelstate.h"
#include "accelgyrosettings.h"
#include "gyrostate.h"
#include <QMutexLocker>
#include <QMessageBox>
#include <QDebug>
#include <QDesktopServices>
#include <QUrl>
#include "accelstate.h"
#include "accelgyrosettings.h"
#include "gyrostate.h"
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/generalsettings.h>
#include <calibration/calibrationutils.h>
ConfigCCAttitudeWidget::ConfigCCAttitudeWidget(QWidget *parent) :
ConfigTaskWidget(parent),
ui(new Ui_ccattitude)

4
ground/gcs/src/plugins/config/configccattitudewidget.h
View File

@ -27,15 +27,15 @@
#ifndef CCATTITUDEWIDGET_H
#define CCATTITUDEWIDGET_H
#include "ui_ccattitude.h"
#include "../uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include <QWidget>
#include <QTimer>
class Ui_Widget;
class Ui_ccattitude;
class ConfigCCAttitudeWidget : public ConfigTaskWidget {
Q_OBJECT

28
ground/gcs/src/plugins/config/configinputwidget.cpp
View File

@ -30,6 +30,17 @@
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/generalsettings.h>
#include <utils/stylehelper.h>
#include "ui_input.h"
#include "ui_input_wizard.h"
#include "inputchannelform.h"
#include "ui_inputchannelform.h"
#include "failsafechannelform.h"
#include "ui_failsafechannelform.h"
#include <systemalarms.h>
#include <QDebug>
@ -41,12 +52,9 @@
#include <QDesktopServices>
#include <QUrl>
#include <QMessageBox>
#include <utils/stylehelper.h>
#include <QMessageBox>
#include "inputchannelform.h"
#include "ui_inputchannelform.h"
#include "failsafechannelform.h"
#include "ui_failsafechannelform.h"
#include <QEventLoop>
#include <QGraphicsSvgItem>
#include <QSvgRenderer>
#define ACCESS_MIN_MOVE -3
#define ACCESS_MAX_MOVE 3
@ -170,7 +178,7 @@ ConfigInputWidget::ConfigInputWidget(QWidget *parent) :
addWidgetBinding("ManualControlSettings", "FailsafeFlightModeSwitchPosition", ui->failsafeFlightMode, 0, 1, true, new QList<int>(failsafeReloadGroup));
// Generate the rows for the failsafe channel form GUI
index = 0;
index = 0;
foreach(QString name, manualSettingsObj->getField("FailsafeChannel")->getElementNames()) {
Q_ASSERT(index < ManualControlSettings::FAILSAFECHANNEL_NUMELEM);
@ -196,10 +204,10 @@ ConfigInputWidget::ConfigInputWidget(QWidget *parent) :
connect(wizardUi->wzBack, SIGNAL(clicked()), this, SLOT(wzBack()));
ui->stackedWidget->setCurrentIndex(0);
QList<QWidget*> widgets = QList<QWidget*>() << ui->fmsModePos1 << ui->fmsModePos2 << ui->fmsModePos3 <<
ui->fmsModePos4 << ui->fmsModePos5 << ui->fmsModePos6;
QList<QWidget *> widgets = QList<QWidget *>() << ui->fmsModePos1 << ui->fmsModePos2 << ui->fmsModePos3 <<
ui->fmsModePos4 << ui->fmsModePos5 << ui->fmsModePos6;
index = 0;
foreach(QWidget* widget, widgets) {
foreach(QWidget * widget, widgets) {
addWidgetBinding("FlightModeSettings", "FlightModePosition", widget, index++, 1, true);
}

23
ground/gcs/src/plugins/config/configinputwidget.h
View File

@ -28,30 +28,33 @@
#ifndef CONFIGINPUTWIDGET_H
#define CONFIGINPUTWIDGET_H
#include "ui_input.h"
#include "ui_input_wizard.h"
#include "../uavobjectwidgetutils/configtaskwidget.h"
#include "uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include <QWidget>
#include <QList>
#include <QRadioButton>
#include "manualcontrolcommand.h"
#include "manualcontrolsettings.h"
#include "actuatorsettings.h"
#include "mixersettings.h"
#include "flightmodesettings.h"
#include "receiveractivity.h"
#include <QGraphicsView>
#include <QtSvg/QSvgRenderer>
#include <QtSvg/QGraphicsSvgItem>
#include "flightstatus.h"
#include "accessorydesired.h"
#include <QPointer>
#include "systemsettings.h"
#include <QPointer>
#include <QWidget>
#include <QList>
#include <QTimer>
class Ui_InputWidget;
class Ui_InputWizardWidget;
class QEventLoop;
class QSvgRenderer;
class QGraphicsSvgItem;
class QGraphicsSimpleTextItem;
class ConfigInputWidget : public ConfigTaskWidget {
Q_OBJECT

6
ground/gcs/src/plugins/config/configoplinkwidget.cpp
View File

@ -28,10 +28,16 @@
#include "configoplinkwidget.h"
#include "ui_oplink.h"
#include <coreplugin/generalsettings.h>
#include <uavobjectmanager.h>
#include <oplinksettings.h>
#include <oplinkstatus.h>
#include <QMessageBox>
#include <QDateTime>
// Channel range and Frequency display
static const int MAX_CHANNEL_NUM = 250;

7
ground/gcs/src/plugins/config/configoplinkwidget.h
View File

@ -27,11 +27,12 @@
#ifndef CONFIGPIPXTREMEWIDGET_H
#define CONFIGPIPXTREMEWIDGET_H
#include <oplinksettings.h>
#include "ui_oplink.h"
#include "configtaskwidget.h"
#include "oplinksettings.h"
class Ui_OPLinkWidget;
class ConfigOPLinkWidget : public ConfigTaskWidget {
Q_OBJECT

21
ground/gcs/src/plugins/config/configoutputwidget.cpp
View File

@ -27,16 +27,21 @@
*/
#include "configoutputwidget.h"
#include "ui_output.h"
#include "ui_outputchannelform.h"
#include "outputchannelform.h"
#include "configvehicletypewidget.h"
#include "uavsettingsimportexport/uavsettingsimportexportfactory.h"
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/generalsettings.h>
#include "mixersettings.h"
#include "actuatorcommand.h"
#include "actuatorsettings.h"
#include "systemsettings.h"
#include "uavsettingsimportexport/uavsettingsimportexportfactory.h"
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/generalsettings.h>
#include <QDebug>
#include <QStringList>
@ -84,11 +89,11 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren
connect(m_ui->channelOutTest, SIGNAL(toggled(bool)), form, SLOT(enableChannelTest(bool)));
connect(form, SIGNAL(channelChanged(int, int)), this, SLOT(sendChannelTest(int, int)));
addWidget(form->ui.actuatorMin);
addWidget(form->ui.actuatorNeutral);
addWidget(form->ui.actuatorMax);
addWidget(form->ui.actuatorRev);
addWidget(form->ui.actuatorLink);
addWidget(form->ui->actuatorMin);
addWidget(form->ui->actuatorNeutral);
addWidget(form->ui->actuatorMax);
addWidget(form->ui->actuatorRev);
addWidget(form->ui->actuatorLink);
}

14
ground/gcs/src/plugins/config/configoutputwidget.h
View File

@ -27,23 +27,27 @@
#ifndef CONFIGOUTPUTWIDGET_H
#define CONFIGOUTPUTWIDGET_H
#include "ui_output.h"
#include "cfg_vehicletypes/vehicleconfig.h"
#include "../uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include "uavobjectutilmanager.h"
#include "cfg_vehicletypes/vehicleconfig.h"
#include <QWidget>
#include <QList>
#include <QSignalMapper>
#include "systemalarms.h"
#include <QList>
#include <QSlider>
class Ui_OutputWidget;
class OutputChannelForm;
class MixerSettings;
class QLabel;
class QCheckBox;
class QWidget;
class OutputBankControls {
public:
OutputBankControls(MixerSettings *mixer, QLabel *label, QColor color, QComboBox *rateCombo, QComboBox *modeCombo);

7
ground/gcs/src/plugins/config/configrevohwwidget.cpp
View File

@ -27,15 +27,18 @@
*/
#include "configrevohwwidget.h"
#include <QDebug>
#include "ui_configrevohwwidget.h"
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/generalsettings.h>
#include "hwsettings.h"
#include <QDebug>
#include <QDesktopServices>
#include <QUrl>
#include <QMessageBox>
ConfigRevoHWWidget::ConfigRevoHWWidget(QWidget *parent) : ConfigTaskWidget(parent), m_refreshing(true)
{
m_ui = new Ui_RevoHWWidget();

13
ground/gcs/src/plugins/config/configrevohwwidget.h
View File

@ -27,14 +27,13 @@
#ifndef CONFIGREVOHWWIDGET_H
#define CONFIGREVOHWWIDGET_H
#include "ui_configrevohwwidget.h"
#include "../uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include <QWidget>
#include <QList>
class Ui_RevoHWWidget;
class UAVObject;
class QWidget;
class ConfigRevoHWWidget : public ConfigTaskWidget {
Q_OBJECT
@ -44,8 +43,8 @@ public:
~ConfigRevoHWWidget();
private:
bool m_refreshing;
Ui_RevoHWWidget *m_ui;
bool m_refreshing;
void setupCustomCombos();
protected slots:

7
ground/gcs/src/plugins/config/configrevonanohwwidget.cpp
View File

@ -27,15 +27,18 @@
*/
#include "configrevonanohwwidget.h"
#include <QDebug>
#include "ui_configrevonanohwwidget.h"
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/generalsettings.h>
#include "hwsettings.h"
#include <QDebug>
#include <QDesktopServices>
#include <QUrl>
#include <QMessageBox>
ConfigRevoNanoHWWidget::ConfigRevoNanoHWWidget(QWidget *parent) : ConfigTaskWidget(parent), m_refreshing(true)
{
m_ui = new Ui_RevoNanoHWWidget();

13
ground/gcs/src/plugins/config/configrevonanohwwidget.h
View File

@ -27,14 +27,13 @@
#ifndef CONFIGREVONANOHWWIDGET_H
#define CONFIGREVONANOHWWIDGET_H
#include "ui_configrevonanohwwidget.h"
#include "../uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include <QWidget>
#include <QList>
class Ui_RevoNanoHWWidget;
class UAVObject;
class QWidget;
class ConfigRevoNanoHWWidget : public ConfigTaskWidget {
Q_OBJECT
@ -44,8 +43,8 @@ public:
~ConfigRevoNanoHWWidget();
private:
bool m_refreshing;
Ui_RevoNanoHWWidget *m_ui;
bool m_refreshing;
void setupCustomCombos();
protected slots:

2
ground/gcs/src/plugins/config/configrevowidget.cpp
View File

@ -26,6 +26,8 @@
*/
#include "configrevowidget.h"
#include "ui_revosensors.h"
#include <attitudestate.h>
#include <attitudesettings.h>
#include <revocalibration.h>

16
ground/gcs/src/plugins/config/configrevowidget.h
View File

@ -27,29 +27,19 @@
#ifndef CONFIGREVOWIDGET_H
#define CONFIGREVOWIDGET_H
#include "ui_revosensors.h"
#include "configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include "calibration/thermal/thermalcalibrationmodel.h"
#include "calibration/sixpointcalibrationmodel.h"
#include "calibration/levelcalibrationmodel.h"
#include "calibration/gyrobiascalibrationmodel.h"
#include <auxmagsettings.h>
#include <magsensor.h>
#include <auxmagsensor.h>
#include <magstate.h>
class Ui_RevoSensorsWidget;
#include <QWidget>
#include <QtSvg/QSvgRenderer>
#include <QtSvg/QGraphicsSvgItem>
#include <QList>
#include <QTimer>
#include <QMutex>
class Ui_Widget;
class QWidget;
class ConfigRevoWidget : public ConfigTaskWidget {
Q_OBJECT

25
ground/gcs/src/plugins/config/configstabilizationwidget.cpp
View File

@ -27,6 +27,21 @@
*/
#include "configstabilizationwidget.h"
#include "ui_stabilization.h"
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/generalsettings.h>
#include "uavobjectutilmanager.h"
#include "objectpersistence.h"
#include "altitudeholdsettings.h"
#include "stabilizationsettings.h"
#include "qwt/src/qwt.h"
#include "qwt/src/qwt_plot.h"
#include "qwt/src/qwt_plot_canvas.h"
#include "qwt/src/qwt_scale_widget.h"
#include <QDebug>
#include <QStringList>
#include <QWidget>
@ -42,16 +57,6 @@
#include <QMenu>
#include <QAction>
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/generalsettings.h>
#include "altitudeholdsettings.h"
#include "stabilizationsettings.h"
#include "qwt/src/qwt.h"
#include "qwt/src/qwt_plot.h"
#include "qwt/src/qwt_plot_canvas.h"
#include "qwt/src/qwt_scale_widget.h"
ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTaskWidget(parent),
boardModel(0), m_stabSettingsBankCount(0), m_currentStabSettingsBank(0)
{

14
ground/gcs/src/plugins/config/configstabilizationwidget.h
View File

@ -27,18 +27,24 @@
#ifndef CONFIGSTABILIZATIONWIDGET_H
#define CONFIGSTABILIZATIONWIDGET_H
#include "ui_stabilization.h"
#include "../uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include "stabilizationsettings.h"
#include <QWidget>
#include <QTimer>
#include <QSignalMapper>
#include "qwt/src/qwt_plot_curve.h"
#include "qwt/src/qwt_plot_grid.h"
#include <QTimer>
#include <QSignalMapper>
class Ui_StabilizationWidget;
class QWidget;
class QTabBar;
class ConfigStabilizationWidget : public ConfigTaskWidget {
Q_OBJECT

8
ground/gcs/src/plugins/config/configtxpidwidget.cpp
View File

@ -27,6 +27,12 @@
*/
#include "configtxpidwidget.h"
#include "ui_txpid.h"
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/generalsettings.h>
#include "txpidsettings.h"
#include "hwsettings.h"
#include "attitudesettings.h"
@ -34,8 +40,6 @@
#include "stabilizationsettingsbank1.h"
#include "stabilizationsettingsbank2.h"
#include "stabilizationsettingsbank3.h"
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/generalsettings.h>
ConfigTxPIDWidget::ConfigTxPIDWidget(QWidget *parent) : ConfigTaskWidget(parent)
{

3
ground/gcs/src/plugins/config/configtxpidwidget.h
View File

@ -27,9 +27,10 @@
#ifndef CONFIGTXPIDWIDGET_H
#define CONFIGTXPIDWIDGET_H
#include "ui_txpid.h"
#include "configtaskwidget.h"
class Ui_TxPIDWidget;
class ConfigTxPIDWidget : public ConfigTaskWidget {
Q_OBJECT

11
ground/gcs/src/plugins/config/configvehicletypewidget.cpp
View File

@ -26,9 +26,15 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "configvehicletypewidget.h"
#include "ui_airframe.h"
#include "configgadgetfactory.h"
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/generalsettings.h>
#include "systemsettings.h"
#include "actuatorsettings.h"
#include "configgadgetfactory.h"
#include "cfg_vehicletypes/configccpmwidget.h"
#include "cfg_vehicletypes/configfixedwingwidget.h"
@ -47,9 +53,6 @@
#include <QDesktopServices>
#include <QUrl>
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/generalsettings.h>
/**
Static function to get currently assigned channelDescriptions
for all known vehicle types; instantiates the appropriate object

9
ground/gcs/src/plugins/config/configvehicletypewidget.h
View File

@ -28,22 +28,17 @@
#ifndef CONFIGVEHICLETYPEWIDGET_H
#define CONFIGVEHICLETYPEWIDGET_H
#include "ui_airframe.h"
#include "cfg_vehicletypes/vehicleconfig.h"
#include "uavobject.h"
#include "../uavobjectwidgetutils/configtaskwidget.h"
#include <QComboBox>
#include <QMap>
#include <QString>
#include <QStringList>
#include <QWidget>
#include <QWidget>
#include <QList>
#include <QItemDelegate>
class Ui_AircraftWidget;
class Ui_Widget;
class QWidget;
/*
* This class derives from ConfigTaskWidget and overrides its default "binding" mechanism.

2
ground/gcs/src/plugins/config/defaultattitudewidget.cpp
View File

@ -25,7 +25,9 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "defaultattitudewidget.h"
#include "ui_defaultattitude.h"
#include <QMutexLocker>
#include <QErrorMessage>
#include <QDebug>

9
ground/gcs/src/plugins/config/defaultattitudewidget.h
View File

@ -27,16 +27,9 @@
#ifndef DEFAULTATTITUDEWIDGET_H
#define DEFAULTATTITUDEWIDGET_H
#include "ui_defaultattitude.h"
#include "../uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include <QWidget>
#include <QTimer>
#include <QMutex>
class Ui_Widget;
class Ui_defaultattitude;
class DefaultAttitudeWidget : public QWidget {
Q_OBJECT

4
ground/gcs/src/plugins/config/defaulthwsettingswidget.cpp
View File

@ -25,7 +25,9 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "defaulthwsettingswidget.h"
#include "ui_defaultattitude.h"
#include "ui_defaulthwsettings.h"
#include <QMutexLocker>
#include <QErrorMessage>
#include <QDebug>

9
ground/gcs/src/plugins/config/defaulthwsettingswidget.h
View File

@ -27,16 +27,9 @@
#ifndef DEFAULTHWSETTINGSt_H
#define DEFAULTHWSETTINGSt_H
#include "ui_defaulthwsettings.h"
#include "../uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include <QWidget>
#include <QTimer>
#include <QMutex>
class Ui_Widget;
class Ui_defaulthwsettings;
class DefaultHwSettingsWidget : public QWidget {
Q_OBJECT

8
ground/gcs/src/plugins/config/mixercurve.cpp
View File

@ -25,11 +25,15 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "mixercurve.h"
#include "ui_mixercurve.h"
#include "dblspindelegate.h"
#include <QWidget>
#include <QResizeEvent>
#include <math.h>
#include "mixercurve.h"
#include "dblspindelegate.h"
MixerCurve::MixerCurve(QWidget *parent) :
QFrame(parent),

11
ground/gcs/src/plugins/config/mixercurve.h
View File

@ -27,22 +27,21 @@
#ifndef MIXERCURVE_H
#define MIXERCURVE_H
#include <QFrame>
#include <QWidget>
#include <QList>
#include <QTableWidget>
#include "ui_mixercurve.h"
#include "mixercurvewidget.h"
#include "dblspindelegate.h"
#include "uavobjectwidgetutils_global.h"
#include "uavobjectwidgetutils/popupwidget.h"
#include <QFrame>
#include <QList>
namespace Ui {
class MixerCurve;
}
class QWidget;
class QTableWidget;
class MixerCurve : public QFrame {
Q_OBJECT

188
ground/gcs/src/plugins/config/outputchannelform.cpp
View File

@ -27,34 +27,36 @@
#include "outputchannelform.h"
#include "ui_outputchannelform.h"
#define MAXOUTPUT_VALUE 2500
#define MINOUTPUT_VALUE 500
OutputChannelForm::OutputChannelForm(const int index, QWidget *parent) :
ChannelForm(index, parent), ui(), m_inChannelTest(false)
ChannelForm(index, parent), ui(new Ui::outputChannelForm), m_inChannelTest(false)
{
ui.setupUi(this);
ui->setupUi(this);
// The convention for OP is Channel 1 to Channel 10.
ui.actuatorNumber->setText(QString("%1").arg(index + 1));
ui->actuatorNumber->setText(QString("%1").arg(index + 1));
setBank("-");
// Register for ActuatorSettings changes:
connect(ui.actuatorMin, SIGNAL(editingFinished()), this, SLOT(setChannelRange()));
connect(ui.actuatorMax, SIGNAL(editingFinished()), this, SLOT(setChannelRange()));
connect(ui.actuatorRev, SIGNAL(toggled(bool)), this, SLOT(reverseChannel(bool)));
connect(ui->actuatorMin, SIGNAL(editingFinished()), this, SLOT(setChannelRange()));
connect(ui->actuatorMax, SIGNAL(editingFinished()), this, SLOT(setChannelRange()));
connect(ui->actuatorRev, SIGNAL(toggled(bool)), this, SLOT(reverseChannel(bool)));
// Now connect the channel out sliders to our signal to send updates in test mode
connect(ui.actuatorNeutral, SIGNAL(valueChanged(int)), this, SLOT(sendChannelTest(int)));
connect(ui->actuatorNeutral, SIGNAL(valueChanged(int)), this, SLOT(sendChannelTest(int)));
ui.actuatorLink->setChecked(false);
connect(ui.actuatorLink, SIGNAL(toggled(bool)), this, SLOT(linkToggled(bool)));
ui->actuatorLink->setChecked(false);
connect(ui->actuatorLink, SIGNAL(toggled(bool)), this, SLOT(linkToggled(bool)));
// Set limits
ui.actuatorMin->setMaximum(MAXOUTPUT_VALUE);
ui.actuatorMax->setMaximum(MAXOUTPUT_VALUE);
ui.actuatorValue->setMaximum(MAXOUTPUT_VALUE);
ui.actuatorMin->setMinimum(MINOUTPUT_VALUE);
ui.actuatorMax->setMinimum(MINOUTPUT_VALUE);
ui.actuatorValue->setMinimum(MINOUTPUT_VALUE);
ui->actuatorMin->setMaximum(MAXOUTPUT_VALUE);
ui->actuatorMax->setMaximum(MAXOUTPUT_VALUE);
ui->actuatorValue->setMaximum(MAXOUTPUT_VALUE);
ui->actuatorMin->setMinimum(MINOUTPUT_VALUE);
ui->actuatorMax->setMinimum(MINOUTPUT_VALUE);
ui->actuatorValue->setMinimum(MINOUTPUT_VALUE);
setChannelRange();
@ -63,17 +65,17 @@ OutputChannelForm::OutputChannelForm(const int index, QWidget *parent) :
OutputChannelForm::~OutputChannelForm()
{
// Do nothing
delete ui;
}
QString OutputChannelForm::name()
{
return ui.actuatorName->text();
return ui->actuatorName->text();
}
QString OutputChannelForm::bank()
{
return ui.actuatorBankNumber->text();
return ui->actuatorBankNumber->text();
}
/**
@ -81,18 +83,18 @@ QString OutputChannelForm::bank()
*/
void OutputChannelForm::setName(const QString &name)
{
ui.actuatorName->setText(name);
ui->actuatorName->setText(name);
}
void OutputChannelForm::setColor(const QColor &color)
{
QString stylesheet = ui.actuatorNumberFrame->styleSheet();
QString stylesheet = ui->actuatorNumberFrame->styleSheet();
stylesheet = stylesheet.split("background-color").first();
stylesheet.append(
QString("background-color: rgb(%1, %2, %3)")
.arg(color.red()).arg(color.green()).arg(color.blue()));
ui.actuatorNumberFrame->setStyleSheet(stylesheet);
ui->actuatorNumberFrame->setStyleSheet(stylesheet);
}
/**
@ -100,7 +102,7 @@ void OutputChannelForm::setColor(const QColor &color)
*/
void OutputChannelForm::setBank(const QString &bank)
{
ui.actuatorBankNumber->setText(bank);
ui->actuatorBankNumber->setText(bank);
}
/**
@ -116,14 +118,14 @@ void OutputChannelForm::enableChannelTest(bool state)
if (m_inChannelTest) {
// Prevent stupid users from touching the minimum & maximum ranges while
// moving the sliders. Thanks Ivan for the tip :)
ui.actuatorMin->setEnabled(false);
ui.actuatorMax->setEnabled(false);
ui.actuatorRev->setEnabled(false);
ui->actuatorMin->setEnabled(false);
ui->actuatorMax->setEnabled(false);
ui->actuatorRev->setEnabled(false);
} else if (m_mixerType != "Disabled") {
ui.actuatorMin->setEnabled(true);
ui.actuatorMax->setEnabled(true);
ui->actuatorMin->setEnabled(true);
ui->actuatorMax->setEnabled(true);
if (m_mixerType != "Motor") {
ui.actuatorRev->setEnabled(true);
ui->actuatorRev->setEnabled(true);
}
}
}
@ -147,13 +149,13 @@ void OutputChannelForm::linkToggled(bool state)
QList<OutputChannelForm *> outputChannelForms = parent()->findChildren<OutputChannelForm *>();
// set the linked channels of the parent widget to the same value
foreach(OutputChannelForm * outputChannelForm, outputChannelForms) {
if (!outputChannelForm->ui.actuatorLink->checkState()) {
if (!outputChannelForm->ui->actuatorLink->checkState()) {
continue;
}
if (this == outputChannelForm) {
continue;
}
int value = outputChannelForm->ui.actuatorNeutral->value();
int value = outputChannelForm->ui->actuatorNeutral->value();
if (min > value) {
min = value;
}
@ -165,16 +167,16 @@ void OutputChannelForm::linkToggled(bool state)
}
// set the linked channels to the same value
foreach(OutputChannelForm * outputChannelForm, outputChannelForms) {
if (!outputChannelForm->ui.actuatorLink->checkState()) {
if (!outputChannelForm->ui->actuatorLink->checkState()) {
continue;
}
outputChannelForm->ui.actuatorNeutral->setValue(min);
outputChannelForm->ui->actuatorNeutral->setValue(min);
}
}
int OutputChannelForm::max() const
{
return ui.actuatorMax->value();
return ui->actuatorMax->value();
}
/**
@ -182,12 +184,12 @@ int OutputChannelForm::max() const
*/
void OutputChannelForm::setMax(int maximum)
{
setRange(ui.actuatorMax->value(), maximum);
setRange(ui->actuatorMax->value(), maximum);
}
int OutputChannelForm::min() const
{
return ui.actuatorMin->value();
return ui->actuatorMin->value();
}
/**
@ -195,12 +197,12 @@ int OutputChannelForm::min() const
*/
void OutputChannelForm::setMin(int minimum)
{
setRange(minimum, ui.actuatorMin->value());
setRange(minimum, ui->actuatorMin->value());
}
int OutputChannelForm::neutral() const
{
return ui.actuatorNeutral->value();
return ui->actuatorNeutral->value();
}
/**
@ -208,7 +210,7 @@ int OutputChannelForm::neutral() const
*/
void OutputChannelForm::setNeutral(int value)
{
ui.actuatorNeutral->setValue(value);
ui->actuatorNeutral->setValue(value);
}
/**
@ -216,8 +218,8 @@ void OutputChannelForm::setNeutral(int value)
*/
void OutputChannelForm::setRange(int minimum, int maximum)
{
ui.actuatorMin->setValue(minimum);
ui.actuatorMax->setValue(maximum);
ui->actuatorMin->setValue(minimum);
ui->actuatorMax->setValue(maximum);
setChannelRange();
}
@ -230,70 +232,70 @@ void OutputChannelForm::setRange(int minimum, int maximum)
*/
void OutputChannelForm::setChannelRange()
{
int minValue = ui.actuatorMin->value();
int maxValue = ui.actuatorMax->value();
int minValue = ui->actuatorMin->value();
int maxValue = ui->actuatorMax->value();
int oldMini = ui.actuatorNeutral->minimum();
int oldMaxi = ui.actuatorNeutral->maximum();
int oldMini = ui->actuatorNeutral->minimum();
int oldMaxi = ui->actuatorNeutral->maximum();
m_mixerType = outputMixerType();
// Red handle for Motors
if ((m_mixerType == "Motor") || (m_mixerType == "ReversableMotor")) {
ui.actuatorNeutral->setStyleSheet("QSlider::handle:horizontal { background: rgb(255, 100, 100); width: 18px; height: 28px;"
"margin: -3px 0; border-radius: 3px; border: 1px solid #777; }");
ui->actuatorNeutral->setStyleSheet("QSlider::handle:horizontal { background: rgb(255, 100, 100); width: 18px; height: 28px;"
"margin: -3px 0; border-radius: 3px; border: 1px solid #777; }");
} else {
ui.actuatorNeutral->setStyleSheet("QSlider::handle:horizontal { background: rgb(196, 196, 196); width: 18px; height: 28px;"
"margin: -3px 0; border-radius: 3px; border: 1px solid #777; }");
ui->actuatorNeutral->setStyleSheet("QSlider::handle:horizontal { background: rgb(196, 196, 196); width: 18px; height: 28px;"
"margin: -3px 0; border-radius: 3px; border: 1px solid #777; }");
}
// Normal motor will be *** never *** reversed : without arming a "Min" value (like 1900) can be applied !
if (m_mixerType == "Motor") {
if (minValue >= maxValue) {
// Keep old values
ui.actuatorMin->setValue(oldMini);
ui.actuatorMax->setValue(oldMaxi);
ui->actuatorMin->setValue(oldMini);
ui->actuatorMax->setValue(oldMaxi);
}
ui.actuatorRev->setChecked(false);
ui.actuatorRev->setEnabled(false);
ui.actuatorNeutral->setInvertedAppearance(false);
ui.actuatorNeutral->setRange(ui.actuatorMin->value(), ui.actuatorMax->value());
ui->actuatorRev->setChecked(false);
ui->actuatorRev->setEnabled(false);
ui->actuatorNeutral->setInvertedAppearance(false);
ui->actuatorNeutral->setRange(ui->actuatorMin->value(), ui->actuatorMax->value());
} else {
// Others output (!Motor)
// Auto check reverse checkbox SpinBox Min/Max changes
ui.actuatorRev->setEnabled(true);
ui->actuatorRev->setEnabled(true);
if (minValue <= maxValue) {
ui.actuatorRev->setChecked(false);
ui.actuatorNeutral->setInvertedAppearance(false);
ui.actuatorNeutral->setRange(minValue, maxValue);
ui->actuatorRev->setChecked(false);
ui->actuatorNeutral->setInvertedAppearance(false);
ui->actuatorNeutral->setRange(minValue, maxValue);
} else {
ui.actuatorRev->setChecked(true);
ui.actuatorNeutral->setInvertedAppearance(true);
ui.actuatorNeutral->setRange(maxValue, minValue);
ui->actuatorRev->setChecked(true);
ui->actuatorNeutral->setInvertedAppearance(true);
ui->actuatorNeutral->setRange(maxValue, minValue);
}
}
// If old neutral was Min, stay Min
if (ui.actuatorNeutral->value() == oldMini) {
ui.actuatorNeutral->setValue(ui.actuatorNeutral->minimum());
if (ui->actuatorNeutral->value() == oldMini) {
ui->actuatorNeutral->setValue(ui->actuatorNeutral->minimum());
}
// Enable only outputs already set in mixer
if (m_mixerType != "Disabled") {
ui.actuatorMin->setEnabled(true);
ui.actuatorMax->setEnabled(true);
ui.actuatorNeutral->setEnabled(true);
ui.actuatorValue->setEnabled(true);
ui.actuatorLink->setEnabled(true);
ui->actuatorMin->setEnabled(true);
ui->actuatorMax->setEnabled(true);
ui->actuatorNeutral->setEnabled(true);
ui->actuatorValue->setEnabled(true);
ui->actuatorLink->setEnabled(true);
} else {
ui.actuatorMin->setEnabled(false);
ui.actuatorMax->setEnabled(false);
ui.actuatorRev->setEnabled(false);
ui.actuatorLink->setEnabled(false);
ui.actuatorMin->setValue(1000);
ui.actuatorMax->setValue(1000);
ui.actuatorNeutral->setRange(minValue, maxValue);
ui.actuatorNeutral->setValue(minValue);
ui.actuatorValue->setEnabled(false);
ui->actuatorMin->setEnabled(false);
ui->actuatorMax->setEnabled(false);
ui->actuatorRev->setEnabled(false);
ui->actuatorLink->setEnabled(false);
ui->actuatorMin->setValue(1000);
ui->actuatorMax->setValue(1000);
ui->actuatorNeutral->setRange(minValue, maxValue);
ui->actuatorNeutral->setValue(minValue);
ui->actuatorValue->setEnabled(false);
}
}
@ -303,13 +305,13 @@ void OutputChannelForm::setChannelRange()
void OutputChannelForm::reverseChannel(bool state)
{
// if 'state' (reverse channel requested) apply only if not already reversed
if ((state && (ui.actuatorMax->value() > ui.actuatorMin->value()))
|| (!state && (ui.actuatorMax->value() < ui.actuatorMin->value()))) {
if ((state && (ui->actuatorMax->value() > ui->actuatorMin->value()))
|| (!state && (ui->actuatorMax->value() < ui->actuatorMin->value()))) {
// Now, swap the min & max values (spin boxes)
int temp = ui.actuatorMax->value();
ui.actuatorMax->setValue(ui.actuatorMin->value());
ui.actuatorMin->setValue(temp);
ui.actuatorNeutral->setInvertedAppearance(state);
int temp = ui->actuatorMax->value();
ui->actuatorMax->setValue(ui->actuatorMin->value());
ui->actuatorMin->setValue(temp);
ui->actuatorNeutral->setInvertedAppearance(state);
setChannelRange();
return;
@ -331,9 +333,9 @@ void OutputChannelForm::sendChannelTest(int value)
}
// update the label
ui.actuatorValue->setValue(value);
ui->actuatorValue->setValue(value);
if (ui.actuatorLink->checkState() && parent()) {
if (ui->actuatorLink->checkState() && parent()) {
// the channel is linked to other channels
QList<OutputChannelForm *> outputChannelForms = parent()->findChildren<OutputChannelForm *>();
// set the linked channels of the parent widget to the same value
@ -341,24 +343,24 @@ void OutputChannelForm::sendChannelTest(int value)
if (this == outputChannelForm) {
continue;
}
if (!outputChannelForm->ui.actuatorLink->checkState()) {
if (!outputChannelForm->ui->actuatorLink->checkState()) {
continue;
}
int val = in_value;
if (val < outputChannelForm->ui.actuatorNeutral->minimum()) {
val = outputChannelForm->ui.actuatorNeutral->minimum();
if (val < outputChannelForm->ui->actuatorNeutral->minimum()) {
val = outputChannelForm->ui->actuatorNeutral->minimum();
}
if (val > outputChannelForm->ui.actuatorNeutral->maximum()) {
val = outputChannelForm->ui.actuatorNeutral->maximum();
if (val > outputChannelForm->ui->actuatorNeutral->maximum()) {
val = outputChannelForm->ui->actuatorNeutral->maximum();
}
if (outputChannelForm->ui.actuatorNeutral->value() == val) {
if (outputChannelForm->ui->actuatorNeutral->value() == val) {
continue;
}
outputChannelForm->ui.actuatorNeutral->setValue(val);
outputChannelForm->ui.actuatorValue->setValue(val);
outputChannelForm->ui->actuatorNeutral->setValue(val);
outputChannelForm->ui->actuatorValue->setValue(val);
}
}

9
ground/gcs/src/plugins/config/outputchannelform.h
View File

@ -29,9 +29,12 @@
#include "channelform.h"
#include "configoutputwidget.h"
#include "ui_outputchannelform.h"
#include <QWidget>
namespace Ui {
class outputChannelForm;
}
class QWidget;
class OutputChannelForm : public ChannelForm {
Q_OBJECT
@ -64,7 +67,7 @@ signals:
void channelChanged(int index, int value);
private:
Ui::outputChannelForm ui;
Ui::outputChannelForm *ui;
bool m_inChannelTest;
QString m_mixerType;

26
ground/gcs/src/plugins/consolegadget/consolegadget.pro
View File

@ -1,15 +1,21 @@
TEMPLATE = lib
TARGET = ConsoleGadget
include(../../plugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
HEADERS += consoleplugin.h \
texteditloggerengine.h
HEADERS += consolegadget.h
HEADERS += consolegadgetwidget.h
HEADERS += consolegadgetfactory.h
SOURCES += consoleplugin.cpp \
texteditloggerengine.cpp
SOURCES += consolegadget.cpp
SOURCES += consolegadgetfactory.cpp
SOURCES += consolegadgetwidget.cpp
HEADERS += \
consoleplugin.h \
texteditloggerengine.h \
consolegadget.h \
consolegadgetwidget.h \
consolegadgetfactory.h
SOURCES += \
consoleplugin.cpp \
texteditloggerengine.cpp \
consolegadget.cpp \
consolegadgetfactory.cpp \
consolegadgetwidget.cpp
OTHER_FILES += ConsoleGadget.pluginspec

29
ground/gcs/src/plugins/coreplugin/coreplugin.pro
View File

@ -1,14 +1,9 @@
TEMPLATE = lib
TARGET = Core
DEFINES += CORE_LIBRARY
QT += qml \
quick \
xml \
network \
script \
svg \
sql
QT += widgets qml quick xml network script svg sql
include(../../plugin.pri)
include(../../libs/utils/utils.pri)
@ -17,15 +12,18 @@ include(../../shared/scriptwrapper/scriptwrapper.pri)
include(coreplugin_dependencies.pri)
include(authorsdialog.pri)
INCLUDEPATH += dialogs \
INCLUDEPATH += \
dialogs \
uavgadgetmanager \
actionmanager
DEPENDPATH += dialogs \
DEPENDPATH += \
dialogs \
uavgadgetmanager \
actionmanager
SOURCES += mainwindow.cpp \
SOURCES += \
mainwindow.cpp \
tabpositionindicator.cpp \
fancyactionbar.cpp \
fancytabwidget.cpp \
@ -72,7 +70,8 @@ SOURCES += mainwindow.cpp \
uavconfiginfo.cpp \
aboutdialog.cpp \
HEADERS += mainwindow.h \
HEADERS += \
mainwindow.h \
tabpositionindicator.h \
fancyactionbar.h \
fancytabwidget.h \
@ -132,13 +131,15 @@ HEADERS += mainwindow.h \
iconfigurableplugin.h \
aboutdialog.h
FORMS += dialogs/settingsdialog.ui \
FORMS += \
dialogs/settingsdialog.ui \
dialogs/shortcutsettings.ui \
generalsettings.ui \
uavgadgetoptionspage.ui \
workspacesettings.ui
RESOURCES += core.qrc \
RESOURCES += \
core.qrc \
fancyactionbar.qrc
unix:!macx {

12
ground/gcs/src/plugins/coreplugin/generalsettings.cpp
View File

@ -29,17 +29,17 @@
#include "generalsettings.h"
#include "ui_generalsettings.h"
#include <utils/stylehelper.h>
#include <utils/qtcolorbutton.h>
#include <utils/consoleprocess.h>
#include <coreplugin/icore.h>
#include <QMessageBox>
#include <QtCore/QDir>
#include <QtCore/QLibraryInfo>
#include <QtCore/QSettings>
#include "ui_generalsettings.h"
#include <QDir>
#include <QLibraryInfo>
#include <QSettings>
using namespace Utils;
using namespace Core::Internal;

3
ground/gcs/src/plugins/coreplugin/generalsettings.h
View File

@ -30,7 +30,8 @@
#define GENERALSETTINGS_H
#include <coreplugin/dialogs/ioptionspage.h>
#include <QtCore/QPointer>
#include <QPointer>
#include <QWidget>
#include <QSettings>

3
ground/gcs/src/plugins/coreplugin/iuavgadget.h
View File

@ -31,12 +31,11 @@
#include <coreplugin/icontext.h>
#include <coreplugin/core_global.h>
#include <QComboBox>
#include <QtCore/QSettings>
QT_BEGIN_NAMESPACE
class QWidget;
class QComboBox;
class QSettings;
QT_END_NAMESPACE
namespace Core {

26
ground/gcs/src/plugins/debuggadget/debuggadget.pro
View File

@ -1,18 +1,24 @@
TEMPLATE = lib
TARGET = DebugGadget
QT += widgets
include(../../plugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
HEADERS += debugplugin.h \
debugengine.h
HEADERS += debuggadget.h
HEADERS += debuggadgetwidget.h
HEADERS += debuggadgetfactory.h
SOURCES += debugplugin.cpp \
debugengine.cpp
SOURCES += debuggadget.cpp
SOURCES += debuggadgetfactory.cpp
SOURCES += debuggadgetwidget.cpp
HEADERS += \
debugplugin.h \
debugengine.h \
debuggadget.h \
debuggadgetwidget.h \
debuggadgetfactory.h
SOURCES += \
debugplugin.cpp \
debugengine.cpp \
debuggadget.cpp \
debuggadgetfactory.cpp \
debuggadgetwidget.cpp
OTHER_FILES += DebugGadget.pluginspec

36
ground/gcs/src/plugins/dial/dial.pro
View File

@ -1,22 +1,30 @@
TEMPLATE = lib
TARGET = DialGadget
QT += svg
QT += opengl
QT += svg opengl
include(../../plugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(dial_dependencies.pri)
HEADERS += dialplugin.h
HEADERS += dialgadget.h
HEADERS += dialgadgetwidget.h
HEADERS += dialgadgetfactory.h
HEADERS += dialgadgetconfiguration.h
HEADERS += dialgadgetoptionspage.h
SOURCES += dialplugin.cpp
SOURCES += dialgadget.cpp
SOURCES += dialgadgetfactory.cpp
SOURCES += dialgadgetwidget.cpp
SOURCES += dialgadgetconfiguration.cpp
SOURCES += dialgadgetoptionspage.cpp
HEADERS += \
dialplugin.h \
dialgadget.h \
dialgadgetwidget.h \
dialgadgetfactory.h \
dialgadgetconfiguration.h \
dialgadgetoptionspage.h
SOURCES += \
dialplugin.cpp \
dialgadget.cpp \
dialgadgetfactory.cpp \
dialgadgetwidget.cpp \
dialgadgetconfiguration.cpp \
dialgadgetoptionspage.cpp
OTHER_FILES += DialGadget.pluginspec
FORMS += dialgadgetoptionspage.ui
RESOURCES += dial.qrc

8
ground/gcs/src/plugins/donothing/donothing.pro
View File

@ -1,11 +1,13 @@
TEMPLATE = lib
TARGET = DoNothing
include(../../plugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
HEADERS += donothingplugin.h
SOURCES += donothingplugin.cpp
HEADERS += \
donothingplugin.h
SOURCES += \
donothingplugin.cpp
OTHER_FILES += DoNothing.pluginspec

21
ground/gcs/src/plugins/emptygadget/emptygadget.pro
View File

@ -1,16 +1,21 @@
TEMPLATE = lib
TARGET = EmptyGadget
QT += widgets
include(../../plugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
HEADERS += emptyplugin.h
HEADERS += emptygadget.h
HEADERS += emptygadgetwidget.h
HEADERS += emptygadgetfactory.h
SOURCES += emptyplugin.cpp
SOURCES += emptygadget.cpp
SOURCES += emptygadgetfactory.cpp
SOURCES += emptygadgetwidget.cpp
HEADERS += \
emptyplugin.h \
emptygadget.h \
emptygadgetwidget.h \
emptygadgetfactory.h
SOURCES += \
emptyplugin.cpp \
emptygadget.cpp \
emptygadgetfactory.cpp \
emptygadgetwidget.cpp
OTHER_FILES += EmptyGadget.pluginspec

12
ground/gcs/src/plugins/flightlog/flightlog.pro
View File

@ -1,7 +1,7 @@
TEMPLATE = lib
TARGET = FlightLog
QT += qml quick
QT += widgets qml quick
include(../../plugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
@ -9,12 +9,16 @@ include(../../plugins/uavobjects/uavobjects.pri)
include(../../plugins/uavobjectutil/uavobjectutil.pri)
include(../../plugins/uavtalk/uavtalk.pri)
HEADERS += flightlogplugin.h \
HEADERS += \
flightlogplugin.h \
flightlogmanager.h
SOURCES += flightlogplugin.cpp \
SOURCES += \
flightlogplugin.cpp \
flightlogmanager.cpp
OTHER_FILES += Flightlog.pluginspec \
OTHER_FILES += \
Flightlog.pluginspec \
FlightLogDialog.qml \
functions.js

65
ground/gcs/src/plugins/gpsdisplay/gpsdisplay.pro
View File

@ -1,36 +1,45 @@
TEMPLATE = lib
TARGET = GpsDisplayGadget
QT += svg
QT += serialport
QT += svg serialport
include(../../plugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(gpsdisplay_dependencies.pri)
include(../../libs/qwt/qwt.pri)
HEADERS += gpsdisplayplugin.h
HEADERS += gpsconstellationwidget.h
HEADERS += gpsparser.h
HEADERS += telemetryparser.h
HEADERS += gpssnrwidget.h
HEADERS += buffer.h
HEADERS += nmeaparser.h
HEADERS += gpsdisplaygadget.h
HEADERS += gpsdisplaywidget.h
HEADERS += gpsdisplaygadgetfactory.h
HEADERS += gpsdisplaygadgetconfiguration.h
HEADERS += gpsdisplaygadgetoptionspage.h
SOURCES += gpsdisplayplugin.cpp
SOURCES += gpsconstellationwidget.cpp
SOURCES += gpsparser.cpp
SOURCES += telemetryparser.cpp
SOURCES += gpssnrwidget.cpp
SOURCES += buffer.cpp
SOURCES += nmeaparser.cpp
SOURCES += gpsdisplaygadget.cpp
SOURCES += gpsdisplaygadgetfactory.cpp
SOURCES += gpsdisplaywidget.cpp
SOURCES += gpsdisplaygadgetconfiguration.cpp
SOURCES += gpsdisplaygadgetoptionspage.cpp
HEADERS += \
gpsdisplayplugin.h \
gpsconstellationwidget.h \
gpsparser.h \
telemetryparser.h \
gpssnrwidget.h \
buffer.h \
nmeaparser.h \
gpsdisplaygadget.h \
gpsdisplaywidget.h \
gpsdisplaygadgetfactory.h \
gpsdisplaygadgetconfiguration.h \
gpsdisplaygadgetoptionspage.h
SOURCES += \
gpsdisplayplugin.cpp \
gpsconstellationwidget.cpp \
gpsparser.cpp \
telemetryparser.cpp \
gpssnrwidget.cpp \
buffer.cpp \
nmeaparser.cpp \
gpsdisplaygadget.cpp \
gpsdisplaygadgetfactory.cpp \
gpsdisplaywidget.cpp \
gpsdisplaygadgetconfiguration.cpp \
gpsdisplaygadgetoptionspage.cpp
OTHER_FILES += GpsDisplayGadget.pluginspec
FORMS += gpsdisplaygadgetoptionspage.ui
FORMS += gpsdisplaywidget.ui
FORMS += \
gpsdisplaygadgetoptionspage.ui \
gpsdisplaywidget.ui
RESOURCES += widgetresources.qrc

6
ground/gcs/src/plugins/hitl/aerosimrc/src/udptest.pro
View File

@ -1,9 +1,9 @@
include(../../../../../gcs.pri)
TEMPLATE = app
TARGET = udp_test
QT += core gui network widgets
TEMPLATE = app
TARGET = udp_test
include(../../../../../gcs.pri)
HEADERS += \
udptestwidget.h

11
ground/gcs/src/plugins/hitl/hitlwidget.cpp
View File

@ -25,12 +25,8 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "hitlwidget.h"
#include "ui_hitlwidget.h"
#include <QDebug>
#include <QFile>
#include <QDir>
#include <QDateTime>
#include <QThread>
#include <hitlplugin.h>
#include <simulator.h>
@ -38,6 +34,11 @@
#include "coreplugin/icore.h"
#include "coreplugin/threadmanager.h"
#include <QDebug>
#include <QFile>
#include <QDir>
#include <QDateTime>
#include <QThread>
QStringList Simulator::instances;

4
ground/gcs/src/plugins/hitl/hitlwidget.h
View File

@ -28,10 +28,10 @@
#ifndef HITLWIDGET_H
#define HITLWIDGET_H
#include <QWidget>
#include <QProcess>
#include "simulator.h"
#include <QWidget>
class Ui_HITLWidget;
class HITLWidget : public QWidget {

16
ground/gcs/src/plugins/hitl/plugin.pro
View File

@ -1,11 +1,13 @@
TEMPLATE = lib
TARGET = HITL
QT += network
QT += widgets network
include(../../plugin.pri)
include(hitl_dependencies.pri)
HEADERS += hitlplugin.h \
HEADERS += \
hitlplugin.h \
hitlwidget.h \
hitloptionspage.h \
hitlfactory.h \
@ -18,7 +20,9 @@ HEADERS += hitlplugin.h \
il2simulator.h \
xplanesimulator9.h \
xplanesimulator10.h
SOURCES += hitlplugin.cpp \
SOURCES += \
hitlplugin.cpp \
hitlwidget.cpp \
hitloptionspage.cpp \
hitlfactory.cpp \
@ -31,9 +35,13 @@ SOURCES += hitlplugin.cpp \
il2simulator.cpp \
xplanesimulator9.cpp \
xplanesimulator10.cpp
OTHER_FILES += hitl.pluginspec
FORMS += hitloptionspage.ui \
FORMS += \
hitloptionspage.ui \
hitlwidget.ui
RESOURCES += hitlresources.qrc

18
ground/gcs/src/plugins/importexport/importexport.pro
View File

@ -1,15 +1,25 @@
TEMPLATE = lib
TARGET = ImportExportGadget
DEFINES += IMPORTEXPORT_LIBRARY
QT += xml
QT += xml widgets
include(../../plugin.pri)
include(importexport_dependencies.pri)
HEADERS += importexportplugin.h \
HEADERS += \
importexportplugin.h \
importexportgadgetwidget.h \
importexportdialog.h
SOURCES += importexportplugin.cpp \
SOURCES += \
importexportplugin.cpp \
importexportgadgetwidget.cpp \
importexportdialog.cpp
OTHER_FILES += ImportExportGadget.pluginspec
FORMS += importexportgadgetwidget.ui \
FORMS += \
importexportgadgetwidget.ui \
importexportdialog.ui

18
ground/gcs/src/plugins/ipconnection/ipconnection.pro
View File

@ -1,17 +1,27 @@
TEMPLATE = lib
TARGET = IPconnection
QT += network widgets
DEFINES += IPconnection_LIBRARY
include(../../plugin.pri)
include(ipconnection_dependencies.pri)
HEADERS += ipconnectionplugin.h \
HEADERS += \
ipconnectionplugin.h \
ipconnection_global.h \
ipconnectionconfiguration.h \
ipconnectionoptionspage.h \
ipconnection_internal.h
SOURCES += ipconnectionplugin.cpp \
SOURCES += \
ipconnectionplugin.cpp \
ipconnectionconfiguration.cpp \
ipconnectionoptionspage.cpp
FORMS += ipconnectionoptionspage.ui
RESOURCES +=
DEFINES += IPconnection_LIBRARY
OTHER_FILES += IPconnection.pluginspec
QT += network

36
ground/gcs/src/plugins/lineardial/lineardial.pro
View File

@ -1,22 +1,30 @@
TEMPLATE = lib
TARGET = LineardialGadget
QT += svg
QT += opengl
QT += widgets svg opengl
include(../../plugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(lineardial_dependencies.pri)
HEADERS += lineardialplugin.h
HEADERS += lineardialgadget.h
HEADERS += lineardialgadgetwidget.h
HEADERS += lineardialgadgetfactory.h
HEADERS += lineardialgadgetconfiguration.h
HEADERS += lineardialgadgetoptionspage.h
SOURCES += lineardialplugin.cpp
SOURCES += lineardialgadget.cpp
SOURCES += lineardialgadgetfactory.cpp
SOURCES += lineardialgadgetwidget.cpp
SOURCES += lineardialgadgetconfiguration.cpp
SOURCES += lineardialgadgetoptionspage.cpp
HEADERS += \
lineardialplugin.h \
lineardialgadget.h \
lineardialgadgetwidget.h \
lineardialgadgetfactory.h \
lineardialgadgetconfiguration.h \
lineardialgadgetoptionspage.h
SOURCES += \
lineardialplugin.cpp \
lineardialgadget.cpp \
lineardialgadgetfactory.cpp \
lineardialgadgetwidget.cpp \
lineardialgadgetconfiguration.cpp \
lineardialgadgetoptionspage.cpp
OTHER_FILES += LineardialGadget.pluginspec
FORMS += lineardialgadgetoptionspage.ui
RESOURCES += lineardial.qrc

10
ground/gcs/src/plugins/logging/logging.pro
View File

@ -1,17 +1,21 @@
TEMPLATE = lib
TARGET = LoggingGadget
DEFINES += LOGGING_LIBRARY
QT += svg
include(../../plugin.pri)
include(logging_dependencies.pri)
HEADERS += loggingplugin.h \
HEADERS += \
loggingplugin.h \
logginggadgetwidget.h \
logginggadget.h \
logginggadgetfactory.h
SOURCES += loggingplugin.cpp \
SOURCES += \
loggingplugin.cpp \
logginggadgetwidget.cpp \
logginggadget.cpp \
logginggadgetfactory.cpp

23
ground/gcs/src/plugins/magicwaypoint/magicwaypoint.pro
View File

@ -1,22 +1,25 @@
TEMPLATE = lib
TARGET = MagicWaypoint
QT += svg
include(../../plugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../plugins/uavobjects/uavobjects.pri)
HEADERS += magicwaypointgadget.h
HEADERS += magicwaypointgadgetwidget.h
HEADERS += magicwaypointgadgetfactory.h
HEADERS += magicwaypointplugin.h
HEADERS += positionfield.h
HEADERS += \
magicwaypointgadget.h \
magicwaypointgadgetwidget.h \
magicwaypointgadgetfactory.h \
magicwaypointplugin.h \
positionfield.h
SOURCES += magicwaypointgadget.cpp
SOURCES += magicwaypointgadgetwidget.cpp
SOURCES += magicwaypointgadgetfactory.cpp
SOURCES += magicwaypointplugin.cpp
SOURCES += positionfield.cpp
SOURCES += \
magicwaypointgadget.cpp \
magicwaypointgadgetwidget.cpp \
magicwaypointgadgetfactory.cpp \
magicwaypointplugin.cpp \
positionfield.cpp
OTHER_FILES += MagicWaypoint.pluginspec

13
ground/gcs/src/plugins/notify/notify.pro
View File

@ -1,21 +1,22 @@
TEMPLATE = lib
TARGET = NotifyPlugin
QT += widgets multimedia
include(../../plugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(notifyplugin_dependencies.pri)
QT += multimedia
HEADERS += notifyplugin.h \
HEADERS += \
notifyplugin.h \
notifypluginoptionspage.h \
notifyitemdelegate.h \
notifytablemodel.h \
notificationitem.h \
notifylogging.h
SOURCES += notifyplugin.cpp \
SOURCES += \
notifyplugin.cpp \
notifypluginoptionspage.cpp \
notifyitemdelegate.cpp \
notifytablemodel.cpp \
@ -29,5 +30,3 @@ FORMS += \
RESOURCES += \
res.qrc

1
ground/gcs/src/plugins/notify/notifyplugin_dependencies.pri
View File

@ -1,3 +1,2 @@
include(../../plugins/uavtalk/uavtalk.pri)
include(../../plugins/uavobjects/uavobjects.pri)

4
ground/gcs/src/plugins/ophid/ophid.pro
View File

@ -1,6 +1,8 @@
TEMPLATE = lib
TARGET = opHID
QT += widgets
DEFINES += OPHID_LIBRARY
//DEFINES += OPHID_DEBUG_ON
@ -25,7 +27,9 @@ SOURCES += \
src/ophid_hidapi.cpp
FORMS +=
RESOURCES +=
OTHER_FILES += opHID.pluginspec
INCLUDEPATH += ./inc

15
ground/gcs/src/plugins/opmap/opmap.pro
View File

@ -1,10 +1,12 @@
QT += xml
TEMPLATE = lib
TARGET = OPMapGadget
QT += widgets xml
PATHPLANNER {
DEFINES += USE_PATHPLANNER
}
TARGET = OPMapGadget
include(../../plugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../libs/opmapcontrol/opmapcontrol.pri)
@ -13,7 +15,8 @@ include(../../plugins/uavobjectutil/uavobjectutil.pri)
include(../../plugins/uavtalk/uavtalk.pri)
include(../../libs/utils/utils.pri)
HEADERS += opmapplugin.h \
HEADERS += \
opmapplugin.h \
opmapgadgetoptionspage.h \
opmapgadgetfactory.h \
opmapgadgetconfiguration.h \
@ -29,7 +32,8 @@ HEADERS += opmapplugin.h \
modeluavoproxy.h \
homeeditor.h
SOURCES += opmapplugin.cpp \
SOURCES += \
opmapplugin.cpp \
opmapgadgetwidget.cpp \
opmapgadgetoptionspage.cpp \
opmapgadgetfactory.cpp \
@ -47,7 +51,8 @@ SOURCES += opmapplugin.cpp \
OTHER_FILES += OPMapGadget.pluginspec
FORMS += opmapgadgetoptionspage.ui \
FORMS += \
opmapgadgetoptionspage.ui \
opmap_widget.ui \
opmap_edit_waypoint_dialog.ui \
opmap_zoom_slider_widget.ui \

39
ground/gcs/src/plugins/pathactioneditor/pathactioneditor.pro
View File

@ -1,33 +1,34 @@
TEMPLATE = lib
TARGET = PathActionEditor
QT += widgets
include(../../plugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../plugins/uavobjects/uavobjects.pri)
HEADERS += pathactioneditorgadget.h
HEADERS += pathactioneditorgadgetwidget.h
HEADERS += pathactioneditorgadgetfactory.h
HEADERS += pathactioneditorplugin.h
HEADERS += pathactioneditortreemodel.h
HEADERS += treeitem.h
HEADERS += fieldtreeitem.h
HEADERS += browseritemdelegate.h
SOURCES += pathactioneditorgadget.cpp
SOURCES += pathactioneditorgadgetwidget.cpp
SOURCES += pathactioneditorgadgetfactory.cpp
SOURCES += pathactioneditorplugin.cpp
SOURCES += pathactioneditortreemodel.cpp
SOURCES += treeitem.cpp
SOURCES += fieldtreeitem.cpp
SOURCES += browseritemdelegate.cpp
HEADERS += \
pathactioneditorgadget.h \
pathactioneditorgadgetwidget.h \
pathactioneditorgadgetfactory.h \
pathactioneditorplugin.h \
pathactioneditortreemodel.h \
treeitem.h \
fieldtreeitem.h \
browseritemdelegate.h
SOURCES += \
pathactioneditorgadget.cpp \
pathactioneditorgadgetwidget.cpp \
pathactioneditorgadgetfactory.cpp \
pathactioneditorplugin.cpp \
pathactioneditortreemodel.cpp \
treeitem.cpp \
fieldtreeitem.cpp \
browseritemdelegate.cpp
OTHER_FILES += pathactioneditor.pluginspec
FORMS += pathactioneditor.ui
RESOURCES +=

8
ground/gcs/src/plugins/pathactioneditor/pathactioneditorgadgetwidget.h
View File

@ -27,12 +27,14 @@
#ifndef PathActionEditorGADGETWIDGET_H_
#define PathActionEditorGADGETWIDGET_H_
#include "pathactioneditortreemodel.h"
#include "pathaction.h"
#include "waypoint.h"
#include <QLabel>
#include <QWidget>
#include <QTreeView>
#include "pathaction.h"
#include "waypoint.h"
#include "pathactioneditortreemodel.h"
class Ui_PathActionEditor;

9
ground/gcs/src/plugins/plugins.pro
View File

@ -156,7 +156,7 @@ plugin_ipconnection.subdir = ipconnection
plugin_ipconnection.depends = plugin_coreplugin
SUBDIRS += plugin_ipconnection
#HITL Simulation gadget
# HITL Simulation gadget
plugin_hitl.subdir = hitl
plugin_hitl.depends = plugin_coreplugin
plugin_hitl.depends += plugin_uavobjects
@ -188,12 +188,6 @@ SUBDIRS += plugin_gcscontrol
#plugin_antennatrack.depends += plugin_uavobjects
#SUBDIRS += plugin_antennatrack
# Scope OpenGL Gadget
#plugin_scopeogl.subdir = scopeogl
#plugin_scopeogl.depends = plugin_coreplugin
#plugin_scopeogl.depends += plugin_uavobjects
#SUBDIRS += plugin_scopeogl
# UAV Object Utility plugin
plugin_uavobjectutil.subdir = uavobjectutil
plugin_uavobjectutil.depends = plugin_coreplugin
@ -244,4 +238,3 @@ plugin_usagetracker.depends += plugin_uavobjects
plugin_usagetracker.depends += plugin_uavtalk
plugin_setupwizard.depends += plugin_uavobjectutil
SUBDIRS += plugin_usagetracker

5
ground/gcs/src/plugins/qmlview/qmlview.pro
View File

@ -1,8 +1,7 @@
TEMPLATE = lib
TARGET = QMLView
QT += svg
QT += opengl
QT += qml quick
QT += svg opengl qml quick
include(../../plugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)

2
ground/gcs/src/plugins/scope/scope.pro
View File

@ -1,6 +1,8 @@
TEMPLATE = lib
TARGET = ScopeGadget
QT += widgets
DEFINES += SCOPE_LIBRARY
include(../../plugin.pri)

23
ground/gcs/src/plugins/serialconnection/serialconnection.pro
View File

@ -1,15 +1,24 @@
TEMPLATE = lib
TARGET = Serial
QT += serialport widgets
include(../../plugin.pri)
include(serial_dependencies.pri)
QT += serialport
HEADERS += serialplugin.h \
serialpluginconfiguration.h \
serialpluginoptionspage.h
SOURCES += serialplugin.cpp \
serialpluginconfiguration.cpp \
serialpluginoptionspage.cpp
HEADERS += \
serialplugin.h \
serialpluginconfiguration.h \
serialpluginoptionspage.h
SOURCES += \
serialplugin.cpp \
serialpluginconfiguration.cpp \
serialpluginoptionspage.cpp
FORMS += \
serialpluginoptions.ui
RESOURCES +=
OTHER_FILES += Serial.pluginspec

4
ground/gcs/src/plugins/serialconnection/serialplugin.cpp
View File

@ -30,12 +30,8 @@
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/icore.h>
#include <QtCore/QtPlugin>
#include <QMainWindow>
#include <QDebug>
SerialEnumerationThread::SerialEnumerationThread(SerialConnection *serial)
: m_serial(serial), m_running(false)
{}

4
ground/gcs/src/plugins/setupwizard/outputcalibrationutil.cpp
View File

@ -27,12 +27,16 @@
*/
#include "outputcalibrationutil.h"
#include "uavobject.h"
#include "uavobjectmanager.h"
#include "extensionsystem/pluginmanager.h"
#include "vehicleconfigurationhelper.h"
#include "manualcontrolsettings.h"
#include <QDebug>
bool OutputCalibrationUtil::c_prepared = false;
ActuatorCommand::Metadata OutputCalibrationUtil::c_savedActuatorCommandMetaData;

2
ground/gcs/src/plugins/setupwizard/outputcalibrationutil.h
View File

@ -30,8 +30,8 @@
#define OUTPUTCALIBRATIONUTIL_H
#include <QObject>
#include "actuatorcommand.h"
#include "actuatorcommand.h"
class OutputCalibrationUtil : public QObject {
Q_OBJECT

3
ground/gcs/src/plugins/setupwizard/pages/savepage.cpp
View File

@ -26,11 +26,14 @@
*/
#include <QMessageBox>
#include "savepage.h"
#include "ui_savepage.h"
#include "setupwizard.h"
#include "vehicleconfigurationhelper.h"
#include <QDebug>
SavePage::SavePage(SetupWizard *wizard, QWidget *parent) :
AbstractWizardPage(wizard, parent),
ui(new Ui::SavePage), m_successfulWrite(false)

10
ground/gcs/src/plugins/setupwizard/setupwizard.pro
View File

@ -1,8 +1,7 @@
TEMPLATE = lib
TARGET = SetupWizard
QT += svg
QT += widgets svg
include(../../plugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
@ -10,7 +9,9 @@ include(../../plugins/uavobjectutil/uavobjectutil.pri)
include(../../plugins/config/config.pri)
LIBS *= -l$$qtLibraryName(Uploader)
HEADERS += setupwizardplugin.h \
HEADERS += \
setupwizardplugin.h \
setupwizard.h \
pages/opstartpage.h \
pages/opendpage.h \
@ -44,7 +45,8 @@ HEADERS += setupwizardplugin.h \
vehicletemplateexportdialog.h \
vehicletemplateselectorwidget.h
SOURCES += setupwizardplugin.cpp \
SOURCES += \
setupwizardplugin.cpp \
setupwizard.cpp \
pages/opstartpage.cpp \
pages/opendpage.cpp \

10
ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
View File

@ -27,7 +27,10 @@
*/
#include "vehicleconfigurationhelper.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectutilmanager.h"
#include "hwsettings.h"
#include "actuatorsettings.h"
#include "attitudesettings.h"
@ -42,10 +45,13 @@
#include "accelgyrosettings.h"
#include "gpssettings.h"
#include "airspeedsettings.h"
#include <QtCore/qmath.h>
#include <QJsonObject>
#include "auxmagsettings.h"
#include <QtCore/qmath.h>
#include <QDebug>
#include <QJsonObject>
#include <QTimer>
VehicleConfigurationHelper::VehicleConfigurationHelper(VehicleConfigurationSource *configSource)
: m_configSource(configSource), m_uavoManager(0),
m_transactionOK(false), m_transactionTimeout(false), m_currentTransactionObjectID(-1),

9
ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.h
View File

@ -28,14 +28,17 @@
#ifndef VEHICLECONFIGURATIONHELPER_H
#define VEHICLECONFIGURATIONHELPER_H
#include <QList>
#include <QPair>
#include "vehicleconfigurationsource.h"
#include "uavobjectmanager.h"
#include "systemsettings.h"
#include "cfg_vehicletypes/vehicleconfig.h"
#include "systemsettings.h"
#include "actuatorsettings.h"
#include <QList>
#include <QPair>
#include <QEventLoop>
struct mixerChannelSettings {
int type;
int throttle1;

32
ground/gcs/src/plugins/systemhealth/systemhealth.pro
View File

@ -1,22 +1,30 @@
TEMPLATE = lib
TARGET = SystemHealthGadget
QT += svg
include(../../plugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(systemhealth_dependencies.pri)
HEADERS += systemhealthplugin.h
HEADERS += systemhealthgadget.h
HEADERS += systemhealthgadgetwidget.h
HEADERS += systemhealthgadgetfactory.h
HEADERS += systemhealthgadgetconfiguration.h
HEADERS += systemhealthgadgetoptionspage.h
SOURCES += systemhealthplugin.cpp
SOURCES += systemhealthgadget.cpp
SOURCES += systemhealthgadgetfactory.cpp
SOURCES += systemhealthgadgetwidget.cpp
SOURCES += systemhealthgadgetconfiguration.cpp
SOURCES += systemhealthgadgetoptionspage.cpp
HEADERS += \
systemhealthplugin.h \
systemhealthgadget.h \
systemhealthgadgetwidget.h \
systemhealthgadgetfactory.h \
systemhealthgadgetconfiguration.h \
systemhealthgadgetoptionspage.h
SOURCES += \
systemhealthplugin.cpp \
systemhealthgadget.cpp \
systemhealthgadgetfactory.cpp \
systemhealthgadgetwidget.cpp \
systemhealthgadgetconfiguration.cpp \
systemhealthgadgetoptionspage.cpp
OTHER_FILES += SystemHealthGadget.pluginspec
FORMS += systemhealthgadgetoptionspage.ui
RESOURCES += \

6
ground/gcs/src/plugins/telemetry/telemetry.pro
View File

@ -7,7 +7,8 @@ QT += svg
include(telemetry_dependencies.pri)
include(../../libs/version_info/version_info.pri)
HEADERS += telemetry_global.h \
HEADERS += \
telemetry_global.h \
telemetryplugin.h \
monitorwidget.h \
monitorgadgetconfiguration.h \
@ -15,7 +16,8 @@ HEADERS += telemetry_global.h \
monitorgadgetfactory.h \
monitorgadgetoptionspage.h
SOURCES += telemetryplugin.cpp \
SOURCES += \
telemetryplugin.cpp \
monitorwidget.cpp \
monitorgadgetconfiguration.cpp \
monitorgadget.cpp \

16
ground/gcs/src/plugins/uavobjectbrowser/uavobjectbrowser.pro
View File

@ -1,8 +1,13 @@
TEMPLATE = lib
TARGET = UAVObjectBrowser
QT += widgets
include(../../plugin.pri)
include(uavobjectbrowser_dependencies.pri)
HEADERS += browserplugin.h \
HEADERS += \
browserplugin.h \
uavobjectbrowserconfiguration.h \
uavobjectbrowser.h \
uavobjectbrowserwidget.h \
@ -12,7 +17,9 @@ HEADERS += browserplugin.h \
treeitem.h \
browseritemdelegate.h \
fieldtreeitem.h
SOURCES += browserplugin.cpp \
SOURCES += \
browserplugin.cpp \
uavobjectbrowserconfiguration.cpp \
uavobjectbrowser.cpp \
uavobjectbrowserfactory.cpp \
@ -22,8 +29,11 @@ SOURCES += browserplugin.cpp \
treeitem.cpp \
browseritemdelegate.cpp \
fieldtreeitem.cpp
OTHER_FILES += UAVObjectBrowser.pluginspec
FORMS += uavobjectbrowser.ui \
FORMS += \
uavobjectbrowser.ui \
uavobjectbrowseroptionspage.ui \
viewoptions.ui

5
ground/gcs/src/plugins/uavobjects/uavobject.cpp
View File

@ -31,7 +31,10 @@
#include <QtEndian>
#include <QDebug>
#include <QtWidgets>
#include <QXmlStreamWriter>
#include <QXmlStreamReader>
#include <QJsonObject>
#include <QJsonArray>
using namespace Utils;

3
ground/gcs/src/plugins/uavobjects/uavobjectmanager.cpp
View File

@ -27,7 +27,8 @@
*/
#include "uavobjectmanager.h"
#include <QtWidgetsDepends>
#include <QJsonObject>
#include <QJsonArray>
/**
* Constructor

1
ground/gcs/src/plugins/uavobjects/uavobjects.pro
View File

@ -17,6 +17,7 @@ HEADERS += \
uavobjectfield.h \
uavobjectsinit.h \
uavobjectsplugin.h
SOURCES += \
uavobject.cpp \
uavmetaobject.cpp \

12
ground/gcs/src/plugins/uavobjectutil/uavobjectutil.pro
View File

@ -1,16 +1,20 @@
TEMPLATE = lib
TARGET = UAVObjectUtil
DEFINES += UAVOBJECTUTIL_LIBRARY
include(../../plugin.pri)
include(uavobjectutil_dependencies.pri)
HEADERS += uavobjectutil_global.h \
uavobjectutilmanager.h \
HEADERS += \
uavobjectutil_global.h \
uavobjectutilmanager.h \
uavobjectutilplugin.h \
devicedescriptorstruct.h \
devicedescriptorstruct.h \
uavobjecthelper.h
SOURCES += uavobjectutilmanager.cpp \
SOURCES += \
uavobjectutilmanager.cpp \
uavobjectutilplugin.cpp \
uavobjecthelper.cpp

10
ground/gcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
View File

@ -30,15 +30,15 @@
#include "utils/homelocationutil.h"
#include "objectpersistence.h"
#include "firmwareiapobj.h"
#include "homelocation.h"
#include "gpspositionsensor.h"
#include <QMutexLocker>
#include <QDebug>
#include <QEventLoop>
#include <QTimer>
#include <objectpersistence.h>
#include "firmwareiapobj.h"
#include "homelocation.h"
#include "gpspositionsensor.h"
// ******************************
// constructor/destructor

7
ground/gcs/src/plugins/uavobjectutil/uavobjectutilmanager.h
View File

@ -34,16 +34,17 @@
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include "objectpersistence.h"
#include "devicedescriptorstruct.h"
#include "objectpersistence.h"
#include "firmwareiapobj.h"
#include <QtGlobal>
#include <QObject>
#include <QTimer>
#include <QMutex>
#include <QQueue>
#include <QComboBox>
#include <QDateTime>
#include <firmwareiapobj.h>
class UAVOBJECTUTIL_EXPORT UAVObjectUtilManager : public QObject {
Q_OBJECT

16
ground/gcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
View File

@ -27,12 +27,24 @@
*/
#include "configtaskwidget.h"
#include <uavtalk/telemetrymanager.h>
#include "uavobjectmanager.h"
#include "uavobject.h"
#include "uavobjectutilmanager.h"
#include "uavtalk/telemetrymanager.h"
#include "uavsettingsimportexport/uavsettingsimportexportfactory.h"
#include "smartsavebutton.h"
#include "mixercurvewidget.h"
#include <QWidget>
#include <QCheckBox>
#include <QComboBox>
#include <QDesktopServices>
#include <QLabel>
#include <QLineEdit>
#include <QSpinBox>
#include <QTableWidget>
#include <QToolButton>
#include <QUrl>
#include <QWidget>
ConfigTaskWidget::ConfigTaskWidget(QWidget *parent) : QWidget(parent), m_currentBoardId(-1), m_isConnected(false), m_isWidgetUpdatesAllowed(true), m_wikiURL("Welcome"),
m_saveButton(NULL), m_isDirty(false), m_outOfLimitsStyle("background-color: rgb(255, 0, 0);"), m_realtimeUpdateTimer(NULL)

30
ground/gcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h
View File

@ -27,25 +27,23 @@
#ifndef CONFIGTASKWIDGET_H
#define CONFIGTASKWIDGET_H
#include "uavobjectwidgetutils_global.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include "uavobjectutilmanager.h"
#include <QQueue>
#include <QWidget>
#include <QList>
#include <QLabel>
#include "smartsavebutton.h"
#include "mixercurvewidget.h"
#include <QTableWidget>
#include <QDoubleSpinBox>
#include <QSpinBox>
#include <QCheckBox>
#include <QPushButton>
#include "uavobjectwidgetutils_global.h"
#include <QDesktopServices>
#include <QUrl>
#include <QEvent>
#include <QVariant>
class UAVObject;
class UAVObjectField;
class UAVObjectManager;
class UAVObjectUtilManager;
class SmartSaveButton;
class QComboBox;
class QPushButton;
class QEvent;
class ShadowWidgetBinding : public QObject {
Q_OBJECT

10
ground/gcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutils.pro
View File

@ -1,12 +1,15 @@
TEMPLATE = lib
TARGET = UAVObjectWidgetUtils
DEFINES += UAVOBJECTWIDGETUTILS_LIBRARY
QT += svg
QT += widgets svg
include(../../plugin.pri)
include(uavobjectwidgetutils_dependencies.pri)
HEADERS += uavobjectwidgetutils_global.h \
HEADERS += \
uavobjectwidgetutils_global.h \
uavobjectwidgetutilsplugin.h \
configtaskwidget.h \
mixercurvewidget.h \
@ -15,7 +18,8 @@ HEADERS += uavobjectwidgetutils_global.h \
smartsavebutton.h \
popupwidget.h
SOURCES += uavobjectwidgetutilsplugin.cpp \
SOURCES += \
uavobjectwidgetutilsplugin.cpp \
configtaskwidget.cpp \
mixercurvewidget.cpp \
mixercurvepoint.cpp \

4
ground/gcs/src/plugins/uavsettingsimportexport/importsummary.cpp
View File

@ -27,6 +27,10 @@
*/
#include "importsummary.h"
#include <QCheckBox>
#include <QDesktopServices>
#include <QUrl>
ImportSummaryDialog::ImportSummaryDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::ImportSummaryDialog)

Some files were not shown because too many files have changed in this diff Show More