OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-14 01:13:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

#6314 Rename to RifSurfaceImporter

Browse Source 
Co-authored-by: Ruben Manuel Thoms <ruben.thoms@ceetronsolutions.com>
This commit is contained in:
Magne Sjaastad 2020-08-24 14:12:51 +02:00
parent 4f68f2b11a
commit 1f2f1bf14e
7 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/FileInterface/CMakeLists_files.cmake
View File

@ -50,7 +50,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RifDerivedEnsembleReader.h
${CMAKE_CURRENT_LIST_DIR}/RifActiveCellsReader.h
${CMAKE_CURRENT_LIST_DIR}/RifCsvDataTableFormatter.h
${CMAKE_CURRENT_LIST_DIR}/RifEclipseInputPropertyLoader.h
${CMAKE_CURRENT_LIST_DIR}/RifSurfaceReader.h
${CMAKE_CURRENT_LIST_DIR}/RifSurfaceImporter.h
${CMAKE_CURRENT_LIST_DIR}/RifRoffReader.h
${CMAKE_CURRENT_LIST_DIR}/RifColorLegendData.h
${CMAKE_CURRENT_LIST_DIR}/RifElasticPropertiesReader.h
@ -111,7 +111,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RifActiveCellsReader.cpp
${CMAKE_CURRENT_LIST_DIR}/RifCsvDataTableFormatter.cpp
${CMAKE_CURRENT_LIST_DIR}/RifReaderEnsembleStatisticsRft.cpp
${CMAKE_CURRENT_LIST_DIR}/RifEclipseInputPropertyLoader.cpp
${CMAKE_CURRENT_LIST_DIR}/RifSurfaceReader.cpp
${CMAKE_CURRENT_LIST_DIR}/RifSurfaceImporter.cpp
${CMAKE_CURRENT_LIST_DIR}/RifRoffReader.cpp
${CMAKE_CURRENT_LIST_DIR}/RifColorLegendData.cpp
${CMAKE_CURRENT_LIST_DIR}/RifElasticPropertiesReader.cpp

6
ApplicationCode/FileInterface/RifSurfaceReader.cpp → ApplicationCode/FileInterface/RifSurfaceImporter.cpp
View File

@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RifSurfaceReader.h"
#include "RifSurfaceImporter.h"
#include "RigGocadData.h"
#include "cvfAssert.h"
@ -37,7 +37,7 @@
/// Returns vertices with z-value as depth, z is increasing downwards
///
//--------------------------------------------------------------------------------------------------
void RifSurfaceReader::readGocadFile( const QString& filename, RigGocadData* gocadData )
void RifSurfaceImporter::readGocadFile( const QString& filename, RigGocadData* gocadData )
{
CVF_ASSERT( gocadData );
@ -200,7 +200,7 @@ void RifSurfaceReader::readGocadFile( const QString& filename, RigGocadData* goc
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::pair<std::vector<cvf::Vec3d>, std::vector<unsigned>> RifSurfaceReader::readPetrelFile( const QString& filename )
std::pair<std::vector<cvf::Vec3d>, std::vector<unsigned>> RifSurfaceImporter::readPetrelFile( const QString& filename )
{
std::ifstream stream( filename.toLatin1().data() );

2
ApplicationCode/FileInterface/RifSurfaceReader.h → ApplicationCode/FileInterface/RifSurfaceImporter.h
View File

@ -27,7 +27,7 @@
class RigGocadData;
class RifSurfaceReader
class RifSurfaceImporter
{
public:
static void readGocadFile( const QString& filename, RigGocadData* gocadData );

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

@ -18,7 +18,7 @@
#include "RimFileSurface.h"
#include "RifSurfaceReader.h"
#include "RifSurfaceImporter.h"
#include "RigGocadData.h"
#include "RigSurface.h"
#include "RimSurfaceCollection.h"
@ -172,13 +172,13 @@ bool RimFileSurface::loadDataFromFile()
QString filePath = this->surfaceFilePath();
if ( filePath.endsWith( "ptl", Qt::CaseInsensitive ) )
{
surface = RifSurfaceReader::readPetrelFile( filePath );
surface = RifSurfaceImporter::readPetrelFile( filePath );
}
else if ( filePath.endsWith( "ts", Qt::CaseInsensitive ) )
{
m_gocadData.reset( new RigGocadData );
RifSurfaceReader::readGocadFile( filePath, m_gocadData.get() );
RifSurfaceImporter::readGocadFile( filePath, m_gocadData.get() );
surface = m_gocadData->gocadGeometry();
}

2
ApplicationCode/ProjectDataModel/Surfaces/RimSurface.cpp
View File

@ -22,7 +22,7 @@
#include "RigSurface.h"
#include "RifSurfaceReader.h"
#include "RifSurfaceImporter.h"
#include "cafPdmUiDoubleSliderEditor.h"

2
ApplicationCode/UnitTests/CMakeLists_files.cmake
View File

@ -66,7 +66,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiaInterpolationTools-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RifWellMeasurementReader-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaDateStringParser-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RigHexGradientTools-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RifSurfaceReader-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RifSurfaceImporter-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RifColorLegendData-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RifRoffReader-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RifElasticPropertiesReader-Test.cpp

32
ApplicationCode/UnitTests/RifSurfaceReader-Test.cpp → ApplicationCode/UnitTests/RifSurfaceImporter-Test.cpp
View File

@ -1,6 +1,6 @@
#include "gtest/gtest.h"
#include "RifSurfaceReader.h"
#include "RifSurfaceImporter.h"
#include "RiaTestDataDirectory.h"
#include "RigGocadData.h"
@ -9,7 +9,7 @@
#include <QString>
#include <QStringList>
TEST( RifSurfaceReader, GocadReadValidFile )
TEST( RifSurfaceImporter, GocadReadValidFile )
{
QDir baseFolder( TEST_DATA_DIR );
@ -18,7 +18,7 @@ TEST( RifSurfaceReader, GocadReadValidFile )
EXPECT_TRUE( QFile::exists( filePath ) );
RigGocadData gocadData;
RifSurfaceReader::readGocadFile( filePath, &gocadData );
RifSurfaceImporter::readGocadFile( filePath, &gocadData );
auto surface = gocadData.gocadGeometry();
auto vertices = surface.first;
@ -31,7 +31,7 @@ TEST( RifSurfaceReader, GocadReadValidFile )
EXPECT_EQ( (size_t)64, indices.back() );
}
TEST( RifSurfaceReader, GocadReadWrongIndices )
TEST( RifSurfaceImporter, GocadReadWrongIndices )
{
QDir baseFolder( TEST_DATA_DIR );
@ -40,7 +40,7 @@ TEST( RifSurfaceReader, GocadReadWrongIndices )
EXPECT_TRUE( QFile::exists( filePath ) );
RigGocadData gocadData;
RifSurfaceReader::readGocadFile( filePath, &gocadData );
RifSurfaceImporter::readGocadFile( filePath, &gocadData );
auto surface = gocadData.gocadGeometry();
auto vertices = surface.first;
@ -50,7 +50,7 @@ TEST( RifSurfaceReader, GocadReadWrongIndices )
EXPECT_EQ( (size_t)15, indices.size() );
}
TEST( RifSurfaceReader, GocadReadProperties )
TEST( RifSurfaceImporter, GocadReadProperties )
{
QDir baseFolder( TEST_DATA_DIR );
@ -59,7 +59,7 @@ TEST( RifSurfaceReader, GocadReadProperties )
EXPECT_TRUE( QFile::exists( filePath ) );
RigGocadData gocadData;
RifSurfaceReader::readGocadFile( filePath, &gocadData );
RifSurfaceImporter::readGocadFile( filePath, &gocadData );
auto surface = gocadData.gocadGeometry();
auto vertices = surface.first;
@ -91,7 +91,7 @@ TEST( RifSurfaceReader, GocadReadProperties )
EXPECT_NEAR( 0.010476, SY_last, 1e-4 );
}
TEST( RifSurfaceReader, GocadReadNoProperty )
TEST( RifSurfaceImporter, GocadReadNoProperty )
{
QDir baseFolder( TEST_DATA_DIR );
@ -100,7 +100,7 @@ TEST( RifSurfaceReader, GocadReadNoProperty )
EXPECT_TRUE( QFile::exists( filePath ) );
RigGocadData gocadData;
RifSurfaceReader::readGocadFile( filePath, &gocadData );
RifSurfaceImporter::readGocadFile( filePath, &gocadData );
std::vector<QString> propNames = gocadData.propertyNames();
std::vector<float> propValues = gocadData.propertyValues( "" );
@ -109,7 +109,7 @@ TEST( RifSurfaceReader, GocadReadNoProperty )
EXPECT_TRUE( propValues.size() == 0 );
}
TEST( RifSurfaceReader, GocadReadNonExistingProperty )
TEST( RifSurfaceImporter, GocadReadNonExistingProperty )
{
QDir baseFolder( TEST_DATA_DIR );
@ -118,14 +118,14 @@ TEST( RifSurfaceReader, GocadReadNonExistingProperty )
EXPECT_TRUE( QFile::exists( filePath ) );
RigGocadData gocadData;
RifSurfaceReader::readGocadFile( filePath, &gocadData );
RifSurfaceImporter::readGocadFile( filePath, &gocadData );
std::vector<float> propValues = gocadData.propertyValues( "NonExistingProperty" );
EXPECT_TRUE( propValues.size() == 0 );
}
TEST( RifSurfaceReader, ReadWrongFileType )
TEST( RifSurfaceImporter, ReadWrongFileType )
{
QDir baseFolder( TEST_DATA_DIR );
@ -135,7 +135,7 @@ TEST( RifSurfaceReader, ReadWrongFileType )
EXPECT_TRUE( QFile::exists( filePath ) );
RigGocadData gocadData;
RifSurfaceReader::readGocadFile( filePath, &gocadData );
RifSurfaceImporter::readGocadFile( filePath, &gocadData );
auto surface = gocadData.gocadGeometry();
auto vertices = surface.first;
@ -150,7 +150,7 @@ TEST( RifSurfaceReader, ReadWrongFileType )
QString filePath = baseFolder.absoluteFilePath( filename );
EXPECT_TRUE( QFile::exists( filePath ) );
auto surface = RifSurfaceReader::readPetrelFile( filePath );
auto surface = RifSurfaceImporter::readPetrelFile( filePath );
auto vertices = surface.first;
auto indices = surface.second;
@ -160,7 +160,7 @@ TEST( RifSurfaceReader, ReadWrongFileType )
}
}
TEST( RifSurfaceReader, ReadPetrelData )
TEST( RifSurfaceImporter, ReadPetrelData )
{
QDir baseFolder( TEST_DATA_DIR );
@ -168,7 +168,7 @@ TEST( RifSurfaceReader, ReadPetrelData )
QString filePath = baseFolder.absoluteFilePath( filename );
EXPECT_TRUE( QFile::exists( filePath ) );
auto surface = RifSurfaceReader::readPetrelFile( filePath );
auto surface = RifSurfaceImporter::readPetrelFile( filePath );
auto vertices = surface.first;
auto indices = surface.second;