Renamed class/flies

ApplicationCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp

@@ -23,7 +23,7 @@
 #include "RicNewWellLogPlotFeatureImpl.h"
 
 #include "RimWellLogFile.h"
-#include "RimWellLog.h"
+#include "RimWellLogFileChannel.h"
 #include "RimWellLogPlot.h"
 #include "RimWellLogPlotTrace.h"
 #include "RimWellLogFileCurve.h"
@@ -54,7 +54,7 @@ namespace caf
 //--------------------------------------------------------------------------------------------------
 bool RicAddWellLogToPlotFeature::isCommandEnabled()
 {
-    std::vector<RimWellLog*> selection = selectedWellLogs();
+    std::vector<RimWellLogFileChannel*> selection = selectedWellLogs();
     return selection.size() > 0;
 }
 
@@ -63,7 +63,7 @@ bool RicAddWellLogToPlotFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 void RicAddWellLogToPlotFeature::onActionTriggered(bool isChecked)
 {
-    std::vector<RimWellLog*> selection = selectedWellLogs();
+    std::vector<RimWellLogFileChannel*> selection = selectedWellLogs();
     if (selection.size() < 1) return;
     
     RimWellLogPlot* plot = RicNewWellLogPlotFeatureImpl::createWellLogPlot();
@@ -77,7 +77,7 @@ void RicAddWellLogToPlotFeature::onActionTriggered(bool isChecked)
 
     for (size_t wlIdx = 0; wlIdx < selection.size(); wlIdx++)
     {
-        RimWellLog* wellLog = selection[wlIdx];
+        RimWellLogFileChannel* wellLog = selection[wlIdx];
 
         RimWellPath* wellPath;
         wellLog->firstAnchestorOrThisOfType(wellPath);
@@ -129,9 +129,9 @@ void RicAddWellLogToPlotFeature::setupActionLook(QAction* actionToSetup)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-std::vector<RimWellLog*> RicAddWellLogToPlotFeature::selectedWellLogs()
+std::vector<RimWellLogFileChannel*> RicAddWellLogToPlotFeature::selectedWellLogs()
 {
-    std::vector<RimWellLog*> selection;
+    std::vector<RimWellLogFileChannel*> selection;
     caf::SelectionManager::instance()->objectsByType(&selection);
     return selection;
 }

ApplicationCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.h

@@ -26,7 +26,7 @@
 class RimMainPlotCollection;
 class RimWellLogPlotCollection;
 class RimWellLogPlot;
-class RimWellLog;
+class RimWellLogFileChannel;
 
 namespace caf 
 {
@@ -45,7 +45,7 @@ protected:
     virtual void setupActionLook( QAction* actionToSetup );
 
 private:
-    std::vector<RimWellLog*> selectedWellLogs();
+    std::vector<RimWellLogFileChannel*> selectedWellLogs();
 };
 
 

ApplicationCode/ProjectDataModel/CMakeLists_files.cmake

@@ -69,7 +69,7 @@ ${CEE_CURRENT_LIST_DIR}RimViewLinker.h
 ${CEE_CURRENT_LIST_DIR}RimViewLinkerCollection.h
 ${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurve.h
 ${CEE_CURRENT_LIST_DIR}RimWellLogFile.h
-${CEE_CURRENT_LIST_DIR}RimWellLog.h
+${CEE_CURRENT_LIST_DIR}RimWellLogFileChannel.h
 ${CEE_CURRENT_LIST_DIR}RimWellLogFileCurve.h
 )
 
@@ -138,7 +138,7 @@ ${CEE_CURRENT_LIST_DIR}RimViewLinker.cpp
 ${CEE_CURRENT_LIST_DIR}RimViewLinkerCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurve.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellLogFile.cpp
-${CEE_CURRENT_LIST_DIR}RimWellLog.cpp
+${CEE_CURRENT_LIST_DIR}RimWellLogFileChannel.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellLogFileCurve.cpp
 )
 

ApplicationCode/ProjectDataModel/RimProject.cpp

@@ -627,7 +627,7 @@ void RimProject::computeUtmAreaOfInterest()
 #include "RimWellLogPlot.h"
 #include "RimWellLogPlotTrace.h"
 #include "RimWellLogPlotCurve.h"
-#include "RimWellLog.h"
+#include "RimWellLogFileChannel.h"
 #include <QMenu>
 
 
@@ -650,7 +650,7 @@ void RimProject::actionsBasedOnSelection(QMenu& contextMenu)
         commandIds << "RicCopyReferencesToClipboardFeature";
 
         caf::PdmUiItem* uiItem = uiItems[0];
-        if (dynamic_cast<RimWellLog*>(uiItem))
+        if (dynamic_cast<RimWellLogFileChannel*>(uiItem))
         {
             commandIds << "RicAddWellLogToPlotFeature";
         }
@@ -828,7 +828,7 @@ void RimProject::actionsBasedOnSelection(QMenu& contextMenu)
         {
             commandIds << "RicDeleteItemFeature";
         }
-        else if (dynamic_cast<RimWellLog*>(uiItem))
+        else if (dynamic_cast<RimWellLogFileChannel*>(uiItem))
         {
             commandIds << "RicAddWellLogToPlotFeature";
         }

ApplicationCode/ProjectDataModel/RimWellLogFile.cpp

@@ -18,7 +18,7 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RimWellLogFile.h"
-#include "RimWellLog.h"
+#include "RimWellLogFileChannel.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
 
@@ -50,7 +50,7 @@ RimWellLogFile::RimWellLogFile()
     m_name.uiCapability()->setUiHidden(true);
     m_name.xmlCapability()->setIOWritable(false);
 
-    CAF_PDM_InitFieldNoDefault(&m_wellLogChannelNames, "WellLogChannelNames", "",  "", "", "");
+    CAF_PDM_InitFieldNoDefault(&m_wellLogChannelNames, "WellLogFileChannels", "",  "", "", "");
     m_wellLogChannelNames.uiCapability()->setUiHidden(true);
     m_wellLogChannelNames.xmlCapability()->setIOWritable(false);
 
@@ -95,7 +95,7 @@ bool RimWellLogFile::readFile()
     QStringList wellLogNames = m_wellLogDataFile->wellLogChannelNames();
     for (int logIdx = 0; logIdx < wellLogNames.size(); logIdx++)
     {
-        RimWellLog* wellLog = new RimWellLog();
+        RimWellLogFileChannel* wellLog = new RimWellLogFileChannel();
         wellLog->setName(wellLogNames[logIdx]);
         m_wellLogChannelNames.push_back(wellLog);
     }

ApplicationCode/ProjectDataModel/RimWellLogFile.h

@@ -27,7 +27,7 @@
 
 #include "cvfBase.h"
 
-class RimWellLog;
+class RimWellLogFileChannel;
 
 class QString;
 
@@ -51,10 +51,10 @@ public:
 
     RigWellLogFile* wellLogFile() { return m_wellLogDataFile.p(); }
 
-    const caf::PdmChildArrayField<RimWellLog*>* wellLogChannelNames() const { return &m_wellLogChannelNames; }
+    const caf::PdmChildArrayField<RimWellLogFileChannel*>* wellLogChannelNames() const { return &m_wellLogChannelNames; }
 
 private:
-    caf::PdmChildArrayField<RimWellLog*>  m_wellLogChannelNames;
+    caf::PdmChildArrayField<RimWellLogFileChannel*>  m_wellLogChannelNames;
 
 private:
     cvf::ref<RigWellLogFile>    m_wellLogDataFile;

ApplicationCode/ProjectDataModel/RimWellLogFileChannel.cpp

@@ -17,19 +17,19 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RimWellLog.h"
+#include "RimWellLogFileChannel.h"
 
 #include <QString>
 
 
-CAF_PDM_SOURCE_INIT(RimWellLog, "WellLog");
+CAF_PDM_SOURCE_INIT(RimWellLogFileChannel, "WellLogFileChannel");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimWellLog::RimWellLog()
+RimWellLogFileChannel::RimWellLogFileChannel()
 {
-    CAF_PDM_InitObject("Well Log", "", "", "");
+    CAF_PDM_InitObject("Well Log File Channel", "", "", "");
 
     CAF_PDM_InitFieldNoDefault(&m_name, "Name", "",  "", "", "");
     m_name.uiCapability()->setUiHidden(true);
@@ -39,7 +39,7 @@ RimWellLog::RimWellLog()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLog::setName(const QString& name)
+void RimWellLogFileChannel::setName(const QString& name)
 {
     m_name = name;
 }

ApplicationCode/ProjectDataModel/RimWellLogFileChannel.h

@@ -28,12 +28,12 @@ class QString;
 ///  
 ///  
 //==================================================================================================
-class RimWellLog : public caf::PdmObject
+class RimWellLogFileChannel : public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;
 
 public:
-    RimWellLog();
+    RimWellLogFileChannel();
     
     void    setName(const QString& name);
     QString name() const { return m_name; }

ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp

@@ -23,7 +23,7 @@
 #include "RimOilField.h"
 #include "RimWellPathCollection.h"
 #include "RimWellPath.h"
-#include "RimWellLog.h"
+#include "RimWellLogFileChannel.h"
 #include "RimWellLogFile.h"
 #include "RimWellLogPlotTrace.h"
 #include "RimWellLogPlot.h"
@@ -206,7 +206,7 @@ QList<caf::PdmOptionItemInfo> RimWellLogFileCurve::calculateValueOptions(const c
             RimWellLogFile* wellLogFile = m_wellPath->m_wellLogFile();
             if (wellLogFile)
             {
-                const caf::PdmChildArrayField<RimWellLog*>* fileLogs = wellLogFile->wellLogChannelNames();
+                const caf::PdmChildArrayField<RimWellLogFileChannel*>* fileLogs = wellLogFile->wellLogChannelNames();
 
                 for (size_t i = 0; i < fileLogs->size(); i++)
                 {

ApplicationCode/ProjectDataModel/RimWellLogFileCurve.h

@@ -27,7 +27,7 @@
 #include <vector>
 
 class RimWellPath;
-class RimWellLog;
+class RimWellLogFileChannel;
 
 //==================================================================================================
 ///