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

Disconnect parent from all signals when detaching from parent

Browse Source
This commit is contained in:
Gaute Lindkvist 2020-09-16 08:47:57 +02:00
parent d3152f5030
commit 15ae290f1d
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.cpp
View File

@ -66,9 +66,25 @@ void PdmObjectHandle::removeAsParentField( PdmFieldHandle* parentField )
{
CAF_ASSERT( m_parentField == parentField );
if ( parentField ) disconnectObserverFromAllSignals( parentField->ownerObject() );
m_parentField = nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void PdmObjectHandle::disconnectObserverFromAllSignals( SignalObserver* observer )
{
if ( observer )
{
for ( auto emittedSignal : emittedSignals() )
{
emittedSignal->disconnect( observer );
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

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

@ -117,8 +117,10 @@ private:
std::vector<std::pair<PdmObjectCapability*, bool>> m_capabilities;
// Child/Parent Relationships
void setAsParentField( PdmFieldHandle* parentField );
void removeAsParentField( PdmFieldHandle* parentField );
void setAsParentField( PdmFieldHandle* parentField );
void removeAsParentField( PdmFieldHandle* parentField );
void disconnectObserverFromAllSignals( SignalObserver* observer );
PdmFieldHandle* m_parentField;
// PtrReferences

2
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafSignal.h
View File

@ -67,7 +67,7 @@ public:
std::list<AbstractSignal*> emittedSignals() const;
private:
std::list<AbstractSignal*> m_signals;
mutable std::list<AbstractSignal*> m_signals;
};
//==================================================================================================