From 5610bf5a10174f568c0eae9f78419f0498af97cd Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Mon, 10 Aug 2015 23:23:41 +0200
Subject: [PATCH] Fixed visibility and rebuild of child items for filters

---
 ApplicationCode/Commands/RicEclipsePropertyFilter.cpp       | 6 ++----
 .../Commands/RicEclipsePropertyFilterNewExec.cpp            | 3 ++-
 ApplicationCode/Commands/RicRangeFilterNewExec.cpp          | 5 ++---
 ApplicationCode/ProjectDataModel/RimEclipseView.cpp         | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ApplicationCode/Commands/RicEclipsePropertyFilter.cpp b/ApplicationCode/Commands/RicEclipsePropertyFilter.cpp
index 0607a4782d..1163b71cc8 100644
--- a/ApplicationCode/Commands/RicEclipsePropertyFilter.cpp
+++ b/ApplicationCode/Commands/RicEclipsePropertyFilter.cpp
@@ -62,8 +62,7 @@ void RicEclipsePropertyFilter::addPropertyFilter(RimEclipsePropertyFilterCollect
     propertyFilterCollection->propertyFilters.push_back(propertyFilter);
     propertyFilterCollection->reservoirView()->scheduleGeometryRegen(PROPERTY_FILTERED);
 
-    caf::PdmUiFieldHandle::updateConnectedUiEditors(propertyFilterCollection->parentField());
-    caf::PdmUiFieldHandle::updateConnectedUiEditors(&propertyFilterCollection->propertyFilters);
+    propertyFilterCollection->updateConnectedEditors();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -77,8 +76,7 @@ void RicEclipsePropertyFilter::insertPropertyFilter(RimEclipsePropertyFilterColl
     propertyFilterCollection->propertyFilters.insertAt(index, propertyFilter);
     propertyFilterCollection->reservoirView()->scheduleGeometryRegen(PROPERTY_FILTERED);
 
-    caf::PdmUiFieldHandle::updateConnectedUiEditors(propertyFilterCollection->parentField());
-    caf::PdmUiFieldHandle::updateConnectedUiEditors(&propertyFilterCollection->propertyFilters);
+    propertyFilterCollection->updateConnectedEditors();
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/Commands/RicEclipsePropertyFilterNewExec.cpp b/ApplicationCode/Commands/RicEclipsePropertyFilterNewExec.cpp
index e470f0601e..429fdf50ec 100644
--- a/ApplicationCode/Commands/RicEclipsePropertyFilterNewExec.cpp
+++ b/ApplicationCode/Commands/RicEclipsePropertyFilterNewExec.cpp
@@ -64,5 +64,6 @@ void RicEclipsePropertyFilterNewExec::redo()
 void RicEclipsePropertyFilterNewExec::undo()
 {
     m_propertyFilterCollection->propertyFilters.erase(m_propertyFilterCollection->propertyFilters.size() - 1);
-    caf::PdmUiFieldHandle::updateConnectedUiEditors(m_propertyFilterCollection->parentField());
+
+    m_propertyFilterCollection->updateConnectedEditors();
 }
diff --git a/ApplicationCode/Commands/RicRangeFilterNewExec.cpp b/ApplicationCode/Commands/RicRangeFilterNewExec.cpp
index 11dd8233d2..2010a1bfd7 100644
--- a/ApplicationCode/Commands/RicRangeFilterNewExec.cpp
+++ b/ApplicationCode/Commands/RicRangeFilterNewExec.cpp
@@ -103,8 +103,7 @@ void RicRangeFilterNewExec::redo()
     cellRangeFilterCollection->reservoirView()->scheduleGeometryRegen(RANGE_FILTERED);
     cellRangeFilterCollection->reservoirView()->scheduleGeometryRegen(RANGE_FILTERED_INACTIVE);
 
-    caf::PdmUiFieldHandle::updateConnectedUiEditors(cellRangeFilterCollection->parentField());
-    caf::PdmUiFieldHandle::updateConnectedUiEditors(&cellRangeFilterCollection->rangeFilters);
+    cellRangeFilterCollection->updateConnectedEditors();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -116,5 +115,5 @@ void RicRangeFilterNewExec::undo()
 
     cellRangeFilterCollection->rangeFilters.erase(cellRangeFilterCollection->rangeFilters.size() - 1);
 
-    caf::PdmUiFieldHandle::updateConnectedUiEditors(cellRangeFilterCollection->parentField());
+    cellRangeFilterCollection->updateConnectedEditors();
 }
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
index 84fb4cc5c2..a217fa40e0 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
@@ -104,7 +104,7 @@ RimEclipseView::RimEclipseView()
 
     CAF_PDM_InitFieldNoDefault(&propertyFilterCollection, "PropertyFilters", "Property Filters",         "", "", "");
     propertyFilterCollection = new RimEclipsePropertyFilterCollection();
-    rangeFilterCollection.uiCapability()->setUiHidden(true);
+    propertyFilterCollection.uiCapability()->setUiHidden(true);
     propertyFilterCollection->setReservoirView(this);
 
     // Visualization fields