diff --git a/ground/openpilotgcs/src/plugins/config/configtaskwidget.cpp b/ground/openpilotgcs/src/plugins/config/configtaskwidget.cpp index 05955f7d1..bc8a85823 100644 --- a/ground/openpilotgcs/src/plugins/config/configtaskwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configtaskwidget.cpp @@ -57,7 +57,11 @@ void ConfigTaskWidget::addUAVObjectToWidgetRelation(QString object, QString fiel addUAVObjectToWidgetRelation(object,field,widget,_field->getElementNames().indexOf(index)); } -void ConfigTaskWidget::addUAVObjectToWidgetRelation(QString object, QString field, QWidget * widget, int index,int scale) +void ConfigTaskWidget::addUAVObjectToWidgetRelation(QString object, + QString field, + QWidget *widget, + int index, + float scale) { UAVObject *obj=NULL; UAVObjectField *_field=NULL; @@ -191,7 +195,7 @@ void ConfigTaskWidget::populateWidgets() } else if(QSpinBox * cb=qobject_cast(ow->widget)) { - cb->setValue(ow->field->getValue(ow->index).toInt()/ow->scale); + cb->setValue(ow->field->getValue(ow->index).toInt()/(int)ow->scale); } else if (QDoubleSpinBox * cb = qobject_cast(ow->widget)) { @@ -199,7 +203,7 @@ void ConfigTaskWidget::populateWidgets() } else if(QSlider * cb=qobject_cast(ow->widget)) { - cb->setValue(ow->field->getValue(ow->index).toInt()/ow->scale); + cb->setValue(ow->field->getValue(ow->index).toInt()/(int)ow->scale); } else if(QCheckBox * cb=qobject_cast(ow->widget)) { @@ -228,7 +232,7 @@ void ConfigTaskWidget::refreshWidgetsValues() } else if(QSpinBox * cb=qobject_cast(ow->widget)) { - cb->setValue(ow->field->getValue(ow->index).toInt()/ow->scale); + cb->setValue(ow->field->getValue(ow->index).toInt()/(int)ow->scale); } else if (QDoubleSpinBox * cb = qobject_cast(ow->widget)) { @@ -236,7 +240,7 @@ void ConfigTaskWidget::refreshWidgetsValues() } else if(QSlider * cb=qobject_cast(ow->widget)) { - cb->setValue(ow->field->getValue(ow->index).toInt()/ow->scale); + cb->setValue(ow->field->getValue(ow->index).toInt()/(int)ow->scale); } else if(QCheckBox * cb=qobject_cast(ow->widget)) { @@ -264,7 +268,7 @@ void ConfigTaskWidget::updateObjectsFromWidgets() } else if(QSpinBox * cb=qobject_cast(ow->widget)) { - ow->field->setValue(cb->value()* ow->scale,ow->index); + ow->field->setValue(cb->value()* (int)ow->scale,ow->index); } else if (QDoubleSpinBox * cb = qobject_cast(ow->widget)) { @@ -272,7 +276,7 @@ void ConfigTaskWidget::updateObjectsFromWidgets() } else if(QSlider * cb=qobject_cast(ow->widget)) { - ow->field->setValue(cb->value()* ow->scale,ow->index); + ow->field->setValue(cb->value()* (int)ow->scale,ow->index); } else if(QCheckBox * cb=qobject_cast(ow->widget)) { diff --git a/ground/openpilotgcs/src/plugins/config/configtaskwidget.h b/ground/openpilotgcs/src/plugins/config/configtaskwidget.h index 15d5560c2..5befbd3f4 100644 --- a/ground/openpilotgcs/src/plugins/config/configtaskwidget.h +++ b/ground/openpilotgcs/src/plugins/config/configtaskwidget.h @@ -55,7 +55,7 @@ public: UAVObjectField * field; QWidget * widget; int index; - int scale; + float scale; }; ConfigTaskWidget(QWidget *parent = 0); @@ -65,7 +65,11 @@ public: static double listMean(QList list); void addUAVObject(QString objectName); void addWidget(QWidget * widget); - void addUAVObjectToWidgetRelation(QString object,QString field,QWidget * widget,int index=0,int scale=1); + void addUAVObjectToWidgetRelation(QString object, + QString field, + QWidget *widget, + int index = 0, + float scale = 1.0f); void setupButtons(QPushButton * update,QPushButton * save); bool isDirty();