Merge branch 'master' into Dev_1.1.0

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

diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index f1bc36d9b27c41994d0a79f142c99c07659b778b..af51a5dd6164706a677181ba402fd625d2910d1c 100644 (file)
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -64,12 +64,22 @@
           id="ConstraintEntityB" 
           label="Last object" 
           tooltip="Select point, line end point, line, center of circle or arc." 
-                shape_types="edge vertex">
+          shape_types="edge vertex">
           <validator id="PartSet_DifferentObjects"/>
           <validator id="SketchPlugin_DistanceAttr" parameters="ConstraintEntityA"/>
           <validator id="SketchPlugin_ShapeValidator" parameters="ConstraintEntityA"/>
           <validator id="GeomValidators_EdgeOrVertex"/>
         </sketch_shape_selector>
+ <!--
+ TODO(nds): v1.0.2, master  
+                           shape_types="edge vertex">
+                       <validator id="PartSet_DifferentObjects"/>
+      <validator id="SketchPlugin_DistanceAttr" parameters="ConstraintEntityA"/>
+      <selection_filter id="MultiFilter" parameters="line,vertex"/>
+    </sketch_shape_selector>
+               
+        <sketch-2dpoint_selector id="ConstraintFlyoutValuePnt" internal="1" obligatory="0"/>
+ -->
         
         <sketch-2dpoint_selector id="ConstraintFlyoutValuePnt"  default="computed" internal="1" obligatory="0"/>
         
@@ -118,10 +128,27 @@
             <validator id="SketchPlugin_ShapeValidator" parameters="ConstraintEntityA"/>
         </sketch_constraint_shape_selector>
         
+<!--  
+  TODO(nds): v1.0.2, master  
+               <sketch_constraint_shape_selector id="ConstraintEntityA" 
+                       label="First line" tooltip="Select a line" shape_types="edge">
+                       <selection_filter id="EdgeFilter" parameters="line"/>
+               </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="PartSet_DifferentObjects"/>
+               </sketch_constraint_shape_selector>
+               
+        <sketch-2dpoint_selector id="ConstraintFlyoutValuePnt" internal="1" obligatory="0"/>
+-->
         <validator id="PartSet_ParallelValidator"/>
       </feature>
     <!--  SketchConstraintPerpendicular  -->
-      <feature id="SketchConstraintPerpendicular" title="Perpendicular" tooltip="Create constraint defining two perpendicular lines" icon=":icons/perpendicular.png">
+      <feature id="SketchConstraintPerpendicular" title="Perpendicular" 
+        tooltip="Create constraint defining two perpendicular lines" 
+        icon=":icons/perpendicular.png">
         <sketch_constraint_shape_selector id="ConstraintEntityA" 
             label="First line" tooltip="Select an line" 
             shape_types="edge">
@@ -136,6 +163,21 @@
           <validator id="SketchPlugin_ShapeValidator" parameters="ConstraintEntityA"/>
             <validator id="GeomValidators_Edge" parameters="line"/>
         </sketch_constraint_shape_selector>
+<!--  
+  TODO(nds): v1.0.2, master
+               <sketch_constraint_shape_selector id="ConstraintEntityA" 
+                       label="First line" tooltip="Select an line" 
+                       shape_types="edge">
+      <selection_filter id="EdgeFilter" 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"/>
+      <selection_filter id="EdgeFilter" parameters="line"/>
+    </sketch_constraint_shape_selector>
+-->
         <validator id="PartSet_PerpendicularValidator"/>
       </feature>
     <!--  SketchConstraintRigid  -->