AppFwk: Index based uiordering insertion.

This commit is contained in:
Jacob Støren 2018-06-22 15:30:43 +02:00
parent 69e81658a6
commit 73a52c4929
2 changed files with 119 additions and 7 deletions

View File

@ -53,7 +53,7 @@ PdmUiOrdering::~PdmUiOrdering()
for (size_t i = 0; i < m_createdGroups.size(); ++i)
{
delete m_createdGroups[i];
m_createdGroups[i] = NULL;
m_createdGroups[i] = nullptr;
}
}
@ -83,22 +83,76 @@ caf::PdmUiGroup* PdmUiOrdering::addNewGroupWithKeyword(const QString& displayNam
return group;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmUiGroup* PdmUiOrdering::insertNewGroup(size_t index, const QString& displayName)
{
PdmUiGroup* group = new PdmUiGroup;
group->setUiName(displayName);
m_createdGroups.push_back(group);
m_ordering.insert(m_ordering.begin() + index, group);
return group;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmUiGroup* PdmUiOrdering::insertNewGroupWithKeyword(size_t index,
const QString& displayName,
const QString& groupKeyword)
{
PdmUiGroup* group = insertNewGroup(index, displayName);
group->setKeyword(groupKeyword);
return group;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool PdmUiOrdering::contains(const PdmUiItem* item) const
{
return this->findItem(item).parent != nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmUiOrdering::FindResult PdmUiOrdering::findItem(const PdmUiItem* item) const
{
for (size_t i = 0; i < m_ordering.size(); ++i)
{
if (m_ordering[i] == item) return true;
if (m_ordering[i] == item) return { const_cast<PdmUiOrdering*>(this), i};
if (m_ordering[i] && m_ordering[i]->isUiGroup())
{
if (static_cast<PdmUiGroup*>(m_ordering[i])->contains(item)) return true;
FindResult result = static_cast<PdmUiGroup*>(m_ordering[i])->findItem(item);
if (result.parent ) return result;
}
}
return false;
return {nullptr, size_t(-1)};
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmUiOrdering::FindResult PdmUiOrdering::findGroup(const QString& groupKeyword) const
{
for (size_t i = 0; i < m_ordering.size(); ++i)
{
if (m_ordering[i] && m_ordering[i]->isUiGroup())
{
if (static_cast<PdmUiGroup*>(m_ordering[i])->keyword() == groupKeyword) return { const_cast<PdmUiOrdering*>(this), i};
FindResult result = static_cast<PdmUiGroup*>(m_ordering[i])->findGroup(groupKeyword);
if (result.parent ) return result;
}
}
return {nullptr, size_t(-1)};
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -123,6 +177,19 @@ void PdmUiOrdering::add(const PdmObjectHandle* obj)
m_ordering.push_back(uiItem);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void PdmUiOrdering::insert(size_t index, const PdmFieldHandle* field)
{
PdmUiFieldHandle* uiItem = const_cast<PdmFieldHandle*>(field)->uiCapability();
CAF_ASSERT(uiItem);
CAF_ASSERT(!this->contains(uiItem));
m_ordering.insert(m_ordering.begin() + index, uiItem);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -147,5 +214,36 @@ const std::vector<PdmUiItem*>& PdmUiOrdering::uiItems() const
return m_ordering;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmUiItem* PdmUiOrdering::FindResult::item()
{
if ( parent )
{
return parent->uiItems()[indexInParent];
}
else
{
return nullptr;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmUiGroup* PdmUiOrdering::FindResult::group()
{
PdmUiItem* g = item();
if ( g && g->isUiGroup() )
{
return static_cast<PdmUiGroup*>(g);
}
else
{
return nullptr;
}
}
} //End of namespace caf

View File

@ -61,12 +61,26 @@ public:
PdmUiOrdering(const PdmUiOrdering&) = delete;
PdmUiOrdering& operator=(const PdmUiOrdering&) = delete;
PdmUiGroup* addNewGroup(const QString& displayName);
PdmUiGroup* addNewGroupWithKeyword(const QString& displayName, const QString& keyword);
void add(const PdmFieldHandle* field);
void insert(size_t index, const PdmFieldHandle* field);
void add(const PdmObjectHandle* obj);
PdmUiGroup* addNewGroup(const QString& displayName);
PdmUiGroup* addNewGroupWithKeyword(const QString& displayName, const QString& groupKeyword);
PdmUiGroup* insertNewGroup(size_t index, const QString& displayName);
PdmUiGroup* insertNewGroupWithKeyword(size_t index, const QString& displayName, const QString& groupKeyword);
struct FindResult
{
PdmUiOrdering* parent;
size_t indexInParent;
PdmUiItem* item();
PdmUiGroup* group();
};
FindResult findGroup(const QString& groupKeyword) const;
FindResult findItem(const PdmUiItem* item) const;
void skipRemainingFields(bool doSkip = true);
// Pdm internal methods