From a3035d4f47ead96ab43b60b7d6f743654ad79413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= <bjorn.erik.jensen@acando.no>
Date: Wed, 5 Sep 2018 12:40:21 +0200
Subject: [PATCH] #3268 MSW export. Improved FishbonesCollection interface

---
 .../RicExportFishbonesWellSegmentsFeature.cpp  |  2 +-
 .../Completions/RimFishbonesCollection.cpp     | 18 +++++++++++++-----
 .../Completions/RimFishbonesCollection.h       |  3 ++-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicExportFishbonesWellSegmentsFeature.cpp b/ApplicationCode/Commands/CompletionExportCommands/RicExportFishbonesWellSegmentsFeature.cpp
index e7fcf2ef2d..7caf3d9263 100644
--- a/ApplicationCode/Commands/CompletionExportCommands/RicExportFishbonesWellSegmentsFeature.cpp
+++ b/ApplicationCode/Commands/CompletionExportCommands/RicExportFishbonesWellSegmentsFeature.cpp
@@ -90,7 +90,7 @@ void RicExportFishbonesWellSegmentsFeature::onActionTriggered(bool isChecked)
         RiaApplication::instance()->setLastUsedDialogDirectory("COMPLETIONS", QFileInfo(exportSettings.folder).absolutePath());
 
         std::vector<RimFishbonesMultipleSubs*> fishbonesSubs;
-        for (RimFishbonesMultipleSubs* subs : fishbonesCollection->fishbonesSubs)
+        for (RimFishbonesMultipleSubs* subs : fishbonesCollection->fishbonesSubs())
         {
             fishbonesSubs.push_back(subs);
         }
diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp
index 10cac2c3d0..845bf67bbc 100644
--- a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp
@@ -44,9 +44,9 @@ RimFishbonesCollection::RimFishbonesCollection()
     nameField()->uiCapability()->setUiHidden(true);
     this->setName("Fishbones");
 
-    CAF_PDM_InitFieldNoDefault(&fishbonesSubs, "FishbonesSubs", "fishbonesSubs", "", "", "");
+    CAF_PDM_InitFieldNoDefault(&m_fishbonesSubs, "FishbonesSubs", "fishbonesSubs", "", "", "");
 
-    fishbonesSubs.uiCapability()->setUiHidden(true);
+    m_fishbonesSubs.uiCapability()->setUiHidden(true);
 
     CAF_PDM_InitFieldNoDefault(&m_wellPathCollection, "WellPathCollection", "Imported Laterals", "", "", "");
     m_wellPathCollection = new RimFishboneWellPathCollection;
@@ -166,7 +166,7 @@ void RimFishbonesCollection::initAfterRead()
 void RimFishbonesCollection::appendFishbonesSubs(RimFishbonesMultipleSubs* subs)
 {
     subs->fishbonesColor = nextFishbonesColor();
-    fishbonesSubs.push_back(subs);
+    m_fishbonesSubs.push_back(subs);
 
     subs->setUnitSystemSpecificDefaults();
     subs->recomputeLateralLocations();
@@ -180,6 +180,14 @@ const RimMswCompletionParameters* RimFishbonesCollection::mswParameters() const
     return m_mswParameters;
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+std::vector<RimFishbonesMultipleSubs*> RimFishbonesCollection::fishbonesSubs() const
+{
+    return m_fishbonesSubs.childObjects();
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
@@ -199,7 +207,7 @@ cvf::Color3f RimFishbonesCollection::nextFishbonesColor() const
 
     QColor qFishbonesColor;
 
-    int newIndex = static_cast<int>(fishbonesSubs.size());
+    int newIndex = static_cast<int>(m_fishbonesSubs.size());
 
     if (qWellPathColor.lightnessF() < 0.5)
     {
@@ -220,7 +228,7 @@ void RimFishbonesCollection::recalculateStartMD()
 {
     double minStartMD = HUGE_VAL;
 
-    for (const RimFishbonesMultipleSubs* sub : fishbonesSubs())
+    for (const RimFishbonesMultipleSubs* sub : m_fishbonesSubs())
     {
         for (auto& index : sub->installedLateralIndices())
         {
diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.h b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.h
index 6b4d054f48..bee67ee733 100644
--- a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.h
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.h
@@ -49,8 +49,8 @@ public:
     RimFishboneWellPathCollection*    wellPathCollection() const;
     void                              appendFishbonesSubs(RimFishbonesMultipleSubs* subs);
     const RimMswCompletionParameters* mswParameters() const;
-    caf::PdmChildArrayField<RimFishbonesMultipleSubs*>  fishbonesSubs;
 
+    std::vector<RimFishbonesMultipleSubs*> fishbonesSubs() const;
     void         recalculateStartMD();
     double       startMD() const;
     double       mainBoreSkinFactor() const { return m_skinFactor; }
@@ -66,6 +66,7 @@ private:
     cvf::Color3f nextFishbonesColor() const;
 
 private:
+    caf::PdmChildArrayField<RimFishbonesMultipleSubs*>  m_fishbonesSubs;
     caf::PdmChildField<RimFishboneWellPathCollection*>  m_wellPathCollection;
 
     caf::PdmField<double>                               m_startMD;