OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#5553 AppFwk : Add root in PtrField reference string

Browse Source
This commit is contained in:
Magne Sjaastad 2020-02-14 15:38:19 +01:00
parent 282b7d7c0f
commit 2b45a9af7f
1 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmReferenceHelper.cpp
View File

@ -48,6 +48,14 @@
namespace caf
{
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString rootIdentifierString()
{
return "$ROOT$";
}
//--------------------------------------------------------------------------------------------------
///
@ -303,9 +311,16 @@ QString PdmReferenceHelper::referenceFromFieldToObject(PdmFieldHandle* fromField
QStringList referenceList = referenceFromRootToObjectAsStringList(lastCommonAnchestor, toObj);
for (size_t i = 0; i < levelCountToCommonAnchestor; ++i)
if (idxToLastCommonAnchestor == 0)
{
referenceList.push_front("..");
referenceList.push_front(rootIdentifierString());
}
else
{
for (size_t i = 0; i < levelCountToCommonAnchestor; ++i)
{
referenceList.push_front("..");
}
}
QString completeReference = referenceList.join(" ");
@ -326,19 +341,27 @@ PdmObjectHandle* PdmReferenceHelper::objectFromFieldReference(PdmFieldHandle* fr
PdmObjectHandle* lastCommonAnchestor = fromField->ownerObject();
CAF_ASSERT(lastCommonAnchestor);
while (!decodedReference.empty() && decodedReference.front() == "..")
if (!decodedReference.empty() && decodedReference.front() == rootIdentifierString())
{
PdmFieldHandle* parentField = lastCommonAnchestor->parentField();
if (!parentField)
{
// Error: Relative object reference has an invalid number of parent levels
return nullptr;
}
lastCommonAnchestor = parentField->ownerObject();
CAF_ASSERT(lastCommonAnchestor);
lastCommonAnchestor = findRoot(lastCommonAnchestor);
decodedReference.pop_front();
}
else
{
while (!decodedReference.empty() && decodedReference.front() == "..")
{
PdmFieldHandle* parentField = lastCommonAnchestor->parentField();
if (!parentField)
{
// Error: Relative object reference has an invalid number of parent levels
return nullptr;
}
lastCommonAnchestor = parentField->ownerObject();
CAF_ASSERT(lastCommonAnchestor);
decodedReference.pop_front();
}
}
return objectFromReferenceStringList(lastCommonAnchestor, decodedReference);
}