From 30b510fe3aeead439d5ebb24dcebbe29254fba5d Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Thu, 6 Aug 2015 16:17:23 +0200
Subject: [PATCH] Improved capabilities for new filter execute command

---
 .../Commands/RicRangeFilterNewExec.cpp        | 20 +++++++++++++------
 .../Commands/RicRangeFilterNewExec.h          | 10 +++++++---
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/ApplicationCode/Commands/RicRangeFilterNewExec.cpp b/ApplicationCode/Commands/RicRangeFilterNewExec.cpp
index 132166465a..f668218a94 100644
--- a/ApplicationCode/Commands/RicRangeFilterNewExec.cpp
+++ b/ApplicationCode/Commands/RicRangeFilterNewExec.cpp
@@ -20,6 +20,7 @@
 
 #include "RimCellRangeFilter.h"
 #include "RimCellRangeFilterCollection.h"
+#include "RimView.h"
 
 
 //--------------------------------------------------------------------------------------------------
@@ -28,9 +29,9 @@
 RicRangeFilterNewExec::RicRangeFilterNewExec(caf::NotificationCenter* notificationCenter)
     : CmdExecuteCommand(notificationCenter)
 {
-    m_filterI = false;
-    m_filterJ = false;
-    m_filterK = false;
+    m_iSlice = -1;
+    m_jSlice = -1;
+    m_kSlice = -1;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -49,21 +50,28 @@ void RicRangeFilterNewExec::redo()
     assert(cellRangeFilterCollection);
 
     RimCellRangeFilter* newFilter = cellRangeFilterCollection->createAndAppendRangeFilter();
-    if (m_filterI)
+    if (m_iSlice)
     {
         newFilter->cellCountI = 1;
     }
     
-    if (m_filterJ)
+    if (m_jSlice)
     {
         newFilter->cellCountJ = 1;
     }
     
-    if (m_filterK)
+    if (m_kSlice)
     {
         newFilter->cellCountK = 1;
     }
 
+    if (m_iSliceStart > -1)    newFilter->startIndexI = m_iSliceStart;
+    if (m_jSliceStart > -1)    newFilter->startIndexJ = m_jSliceStart;
+    if (m_kSliceStart > -1)    newFilter->startIndexK = m_kSliceStart;
+
+    cellRangeFilterCollection->reservoirView()->scheduleGeometryRegen(RANGE_FILTERED);
+    cellRangeFilterCollection->reservoirView()->scheduleGeometryRegen(RANGE_FILTERED_INACTIVE);
+
     caf::PdmUiFieldHandle::updateConnectedUiEditors(cellRangeFilterCollection->parentField());
 }
 
diff --git a/ApplicationCode/Commands/RicRangeFilterNewExec.h b/ApplicationCode/Commands/RicRangeFilterNewExec.h
index b2feed8d42..92b5dbe865 100644
--- a/ApplicationCode/Commands/RicRangeFilterNewExec.h
+++ b/ApplicationCode/Commands/RicRangeFilterNewExec.h
@@ -38,9 +38,13 @@ public:
 public:
     caf::PdmPointer<RimCellRangeFilterCollection> cellRangeFilterCollection;
 
-    bool m_filterI;
-    bool m_filterJ;
-    bool m_filterK;
+    bool m_iSlice;
+    bool m_jSlice;
+    bool m_kSlice;
+
+    int m_iSliceStart;
+    int m_jSliceStart;
+    int m_kSliceStart;
 };