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

Refactor: Rename WellLogFile to WellLogData.

Browse Source
This commit is contained in:
Kristian Bendiksen
2024-05-27 14:00:40 +02:00
parent 11128073f7
commit 6e1289507f
10 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp
View File

@@ -91,7 +91,7 @@ void Rim3dWellLogFileCurve::curveValuesAndMds( std::vector<double>* values, std:
if ( m_wellLogFile )
{
RigWellLogFile* wellLogFile = m_wellLogFile->wellLogFileData();
RigWellLogData* wellLogFile = m_wellLogFile->wellLogFileData();
if ( wellLogFile )
{
*values = wellLogFile->values( m_wellLogChannelName );
@@ -137,7 +137,7 @@ QString Rim3dWellLogFileCurve::createAutoName() const
channelNameAvailable = true;
}
RigWellLogFile* wellLogFile = m_wellLogFile ? m_wellLogFile->wellLogFileData() : nullptr;
RigWellLogData* wellLogFile = m_wellLogFile ? m_wellLogFile->wellLogFileData() : nullptr;
if ( wellLogFile )
{

4
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.h
View File

@@ -28,7 +28,7 @@
class RimWellLogChannel;
class RimWellPath;
class RigWellLogFile;
class RigWellLogData;
//==================================================================================================
///
@@ -49,7 +49,7 @@ public:
virtual QString wellName() const = 0;
virtual QString name() const = 0;
virtual bool readFile( QString* errorMessage ) = 0;
virtual RigWellLogFile* wellLogFileData() = 0;
virtual RigWellLogData* wellLogFileData() = 0;
virtual QDateTime date() const;

4
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFileCurve.cpp
View File

@@ -85,7 +85,7 @@ void RimWellLogLasFileCurve::onLoadDataAndUpdate( bool updateParentPlot )
if ( m_wellPath && m_wellLogFile )
{
RigWellLogFile* wellLogFile = m_wellLogFile->wellLogFileData();
RigWellLogData* wellLogFile = m_wellLogFile->wellLogFileData();
if ( wellLogFile )
{
std::vector<double> values = wellLogFile->values( m_wellLogChannelName );
@@ -457,7 +457,7 @@ QString RimWellLogLasFileCurve::createCurveAutoName()
channelNameAvailable = true;
}
RigWellLogFile* wellLogFile = m_wellLogFile ? m_wellLogFile->wellLogFileData() : nullptr;
RigWellLogData* wellLogFile = m_wellLogFile ? m_wellLogFile->wellLogFileData() : nullptr;
if ( wellLogFile )
{

4
ApplicationLibCode/ReservoirDataModel/CMakeLists_filesNotToUnitTest.cmake
View File

@@ -4,7 +4,7 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseCellMapperTools.h
${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseRangeFilterMapper.h
${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCenterLineCalculator.h
${CMAKE_CURRENT_LIST_DIR}/RigWellLogFile.h
${CMAKE_CURRENT_LIST_DIR}/RigWellLogData.h
${CMAKE_CURRENT_LIST_DIR}/RigWellLogLasFile.h
${CMAKE_CURRENT_LIST_DIR}/RigWellLogCsvFile.h
${CMAKE_CURRENT_LIST_DIR}/RigReservoirGridTools.h
@@ -16,7 +16,7 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseCellMapperTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseRangeFilterMapper.cpp
${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCenterLineCalculator.cpp
${CMAKE_CURRENT_LIST_DIR}/RigWellLogFile.cpp
${CMAKE_CURRENT_LIST_DIR}/RigWellLogData.cpp
${CMAKE_CURRENT_LIST_DIR}/RigWellLogLasFile.cpp
${CMAKE_CURRENT_LIST_DIR}/RigWellLogCsvFile.cpp
${CMAKE_CURRENT_LIST_DIR}/RigReservoirGridTools.cpp

2
ApplicationLibCode/ReservoirDataModel/RigWellLogCsvFile.cpp
View File

@@ -40,7 +40,7 @@
///
//--------------------------------------------------------------------------------------------------
RigWellLogCsvFile::RigWellLogCsvFile()
: RigWellLogFile()
: RigWellLogData()
{
}

4
ApplicationLibCode/ReservoirDataModel/RigWellLogCsvFile.h
View File

@@ -18,7 +18,7 @@
#pragma once
#include "RigWellLogFile.h"
#include "RigWellLogData.h"
#include "RiaDefines.h"
@@ -32,7 +32,7 @@ class RigWellPath;
//==================================================================================================
///
//==================================================================================================
class RigWellLogCsvFile : public RigWellLogFile
class RigWellLogCsvFile : public RigWellLogData
{
public:
RigWellLogCsvFile();

10
ApplicationLibCode/ReservoirDataModel/RigWellLogFile.cpp → ApplicationLibCode/ReservoirDataModel/RigWellLogData.cpp
View File

@@ -17,12 +17,12 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RigWellLogFile.h"
#include "RigWellLogData.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigWellLogFile::RigWellLogFile()
RigWellLogData::RigWellLogData()
: cvf::Object()
{
}
@@ -30,14 +30,14 @@ RigWellLogFile::RigWellLogFile()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigWellLogFile::~RigWellLogFile()
RigWellLogData::~RigWellLogData()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaDefines::DepthUnitType RigWellLogFile::depthUnit() const
RiaDefines::DepthUnitType RigWellLogData::depthUnit() const
{
RiaDefines::DepthUnitType unitType = RiaDefines::DepthUnitType::UNIT_METER;
@@ -52,7 +52,7 @@ RiaDefines::DepthUnitType RigWellLogFile::depthUnit() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RigWellLogFile::convertedWellLogChannelUnitString( const QString& wellLogChannelName, RiaDefines::DepthUnitType displayDepthUnit ) const
QString RigWellLogData::convertedWellLogChannelUnitString( const QString& wellLogChannelName, RiaDefines::DepthUnitType displayDepthUnit ) const
{
QString unit = wellLogChannelUnitString( wellLogChannelName );

6
ApplicationLibCode/ReservoirDataModel/RigWellLogFile.h → ApplicationLibCode/ReservoirDataModel/RigWellLogData.h
View File

@@ -31,11 +31,11 @@ class RimWellLogCurve;
//==================================================================================================
///
//==================================================================================================
class RigWellLogFile : public cvf::Object
class RigWellLogData : public cvf::Object
{
public:
RigWellLogFile();
~RigWellLogFile() override;
RigWellLogData();
~RigWellLogData() override;
virtual QStringList wellLogChannelNames() const = 0;

2
ApplicationLibCode/ReservoirDataModel/RigWellLogLasFile.cpp
View File

@@ -38,7 +38,7 @@
///
//--------------------------------------------------------------------------------------------------
RigWellLogLasFile::RigWellLogLasFile()
: RigWellLogFile()
: RigWellLogData()
{
m_wellLogFile = nullptr;
}

4
ApplicationLibCode/ReservoirDataModel/RigWellLogLasFile.h
View File

@@ -19,7 +19,7 @@
#pragma once
#include "RigWellLogFile.h"
#include "RigWellLogData.h"
#include "RiaDefines.h"
@@ -36,7 +36,7 @@ class RimWellLogCurve;
//==================================================================================================
///
//==================================================================================================
class RigWellLogLasFile : public RigWellLogFile
class RigWellLogLasFile : public RigWellLogData
{
public:
RigWellLogLasFile();