From a97cc28f53a60f2e440366c14aaa6d4d0409493e Mon Sep 17 00:00:00 2001 From: Bryant Date: Sat, 25 May 2013 12:53:25 -0700 Subject: [PATCH 1/3] Simplified switch statement. --- src/ui/designer/QGCParamSlider.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/ui/designer/QGCParamSlider.cc b/src/ui/designer/QGCParamSlider.cc index 5d37f4f..857c286 100644 --- a/src/ui/designer/QGCParamSlider.cc +++ b/src/ui/designer/QGCParamSlider.cc @@ -263,11 +263,7 @@ void QGCParamSlider::endEditMode() switch (parameterValue.type()) { case QVariant::Char: - ui->intValueSpinBox->show(); - break; case QVariant::Int: - ui->intValueSpinBox->show(); - break; case QVariant::UInt: ui->intValueSpinBox->show(); break; From 34dc0822432c1a909db5e06ddcf40ea2d3b40f51 Mon Sep 17 00:00:00 2001 From: Bryant Date: Sat, 25 May 2013 12:53:47 -0700 Subject: [PATCH 2/3] Removed unused code causing compilation warnings. --- src/ui/designer/QGCParamSlider.cc | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/ui/designer/QGCParamSlider.cc b/src/ui/designer/QGCParamSlider.cc index 857c286..4521e94 100644 --- a/src/ui/designer/QGCParamSlider.cc +++ b/src/ui/designer/QGCParamSlider.cc @@ -377,14 +377,6 @@ void QGCParamSlider::setParameterValue(int uas, int component, int paramCount, i ui->editSelectParamComboBox->addItem(parameterName, paramIndex); } - if (this->parameterName == "RC5_MIN") - { - int stopper = 1; - } - if (parameterName == "RC5_MIN") - { - int stpoper = 1; - } if (visibleParam != "") { if (parameterName == visibleParam) From 18a7f56e4437e406691f652ac6e0c993f9280059 Mon Sep 17 00:00:00 2001 From: Bryant Date: Sat, 25 May 2013 12:57:29 -0700 Subject: [PATCH 3/3] Fixed setting the slider position based on parameter values for variables that don't have a range specified. --- src/ui/designer/QGCParamSlider.cc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ui/designer/QGCParamSlider.cc b/src/ui/designer/QGCParamSlider.cc index 4521e94..9cd9d07 100644 --- a/src/ui/designer/QGCParamSlider.cc +++ b/src/ui/designer/QGCParamSlider.cc @@ -415,51 +415,51 @@ void QGCParamSlider::setParameterValue(int uas, int component, int paramCount, i ui->intValueSpinBox->setEnabled(true); ui->doubleValueSpinBox->hide(); ui->intValueSpinBox->setValue(value.toUInt()); - ui->intValueSpinBox->setMinimum(-ui->intValueSpinBox->maximum()); - ui->valueSlider->setValue(floatToScaledInt(value.toUInt())); + ui->intValueSpinBox->setRange(0, UINT8_MAX); if (parameterMax == 0 && parameterMin == 0) { - ui->editMaxSpinBox->setValue(255); + ui->editMaxSpinBox->setValue(UINT8_MAX); ui->editMinSpinBox->setValue(0); } + ui->valueSlider->setValue(floatToScaledInt(value.toUInt())); break; case QVariant::Int: ui->intValueSpinBox->show(); ui->intValueSpinBox->setEnabled(true); ui->doubleValueSpinBox->hide(); ui->intValueSpinBox->setValue(value.toInt()); - ui->valueSlider->setValue(floatToScaledInt(value.toInt())); - ui->intValueSpinBox->setMinimum(-ui->intValueSpinBox->maximum()); + ui->intValueSpinBox->setRange(INT32_MIN, INT32_MAX); if (parameterMax == 0 && parameterMin == 0) { - ui->editMaxSpinBox->setValue(65535); - ui->editMinSpinBox->setValue(0); + ui->editMaxSpinBox->setValue(INT32_MAX); + ui->editMinSpinBox->setValue(INT32_MIN); } + ui->valueSlider->setValue(floatToScaledInt(value.toInt())); break; case QVariant::UInt: ui->intValueSpinBox->show(); ui->intValueSpinBox->setEnabled(true); ui->doubleValueSpinBox->hide(); ui->intValueSpinBox->setValue(value.toUInt()); - ui->valueSlider->setValue(floatToScaledInt(value.toUInt())); - ui->intValueSpinBox->setMinimum(0); + ui->intValueSpinBox->setRange(0, UINT32_MAX); if (parameterMax == 0 && parameterMin == 0) { - ui->editMaxSpinBox->setValue(65535); + ui->editMaxSpinBox->setValue(UINT32_MAX); ui->editMinSpinBox->setValue(0); } + ui->valueSlider->setValue(floatToScaledInt(value.toUInt())); break; case QMetaType::Float: ui->doubleValueSpinBox->setValue(value.toFloat()); ui->doubleValueSpinBox->show(); ui->doubleValueSpinBox->setEnabled(true); ui->intValueSpinBox->hide(); - ui->valueSlider->setValue(floatToScaledInt(value.toFloat())); if (parameterMax == 0 && parameterMin == 0) { ui->editMaxSpinBox->setValue(10000); ui->editMinSpinBox->setValue(0); } + ui->valueSlider->setValue(floatToScaledInt(value.toFloat())); break; default: qCritical() << "ERROR: NO VALID PARAM TYPE";