Commit b5d2023b authored by Haocheng LIU's avatar Haocheng LIU

Assign associationRule to Definition when AssociationDef is involved

When initializing the operator system we never copy the associationRule
inside attribute definition into the sytem. So if SMTK tries to set the
association mask, it would create a default association rule before the
assignment. AssociationRule copyment is added to address this problem.
parent 8ddeea98
......@@ -640,7 +640,7 @@ System::copyDefinition(const smtk::attribute::DefinitionPtr sourceDef,
return newDef;
}
//----------------------------------------------------------------------------
// Copies attribute defintion into this system, returning true if successful
// Copies attribute definition into this system, returning true if successful
bool System::copyDefinitionImpl(smtk::attribute::DefinitionPtr sourceDef,
smtk::attribute::ItemDefinition::CopyInfo& info)
{
......@@ -695,6 +695,10 @@ bool System::copyDefinitionImpl(smtk::attribute::DefinitionPtr sourceDef,
{
newDef->setDefaultColor(sourceDef->defaultColor());
}
if (sourceDef->associationRule())
{
newDef->setAssociationRule(sourceDef->associationRule());
}
newDef->setAssociationMask(sourceDef->associationMask());
// Copy new item definitions only (i.e., not inherited item defs)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment