[PATCH] QuadraturePoints -- any integer type for offsets

[Burlen Loring]

In PV SM XML, remove vtk id type qualifier, and add a category
in the menu.

Change-Id: I38fd56f40cbf55ae06a28629df7bc2cdca7a96b1
---
 Applications/ParaView/ParaViewFilters.xml          |   12 +++++--
 .../SMApplication/Resources/filters.xml            |   30 ++++++++------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/Applications/ParaView/ParaViewFilters.xml b/Applications/ParaView/ParaViewFilters.xml
index 22eb6da..7f27f08 100644
--- a/Applications/ParaView/ParaViewFilters.xml
+++ b/Applications/ParaView/ParaViewFilters.xml
@@ -89,6 +89,13 @@
     <Proxy group="filters" name="ExtractHierarchicalDataSets" />
   </Category>
 
+  <Category name="Quadrature Points" menu_label="&amp;Quadrature Points">
+    <Proxy group="filters" name="QuadraturePointInterpolator" />
+    <Proxy group="filters" name="QuadraturePointsGenerator" />
+    <Proxy group="filters" name="QuadraturePointStatistics" />
+    <Proxy group="filters" name="QuadratureSchemeDictionaryGenerator" />
+  </Category>
+
   <Proxy group="filters" name="ImageDataToAMR" />
   <Proxy group="filters" name="UniformGridPartitioner" />
   <Proxy group="filters" name="AnnotateGlobalData" />
@@ -166,10 +173,7 @@
   <Proxy group="filters" name="PythonCalculator" />
   <Proxy group="filters" name="PythonAnnotation" />
   <Proxy group="filters" name="PythonExtractSelection" />
-  <Proxy group="filters" name="QuadraturePointInterpolator" />
-  <Proxy group="filters" name="QuadraturePointsGenerator" />
-  <Proxy group="filters" name="QuadraturePointStatistics" />
-  <Proxy group="filters" name="QuadratureSchemeDictionaryGenerator" />
+
   <Proxy group="filters" name="QuadricClustering" />
   <Proxy group="filters" name="RectilinearGridConnectivity" />
   <Proxy group="filters" name="RectilinearGridToPointSet" />
diff --git a/ParaViewCore/ServerManager/SMApplication/Resources/filters.xml b/ParaViewCore/ServerManager/SMApplication/Resources/filters.xml
index 29faffd..607ef69 100644
--- a/ParaViewCore/ServerManager/SMApplication/Resources/filters.xml
+++ b/ParaViewCore/ServerManager/SMApplication/Resources/filters.xml
@@ -3582,25 +3582,24 @@ found and the point will be rejected.</Documentation>
         <DataTypeDomain name="input_type">
           <DataType value="vtkUnstructuredGrid" />
         </DataTypeDomain>
-        <Documentation>This property specifies the input of the
-        filter.</Documentation>
+        <InputArrayDomain attribute_type="cell" name="input_array" />
+        <Documentation>This property specifies the input of the filter.</Documentation>
       </InputProperty>
       <StringVectorProperty animateable="0"
                             command="SetInputArrayToProcess"
                             element_types="0 0 0 0 2"
-                            name="SelectSourceArray"
+                            name="QuadratureSchemeDefinition"
+                            label="Quadrature Scheme Def"
                             number_of_elements="5">
         <Documentation>Specifies the offset array from which we interpolate
         values to quadrature points.</Documentation>
         <ArrayListDomain attribute_type="Scalars"
-                         data_type="VTK_ID_TYPE"
                          key_locations="vtkQuadratureSchemeDefinition"
                          key_names="DICTIONARY"
                          key_strategies="NEED_KEY"
                          name="array_list">
           <RequiredProperties>
-            <Property function="Input"
-                      name="Input" />
+            <Property function="Input" name="Input" />
           </RequiredProperties>
         </ArrayListDomain>
       </StringVectorProperty>
@@ -3613,10 +3612,8 @@ found and the point will be rejected.</Documentation>
                      short_help="Create a point set with data at quadrature points.">
                      "Create a point set with data at quadrature
                      points."</Documentation>
-      <OutputPort index="0"
-                  name="Quadrature Points" />
-      <InputProperty command="SetInputConnection"
-                     name="Input">
+      <OutputPort index="0" name="Quadrature Points" />
+      <InputProperty command="SetInputConnection" name="Input">
         <ProxyGroupDomain name="groups">
           <Group name="sources" />
           <Group name="filters" />
@@ -3624,28 +3621,25 @@ found and the point will be rejected.</Documentation>
         <DataTypeDomain name="input_type">
           <DataType value="vtkUnstructuredGrid" />
         </DataTypeDomain>
-        <InputArrayDomain attribute_type="cell"
-                          name="input_array" />
-        <Documentation>This property specifies the input of the
-        filter.</Documentation>
+        <InputArrayDomain attribute_type="cell" name="input_array" />
+        <Documentation>This property specifies the input of the filter.</Documentation>
       </InputProperty>
       <!-- Source Array-->
       <StringVectorProperty animateable="0"
                             command="SetInputArrayToProcess"
                             element_types="0 0 0 0 2"
-                            name="SelectSourceArray"
+                            name="QuadratureSchemeDefinition"
+                            label="Quadrature Scheme Def"
                             number_of_elements="5">
         <Documentation>Specifies the offset array from which we generate
         quadrature points.</Documentation>
         <ArrayListDomain attribute_type="Scalars"
-                         data_type="VTK_ID_TYPE"
                          key_locations="vtkQuadratureSchemeDefinition"
                          key_names="DICTIONARY"
                          key_strategies="NEED_KEY"
                          name="array_list">
           <RequiredProperties>
-            <Property function="Input"
-                      name="Input" />
+            <Property function="Input" name="Input" />
           </RequiredProperties>
         </ArrayListDomain>
       </StringVectorProperty>
-- 
1.7.0.4


--------------060106050407030207060204--