diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp index 0b9257c08d..b82819472c 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp @@ -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(); diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimOsduWellLog.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimOsduWellLog.cpp index e2738a0c70..feb3b5f44d 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimOsduWellLog.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimOsduWellLog.cpp @@ -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 ); } } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLog.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLog.cpp index 8340a6371a..82b4d75aab 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLog.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLog.cpp @@ -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 RimWellLog::wellLogChannels() const { - return m_wellLogChannelNames.childrenByType(); + return m_wellLogChannels.childrenByType(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLog.h b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLog.h index 0a899326a6..50e570d744 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLog.h +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLog.h @@ -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 m_wellLogChannelNames; + caf::PdmChildArrayField m_wellLogChannels; caf::PdmField m_date; }; diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogChannel.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogChannel.cpp index adf99714c9..05c1cf357e 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogChannel.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogChannel.cpp @@ -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() ); } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.cpp index d6324d3a5a..384bedd19c 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.cpp @@ -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; diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.cpp index 2bd2d8adbe..28655c2b37 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.cpp @@ -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(); diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFileCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFileCurve.cpp index 6e1b0bc621..e421336445 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFileCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFileCurve.cpp @@ -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; } diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp index eebe7d8d17..339d974dee 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp @@ -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;