Skip to content

Commit 35b13f1

Browse files
committed
Fix default value
1 parent 469a3a1 commit 35b13f1

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

src/dialogs/addregisterwidget.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,13 @@ AddRegisterWidget::AddRegisterWidget(SettingsModel* pSettingsModel, const QStrin
4343
_pUi->cmbType->addItem(typeObj["label"].toString(), typeObj["id"].toString());
4444
}
4545

46-
/* Pre-select the default data type */
47-
const int defaultIndex = _pUi->cmbType->findData(defaultTypeId);
48-
if (defaultIndex >= 0)
46+
/* Pre-select the default data type and remember the index for resetFields() */
47+
_defaultTypeIndex = _pUi->cmbType->findData(defaultTypeId);
48+
if (_defaultTypeIndex < 0)
4949
{
50-
_pUi->cmbType->setCurrentIndex(defaultIndex);
50+
_defaultTypeIndex = 0;
5151
}
52+
_pUi->cmbType->setCurrentIndex(_defaultTypeIndex);
5253

5354
/* Populate device combo */
5455
_pUi->cmbDevice->clear();
@@ -98,7 +99,7 @@ void AddRegisterWidget::handleResultAccept()
9899
void AddRegisterWidget::resetFields()
99100
{
100101
_pUi->lineName->setText("Name of curve");
101-
_pUi->cmbType->setCurrentIndex(0);
102+
_pUi->cmbType->setCurrentIndex(_defaultTypeIndex);
102103
_pUi->cmbDevice->setCurrentIndex(0);
103104
_pUi->radioPrimary->setChecked(true);
104105
_pAddressForm->setSchema(_addressSchema, QJsonObject());

src/dialogs/addregisterwidget.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ private slots:
3737
Ui::AddRegisterWidget* _pUi;
3838
SchemaFormWidget* _pAddressForm;
3939
QJsonObject _addressSchema;
40+
int _defaultTypeIndex{ 0 };
4041

4142
SettingsModel* _pSettingsModel;
4243

0 commit comments

Comments
 (0)