Refactor: rename RimWellLogFile to RimWellLogLasFile

ApplicationLibCode/Application/RiaApplication.cpp

@@ -83,7 +83,7 @@
 #include "RimTextAnnotationInView.h"
 #include "RimViewLinker.h"
 #include "RimViewLinkerCollection.h"
-#include "RimWellLogFile.h"
+#include "RimWellLogLasFile.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
 #include "RimWellPathFracture.h"
@@ -986,8 +986,8 @@ void RiaApplication::addWellPathFormationsToModel( QList<QString> wellPathFormat
 //--------------------------------------------------------------------------------------------------
 /// Add a list of well log file paths (LAS files) to the well path collection
 //--------------------------------------------------------------------------------------------------
-std::vector<RimWellLogFile*> RiaApplication::addWellLogsToModel( const QList<QString>&       wellLogFilePaths,
-                                                                 gsl::not_null<QStringList*> errorMessages )
+std::vector<RimWellLogLasFile*> RiaApplication::addWellLogsToModel( const QList<QString>&       wellLogFilePaths,
+                                                                    gsl::not_null<QStringList*> errorMessages )
 {
     if ( m_project == nullptr || m_project->oilFields.empty() ) return {};
 
@@ -1001,7 +1001,7 @@ std::vector<RimWellLogFile*> RiaApplication::addWellLogsToModel( const QList<QSt
         m_project->updateConnectedEditors();
     }
 
-    std::vector<RimWellLogFile*> wellLogFiles = oilField->wellPathCollection->addWellLogs( wellLogFilePaths, errorMessages );
+    std::vector<RimWellLogLasFile*> wellLogFiles = oilField->wellPathCollection->addWellLogs( wellLogFilePaths, errorMessages );
 
     oilField->wellPathCollection->updateConnectedEditors();
 

ApplicationLibCode/Application/RiaApplication.h

@@ -61,7 +61,7 @@ class RimProject;
 class RimSummaryPlot;
 class Rim3dView;
 class RimViewWindow;
-class RimWellLogFile;
+class RimWellLogLasFile;
 class RimWellLogPlot;
 class RimWellAllocationPlot;
 
@@ -147,9 +147,9 @@ class RiaApplication
 
     bool openOdbCaseFromFile( const QString& fileName, bool applyTimeStepFilter = false );
 
-    std::vector<RimWellPath*>    addWellPathsToModel( QList<QString> wellPathFilePaths, gsl::not_null<QStringList*> errorMessages );
-    void                         addWellPathFormationsToModel( QList<QString> wellPathFilePaths );
-    std::vector<RimWellLogFile*> addWellLogsToModel( const QList<QString>& wellLogFilePaths, gsl::not_null<QStringList*> errorMessages );
+    std::vector<RimWellPath*>       addWellPathsToModel( QList<QString> wellPathFilePaths, gsl::not_null<QStringList*> errorMessages );
+    void                            addWellPathFormationsToModel( QList<QString> wellPathFilePaths );
+    std::vector<RimWellLogLasFile*> addWellLogsToModel( const QList<QString>& wellLogFilePaths, gsl::not_null<QStringList*> errorMessages );
 
     QString scriptDirectories() const;
     QString scriptEditorPath() const;

ApplicationLibCode/Application/RiaGuiApplication.cpp

@@ -84,7 +84,7 @@
 #include "RimTools.h"
 #include "RimViewLinker.h"
 #include "RimViewLinkerCollection.h"
-#include "RimWellLogFile.h"
+#include "RimWellLogLasFile.h"
 #include "RimWellLogPlot.h"
 #include "RimWellLogPlotCollection.h"
 #include "RimWellPathCollection.h"

ApplicationLibCode/CommandFileInterface/RicfImportWellLogFiles.cpp

@@ -20,7 +20,7 @@
 #include "WellLogCommands/RicWellLogsImportFileFeature.h"
 
 #include "RiaApplication.h"
-#include "RimWellLogFile.h"
+#include "RimWellLogLasFile.h"
 
 #include "cafPdmFieldScriptingCapability.h"
 
@@ -100,12 +100,12 @@ caf::PdmScriptResponse RicfImportWellLogFiles::execute()
 
     if ( !wellLogFilePaths.empty() )
     {
-        std::vector<RimWellLogFile*> importedWellLogFiles =
+        std::vector<RimWellLogLasFile*> importedWellLogFiles =
             RicWellLogsImportFileFeature::importWellLogFiles( wellLogFilePaths, &warningMessages );
         if ( !importedWellLogFiles.empty() )
         {
             RicfImportWellLogFilesResult* result = new RicfImportWellLogFilesResult;
-            for ( RimWellLogFile* wellLogFile : importedWellLogFiles )
+            for ( RimWellLogLasFile* wellLogFile : importedWellLogFiles )
             {
                 result->wellPathNames.v().push_back( wellLogFile->wellName() );
             }

ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesFeature.cpp

@@ -32,7 +32,7 @@
 #include "RimMainPlotCollection.h"
 #include "RimOilField.h"
 #include "RimProject.h"
-#include "RimWellLogFile.h"
+#include "RimWellLogLasFile.h"
 #include "RimWellLogPlotCollection.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
@@ -66,7 +66,7 @@ void RicCreateDepthAdjustedLasFilesFeature::onActionTriggered( bool isChecked )
         {
             RimCase*                  selectedCase             = featureUi.selectedCase();
             RimWellPath*              sourceWell               = featureUi.sourceWell();
-            RimWellLogFile*           soureWellLogFile         = featureUi.wellLogFile();
+            RimWellLogLasFile*        soureWellLogFile         = featureUi.wellLogFile();
             std::vector<RimWellPath*> destinationWells         = featureUi.destinationWells().ptrReferencedObjectsByType();
             std::vector<QString>      selectedResultProperties = featureUi.selectedResultProperties();
             QString                   exportFolder             = featureUi.exportFolder();
@@ -115,7 +115,7 @@ void RicCreateDepthAdjustedLasFilesFeature::setupActionLook( QAction* actionToSe
 //--------------------------------------------------------------------------------------------------
 void RicCreateDepthAdjustedLasFilesFeature::createDepthAdjustedWellLogFileFromEclipseCase( RimEclipseCase*                 eclipseCase,
                                                                                            RimWellPath*                    sourceWell,
-                                                                                           RimWellLogFile*                 soureWellLogFile,
+                                                                                           RimWellLogLasFile*              soureWellLogFile,
                                                                                            const std::vector<RimWellPath*> destinationWells,
                                                                                            const std::vector<QString>& selectedResultProperties,
                                                                                            const QString& exportFolder )
@@ -144,7 +144,7 @@ void RicCreateDepthAdjustedLasFilesFeature::createDepthAdjustedWellLogFileFromEc
 //--------------------------------------------------------------------------------------------------
 void RicCreateDepthAdjustedLasFilesFeature::createDepthAdjustedWellLogFileFromGeoMechCase( RimGeoMechCase*                 geoMechCase,
                                                                                            RimWellPath*                    sourceWell,
-                                                                                           RimWellLogFile*                 soureWellLogFile,
+                                                                                           RimWellLogLasFile*              soureWellLogFile,
                                                                                            const std::vector<RimWellPath*> destinationWells,
                                                                                            const std::vector<QString>& selectedResultProperties,
                                                                                            const QString& exportFolder )

ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesFeature.h

@@ -23,7 +23,7 @@
 class RimEclipseCase;
 class RimGeoMechCase;
 class RimWellPath;
-class RimWellLogFile;
+class RimWellLogLasFile;
 
 //==================================================================================================
 ///
@@ -42,14 +42,14 @@ class RicCreateDepthAdjustedLasFilesFeature : public caf::CmdFeature
 private:
     void createDepthAdjustedWellLogFileFromEclipseCase( RimEclipseCase*                 eclipseCase,
                                                         RimWellPath*                    sourceWell,
-                                                        RimWellLogFile*                 soureWellLogFile,
+                                                        RimWellLogLasFile*              soureWellLogFile,
                                                         const std::vector<RimWellPath*> destinationWells,
                                                         const std::vector<QString>&     selectedResultProperties,
                                                         const QString&                  exportFolder );
 
     void createDepthAdjustedWellLogFileFromGeoMechCase( RimGeoMechCase*                 geoMechCase,
                                                         RimWellPath*                    sourceWell,
-                                                        RimWellLogFile*                 soureWellLogFile,
+                                                        RimWellLogLasFile*              soureWellLogFile,
                                                         const std::vector<RimWellPath*> destinationWells,
                                                         const std::vector<QString>&     selectedResultProperties,
                                                         const QString&                  exportFolder );

ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesImpl.cpp

@@ -33,7 +33,7 @@
 #include "RimEclipseCase.h"
 #include "RimGeoMechCase.h"
 #include "RimMainPlotCollection.h"
-#include "RimWellLogFile.h"
+#include "RimWellLogLasFile.h"
 #include "RimWellLogPlotCollection.h"
 #include "RimWellPath.h"
 
@@ -114,7 +114,7 @@ LasDepthValueAndIndexPerKLayer
 //--------------------------------------------------------------------------------------------------
 void RicCreateDepthAdjustedLasFilesImpl::createDestinationWellsLasFiles( RimCase*                        selectedCase,
                                                                          RimWellPath*                    sourceWell,
-                                                                         RimWellLogFile*                 soureWellLogFile,
+                                                                         RimWellLogLasFile*              soureWellLogFile,
                                                                          const std::vector<RimWellPath*> destinationWells,
                                                                          const std::vector<QString>&     selectedResultProperties,
                                                                          const QString&                  exportFolder,

ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesImpl.h

@@ -29,7 +29,7 @@ class RigWellLogLasFile;
 class RimCase;
 class RimEclipseCase;
 class RimWellPath;
-class RimWellLogFile;
+class RimWellLogLasFile;
 
 //==================================================================================================
 /// Object to hold Depth value and its original index in a LAS file vector categorized by K-layer.
@@ -65,7 +65,7 @@ cvf::ref<RigResultAccessor> createIndexKResultAccessor( RimEclipseCase* selected
 
 void createDestinationWellsLasFiles( RimCase*                        selectedCase,
                                      RimWellPath*                    sourceWell,
-                                     RimWellLogFile*                 soureWellLogFile,
+                                     RimWellLogLasFile*              soureWellLogFile,
                                      const std::vector<RimWellPath*> destinationWells,
                                      const std::vector<QString>&     selectedResultProperties,
                                      const QString&                  exportFolder,

ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesUi.cpp

@@ -24,8 +24,8 @@
 #include "RimOilField.h"
 #include "RimProject.h"
 #include "RimTools.h"
-#include "RimWellLogFile.h"
 #include "RimWellLogFileChannel.h"
+#include "RimWellLogLasFile.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
 

ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesUi.h

@@ -32,7 +32,7 @@
 
 class RimCase;
 class RimWellPath;
-class RimWellLogFile;
+class RimWellLogLasFile;
 
 //==================================================================================================
 ///
@@ -54,12 +54,12 @@ class RicCreateDepthAdjustedLasFilesUi : public caf::PdmObject
     QString invalidSelectionsLogString() const;
 
 public:
-    caf::PdmField<QString>              exportFolder;
-    caf::PdmPtrField<RimCase*>          selectedCase;
-    caf::PdmPtrField<RimWellPath*>      sourceWell;
-    caf::PdmPtrField<RimWellLogFile*>   wellLogFile;
-    caf::PdmField<std::vector<QString>> selectedResultProperties;
-    caf::PdmPtrArrayField<RimWellPath*> destinationWells;
+    caf::PdmField<QString>               exportFolder;
+    caf::PdmPtrField<RimCase*>           selectedCase;
+    caf::PdmPtrField<RimWellPath*>       sourceWell;
+    caf::PdmPtrField<RimWellLogLasFile*> wellLogFile;
+    caf::PdmField<std::vector<QString>>  selectedResultProperties;
+    caf::PdmPtrArrayField<RimWellPath*>  destinationWells;
 
 protected:
     void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;

ApplicationLibCode/Commands/RicImportEnsembleWellLogsFeature.cpp

@@ -26,7 +26,7 @@
 #include "RimEnsembleWellLogsCollection.h"
 #include "RimOilField.h"
 #include "RimProject.h"
-#include "RimWellLogFile.h"
+#include "RimWellLogLasFile.h"
 
 #include "RicRecursiveFileSearchDialog.h"
 #include "WellLogCommands/RicWellLogsImportFileFeature.h"
@@ -85,11 +85,11 @@ RimEnsembleWellLogs*
 {
     if ( fileNames.isEmpty() ) return nullptr;
 
-    std::vector<RimWellLogFile*> cases;
+    std::vector<RimWellLogLasFile*> cases;
     for ( QString fileNames : fileNames )
     {
-        QString         errorMessage;
-        RimWellLogFile* logFileInfo = RimWellLogFile::readWellLogFile( fileNames, &errorMessage );
+        QString            errorMessage;
+        RimWellLogLasFile* logFileInfo = RimWellLogLasFile::readWellLogFile( fileNames, &errorMessage );
         cases.push_back( logFileInfo );
         if ( !errorMessage.isEmpty() )
         {

ApplicationLibCode/Commands/RicWellLogTools.cpp

@@ -33,9 +33,9 @@
 #include "RimWellLogCalculatedCurve.h"
 #include "RimWellLogCurveCommonDataSource.h"
 #include "RimWellLogExtractionCurve.h"
-#include "RimWellLogFile.h"
 #include "RimWellLogFileChannel.h"
-#include "RimWellLogFileCurve.h"
+#include "RimWellLogLasFile.h"
+#include "RimWellLogLasFileCurve.h"
 #include "RimWellLogRftCurve.h"
 #include "RimWellLogTrack.h"
 #include "RimWellLogWbsCurve.h"
@@ -140,10 +140,10 @@ void RicWellLogTools::addWellLogChannelsToPlotTrack( RimWellLogTrack* plotTrack,
 {
     for ( size_t cIdx = 0; cIdx < wellLogFileChannels.size(); cIdx++ )
     {
-        RimWellLogFileCurve* plotCurve = RicWellLogTools::addFileCurve( plotTrack );
+        RimWellLogLasFileCurve* plotCurve = RicWellLogTools::addFileCurve( plotTrack );
 
-        RimWellPath*    wellPath    = wellLogFileChannels[cIdx]->firstAncestorOrThisOfType<RimWellPath>();
-        RimWellLogFile* wellLogFile = wellLogFileChannels[cIdx]->firstAncestorOrThisOfType<RimWellLogFile>();
+        RimWellPath*       wellPath    = wellLogFileChannels[cIdx]->firstAncestorOrThisOfType<RimWellPath>();
+        RimWellLogLasFile* wellLogFile = wellLogFileChannels[cIdx]->firstAncestorOrThisOfType<RimWellLogLasFile>();
 
         if ( wellPath )
         {
@@ -406,11 +406,11 @@ RimWellLogRftCurve* RicWellLogTools::addRftCurve( RimWellLogTrack* plotTrack, co
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimWellLogFileCurve* RicWellLogTools::addFileCurve( RimWellLogTrack* plotTrack, bool showPlotWindow )
+RimWellLogLasFileCurve* RicWellLogTools::addFileCurve( RimWellLogTrack* plotTrack, bool showPlotWindow )
 {
     CVF_ASSERT( plotTrack );
 
-    RimWellLogFileCurve* curve = new RimWellLogFileCurve();
+    RimWellLogLasFileCurve* curve = new RimWellLogLasFileCurve();
 
     cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromTable( plotTrack->curveCount() );
     curve->setColor( curveColor );

ApplicationLibCode/Commands/RicWellLogTools.h

@@ -30,7 +30,7 @@ class Rim3dView;
 class Rim3dWellLogCurveCollection;
 class RimWellLogExtractionCurve;
 class RimWellLogFileChannel;
-class RimWellLogFileCurve;
+class RimWellLogLasFileCurve;
 class RimWellLogRftCurve;
 class RimWellLogTrack;
 class RimWellLogWbsCurve;
@@ -51,10 +51,10 @@ class RicWellLogTools
     static bool              hasRftDataForWell( const QString& wellName );
     static bool              isWellPathOrSimWellSelectedInView();
     static void addWellLogChannelsToPlotTrack( RimWellLogTrack* plotTrack, const std::vector<RimWellLogFileChannel*>& wellLogFileChannels );
-    static RimWellPath*         selectedWellPathWithLogFile();
-    static RimWellPath*         findWellPathWithLogFileFromSelection();
-    static RimWellLogRftCurve*  addRftCurve( RimWellLogTrack* plotTrack, const RimSimWellInView* simWell, bool showPlotWindow = true );
-    static RimWellLogFileCurve* addFileCurve( RimWellLogTrack* plotTrack, bool showPlotWindow = true );
+    static RimWellPath*            selectedWellPathWithLogFile();
+    static RimWellPath*            findWellPathWithLogFileFromSelection();
+    static RimWellLogRftCurve*     addRftCurve( RimWellLogTrack* plotTrack, const RimSimWellInView* simWell, bool showPlotWindow = true );
+    static RimWellLogLasFileCurve* addFileCurve( RimWellLogTrack* plotTrack, bool showPlotWindow = true );
 
     static RimWellLogExtractionCurve* addWellLogExtractionCurve( RimWellLogTrack*        plotTrack,
                                                                  RimCase*                rimCase,

ApplicationLibCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp

@@ -24,9 +24,9 @@
 
 #include "RimMainPlotCollection.h"
 #include "RimProject.h"
-#include "RimWellLogFile.h"
 #include "RimWellLogFileChannel.h"
-#include "RimWellLogFileCurve.h"
+#include "RimWellLogLasFile.h"
+#include "RimWellLogLasFileCurve.h"
 #include "RimWellLogPlot.h"
 #include "RimWellLogPlotCollection.h"
 #include "RimWellLogTrack.h"
@@ -74,11 +74,11 @@ void RicAddWellLogToPlotFeature::onActionTriggered( bool isChecked )
         RimWellLogFileChannel* wellLog = selection[wlIdx];
 
         auto wellPath    = wellLog->firstAncestorOrThisOfType<RimWellPath>();
-        auto wellLogFile = wellLog->firstAncestorOrThisOfType<RimWellLogFile>();
+        auto wellLogFile = wellLog->firstAncestorOrThisOfType<RimWellLogLasFile>();
         if ( wellLogFile )
         {
-            RimWellLogFileCurve* curve      = new RimWellLogFileCurve;
-            cvf::Color3f         curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromTable( plotTrack->curveCount() );
+            RimWellLogLasFileCurve* curve      = new RimWellLogLasFileCurve;
+            cvf::Color3f            curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromTable( plotTrack->curveCount() );
             curve->setColor( curveColor );
 
             plotTrack->addCurve( curve );

ApplicationLibCode/Commands/WellLogCommands/RicChangeDataSourceFeature.cpp

@@ -24,7 +24,7 @@
 #include "RimWellLogCurve.h"
 #include "RimWellLogCurveCommonDataSource.h"
 #include "RimWellLogExtractionCurve.h"
-#include "RimWellLogFileCurve.h"
+#include "RimWellLogLasFileCurve.h"
 #include "RimWellLogPlot.h"
 #include "RimWellLogTrack.h"
 #include "RimWellPath.h"
@@ -101,7 +101,7 @@ bool RicChangeDataSourceFeature::selectedTracksAndCurves( std::vector<RimWellLog
     {
         RimWellLogTrack*           wellLogTrack           = dynamic_cast<RimWellLogTrack*>( selectedObject );
         RimWellLogExtractionCurve* wellLogExtractionCurve = dynamic_cast<RimWellLogExtractionCurve*>( selectedObject );
-        RimWellLogFileCurve*       wellLogFileCurve       = dynamic_cast<RimWellLogFileCurve*>( selectedObject );
+        RimWellLogLasFileCurve*    wellLogFileCurve       = dynamic_cast<RimWellLogLasFileCurve*>( selectedObject );
         if ( wellLogTrack )
         {
             tracks->push_back( wellLogTrack );