Union of validator and filter functionalities.

[modules/shaper.git] / src / SketchPlugin / plugin-Sketch.xml

diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index b4a7ab35b24d03bc609a1e3a0ea7581719d2b886..ed75e1bd9680701f00f1f2d6e67efef9319ac032 100644 (file)
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -56,7 +56,7 @@
               tooltip="Select point, line end point, line, center of circle or arc."
               shape_types="edge vertex">
           <validator id="SketchPlugin_ShapeValidator" parameters="ConstraintEntityB"/>
-          <selection_filter id="MultiFilter" parameters="line,vertex"/>
+          <validator id="ModuleBase_ValidatorLinearEdgeOrVertex"/>
         </sketch_shape_selector>/>
         <sketch_shape_selector 
           id="ConstraintEntityB" 
@@ -66,8 +66,8 @@
           <validator id="PartSet_DifferentObjects"/>
           <validator id="SketchPlugin_DistanceAttr" parameters="ConstraintEntityA"/>
           <validator id="SketchPlugin_ShapeValidator" parameters="ConstraintEntityB"/>
-          <selection_filter id="MultiFilter" parameters="line,vertex"/>
-    </sketch_shape_selector>
+          <validator id="ModuleBase_ValidatorLinearEdgeOrVertex"/>
+        </sketch_shape_selector>
         
         <sketch-2dpoint_selector id="ConstraintFlyoutValuePnt"  default="computed" internal="1" obligatory="0"/>
         
@@ -83,7 +83,7 @@
         <shape_selector id="ConstraintEntityA" label="Line" tooltip="Select an line" 
             shape_types="edge" >
             <validator id="SketchPlugin_ResultLine"/>
-      <selection_filter id="EdgeFilter" parameters="line"/>
+            <validator id="ModuleBase_ValidatorLinearEdge" parameters="line"/>
       <validator id="SketchPlugin_ResultLine"/>
     </shape_selector>
         <sketch-2dpoint_selector id="ConstraintFlyoutValuePnt" default="computed" internal="1" obligatory="0"/>
@@ -98,7 +98,7 @@
         <shape_selector id="ConstraintEntityA" label="Circle or Arc" tooltip="Select a circle or an arc" 
             shape_types="edge">
             <validator id="SketchPlugin_ResultArc"/>
-            <selection_filter id="EdgeFilter" parameters="circle"/>
+            <validator id="ModuleBase_ValidatorLinearEdge" parameters="circle"/>
         </shape_selector>
         <sketch-2dpoint_selector id="ConstraintFlyoutValuePnt"  default="computed" internal="1" obligatory="0"/>
         <doublevalue_editor label="Value" tooltip="Radius" id="ConstraintValue" default="computed"/>
@@ -108,13 +108,13 @@
       <feature id="SketchConstraintParallel" title="Parallel" tooltip="Create constraint defining two parallel lines" icon=":icons/parallel.png">
         <sketch_constraint_shape_selector id="ConstraintEntityA" 
             label="First line" tooltip="Select a line" shape_types="edge">
-            <selection_filter id="EdgeFilter" parameters="line"/>
-          <validator id="SketchPlugin_ShapeValidator" parameters="ConstraintEntityB"/>
+            <validator id="ModuleBase_ValidatorLinearEdge" parameters="line"/>
+            <validator id="SketchPlugin_ShapeValidator" parameters="ConstraintEntityB"/>
         </sketch_constraint_shape_selector>
         
         <sketch_constraint_shape_selector id="ConstraintEntityB" label="Last line" tooltip="Select a line" 
             shape_types="edge">
-            <selection_filter id="EdgeFilter" parameters="line"/>
+            <validator id="ModuleBase_ValidatorLinearEdge" parameters="line"/>
             <validator id="PartSet_DifferentObjects"/>
             <validator id="SketchPlugin_ShapeValidator" parameters="ConstraintEntityA"/>
         </sketch_constraint_shape_selector>
@@ -127,16 +127,16 @@
             label="First line" tooltip="Select an line" 
             shape_types="edge">
           <validator id="SketchPlugin_ShapeValidator" parameters="ConstraintEntityB"/>
-          <selection_filter id="EdgeFilter" parameters="line"/>
-    </sketch_constraint_shape_selector>
+            <validator id="ModuleBase_ValidatorLinearEdge" parameters="line"/>
+        </sketch_constraint_shape_selector>
         
         <sketch_constraint_shape_selector id="ConstraintEntityB" 
             label="Last line" tooltip="Select an line" 
             shape_types="edge">
             <validator id="PartSet_DifferentObjects"/>
           <validator id="SketchPlugin_ShapeValidator" parameters="ConstraintEntityA"/>
-          <selection_filter id="EdgeFilter" parameters="line"/>
-    </sketch_constraint_shape_selector>
+            <validator id="ModuleBase_ValidatorLinearEdge" parameters="line"/>
+        </sketch_constraint_shape_selector>
         <validator id="PartSet_PerpendicularValidator"/>
       </feature>
     <!--  SketchConstraintRigid  -->
@@ -153,14 +153,14 @@
       <feature id="SketchConstraintHorizontal" title="Horizontal" tooltip="Create constraint defining horizontal line" icon=":icons/horisontal.png">
         <sketch_constraint_shape_selector id="ConstraintEntityA" 
             label="Line" tooltip="Select a line" shape_types="edge">
-            <selection_filter id="EdgeFilter" parameters="line"/>
+            <validator id="ModuleBase_ValidatorLinearEdge" parameters="line"/>
         </sketch_constraint_shape_selector>
       </feature>
     <!--  SketchConstraintVertical  -->
       <feature id="SketchConstraintVertical" title="Vertical" tooltip="Create constraint defining vertical line" icon=":icons/vertical.png">
         <sketch_constraint_shape_selector id="ConstraintEntityA" 
             label="Line" tooltip="Select a line" shape_types="edge">
-            <selection_filter id="EdgeFilter" parameters="line"/>
+            <validator id="ModuleBase_ValidatorLinearEdge" parameters="line"/>
         </sketch_constraint_shape_selector>
       </feature>
     <!--  SketchConstraintEqual  -->