(#538) Initialize new plot with depth unit

Removed obsolete functions

ApplicationCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp

@@ -93,6 +93,12 @@ void RicAddWellLogToPlotFeature::onActionTriggered(bool isChecked)
             RigWellLogFile* wellLogDataFile = wellLogFile->wellLogFile();
             CVF_ASSERT(wellLogDataFile);
 
+            if (wlIdx == 0)
+            {
+                // Initialize plot with depth unit from the first log file
+                plot->setDepthUnit(wellLogDataFile->depthUnit());
+            }
+
             cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromTable();
             curve->setColor(curveColor);
             curve->setWellPath(wellPath);

ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp

@@ -22,12 +22,13 @@
 #include "RicWellLogPlotCurveFeatureImpl.h"
 #include "RicNewWellLogPlotFeatureImpl.h"
 
-#include "RimWellLogTrack.h"
+#include "RimProject.h"
+#include "RimView.h"
 #include "RimWellLogExtractionCurve.h"
+#include "RimWellLogPlot.h"
+#include "RimWellLogTrack.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
-#include "RimView.h"
-#include "RimProject.h"
 
 #include "RiuMainWindow.h"
 #include "RiaApplication.h"
@@ -66,6 +67,13 @@ void RicNewWellLogCurveExtractionFeature::onActionTriggered(bool isChecked)
         {
             RimWellLogTrack* wellLogPlotTrack = RicNewWellLogPlotFeatureImpl::createWellLogPlotTrack();
             RimWellLogExtractionCurve* plotCurve = addCurve(wellLogPlotTrack, RiaApplication::instance()->activeReservoirView(), wellPath);
+
+            RimWellLogPlot* plot = NULL;
+            wellLogPlotTrack->firstAnchestorOrThisOfType(plot);
+            if (plot)
+            {
+                plot->setDepthUnit(plotCurve->curveData()->depthUnit());
+            }
  
             plotCurve->updatePlotData();
             plotCurve->updateConnectedEditors();

ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotFeatureImpl.cpp

@@ -19,50 +19,16 @@
 
 #include "RicNewWellLogPlotFeatureImpl.h"
 
-#include "RimProject.h"
 #include "RimMainPlotCollection.h"
-#include "RimWellLogPlotCollection.h"
+#include "RimProject.h"
 #include "RimWellLogPlot.h"
+#include "RimWellLogPlotCollection.h"
 #include "RimWellLogTrack.h"
 
 #include "RiaApplication.h"
 
 #include "cvfAssert.h"
 
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-RimMainPlotCollection* RicNewWellLogPlotFeatureImpl::mainPlotCollection()
-{
-    RimProject* project = RiaApplication::instance()->project();
-    CVF_ASSERT(project);
-
-    RimMainPlotCollection* mainPlotColl = project->mainPlotCollection();
-    if (!mainPlotColl)
-    {
-        project->recreateMainPlotCollection();
-    }
-
-    return project->mainPlotCollection();
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-RimWellLogPlotCollection* RicNewWellLogPlotFeatureImpl::wellLogPlotCollection()
-{
-    RimMainPlotCollection* mainPlotColl = mainPlotCollection();
-    CVF_ASSERT(mainPlotColl);
-
-    RimWellLogPlotCollection* wellLogPlotColl = mainPlotColl->wellLogPlotCollection();
-    if (!wellLogPlotColl)
-    {
-        mainPlotColl->recreateWellLogPlotCollection();
-    }
-
-    return mainPlotColl->wellLogPlotCollection();
-}
-
 
 //--------------------------------------------------------------------------------------------------
 /// 
@@ -97,3 +63,20 @@ RimWellLogTrack* RicNewWellLogPlotFeatureImpl::createWellLogPlotTrack()
 
     return plotTrack;
 }
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimWellLogPlotCollection* RicNewWellLogPlotFeatureImpl::wellLogPlotCollection()
+{
+    RimProject* project = RiaApplication::instance()->project();
+    CVF_ASSERT(project);
+
+    RimMainPlotCollection* mainPlotColl = project->mainPlotCollection();
+    CVF_ASSERT(mainPlotColl);
+
+    RimWellLogPlotCollection* wellLogPlotColl = mainPlotColl->wellLogPlotCollection();
+    CVF_ASSERT(wellLogPlotColl);
+
+    return mainPlotColl->wellLogPlotCollection();
+}

ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotFeatureImpl.h

@@ -19,7 +19,6 @@
 
 #pragma once
 
-class RimMainPlotCollection;
 class RimWellLogPlotCollection;
 class RimWellLogPlot;
 class RimWellLogTrack;
@@ -30,9 +29,9 @@ class RimWellLogTrack;
 class RicNewWellLogPlotFeatureImpl
 {
 public:
+    static RimWellLogPlot*  createWellLogPlot();
+    static RimWellLogTrack* createWellLogPlotTrack();
 
-    static RimMainPlotCollection*      mainPlotCollection();
+private:
-    static RimWellLogPlotCollection*   wellLogPlotCollection();
+    static RimWellLogPlotCollection* wellLogPlotCollection();
-    static RimWellLogPlot*             createWellLogPlot();
-    static RimWellLogTrack*        createWellLogPlotTrack();
 };

ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp

@@ -65,17 +65,6 @@ caf::PdmFieldHandle* RimMainPlotCollection::objectToggleField()
     return &show;
 }
 
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RimMainPlotCollection::recreateWellLogPlotCollection()
-{
-    if (!wellLogPlotCollection())
-    {
-        m_wellLogPlotCollection = new RimWellLogPlotCollection();
-    }
-}
-
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimMainPlotCollection.h

@@ -38,7 +38,6 @@ public:
     virtual ~RimMainPlotCollection();
 
     RimWellLogPlotCollection* wellLogPlotCollection();
-    void recreateWellLogPlotCollection();
 
 protected:
 

ApplicationCode/ProjectDataModel/RimProject.cpp

@@ -735,14 +735,3 @@ void RimProject::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QS
     uiTreeOrdering.setForgetRemainingFields(true);
 }
 
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RimProject::recreateMainPlotCollection()
-{
-    if (!mainPlotCollection())
-    {
-        mainPlotCollection = new RimMainPlotCollection();
-    }
-}
-

ApplicationCode/ProjectDataModel/RimProject.h

@@ -93,8 +93,6 @@ public:
 
     void            actionsBasedOnSelection(QMenu& contextMenu);
 
-    void            recreateMainPlotCollection();
-
 protected:
     // Overridden methods
     void            initScriptDirectories();

ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp

@@ -560,3 +560,13 @@ size_t RimWellLogPlot::trackIndex(RimWellLogTrack* track)
     return m_tracks.index(track);
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimWellLogPlot::setDepthUnit(RimDefines::DepthUnitType depthUnit)
+{
+    m_depthUnit = depthUnit;
+
+    updateTracks();
+}
+

ApplicationCode/ProjectDataModel/RimWellLogPlot.h

@@ -53,7 +53,10 @@ public:
     void                                            setDescription(const QString& description);
 
     DepthTypeEnum                                   depthType() const;
+
     RimDefines::DepthUnitType                       depthUnit() const;
+    void                                            setDepthUnit(RimDefines::DepthUnitType depthUnit);
+
     QString                                         depthPlotTitle() const;
 
     caf::PdmField< std::vector<int> >               windowGeometry;