Merged from maintenance branch

This commit is contained in:
Magne Sjaastad
2016-08-05 12:13:13 +02:00
27 changed files with 524 additions and 54 deletions

View File

@@ -94,7 +94,9 @@ bool PdmUiOrdering::contains(const PdmUiItem* item)
void PdmUiOrdering::add(const PdmFieldHandle* field)
{
PdmUiFieldHandle* uiItem = const_cast<PdmFieldHandle*>(field)->uiCapability();
assert(uiItem);
assert(uiItem);
assert(!this->contains(uiItem));
m_ordering.push_back(uiItem);
}
@@ -105,6 +107,8 @@ void PdmUiOrdering::add(const PdmObjectHandle* obj)
{
PdmUiObjectHandle* uiItem = uiObj(const_cast<PdmObjectHandle*>(obj));
assert(uiItem);
assert(!this->contains(uiItem));
m_ordering.push_back(uiItem);
}