Deprecate everything that touches vtkHyperOctree.

(cherry picked from commit f2439b95)

Common/DataModel/CMakeLists.txt

@@ -68,9 +68,6 @@ set(Module_SRCS
   vtkHexahedron.cxx
   vtkHierarchicalBoxDataIterator.cxx
   vtkHierarchicalBoxDataSet.cxx
-  vtkHyperOctreeCursor.cxx
-  vtkHyperOctree.cxx
-  vtkHyperOctreePointsGrabber.cxx
   vtkHyperTree.cxx
   vtkHyperTreeCursor.cxx
   vtkHyperTreeGrid.cxx
@@ -222,6 +219,14 @@ set(Module_SRCS
   vtkUniformGridAMRDataIterator.cxx
   )
 
+if (NOT VTK_LEGACY_REMOVE)
+  list(APPEND Module_SRCS
+    vtkHyperOctree.cxx
+    vtkHyperOctreeCursor.cxx
+    vtkHyperOctreePointsGrabber.cxx
+  )
+endif()
+
 set(${vtk-module}_HDRS
   vtkArrayListTemplate.h
   vtkCellType.h

Common/DataModel/vtkDataObjectTypes.cxx

@@ -31,7 +31,9 @@ PURPOSE.  See the above copyright notice for more information.
 #include  "vtkHierarchicalBoxDataSet.h"
 #include  "vtkOverlappingAMR.h"
 #include  "vtkNonOverlappingAMR.h"
+#if !defined(VTK_LEGACY_REMOVE)
 #include  "vtkHyperOctree.h"
+#endif // LEGACY remove
 #include  "vtkHyperTreeGrid.h"
 #include  "vtkImageData.h"
 #include  "vtkMultiBlockDataSet.h"
@@ -77,7 +79,7 @@ static const char* vtkDataObjectTypesStrings[] = {
   "vtkHierarchicalDataSet", // OBSOLETE
   "vtkHierarchicalBoxDataSet", // OBSOLETE
   "vtkGenericDataSet",
-  "vtkHyperOctree",
+  "vtkHyperOctree", // OBSOLETE
   "vtkTemporalDataSet",//OBSOLETE
   "vtkTable",
   "vtkGraph",
@@ -216,10 +218,12 @@ vtkDataObject* vtkDataObjectTypes::NewDataObject(const char* type)
   {
     return vtkNonOverlappingAMR::New();
   }
+#if !defined(VTK_LEGACY_REMOVE)
   else if(strcmp(type, "vtkHyperOctree") == 0)
   {
     return vtkHyperOctree::New();
   }
+#endif // LEGACY remove
   else if(strcmp(type, "vtkHyperTreeGrid") == 0)
   {
     return vtkHyperTreeGrid::New();

Common/DataModel/vtkHyperOctree.cxx

@@ -960,6 +960,8 @@ vtkStandardNewMacro(vtkHyperOctree);
 // Default constructor.
 vtkHyperOctree::vtkHyperOctree()
 {
+  VTK_LEGACY_BODY(vtkHyperOctree, "VTK 8.2");
+
   this->DualGridFlag = 1;
   this->Dimension=3;
 

Common/DataModel/vtkHyperOctree.h

@@ -140,6 +140,7 @@ class vtkPixel;
 class vtkVoxel;
 class vtkCellLinks;
 
+#if !defined(VTK_LEGACY_REMOVE)
 class VTKCOMMONDATAMODEL_EXPORT vtkHyperOctree : public vtkDataSet
 {
 public:
@@ -631,5 +632,6 @@ private:
   unsigned short IsLeaf;
   unsigned short Level;
 };
+#endif // LEGACY remove
 
 #endif

Common/DataModel/vtkHyperOctreeCursor.cxx

@@ -19,6 +19,7 @@
 // Constructor.
 vtkHyperOctreeCursor::vtkHyperOctreeCursor()
 {
+  VTK_LEGACY_BODY(vtkHyperOctreeCursor, "VTK 8.2");
 }
 
 //-----------------------------------------------------------------------------

Common/DataModel/vtkHyperOctreeCursor.h

@@ -28,6 +28,7 @@
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
 
+#if !defined(VTK_LEGACY_REMOVE)
 enum
 {
   VTK_OCTREE_CHILD_ZMIN_YMIN_XMIN=0,
@@ -182,4 +183,6 @@ private:
   vtkHyperOctreeCursor(const vtkHyperOctreeCursor&) = delete;
   void operator=(const vtkHyperOctreeCursor&) = delete;
 };
+#endif // LEGACY remove
+
 #endif

Common/DataModel/vtkHyperOctreePointsGrabber.cxx

@@ -21,6 +21,7 @@
 // Default constructor.
 vtkHyperOctreePointsGrabber::vtkHyperOctreePointsGrabber()
 {
+  VTK_LEGACY_BODY(vtkHyperOctreePointsGrabber, "VTK 8.2");
   this->Dimension=3;
 }
 

Common/DataModel/vtkHyperOctreePointsGrabber.h

@@ -32,6 +32,7 @@
 #include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
 
+#if !defined(VTK_LEGACY_REMOVE)
 class VTKCOMMONDATAMODEL_EXPORT vtkHyperOctreePointsGrabber : public vtkObject
 {
 public:
@@ -97,5 +98,6 @@ private:
   vtkHyperOctreePointsGrabber(const vtkHyperOctreePointsGrabber&) = delete;
   void operator=(const vtkHyperOctreePointsGrabber&) = delete;
 };
+#endif // LEGACY remove
 
 #endif

Common/ExecutionModel/CMakeLists.txt

@@ -18,7 +18,6 @@ SET(Module_SRCS
   vtkFilteringInformationKeyManager.cxx
   vtkGraphAlgorithm.cxx
   vtkHierarchicalBoxDataSetAlgorithm.cxx
-  vtkHyperOctreeAlgorithm.cxx
   vtkHyperTreeGridAlgorithm.cxx
   vtkImageAlgorithm.cxx
   vtkImageInPlaceFilter.cxx
@@ -64,6 +63,13 @@ SET(Module_SRCS
   vtkNonOverlappingAMRAlgorithm.cxx
   )
 
+
+if (NOT VTK_LEGACY_REMOVE)
+  list(APPEND Module_SRCS
+    vtkHyperOctreeAlgorithm.cxx
+  )
+endif()
+
 set_source_files_properties(
   vtkExecutive
   vtkHyperOctreeAlgorithm

Common/ExecutionModel/vtkHyperOctreeAlgorithm.cxx

@@ -25,6 +25,7 @@
 //----------------------------------------------------------------------------
 vtkHyperOctreeAlgorithm::vtkHyperOctreeAlgorithm()
 {
+  VTK_LEGACY_BODY(vtkHyperOctreeAlgorithm, "VTK 8.2");
   // by default assume filters have one input and one output
   // subclasses that deviate should modify this setting
   this->SetNumberOfInputPorts(1);

Common/ExecutionModel/vtkHyperOctreeAlgorithm.h

@@ -35,6 +35,7 @@
 #include "vtkAlgorithm.h"
 #include "vtkHyperOctree.h" // makes things a bit easier
 
+#if !defined(VTK_LEGACY_REMOVE)
 class vtkDataSet;
 class vtkHyperOctree;
 
@@ -119,5 +120,6 @@ private:
   vtkHyperOctreeAlgorithm(const vtkHyperOctreeAlgorithm&) = delete;
   void operator=(const vtkHyperOctreeAlgorithm&) = delete;
 };
+#endif // LEGACY remove
 
 #endif

Examples/IO/Cxx/DumpXMLFile.cxx

@@ -3,7 +3,7 @@
 //  Usage: DumpXMLFile XMLFile1 XMLFile2 ...
 //         where
 //         XMLFile is a vtk XML file of type .vtu, .vtp, .vts, .vtr,
-//         .vti, .vto
+//         .vti
 //
 #include <vtkSmartPointer.h>
 #include <vtkXMLReader.h>
@@ -11,7 +11,6 @@
 #include <vtkXMLPolyDataReader.h>
 #include <vtkXMLStructuredGridReader.h>
 #include <vtkXMLRectilinearGridReader.h>
-#include <vtkXMLHyperOctreeReader.h>
 #include <vtkXMLCompositeDataReader.h>
 #include <vtkXMLStructuredGridReader.h>
 #include <vtkXMLImageDataReader.h>
@@ -19,7 +18,6 @@
 #include <vtkDataSet.h>
 #include <vtkUnstructuredGrid.h>
 #include <vtkRectilinearGrid.h>
-#include <vtkHyperOctree.h>
 #include <vtkImageData.h>
 #include <vtkPolyData.h>
 #include <vtkStructuredGrid.h>
@@ -76,10 +74,6 @@ int main (int argc, char *argv[])
     {
       dataSet = ReadAnXMLFile<vtkXMLImageDataReader> (argv[f]);
     }
-    else if (extension == ".vto")
-    {
-      dataSet = ReadAnXMLFile<vtkXMLHyperOctreeReader> (argv[f]);
-    }
     else if (extension == ".vtk")
     {
       dataSet = ReadAnXMLFile<vtkDataSetReader> (argv[f]);

Filters/HyperTree/CMakeLists.txt

 set(Module_SRCS
-  vtkClipHyperOctree.cxx
   vtkHyperTreeGridAxisClip.cxx
   vtkHyperTreeGridAxisCut.cxx
   vtkHyperTreeGridAxisReflection.cxx
@@ -10,15 +9,21 @@ set(Module_SRCS
   vtkHyperTreeGridPlaneCutter.cxx
   vtkHyperTreeGridThreshold.cxx
   vtkHyperTreeGridToUnstructuredGrid.cxx
-  vtkHyperOctreeClipCutPointsGrabber.cxx
-  vtkHyperOctreeContourFilter.cxx
-  vtkHyperOctreeCutter.cxx
-  vtkHyperOctreeDepth.cxx
-  vtkHyperOctreeDualGridContourFilter.cxx
-  vtkHyperOctreeLimiter.cxx
-  vtkHyperOctreeSampleFunction.cxx
-  vtkHyperOctreeSurfaceFilter.cxx
-  vtkHyperOctreeToUniformGridFilter.cxx
   )
 
+if (NOT VTK_LEGACY_REMOVE)
+  list(APPEND Module_SRCS
+    vtkClipHyperOctree.cxx
+    vtkHyperOctreeClipCutPointsGrabber.cxx
+    vtkHyperOctreeContourFilter.cxx
+    vtkHyperOctreeCutter.cxx
+    vtkHyperOctreeDepth.cxx
+    vtkHyperOctreeDualGridContourFilter.cxx
+    vtkHyperOctreeLimiter.cxx
+    vtkHyperOctreeSampleFunction.cxx
+    vtkHyperOctreeSurfaceFilter.cxx
+    vtkHyperOctreeToUniformGridFilter.cxx
+  )
+endif()
+
 vtk_module_library(vtkFiltersHyperTree ${Module_SRCS})

Filters/HyperTree/Testing/Cxx/CMakeLists.txt

 set(test_sources
-  TestClipHyperOctree.cxx
-  TestHyperOctreeContourFilter.cxx
-  TestHyperOctreeCutter.cxx
-  TestHyperOctreeSurfaceFilter.cxx
-  TestHyperOctreeToUniformGrid.cxx
+  # All things HyperOctree-related have been deprecated, so these now emit lots
+  # of warnings:
+  #TestClipHyperOctree.cxx
+  #TestHyperOctreeContourFilter.cxx
+  #TestHyperOctreeCutter.cxx
+  #TestHyperOctreeDual.cxx
+  #TestHyperOctreeSurfaceFilter.cxx
+  #TestHyperOctreeToUniformGrid.cxx
+
   TestHyperTreeGridBinary2D.cxx
   TestHyperTreeGridBinary2DAxisClipBox.cxx
   TestHyperTreeGridBinary2DAxisClipEllipse.cxx
@@ -71,7 +75,6 @@ set(test_sources
 
 if (NOT VTK_LEGACY_REMOVE)
   list(APPEND test_sources
-    TestHyperOctreeDual.cxx #deprecated due to vtkHyperOctreeFractalSource use
   )
 endif()
 

Filters/HyperTree/vtkClipHyperOctree.cxx

@@ -52,6 +52,8 @@ vtkCxxSetObjectMacro(vtkClipHyperOctree,ClipFunction,vtkImplicitFunction);
 // set to 0.0; and generate clip scalars turned off.
 vtkClipHyperOctree::vtkClipHyperOctree(vtkImplicitFunction *cf)
 {
+  VTK_LEGACY_BODY(vtkClipHyperOctree, "VTK 8.2");
+
   this->ClipFunction = cf;
   this->InsideOut = 0;
   this->Locator = nullptr;

Filters/HyperTree/vtkClipHyperOctree.h

@@ -63,6 +63,7 @@
 #include "vtkFiltersHyperTreeModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
 
+#if !defined(VTK_LEGACY_REMOVE)
 class vtkImplicitFunction;
 class vtkIncrementalPointLocator;
 class vtkHyperOctreeCursor;
@@ -231,5 +232,6 @@ private:
   vtkClipHyperOctree(const vtkClipHyperOctree&) = delete;
   void operator=(const vtkClipHyperOctree&) = delete;
 };
+#endif // LEGACY remove
 
 #endif

Filters/HyperTree/vtkHyperOctreeClipCutPointsGrabber.cxx

@@ -34,6 +34,8 @@ public:
 // Default constructor.
 vtkHyperOctreeClipCutPointsGrabber::vtkHyperOctreeClipCutPointsGrabber()
 {
+  VTK_LEGACY_BODY(vtkHyperOctreeClipCutPointsGrabber, "VTK 8.2");
+
   this->Triangulator=vtkOrderedTriangulator::New();
   this->IdSet=new vtkHyperOctreeIdSet;
   this->Polygon=nullptr;

Filters/HyperTree/vtkHyperOctreeClipCutPointsGrabber.h

@@ -28,11 +28,11 @@
 #include "vtkFiltersHyperTreeModule.h" // For export macro
 #include "vtkHyperOctreePointsGrabber.h"
 
+#if !defined(VTK_LEGACY_REMOVE)
 class vtkHyperOctreeIdSet; // Pimpl idiom
 class vtkPolygon;
 class vtkOrderedTriangulator;
 
-
 class VTKFILTERSHYPERTREE_EXPORT vtkHyperOctreeClipCutPointsGrabber : public vtkHyperOctreePointsGrabber
 {
 public:
@@ -107,5 +107,6 @@ private:
   vtkHyperOctreeClipCutPointsGrabber(const vtkHyperOctreeClipCutPointsGrabber&) = delete;
   void operator=(const vtkHyperOctreeClipCutPointsGrabber&) = delete;
 };
+#endif // LEGACY remove
 
 #endif

Filters/HyperTree/vtkHyperOctreeContourFilter.cxx

@@ -161,6 +161,8 @@ vtkStandardNewMacro(vtkHyperOctreeContourFilter);
 // set to 0.0; and generate cut scalars turned off.
 vtkHyperOctreeContourFilter::vtkHyperOctreeContourFilter()
 {
+  VTK_LEGACY_BODY(vtkHyperOctreeContourFilter, "VTK 8.2");
+
   this->ContourValues = vtkContourValues::New();
 
   this->Locator = nullptr;

Filters/HyperTree/vtkHyperOctreeContourFilter.h

@@ -54,6 +54,7 @@
 #include "vtkContourValues.h" // Needed for inline methods
 #include "vtkCutter.h" // for VTK_SORT_BY_VALUE
 
+#if !defined(VTK_LEGACY_REMOVE)
 class vtkIncrementalPointLocator;
 class vtkHyperOctree;
 class vtkOrderedTriangulator;
@@ -80,6 +81,7 @@ public:
 
   /**
    * Methods to set / get contour values.
+#if !defined(VTK_LEGACY_REMOVE)
    */
 
   /**
@@ -251,4 +253,6 @@ private:
   vtkHyperOctreeContourFilter(const vtkHyperOctreeContourFilter&) = delete;
   void operator=(const vtkHyperOctreeContourFilter&) = delete;
 };
+#endif // LEGACY remove
+
 #endif