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

Custom vfp plot (#11450)

Browse Source 
* AppFwk: When clearing a tree selection, make sure all values are cleared
* Fix deprecated implicit lambda
* Add support for using the closest value in addition to exact match
* Add table data source object and add plot with multiple data sources
Delete the temporary RimVfpDeck class
Add RimVfpTable to represent a table in a data source
Add plot able to show data from multiple tables

* AppFwk: Make it possible to call resolveReferences multiple times
Use case: Vfp tables are stored in files. Multiple tables can be present in one file. Pdm table objects are created after resolve references is done as part of parsing file. When the Pdm object are created, resolveReferences can be called once more.

* Call resolveReferencesRecursively() after RimVfpTable objects are created
This commit is contained in:
Magne Sjaastad
2024-05-29 12:55:45 +02:00
committed by GitHub
parent 2fb54ac1ec
commit 1d57b9032b
38 changed files with 2206 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrField.h
View File

@@ -39,10 +39,7 @@ class PdmPtrField<DataType*> : public PdmValueField
public:
typedef PdmPointer<DataType> FieldDataType;
PdmPtrField()
: m_isResolved( false )
{
}
PdmPtrField() {}
explicit PdmPtrField( const DataTypePtr& fieldValue );
~PdmPtrField() override;
@@ -81,7 +78,6 @@ private:
// Resolving
QString m_referenceString;
bool m_isResolved;
};
} // End of namespace caf

1
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrField.inl
View File

@@ -29,7 +29,6 @@ void caf::PdmPtrField<DataType*>::setFromQVariant( const QVariant& variant )
template <typename DataType>
caf::PdmPtrField<DataType*>::PdmPtrField( const DataTypePtr& fieldValue )
{
m_isResolved = true;
m_fieldValue = fieldValue;
if ( m_fieldValue != NULL ) m_fieldValue->addReferencingPtrField( this );
}

4
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.h
View File

@@ -54,7 +54,6 @@ public:
{
m_field = field;
m_dataTypeName = DataType::classKeywordStatic();
m_isResolved = false;
m_referenceString = "";
}
@@ -70,7 +69,6 @@ private:
// Resolving
QString m_referenceString;
bool m_isResolved;
};
template <typename DataType>
@@ -87,7 +85,6 @@ public:
{
m_field = field;
m_dataTypeName = DataType::classKeywordStatic();
m_isResolved = false;
m_referenceString = "";
}
@@ -103,7 +100,6 @@ private:
// Resolving
QString m_referenceString;
bool m_isResolved;
};
template <typename DataType>

8
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.inl
View File

@@ -90,7 +90,6 @@ void caf::PdmFieldXmlCap<caf::PdmPtrField<DataType*>>::readFieldData( QXmlStream
//
// and then we need a traversal of the object hierarchy to resolve all references before initAfterRead.
m_isResolved = false;
m_referenceString = dataString;
m_field->setRawPtr( NULL );
}
@@ -117,12 +116,11 @@ void caf::PdmFieldXmlCap<caf::PdmPtrField<DataType*>>::writeFieldData( QXmlStrea
template <typename DataType>
bool caf::PdmFieldXmlCap<PdmPtrField<DataType*>>::resolveReferences()
{
if ( m_isResolved ) return true;
if ( m_field->m_fieldValue.rawPtr() != nullptr ) return true;
if ( m_referenceString.isEmpty() ) return true;
PdmObjectHandle* objHandle = PdmReferenceHelper::objectFromFieldReference( this->fieldHandle(), m_referenceString );
m_field->setRawPtr( objHandle );
m_isResolved = true;
return objHandle != nullptr;
}
@@ -163,7 +161,6 @@ void caf::PdmFieldXmlCap<caf::PdmPtrArrayField<DataType*>>::readFieldData( QXmlS
// It must be done when we know that the complete hierarchy is read and created,
// and then we need a traversal of the object hierarchy to resolve all references before initAfterRead.
m_isResolved = false;
m_referenceString = dataString;
m_field->clearWithoutDelete();
}
@@ -193,7 +190,6 @@ void caf::PdmFieldXmlCap<caf::PdmPtrArrayField<DataType*>>::writeFieldData( QXml
template <typename DataType>
bool caf::PdmFieldXmlCap<PdmPtrArrayField<DataType*>>::resolveReferences()
{
if ( m_isResolved ) return true;
if ( m_referenceString.isEmpty() ) return true;
m_field->clearWithoutDelete();
@@ -211,8 +207,6 @@ bool caf::PdmFieldXmlCap<PdmPtrArrayField<DataType*>>::resolveReferences()
m_field->m_pointers.back().setRawPtr( objHandle );
}
m_isResolved = true;
return foundValidObjectFromString;
}

4
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/cafPdmAdvancedTemplateTest.cpp
View File

@@ -197,7 +197,11 @@ TEST( AdvancedObjectTest, FieldWrite )
a->readObjectFromXmlString( serializedString, caf::PdmDefaultObjectFactory::instance() );
a->xmlCapability()->resolveReferencesRecursively();
ASSERT_TRUE( a->m_pointerToItem() == container->m_items[1] );
// Set pointer to null. The reference string is still valid, and the resolving will restore the pointer.
a->m_pointerToItem = nullptr;
a->xmlCapability()->resolveReferencesRecursively();
ASSERT_TRUE( a->m_pointerToItem() == container->m_items[1] );
}
}