Range filter: Add grid type drop-down list to enable LGR-grid range filtering

TP#3995
p4#: 21408

CommonCode/cvfStructGridGeometryGenerator.cpp

@@ -78,11 +78,11 @@ void CellRangeFilter::addCellInclude(size_t i, size_t j, size_t k)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool CellRangeFilter::isCellRejected(size_t i, size_t j, size_t k) const
+bool CellRangeFilter::isCellVisible(size_t i, size_t j, size_t k) const
 {
     if (m_includeRanges.size() == 0)
     {
-        return true;
+        return false;
     }
 
     size_t idx;
@@ -90,7 +90,7 @@ bool CellRangeFilter::isCellRejected(size_t i, size_t j, size_t k) const
     {
         if (m_excludeRanges[idx].isInRange(i, j, k))
         {
-            return true;
+            return false;
         }
     }
 
@@ -98,11 +98,28 @@ bool CellRangeFilter::isCellRejected(size_t i, size_t j, size_t k) const
     {
         if (m_includeRanges[idx].isInRange(i, j, k))
         {
-            return false;
+            return true;
         }
     }
 
-    return true;
+    return false;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool CellRangeFilter::isCellExcluded(size_t i, size_t j, size_t k) const
+{
+    for (size_t idx = 0; idx < m_excludeRanges.size(); idx++)
+    {
+        if (m_excludeRanges[idx].isInRange(i, j, k))
+        {
+            return true;
+        }
+    }
+
+    return false;
 }
 
 //--------------------------------------------------------------------------------------------------

CommonCode/cvfStructGridGeometryGenerator.h

@@ -43,7 +43,11 @@ public:
 
     void addCellExcludeRange(size_t minI, size_t minJ, size_t minK, size_t maxI, size_t maxJ, size_t maxK);
 
-    bool isCellRejected(size_t i, size_t j, size_t k) const;
+    //bool isCellRejected(size_t i, size_t j, size_t k) const;
+
+    bool isCellVisible(size_t i, size_t j, size_t k) const;
+    bool isCellExcluded(size_t i, size_t j, size_t k) const;
+
 
     enum CellStateType
     {