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
...@@ -52,6 +52,8 @@ vtkCxxSetObjectMacro(vtkHyperOctreeCutter,CutFunction,vtkImplicitFunction); ...@@ -52,6 +52,8 @@ vtkCxxSetObjectMacro(vtkHyperOctreeCutter,CutFunction,vtkImplicitFunction);
// set to 0.0; and generate cut scalars turned off. // set to 0.0; and generate cut scalars turned off.
vtkHyperOctreeCutter::vtkHyperOctreeCutter(vtkImplicitFunction *cf) vtkHyperOctreeCutter::vtkHyperOctreeCutter(vtkImplicitFunction *cf)
{ {
VTK_LEGACY_BODY(vtkHyperOctreeCutter, "VTK 8.1");
this->ContourValues = vtkContourValues::New(); this->ContourValues = vtkContourValues::New();
this->SortBy = VTK_SORT_BY_VALUE; this->SortBy = VTK_SORT_BY_VALUE;
......
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
// fix until this filter can be converted to geernate unstructured grids. // fix until this filter can be converted to geernate unstructured grids.
//#define VTK_NUMBER_OF_CELL_TYPES 68 //#define VTK_NUMBER_OF_CELL_TYPES 68
#if !defined(VTK_LEGACY_REMOVE)
class vtkImplicitFunction; class vtkImplicitFunction;
class vtkIncrementalPointLocator; class vtkIncrementalPointLocator;
class vtkHyperOctree; class vtkHyperOctree;
...@@ -280,5 +281,6 @@ private: ...@@ -280,5 +281,6 @@ private:
vtkHyperOctreeCutter(const vtkHyperOctreeCutter&) = delete; vtkHyperOctreeCutter(const vtkHyperOctreeCutter&) = delete;
void operator=(const vtkHyperOctreeCutter&) = delete; void operator=(const vtkHyperOctreeCutter&) = delete;
}; };
#endif // LEGACY remove
#endif #endif
...@@ -29,6 +29,8 @@ vtkStandardNewMacro(vtkHyperOctreeDepth); ...@@ -29,6 +29,8 @@ vtkStandardNewMacro(vtkHyperOctreeDepth);
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
vtkHyperOctreeDepth::vtkHyperOctreeDepth() vtkHyperOctreeDepth::vtkHyperOctreeDepth()
{ {
VTK_LEGACY_BODY(vtkHyperOctreeDepth, "VTK 8.1");
this->GeneratedDepths = nullptr; this->GeneratedDepths = nullptr;
} }
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "vtkFiltersHyperTreeModule.h" // For export macro #include "vtkFiltersHyperTreeModule.h" // For export macro
#include "vtkDataSetAlgorithm.h" #include "vtkDataSetAlgorithm.h"
#if !defined(VTK_LEGACY_REMOVE)
class vtkHyperOctree; class vtkHyperOctree;
class vtkHyperOctreeCursor; class vtkHyperOctreeCursor;
class vtkIntArray; class vtkIntArray;
...@@ -59,5 +60,6 @@ private: ...@@ -59,5 +60,6 @@ private:
vtkHyperOctreeDepth(const vtkHyperOctreeDepth&) = delete; vtkHyperOctreeDepth(const vtkHyperOctreeDepth&) = delete;
void operator=(const vtkHyperOctreeDepth&) = delete; void operator=(const vtkHyperOctreeDepth&) = delete;
}; };
#endif // LEGACY remove
#endif #endif
...@@ -80,6 +80,8 @@ vtkStandardNewMacro(vtkHyperOctreeDualGridContourFilter); ...@@ -80,6 +80,8 @@ vtkStandardNewMacro(vtkHyperOctreeDualGridContourFilter);
// set to 0.0; and generate cut scalars turned off. // set to 0.0; and generate cut scalars turned off.
vtkHyperOctreeDualGridContourFilter::vtkHyperOctreeDualGridContourFilter() vtkHyperOctreeDualGridContourFilter::vtkHyperOctreeDualGridContourFilter()
{ {
VTK_LEGACY_BODY(vtkHyperOctree, "VTK 8.1");
this->ContourValues = vtkContourValues::New(); this->ContourValues = vtkContourValues::New();
this->Locator = nullptr; this->Locator = nullptr;
......
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,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 vtkHyperOctree; class vtkHyperOctree;
class vtkTetra; class vtkTetra;
class vtkHyperOctreeCursor; class vtkHyperOctreeCursor;
...@@ -216,4 +217,6 @@ private: ...@@ -216,4 +217,6 @@ private:
vtkHyperOctreeDualGridContourFilter(const vtkHyperOctreeDualGridContourFilter&) = delete; vtkHyperOctreeDualGridContourFilter(const vtkHyperOctreeDualGridContourFilter&) = delete;
void operator=(const vtkHyperOctreeDualGridContourFilter&) = delete; void operator=(const vtkHyperOctreeDualGridContourFilter&) = delete;
}; };
#endif // LEGACY remove
#endif #endif
...@@ -34,6 +34,8 @@ vtkStandardNewMacro(vtkHyperOctreeLimiter); ...@@ -34,6 +34,8 @@ vtkStandardNewMacro(vtkHyperOctreeLimiter);
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
vtkHyperOctreeLimiter::vtkHyperOctreeLimiter() vtkHyperOctreeLimiter::vtkHyperOctreeLimiter()
{ {
VTK_LEGACY_BODY(vtkHyperOctreeLimiter, "VTK 8.1");
this->MaximumLevel = 5; this->MaximumLevel = 5;
this->AccumScratch = new double[1024]; this->AccumScratch = new double[1024];
} }
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "vtkFiltersHyperTreeModule.h" // For export macro #include "vtkFiltersHyperTreeModule.h" // For export macro
#include "vtkDataSetAlgorithm.h" #include "vtkDataSetAlgorithm.h"
#if !defined(VTK_LEGACY_REMOVE)
class vtkHyperOctree; class vtkHyperOctree;
class vtkHyperOctreeCursor; class vtkHyperOctreeCursor;
...@@ -79,5 +80,6 @@ private: ...@@ -79,5 +80,6 @@ private:
vtkHyperOctreeLimiter(const vtkHyperOctreeLimiter&) = delete; vtkHyperOctreeLimiter(const vtkHyperOctreeLimiter&) = delete;
void operator=(const vtkHyperOctreeLimiter&) = delete; void operator=(const vtkHyperOctreeLimiter&) = delete;
}; };
#endif // LEGACY remove
#endif #endif
...@@ -33,6 +33,8 @@ vtkCxxSetObjectMacro(vtkHyperOctreeSampleFunction,ImplicitFunction, ...@@ -33,6 +33,8 @@ vtkCxxSetObjectMacro(vtkHyperOctreeSampleFunction,ImplicitFunction,
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
vtkHyperOctreeSampleFunction::vtkHyperOctreeSampleFunction() vtkHyperOctreeSampleFunction::vtkHyperOctreeSampleFunction()
{ {
VTK_LEGACY_BODY(vtkHyperOctreeSampleFunction, "VTK 8.1");
this->SetNumberOfInputPorts(0); this->SetNumberOfInputPorts(0);
this->Dimension=3; this->Dimension=3;
int i=0; int i=0;
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
class vtkImplicitFunction; class vtkImplicitFunction;
#if !defined(VTK_LEGACY_REMOVE)
class VTKFILTERSHYPERTREE_EXPORT vtkHyperOctreeSampleFunction : public vtkHyperOctreeAlgorithm class VTKFILTERSHYPERTREE_EXPORT vtkHyperOctreeSampleFunction : public vtkHyperOctreeAlgorithm
{ {
public: public:
...@@ -239,5 +240,6 @@ private: ...@@ -239,5 +240,6 @@ private:
vtkHyperOctreeSampleFunction(const vtkHyperOctreeSampleFunction&) = delete; vtkHyperOctreeSampleFunction(const vtkHyperOctreeSampleFunction&) = delete;
void operator=(const vtkHyperOctreeSampleFunction&) = delete; void operator=(const vtkHyperOctreeSampleFunction&) = delete;
}; };
#endif // LEGACY remove
#endif #endif
...@@ -34,6 +34,8 @@ vtkStandardNewMacro(vtkHyperOctreeToUniformGridFilter); ...@@ -34,6 +34,8 @@ vtkStandardNewMacro(vtkHyperOctreeToUniformGridFilter);
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
vtkHyperOctreeToUniformGridFilter::vtkHyperOctreeToUniformGridFilter() vtkHyperOctreeToUniformGridFilter::vtkHyperOctreeToUniformGridFilter()
{ {
VTK_LEGACY_BODY(vtkHyperOctreeToUniformGridFilter, "VTK 8.1");
this->InputCD=nullptr; this->InputCD=nullptr;
this->OutputCD=nullptr; this->OutputCD=nullptr;
this->Cursor=nullptr; this->Cursor=nullptr;
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "vtkFiltersHyperTreeModule.h" // For export macro #include "vtkFiltersHyperTreeModule.h" // For export macro
#include "vtkImageAlgorithm.h" #include "vtkImageAlgorithm.h"
#if !defined(VTK_LEGACY_REMOVE)
class vtkHyperOctreeCursor; class vtkHyperOctreeCursor;
class vtkCellData; class vtkCellData;
class vtkDataSetAttributes; class vtkDataSetAttributes;
...@@ -69,5 +70,6 @@ private: ...@@ -69,5 +70,6 @@ private:
vtkHyperOctreeToUniformGridFilter(const vtkHyperOctreeToUniformGridFilter&) = delete; vtkHyperOctreeToUniformGridFilter(const vtkHyperOctreeToUniformGridFilter&) = delete;
void operator=(const vtkHyperOctreeToUniformGridFilter&) = delete; void operator=(const vtkHyperOctreeToUniformGridFilter&) = delete;
}; };
#endif // LEGACY remove
#endif #endif
...@@ -11,7 +11,6 @@ set(Module_SRCS ...@@ -11,7 +11,6 @@ set(Module_SRCS
vtkEllipticalButtonSource.cxx vtkEllipticalButtonSource.cxx
vtkFrustumSource.cxx vtkFrustumSource.cxx
vtkGlyphSource2D.cxx vtkGlyphSource2D.cxx
vtkHyperOctreeFractalSource.cxx
vtkHyperTreeGridSource.cxx vtkHyperTreeGridSource.cxx
vtkLineSource.cxx vtkLineSource.cxx
vtkOutlineCornerFilter.cxx vtkOutlineCornerFilter.cxx
...@@ -38,6 +37,12 @@ set(Module_SRCS ...@@ -38,6 +37,12 @@ set(Module_SRCS
vtkDiagonalMatrixSource.cxx vtkDiagonalMatrixSource.cxx
) )
if (NOT VTK_LEGACY_REMOVE)
list(APPEND Module_SRCS
vtkHyperOctreeFractalSource.cxx
)
endif()
set_source_files_properties( set_source_files_properties(
vtkButtonSource vtkButtonSource
ABSTRACT ABSTRACT
......
...@@ -32,6 +32,8 @@ vtkStandardNewMacro(vtkHyperOctreeFractalSource); ...@@ -32,6 +32,8 @@ vtkStandardNewMacro(vtkHyperOctreeFractalSource);
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
vtkHyperOctreeFractalSource::vtkHyperOctreeFractalSource() vtkHyperOctreeFractalSource::vtkHyperOctreeFractalSource()
{ {
VTK_LEGACY_BODY(vtkHyperOctreeFractalSource, "VTK 8.1");
this->SetNumberOfInputPorts(0); this->SetNumberOfInputPorts(0);
this->SizeCX[0] = 2.5; this->SizeCX[0] = 2.5;
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
class vtkImplicitFunction; class vtkImplicitFunction;
#if !defined(VTK_LEGACY_REMOVE)
class VTKFILTERSSOURCES_EXPORT vtkHyperOctreeFractalSource : public vtkHyperOctreeAlgorithm class VTKFILTERSSOURCES_EXPORT vtkHyperOctreeFractalSource : public vtkHyperOctreeAlgorithm
{ {
public: public:
...@@ -165,5 +166,6 @@ private: ...@@ -165,5 +166,6 @@ private:
vtkHyperOctreeFractalSource(const vtkHyperOctreeFractalSource&) = delete; vtkHyperOctreeFractalSource(const vtkHyperOctreeFractalSource&) = delete;
void operator=(const vtkHyperOctreeFractalSource&) = delete; void operator=(const vtkHyperOctreeFractalSource&) = delete;
}; };
#endif //VTK_LEGACY_REMOVE
#endif #endif
...@@ -11,8 +11,6 @@ set(Module_SRCS ...@@ -11,8 +11,6 @@ set(Module_SRCS
vtkXMLHierarchicalBoxDataReader.cxx vtkXMLHierarchicalBoxDataReader.cxx
vtkXMLHierarchicalBoxDataWriter.cxx vtkXMLHierarchicalBoxDataWriter.cxx
vtkXMLHierarchicalDataReader.cxx vtkXMLHierarchicalDataReader.cxx
vtkXMLHyperOctreeReader.cxx
vtkXMLHyperOctreeWriter.cxx
vtkXMLImageDataReader.cxx vtkXMLImageDataReader.cxx
vtkXMLImageDataWriter.cxx vtkXMLImageDataWriter.cxx
vtkXMLMultiBlockDataReader.cxx vtkXMLMultiBlockDataReader.cxx
...@@ -49,6 +47,13 @@ set(Module_SRCS ...@@ -49,6 +47,13 @@ set(Module_SRCS
vtkXMLWriter.cxx vtkXMLWriter.cxx
) )
if (NOT VTK_LEGACY_REMOVE)
list(APPEND Module_SRCS
vtkXMLHyperOctreeReader.cxx
vtkXMLHyperOctreeWriter.cxx
)
endif()
set_source_files_properties( set_source_files_properties(
vtkXMLCompositeDataReader vtkXMLCompositeDataReader
vtkXMLCompositeDataWriter vtkXMLCompositeDataWriter
......
...@@ -2,7 +2,7 @@ set(TestXML_ARGS "DATA{${VTK_TEST_INPUT_DIR}/sample.xml}") ...@@ -2,7 +2,7 @@ set(TestXML_ARGS "DATA{${VTK_TEST_INPUT_DIR}/sample.xml}")
vtk_add_test_cxx(${vtk-module}CxxTests tests vtk_add_test_cxx(${vtk-module}CxxTests tests
TestAMRXMLIO.cxx,NO_VALID TestAMRXMLIO.cxx,NO_VALID
TestDataObjectXMLIO.cxx,NO_VALID TestDataObjectXMLIO.cxx,NO_VALID
TestHyperOctreeIO.cxx #TestHyperOctreeIO.cxx # HyperOctree is deprecated
TestReadDuplicateDataArrayNames.cxx,NO_DATA,NO_VALID TestReadDuplicateDataArrayNames.cxx,NO_DATA,NO_VALID
TestXML.cxx,NO_DATA,NO_VALID,NO_OUTPUT TestXML.cxx,NO_DATA,NO_VALID,NO_OUTPUT
TestXMLGhostCellsImport.cxx TestXMLGhostCellsImport.cxx
......
...@@ -17,7 +17,9 @@ ...@@ -17,7 +17,9 @@
#include "vtkAlgorithmOutput.h" #include "vtkAlgorithmOutput.h"
#include "vtkCallbackCommand.h" #include "vtkCallbackCommand.h"
#include "vtkDataSet.h" #include "vtkDataSet.h"
#if !defined(VTK_LEGACY_REMOVE)
#include "vtkHyperOctree.h" #include "vtkHyperOctree.h"
#endif // LEGACY remove
#include "vtkImageData.h" #include "vtkImageData.h"
#include "vtkInformation.h" #include "vtkInformation.h"
#include "vtkObjectFactory.h" #include "vtkObjectFactory.h"
...@@ -26,7 +28,9 @@ ...@@ -26,7 +28,9 @@
#include "vtkSmartPointer.h" #include "vtkSmartPointer.h"
#include "vtkStructuredGrid.h" #include "vtkStructuredGrid.h"
#include "vtkUnstructuredGrid.h" #include "vtkUnstructuredGrid.h"
#if !defined(VTK_LEGACY_REMOVE)
#include "vtkXMLHyperOctreeWriter.h" #include "vtkXMLHyperOctreeWriter.h"
#endif // LEGACY remove
#include "vtkXMLImageDataWriter.h" #include "vtkXMLImageDataWriter.h"
#include "vtkXMLPolyDataWriter.h" #include "vtkXMLPolyDataWriter.h"
#include "vtkXMLRectilinearGridWriter.h" #include "vtkXMLRectilinearGridWriter.h"
...@@ -82,7 +86,12 @@ vtkXMLWriter* vtkXMLDataObjectWriter::NewWriter(int dataset_type) ...@@ -82,7 +86,12 @@ vtkXMLWriter* vtkXMLDataObjectWriter::NewWriter(int dataset_type)
case VTK_POLY_DATA: case VTK_POLY_DATA:
return vtkXMLPolyDataWriter::New(); return vtkXMLPolyDataWriter::New();
case VTK_HYPER_OCTREE: case VTK_HYPER_OCTREE:
#if !defined(VTK_LEGACY_REMOVE)
return vtkXMLHyperOctreeWriter::New(); return vtkXMLHyperOctreeWriter::New();
#else // LEGACY remove
vtkGenericWarningMacro("vtkHyperOctree has been deprecated.");
return nullptr;
#endif // LEGACY remove
case VTK_TABLE: case VTK_TABLE:
return vtkXMLTableWriter::New(); return vtkXMLTableWriter::New();
} }
......
...@@ -15,7 +15,9 @@ ...@@ -15,7 +15,9 @@
#include "vtkXMLGenericDataObjectReader.h" #include "vtkXMLGenericDataObjectReader.h"
#include "vtkHierarchicalBoxDataSet.h" #include "vtkHierarchicalBoxDataSet.h"
#if !defined(VTK_LEGACY_REMOVE)
#include "vtkHyperOctree.h" #include "vtkHyperOctree.h"
#endif // LEGACY remove
#include "vtkImageData.h" #include "vtkImageData.h"
#include "vtkInformation.h" #include "vtkInformation.h"
#include "vtkInformationVector.h" #include "vtkInformationVector.h"
...@@ -29,7 +31,9 @@ ...@@ -29,7 +31,9 @@
#include "vtkStructuredGrid.h" #include "vtkStructuredGrid.h"
#include "vtkUnstructuredGrid.h" #include "vtkUnstructuredGrid.h"
#include "vtkXMLFileReadTester.h" #include "vtkXMLFileReadTester.h"
#if !defined(VTK_LEGACY_REMOVE)
#include "vtkXMLHyperOctreeReader.h" #include "vtkXMLHyperOctreeReader.h"
#endif // LEGACY remove
#include "vtkXMLImageDataReader.h" #include "vtkXMLImageDataReader.h"
#include "vtkXMLMultiBlockDataReader.h" #include "vtkXMLMultiBlockDataReader.h"
#include "vtkXMLPImageDataReader.h" #include "vtkXMLPImageDataReader.h"
...@@ -193,9 +197,14 @@ int vtkXMLGenericDataObjectReader::RequestDataObject( ...@@ -193,9 +197,14 @@ int vtkXMLGenericDataObjectReader::RequestDataObject(
output = vtkNonOverlappingAMR::New(); output = vtkNonOverlappingAMR::New();
break; break;
case VTK_HYPER_OCTREE: case VTK_HYPER_OCTREE:
#if !defined(VTK_LEGACY_REMOVE)
this->Reader=vtkXMLHyperOctreeReader::New(); this->Reader=vtkXMLHyperOctreeReader::New();
output=vtkHyperOctree::New(); output=vtkHyperOctree::New();
break; break;
#else // LEGACY remove
vtkErrorMacro("vtkHyperOctree has been deprecated.");
return 0;
#endif // LEGACY remove
case VTK_IMAGE_DATA: case VTK_IMAGE_DATA:
if(parallel) if(parallel)
{ {
...@@ -374,11 +383,14 @@ vtkXMLGenericDataObjectReader::GetHierarchicalBoxDataSetOutput() ...@@ -374,11 +383,14 @@ vtkXMLGenericDataObjectReader::GetHierarchicalBoxDataSetOutput()
return vtkHierarchicalBoxDataSet::SafeDownCast(this->GetOutput()); return vtkHierarchicalBoxDataSet::SafeDownCast(this->GetOutput());
} }
#if !defined(VTK_LEGACY_REMOVE)
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
vtkHyperOctree *vtkXMLGenericDataObjectReader::GetHyperOctreeOutput() vtkHyperOctree *vtkXMLGenericDataObjectReader::GetHyperOctreeOutput()
{ {
return vtkHyperOctree::SafeDownCast(this->GetOutput()); return vtkHyperOctree::SafeDownCast(this->GetOutput());
} }
#endif // LEGACY remove
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
vtkImageData *vtkXMLGenericDataObjectReader::GetImageDataOutput() vtkImageData *vtkXMLGenericDataObjectReader::GetImageDataOutput()
......
...@@ -62,7 +62,9 @@ public: ...@@ -62,7 +62,9 @@ public:
* getting the output.) * getting the output.)
*/ */
vtkHierarchicalBoxDataSet *GetHierarchicalBoxDataSetOutput(); vtkHierarchicalBoxDataSet *GetHierarchicalBoxDataSetOutput();
#if !defined(VTK_LEGACY_REMOVE)
vtkHyperOctree *GetHyperOctreeOutput(); vtkHyperOctree *GetHyperOctreeOutput();
#endif // LEGACY remove
vtkImageData *GetImageDataOutput(); vtkImageData *GetImageDataOutput();
vtkMultiBlockDataSet *GetMultiBlockDataSetOutput(); vtkMultiBlockDataSet *GetMultiBlockDataSetOutput();
vtkPolyData *GetPolyDataOutput(); vtkPolyData *GetPolyDataOutput();
......
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