OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-26 23:20:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

#12461 Add support for import of .irap and .gri

Browse Source 
* Add surfio as submodule and create importer with tests
* Update compile fix when mio.h is included in multiple compile units
* Move file tools into RifFileTools
This commit is contained in:
Magne Sjaastad authored and GitHub committed 2025-05-28 09:50:45 +02:00
1 parent d628760339
commit 13a793f16c
25 files changed
+21091 -42
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp
+10 -18
View File
@@ -32,6 +32,7 @@
#include "cafPdmObjectScriptingCapability.h"
#include <QFileInfo>
#include <memory>
CAF_PDM_SOURCE_INIT( RimFileSurface, "Surface", "FileSurface" );
@@ -119,13 +120,12 @@ void RimFileSurface::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
bool RimFileSurface::updateSurfaceData()
{
bool result = true;
if ( m_vertices.empty() )
if ( m_triangleMeshData->geometry().first.empty() )
{
result = loadDataFromFile();
}
std::vector<cvf::Vec3d> vertices{ m_vertices };
std::vector<unsigned> tringleIndices{ m_tringleIndices };
auto [vertices, tringleIndices] = m_triangleMeshData->geometry();
auto surface = new RigSurface;
if ( !vertices.empty() && !tringleIndices.empty() )
@@ -155,8 +155,7 @@ bool RimFileSurface::updateSurfaceData()
//--------------------------------------------------------------------------------------------------
void RimFileSurface::clearCachedNativeData()
{
m_vertices.clear();
m_tringleIndices.clear();
m_triangleMeshData.reset();
}
//--------------------------------------------------------------------------------------------------
@@ -164,35 +163,28 @@ void RimFileSurface::clearCachedNativeData()
//--------------------------------------------------------------------------------------------------
bool RimFileSurface::loadDataFromFile()
{
std::pair<std::vector<cvf::Vec3d>, std::vector<unsigned>> surface;
m_triangleMeshData = std::make_unique<RigTriangleMeshData>();
QString filePath = surfaceFilePath();
if ( filePath.endsWith( "ptl", Qt::CaseInsensitive ) )
{
surface = RifSurfaceImporter::readPetrelFile( filePath );
auto surface = RifSurfaceImporter::readPetrelFile( filePath );
m_triangleMeshData->setGeometryData( surface.first, surface.second );
}
else if ( filePath.endsWith( "ts", Qt::CaseInsensitive ) )
{
m_triangleMeshData = std::make_unique<RigTriangleMeshData>();
RifSurfaceImporter::readGocadFile( filePath, m_triangleMeshData.get() );
surface = m_triangleMeshData->geometry();
}
else if ( filePath.endsWith( "vtu", Qt::CaseInsensitive ) )
{
m_triangleMeshData = RifVtkSurfaceImporter::importFromFile( filePath.toStdString() );
surface = m_triangleMeshData->geometry();
}
else if ( filePath.endsWith( "dat", Qt::CaseInsensitive ) || filePath.endsWith( "xyz", Qt::CaseInsensitive ) )
{
double resamplingDistance = RiaPreferences::current()->surfaceImportResamplingDistance();
surface = RifSurfaceImporter::readOpenWorksXyzFile( filePath, resamplingDistance );
auto surface = RifSurfaceImporter::readOpenWorksXyzFile( filePath, resamplingDistance );
m_triangleMeshData->setGeometryData( surface.first, surface.second );
}
m_vertices = surface.first;
m_tringleIndices = surface.second;
return !( m_vertices.empty() || m_tringleIndices.empty() );
return !( m_triangleMeshData->geometry().first.empty() );
}