const Config_WidgetAPI* theData)
: ModuleBase_ModelWidget(theParent, theData), myIsFirst(true)
{
- myHasValue = defaultValues.contains(myFeatureId);
+ myHasValue = defaultValues.contains(myFeatureId + attributeID());
if (myHasValue)
- myDefValue = defaultValues[myFeatureId];
+ myDefValue = defaultValues[myFeatureId + attributeID()];
else
myDefValue = 0;
myChoiceCtrl->setChoiceList(aChoiceList);
}
}
- if (aIntAttr->isInitialized())
+ if (aIntAttr->isInitialized()) {
myChoiceCtrl->setValue(aIntAttr->value());
+
+ myChoiceCtrl->blockSignals(isBlocked);
+ emit itemSelected(this, aIntAttr->value());
+ myDefValue = aIntAttr->value();
+ }
else {
bool aHasDefaultValue;
int aDefaultVal = QString::fromStdString(getDefaultValue()).toInt(&aHasDefaultValue);
- myChoiceCtrl->setValue(aHasDefaultValue ? aDefaultVal : 0);
+ int aVal = aHasDefaultValue ? aDefaultVal : 0;
+ myChoiceCtrl->setValue(aVal);
+
+ myChoiceCtrl->blockSignals(isBlocked);
+ emit itemSelected(this, aVal);
+ myDefValue = aVal;
}
- myChoiceCtrl->blockSignals(isBlocked);
- emit itemSelected(this, aIntAttr->value());
- myDefValue = aIntAttr->value();
myIsFirst = false;
}
return true;
void ModuleBase_WidgetChoice::onFeatureAccepted()
{
- defaultValues[myFeatureId] = myDefValue;
+ defaultValues[myFeatureId + attributeID()] = myDefValue;
}