Commit d6801ac6 authored by tstellanova's avatar tstellanova

fix rendering of advanced parameters editors

parent 1b1e0f50
...@@ -25,22 +25,24 @@ QGCBaseParamWidget* QGCBaseParamWidget::initWithUAS(UASInterface *uas) ...@@ -25,22 +25,24 @@ QGCBaseParamWidget* QGCBaseParamWidget::initWithUAS(UASInterface *uas)
void QGCBaseParamWidget::setUAS(UASInterface* uas) void QGCBaseParamWidget::setUAS(UASInterface* uas)
{ {
if (mav) { if (uas != mav) {
//TODO disconnect any connections as needed if (mav) {
disconnectViewSignalsAndSlots(); //TODO disconnect any connections as needed
disconnectFromParamManager(); disconnectViewSignalsAndSlots();
clearOnboardParamDisplay(); disconnectFromParamManager();
clearPendingParamDisplay(); clearOnboardParamDisplay();
} clearPendingParamDisplay();
}
mav = uas;
mav = uas;
if (mav) {
connectToParamManager(); if (mav) {
connectViewSignalsAndSlots(); connectToParamManager();
layoutWidget(); connectViewSignalsAndSlots();
layoutWidget();
paramMgr->requestParameterListIfEmpty();
paramMgr->requestParameterListIfEmpty();
}
} }
} }
......
...@@ -84,15 +84,16 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) : ...@@ -84,15 +84,16 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
//connect(ui->setTrimButton, SIGNAL(clicked()), this, SLOT(setTrimPositions())); //connect(ui->setTrimButton, SIGNAL(clicked()), this, SLOT(setTrimPositions()));
//TODO connect buttons here to save/clear actions? //TODO connect buttons here to save/clear actions?
mav = UASManager::instance()->getActiveUAS(); UASInterface* tmpMav = UASManager::instance()->getActiveUAS();
if (!mav) { if (tmpMav) {
qWarning() << "No active mav! "; ui->pendingCommitsWidget->initWithUAS(tmpMav);
}
else {
ui->pendingCommitsWidget->initWithUAS(mav);
ui->pendingCommitsWidget->update(); ui->pendingCommitsWidget->update();
setActiveUAS(tmpMav);
} }
connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)),
this, SLOT(setActiveUAS(UASInterface*)));
//TODO the following methods are not yet implemented //TODO the following methods are not yet implemented
// Connect RC mapping assignments // Connect RC mapping assignments
...@@ -115,9 +116,9 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) : ...@@ -115,9 +116,9 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
// connect(ui->invertCheckBox_7, SIGNAL(clicked(bool)), this, SLOT(setAux2Inverted(bool))); // connect(ui->invertCheckBox_7, SIGNAL(clicked(bool)), this, SLOT(setAux2Inverted(bool)));
// connect(ui->invertCheckBox_8, SIGNAL(clicked(bool)), this, SLOT(setAux3Inverted(bool))); // connect(ui->invertCheckBox_8, SIGNAL(clicked(bool)), this, SLOT(setAux3Inverted(bool)));
connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)), this, SLOT(setActiveUAS(UASInterface*)));
setActiveUAS(UASManager::instance()->getActiveUAS());
for (unsigned int i = 0; i < chanMax; i++) { for (unsigned int i = 0; i < chanMax; i++) {
rcValue[i] = UINT16_MAX; rcValue[i] = UINT16_MAX;
...@@ -1248,6 +1249,7 @@ void QGCPX4VehicleConfig::parameterChanged(int uas, int component, QString param ...@@ -1248,6 +1249,7 @@ void QGCPX4VehicleConfig::parameterChanged(int uas, int component, QString param
return; return;
} }
//TODO this may introduce a bug with param editor widgets not receiving param updates
if (parameterName.startsWith("RC")) { if (parameterName.startsWith("RC")) {
handleRcParameterChange(parameterName,value); handleRcParameterChange(parameterName,value);
return; return;
......
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