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

Code review, brush-up, and extended surface unit tests

Browse Source
This commit is contained in:
Stein Inge Dale
2020-06-03 13:34:18 +02:00
committed by Magne Sjaastad
parent e5f3a3b67d
commit 10e4c60073
5 changed files with 66 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/ProjectDataModel/Surfaces/RimFileSurface.cpp
View File

@@ -38,6 +38,8 @@ RimFileSurface::RimFileSurface()
CAF_PDM_InitObject( "Surface", ":/ReservoirSurface16x16.png", "", "" );
CAF_PDM_InitFieldNoDefault( &m_surfaceDefinitionFilePath, "SurfaceFilePath", "File", "", "", "" );
m_gocadData.reset( new RigGocadData );
}
//--------------------------------------------------------------------------------------------------
@@ -147,10 +149,9 @@ bool RimFileSurface::loadDataFromFile()
}
else if ( filePath.endsWith( "ts", Qt::CaseInsensitive ) )
{
RigGocadData gocadData;
RifSurfaceReader::readGocadFile( filePath, &gocadData );
RifSurfaceReader::readGocadFile( filePath, m_gocadData.get() );
surface = gocadData.gocadGeometry();
surface = m_gocadData->gocadGeometry();
}
m_vertices = surface.first;