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

#5379 Surface : Add depth offset to base surface class

Browse Source
This commit is contained in:
Magne Sjaastad
2020-05-03 11:35:06 +02:00
parent 7bfe631118
commit e0d426df12
11 changed files with 225 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,7 +98,7 @@ RimSurface* RimSurfaceCollection::importSurfacesFromFiles( const QStringList& fi
newSurface->setSurfaceFilePath( newFileName );
newSurface->setColor( newColor );
if ( !newSurface->loadData() )
if ( !newSurface->onLoadData() )
{
delete newSurface;
errorMessages += newFileName + "\n";
@@ -161,10 +161,7 @@ void RimSurfaceCollection::loadData()
{
for ( auto surf : m_surfaces )
{
if ( !surf->loadData() )
{
// Error: could not open the surface file surf->surfaceFilePath();
}
surf->loadDataIfRequired();
}
}