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

OP-803 fix attempt

Browse Source
This commit is contained in:
filnet 2013-01-16 23:43:22 +01:00
parent 481005cc69
commit 1e3aeaf988
4 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/openpilotgcs/src/plugins/coreplugin/uavgadgetdecorator.cpp
View File

@ -45,8 +45,8 @@ UAVGadgetDecorator::UAVGadgetDecorator(IUAVGadget *gadget, QList<IUAVGadgetConfi
foreach (IUAVGadgetConfiguration *config, *m_configurations) foreach (IUAVGadgetConfiguration *config, *m_configurations)
m_toolbar->addItem(config->name()); m_toolbar->addItem(config->name());
connect(m_toolbar, SIGNAL(activated(int)), this, SLOT(loadConfiguration(int))); connect(m_toolbar, SIGNAL(activated(int)), this, SLOT(loadConfiguration(int)));
if (m_configurations->count() > 0) // if (m_configurations->count() > 0)
loadConfiguration(0); // loadConfiguration(0);
updateToolbar(); updateToolbar();
} }

8
ground/openpilotgcs/src/plugins/coreplugin/uavgadgetinstancemanager.cpp
View File

@ -253,13 +253,17 @@ void UAVGadgetInstanceManager::createOptionsPages()
} }
IUAVGadget *UAVGadgetInstanceManager::createGadget(QString classId, QWidget *parent) IUAVGadget *UAVGadgetInstanceManager::createGadget(QString classId, QWidget *parent, bool loadDefaultConfiguration)
{ {
IUAVGadgetFactory *f = factory(classId); IUAVGadgetFactory *f = factory(classId);
if (f) { if (f) {
QList<IUAVGadgetConfiguration*> *configs = configurations(classId); QList<IUAVGadgetConfiguration*> *configs = configurations(classId);
IUAVGadget *g = f->createGadget(parent); IUAVGadget *g = f->createGadget(parent);
IUAVGadget *gadget = new UAVGadgetDecorator(g, configs); UAVGadgetDecorator *gadget = new UAVGadgetDecorator(g, configs);
if ((loadDefaultConfiguration && configs && configs->count()) > 0) {
gadget->loadConfiguration(configs->at(0));
}
m_gadgetInstances.append(gadget); m_gadgetInstances.append(gadget);
connect(this, SIGNAL(configurationAdded(IUAVGadgetConfiguration*)), gadget, SLOT(configurationAdded(IUAVGadgetConfiguration*))); connect(this, SIGNAL(configurationAdded(IUAVGadgetConfiguration*)), gadget, SLOT(configurationAdded(IUAVGadgetConfiguration*)));
connect(this, SIGNAL(configurationChanged(IUAVGadgetConfiguration*)), gadget, SLOT(configurationChanged(IUAVGadgetConfiguration*))); connect(this, SIGNAL(configurationChanged(IUAVGadgetConfiguration*)), gadget, SLOT(configurationChanged(IUAVGadgetConfiguration*)));

2
ground/openpilotgcs/src/plugins/coreplugin/uavgadgetinstancemanager.h
View File

@ -61,7 +61,7 @@ public:
~UAVGadgetInstanceManager(); ~UAVGadgetInstanceManager();
void readSettings(QSettings *qs); void readSettings(QSettings *qs);
void saveSettings(QSettings *qs); void saveSettings(QSettings *qs);
IUAVGadget *createGadget(QString classId, QWidget *parent); IUAVGadget *createGadget(QString classId, QWidget *parent, bool loadDefaultConfiguration = true);
void removeGadget(IUAVGadget *gadget); void removeGadget(IUAVGadget *gadget);
void removeAllGadgets(); void removeAllGadgets();
bool canDeleteConfiguration(IUAVGadgetConfiguration *config); bool canDeleteConfiguration(IUAVGadgetConfiguration *config);

22
ground/openpilotgcs/src/plugins/coreplugin/uavgadgetmanager/uavgadgetview.cpp
View File

@ -265,11 +265,29 @@ void UAVGadgetView::saveState(QSettings* qSettings)
void UAVGadgetView::restoreState(QSettings* qSettings) void UAVGadgetView::restoreState(QSettings* qSettings)
{ {
QString classId = qSettings->value("classId").toString(); QString classId = qSettings->value("classId").toString();
int index = indexOfClassId(classId); int index = indexOfClassId(classId);
listSelectionActivated(index); if (index < 0) {
index = m_defaultIndex;
}
classId = m_uavGadgetList->itemData(index).toString();
IUAVGadget *newGadget;
UAVGadgetInstanceManager *im = ICore::instance()->uavGadgetInstanceManager();
if(qSettings->childGroups().contains("gadget")) { if(qSettings->childGroups().contains("gadget")) {
newGadget = im->createGadget(classId, this, false);
qSettings->beginGroup("gadget"); qSettings->beginGroup("gadget");
gadget()->restoreState(qSettings); newGadget->restoreState(qSettings);
qSettings->endGroup(); qSettings->endGroup();
} }
else {
newGadget = im->createGadget(classId, this);
}
IUAVGadget *gadgetToRemove = m_uavGadget;
setGadget(newGadget);
m_uavGadgetManager->setCurrentGadget(newGadget);
im->removeGadget(gadgetToRemove);
} }