Commit ab71574c authored by David E. DeMarle's avatar David E. DeMarle Committed by Kitware Robot
Browse files

Merge topic 'deprecate-hot' into release

21e886be change commit string to 8.1
48d2d219 Deprecate everything that touches vtkHyperOctree.
24ebec5b

 Deprecate vtkHyperOctreeFractalSource.
Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Acked-by: default avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !3689
parents 1cae6ed4 21e886be
...@@ -68,9 +68,6 @@ set(Module_SRCS ...@@ -68,9 +68,6 @@ set(Module_SRCS
vtkHexahedron.cxx vtkHexahedron.cxx
vtkHierarchicalBoxDataIterator.cxx vtkHierarchicalBoxDataIterator.cxx
vtkHierarchicalBoxDataSet.cxx vtkHierarchicalBoxDataSet.cxx
vtkHyperOctreeCursor.cxx
vtkHyperOctree.cxx
vtkHyperOctreePointsGrabber.cxx
vtkHyperTree.cxx vtkHyperTree.cxx
vtkHyperTreeCursor.cxx vtkHyperTreeCursor.cxx
vtkHyperTreeGrid.cxx vtkHyperTreeGrid.cxx
...@@ -222,6 +219,14 @@ set(Module_SRCS ...@@ -222,6 +219,14 @@ set(Module_SRCS
vtkUniformGridAMRDataIterator.cxx vtkUniformGridAMRDataIterator.cxx
) )
if (NOT VTK_LEGACY_REMOVE)
list(APPEND Module_SRCS
vtkHyperOctree.cxx
vtkHyperOctreeCursor.cxx
vtkHyperOctreePointsGrabber.cxx
)
endif()
set(${vtk-module}_HDRS set(${vtk-module}_HDRS
vtkArrayListTemplate.h vtkArrayListTemplate.h
vtkCellType.h vtkCellType.h
......
...@@ -31,7 +31,9 @@ PURPOSE. See the above copyright notice for more information. ...@@ -31,7 +31,9 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkHierarchicalBoxDataSet.h" #include "vtkHierarchicalBoxDataSet.h"
#include "vtkOverlappingAMR.h" #include "vtkOverlappingAMR.h"
#include "vtkNonOverlappingAMR.h" #include "vtkNonOverlappingAMR.h"
#if !defined(VTK_LEGACY_REMOVE)
#include "vtkHyperOctree.h" #include "vtkHyperOctree.h"
#endif // LEGACY remove
#include "vtkHyperTreeGrid.h" #include "vtkHyperTreeGrid.h"
#include "vtkImageData.h" #include "vtkImageData.h"
#include "vtkMultiBlockDataSet.h" #include "vtkMultiBlockDataSet.h"
...@@ -77,7 +79,7 @@ static const char* vtkDataObjectTypesStrings[] = { ...@@ -77,7 +79,7 @@ static const char* vtkDataObjectTypesStrings[] = {
"vtkHierarchicalDataSet", // OBSOLETE "vtkHierarchicalDataSet", // OBSOLETE
"vtkHierarchicalBoxDataSet", // OBSOLETE "vtkHierarchicalBoxDataSet", // OBSOLETE
"vtkGenericDataSet", "vtkGenericDataSet",
"vtkHyperOctree", "vtkHyperOctree", // OBSOLETE
"vtkTemporalDataSet",//OBSOLETE "vtkTemporalDataSet",//OBSOLETE
"vtkTable", "vtkTable",
"vtkGraph", "vtkGraph",
...@@ -216,10 +218,12 @@ vtkDataObject* vtkDataObjectTypes::NewDataObject(const char* type) ...@@ -216,10 +218,12 @@ vtkDataObject* vtkDataObjectTypes::NewDataObject(const char* type)
{ {
return vtkNonOverlappingAMR::New(); return vtkNonOverlappingAMR::New();
} }
#if !defined(VTK_LEGACY_REMOVE)
else if(strcmp(type, "vtkHyperOctree") == 0) else if(strcmp(type, "vtkHyperOctree") == 0)
{ {
return vtkHyperOctree::New(); return vtkHyperOctree::New();
} }
#endif // LEGACY remove
else if(strcmp(type, "vtkHyperTreeGrid") == 0) else if(strcmp(type, "vtkHyperTreeGrid") == 0)
{ {
return vtkHyperTreeGrid::New(); return vtkHyperTreeGrid::New();
......
...@@ -960,6 +960,8 @@ vtkStandardNewMacro(vtkHyperOctree); ...@@ -960,6 +960,8 @@ vtkStandardNewMacro(vtkHyperOctree);
// Default constructor. // Default constructor.
vtkHyperOctree::vtkHyperOctree() vtkHyperOctree::vtkHyperOctree()
{ {
VTK_LEGACY_BODY(vtkHyperOctree, "VTK 8.1");
this->DualGridFlag = 1; this->DualGridFlag = 1;
this->Dimension=3; this->Dimension=3;
......
...@@ -140,6 +140,7 @@ class vtkPixel; ...@@ -140,6 +140,7 @@ class vtkPixel;
class vtkVoxel; class vtkVoxel;
class vtkCellLinks; class vtkCellLinks;
#if !defined(VTK_LEGACY_REMOVE)
class VTKCOMMONDATAMODEL_EXPORT vtkHyperOctree : public vtkDataSet class VTKCOMMONDATAMODEL_EXPORT vtkHyperOctree : public vtkDataSet
{ {
public: public:
...@@ -631,5 +632,6 @@ private: ...@@ -631,5 +632,6 @@ private:
unsigned short IsLeaf; unsigned short IsLeaf;
unsigned short Level; unsigned short Level;
}; };
#endif // LEGACY remove
#endif #endif
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
// Constructor. // Constructor.
vtkHyperOctreeCursor::vtkHyperOctreeCursor() vtkHyperOctreeCursor::vtkHyperOctreeCursor()
{ {
VTK_LEGACY_BODY(vtkHyperOctreeCursor, "VTK 8.1");
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "vtkCommonDataModelModule.h" // For export macro #include "vtkCommonDataModelModule.h" // For export macro
#include "vtkObject.h" #include "vtkObject.h"
#if !defined(VTK_LEGACY_REMOVE)
enum enum
{ {
VTK_OCTREE_CHILD_ZMIN_YMIN_XMIN=0, VTK_OCTREE_CHILD_ZMIN_YMIN_XMIN=0,
...@@ -182,4 +183,6 @@ private: ...@@ -182,4 +183,6 @@ private:
vtkHyperOctreeCursor(const vtkHyperOctreeCursor&) = delete; vtkHyperOctreeCursor(const vtkHyperOctreeCursor&) = delete;
void operator=(const vtkHyperOctreeCursor&) = delete; void operator=(const vtkHyperOctreeCursor&) = delete;
}; };
#endif // LEGACY remove
#endif #endif
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
// Default constructor. // Default constructor.
vtkHyperOctreePointsGrabber::vtkHyperOctreePointsGrabber() vtkHyperOctreePointsGrabber::vtkHyperOctreePointsGrabber()
{ {
VTK_LEGACY_BODY(vtkHyperOctreePointsGrabber, "VTK 8.1");
this->Dimension=3; this->Dimension=3;
} }
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "vtkCommonDataModelModule.h" // For export macro #include "vtkCommonDataModelModule.h" // For export macro
#include "vtkObject.h" #include "vtkObject.h"
#if !defined(VTK_LEGACY_REMOVE)
class VTKCOMMONDATAMODEL_EXPORT vtkHyperOctreePointsGrabber : public vtkObject class VTKCOMMONDATAMODEL_EXPORT vtkHyperOctreePointsGrabber : public vtkObject
{ {
public: public:
...@@ -97,5 +98,6 @@ private: ...@@ -97,5 +98,6 @@ private:
vtkHyperOctreePointsGrabber(const vtkHyperOctreePointsGrabber&) = delete; vtkHyperOctreePointsGrabber(const vtkHyperOctreePointsGrabber&) = delete;
void operator=(const vtkHyperOctreePointsGrabber&) = delete; void operator=(const vtkHyperOctreePointsGrabber&) = delete;
}; };
#endif // LEGACY remove
#endif #endif
...@@ -18,7 +18,6 @@ SET(Module_SRCS ...@@ -18,7 +18,6 @@ SET(Module_SRCS
vtkFilteringInformationKeyManager.cxx vtkFilteringInformationKeyManager.cxx
vtkGraphAlgorithm.cxx vtkGraphAlgorithm.cxx
vtkHierarchicalBoxDataSetAlgorithm.cxx vtkHierarchicalBoxDataSetAlgorithm.cxx
vtkHyperOctreeAlgorithm.cxx
vtkHyperTreeGridAlgorithm.cxx vtkHyperTreeGridAlgorithm.cxx
vtkImageAlgorithm.cxx vtkImageAlgorithm.cxx
vtkImageInPlaceFilter.cxx vtkImageInPlaceFilter.cxx
...@@ -64,6 +63,13 @@ SET(Module_SRCS ...@@ -64,6 +63,13 @@ SET(Module_SRCS
vtkNonOverlappingAMRAlgorithm.cxx vtkNonOverlappingAMRAlgorithm.cxx
) )
if (NOT VTK_LEGACY_REMOVE)
list(APPEND Module_SRCS
vtkHyperOctreeAlgorithm.cxx
)
endif()
set_source_files_properties( set_source_files_properties(
vtkExecutive vtkExecutive
vtkHyperOctreeAlgorithm vtkHyperOctreeAlgorithm
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
vtkHyperOctreeAlgorithm::vtkHyperOctreeAlgorithm() vtkHyperOctreeAlgorithm::vtkHyperOctreeAlgorithm()
{ {
VTK_LEGACY_BODY(vtkHyperOctreeAlgorithm, "VTK 8.1");
// by default assume filters have one input and one output // by default assume filters have one input and one output
// subclasses that deviate should modify this setting // subclasses that deviate should modify this setting
this->SetNumberOfInputPorts(1); this->SetNumberOfInputPorts(1);
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "vtkAlgorithm.h" #include "vtkAlgorithm.h"
#include "vtkHyperOctree.h" // makes things a bit easier #include "vtkHyperOctree.h" // makes things a bit easier
#if !defined(VTK_LEGACY_REMOVE)
class vtkDataSet; class vtkDataSet;
class vtkHyperOctree; class vtkHyperOctree;
...@@ -119,5 +120,6 @@ private: ...@@ -119,5 +120,6 @@ private:
vtkHyperOctreeAlgorithm(const vtkHyperOctreeAlgorithm&) = delete; vtkHyperOctreeAlgorithm(const vtkHyperOctreeAlgorithm&) = delete;
void operator=(const vtkHyperOctreeAlgorithm&) = delete; void operator=(const vtkHyperOctreeAlgorithm&) = delete;
}; };
#endif // LEGACY remove
#endif #endif
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// Usage: DumpXMLFile XMLFile1 XMLFile2 ... // Usage: DumpXMLFile XMLFile1 XMLFile2 ...
// where // where
// XMLFile is a vtk XML file of type .vtu, .vtp, .vts, .vtr, // XMLFile is a vtk XML file of type .vtu, .vtp, .vts, .vtr,
// .vti, .vto // .vti
// //
#include <vtkSmartPointer.h> #include <vtkSmartPointer.h>
#include <vtkXMLReader.h> #include <vtkXMLReader.h>
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include <vtkXMLPolyDataReader.h> #include <vtkXMLPolyDataReader.h>
#include <vtkXMLStructuredGridReader.h> #include <vtkXMLStructuredGridReader.h>
#include <vtkXMLRectilinearGridReader.h> #include <vtkXMLRectilinearGridReader.h>
#include <vtkXMLHyperOctreeReader.h>
#include <vtkXMLCompositeDataReader.h> #include <vtkXMLCompositeDataReader.h>
#include <vtkXMLStructuredGridReader.h> #include <vtkXMLStructuredGridReader.h>
#include <vtkXMLImageDataReader.h> #include <vtkXMLImageDataReader.h>
...@@ -19,7 +18,6 @@ ...@@ -19,7 +18,6 @@
#include <vtkDataSet.h> #include <vtkDataSet.h>
#include <vtkUnstructuredGrid.h> #include <vtkUnstructuredGrid.h>
#include <vtkRectilinearGrid.h> #include <vtkRectilinearGrid.h>
#include <vtkHyperOctree.h>
#include <vtkImageData.h> #include <vtkImageData.h>
#include <vtkPolyData.h> #include <vtkPolyData.h>
#include <vtkStructuredGrid.h> #include <vtkStructuredGrid.h>
...@@ -76,10 +74,6 @@ int main (int argc, char *argv[]) ...@@ -76,10 +74,6 @@ int main (int argc, char *argv[])
{ {
dataSet = ReadAnXMLFile<vtkXMLImageDataReader> (argv[f]); dataSet = ReadAnXMLFile<vtkXMLImageDataReader> (argv[f]);
} }
else if (extension == ".vto")
{
dataSet = ReadAnXMLFile<vtkXMLHyperOctreeReader> (argv[f]);
}
else if (extension == ".vtk") else if (extension == ".vtk")
{ {
dataSet = ReadAnXMLFile<vtkDataSetReader> (argv[f]); dataSet = ReadAnXMLFile<vtkDataSetReader> (argv[f]);
......
set(Module_SRCS set(Module_SRCS
vtkClipHyperOctree.cxx
vtkHyperTreeGridAxisClip.cxx vtkHyperTreeGridAxisClip.cxx
vtkHyperTreeGridAxisCut.cxx vtkHyperTreeGridAxisCut.cxx
vtkHyperTreeGridAxisReflection.cxx vtkHyperTreeGridAxisReflection.cxx
...@@ -10,15 +9,21 @@ set(Module_SRCS ...@@ -10,15 +9,21 @@ set(Module_SRCS
vtkHyperTreeGridPlaneCutter.cxx vtkHyperTreeGridPlaneCutter.cxx
vtkHyperTreeGridThreshold.cxx vtkHyperTreeGridThreshold.cxx
vtkHyperTreeGridToUnstructuredGrid.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}) vtk_module_library(vtkFiltersHyperTree ${Module_SRCS})
vtk_add_test_cxx(${vtk-module}CxxTests tests set(test_sources
TestClipHyperOctree.cxx # All things HyperOctree-related have been deprecated, so these now emit lots
TestHyperOctreeContourFilter.cxx # of warnings:
TestHyperOctreeCutter.cxx #TestClipHyperOctree.cxx
TestHyperOctreeDual.cxx #TestHyperOctreeContourFilter.cxx
TestHyperOctreeSurfaceFilter.cxx #TestHyperOctreeCutter.cxx
TestHyperOctreeToUniformGrid.cxx #TestHyperOctreeDual.cxx
#TestHyperOctreeSurfaceFilter.cxx
#TestHyperOctreeToUniformGrid.cxx
TestHyperTreeGridBinary2D.cxx TestHyperTreeGridBinary2D.cxx
TestHyperTreeGridBinary2DAxisClipBox.cxx TestHyperTreeGridBinary2DAxisClipBox.cxx
TestHyperTreeGridBinary2DAxisClipEllipse.cxx TestHyperTreeGridBinary2DAxisClipEllipse.cxx
...@@ -69,4 +72,12 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests ...@@ -69,4 +72,12 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests
TestHyperTreeGridTernarySphereMaterial.cxx TestHyperTreeGridTernarySphereMaterial.cxx
TestHyperTreeGridTernarySphereMaterialReflections.cxx TestHyperTreeGridTernarySphereMaterialReflections.cxx
) )
if (NOT VTK_LEGACY_REMOVE)
list(APPEND test_sources
)
endif()
vtk_add_test_cxx(${vtk-module}CxxTests tests ${test_sources})
vtk_test_cxx_executable(${vtk-module}CxxTests tests) vtk_test_cxx_executable(${vtk-module}CxxTests tests)
...@@ -52,6 +52,8 @@ vtkCxxSetObjectMacro(vtkClipHyperOctree,ClipFunction,vtkImplicitFunction); ...@@ -52,6 +52,8 @@ vtkCxxSetObjectMacro(vtkClipHyperOctree,ClipFunction,vtkImplicitFunction);
// set to 0.0; and generate clip scalars turned off. // set to 0.0; and generate clip scalars turned off.
vtkClipHyperOctree::vtkClipHyperOctree(vtkImplicitFunction *cf) vtkClipHyperOctree::vtkClipHyperOctree(vtkImplicitFunction *cf)
{ {
VTK_LEGACY_BODY(vtkClipHyperOctree, "VTK 8.1");
this->ClipFunction = cf; this->ClipFunction = cf;
this->InsideOut = 0; this->InsideOut = 0;
this->Locator = nullptr; this->Locator = nullptr;
......
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
#include "vtkFiltersHyperTreeModule.h" // For export macro #include "vtkFiltersHyperTreeModule.h" // For export macro
#include "vtkUnstructuredGridAlgorithm.h" #include "vtkUnstructuredGridAlgorithm.h"
#if !defined(VTK_LEGACY_REMOVE)
class vtkImplicitFunction; class vtkImplicitFunction;
class vtkIncrementalPointLocator; class vtkIncrementalPointLocator;
class vtkHyperOctreeCursor; class vtkHyperOctreeCursor;
...@@ -231,5 +232,6 @@ private: ...@@ -231,5 +232,6 @@ private:
vtkClipHyperOctree(const vtkClipHyperOctree&) = delete; vtkClipHyperOctree(const vtkClipHyperOctree&) = delete;
void operator=(const vtkClipHyperOctree&) = delete; void operator=(const vtkClipHyperOctree&) = delete;
}; };
#endif // LEGACY remove
#endif #endif
...@@ -34,6 +34,8 @@ public: ...@@ -34,6 +34,8 @@ public:
// Default constructor. // Default constructor.
vtkHyperOctreeClipCutPointsGrabber::vtkHyperOctreeClipCutPointsGrabber() vtkHyperOctreeClipCutPointsGrabber::vtkHyperOctreeClipCutPointsGrabber()
{ {
VTK_LEGACY_BODY(vtkHyperOctreeClipCutPointsGrabber, "VTK 8.1");
this->Triangulator=vtkOrderedTriangulator::New(); this->Triangulator=vtkOrderedTriangulator::New();
this->IdSet=new vtkHyperOctreeIdSet; this->IdSet=new vtkHyperOctreeIdSet;
this->Polygon=nullptr; this->Polygon=nullptr;
......
...@@ -28,11 +28,11 @@ ...@@ -28,11 +28,11 @@
#include "vtkFiltersHyperTreeModule.h" // For export macro #include "vtkFiltersHyperTreeModule.h" // For export macro
#include "vtkHyperOctreePointsGrabber.h" #include "vtkHyperOctreePointsGrabber.h"
#if !defined(VTK_LEGACY_REMOVE)
class vtkHyperOctreeIdSet; // Pimpl idiom class vtkHyperOctreeIdSet; // Pimpl idiom
class vtkPolygon; class vtkPolygon;
class vtkOrderedTriangulator; class vtkOrderedTriangulator;
class VTKFILTERSHYPERTREE_EXPORT vtkHyperOctreeClipCutPointsGrabber : public vtkHyperOctreePointsGrabber class VTKFILTERSHYPERTREE_EXPORT vtkHyperOctreeClipCutPointsGrabber : public vtkHyperOctreePointsGrabber
{ {
public: public:
...@@ -107,5 +107,6 @@ private: ...@@ -107,5 +107,6 @@ private:
vtkHyperOctreeClipCutPointsGrabber(const vtkHyperOctreeClipCutPointsGrabber&) = delete; vtkHyperOctreeClipCutPointsGrabber(const vtkHyperOctreeClipCutPointsGrabber&) = delete;
void operator=(const vtkHyperOctreeClipCutPointsGrabber&) = delete; void operator=(const vtkHyperOctreeClipCutPointsGrabber&) = delete;
}; };
#endif // LEGACY remove
#endif #endif
...@@ -161,6 +161,8 @@ vtkStandardNewMacro(vtkHyperOctreeContourFilter); ...@@ -161,6 +161,8 @@ vtkStandardNewMacro(vtkHyperOctreeContourFilter);
// set to 0.0; and generate cut scalars turned off. // set to 0.0; and generate cut scalars turned off.
vtkHyperOctreeContourFilter::vtkHyperOctreeContourFilter() vtkHyperOctreeContourFilter::vtkHyperOctreeContourFilter()
{ {
VTK_LEGACY_BODY(vtkHyperOctreeContourFilter, "VTK 8.1");
this->ContourValues = vtkContourValues::New(); this->ContourValues = vtkContourValues::New();
this->Locator = nullptr; this->Locator = nullptr;
......
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
#include "vtkContourValues.h" // Needed for inline methods #include "vtkContourValues.h" // Needed for inline methods
#include "vtkCutter.h" // for VTK_SORT_BY_VALUE #include "vtkCutter.h" // for VTK_SORT_BY_VALUE
#if !defined(VTK_LEGACY_REMOVE)
class vtkIncrementalPointLocator; class vtkIncrementalPointLocator;
class vtkHyperOctree; class vtkHyperOctree;
class vtkOrderedTriangulator; class vtkOrderedTriangulator;
...@@ -80,6 +81,7 @@ public: ...@@ -80,6 +81,7 @@ public:
/** /**
* Methods to set / get contour values. * Methods to set / get contour values.
#if !defined(VTK_LEGACY_REMOVE)
*/ */
/** /**
...@@ -251,4 +253,6 @@ private: ...@@ -251,4 +253,6 @@ private:
vtkHyperOctreeContourFilter(const vtkHyperOctreeContourFilter&) = delete; vtkHyperOctreeContourFilter(const vtkHyperOctreeContourFilter&) = delete;
void operator=(const vtkHyperOctreeContourFilter&) = delete; void operator=(const vtkHyperOctreeContourFilter&) = delete;
}; };
#endif // LEGACY remove
#endif #endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment