Commit d79ad61e authored by Allison Vacanti's avatar Allison Vacanti
Browse files

Remove the now-deprecated OctreeFractal source.

parent 21c89fd5
......@@ -202,8 +202,6 @@
<Proxy group="filters" name="Median" />
<Proxy group="filters" name="MergeBlocks" />
<Proxy group="filters" name="MeshQuality" />
<Proxy group="filters" name="OctreeDepthLimit" />
<Proxy group="filters" name="OctreeDepthScalars" />
<Proxy group="filters" name="OTKernelSmoothing" />
<Proxy group="filters" name="OTDensityMap" />
<Proxy group="filters" name="OutlineCornerFilter" />
......
......@@ -13,7 +13,6 @@
<Proxy group="sources" name="HyperTreeGridSource" />
<Proxy group="sources" name="LineSource" />
<Proxy group="sources" name="ImageMandelbrotSource" />
<Proxy group="sources" name="OctreeFractal" />
<Proxy group="sources" name="OutlineSource" />
<Proxy group="sources" name="PlaneSource" />
<Proxy group="sources" name="PointSource" />
......
......@@ -317,7 +317,6 @@ set(_vtk_modules
# vtkXMLPRectilinearGridReader
# vtkXMLMultiBlockDataReader
# vtkXMLHierarchicalBoxDataReader
# vtkXMLHyperOctreeWriter
# vtkXMLPolyDataWriter
# vtkXMLUnstructuredGridWriter
# vtkXMLStructuredGridWriter
......
......@@ -105,8 +105,6 @@
<Proxy group="filters" name="Median" />
<Proxy group="filters" name="MergeBlocks" />
<Proxy group="filters" name="MeshQuality" />
<Proxy group="filters" name="OctreeDepthLimit" />
<Proxy group="filters" name="OctreeDepthScalars" />
<Proxy group="filters" name="OutlineCornerFilter" />
<Proxy group="filters" name="OutlineFilter" />
<Proxy group="filters" name="ParticlePathLines" />
......
......@@ -12,7 +12,6 @@
<Proxy group="sources" name="HierarchicalFractal" />
<Proxy group="sources" name="LineSource" />
<Proxy group="sources" name="ImageMandelbrotSource" />
<Proxy group="sources" name="OctreeFractal" />
<Proxy group="sources" name="OutlineSource" />
<Proxy group="sources" name="PlaneSource" />
<Proxy group="sources" name="PointSource" />
......
......@@ -105,8 +105,6 @@
<Proxy group="filters" name="Median" />
<Proxy group="filters" name="MergeBlocks" />
<Proxy group="filters" name="MeshQuality" />
<Proxy group="filters" name="OctreeDepthLimit" />
<Proxy group="filters" name="OctreeDepthScalars" />
<Proxy group="filters" name="OutlineCornerFilter" />
<Proxy group="filters" name="OutlineFilter" />
<Proxy group="filters" name="ParticlePathLines" />
......
......@@ -12,7 +12,6 @@
<Proxy group="sources" name="HierarchicalFractal" />
<Proxy group="sources" name="LineSource" />
<Proxy group="sources" name="ImageMandelbrotSource" />
<Proxy group="sources" name="OctreeFractal" />
<Proxy group="sources" name="OutlineSource" />
<Proxy group="sources" name="PlaneSource" />
<Proxy group="sources" name="PointSource" />
......
......@@ -12,7 +12,6 @@
<Proxy group="sources" name="HierarchicalFractal" />
<Proxy group="sources" name="LineSource" />
<Proxy group="sources" name="ImageMandelbrotSource" />
<Proxy group="sources" name="OctreeFractal" />
<Proxy group="sources" name="OutlineSource" />
<Proxy group="sources" name="PlaneSource" />
<Proxy group="sources" name="PointSource" />
......
......@@ -4451,66 +4451,6 @@ array.
<!-- End OutlineCornerFilter -->
</SourceProxy>
<!-- ==================================================================== -->
<SourceProxy class="vtkHyperOctreeDepth"
label="Octree Depth Scalars"
name="OctreeDepthScalars">
<Documentation long_help="This filter adds a scalar to each leaf of the octree that represents the leaf's depth within the tree."
short_help="Computes cell depths within the octree.">The
vtkHyperOctreeDepth filter adds a scalar to each leaf of
the octree that represents the leaf's depth within the
tree.</Documentation>
<InputProperty clean_command="RemoveAllInputs"
command="AddInputConnection"
name="Input">
<ProxyGroupDomain name="groups">
<Group name="sources" />
<Group name="filters" />
</ProxyGroupDomain>
<DataTypeDomain name="input_type">
<DataType value="vtkHyperOctree" />
</DataTypeDomain>
<Documentation>This property specifies the input to the Octree Depth
Scalars filter.</Documentation>
</InputProperty>
<!-- End OctreeDepthScalars-->
</SourceProxy>
<!-- ==================================================================== -->
<SourceProxy class="vtkHyperOctreeLimiter"
label="Octree Depth Limit"
name="OctreeDepthLimit">
<Documentation long_help="This filter takes in a octree and produces a new octree which is no deeper than the maximum specified depth level."
short_help="Reduce an octree's resolution.">The Octree
Depth Limit filter takes in an octree and produces a new
octree that is nowhere deeper than the maximum specified
depth level. The attribute data of pruned leaf cells are
integrated in to their ancestors at the cut
level.</Documentation>
<InputProperty clean_command="RemoveAllInputs"
command="AddInputConnection"
name="Input">
<ProxyGroupDomain name="groups">
<Group name="sources" />
<Group name="filters" />
</ProxyGroupDomain>
<DataTypeDomain name="input_type">
<DataType value="vtkHyperOctree" />
</DataTypeDomain>
<Documentation>This property specifies the input to the Octree Depth
Limit filter.</Documentation>
</InputProperty>
<IntVectorProperty command="SetMaximumLevel"
default_values="4"
name="MaximumLevel"
number_of_elements="1">
<IntRangeDomain max="255"
min="3"
name="range" />
<Documentation>The value of this property specifies the maximum depth
of the output octree.</Documentation>
</IntVectorProperty>
<!-- End OctreeDepthLimit-->
</SourceProxy>
<!-- ==================================================================== -->
<SourceProxy class="vtkProcessIdScalars"
label="Process Id Scalars"
multiprocess_support="multiple_processes"
......
......@@ -1012,100 +1012,6 @@
<!-- End Mandelbrot -->
</SourceProxy>
<!-- ==================================================================== -->
<SourceProxy class="vtkHyperOctreeFractalSource"
label="Octree Fractal"
name="OctreeFractal">
<Documentation long_help="Test source for octree with Mandelbrot fractal"
short_help="Octree Fractal">Create an octree from a
Mandelbrot fractal. See the Mandelbrot source for a
description of the variables used.</Documentation>
<IntVectorProperty command="SetDimension"
default_values="2"
name="Dimension"
number_of_elements="1">
<IntRangeDomain max="3"
min="1"
name="range" />
<Documentation>This property specifies the dimensionality of the
fractal: 1D - Binary tree line, 2D - Quadtree plane, 3D - Octree
volume.</Documentation>
</IntVectorProperty>
<IntVectorProperty command="SetMaximumLevel"
default_values="5"
name="MaximumLevel"
number_of_elements="1">
<IntRangeDomain max="11"
min="2"
name="range" />
<Documentation>This property specifies the maximum refinement level for
the grid.</Documentation>
</IntVectorProperty>
<IntVectorProperty command="SetMinimumLevel"
default_values="3"
name="MinimumLevel"
number_of_elements="1">
<IntRangeDomain max="10"
min="1"
name="range" />
<Documentation>This property specifies the minimum refinement level for
the grid.</Documentation>
</IntVectorProperty>
<IntVectorProperty command="SetProjectionAxes"
default_values="0 1 2"
name="ProjectionAxes"
number_of_elements="3">
<IntRangeDomain name="range" />
<Documentation>This property indicates which axes of the dataset to
display. See Mandelbrot source for a description of the possible
axes.</Documentation>
</IntVectorProperty>
<DoubleVectorProperty command="SetOriginCX"
default_values="-1.75 -1.25 0.0 0.0"
name="OriginCX"
number_of_elements="4">
<DoubleRangeDomain name="range" />
<Documentation>This property specifies the imaginary and real values
for C (constant) and X (initial value). See Mandelbrot source for a
description of the C and X variables.</Documentation>
</DoubleVectorProperty>
<DoubleVectorProperty command="SetSizeCX"
default_values="2.5 2.5 2.0 1.5"
name="SizeCX"
number_of_elements="4">
<DoubleRangeDomain name="range" />
<Documentation>The four values of this property indicate the length of
the output in each of the four dimensions (the real and imaginary
components of C and the real and imaginary components of X). The three
dimensions specified in the Projection Axes property will determine
which of these values specify the length of the axes in the
output.</Documentation>
</DoubleVectorProperty>
<IntVectorProperty animateable="1"
command="SetMaximumNumberOfIterations"
default_values="100"
label="Maximum Number of Iterations"
name="MaximumNumberOfIterations"
number_of_elements="1">
<IntRangeDomain max="5000"
min="1"
name="range" />
<Documentation>The value of this property specifies the limit on
computational iterations (i.e., the maximum number of iterations to
perform to determine if the value will go above 2). Values less than
2.0 after the specified number of iterations are considered in the
fractal set.</Documentation>
</IntVectorProperty>
<DoubleVectorProperty command="SetSpanThreshold"
default_values="2.0"
name="Threshold"
number_of_elements="1">
<DoubleRangeDomain name="range" />
<Documentation>This property specifies a threshold value that
determines when to subdivide a leaf node.</Documentation>
</DoubleVectorProperty>
<!-- End OctreeFractal -->
</SourceProxy>
<!-- ==================================================================== -->
<SourceProxy class="vtkPlaneSource"
label="Plane"
name="PlaneSource">
......
......@@ -135,36 +135,6 @@
<!-- End of XMLPolyDataWriter -->
</WriterProxy>
<!-- ================================================================= -->
<WriterProxy base_proxygroup="writers"
base_proxyname="XMLDataObjectWriterBase"
class="vtkFileSeriesWriter"
file_name_method="SetFileName"
name="XMLHyperOctreeWriter">
<Documentation short_help="Write unstructured grid in a xml-based vtk data file.">
Writer to write unstructured grid in a xml-based vtk data file. Cannot be
used for parallel writing.</Documentation>
<InputProperty command="SetInputConnection"
name="Input">
<DataTypeDomain composite_data_supported="0"
name="input_type">
<DataType value="vtkHyperOctree" />
</DataTypeDomain>
<Documentation>The input filter/source whose output dataset is to
written to the file.</Documentation>
</InputProperty>
<Hints>
<Property name="Input"
show="0" />
<Property name="FileName"
show="0" />
<Property name="HeaderType"
show="0" />
<WriterFactory extensions="vto"
file_description="VTK Octree Files" />
</Hints>
<!-- End of XMLHyperOctreeWriter -->
</WriterProxy>
<!-- ================================================================= -->
<WriterProxy base_proxygroup="writers"
base_proxyname="XMLDataObjectWriterBase"
class="vtkFileSeriesWriter"
......
......@@ -34,8 +34,6 @@
#include "vtkGeometryFilter.h"
#include "vtkHierarchicalBoxDataIterator.h"
#include "vtkHierarchicalBoxDataSet.h"
#include "vtkHyperOctree.h"
#include "vtkHyperOctreeSurfaceFilter.h"
#include "vtkHyperTreeGrid.h"
#include "vtkHyperTreeGridGeometry.h"
#include "vtkImageData.h"
......@@ -499,11 +497,6 @@ void vtkPVGeometryFilter::ExecuteBlock(vtkDataObject* input, vtkPolyData* output
this->PolyDataExecute(static_cast<vtkPolyData*>(input), output, doCommunicate);
return;
}
if (input->IsA("vtkHyperOctree"))
{
this->OctreeExecute(static_cast<vtkHyperOctree*>(input), output, doCommunicate);
return;
}
if (input->IsA("vtkHyperTreeGrid"))
{
this->HyperTreeGridExecute(static_cast<vtkHyperTreeGrid*>(input), output, doCommunicate);
......@@ -1619,30 +1612,6 @@ void vtkPVGeometryFilter::PolyDataExecute(
this->DataSetExecute(input, output, doCommunicate);
}
//----------------------------------------------------------------------------
void vtkPVGeometryFilter::OctreeExecute(vtkHyperOctree* input, vtkPolyData* out, int doCommunicate)
{
if (!this->UseOutline)
{
this->OutlineFlag = 0;
vtkHyperOctreeSurfaceFilter* internalFilter = vtkHyperOctreeSurfaceFilter::New();
internalFilter->SetPassThroughCellIds(this->PassThroughCellIds);
// internalFilter->SetPassThroughPointIds(this->PassThroughPointIds);
vtkHyperOctree* octreeCopy = vtkHyperOctree::New();
octreeCopy->ShallowCopy(input);
internalFilter->SetInputData(octreeCopy);
internalFilter->Update();
out->ShallowCopy(internalFilter->GetOutput());
octreeCopy->Delete();
internalFilter->Delete();
return;
}
this->OutlineFlag = 1;
this->DataSetExecute(input, out, doCommunicate);
}
//----------------------------------------------------------------------------
void vtkPVGeometryFilter::HyperTreeGridExecute(
vtkHyperTreeGrid* input, vtkPolyData* out, int doCommunicate)
......
......@@ -30,7 +30,6 @@ class vtkDataSet;
class vtkDataSetSurfaceFilter;
class vtkGenericDataSet;
class vtkGenericGeometryFilter;
class vtkHyperOctree;
class vtkHyperTreeGrid;
class vtkImageData;
class vtkUniformGrid;
......@@ -260,8 +259,6 @@ protected:
void PolyDataExecute(vtkPolyData* input, vtkPolyData* output, int doCommunicate);
void OctreeExecute(vtkHyperOctree* input, vtkPolyData* output, int doCommunicate);
void HyperTreeGridExecute(vtkHyperTreeGrid* input, vtkPolyData* output, int doCommunicate);
/**
......
Subproject commit 446144dad72d59b5c9f705606cffe70bf11b2ff2
Subproject commit 37d3d20d79bd67be9fe4af8ac58df916ce18688f
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