(#396) Adding a trace when creating a new well log plot

Did some refactoring - moved creation code to command feature.
OPM · Sep 3, 2015 · bcab7f2 · bcab7f2
1 parent 2288130
commit bcab7f2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 23 deletions.
diff --git a/ApplicationCode/Commands/RicNewWellLogPlotFeature.cpp b/ApplicationCode/Commands/RicNewWellLogPlotFeature.cpp
@@ -22,8 +22,11 @@
 #include "RimProject.h"
 #include "RimMainPlotCollection.h"
 #include "RimWellLogPlotCollection.h"
+#include "RimWellLogPlot.h"
+#include "RimWellLogPlotTrace.h"
 
 #include "RiaApplication.h"
+#include "RiuMainWindow.h"
 
 #include <QAction>
 
@@ -46,7 +49,14 @@ void RicNewWellLogPlotFeature::onActionTriggered(bool isChecked)
     RimWellLogPlotCollection* wellLogPlotColl = wellLogPlotCollection();
     if (wellLogPlotColl)
     {
-        wellLogPlotColl->addWellLogPlot();
+        RimWellLogPlot* plot = new RimWellLogPlot();
+        RimWellLogPlotTrace* plotrace = new RimWellLogPlotTrace();
+
+        plot->addTrace(plotrace);
+        wellLogPlotColl->wellLogPlots().push_back(plot);
+
+        RiaApplication::instance()->project()->updateConnectedEditors();
+        RiuMainWindow::instance()->setCurrentObjectInTreeView(plot);
     }
 }
 

diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp b/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp
@@ -20,11 +20,6 @@
 #include "RimWellLogPlotCollection.h"
 
 #include "RimWellLogPlot.h"
-#include "RimProject.h"
-
-#include "RiuMainWindow.h"
-
-#include "RiaApplication.h"
 
 #include "cafPdmUiTreeView.h"
 
@@ -48,15 +43,3 @@ RimWellLogPlotCollection::~RimWellLogPlotCollection()
 {
     wellLogPlots.deleteAllChildObjects();
 }
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RimWellLogPlotCollection::addWellLogPlot()
-{
-    RimWellLogPlot* plot = new RimWellLogPlot();
-    wellLogPlots.push_back(plot);
-
-    RiaApplication::instance()->project()->updateConnectedEditors();
-    RiuMainWindow::instance()->setCurrentObjectInTreeView(plot);
-}
diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.h b/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.h
@@ -38,9 +38,4 @@ class RimWellLogPlotCollection : public caf::PdmObject
     virtual ~RimWellLogPlotCollection();
 
     caf::PdmChildArrayField<RimWellLogPlot*> wellLogPlots;
-
-    void addWellLogPlot();
-
-private:
-    caf::PdmField<bool> show;
 };