rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-05 21:52:10 +01:00
Code Issues Releases Activity

OP-933 Makes tab selection in Configuration plugin sticky between board connect - disconnect - connect.

Browse Source
This commit is contained in:
Fredrik Arvidsson 2013-04-29 18:44:54 +02:00
parent 9538d2fce1
commit 7fd3b83b1c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
View File

@ -165,7 +165,7 @@ void ConfigGadgetWidget::resizeEvent(QResizeEvent *event)
} }
void ConfigGadgetWidget::onAutopilotDisconnect() { void ConfigGadgetWidget::onAutopilotDisconnect() {
ftw->setCurrentIndex(ConfigGadgetWidget::hardware); int selectedIndex = ftw->currentIndex();
QIcon *icon = new QIcon(); QIcon *icon = new QIcon();
icon->addFile(":/configgadget/images/ins_normal.png", QSize(), QIcon::Normal, QIcon::Off); icon->addFile(":/configgadget/images/ins_normal.png", QSize(), QIcon::Normal, QIcon::Off);
@ -181,7 +181,7 @@ void ConfigGadgetWidget::onAutopilotDisconnect() {
ftw->removeTab(ConfigGadgetWidget::hardware); ftw->removeTab(ConfigGadgetWidget::hardware);
ftw->insertTab(ConfigGadgetWidget::hardware, qwd, *icon, QString("Hardware")); ftw->insertTab(ConfigGadgetWidget::hardware, qwd, *icon, QString("Hardware"));
ftw->setCurrentIndex(ConfigGadgetWidget::hardware); ftw->setCurrentIndex(selectedIndex);
emit autopilotDisconnected(); emit autopilotDisconnected();
} }
@ -194,6 +194,7 @@ void ConfigGadgetWidget::onAutopilotConnect() {
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
UAVObjectUtilManager* utilMngr = pm->getObject<UAVObjectUtilManager>(); UAVObjectUtilManager* utilMngr = pm->getObject<UAVObjectUtilManager>();
if (utilMngr) { if (utilMngr) {
int selectedIndex = ftw->currentIndex();
int board = utilMngr->getBoardModel(); int board = utilMngr->getBoardModel();
if ((board & 0xff00) == 1024) { if ((board & 0xff00) == 1024) {
// CopterControl family // CopterControl family
@ -212,7 +213,6 @@ void ConfigGadgetWidget::onAutopilotConnect() {
ftw->removeTab(ConfigGadgetWidget::hardware); ftw->removeTab(ConfigGadgetWidget::hardware);
ftw->insertTab(ConfigGadgetWidget::hardware, qwd, *icon, QString("Hardware")); ftw->insertTab(ConfigGadgetWidget::hardware, qwd, *icon, QString("Hardware"));
ftw->setCurrentIndex(ConfigGadgetWidget::hardware);
} else if ((board & 0xff00) == 0x0900) { } else if ((board & 0xff00) == 0x0900) {
// Revolution family // Revolution family
@ -230,11 +230,11 @@ void ConfigGadgetWidget::onAutopilotConnect() {
ftw->removeTab(ConfigGadgetWidget::hardware); ftw->removeTab(ConfigGadgetWidget::hardware);
ftw->insertTab(ConfigGadgetWidget::hardware, qwd, *icon, QString("Hardware")); ftw->insertTab(ConfigGadgetWidget::hardware, qwd, *icon, QString("Hardware"));
ftw->setCurrentIndex(ConfigGadgetWidget::hardware);
} else { } else {
//Unknown board //Unknown board
qDebug() << "Unknown board " << board; qDebug() << "Unknown board " << board;
} }
ftw->setCurrentIndex(selectedIndex);
} }
emit autopilotConnected(); emit autopilotConnected();
} }