diff --git a/ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesUi.cpp b/ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesUi.cpp index ad275a9233..dbf0ed3221 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesUi.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesUi.cpp @@ -24,7 +24,7 @@ #include "RimOilField.h" #include "RimProject.h" #include "RimTools.h" -#include "RimWellLogFileChannel.h" +#include "RimWellLogChannel.h" #include "RimWellLogLasFile.h" #include "RimWellPath.h" #include "RimWellPathCollection.h" diff --git a/ApplicationLibCode/Commands/RicWellLogTools.cpp b/ApplicationLibCode/Commands/RicWellLogTools.cpp index bb90dcd940..9a8f412f0e 100644 --- a/ApplicationLibCode/Commands/RicWellLogTools.cpp +++ b/ApplicationLibCode/Commands/RicWellLogTools.cpp @@ -31,9 +31,9 @@ #include "RimSimWellInView.h" #include "RimSummaryCase.h" #include "RimWellLogCalculatedCurve.h" +#include "RimWellLogChannel.h" #include "RimWellLogCurveCommonDataSource.h" #include "RimWellLogExtractionCurve.h" -#include "RimWellLogFileChannel.h" #include "RimWellLogLasFile.h" #include "RimWellLogLasFileCurve.h" #include "RimWellLogRftCurve.h" @@ -136,21 +136,21 @@ bool RicWellLogTools::isWellPathOrSimWellSelectedInView() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicWellLogTools::addWellLogChannelsToPlotTrack( RimWellLogTrack* plotTrack, const std::vector& wellLogFileChannels ) +void RicWellLogTools::addWellLogChannelsToPlotTrack( RimWellLogTrack* plotTrack, const std::vector& wellLogChannels ) { - for ( size_t cIdx = 0; cIdx < wellLogFileChannels.size(); cIdx++ ) + for ( RimWellLogChannel* wellLogChannel : wellLogChannels ) { RimWellLogLasFileCurve* plotCurve = RicWellLogTools::addFileCurve( plotTrack ); - RimWellPath* wellPath = wellLogFileChannels[cIdx]->firstAncestorOrThisOfType(); - RimWellLogLasFile* wellLogFile = wellLogFileChannels[cIdx]->firstAncestorOrThisOfType(); + RimWellPath* wellPath = wellLogChannel->firstAncestorOrThisOfType(); + RimWellLogLasFile* wellLogFile = wellLogChannel->firstAncestorOrThisOfType(); if ( wellPath ) { if ( wellLogFile ) plotCurve->setWellLogFile( wellLogFile ); plotCurve->setWellPath( wellPath ); - plotCurve->setWellLogChannelName( wellLogFileChannels[cIdx]->name() ); + plotCurve->setWellLogChannelName( wellLogChannel->name() ); plotCurve->loadDataAndUpdate( true ); plotCurve->updateConnectedEditors(); } diff --git a/ApplicationLibCode/Commands/RicWellLogTools.h b/ApplicationLibCode/Commands/RicWellLogTools.h index 5648b9542b..563895e898 100644 --- a/ApplicationLibCode/Commands/RicWellLogTools.h +++ b/ApplicationLibCode/Commands/RicWellLogTools.h @@ -29,7 +29,7 @@ class RimSimWellInView; class Rim3dView; class Rim3dWellLogCurveCollection; class RimWellLogExtractionCurve; -class RimWellLogFileChannel; +class RimWellLogChannel; class RimWellLogLasFileCurve; class RimWellLogRftCurve; class RimWellLogTrack; @@ -50,7 +50,7 @@ public: static bool hasRftData(); static bool hasRftDataForWell( const QString& wellName ); static bool isWellPathOrSimWellSelectedInView(); - static void addWellLogChannelsToPlotTrack( RimWellLogTrack* plotTrack, const std::vector& wellLogFileChannels ); + static void addWellLogChannelsToPlotTrack( RimWellLogTrack* plotTrack, const std::vector& wellLogFileChannels ); static RimWellPath* selectedWellPathWithLogFile(); static RimWellPath* findWellPathWithLogFileFromSelection(); static RimWellLogRftCurve* addRftCurve( RimWellLogTrack* plotTrack, const RimSimWellInView* simWell, bool showPlotWindow = true ); diff --git a/ApplicationLibCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp b/ApplicationLibCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp index 749f4d8f8a..d521a3bd70 100644 --- a/ApplicationLibCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp +++ b/ApplicationLibCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp @@ -24,7 +24,7 @@ #include "RimMainPlotCollection.h" #include "RimProject.h" -#include "RimWellLogFileChannel.h" +#include "RimWellLogChannel.h" #include "RimWellLogLasFile.h" #include "RimWellLogLasFileCurve.h" #include "RimWellLogPlot.h" @@ -49,7 +49,7 @@ CAF_CMD_SOURCE_INIT( RicAddWellLogToPlotFeature, "RicAddWellLogToPlotFeature" ); //-------------------------------------------------------------------------------------------------- bool RicAddWellLogToPlotFeature::isCommandEnabled() const { - std::vector selection = selectedWellLogs(); + std::vector selection = selectedWellLogs(); return !selection.empty(); } @@ -58,7 +58,7 @@ bool RicAddWellLogToPlotFeature::isCommandEnabled() const //-------------------------------------------------------------------------------------------------- void RicAddWellLogToPlotFeature::onActionTriggered( bool isChecked ) { - std::vector selection = selectedWellLogs(); + std::vector selection = selectedWellLogs(); if ( selection.empty() ) return; RimWellLogPlot* plot = RicNewWellLogPlotFeatureImpl::createWellLogPlot(); @@ -71,7 +71,7 @@ void RicAddWellLogToPlotFeature::onActionTriggered( bool isChecked ) for ( size_t wlIdx = 0; wlIdx < selection.size(); wlIdx++ ) { - RimWellLogFileChannel* wellLog = selection[wlIdx]; + RimWellLogChannel* wellLog = selection[wlIdx]; auto wellPath = wellLog->firstAncestorOrThisOfType(); auto wellLogFile = wellLog->firstAncestorOrThisOfType(); @@ -116,9 +116,9 @@ void RicAddWellLogToPlotFeature::setupActionLook( QAction* actionToSetup ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RicAddWellLogToPlotFeature::selectedWellLogs() +std::vector RicAddWellLogToPlotFeature::selectedWellLogs() { - std::vector selection; + std::vector selection; caf::SelectionManager::instance()->objectsByType( &selection ); return selection; } diff --git a/ApplicationLibCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.h b/ApplicationLibCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.h index 9ae431c45f..6ff2e1abd4 100644 --- a/ApplicationLibCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.h +++ b/ApplicationLibCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.h @@ -26,7 +26,7 @@ class RimMainPlotCollection; class RimWellLogPlotCollection; class RimWellLogPlot; -class RimWellLogFileChannel; +class RimWellLogChannel; //================================================================================================== /// @@ -41,5 +41,5 @@ protected: void setupActionLook( QAction* actionToSetup ) override; private: - static std::vector selectedWellLogs(); + static std::vector selectedWellLogs(); }; diff --git a/ApplicationLibCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp b/ApplicationLibCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp index 25bb643b7c..3b9430c64f 100644 --- a/ApplicationLibCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp +++ b/ApplicationLibCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp @@ -35,8 +35,8 @@ #include "RimProject.h" #include "RimTools.h" #include "RimWellBoreStabilityPlot.h" +#include "RimWellLogChannel.h" #include "RimWellLogExtractionCurve.h" -#include "RimWellLogFileChannel.h" #include "RimWellLogLasFile.h" #include "RimWellLogLasFileCurve.h" #include "RimWellLogPlotCollection.h" diff --git a/ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp b/ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp index 5097767a2d..e63b1150db 100644 --- a/ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp +++ b/ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp @@ -24,7 +24,7 @@ #include "RicWellLogTools.h" #include "RimTools.h" -#include "RimWellLogFileChannel.h" +#include "RimWellLogChannel.h" #include "RimWellLogLasFile.h" #include "RimWellLogLasFileCurve.h" #include "RimWellLogTrack.h" diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPlotTools.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPlotTools.cpp index 33d7e93f06..179bfe7a14 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPlotTools.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPlotTools.cpp @@ -37,8 +37,8 @@ #include "RimProject.h" #include "RimSummaryCase.h" #include "RimSummaryCaseCollection.h" +#include "RimWellLogChannel.h" #include "RimWellLogExtractionCurve.h" -#include "RimWellLogFileChannel.h" #include "RimWellLogLasFile.h" #include "RimWellLogLasFileCurve.h" #include "RimWellLogRftCurve.h" @@ -80,7 +80,7 @@ public: //-------------------------------------------------------------------------------------------------- bool RimWellPlotTools::hasPressureData( const RimWellLogFile* wellLogFile ) { - for ( RimWellLogFileChannel* const wellLogChannel : wellLogFile->wellLogChannels() ) + for ( RimWellLogChannel* const wellLogChannel : wellLogFile->wellLogChannels() ) { if ( isPressureChannel( wellLogChannel ) ) return true; } @@ -125,7 +125,7 @@ std::pair RimWellPlotTools::pressureResultData //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimWellPlotTools::isPressureChannel( RimWellLogFileChannel* channel ) +bool RimWellPlotTools::isPressureChannel( RimWellLogChannel* channel ) { for ( const auto& pressureDataName : PRESSURE_DATA_NAMES ) { @@ -146,7 +146,7 @@ bool RimWellPlotTools::hasPressureData( RimEclipseResultCase* gridCase ) //-------------------------------------------------------------------------------------------------- bool RimWellPlotTools::hasFlowData( const RimWellLogFile* wellLogFile ) { - for ( RimWellLogFileChannel* const wellLogChannel : wellLogFile->wellLogChannels() ) + for ( RimWellLogChannel* const wellLogChannel : wellLogFile->wellLogChannels() ) { if ( isFlowChannel( wellLogChannel ) ) return true; } @@ -182,7 +182,7 @@ bool RimWellPlotTools::hasAssociatedWellPath( const QString& wellName ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimWellPlotTools::isFlowChannel( RimWellLogFileChannel* channel ) +bool RimWellPlotTools::isFlowChannel( RimWellLogChannel* channel ) { return tryMatchChannelName( FLOW_DATA_NAMES, channel->name() ); } @@ -297,11 +297,11 @@ std::vector RimWellPlotTools::wellLogFilesContainingPressure( c //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimWellLogFileChannel* RimWellPlotTools::getPressureChannelFromWellFile( const RimWellLogFile* wellLogFile ) +RimWellLogChannel* RimWellPlotTools::getPressureChannelFromWellFile( const RimWellLogFile* wellLogFile ) { if ( wellLogFile != nullptr ) { - for ( RimWellLogFileChannel* const channel : wellLogFile->wellLogChannels() ) + for ( RimWellLogChannel* const channel : wellLogFile->wellLogChannels() ) { if ( isPressureChannel( channel ) ) { diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPlotTools.h b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPlotTools.h index 046cad5f8e..47bca4f5b6 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPlotTools.h +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPlotTools.h @@ -36,7 +36,7 @@ class RimEclipseResultCase; class RimObservedFmuRftData; class RimSummaryCaseCollection; class RimWellLogCurve; -class RimWellLogFileChannel; +class RimWellLogChannel; class RimWellLogPlot; class RimWellPath; class RimPressureDepthData; @@ -87,7 +87,7 @@ public: static void addTimeStepsToMap( std::map>& destMap, const std::map>& timeStepsToAdd ); static std::vector wellLogFilesContainingPressure( const QString& wellPathNameOrSimWellName ); - static RimWellLogFileChannel* getPressureChannelFromWellFile( const RimWellLogFile* wellLogFile ); + static RimWellLogChannel* getPressureChannelFromWellFile( const RimWellLogFile* wellLogFile ); static RimWellPath* wellPathFromWellLogFile( const RimWellLogFile* wellLogFile ); static std::map> timeStepsMapFromGridCase( RimEclipseCase* gridCase ); static RiaRftPltCurveDefinition curveDefFromCurve( const RimWellLogCurve* curve ); @@ -147,11 +147,11 @@ private: static std::set FLOW_DATA_NAMES; static bool hasPressureData( const RimWellLogFile* wellLogFile ); - static bool isPressureChannel( RimWellLogFileChannel* channel ); + static bool isPressureChannel( RimWellLogChannel* channel ); static bool hasPressureData( RimEclipseResultCase* gridCase ); static bool hasPressureData( RimWellPath* wellPath ); static bool hasFlowData( RimEclipseResultCase* gridCase ); - static bool isFlowChannel( RimWellLogFileChannel* channel ); + static bool isFlowChannel( RimWellLogChannel* channel ); static bool tryMatchChannelName( const std::set& channelNames, const QString& channelNameToMatch ); static std::set findMatchingOrAdjacentTimeSteps( const std::set& baseTimeLine, const std::set& availableTimeSteps ); diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp index 37ba161f5f..a3cdd2e9d2 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp @@ -47,9 +47,9 @@ #include "RimProject.h" #include "RimSummaryCurveAppearanceCalculator.h" #include "RimWellFlowRateCurve.h" +#include "RimWellLogChannel.h" #include "RimWellLogExtractionCurve.h" #include "RimWellLogFile.h" -#include "RimWellLogFileChannel.h" #include "RimWellLogLasFile.h" #include "RimWellLogLasFileCurve.h" #include "RimWellLogPlot.h" diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.h b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.h index 14c3be4af4..5764394a9e 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.h +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.h @@ -38,7 +38,7 @@ class RimEclipseCase; class RimEclipseResultCase; class RimWellLogCurve; -class RimWellLogFileChannel; +class RimWellLogChannel; class RimWellPath; class RiuWellPltPlot; class RimWellLogTrack; diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp index 03f64193e9..7631f6c744 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp @@ -46,8 +46,8 @@ #include "RimSummaryCase.h" #include "RimSummaryCaseCollection.h" #include "RimTools.h" +#include "RimWellLogChannel.h" #include "RimWellLogExtractionCurve.h" -#include "RimWellLogFileChannel.h" #include "RimWellLogLasFile.h" #include "RimWellLogLasFileCurve.h" #include "RimWellLogPlot.h" @@ -687,8 +687,8 @@ void RimWellRftPlot::updateCurvesInPlot( const std::setaddCurve( curve ); curve->setWellPath( wellPath ); diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.h b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.h index 6cbb040255..6fc08f2293 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.h +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.h @@ -44,7 +44,7 @@ class RimEclipseCase; class RimEclipseResultCase; class RimRegularLegendConfig; class RimWellLogCurve; -class RimWellLogFileChannel; +class RimWellLogChannel; class RimWellPath; class RimWellPathCollection; class RiuWellRftPlot; diff --git a/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp index 8bc343eed3..9b7ac20320 100644 --- a/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp @@ -154,8 +154,8 @@ #include "RimVirtualPerforationResults.h" #include "RimWellAllocationPlot.h" #include "RimWellIASettings.h" +#include "RimWellLogChannel.h" #include "RimWellLogCurve.h" -#include "RimWellLogFileChannel.h" #include "RimWellLogLasFile.h" #include "RimWellLogPlot.h" #include "RimWellLogPlotCollection.h" @@ -838,7 +838,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection() menuBuilder << "RicShowSummaryCurveCalculatorFeature"; } } - else if ( dynamic_cast( firstUiItem ) ) + else if ( dynamic_cast( firstUiItem ) ) { menuBuilder << "RicAddWellLogToPlotFeature"; } @@ -1240,7 +1240,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection() menuBuilder.addSeparator(); } - if ( dynamic_cast( firstUiItem ) ) + if ( dynamic_cast( firstUiItem ) ) { menuBuilder << "RicAddWellLogToPlotFeature"; } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/CMakeLists_files.cmake b/ApplicationLibCode/ProjectDataModel/WellLog/CMakeLists_files.cmake index f3030b156c..a09f017929 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/CMakeLists_files.cmake +++ b/ApplicationLibCode/ProjectDataModel/WellLog/CMakeLists_files.cmake @@ -42,7 +42,7 @@ set(SOURCE_GROUP_SOURCE_FILES ${CMAKE_CURRENT_LIST_DIR}/RimWellLogCsvFile.cpp ${CMAKE_CURRENT_LIST_DIR}/RimWellLogFile.cpp ${CMAKE_CURRENT_LIST_DIR}/RimWellLogFileUtil.cpp - ${CMAKE_CURRENT_LIST_DIR}/RimWellLogFileChannel.cpp + ${CMAKE_CURRENT_LIST_DIR}/RimWellLogChannel.cpp ${CMAKE_CURRENT_LIST_DIR}/RimWellLogLasFileCurve.cpp ${CMAKE_CURRENT_LIST_DIR}/RimWellLogRftCurve.cpp ${CMAKE_CURRENT_LIST_DIR}/RimWellLogWbsCurve.cpp diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogExtractionCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogExtractionCurve.cpp index 8bbf4755e3..e8747eb43b 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogExtractionCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogExtractionCurve.cpp @@ -40,9 +40,9 @@ #include "RimGeoMechResultDefinition.h" #include "RimGeoMechView.h" #include "RimTools.h" +#include "RimWellLogChannel.h" #include "RimWellLogExtractionCurve.h" #include "RimWellLogExtractionCurveNameConfig.h" -#include "RimWellLogFileChannel.h" #include "RimWellLogLasFile.h" #include "RimWellPath.h" diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp index 78673e7dd7..9adcedd4ad 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp @@ -20,7 +20,7 @@ #include "RigWellLogLasFile.h" -#include "RimWellLogFileChannel.h" +#include "RimWellLogChannel.h" #include "RimWellLogLasFile.h" #include "RimWellLogLasFileCurveNameConfig.h" #include "RimWellPath.h" @@ -72,7 +72,7 @@ void Rim3dWellLogFileCurve::setDefaultFileCurveDataInfo() if ( m_wellLogFile ) { - std::vector fileLogs = m_wellLogFile->wellLogChannels(); + std::vector fileLogs = m_wellLogFile->wellLogChannels(); if ( !fileLogs.empty() ) { @@ -204,7 +204,7 @@ QList Rim3dWellLogFileCurve::calculateValueOptions( cons { if ( m_wellLogFile ) { - std::vector fileLogs = m_wellLogFile->wellLogChannels(); + std::vector fileLogs = m_wellLogFile->wellLogChannels(); for ( size_t i = 0; i < fileLogs.size(); i++ ) { diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp index 38f891bd31..3bb967afa8 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp @@ -38,8 +38,8 @@ #include "RimProject.h" #include "RimSummaryCase.h" #include "RimSummaryCaseCollection.h" +#include "RimWellLogChannel.h" #include "RimWellLogCurve.h" -#include "RimWellLogFileChannel.h" #include "RimWellLogLasFile.h" #include "RimWellLogLasFileCurve.h" #include "RimWellLogPlot.h" @@ -567,7 +567,7 @@ QList RimEnsembleWellLogCurveSet::calculateValueOptions( std::set wellLogChannelNames; for ( auto wellLogFile : m_ensembleWellLogs->wellLogFiles() ) { - std::vector fileLogs = wellLogFile->wellLogChannels(); + std::vector fileLogs = wellLogFile->wellLogChannels(); for ( size_t i = 0; i < fileLogs.size(); i++ ) { QString wellLogChannelName = fileLogs[i]->name(); diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileChannel.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogChannel.cpp similarity index 87% rename from ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileChannel.cpp rename to ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogChannel.cpp index 6371138944..adf8be5b33 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileChannel.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogChannel.cpp @@ -17,18 +17,18 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RimWellLogFileChannel.h" +#include "RimWellLogChannel.h" #include "RiaFieldHandleTools.h" #include -CAF_PDM_SOURCE_INIT( RimWellLogFileChannel, "WellLogFileChannel" ); +CAF_PDM_SOURCE_INIT( RimWellLogChannel, "WellLogFileChannel" ); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimWellLogFileChannel::RimWellLogFileChannel() +RimWellLogChannel::RimWellLogChannel() { CAF_PDM_InitObject( "Well Log File Channel" ); @@ -39,7 +39,7 @@ RimWellLogFileChannel::RimWellLogFileChannel() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimWellLogFileChannel::setName( const QString& name ) +void RimWellLogChannel::setName( const QString& name ) { m_name = name; } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileChannel.h b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogChannel.h similarity index 94% rename from ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileChannel.h rename to ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogChannel.h index f55875c96e..104a45d626 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileChannel.h +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogChannel.h @@ -28,12 +28,12 @@ class QString; /// /// //================================================================================================== -class RimWellLogFileChannel : public caf::PdmObject +class RimWellLogChannel : public caf::PdmObject { CAF_PDM_HEADER_INIT; public: - RimWellLogFileChannel(); + RimWellLogChannel(); void setName( const QString& name ); QString name() const { return m_name; } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.cpp index cc71b7b498..3de9f37a4e 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.cpp @@ -25,7 +25,7 @@ #include "RimFileWellPath.h" #include "RimTools.h" -#include "RimWellLogFileChannel.h" +#include "RimWellLogChannel.h" #include #include @@ -91,7 +91,7 @@ bool RimWellLogCsvFile::readFile( QString* errorMessage ) QStringList wellLogNames = m_wellLogDataFile->wellLogChannelNames(); for ( int logIdx = 0; logIdx < wellLogNames.size(); logIdx++ ) { - RimWellLogFileChannel* wellLog = new RimWellLogFileChannel(); + RimWellLogChannel* wellLog = new RimWellLogChannel(); wellLog->setName( wellLogNames[logIdx] ); m_wellLogChannelNames.push_back( wellLog ); } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp index 67d6bb34c5..a6e65d7221 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp @@ -51,9 +51,9 @@ #include "RimMainPlotCollection.h" #include "RimTools.h" #include "RimWellBoreStabilityPlot.h" +#include "RimWellLogChannel.h" #include "RimWellLogCurve.h" #include "RimWellLogCurveCommonDataSource.h" -#include "RimWellLogFileChannel.h" #include "RimWellLogFileUtil.h" #include "RimWellLogLasFile.h" #include "RimWellLogPlot.h" diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.cpp index c863c37bce..198a2741d3 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.cpp @@ -20,7 +20,7 @@ #include "RimFileWellPath.h" #include "RimTools.h" -#include "RimWellLogFileChannel.h" +#include "RimWellLogChannel.h" #include "RiaFieldHandleTools.h" #include "RiaQDateTimeTools.h" @@ -79,9 +79,9 @@ QString RimWellLogFile::fileName() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimWellLogFile::wellLogChannels() const +std::vector RimWellLogFile::wellLogChannels() const { - std::vector channels; + std::vector channels; for ( const auto& channel : m_wellLogChannelNames ) { channels.push_back( channel ); diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.h b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.h index 399cf23367..8dec8e083c 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.h +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.h @@ -25,7 +25,7 @@ #include #include -class RimWellLogFileChannel; +class RimWellLogChannel; class RimWellPath; class RigWellLogFile; @@ -42,9 +42,9 @@ public: RimWellLogFile(); ~RimWellLogFile() override; - virtual void setFileName( const QString& fileName ); - virtual QString fileName() const; - virtual std::vector wellLogChannels() const; + virtual void setFileName( const QString& fileName ); + virtual QString fileName() const; + virtual std::vector wellLogChannels() const; virtual QString wellName() const = 0; virtual QString name() const = 0; @@ -62,7 +62,7 @@ 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::PdmField m_fileName; - caf::PdmField m_date; + caf::PdmChildArrayField m_wellLogChannelNames; + caf::PdmField m_fileName; + caf::PdmField m_date; }; diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.cpp index 45ccea42ee..72632f3223 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.cpp @@ -30,7 +30,7 @@ #include "RimFileWellPath.h" #include "RimTools.h" -#include "RimWellLogFileChannel.h" +#include "RimWellLogChannel.h" #include "RimWellPathCollection.h" #include "RimWellPlotTools.h" @@ -155,7 +155,7 @@ bool RimWellLogLasFile::readFile( QString* errorMessage ) QStringList wellLogNames = m_wellLogDataFile->wellLogChannelNames(); for ( int logIdx = 0; logIdx < wellLogNames.size(); logIdx++ ) { - RimWellLogFileChannel* wellLog = new RimWellLogFileChannel(); + RimWellLogChannel* wellLog = new RimWellLogChannel(); wellLog->setName( wellLogNames[logIdx] ); m_wellLogChannelNames.push_back( wellLog ); } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.h b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.h index cc34eb4499..64c746b3b0 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.h +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.h @@ -29,7 +29,7 @@ #include -class RimWellLogFileChannel; +class RimWellLogChannel; class RimWellPath; class QString; diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFileCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFileCurve.cpp index 4f857a210e..203543d3d0 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFileCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFileCurve.cpp @@ -30,7 +30,7 @@ #include "RimProject.h" #include "RimTools.h" -#include "RimWellLogFileChannel.h" +#include "RimWellLogChannel.h" #include "RimWellLogLasFile.h" #include "RimWellLogPlot.h" #include "RimWellLogTrack.h" @@ -382,7 +382,7 @@ QList RimWellLogLasFileCurve::calculateValueOptions( con { if ( m_wellLogFile ) { - std::vector fileLogs = m_wellLogFile->wellLogChannels(); + std::vector fileLogs = m_wellLogFile->wellLogChannels(); for ( size_t i = 0; i < fileLogs.size(); i++ ) { diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFileCurve.h b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFileCurve.h index 12c8bca896..a1ab607ef2 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFileCurve.h +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFileCurve.h @@ -27,7 +27,7 @@ #include class RimWellPath; -class RimWellLogFileChannel; +class RimWellLogChannel; class RimWellLogFile; class RigWellLogIndexDepthOffset; diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp index 19afdd1bcf..3a99298198 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp @@ -43,7 +43,7 @@ #include "RimStimPlanModelCollection.h" #include "RimTools.h" #include "RimWellIASettingsCollection.h" -#include "RimWellLogFileChannel.h" +#include "RimWellLogChannel.h" #include "RimWellLogLasFile.h" #include "RimWellLogPlotCollection.h" #include "RimWellPathAttributeCollection.h" @@ -588,8 +588,8 @@ RimWellLogFile* RimWellPath::firstWellLogFileMatchingChannelName( const QString& std::vector allWellLogFiles = wellLogFiles(); for ( RimWellLogFile* logFile : allWellLogFiles ) { - std::vector channels = logFile->wellLogChannels(); - for ( RimWellLogFileChannel* channel : channels ) + std::vector channels = logFile->wellLogChannels(); + for ( RimWellLogChannel* channel : channels ) { if ( channel->name() == channelName ) { diff --git a/ApplicationLibCode/UserInterface/RiuDragDrop.cpp b/ApplicationLibCode/UserInterface/RiuDragDrop.cpp index ead07b0190..81aea9b534 100644 --- a/ApplicationLibCode/UserInterface/RiuDragDrop.cpp +++ b/ApplicationLibCode/UserInterface/RiuDragDrop.cpp @@ -41,8 +41,8 @@ #include "RimSurface.h" #include "RimSurfaceCollection.h" #include "RimWellAllocationPlot.h" +#include "RimWellLogChannel.h" #include "RimWellLogCurve.h" -#include "RimWellLogFileChannel.h" #include "RimWellLogPlot.h" #include "RimWellLogTrack.h" @@ -216,7 +216,7 @@ Qt::DropActions RiuDragDrop::supportedDropActions() const { return Qt::CopyAction | Qt::MoveAction; } - else if ( RiuTypedPdmObjects::containsTypedObjects( m_dragItems ) ) + else if ( RiuTypedPdmObjects::containsTypedObjects( m_dragItems ) ) { return Qt::CopyAction; } @@ -247,7 +247,7 @@ Qt::ItemFlags RiuDragDrop::flags( const QModelIndex& index ) const } if ( dynamic_cast( uiItem ) || dynamic_cast( uiItem ) || - dynamic_cast( uiItem ) || dynamic_cast( uiItem ) || dynamic_cast( uiItem ) || + dynamic_cast( uiItem ) || dynamic_cast( uiItem ) || dynamic_cast( uiItem ) || dynamic_cast( uiItem ) || dynamic_cast( uiItem ) ) { itemflags |= Qt::ItemIsDragEnabled; @@ -342,14 +342,14 @@ Qt::ItemFlags RiuDragDrop::flags( const QModelIndex& index ) const { if ( dynamic_cast( uiItem ) ) { - if ( RiuTypedPdmObjects::containsTypedObjects( m_dragItems ) ) + if ( RiuTypedPdmObjects::containsTypedObjects( m_dragItems ) ) { itemflags |= Qt::ItemIsDropEnabled; } } else if ( dynamic_cast( uiItem ) ) { - if ( RiuTypedPdmObjects::containsTypedObjects( m_dragItems ) ) + if ( RiuTypedPdmObjects::containsTypedObjects( m_dragItems ) ) { itemflags |= Qt::ItemIsDropEnabled; } @@ -523,13 +523,12 @@ bool RiuDragDrop::handleWellLogPlotTrackDrop( Qt::DropAction action, RimWellLogTrack* trackTarget, int insertAtPosition ) { - std::vector wellLogFileChannels = - RiuTypedPdmObjects::typedObjectsFromGroup( draggedObjects ); - if ( !wellLogFileChannels.empty() ) + std::vector wellLogChannels = RiuTypedPdmObjects::typedObjectsFromGroup( draggedObjects ); + if ( !wellLogChannels.empty() ) { if ( action == Qt::CopyAction ) { - RicWellLogTools::addWellLogChannelsToPlotTrack( trackTarget, wellLogFileChannels ); + RicWellLogTools::addWellLogChannelsToPlotTrack( trackTarget, wellLogChannels ); return true; } }