rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-26 15:54:15 +01:00
Code Issues Releases Activity

LP-245 config: clean up variant to widget handling code

Browse Source
This commit is contained in:
Philippe Renon 2016-09-13 21:07:43 +02:00 committed by Philippe Renon
parent ce4b74824c
commit 7eeb381fd3
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ground/gcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
View File

@ -931,7 +931,7 @@ QVariant ConfigTaskWidget::getVariantFromWidget(QWidget *widget, WidgetBinding *
if (binding->isInteger()) {
return QVariant(getComboboxSelectedOption(cb));
}
return (QString)cb->currentText();
return cb->currentText();
} else if (QDoubleSpinBox * cb = qobject_cast<QDoubleSpinBox *>(widget)) {
return (double)(cb->value() * scale);
} else if (QSpinBox * cb = qobject_cast<QSpinBox *>(widget)) {
@ -939,18 +939,17 @@ QVariant ConfigTaskWidget::getVariantFromWidget(QWidget *widget, WidgetBinding *
} else if (QSlider * cb = qobject_cast<QSlider *>(widget)) {
return (double)(cb->value() * scale);
} else if (QCheckBox * cb = qobject_cast<QCheckBox *>(widget)) {
return (QString)(cb->isChecked() ? "True" : "False");
return cb->isChecked() ? "True" : "False";
} else if (QLineEdit * cb = qobject_cast<QLineEdit *>(widget)) {
QString value = (QString)cb->displayText();
QString value = cb->displayText();
if (binding->units() == "hex") {
bool ok;
return value.toUInt(&ok, 16);
} else {
return value;
}
} else {
return QVariant();
}
return QVariant();
}
bool ConfigTaskWidget::setWidgetFromVariant(QWidget *widget, QVariant value, WidgetBinding *binding)
@ -969,7 +968,7 @@ bool ConfigTaskWidget::setWidgetFromVariant(QWidget *widget, QVariant value, Wid
if (scale == 0) {
cb->setText(value.toString());
} else {
cb->setText(QString::number((value.toDouble() / scale)));
cb->setText(QString::number(value.toDouble() / scale));
}
return true;
} else if (QDoubleSpinBox * cb = qobject_cast<QDoubleSpinBox *>(widget)) {
@ -982,8 +981,7 @@ bool ConfigTaskWidget::setWidgetFromVariant(QWidget *widget, QVariant value, Wid
cb->setValue((int)qRound(value.toDouble() / scale));
return true;
} else if (QCheckBox * cb = qobject_cast<QCheckBox *>(widget)) {
bool bvalue = value.toString() == "True";
cb->setChecked(bvalue);
cb->setChecked(value.toString() == "True");
return true;
} else if (QLineEdit * cb = qobject_cast<QLineEdit *>(widget)) {
if ((scale == 0) || (scale == 1)) {
@ -993,12 +991,11 @@ bool ConfigTaskWidget::setWidgetFromVariant(QWidget *widget, QVariant value, Wid
cb->setText(value.toString());
}
} else {
cb->setText(QString::number((value.toDouble() / scale)));
cb->setText(QString::number(value.toDouble() / scale));
}
return true;
} else {
return false;
}
return false;
}
bool ConfigTaskWidget::setWidgetFromField(QWidget *widget, UAVObjectField *field, WidgetBinding *binding)