#2261 Well Paths: Change newestAddedWellPath to mostRecentlyUpdatedWe…

…llPath
OPM · Jan 29, 2018 · d67e1a7 · d67e1a7
1 parent 438ee34
commit d67e1a7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/ApplicationCode/Commands/WellPathCommands/RicWellPathFormationsImportFileFeature.cpp b/ApplicationCode/Commands/WellPathCommands/RicWellPathFormationsImportFileFeature.cpp
@@ -77,7 +77,7 @@ void RicWellPathFormationsImportFileFeature::onActionTriggered(bool isChecked)
 
         if (oilField->wellPathCollection->wellPaths().size() > 0)
         {
-            RimWellPath* wellPath = oilField->wellPathCollection->newestAddedWellPath();
+            RimWellPath* wellPath = oilField->wellPathCollection->mostRecentlyUpdatedWellPath();
             if (wellPath)
             {
                 RiuMainWindow::instance()->selectAsCurrentItem(wellPath);

diff --git a/ApplicationCode/Commands/WellPathCommands/RicWellPathsImportFileFeature.cpp b/ApplicationCode/Commands/WellPathCommands/RicWellPathsImportFileFeature.cpp
@@ -70,7 +70,7 @@ void RicWellPathsImportFileFeature::onActionTriggered(bool isChecked)
 
         if (oilField->wellPathCollection->wellPaths().size() > 0)
         {
-            RimWellPath* wellPath = oilField->wellPathCollection->newestAddedWellPath();
+            RimWellPath* wellPath = oilField->wellPathCollection->mostRecentlyUpdatedWellPath();
             if (wellPath)
             {
                 RiuMainWindow::instance()->selectAsCurrentItem(wellPath);

diff --git a/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp b/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
@@ -101,7 +101,7 @@ RimWellPathCollection::RimWellPathCollection()
 
     m_wellPathImporter = new RifWellPathImporter;
     m_wellPathFormationsImporter = new RifWellPathFormationsImporter;
-    m_newestAddedWellPath = nullptr;
+    m_mostRecentlyUpdatedWellPath = nullptr;
 }
 
 
@@ -268,23 +268,20 @@ void RimWellPathCollection::readAndAddWellPaths(std::vector<RimWellPath*>& wellP
             // Let name from well path file override name from well log file
             existingWellPath->setName(wellPath->name());
 
+            m_mostRecentlyUpdatedWellPath = existingWellPath;
             delete wellPath;
         }
         else
         {
             wellPath->wellPathColor = cvf::Color3f(interpolatedWellColors[wpIdx]);
             wellPath->setUnitSystem(findUnitSystemForWellPath(wellPath));
+            m_mostRecentlyUpdatedWellPath = wellPath;
             wellPaths.push_back(wellPath);
         }
 
         progress.incrementProgress();
     }
 
-    if (!wellPaths.empty())
-    {
-        m_newestAddedWellPath = wellPaths[wellPaths.size() - 1];
-    }
-
     this->sortWellsByName();
 }
 
@@ -360,7 +357,7 @@ void RimWellPathCollection::addWellPathFormations(const QStringList& filePaths)
 
             QString wellFormationsCount = QString("%1").arg(it->second->formationNamesCount());
 
-            m_newestAddedWellPath = wellPath;
+            m_mostRecentlyUpdatedWellPath = wellPath;
 
             outputMessage += it->first + "\t\t";
             outputMessage += wellPath->name() + " \t\t\t";
@@ -520,9 +517,9 @@ void RimWellPathCollection::deleteAllWellPaths()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimWellPath* RimWellPathCollection::newestAddedWellPath()
+RimWellPath* RimWellPathCollection::mostRecentlyUpdatedWellPath()
 {
-    return m_newestAddedWellPath;
+    return m_mostRecentlyUpdatedWellPath;
 }
 
 //--------------------------------------------------------------------------------------------------

diff --git a/ApplicationCode/ProjectDataModel/RimWellPathCollection.h b/ApplicationCode/ProjectDataModel/RimWellPathCollection.h
@@ -93,7 +93,7 @@ class RimWellPathCollection : public caf::PdmObject
     void                                removeWellPath(RimWellPath* wellPath);
     void                                deleteAllWellPaths();
 
-    RimWellPath*                        newestAddedWellPath();
+    RimWellPath*                        mostRecentlyUpdatedWellPath();
 
     void                                readWellPathFormationFiles();
     void                                reloadAllWellPathFormations();
@@ -136,5 +136,5 @@ class RimWellPathCollection : public caf::PdmObject
 
     RifWellPathImporter*                m_wellPathImporter;
     RifWellPathFormationsImporter*      m_wellPathFormationsImporter;
-    caf::PdmPointer<RimWellPath>        m_newestAddedWellPath;
+    caf::PdmPointer<RimWellPath>        m_mostRecentlyUpdatedWellPath;
 };