This commit is contained in:
matlabbe
2025-04-13 15:58:21 -07:00
parent 08f031e11c
commit b750e94eaa
6 changed files with 50 additions and 16 deletions
+20 -7
View File
@@ -4810,8 +4810,6 @@ void PreferencesDialog::setParameter(const std::string & key, const std::string
QWidget * obj = _ui->stackedWidget->findChild<QWidget*>(key.c_str());
if(obj)
{
uInsert(_parameters, ParametersPair(key, value));
QSpinBox * spin = qobject_cast<QSpinBox *>(obj);
QDoubleSpinBox * doubleSpin = qobject_cast<QDoubleSpinBox *>(obj);
QComboBox * combo = qobject_cast<QComboBox *>(obj);
@@ -4822,18 +4820,28 @@ void PreferencesDialog::setParameter(const std::string & key, const std::string
bool ok;
if(spin)
{
spin->setValue(QString(value.c_str()).toInt(&ok));
int v = QString(value.c_str()).toInt(&ok);
if(!ok)
{
UERROR("Conversion failed from \"%s\" for parameter %s", value.c_str(), key.c_str());
UERROR("Conversion failed from \"%s\" for parameter %s. Original value (%d) is kept.", value.c_str(), key.c_str(), spin->value());
}
else
{
spin->setValue(v);
uInsert(_parameters, ParametersPair(key, value));
}
}
else if(doubleSpin)
{
doubleSpin->setValue(QString(value.c_str()).toDouble(&ok));
double v = QString(value.c_str()).toDouble(&ok);
if(!ok)
{
UERROR("Conversion failed from \"%s\" for parameter %s", value.c_str(), key.c_str());
UERROR("Conversion failed from \"%s\" for parameter %s. Original value (%f) is kept.", value.c_str(), key.c_str(), doubleSpin->value());
}
else
{
doubleSpin->setValue(v);
uInsert(_parameters, ParametersPair(key, value));
}
}
else if(combo)
@@ -4856,7 +4864,7 @@ void PreferencesDialog::setParameter(const std::string & key, const std::string
int valueInt = QString(valueCpy.c_str()).toInt(&ok);
if(!ok)
{
UERROR("Conversion failed from \"%s\" for parameter %s", valueCpy.c_str(), key.c_str());
UERROR("Conversion failed from \"%s\" for parameter %s. Original value (%d) is kept.", valueCpy.c_str(), key.c_str(), combo->currentIndex());
}
else
{
@@ -4935,6 +4943,7 @@ void PreferencesDialog::setParameter(const std::string & key, const std::string
if(ok)
{
combo->setCurrentIndex(valueInt);
uInsert(_parameters, ParametersPair(key, uNumber2Str(valueInt)));
}
}
@@ -4944,18 +4953,22 @@ void PreferencesDialog::setParameter(const std::string & key, const std::string
_ui->checkBox_useOdomFeatures->blockSignals(true);
check->setChecked(uStr2Bool(value.c_str()));
_ui->checkBox_useOdomFeatures->blockSignals(false);
uInsert(_parameters, ParametersPair(key, uBool2Str(check->isChecked())));
}
else if(radio)
{
radio->setChecked(uStr2Bool(value.c_str()));
uInsert(_parameters, ParametersPair(key, uBool2Str(radio->isChecked())));
}
else if(lineEdit)
{
lineEdit->setText(value.c_str());
uInsert(_parameters, ParametersPair(key, value));
}
else if(groupBox)
{
groupBox->setChecked(uStr2Bool(value.c_str()));
uInsert(_parameters, ParametersPair(key, uBool2Str(groupBox->isChecked())));
}
else
{