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

Always move views from obsolete fields into view collection

Browse Source 
The original code caused ProjectFiles2024Tests\TestCase_GridCalculations to fail
This commit is contained in:
Magne Sjaastad 2024-04-28 08:26:15 +02:00
parent 55c0e81d9e
commit 3cd80f0871
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -279,31 +279,28 @@ void RimEclipseCase::initAfterRead()
{
RimCase::initAfterRead();
if ( RimProject::current()->isProjectFileVersionEqualOrOlderThan( "2024.03.0" ) )
// Move views to view collection.
RimEclipseViewCollection* viewColl = viewCollection();
for ( RimEclipseView* riv : m_reservoirViews_OBSOLETE.childrenByType() )
{
// Move views to view collection.
RimEclipseViewCollection* viewColl = viewCollection();
for ( RimEclipseView* riv : m_reservoirViews_OBSOLETE.childrenByType() )
{
CVF_ASSERT( riv );
riv->setEclipseCase( this );
m_reservoirViews_OBSOLETE.removeChild( riv );
viewColl->addView( riv );
}
m_reservoirViews_OBSOLETE.clearWithoutDelete();
// Move contour maps
auto mapViewColl = contourMapCollection();
for ( RimEclipseContourMapView* contourMap : m_contourMapCollection_OBSOLETE->views() )
{
contourMap->setEclipseCase( this );
m_contourMapCollection_OBSOLETE->removeChild( contourMap );
mapViewColl->addView( contourMap );
}
m_contourMapCollection_OBSOLETE->clearWithoutDelete();
CVF_ASSERT( riv );
riv->setEclipseCase( this );
m_reservoirViews_OBSOLETE.removeChild( riv );
viewColl->addView( riv );
}
m_reservoirViews_OBSOLETE.clearWithoutDelete();
// Move contour maps
auto mapViewColl = contourMapCollection();
for ( RimEclipseContourMapView* contourMap : m_contourMapCollection_OBSOLETE->views() )
{
contourMap->setEclipseCase( this );
m_contourMapCollection_OBSOLETE->removeChild( contourMap );
mapViewColl->addView( contourMap );
}
m_contourMapCollection_OBSOLETE->clearWithoutDelete();
}
//--------------------------------------------------------------------------------------------------