Browse Source

Mainwindow: Fix HIL config deletion

QGC4.4
Lorenz Meier 10 years ago
parent
commit
3c0c01d6ef
  1. 9
      src/ui/MainWindow.cc
  2. 3
      src/ui/MainWindow.h

9
src/ui/MainWindow.cc

@ -796,6 +796,7 @@ void MainWindow::connectCommonActions() @@ -796,6 +796,7 @@ void MainWindow::connectCommonActions()
// Connect internal actions
connect(UASManager::instance(), SIGNAL(UASCreated(UASInterface*)), this, SLOT(UASCreated(UASInterface*)));
connect(UASManager::instance(), SIGNAL(UASDeleted(int)), this, SLOT(UASDeleted(int)));
// Unmanned System controls
connect(_ui.actionLiftoff, SIGNAL(triggered()), UASManager::instance(), SLOT(launchActiveUAS()));
@ -909,6 +910,14 @@ void MainWindow::UASCreated(UASInterface* uas) @@ -909,6 +910,14 @@ void MainWindow::UASCreated(UASInterface* uas)
}
}
void MainWindow::UASDeleted(int uasId)
{
if (_mapUasId2HilDockWidget.contains(uasId)) {
_mapUasId2HilDockWidget[uasId]->deleteLater();
_mapUasId2HilDockWidget.remove(uasId);
}
}
/// Stores the state of the toolbar, status bar and widgets associated with the current view
void MainWindow::_storeCurrentViewState(void)
{

3
src/ui/MainWindow.h

@ -146,6 +146,9 @@ public slots: @@ -146,6 +146,9 @@ public slots:
/** @brief Add a new UAS */
void UASCreated(UASInterface* uas);
/** @brief Remove an old UAS */
void UASDeleted(int uasID);
void handleMisconfiguration(UASInterface* uas);
/** @brief Load configuration views */
void loadSetupView();

Loading…
Cancel
Save