Commit 9979ede7 authored by Allison Vacanti's avatar Allison Vacanti
Browse files

Merge branch 'deprecate_octree_fractal_release' into deprecate_octree_fractal

parents 3b090d7f f4a51052
vtk_add_test_cxx(${vtk-module}CxxTests tests
set(test_sources
TestClipHyperOctree.cxx
TestHyperOctreeContourFilter.cxx
TestHyperOctreeCutter.cxx
TestHyperOctreeDual.cxx
TestHyperOctreeSurfaceFilter.cxx
TestHyperOctreeToUniformGrid.cxx
TestHyperTreeGridBinary2D.cxx
......@@ -68,4 +67,13 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests
TestHyperTreeGridTernarySphereMaterial.cxx
TestHyperTreeGridTernarySphereMaterialReflections.cxx
)
if (NOT VTK_LEGACY_REMOVE)
list(APPEND test_sources
TestHyperOctreeDual.cxx #deprecated due to vtkHyperOctreeFractalSource use
)
endif()
vtk_add_test_cxx(${vtk-module}CxxTests tests ${test_sources})
vtk_test_cxx_executable(${vtk-module}CxxTests tests)
......@@ -11,7 +11,6 @@ set(Module_SRCS
vtkEllipticalButtonSource.cxx
vtkFrustumSource.cxx
vtkGlyphSource2D.cxx
vtkHyperOctreeFractalSource.cxx
vtkHyperTreeGridSource.cxx
vtkLineSource.cxx
vtkOutlineCornerFilter.cxx
......@@ -38,4 +37,10 @@ set(Module_SRCS
vtkDiagonalMatrixSource.cxx
)
if (NOT VTK_LEGACY_REMOVE)
list(APPEND Module_SRCS
vtkHyperOctreeFractalSource.cxx
)
endif()
vtk_module_library(vtkFiltersSources ${Module_SRCS})
......@@ -32,6 +32,8 @@ vtkStandardNewMacro(vtkHyperOctreeFractalSource);
//----------------------------------------------------------------------------
vtkHyperOctreeFractalSource::vtkHyperOctreeFractalSource()
{
VTK_LEGACY_BODY(vtkHyperOctreeFractalSource, "VTK 8.2");
this->SetNumberOfInputPorts(0);
this->SizeCX[0] = 2.5;
......
......@@ -30,6 +30,7 @@
class vtkImplicitFunction;
#if !defined(VTK_LEGACY_REMOVE)
class VTKFILTERSSOURCES_EXPORT vtkHyperOctreeFractalSource : public vtkHyperOctreeAlgorithm
{
public:
......@@ -165,5 +166,6 @@ private:
vtkHyperOctreeFractalSource(const vtkHyperOctreeFractalSource&) = delete;
void operator=(const vtkHyperOctreeFractalSource&) = delete;
};
#endif //VTK_LEGACY_REMOVE
#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