Commit 561cd504 authored by Spiros Tsalikis's avatar Spiros Tsalikis
Browse files

Remove deprecated Legacy Resample With Dataset and plyreader

parent e79db9a5
......@@ -114,7 +114,6 @@
<Proxy group="filters" name="PlotOnSortedLines" />
<Proxy group="filters" name="PointDataToCellData" />
<Proxy group="filters" name="PolyDataNormals" />
<Proxy group="filters" name="Probe" />
<Proxy group="filters" name="ProbeLine" />
<Proxy group="filters" name="ProbePoint" />
<Proxy group="filters" name="ProcessIdScalars" />
......
......@@ -114,7 +114,6 @@
<Proxy group="filters" name="PlotOnSortedLines" />
<Proxy group="filters" name="PointDataToCellData" />
<Proxy group="filters" name="PolyDataNormals" />
<Proxy group="filters" name="Probe" />
<Proxy group="filters" name="ProbeLine" />
<Proxy group="filters" name="ProbePoint" />
<Proxy group="filters" name="ProcessIdScalars" />
......
......@@ -482,175 +482,6 @@
</IntVectorProperty>
</SourceProxy>
<!-- ==================================================================== -->
<SourceProxy class="vtkPProbeFilter"
label="Legacy Resample With Dataset"
name="Probe">
<Documentation long_help="Sample data attributes at the points of a dataset."
short_help="Sample data values at the points of a dataset.">
Probe is a filter that computes point attributes at
specified point positions. The filter has two inputs: the
Input and Source. The 'Source' geometric structure is passed
through the filter. The point attributes are computed at
the 'Source' point positions by interpolating into the
'Input' data. For example, we can compute data values on a plane
(plane specified as Source) from a volume (Input). The
cell data of the Input data is copied to the output based
on in which Input cell each Source point is. If an array
of the same name exists both in Input's point and cell
data, only the one from the point data is
probed. This is the implementation of the
'Resample With Dataset' filter available in ParaView
version 5.1 and earlier. </Documentation>
<Deprecated deprecated_in="5.2" to_remove_in="5.3">
This has been replaced by 'Resample With Dataset'. Please consider
using that instead.
</Deprecated>
<InputProperty command="SetSourceConnection"
name="Input">
<ProxyGroupDomain name="groups">
<Group name="sources" />
<Group name="filters" />
</ProxyGroupDomain>
<DataTypeDomain name="input_type">
<DataType value="vtkDataSet" />
<DataType value="vtkCompositeDataSet" />
</DataTypeDomain>
<InputArrayDomain name="input_array" />
<Documentation>This property specifies the dataset from which to obtain
probe values. The data attributes come from this dataset.</Documentation>
</InputProperty>
<InputProperty command="SetInputConnection"
name="Source">
<ProxyGroupDomain name="groups">
<Group name="sources" />
<Group name="filters" />
</ProxyGroupDomain>
<DataTypeDomain name="input_type">
<DataType value="vtkDataSet" />
</DataTypeDomain>
<Documentation>This property specifies the dataset whose geometry will
be used in determining positions to probe. The mesh comes from this
dataset.</Documentation>
</InputProperty>
<IntVectorProperty command="SetPassCellArrays"
default_values="0"
name="PassCellArrays"
number_of_elements="1"
panel_visibility="advanced">
<Documentation>
When set the input's cell data arrays are shallow copied to the output.
</Documentation>
<BooleanDomain name="bool" />
</IntVectorProperty>
<IntVectorProperty command="SetPassPointArrays"
default_values="0"
name="PassPointArrays"
number_of_elements="1"
panel_visibility="advanced">
<Documentation>
When set the input's point data arrays are shallow copied to the output.
</Documentation>
<BooleanDomain name="bool" />
</IntVectorProperty>
<IntVectorProperty command="SetPassFieldArrays"
default_values="1"
name="PassFieldArrays"
number_of_elements="1"
panel_visibility="advanced">
<Documentation>
Set whether to pass the field-data arrays from the Input i.e. the input
providing the geometry to the output. On by default.
</Documentation>
<BooleanDomain name="bool" />
</IntVectorProperty>
<IntVectorProperty command="SetComputeTolerance"
default_values="1"
name="ComputeTolerance"
number_of_elements="1"
panel_visibility="advanced">
<Documentation>
Set whether to compute the tolerance or to use a user provided
value. On by default.
</Documentation>
<BooleanDomain name="bool" />
</IntVectorProperty>
<DoubleVectorProperty command="SetTolerance"
default_values="2.2204460492503131e-16"
name="Tolerance"
number_of_elements="1"
panel_visibility="advanced">
<DoubleRangeDomain min="2.2204460492503131e-16"
name="range" />
<Hints>
<PropertyWidgetDecorator type="ShowWidgetDecorator">
<Property name="ComputeTolerance" function="boolean_invert" />
</PropertyWidgetDecorator>
</Hints>
<Documentation>Set the tolerance to use for
vtkDataSet::FindCell</Documentation>
</DoubleVectorProperty>
<Hints>
<Visibility replace_input="1" />
</Hints>
<!-- End Probe -->
</SourceProxy>
<!-- ==================================================================== -->
<SourceProxy class="vtkPResampleFilter"
name="ImageResampling">
<Documentation long_help="Sample data attributes using a 3D image as probing mesh."
short_help="Sample data values using a 3D image."/>
<Deprecated deprecated_in="5.1" to_remove_in="5.2">Please use "Resample To Image" instead instead of "ImageResampling" filter.</Deprecated>
<InputProperty command="SetInputConnection" name="Input">
<ProxyGroupDomain name="groups">
<Group name="sources" />
<Group name="filters" />
</ProxyGroupDomain>
<DataTypeDomain name="input_type">
<DataType value="vtkDataSet" />
<DataType value="vtkCompositeDataSet" />
</DataTypeDomain>
<Documentation>This property specifies the dataset whose data will
be probed</Documentation>
</InputProperty>
<IntVectorProperty command="SetSamplingDimension"
default_values="10 10 10"
name="SamplingDimension"
number_of_elements="3"
panel_visibility="default">
<IntRangeDomain name="range" min="2 2 2" max="10000 10000 10000"/>
<Documentation>
How many linear resampling we want along each axis
</Documentation>
</IntVectorProperty>
<IntVectorProperty command="SetUseInputBounds"
default_values="1"
name="UseInputBounds"
number_of_elements="1"
panel_visibility="default">
<Documentation>
Do we use input bounds or custom ones?
</Documentation>
<BooleanDomain name="bool" />
</IntVectorProperty>
<DoubleVectorProperty command="SetCustomSamplingBounds"
default_values="0 1 0 1 0 1"
name="CustomSamplingBounds"
number_of_elements="6"
panel_visibility="default">
<Documentation>
Custom probing bounds if needed
</Documentation>
</DoubleVectorProperty>
<!-- End ImageResampling -->
</SourceProxy>
<!-- ==================================================================== -->
<SourceProxy class="vtkAggregateDataSetFilter"
label="Aggregate Dataset"
......
......@@ -96,17 +96,6 @@
<!-- End PLYReader -->
</SourceProxy>
<!-- ================================================================== -->
<SourceProxy class="vtkPLYReader"
name="plyreader"
base_proxygroup="internal_sources"
base_proxyname="PLYReaderCore">
<Deprecated deprecated_in="5.3" to_remove_in="5.4">
This has been replaced by "PLYReader" which also supports a series of PLY files.
</Deprecated>
<!-- End plyreader -->
</SourceProxy>
<!-- ================================================================== -->
<!-- end of "sources" -->
</ProxyGroup>
......
......@@ -2,46 +2,13 @@ from paraview.simple import *
import paraview
sourceDs = Wavelet()
inputDs = Sphere()
# Test 'Resample With Dataset` proxies
p1 = ResampleWithDataset(SourceDataArrays=inputDs, DestinationMesh=sourceDs)
print("Proxy Name before: %s" % p1.GetXMLName())
assert p1.GetXMLName() == "ResampleWithDataset", "The default proxy name must be ResampleWithDataset"
print("")
print("Setting compatibility version to 5.0...")
paraview.compatibility.major = 5
paraview.compatibility.minor = 0
p2 = paraview.simple.ResampleWithDataset(Input=inputDs, Source=sourceDs)
print("Proxy Name for compatibility version 5.0: %s" % p2.GetXMLName())
assert p2.GetXMLName() == "Probe", "The default proxy name must be Probe"
renderView1 = GetActiveViewOrCreate('RenderView')
sphere1Display = Show(sourceDs, renderView1)
# change representation type
sphere1Display.SetRepresentationType('Point Gaussian')
# Properties modified on sphere1Display
sphere1Display.ShaderPreset = 'Gaussian Blur (Default)'
# reset view to fit data
renderView1.ResetCamera()
# update the view to ensure updated data information
renderView1.Update()
print("")
print("Testing Plot Over Line Legacy")
ResetSession()
paraview.compatibility.major = 5
paraview.compatibility.minor = 9
# Create plot over line proxy
p3 = PlotOverLine(Input=sourceDs)
......
......@@ -866,14 +866,6 @@ def getattr(proxy, pname):
# label and not its name.
def GetProxy(module, key, **kwargs):
version = paraview.compatibility.GetVersion()
if version < 5.2:
if key == "ResampleWithDataset":
return builtins.getattr(module, "LegacyResampleWithDataset")(**kwargs)
if version < 5.3:
if key == "PLYReader":
# note the case. The old reader didn't support `FileNames` property,
# only `FileName`.
return builtins.getattr(module, "plyreader")(**kwargs)
if version < 5.5:
if key == "Clip":
# in PV 5.5 we changed the default for Clip's InsideOut property to 1 instead of 0
......
Supports Markdown
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