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

Regression Test: Do not access RimWellLogPlotCollection directly from desctructors

Browse Source 
Regression tests are calling RimProject::reset(), and this function deletes the RimProject object.
This commit is contained in:
Magne Sjaastad
2022-08-23 10:01:24 +02:00
parent 4d244bc848
commit c2ab9e6fe0
6 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp
View File

@@ -98,7 +98,7 @@ void caf::AppEnum<RimGeoMechCase::InitialPermeabilityType>::setUp()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGeoMechCase::RimGeoMechCase( void )
RimGeoMechCase::RimGeoMechCase()
: m_applyTimeFilter( false )
{
CAF_PDM_InitScriptableObjectWithNameAndComment( "GeoMechanical Case",
@@ -181,14 +181,21 @@ RimGeoMechCase::RimGeoMechCase( void )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGeoMechCase::~RimGeoMechCase( void )
RimGeoMechCase::~RimGeoMechCase()
{
geoMechViews.deleteChildren();
RimWellLogPlotCollection* plotCollection = RimMainPlotCollection::current()->wellLogPlotCollection();
if ( plotCollection )
RimProject* project = RimProject::current();
if ( project )
{
plotCollection->removeExtractors( this->geoMechData() );
if ( project->mainPlotCollection() )
{
RimWellLogPlotCollection* plotCollection = project->mainPlotCollection()->wellLogPlotCollection();
if ( plotCollection )
{
plotCollection->removeExtractors( this->geoMechData() );
}
}
}
if ( this->geoMechData() )