rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

Merge branch 'thread/OP-1581_VSW_Button_On_Vehicle_Page' into rel-14.10

Browse Source
This commit is contained in:
m_thread 2014-10-30 01:30:02 +01:00
commit 7b103e9886
5 changed files with 56 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ground/openpilotgcs/src/plugins/config/airframe.ui
View File

@ -87,6 +87,29 @@
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="vehicleSetupWizardButton">
<property name="text">
<string>Vehicle Setup Wizard...</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@ -389,8 +412,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>838</width>
<height>445</height>
<width>293</width>
<height>300</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_18">
@ -925,6 +948,24 @@ p, li { white-space: pre-wrap; }
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>nameEdit</tabstop>
<tabstop>vehicleSetupWizardButton</tabstop>
<tabstop>airframesScrollArea</tabstop>
<tabstop>scrollArea_2</tabstop>
<tabstop>decelTime</tabstop>
<tabstop>accelTime</tabstop>
<tabstop>feedForwardSlider</tabstop>
<tabstop>maxAccelSlider</tabstop>
<tabstop>ffTestBox1</tabstop>
<tabstop>ffTestBox2</tabstop>
<tabstop>ffTestBox3</tabstop>
<tabstop>textBrowser</tabstop>
<tabstop>airframeHelp</tabstop>
<tabstop>saveAircraftToRAM</tabstop>
<tabstop>saveAircraftToSD</tabstop>
<tabstop>tabWidget</tabstop>
</tabstops>
<resources>
<include location="../coreplugin/core.qrc"/>
</resources>

3
ground/openpilotgcs/src/plugins/config/configgadgetfactory.h
View File

@ -46,6 +46,9 @@ public:
IUAVGadget *createGadget(QWidget *parent);
signals:
void onOpenVehicleConfigurationWizard();
public slots:
void startInputWizard();

4
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
View File

@ -27,6 +27,7 @@
#include "configvehicletypewidget.h"
#include "systemsettings.h"
#include "actuatorsettings.h"
#include "configgadgetfactory.h"
#include "cfg_vehicletypes/configccpmwidget.h"
#include "cfg_vehicletypes/configfixedwingwidget.h"
@ -121,6 +122,9 @@ ConfigVehicleTypeWidget::ConfigVehicleTypeWidget(QWidget *parent) : ConfigTaskWi
m_aircraft->saveAircraftToRAM->setVisible(false);
}
ConfigGadgetFactory *configGadgetFactory = pm->getObject<ConfigGadgetFactory>();
connect(m_aircraft->vehicleSetupWizardButton, SIGNAL(clicked()), configGadgetFactory, SIGNAL(onOpenVehicleConfigurationWizard()));
SystemSettings *syssettings = SystemSettings::GetInstance(getObjectManager());
Q_ASSERT(syssettings);
m_aircraft->nameEdit->setMaxLength(syssettings->VEHICLENAME_NUMELEM);

5
ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.cpp
View File

@ -29,6 +29,7 @@
#include <QDebug>
#include <QtPlugin>
#include <QStringList>
#include <configgadgetfactory.h>
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/coreconstants.h>
@ -78,6 +79,10 @@ bool SetupWizardPlugin::initialize(const QStringList & args, QString *errMsg)
ac->appendGroup("Wizard");
ac->addAction(cmd, "Wizard");
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
ConfigGadgetFactory *configGadgetFactory = pm->getObject<ConfigGadgetFactory>();
connect(configGadgetFactory, SIGNAL(onOpenVehicleConfigurationWizard()), this, SLOT(showSetupWizard()));
return true;
}

2
ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h
View File

@ -33,7 +33,7 @@
class SetupWizardPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.SetupWizard")
Q_PLUGIN_METADATA(IID "OpenPilot.SetupWizard")
public:
SetupWizardPlugin();