Commit a80fbc54 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

remove vtkSMFieldDataDomain from string-vector-properties

vtkSMFieldDataDomain was used on vtkSMStringVectorProperty instances
that allowed user to select array to process. There is really no need
for it nor is it correct, since vtkSMFieldDataDomain is a subclass of
vtkSMEnumerationDomain and hence intended for vtkSMIntVectorProperty
instances!

Getting rid of this old misuse of the domain.
parent a160a287
......@@ -21,12 +21,6 @@
name="DummyInput" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="DummyInput" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property contains the name of
the array to use as flow velocity.</Documentation>
</StringVectorProperty>
......@@ -46,12 +40,6 @@
name="DummyInput" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="DummyInput" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property contains the name of
the array to use as flow density.</Documentation>
</StringVectorProperty>
......@@ -70,12 +58,6 @@
name="DummyInput" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="DummyInput" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property contains the name of
the array to use as flow dynamic viscosity.</Documentation>
</StringVectorProperty>
......@@ -94,12 +76,6 @@
name="DummySource" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="DummySource" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property contains the name of
the array to use from seeds as particle diameter.</Documentation>
</StringVectorProperty>
......@@ -118,12 +94,6 @@
name="DummySource" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="DummySource" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property contains the name of
the array to use from seeds as particle density.</Documentation>
</StringVectorProperty>
......
......@@ -28,7 +28,7 @@ This is a line by line explanation for LagrangianIntegrationModelExample.xml
// index : a user index in order to identify the array, define it in default values, start at 1, index 0 is reserved.
// port : the port number , define it in default values
// connection : the connection in the port, define it in default values but should not be needed in tracker context
// fieldAssociaction : point data or cell data, defined in FieldDataDomain
// fieldAssociaction : point data or cell data, defined in InputArrayDomain
// arrayName : actual array name, passed be paraview.
default_values_delimiter=";" // Only when using default values for multiples args, ie more than just the index
default_values="2;1;0;0:ParticleDiameter" // Default values, here it is port 1 with index 2, connection 0, type is PointData
......@@ -51,12 +51,6 @@ This is a line by line explanation for LagrangianIntegrationModelExample.xml
// the surfaces are called DummySurface
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list"> // Needed if one want to be able to recover the field association, recommended.
<RequiredProperties> // Should be the same as above RequiredProperties
<Property function="Input"
name="DummyInput" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property contains the name of // Documentation for the property
the array to use as flow velocity.</Documentation>
</StringVectorProperty>
......
......@@ -194,11 +194,6 @@
<Property function="Input" name="Input" />
</RequiredProperties>
</RepresentedArrayListDomain>
<FieldDataDomain name="field_list" disable_update_domain_entries="1">
<RequiredProperties>
<Property function="Input" name="Input" />
</RequiredProperties>
</FieldDataDomain>
</StringVectorProperty>
<ProxyProperty command="SetLookupTable" name="LookupTable">
<Documentation>Set the lookup-table to use to map data array to colors.
......
......@@ -303,11 +303,6 @@
<Property function="Input" name="DummyInput" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input" name="DummyInput" />
</RequiredProperties>
</FieldDataDomain>
<Hints>
<PropertyWidgetDecorator type="GenericDecorator"
mode="visibility"
......
......@@ -35,12 +35,6 @@
name="Input" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="Input" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property indicates the name of the array from which
to compute the histogram.</Documentation>
</StringVectorProperty>
......@@ -157,12 +151,6 @@
name="Input" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="Input" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property indicates the name of the array from which
to compute the X coordinates of the density map.</Documentation>
</StringVectorProperty>
......@@ -181,12 +169,6 @@
name="Input" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="Input" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property indicates the name of the array from which
to compute the Y coordinates of the density map.</Documentation>
</StringVectorProperty>
......
......@@ -184,12 +184,6 @@ annotation text.
name="Input" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="Input" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property indicates the name of the array from which
to compute the histogram.</Documentation>
</StringVectorProperty>
......
......@@ -4433,13 +4433,6 @@
<Property function="Input" name="Input" />
</RequiredProperties>
</RepresentedArrayListDomain>
<FieldDataDomain name="field_list"
disable_update_domain_entries="1"
force_point_cell_data="1">
<RequiredProperties>
<Property function="Input" name="Input" />
</RequiredProperties>
</FieldDataDomain>
</StringVectorProperty>
<DoubleVectorProperty command="SetPosition"
default_values="0 0 0"
......@@ -4679,13 +4672,6 @@
<Property function="Input" name="Input" />
</RequiredProperties>
</RepresentedArrayListDomain>
<FieldDataDomain name="field_list"
disable_update_domain_entries="1"
force_point_cell_data="1">
<RequiredProperties>
<Property function="Input" name="Input" />
</RequiredProperties>
</FieldDataDomain>
</StringVectorProperty>
<IntVectorProperty command="SetMapScalars"
default_values="1"
......@@ -5149,13 +5135,6 @@
<Property function="Input" name="Input" />
</RequiredProperties>
</RepresentedArrayListDomain>
<FieldDataDomain name="field_list"
disable_update_domain_entries="1"
force_point_cell_data="1">
<RequiredProperties>
<Property function="Input" name="Input" />
</RequiredProperties>
</FieldDataDomain>
</StringVectorProperty>
<IntVectorProperty command="SetExtractedBlockIndex"
default_values="0"
......@@ -5382,13 +5361,6 @@
<Property function="Input" name="Input" />
</RequiredProperties>
</RepresentedArrayListDomain>
<FieldDataDomain name="field_list"
disable_update_domain_entries="1"
force_point_cell_data="1">
<RequiredProperties>
<Property function="Input" name="Input" />
</RequiredProperties>
</FieldDataDomain>
</StringVectorProperty>
<IntVectorProperty command="SetSlice"
default_values="0"
......@@ -6601,12 +6573,6 @@
<Property function="Input" name="Input" />
</RequiredProperties>
</RepresentedArrayListDomain>
<FieldDataDomain name="field_list"
disable_update_domain_entries="1">
<RequiredProperties>
<Property function="Input" name="Input" />
</RequiredProperties>
</FieldDataDomain>
</StringVectorProperty>
<ProxyProperty command="SetLookupTable"
name="LookupTable" >
......@@ -6981,12 +6947,6 @@
name="Input" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="Input" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property indicates the name of the array from which
to compute the histogram.</Documentation>
</StringVectorProperty>
......@@ -10722,13 +10682,6 @@
<Property function="Input" name="Input" />
</RequiredProperties>
</RepresentedArrayListDomain>
<FieldDataDomain name="field_list"
disable_update_domain_entries="1"
force_point_cell_data="1">
<RequiredProperties>
<Property function="Input" name="Input" />
</RequiredProperties>
</FieldDataDomain>
</StringVectorProperty>
<DoubleVectorProperty command="SetPosition"
default_values="0 0 0"
......@@ -10942,12 +10895,6 @@
<Property function="Input" name="Input" />
</RequiredProperties>
</RepresentedArrayListDomain>
<FieldDataDomain name="field_list"
disable_update_domain_entries="1">
<RequiredProperties>
<Property function="Input" name="Input" />
</RequiredProperties>
</FieldDataDomain>
</StringVectorProperty>
<StringVectorProperty command="SetRepresentation"
default_values="Surface"
......
......@@ -35,12 +35,6 @@
name="Input" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="Input" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property specifies the name of the scalar array
from which the contour filter will compute isolines and/or
isosurfaces.</Documentation>
......@@ -161,12 +155,6 @@
name="Input" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="Input" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property specifies the name of the scalar array
from which the contour filter will compute isolines and/or
isosurfaces.</Documentation>
......
......@@ -40,12 +40,6 @@
name="Input" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="Input" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>
The value of this property contains the name of the scalar array that
contains material labels.
......@@ -114,12 +108,6 @@
name="Input" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="Input" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>
The value of this property contains the name of the scalar array that
contains material labels.
......
......@@ -22,11 +22,6 @@
<Property name="Input" function="Input"/>
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property name="Input" function="Input"/>
</RequiredProperties>
</FieldDataDomain>
<Documentation>
Select the data used to compute bump mapping.
Only scalar point data arrays are accepted.
......@@ -67,11 +62,6 @@
<Property name="Input" function="Input"/>
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property name="Input" function="Input"/>
</RequiredProperties>
</FieldDataDomain>
<Documentation>
Select a cell data array in order to extrude cells.
Select a point data array in order to generate a height field.
......
......@@ -103,12 +103,6 @@
name="Input" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="Input" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>
Select the input array to be treated as defining seeds.
A point having a non-zero value will be considered as being a seed.
......@@ -127,11 +121,6 @@
<Property function="Input" name="Input" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input" name="Input" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>Select the input array to be treated as the Metric
Tensor.It can only be an isometric tensor, and the selected field should
contain the length of the metric tensor at each polydata point.
......
......@@ -211,12 +211,6 @@
name="DummySource" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="DummySource" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property contains the name of the vector array from
the seeds to use as initial particle velocity.</Documentation>
</StringVectorProperty>
......@@ -248,12 +242,6 @@
name="DummySource" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="DummySource" />
</RequiredProperties>
</FieldDataDomain>
<Hints>
<PropertyWidgetDecorator type="ShowWidgetDecorator">
<Property name="UseInitialIntegrationTime" function="boolean" />
......@@ -345,12 +333,6 @@
name="DummyInput" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="DummyInput" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property contains the name of
the array to use as flow velocity.</Documentation>
</StringVectorProperty>
......@@ -370,12 +352,6 @@
name="DummyInput" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="DummyInput" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property contains the name of
the array to use as flow density.</Documentation>
</StringVectorProperty>
......@@ -394,12 +370,6 @@
name="DummyInput" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="DummyInput" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property contains the name of
the array to use as flow dynamic viscosity.</Documentation>
</StringVectorProperty>
......@@ -418,12 +388,6 @@
name="DummySource" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="DummySource" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property contains the name of
the array to use from seeds as particle diameter.</Documentation>
</StringVectorProperty>
......@@ -442,12 +406,6 @@
name="DummySource" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="DummySource" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property contains the name of
the array to use from seedsas particle density.</Documentation>
</StringVectorProperty>
......
......@@ -41,11 +41,6 @@
<Property name="Input" function="Input" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property name="Input" function="Input" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>
The name of the scalar array that represents flux through a 2D
element or circulation along a 1D element. This array will be
......@@ -106,11 +101,6 @@
<Property name="Input" function="Input" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property name="Input" function="Input" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>
The name of the scalar or vector array that represents flux
through a 2D element or circulation along a 1D element. If
......
......@@ -34,13 +34,6 @@
<Property name="Input" function="Input"/>
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list"
disable_update_domain_entries="1">
<RequiredProperties>
<Property name="Input" function="Input"/>
</RequiredProperties>
</FieldDataDomain>
<Documentation>
This property specifies the name of the input vector array to process.
</Documentation>
......@@ -70,13 +63,6 @@
<Property function="Input" name="Input" />
</RequiredProperties>
</RepresentedArrayListDomain>
<FieldDataDomain name="field_list"
disable_update_domain_entries="1"
force_point_cell_data="1">
<RequiredProperties>
<Property function="Input" name="Input" />
</RequiredProperties>
</FieldDataDomain>
</StringVectorProperty>
<IntVectorProperty name="Visibility"
......
......@@ -76,13 +76,6 @@
<Property function="Input" name="Input" />
</RequiredProperties>
</RepresentedArrayListDomain>
<FieldDataDomain name="field_list"
disable_update_domain_entries="1"
force_point_cell_data="1">
<RequiredProperties>
<Property function="Input" name="Input" />
</RequiredProperties>
</FieldDataDomain>
</StringVectorProperty>
<ProxyProperty command="SetLookupTable"
name="LookupTable" >
......
......@@ -28,14 +28,6 @@
<Property name="Input" function="Input"/>
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list"
disable_update_domain_entries="1">
<RequiredProperties>
<Property name="Input" function="Input"/>
</RequiredProperties>
</FieldDataDomain>
<Documentation>
This property specifies the name of the input vector array to process.
</Documentation>
......
......@@ -41,12 +41,6 @@
name="Input" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="Input" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property specifies the name of the scalar array
from which the contour filter will compute isolines and/or
isosurfaces.</Documentation>
......@@ -134,12 +128,6 @@
name="Input" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="Input" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>The value of this property contains the name of the
scalar array from which to perform thresholding.</Documentation>
</StringVectorProperty>
......@@ -203,12 +191,6 @@
name="Input" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="Input" />
</RequiredProperties>
</FieldDataDomain>
<Documentation>This property lists the name of the scalar array from
which to compute the gradient.</Documentation>
</StringVectorProperty>
......@@ -450,12 +432,6 @@
name="Input" />
</RequiredProperties>
</ArrayListDomain>
<FieldDataDomain name="field_list">
<RequiredProperties>
<Property function="Input"
name="Input" />
</RequiredProperties>
</FieldDataDomain>
</StringVectorProperty>
<DoubleVectorProperty command="SetClipValue"
default_values="0.0"
......
......@@ -38,7 +38,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "vtkSMDomain.h"
#include "vtkSMDomainIterator.h"
#include "vtkSMEnumerationDomain.h"
#include "vtkSMFieldDataDomain.h"
#include "vtkSMFileListDomain.h"
#include "vtkSMProperty.h"
#include "vtkSMPropertyHelper.h"
......@@ -127,7 +126,6 @@ pqStringVectorPropertyWidget::pqStringVectorPropertyWidget(
vtkSMEnumerationDomain* enumerationDomain = 0;
vtkSMFileListDomain* fileListDomain = 0;
vtkSMArrayListDomain* arrayListDomain = 0;
vtkSMFieldDataDomain* fieldDataDomain = 0;
vtkSMStringListDomain* stringListDomain = 0;
vtkSMSILDomain* silDomain = 0;
vtkSMArraySelectionDomain* arraySelectionDomain = 0;
......@@ -148,8 +146,6 @@ pqStringVectorPropertyWidget::pqStringVectorPropertyWidget(
arraySelectionDomain ? arraySelectionDomain : vtkSMArraySelectionDomain::SafeDownCast(domain);
stringListDomain =
stringListDomain ? stringListDomain : vtkSMStringListDomain::SafeDownCast(domain);
fieldDataDomain =
fieldDataDomain ? fieldDataDomain : vtkSMFieldDataDomain::SafeDownCast(domain);
}
domainIter->Delete();
......
4b2e33467dd77f279b68a96cc404b2ec6c4a9c4d979c43e475be9f9ad4d5e51c49ea931e34795f7d65df4094bc94ceab366e5600915626ccb38971b4a1465830
65edf590ccfb762075df51759e9807813fbb14030b027e03a73cf6d3d1165623f691229efef904edbe7120cfc0061de659a165f938729bf3fd2db346f59f3a94
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