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

Fix crash when copying the intersection.

Browse Source 
Updating of the default is handled later, so is not neccesary when doint initAfterRead after deserialization.
This commit is contained in:
Jacob Støren 2019-11-20 09:04:39 +01:00
parent dcb32c285f
commit 439071dddf
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/ProjectDataModel/RimIntersectionHandle.cpp
View File

@ -184,13 +184,17 @@ void RimIntersectionHandle::updateDefaultSeparateDataSource()
if ( m_separateDataSource() == nullptr ) if ( m_separateDataSource() == nullptr )
{ {
RimGridView* view; RimGridView* view;
this->firstAncestorOrThisOfTypeAsserted( view ); this->firstAncestorOrThisOfType( view );
std::vector<RimIntersectionResultDefinition*> iResDefs = if ( view )
view->separateIntersectionResultsCollection()->intersectionResultsDefinitions();
if ( iResDefs.size() )
{ {
m_separateDataSource = iResDefs[0]; std::vector<RimIntersectionResultDefinition*> iResDefs =
view->separateIntersectionResultsCollection()->intersectionResultsDefinitions();
if ( iResDefs.size() )
{
m_separateDataSource = iResDefs[0];
}
} }
} }
} }
@ -203,6 +207,8 @@ cvf::ref<RivIntersectionHexGridInterface> RimIntersectionHandle::createHexGridIn
RimIntersectionResultDefinition* resDef = activeSeparateResultDefinition(); RimIntersectionResultDefinition* resDef = activeSeparateResultDefinition();
if ( resDef && resDef->activeCase() ) if ( resDef && resDef->activeCase() )
{ {
// Eclipse case
RimEclipseCase* eclipseCase = dynamic_cast<RimEclipseCase*>( resDef->activeCase() ); RimEclipseCase* eclipseCase = dynamic_cast<RimEclipseCase*>( resDef->activeCase() );
if ( eclipseCase && eclipseCase->eclipseCaseData() ) if ( eclipseCase && eclipseCase->eclipseCaseData() )
{ {
@ -212,6 +218,8 @@ cvf::ref<RivIntersectionHexGridInterface> RimIntersectionHandle::createHexGridIn
this->isInactiveCellsVisible() ); this->isInactiveCellsVisible() );
} }
// Geomech case
RimGeoMechCase* geomCase = dynamic_cast<RimGeoMechCase*>( resDef->activeCase() ); RimGeoMechCase* geomCase = dynamic_cast<RimGeoMechCase*>( resDef->activeCase() );
if ( geomCase && geomCase->geoMechData() && geomCase->geoMechData()->femParts() ) if ( geomCase && geomCase->geoMechData() && geomCase->geoMechData()->femParts() )