Commit cabb78f2 authored by Amy Squillacote's avatar Amy Squillacote
Browse files

using SM properties for vtkPVVectorEntry and vtkPVScaleFactorEntry

parent e8082fb8
......@@ -28,7 +28,7 @@ The Balance filter is available when ParaView is run in parallel. It does load-b
help="Redistribute polydata to a subset of processes."
input_name="Input"/>
<VectorEntry label="Number of Processes" trace_name="NumberOfProcesses"
variable="NumberOfProcesses"
property="NumberOfProcesses"
type="int"
default_value="1"/>
<Documentation>
......@@ -375,7 +375,7 @@ The D3 filter is available when ParaView is run in parallel. It operates on any
<!-- keeping vector entries with length > 1 -->
<VectorEntry label="Scalar range"
trace_name="ScalarRange"
variable="ScalarRange"
property="ScalarRange"
type="float" length="2"
default_value="0.0 1.0"
help="Set the range of scalar values to generate" />
......@@ -730,12 +730,13 @@ The Group Parts filter causes different data sets to be grouped into a collectio
<!-- ScaleFactor value chosen does not change processing speed of this filter or cause it to crash. -->
<VectorEntry label="Scale factor"
trace_name="ScaleFactor"
variable="ScaleFactor" type="float"
property="ScaleFactor" type="float"
help="Set the extrusion scale factor"
default_value="1.0"/>
<!-- keeping vector entries with length > 1 -->
<VectorEntry variable="Vector"
<VectorEntry label="Vector"
trace_name="Vector"
property="Vector"
type="float" length="3"
help="Set the direction for the extrusion"
default_value="0.0 0.0 1.0"/>
......@@ -849,7 +850,7 @@ The Input menu allows the user to select the data set to which this filter will
<!-- keeping vector entries with length > 1 -->
<VectorEntry label="Kernel Size"
trace_name="KernelSize"
variable="KernelSize" type="int"
property="KernelSize" type="int"
length="3"
help="Determines the smoothing neighborhood."
default_value="1 1 1"/>
......@@ -1075,7 +1076,7 @@ The Point Data to Cell Data filter averages the values of the point attributes o
<!-- keeping vector entries with length > 1 -->
<VectorEntry label="Divisions"
trace_name="NumberOfDivisions"
variable="NumberOfDivisions"
property="NumberOfDivisions"
type="int"
length="3"
help="Set the number of bins in each dimension"
......@@ -1179,7 +1180,7 @@ The Random Vectors filter generates a point-centered array of random vectors. It
<!-- reasonable value dependent on bounds of the data -->
<VectorEntry label="Center"
trace_name="Center"
variable="Center"
property="Center"
type="float"
help="The center of the mirror plane."
default_value="0.0"/>
......@@ -1222,7 +1223,8 @@ The Reflection filter reflects the input data set across the specified plane. If
input_menu="im"
number_of_components="1"
help="Select the input scalars to process."/>
<ScaleFactorEntry variable="Width"
<ScaleFactorEntry label="Width"
property="Width"
input_menu="im"
trace_name="Width"
type="float"
......@@ -1245,7 +1247,7 @@ The Reflection filter reflects the input data set across the specified plane. If
<!-- keeping vector entries with length > 1 -->
<VectorEntry label="Default normal"
trace_name="DefaultNormal"
variable="DefaultNormal"
property="DefaultNormal"
type="float"
length="3"
help="Specify the normal to use if Use default normal is on."
......@@ -1282,21 +1284,23 @@ The Width entry box specifies half the width of the ribbons. If Vary width is on
default_value="12"/>
<LabeledToggle variable="Capping"
trace_name="Capping" default_value="1"/>
<VectorEntry variable="Angle"
<VectorEntry label="Angle"
trace_name="Angle"
property="Angle"
help="Set the angle of rotation."
type="float"
default_value="360.0"/>
<!-- Translation value chosen does not change processing speed of this filter or cause it to crash. -->
<VectorEntry variable="Translation"
<VectorEntry label="Translation"
trace_name="Translation"
property="Translation"
type="float"
help="The total amount of translation along the z-axis."
default_value="0.0"/>
<!-- DeltaRadius value chosen does not change processing speed of this filter or cause it to crash. -->
<VectorEntry label="Delta radius"
trace_name="DeltaRadius"
variable="DeltaRadius"
property="DeltaRadius"
type="float"
help="The change in radius during sweep process."
default_value="0.0"/>
......@@ -1349,7 +1353,7 @@ The Shrink filter causes the individual cells of a data set to break apart from
input_name="Input"/>
<VectorEntry label="Shrink factor"
trace_name="ShrinkFactor"
variable="ShrinkFactor"
property="ShrinkFactor"
type="float"
help="Set the amount to shrink by"
default_value="0.5"/>
......@@ -1459,7 +1463,7 @@ The Subdivide filter iteratively divides each triangle in the data set into 4 ne
range="1 3"/>
<VectorEntry label="Max Chord Error"
trace_name="ChordError"
variable="ChordError" type="float"
property="ChordError" type="float"
help="The maximum chord error allowed at any edge midpoint in the output tessellation."
default_value="0.0001" data_range=".0000000001 1"
/>
......@@ -1472,7 +1476,7 @@ The Subdivide filter iteratively divides each triangle in the data set into 4 ne
/>
<VectorEntry label="Max Num Of Subdivisions"
trace_name="MaximumNumberOfSubdivisions"
variable="MaximumNumberOfSubdivisions" type="int"
property="MaximumNumberOfSubdivisions" type="int"
default_value="1" data_range="0 8"/>
<Documentation>
The Tessellate filter tessellates cells with nonlinear geometry and/or scalar fields into a simplicial complex with linearly interpolated field values that more closely approximate the original field. This is useful for the quadratic cells supported by VTK. There are several settings that affect the tessellation.
......@@ -1573,7 +1577,8 @@ The Transform filter allows you to specify the position, size, and orientation o
trace_name="Capping"
help="Select whether to draw endcaps on the tube"
default_value="0"/>
<ScaleFactorEntry variable="Radius"
<ScaleFactorEntry label="Radius"
property="Radius"
input_menu="im"
trace_name="Radius"
type="float"
......@@ -1594,7 +1599,7 @@ The Transform filter allows you to specify the position, size, and orientation o
<!-- RadiusFactor value chosen does not change processing speed of this filter or cause it to crash. -->
<VectorEntry label="Radius factor"
trace_name="RadiusFactor"
variable="RadiusFactor"
property="RadiusFactor"
type="float"
help="Set the maximum tube radius in terms of a multiple of the minimum radius"
default_value="10"/>
......@@ -1627,13 +1632,14 @@ The Tube filter creates tubes around the lines in the input polygonal data set.
help="Select the input scalars to process."/>
<!-- ScaleFactor value chosen does not change processing speed of this filter or cause it to crash. -->
<VectorEntry label="Scale factor"
variable="ScaleFactor"
property="ScaleFactor"
trace_name="ScaleFactor"
type="float"
help="Displacement is vector times scale."
default_value="1.0"/>
<!-- keeping vector entries with length > 1 -->
<VectorEntry variable="Normal"
<VectorEntry label="Normal"
property="Normal"
trace_name="Normal"
type="float"
length="3"
......@@ -1684,7 +1690,7 @@ This filter operates on polygonal, curvilinear, and unstructured grid data sets
<!-- ScaleFactor value chosen does not change processing speed of this filter or cause it to crash. -->
<VectorEntry label="Scale factor"
trace_name="ScaleFactor"
variable="ScaleFactor"
property="ScaleFactor"
type="float"
help="Displacement is vector times scale."
default_value="1.0"/>
......@@ -1815,7 +1821,7 @@ The Cut filter takes any type of data set as input. Use the Input menu to choose
<VectorEntry label="Clip value"
trace_name="Offset"
type="float"
variable="Value"
property="Value"
help="Choose the scalar value to clip with"/>
</Item>
</ContainerWidget>
......@@ -2114,6 +2120,7 @@ The Probe filter operates on any type of data and produces polygonal output (a p
value="Output">
<PointSourceWidget trace_name="Point"
radius_scale_factor=".1"
radius_property="Radius"
input_menu="im"
default_number_of_points="100"
show_entries="1"/>
......@@ -2139,7 +2146,7 @@ The Probe filter operates on any type of data and produces polygonal output (a p
</Item>
<Item>
<ScaleFactorEntry label=""
variable="MaximumPropagation"
property="MaximumPropagation"
type="float"
trace_name="MaxPropLen"
scale_factor="1.0"
......@@ -2165,7 +2172,7 @@ The Probe filter operates on any type of data and produces polygonal output (a p
</Item>
<Item>
<VectorEntry label=""
variable="InitialIntegrationStep"
property="InitialIntegrationStep"
type="float"
trace_name="InitLen"
help="Initial step length"
......@@ -2214,7 +2221,7 @@ The Probe filter operates on any type of data and produces polygonal output (a p
</Item>
<Item>
<VectorEntry label=""
variable="MinimumIntegrationStep"
property="MinimumIntegrationStep"
type="float"
trace_name="MinLen"
help="Minimum step length used in the integation"
......@@ -2241,7 +2248,7 @@ The Probe filter operates on any type of data and produces polygonal output (a p
</Item>
<Item>
<VectorEntry label=""
variable="MaximumIntegrationStep"
property="MaximumIntegrationStep"
type="float"
trace_name="MaxLen"
help="Maximum step length used in the integration"
......@@ -2252,7 +2259,7 @@ The Probe filter operates on any type of data and produces polygonal output (a p
<Item>
<VectorEntry label="Maximum Error"
trace_name="MaximumError"
variable="MaximumError"
property="MaximumError"
type="float"
help="Maximum error allowed in the integration"
default_value="0.000001"/>
......@@ -2262,13 +2269,13 @@ The Probe filter operates on any type of data and produces polygonal output (a p
</SelectWidget>
<VectorEntry label="Max. Steps"
trace_name="MaximumNumberOfSteps"
variable="MaximumNumberOfSteps"
property="MaximumNumberOfSteps"
type="int"
help="Maximum number of steps."
default_value="2000"/>
<VectorEntry label="Term. Speed"
trace_name="TerminalSpeed"
variable="TerminalSpeed"
property="TerminalSpeed"
type="float"
help="Terminal speed. The integration will be stopped if the speed (absolute value) is smaller than this threshold"
default_value="0.000000000001"/>
......
......@@ -173,8 +173,8 @@
extensions=".h5"
file_description="HDF5 Raw ImageData Files">
<Source class="vtkHDF5RawImageReader"/>
<VectorEntry length="3"
variable="Stride" trace_name="Stride" type="int"
<VectorEntry length="3" label="Stride"
property="Stride" trace_name="Stride" type="int"
help="Read a subset of data spaced by the stride."
default_value="1 1 1"/>
<ArraySelection attribute_name="Point"
......@@ -207,7 +207,7 @@
extensions=".xyz"
file_description="XMol Molecule Files">
<Source class="vtkXYZMolReader"/>
<VectorEntry variable="TimeStep"
<VectorEntry property="TimeStep" label="TimeStep"
trace_name="TimeStep" type="int"
help="Set the TimeStep"
default_value="0"/>
......@@ -285,11 +285,11 @@
extensions=".cube"
file_description="Gaussian Cube Files">
<Source class="vtkGaussianCubeReader"/>
<VectorEntry variable="HBScale"
<VectorEntry property="HBScale" label="HBScale"
trace_name="HBScale" type="float"
help="Set the HB scale"
default_value="1.0"/>
<VectorEntry variable="BScale"
<VectorEntry property="BScale" label="BScale"
trace_name="BScale" type="float"
help="Set the B scale"
default_value="1.0"/>
......@@ -301,19 +301,19 @@
extensions=".pop"
file_description="POP Ocean Files">
<Source class="vtkPOPReader"/>
<VectorEntry variable="Radius"
<VectorEntry property="Radius" label="Radius"
trace_name="Radius" type="float"
help="Set the radius of the data set"
default_value="60000"/>
<VectorEntry label="Clip Extent"
variable="ClipExtent" type="int"
property="ClipExtent" type="int"
length="6"
trace_name="ClipExtent"
help="For reading a smaller extent."
default_value="-2147483647 2147483647 -2147483647 2147483647 -2147483647 2147483647"/>
<VectorEntry label="Ghost Levels"
trace_name="NumberOfGhostLevels"
variable="NumberOfGhostLevels"
property="NumberOfGhostLevels"
type="int"
help="Set the number of ghost levels to read."
default_value="1"/>
......@@ -383,23 +383,23 @@
value="3"/>
</SelectionList>
<VectorEntry label="Origin"
trace_name="Origin" variable="DataOrigin"
trace_name="Origin" property="DataOrigin"
type="float" length="3"
help="Set the position of the point with index (0,0,0)"
default_value="0.0 0.0 0.0"/>
<VectorEntry label="Spacing"
trace_name="Spacing" variable="DataSpacing"
trace_name="Spacing" property="DataSpacing"
type="float" length="3"
help="Set the size of a voxel in each dimension."
default_value="1.0 1.0 1.0"/>
<VectorEntry label="Extent"
trace_name="Extent" variable="DataExtent"
trace_name="Extent" property="DataExtent"
type="int" length="6"
help="Set the min and max values of the data in each dimension"
default_value="0 0 0 0 0 0"/>
<VectorEntry label="Num. components"
trace_name="NumberOfScalarComponents"
variable="NumberOfScalarComponents" type="int"
property="NumberOfScalarComponents" type="int"
help="How many componenets does each pixel have. (i.e. RGB would be 3.)"
default_value="1"/>
<StringEntry label="Array name"
......@@ -422,7 +422,7 @@
<ArraySelection trace_name="cell_array_sel"
attribute_name="Point" />
<VectorEntry label="Stride"
trace_name="stride" variable="Stride" type="int"
trace_name="stride" property="Stride" type="int"
length="3"
default_value="1 1 1"
help="Set the number of steps to skip between each point (structured data only)."/>
......@@ -450,7 +450,7 @@
help="Pattern used to load files. There are two parts to it prefix (%s) and the file number (%i)" />
<VectorEntry variable="FileRange"
<VectorEntry property="FileRange"
label="Range of files" type="int"
trace_name="file_range"
length="2"
......@@ -500,7 +500,7 @@
help="Select whether the reader automatically applies displacements" default_value="1"/>
<VectorEntry label="Displacement Scale"
trace_name="DisplacementMagnitude"
variable="DisplacementMagnitude"
property="DisplacementMagnitude"
type="float"
help="The magnitude of the applied displacement."
default_value="1.0"/>
......
......@@ -37,14 +37,14 @@ The output of the 2D Glyph source is polygonal data.
<Source class="vtkCTHFractal"/>
<!-- should use widget that keeps values non-negative -->
<VectorEntry label="Dimension" trace_name="Dimension"
variable="Dimensions" type="int" default_value="10"
property="Dimensions" type="int" default_value="10"
help="XYZ cell dimensions of a block"/>
<VectorEntry label="FractalValue" trace_name="FractalValue"
variable="FractalValue" type="float" default_value="9.5"
property="FractalValue" type="float" default_value="9.5"
help="Map this value to 0.5 for use as a volume fraction."/>
<!-- should use widget that keeps value non-negative -->
<VectorEntry label="MaximumLevel" trace_name="MaximumLevel"
variable="MaximumLevel" type="int" default_value="6"
property="MaximumLevel" type="int" default_value="6"
help="Determines how deep to refine the grid."/>
<LabeledToggle variable="GhostLevels" trace_name="GhostLevels"
default_value="0"
......@@ -134,11 +134,11 @@ The output of the Arrow source is polygonal data. This polygonal data will not c
long_help="Three lines representing the axes - red line along X, green line along Y, and blue line along Z."
short_help="Create three lines representing X, Y and Z axes">
<Source class="vtkAxes"/>
<VectorEntry label="Scale" trace_name="ScaleFactor" variable="ScaleFactor"
<VectorEntry label="Scale" trace_name="ScaleFactor" property="ScaleFactor"
type="float" default_value="1.0"
help="Set the size of the axes"/>
<VectorEntry variable="Origin" trace_name="Origin" type="float"
length="3" default_value="0.0 0.0 0.0"
<VectorEntry label="Origin" property="Origin" trace_name="Origin"
type="float" length="3" default_value="0.0 0.0 0.0"
help="Set the x, y, z coordinates of the origin of the axes" />
<LabeledToggle variable="Symmetric" trace_name="Symmetric"
default_value="0"
......@@ -166,7 +166,7 @@ The output of the Axes source is polygonal data. This polygonal data has a scala
<ThumbWheel label="Z length" trace_name="ZLength" variable="ZLength"
resolution="0.01" minimum_value="0" default_value="1"
help="The length of the cube in the z direction." />
<VectorEntry variable="Center" trace_name="Center" length="3"
<VectorEntry label="Center" property="Center" trace_name="Center" length="3"
type="float" default_value="0.0 0.0 0.0"
help="Set the center of the cube." />
<Documentation>
......@@ -221,8 +221,8 @@ The output of the Cone source is polygonal data.
<ThumbWheel variable="Radius" trace_name="Radius"
resolution="0.01" minimum_value="0" default_value="0.5"
help="The radius of the cylinder." />
<VectorEntry variable="Center" trace_name="Center" type="float" length="3"
default_value="0.0 0.0 0.0"
<VectorEntry label="Center" property="Center" trace_name="Center"
type="float" length="3" default_value="0.0 0.0 0.0"
help="Set the center of the cylinder." />
<LabeledToggle variable="Capping" trace_name="Capping" default_value="1"
help="Set whether to draw the ends of the cylinder" />
......@@ -264,17 +264,17 @@ The output of the Line source is polygonal data.
long_help="Representation (unsigned char ) of the Mandlebrot set in up to 3 dimensions."
short_help="Create a Mandelbrot representation">
<Source class="vtkImageMandelbrotSource"/>
<VectorEntry label="Extent" trace_name="Extent" variable="WholeExtent"
<VectorEntry label="Extent" trace_name="Extent" property="WholeExtent"
type="int" length="6" default_value="0 250 0 250 0 0"
help="Set the min and max values of the data in each dimension" />
<VectorEntry label="Sub-space" trace_name="SubSpace"
variable="ProjectionAxes" type="int"
property="ProjectionAxes" type="int"
length="3" default_value="0 1 2"
help="Choose which axes of the data set to display" />
<VectorEntry label="Origin" trace_name="Origin" variable="OriginCX"
<VectorEntry label="Origin" trace_name="Origin" property="OriginCX"
type="float" length="4" default_value="-1.75 -1.25 0.0 0.0"
help="Set the imaginary and real values for C (constant) and X (initial value)" />
<VectorEntry label="Size" trace_name="Size" variable="SizeCX" type="float"
<VectorEntry label="Size" trace_name="Size" property="SizeCX" type="float"
length="4" default_value="2.5 2.5 2.0 1.5"
help="Set the inaginary and real values for the world size of the volume for C (constant) and X (initial value)" />
<Scale label="Max. iterations" trace_name="MaxIterations"
......@@ -306,10 +306,12 @@ The output of the Mandelbrot source is image (uniform rectilinear) data.
<ThumbWheel label="Run Factor" variable="RunFactor" trace_name="RunLength"
resolution="1" minimum_value="1" default_value="20"
help="A value that influences the run length and branching of the maze." />
<VectorEntry label="Magnet Factor" variable="MagnetFactor" trace_name="MagnetFactor"
<VectorEntry label="Magnet Factor" property="MagnetFactor"
trace_name="MagnetFactor"
type="int" default_value="4"
help="When this value is larger than 1, new paths are preferentially formed adjacent to existing paths." />
<VectorEntry label="Random Seed" variable="RandomSeed" trace_name="RandomSeed"
<VectorEntry label="Random Seed" property="RandomSeed"
trace_name="RandomSeed"
type="int" default_value="111"
help="Initializes the random number generator." />
<LabeledToggle variable="ShowSolution" trace_name="ShowSolution" default_value="0"
......@@ -330,13 +332,13 @@ The output of the Maze source is polygonal data.
long_help="Parallelogram given an origin and two points. The resolution indicates the number of division along each axis of the plane."
short_help="Create a parallelogram from an origin and two points">
<Source class="vtkPlaneSource"/>
<VectorEntry variable="Origin" trace_name="Origin" type="float" length="3"
default_value="-0.5 -0.5 0.0"
<VectorEntry label="Origin" property="Origin" trace_name="Origin"
type="float" length="3" default_value="-0.5 -0.5 0.0"
help="Set the position of the origin of the plane."/>
<VectorEntry label="First point" variable="Point1" trace_name="Point1"
<VectorEntry label="First point" property="Point1" trace_name="Point1"
type="float" length="3" default_value="0.5 -0.5 0.0"
help="Set the position of the point defining the first axis."/>
<VectorEntry label="Second point" variable="Point2" trace_name="Point2"
<VectorEntry label="Second point" property="Point2" trace_name="Point2"
type="float" length="3" default_value="-0.5 0.5 0.0"
help="Set the position of the point defining the second axis."/>
<ThumbWheel label="X resolution" trace_name="XResolution"
......@@ -363,8 +365,8 @@ The output of the Plane source is polygonal data.
long_help="3D sphere given a center and radius."
short_help="Create a 3D sphere">
<Source class="vtkSphereSource"/>
<VectorEntry variable="Center" trace_name="Center" type="float" length="3"
default_value="0.0 0.0 0.0"
<VectorEntry label="Center" property="Center" trace_name="Center"
type="float" length="3" default_value="0.0 0.0 0.0"
help="Set the coordinates for the center of the sphere." />
<ThumbWheel variable="Radius" trace_name="Radius"
resolution="0.01" minimum_value="0" default_value="0.5"
......@@ -415,11 +417,11 @@ The output of the Sphere source is polygonal data with point normals defined.
long_help="Superquadric according to the theta and phi roundness parameters. This one function can generate a wide variety of 3D objects including a box, a sphere, or a torus."
short_help="Create a superquadric according to the theta and phi roundness parameters">
<Source class="vtkSuperquadricSource"/>
<VectorEntry variable="Center" trace_name="Center" type="float" length="3"
default_value="0.0 0.0 0.0"
<VectorEntry label="Center" property="Center" trace_name="Center"
type="float" length="3" default_value="0.0 0.0 0.0"
help="Set the center of the superquadric" />
<VectorEntry variable="Scale" trace_name="Scale" type="float" length="3"
default_value="1.0 1.0 1.0"
<VectorEntry label="Scale" property="Scale" trace_name="Scale" type="float"
length="3" default_value="1.0 1.0 1.0"
help="Set the scale of the superquadric" />
<Scale label="Theta resolution" trace_name="ThetaResolution"
variable="ThetaResolution" default_value="16" resolution="1"
......@@ -445,7 +447,7 @@ The output of the Sphere source is polygonal data with point normals defined.
resolution="0.01" range="0.01 10" default_value="1"
display_entry="1" display_value="0" entry_and_label_on_top="0"
help="Values range from 0 (rectangular) to 1 (circular) to higher order."/>
<VectorEntry variable="Size" trace_name="Size"
<VectorEntry label="Size" property="Size" trace_name="Size"
type="float" default_value="0.5"
help="Isotropic size" />
<LabeledToggle variable="Toroidal" trace_name="Toroidal" default_value="0"
......@@ -469,28 +471,30 @@ The output of the Superquadric source is polygonal data with point normals and t
module_type="Source"
long_help="Regular rectilinear grid in up to three dimensions with values varying according to a periodic function.">
<Source class="vtkRTAnalyticSource"/>
<VectorEntry label="Extent" trace_name="WholeExtent" variable="WholeExtent"
<VectorEntry label="Extent" trace_name="WholeExtent" property="WholeExtent"
type="int" length="6" default_value="-10 10 -10 10 -10 10"
help="Extent (dimensions) of the function." />
<VectorEntry variable="Center" trace_name="Center" type="int" length="3"
<VectorEntry label="Center" property="Center" trace_name="Center"
type="float" length="3"
default_value="0.0 0.0 0.0"
help="Center of the function."/>
<VectorEntry variable="Maximum" trace_name="Maximum" type="float"
<VectorEntry label="Maximum" property="Maximum" trace_name="Maximum"
type="float"
default_value="255.0" help="Maximum value of the function"/>
<VectorEntry label="X Freq." trace_name="XFreq" variable="XFreq"
<VectorEntry label="X Freq." trace_name="XFreq" property="XFreq"
type="float" default_value="60" help="Frequency in X"/>
<VectorEntry label="Y Freq." trace_name="YFreq" variable="YFreq"
<VectorEntry label="Y Freq." trace_name="YFreq" property="YFreq"
type="float" default_value="30" help="Frequency in Y"/>
<VectorEntry label="Z Freq." trace_name="ZFreq" variable="ZFreq"
<VectorEntry label="Z Freq." trace_name="ZFreq" property="ZFreq"
type="float" default_value="40" help="Frequency in Z"/>
<VectorEntry label="X Mag." trace_name="XMag" variable="XMag"
<VectorEntry label="X Mag." trace_name="XMag" property="XMag"
type="float" default_value="10" help="Wave amplitude in X"/>
<VectorEntry label="Y Mag." trace_name="YMag" variable="YMag"
<VectorEntry label="Y Mag." trace_name="YMag" property="YMag"
type="float" default_value="18" help="Wave amplitude in Y"/>
<VectorEntry label="Z Mag." trace_name="ZMag" variable="ZMag"
<VectorEntry label="Z Mag." trace_name="ZMag" property="ZMag"
type="float" default_value="5" help="Wave amplitude in Z"/>
<VectorEntry label="Standard dev." trace_name="StandardDeviation"
variable="StandardDeviation" type="float" default_value="0.5"
property="StandardDeviation" type="float" default_value="0.5"
help="Standard deviation of the gaussian" />
<Documentation>
The Wavelet source can be used to create a uniform rectilinear grid in up to three dimensions with values varying according to the following periodic function.
......
......@@ -38,6 +38,9 @@
#include "vtkPVWidget.h"
#include "vtkPVWidgetCollection.h"
#include "vtkPVWidgetProperty.h"
#include "vtkSMDomain.h"
#include "vtkSMProperty.h"
#include "vtkSMSourceProxy.h"
#include "vtkPVWindow.h"
#include "vtkKWLoadSaveDialog.h"
#include "vtkJPEGWriter.h"
......@@ -179,7 +182,7 @@ public:
//-----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPVAnimationInterface);
vtkCxxRevisionMacro(vtkPVAnimationInterface, "1.134");
vtkCxxRevisionMacro(vtkPVAnimationInterface, "1.135");
vtkCxxSetObjectMacro(vtkPVAnimationInterface,ControlledWidget, vtkPVWidget);
......@@ -942,15 +945,28 @@ void vtkPVAnimationInterface::SetCurrentTime(int time, int trace)
else
{
vtkPVWidgetProperty *prop = entry->GetCurrentProperty();
vtkSMProperty *smProp = entry->GetCurrentSMProperty();
vtkSMDomain *smDomain = entry->GetCurrentSMDomain();
if (prop)
{
this->Script(entry->GetTimeEquation());
prop->SetAnimationTime(vtkKWObject::GetFloatResult(pvApp));
prop->GetWidget()->ModifiedCallback();
if ( entry->GetPVSource() )
{
entry->GetPVSource()->UpdateVTKSourceParameters();
}
}
if ( entry->GetPVSource() )
else if (smProp && smDomain)
{
entry->GetPVSource()->UpdateVTKSourceParameters();
this->Script(entry->GetTimeEquation());
smDomain->SetAnimationValue(smProp, 0,
vtkKWObject::GetFloatResult(pvApp));
if (entry->GetPVSource() && entry->GetPVSource()->GetProxy())
{
entry->GetPVSource()->GetProxy()->UpdateVTKObjects();
entry->GetPVSource()->ResetCallback();
}
}
}
}
......
......@@ -38,7 +38,8 @@
#include "vtkKWScale.h"
#include "vtkKWLabeledRadioButtonSet.h"
#include "vtkKWRadioButtonSet.h"
#include "vtkSMProperty.h"
#include "vtkSMDomain.h"
#include <vtkstd/string>
......@@ -75,10 +76,14 @@ public:
//-----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPVAnimationInterfaceEntry);
vtkCxxRevisionMacro(vtkPVAnimationInterfaceEntry, "1.39");
vtkCxxRevisionMacro(vtkPVAnimationInterfaceEntry, "1.40");
vtkCxxSetObjectMacro(vtkPVAnimationInterfaceEntry, CurrentProperty,
vtkPVWidgetProperty);
vtkCxxSetObjectMacro(vtkPVAnimationInterfaceEntry, CurrentSMProperty,
vtkSMProperty);
vtkCxxSetObjectMacro(vtkPVAnimationInterfaceEntry, CurrentSMDomain,
vtkSMDomain);
//-----------------------------------------------------------------------------
vtkPVAnimationInterfaceEntry::vtkPVAnimationInterfaceEntry()
......@@ -133,6 +138,8 @@ vtkPVAnimationInterfaceEntry::vtkPVAnimationInterfaceEntry()
this->ScriptEditorDirty = 0;
this->CurrentProperty = NULL;
this->CurrentSMProperty = NULL;
this->CurrentSMDomain = NULL;