Adv Param List: Fix for invalid numbers entered in Adv Param List bei…

…ng taken as zero
ArduPilot · Mar 9, 2015 · 6cd6f59 · 6cd6f59
1 parent 9880902
commit 6cd6f59
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/ui/configuration/AdvParameterList.cc b/src/ui/configuration/AdvParameterList.cc
@@ -91,14 +91,29 @@ void AdvParameterList::tableWidgetItemChanged(QTableWidgetItem* item)
         //Invalid item, something has gone awry.
         return;
     }
+    QLocale locallocale;
+    bool ok = false;
+    double number = locallocale.toDouble(item->text(),&ok);
+    if (!ok)
+    {
+        //Failed to convert
+        QMessageBox::warning(this,"Error","Failed to convert number, please verify your input and try again");
+        disconnect(ui.tableWidget, SIGNAL(itemChanged(QTableWidgetItem*)),this, SLOT(tableWidgetItemChanged(QTableWidgetItem*)));
+        ui.tableWidget->item(item->row(),ADV_TABLE_COLUMN_VALUE)->setText(m_paramToOrigValueMap[ui.tableWidget->item(item->row(),ADV_TABLE_COLUMN_PARAM)->text()]);
+        connect(ui.tableWidget, SIGNAL(itemChanged(QTableWidgetItem*)),this, SLOT(tableWidgetItemChanged(QTableWidgetItem*)));
+        return;
+    }
+
     m_origBrushList.append(ui.tableWidget->item(item->row(),ADV_TABLE_COLUMN_PARAM)->text());
     QBrush brush = QBrush(QColor::fromRgb(132,181,132));
     ui.tableWidget->item(item->row(),ADV_TABLE_COLUMN_PARAM)->setBackground(brush);
     ui.tableWidget->item(item->row(),ADV_TABLE_COLUMN_VALUE)->setBackground(brush);
     ui.tableWidget->item(item->row(),ADV_TABLE_COLUMN_UNIT)->setBackground(brush);
     ui.tableWidget->item(item->row(),ADV_TABLE_COLUMN_RANGE)->setBackground(brush);
     ui.tableWidget->item(item->row(),ADV_TABLE_COLUMN_DESCRIPTION)->setBackground(brush);
-    m_modifiedParamMap[ui.tableWidget->item(item->row(),ADV_TABLE_COLUMN_PARAM)->text()] = item->text().toDouble();
+    m_modifiedParamMap[ui.tableWidget->item(item->row(),ADV_TABLE_COLUMN_PARAM)->text()] = number;
+    m_paramToOrigValueMap[ui.tableWidget->item(item->row(),ADV_TABLE_COLUMN_PARAM)->text()] = item->text();
+
 
     int itemsChanged = m_modifiedParamMap.size();
 
@@ -411,6 +426,7 @@ void AdvParameterList::parameterChanged(int /*uas*/, int /*component*/, QString
     {
         valstr = QString::number(value.toInt(),'f',0);
     }
+    m_paramToOrigValueMap[parameterName] = valstr;
     m_paramValueMap[parameterName]->setText(valstr);
     connect(ui.tableWidget,SIGNAL(itemChanged(QTableWidgetItem*)),this,SLOT(tableWidgetItemChanged(QTableWidgetItem*)));
 

diff --git a/src/ui/configuration/AdvParameterList.h b/src/ui/configuration/AdvParameterList.h
@@ -82,6 +82,7 @@ private slots:
     QMap<QString,double> m_modifiedParamMap;
     QMap<QString,QString> m_paramToUnitMap;
     QMap<QString,QString> m_paramToRangeMap;
+    QMap<QString,QString> m_paramToOrigValueMap;
 
     QList<QTableWidgetItem *> m_searchItemList;
     int m_searchIndex;