Commit 4bd4091b authored by Don Gagne's avatar Don Gagne

Convert to activeUASSet(UASInterface*) signal

parent d06c98ed
......@@ -9,8 +9,8 @@ QGCWaypointListMulti::QGCWaypointListMulti(QWidget *parent) :
{
ui->setupUi(this);
setMinimumSize(600, 80);
connect(UASManager::instance(), SIGNAL(UASCreated(UASInterface*)), this, SLOT(systemCreated(UASInterface*)));
connect(UASManager::instance(), SIGNAL(activeUASSet(int)), this, SLOT(systemSetActive(int)));
connect(UASManager::instance(), &UASManager::UASCreated, this, &QGCWaypointListMulti::systemCreated);
connect(UASManager::instance(), &UASManager::activeUASSet, this, &QGCWaypointListMulti::systemSetActive);
WaypointList* list = new WaypointList(ui->stackedWidget, UASManager::instance()->getActiveUASWaypointManager());
lists.insert(offline_uas_id, list);
......@@ -18,7 +18,7 @@ QGCWaypointListMulti::QGCWaypointListMulti(QWidget *parent) :
if (UASManager::instance()->getActiveUAS()) {
systemCreated(UASManager::instance()->getActiveUAS());
systemSetActive(UASManager::instance()->getActiveUAS()->getUASID());
systemSetActive(UASManager::instance()->getActiveUAS());
}
}
......@@ -50,9 +50,9 @@ void QGCWaypointListMulti::systemCreated(UASInterface* uas)
connect(uas, SIGNAL(destroyed(QObject*)), this, SLOT(systemDeleted(QObject*)));
}
void QGCWaypointListMulti::systemSetActive(int uas)
void QGCWaypointListMulti::systemSetActive(UASInterface* uas)
{
WaypointList* list = lists.value(uas, NULL);
WaypointList* list = lists.value(uas->getUASID(), NULL);
if (list) {
ui->stackedWidget->setCurrentWidget(list);
}
......
......@@ -23,7 +23,7 @@ public:
public slots:
void systemDeleted(QObject* uas);
void systemCreated(UASInterface* uas);
void systemSetActive(int uas);
void systemSetActive(UASInterface* uas);
protected:
quint16 offline_uas_id;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment