Commit 9f17108e authored by tstellanova's avatar tstellanova

ignoring UAS updates while slider has no param name

parent 8d98abe2
...@@ -92,29 +92,29 @@ void QGCParamSlider::refreshParamList() ...@@ -92,29 +92,29 @@ void QGCParamSlider::refreshParamList()
void QGCParamSlider::setActiveUAS(UASInterface* activeUas) void QGCParamSlider::setActiveUAS(UASInterface* activeUas)
{ {
if (activeUas) if (activeUas) {
{
if (uas)
{
disconnect(uas, SIGNAL(parameterChanged(int,int,int,int,QString,QVariant)), this, SLOT(setParameterValue(int,int,int,int,QString,QVariant)));
}
// Connect buttons and signals
connect(activeUas, SIGNAL(parameterChanged(int,int,int,int,QString,QVariant)), this, SLOT(setParameterValue(int,int,int,int,QString,QVariant)), Qt::UniqueConnection);
uas = activeUas;
// Update current param value
//requestParameter();
// Set param info // Set param info
QString text = uas->getParamManager()->getParamInfo(parameterName); if (!parameterName.isEmpty()) {
if (text != "") //disconnect from any existing uas signals
{ if (uas != activeUas) {
ui->infoLabel->setToolTip(text); disconnect(uas, SIGNAL(parameterChanged(int,int,int,int,QString,QVariant)), this, SLOT(setParameterValue(int,int,int,int,QString,QVariant)));
ui->infoLabel->show(); connect(activeUas, SIGNAL(parameterChanged(int,int,int,int,QString,QVariant)), this, SLOT(setParameterValue(int,int,int,int,QString,QVariant)), Qt::UniqueConnection);
uas = activeUas;
}
QString text = uas->getParamManager()->getParamInfo(parameterName);
if (text != "") {
ui->infoLabel->setToolTip(text);
ui->infoLabel->show();
}
// Force-uncheck and hide label if no description is available
if (ui->editInfoCheckBox->isChecked()) {
showInfo((text.length() > 0));
}
} }
// Force-uncheck and hide label if no description is available else {
if (ui->editInfoCheckBox->isChecked()) //when parameter widgets are first loaded, they are disconnected from any parameter?
{ qWarning() << __FILE__ << ":" << __LINE__ << "slider has no parameterName??";
showInfo((text.length() > 0));
} }
} }
} }
......
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