From 60c08272ef12fdb84fa50cfed33ebf0e630fdaaa Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Wed, 29 Jul 2015 14:41:36 +0200
Subject: [PATCH] Modularization fixes from WellPathImportSsihub

---
 .../WellPathImportSsihub/RimOilFieldEntry.h      |  3 ++-
 .../WellPathImportSsihub/RimOilRegionEntry.h     |  2 +-
 .../WellPathImportSsihub/RimWellPathImport.cpp   | 16 ++++++++--------
 .../WellPathImportSsihub/RimWellPathImport.h     |  2 +-
 .../WellPathImportSsihub/RiuWellImportWizard.cpp | 10 +++++-----
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/ApplicationCode/WellPathImportSsihub/RimOilFieldEntry.h b/ApplicationCode/WellPathImportSsihub/RimOilFieldEntry.h
index b15770391a..bbe2bdac45 100644
--- a/ApplicationCode/WellPathImportSsihub/RimOilFieldEntry.h
+++ b/ApplicationCode/WellPathImportSsihub/RimOilFieldEntry.h
@@ -20,6 +20,7 @@
 
 #include "cafPdmObject.h"
 #include "cafPdmField.h"
+#include "cafPdmChildArrayField.h"
 
 #include "RimWellsEntry.h"
 
@@ -39,7 +40,7 @@ public:
     caf::PdmField<bool>             selected;
     caf::PdmField<QString>          wellsFilePath;  // Location of the response file from request "/wells"
 
-    caf::PdmPointersField<RimWellPathEntry*> wells;
+    caf::PdmChildArrayField<RimWellPathEntry*> wells;
 
     RimWellPathEntry* find(const QString& name, RimWellPathEntry::WellTypeEnum wellPathType);
 
diff --git a/ApplicationCode/WellPathImportSsihub/RimOilRegionEntry.h b/ApplicationCode/WellPathImportSsihub/RimOilRegionEntry.h
index da0db5d294..0af69eb858 100644
--- a/ApplicationCode/WellPathImportSsihub/RimOilRegionEntry.h
+++ b/ApplicationCode/WellPathImportSsihub/RimOilRegionEntry.h
@@ -43,7 +43,7 @@ public:
 
     caf::PdmField<QString>                      name;
     caf::PdmField<bool>                         selected;
-    caf::PdmPointersField<RimOilFieldEntry*>    fields;
+    caf::PdmChildArrayField<RimOilFieldEntry*>    fields;
 
 };
 
diff --git a/ApplicationCode/WellPathImportSsihub/RimWellPathImport.cpp b/ApplicationCode/WellPathImportSsihub/RimWellPathImport.cpp
index 779e6cdf1e..2793c5da25 100644
--- a/ApplicationCode/WellPathImportSsihub/RimWellPathImport.cpp
+++ b/ApplicationCode/WellPathImportSsihub/RimWellPathImport.cpp
@@ -168,17 +168,17 @@ void RimWellPathImport::updateFieldVisibility()
 {
     if (utmFilterMode == UTM_FILTER_CUSTOM)
     {
-        north.setUiReadOnly(false);
-        south.setUiReadOnly(false);
-        east.setUiReadOnly(false);
-        west.setUiReadOnly(false);
+        north.capability<caf::PdmUiFieldHandle>()->setUiReadOnly(false);
+        south.capability<caf::PdmUiFieldHandle>()->setUiReadOnly(false);
+        east.capability<caf::PdmUiFieldHandle>()->setUiReadOnly(false);
+        west.capability<caf::PdmUiFieldHandle>()->setUiReadOnly(false);
     }
     else
     {
-        north.setUiReadOnly(true);
-        south.setUiReadOnly(true);
-        east.setUiReadOnly(true);
-        west.setUiReadOnly(true);
+        north.capability<caf::PdmUiFieldHandle>()->setUiReadOnly(true);
+        south.capability<caf::PdmUiFieldHandle>()->setUiReadOnly(true);
+        east.capability<caf::PdmUiFieldHandle>()->setUiReadOnly(true);
+        west.capability<caf::PdmUiFieldHandle>()->setUiReadOnly(true);
     }
 }
 
diff --git a/ApplicationCode/WellPathImportSsihub/RimWellPathImport.h b/ApplicationCode/WellPathImportSsihub/RimWellPathImport.h
index cec2ba95d4..491664f051 100644
--- a/ApplicationCode/WellPathImportSsihub/RimWellPathImport.h
+++ b/ApplicationCode/WellPathImportSsihub/RimWellPathImport.h
@@ -52,7 +52,7 @@ public:
     caf::PdmField<double>                           east;
     caf::PdmField<double>                           west;
 
-    caf::PdmPointersField<RimOilRegionEntry*>       regions;
+    caf::PdmChildArrayField<RimOilRegionEntry*>       regions;
 
     void updateRegions(const QStringList& regions, const QStringList& fields, const QStringList& edmIds);
 
diff --git a/ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.cpp b/ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.cpp
index 4376f52b36..32df71ab1c 100644
--- a/ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.cpp
+++ b/ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.cpp
@@ -590,7 +590,7 @@ void RiuWellImportWizard::slotCurrentIdChanged(int currentId)
             for (size_t fIdx = 0; fIdx < oilRegion->fields.size(); fIdx++)
             {
                 RimOilFieldEntry* oilField = oilRegion->fields[fIdx];
-                oilField->wells.setUiHidden(hideWells);
+                oilField->wells.capability<caf::PdmUiFieldHandle>()->setUiHidden(hideWells);
             }
         }
     }
@@ -775,7 +775,7 @@ FieldSelectionPage::FieldSelectionPage(RimWellPathImport* wellPathImport, QWidge
 
     // Tree view
     caf::PdmUiTreeView* treeView = new caf::PdmUiTreeView(this);
-    treeView->setPdmObject(wellPathImport);
+    treeView->setPdmItem(wellPathImport);
     layout->addWidget(treeView);
     layout->setStretchFactor(treeView, 10);
 
@@ -896,7 +896,7 @@ void WellSelectionPage::buildWellTreeView()
         if (oilRegion->selected)
         {
             caf::PdmObjectGroup* regGroup = new caf::PdmObjectGroup;
-            regGroup->setUiName(oilRegion->userDescriptionField()->uiValue().toString());
+            regGroup->setUiName(uiField(oilRegion->userDescriptionField())->uiValue().toString());
 
             m_regionsWithVisibleWells->objects.push_back(regGroup);
 
@@ -906,7 +906,7 @@ void WellSelectionPage::buildWellTreeView()
                 if (oilField->selected)
                 {
                     caf::PdmObjectGroup* fieldGroup = new caf::PdmObjectGroup;
-                    fieldGroup->setUiName(oilField->userDescriptionField()->uiValue().toString());
+                    fieldGroup->setUiName(uiField(oilField->userDescriptionField())->uiValue().toString());
 
                     regGroup->objects.push_back(fieldGroup);
 
@@ -920,7 +920,7 @@ void WellSelectionPage::buildWellTreeView()
         }
     }
 
-    m_wellSelectionTreeView->setPdmObject(m_regionsWithVisibleWells);
+    m_wellSelectionTreeView->setPdmItem(m_regionsWithVisibleWells);
     m_regionsWithVisibleWells->updateConnectedEditors();
     
     m_wellSelectionTreeView->treeView()->expandAll();