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

#3816 Annotations : Assert if resolve of PdmPtrField fails

Browse Source
This commit is contained in:
Magne Sjaastad
2018-12-04 14:33:14 +01:00
parent aa19715c40
commit af18e30ac6
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -847,16 +847,7 @@ void RimEclipseView::onLoadDataAndUpdate()
syncronizeWellsWithResults();
RimProject* proj = RiaApplication::instance()->project();
if (proj && proj->activeOilField())
{
RimAnnotationCollection* annotColl = proj->activeOilField()->annotationCollection();
if (annotColl && annotationCollection())
{
annotationCollection()->onGlobalCollectionChanged(annotColl);
}
}
syncronizeLocalAnnotationsFromGlobal();
{
// Update simulation well fractures after well cell results are imported
@@ -1269,6 +1260,22 @@ void RimEclipseView::syncronizeWellsWithResults()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseView::syncronizeLocalAnnotationsFromGlobal()
{
RimProject* proj = RiaApplication::instance()->project();
if (proj && proj->activeOilField())
{
RimAnnotationCollection* annotColl = proj->activeOilField()->annotationCollection();
if (annotColl && annotationCollection())
{
annotationCollection()->onGlobalCollectionChanged(annotColl);
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------