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: register keyword aliases for WellLogFile.

Browse Source
This commit is contained in:
Kristian Bendiksen
2024-06-17 14:37:57 +02:00
parent 81eca2c893
commit 80f269715b
9 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,8 @@ Rim3dWellLogFileCurve::Rim3dWellLogFileCurve()
CAF_PDM_InitFieldNoDefault( &m_wellLogChannelName, "CurveWellLogChannel", "Well Log Channel" );
CAF_PDM_InitFieldNoDefault( &m_wellLog, "WellLogFile", "Well Log" );
CAF_PDM_InitFieldNoDefault( &m_wellLog, "WellLog", "Well Log" );
m_wellLog.registerKeywordAlias( "WellLogFile" );
CAF_PDM_InitFieldNoDefault( &m_nameConfig, "NameConfig", "" );
m_nameConfig = new RimWellLogLasFileCurveNameConfig();

6
ApplicationLibCode/ProjectDataModel/WellLog/RimOsduWellLog.cpp
View File

@@ -57,7 +57,7 @@ RimOsduWellLog::RimOsduWellLog()
//--------------------------------------------------------------------------------------------------
RimOsduWellLog::~RimOsduWellLog()
{
m_wellLogChannelNames.deleteChildren();
m_wellLogChannels.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
@@ -153,13 +153,13 @@ void RimOsduWellLog::setWellLogData( RigOsduWellLogData* wellLogData )
{
m_wellLogData = wellLogData;
m_wellLogChannelNames.deleteChildren();
m_wellLogChannels.deleteChildren();
for ( const QString& wellLogName : wellLogData->wellLogChannelNames() )
{
RimWellLogChannel* wellLog = new RimWellLogChannel();
wellLog->setName( wellLogName );
m_wellLogChannelNames.push_back( wellLog );
m_wellLogChannels.push_back( wellLog );
}
}

8
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLog.cpp
View File

@@ -45,8 +45,10 @@ RimWellLog::RimWellLog()
CAF_PDM_InitFieldNoDefault( &m_date, "Date", "Date" );
CAF_PDM_InitFieldNoDefault( &m_wellLogChannelNames, "WellLogFileChannels", "" );
RiaFieldHandleTools::disableWriteAndSetFieldHidden( &m_wellLogChannelNames );
CAF_PDM_InitFieldNoDefault( &m_wellLogChannels, "WellLogChannels", "" );
m_wellLogChannels.registerKeywordAlias( "WellLogFileChannels" );
RiaFieldHandleTools::disableWriteAndSetFieldHidden( &m_wellLogChannels );
}
//--------------------------------------------------------------------------------------------------
@@ -54,7 +56,7 @@ RimWellLog::RimWellLog()
//--------------------------------------------------------------------------------------------------
std::vector<RimWellLogChannel*> RimWellLog::wellLogChannels() const
{
return m_wellLogChannelNames.childrenByType();
return m_wellLogChannels.childrenByType();
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLog.h
View File

@@ -58,6 +58,6 @@ protected:
void defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
caf::PdmChildArrayField<RimWellLogChannel*> m_wellLogChannelNames;
caf::PdmChildArrayField<RimWellLogChannel*> m_wellLogChannels;
caf::PdmField<QDateTime> m_date;
};

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

@@ -21,14 +21,14 @@
#include "RiaFieldHandleTools.h"
CAF_PDM_SOURCE_INIT( RimWellLogChannel, "WellLogFileChannel" );
CAF_PDM_SOURCE_INIT( RimWellLogChannel, "WellLogChannel", "WellLogFileChannel" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellLogChannel::RimWellLogChannel()
{
CAF_PDM_InitObject( "Well Log File Channel" );
CAF_PDM_InitObject( "Well Log Channel" );
RiaFieldHandleTools::disableWriteAndSetFieldHidden( nameField() );
}

6
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.cpp
View File

@@ -56,7 +56,7 @@ RimWellLogCsvFile::RimWellLogCsvFile()
//--------------------------------------------------------------------------------------------------
RimWellLogCsvFile::~RimWellLogCsvFile()
{
m_wellLogChannelNames.deleteChildren();
m_wellLogChannels.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
@@ -86,14 +86,14 @@ bool RimWellLogCsvFile::readFile( QString* errorMessage )
return false;
}
m_wellLogChannelNames.deleteChildren();
m_wellLogChannels.deleteChildren();
QStringList wellLogNames = m_wellLogDataFile->wellLogChannelNames();
for ( int logIdx = 0; logIdx < wellLogNames.size(); logIdx++ )
{
RimWellLogChannel* wellLog = new RimWellLogChannel();
wellLog->setName( wellLogNames[logIdx] );
m_wellLogChannelNames.push_back( wellLog );
m_wellLogChannels.push_back( wellLog );
}
return true;

6
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.cpp
View File

@@ -87,7 +87,7 @@ RimWellLogLasFile::RimWellLogLasFile()
//--------------------------------------------------------------------------------------------------
RimWellLogLasFile::~RimWellLogLasFile()
{
m_wellLogChannelNames.deleteChildren();
m_wellLogChannels.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
@@ -150,14 +150,14 @@ bool RimWellLogLasFile::readFile( QString* errorMessage )
m_date = DEFAULT_DATE_TIME;
}
m_wellLogChannelNames.deleteChildren();
m_wellLogChannels.deleteChildren();
QStringList wellLogNames = m_wellLogDataFile->wellLogChannelNames();
for ( int logIdx = 0; logIdx < wellLogNames.size(); logIdx++ )
{
RimWellLogChannel* wellLog = new RimWellLogChannel();
wellLog->setName( wellLogNames[logIdx] );
m_wellLogChannelNames.push_back( wellLog );
m_wellLogChannels.push_back( wellLog );
}
auto wellPath = firstAncestorOrThisOfType<RimFileWellPath>();

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

@@ -60,7 +60,8 @@ RimWellLogLasFileCurve::RimWellLogLasFileCurve()
CAF_PDM_InitFieldNoDefault( &m_wellLogChannelName, "CurveWellLogChannel", "Well Log Channel" );
CAF_PDM_InitFieldNoDefault( &m_wellLog, "WellLogFile", "Well Log File" );
CAF_PDM_InitFieldNoDefault( &m_wellLog, "WellLog", "Well Log" );
m_wellLog.registerKeywordAlias( "WellLogFile" );
m_wellPath = nullptr;
}

3
ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp
View File

@@ -133,7 +133,8 @@ RimWellPath::RimWellPath()
CAF_PDM_InitScriptableFieldNoDefault( &m_completionSettings, "CompletionSettings", "Completion Settings" );
m_completionSettings = new RimWellPathCompletionSettings;
CAF_PDM_InitFieldNoDefault( &m_wellLogs, "WellLogFiles", "Well Logs" );
CAF_PDM_InitFieldNoDefault( &m_wellLogs, "WellLogs", "Well Logs" );
m_wellLogs.registerKeywordAlias( "WellLogFiles" );
CAF_PDM_InitFieldNoDefault( &m_3dWellLogCurves, "CollectionOf3dWellLogCurves", "3D Track" );
m_3dWellLogCurves = new Rim3dWellLogCurveCollection;