From cbe48c6adf00fd007031969be04ea1b699e00d37 Mon Sep 17 00:00:00 2001
From: vsv <vitaly.smetannikov@opencascade.com>
Date: Mon, 8 Dec 2014 15:39:30 +0300
Subject: [PATCH] Restore all validators for sketcher

---
 src/SketchPlugin/plugin-Sketch.xml | 60 +++++++++++++++++++++---------
 1 file changed, 43 insertions(+), 17 deletions(-)

diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index 608b345c1..f61678154 100644
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -27,65 +27,91 @@
 	  
     <group id="Constraints">
       <feature id="SketchConstraintCoincidence" title="Coincident" tooltip="Create constraint for the coincidence of two points" internal="1"/>
-
+	<!--  SketchConstraintDistance  -->
       <feature id="SketchConstraintDistance" title="Distance" tooltip="Create constraint for the distance from a point to an object" icon=":icons/distance.png">
         <label title="Select objects for distance definition. Following objects can be accepted: point, line or arc end point, center of circle or arc."/>
+		
 		<sketch_shape_selector id="ConstraintEntityA" label="First object" tooltip="Select point, line end point, line, center of circle or arc." 
 			shape_types="edge vertex"  use_subshapes="true"/>
+		
 		<sketch_shape_selector id="ConstraintEntityB" label="Last object" tooltip="Select point, line end point, line, center of circle or arc." 
-			shape_types="edge vertex"  use_subshapes="true"/>
+			shape_types="edge vertex"  use_subshapes="true">
+			<validator id="SketchPlugin_DifferentObjects"/>
+		</sketch_shape_selector>
+		
         <sketch-2dpoint_selector id="ConstraintFlyoutValuePnt" internal="1" obligatory="0"/>
-        <doublevalue_editor label="Value" tooltip="Constraint value" id="ConstraintValue" default="computed" min="0">
+        
+		<doublevalue_editor label="Value" tooltip="Constraint value" id="ConstraintValue" default="computed" min="0">
           <validator id="GeomValidators_Positive"/>
         </doublevalue_editor>
-        <validator id="PartSet_DistanceValidator"/>
+        
+		<validator id="PartSet_DistanceValidator"/>
       </feature>
-      
+	<!--  SketchConstraintLength  -->      
       <feature id="SketchConstraintLength" title="Length" tooltip="Create constraint for the given length of a line segment" icon=":icons/length.png">
         <label title="Select a line on which to calculate length" tooltip="Select a line on which to calculate length"/>
 		<shape_selector id="ConstraintEntityA" label="Line" tooltip="Select an line in the viewer" 
-			shape_types="edge" />
+			shape_types="edge" >
+			<validator id="SketchPlugin_ResultLine"/>
+		</shape_selector>
         <sketch-2dpoint_selector id="ConstraintFlyoutValuePnt" internal="1" obligatory="0"/>
         <doublevalue_editor label="Value" tooltip="Constraint value" id="ConstraintValue" default="computed">
           <validator id="GeomValidators_Positive"/>
         </doublevalue_editor>
         <validator id="PartSet_LengthValidator"/>
       </feature>
-      
+	<!--  SketchConstraintRadius  -->
       <feature id="SketchConstraintRadius" title="Radius" tooltip="Create constraint for the given radius of a circle or an arc" icon=":icons/radius_constr.png">
         <label title="Select a circle or an arc on which to calculate radius" tooltip="Select a circle or an arc on which to calculate radius"/>
 		<shape_selector id="ConstraintEntityA" label="Circle or Arc" tooltip="Select a circle or an arc in the viewer" 
-			shape_types="edge"/>
+			shape_types="edge">
+			<validator id="SketchPlugin_ResultArc"/>
+		</shape_selector>
         <sketch-2dpoint_selector id="ConstraintFlyoutValuePnt" internal="1" obligatory="0"/>
         <doublevalue_editor label="Value" tooltip="Constraint value" id="ConstraintValue" default="computed"/>
         <validator id="PartSet_RadiusValidator"/>
       </feature>
-      
+	<!--  SketchConstraintParallel  -->
       <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 an line in the viewer" 
-			shape_types="edge" use_subshapes="true"/>
+		<sketch_constraint_shape_selector id="ConstraintEntityA" 
+			label="First line" tooltip="Select an line in the viewer" 
+			shape_types="edge" use_subshapes="true">
+			<validator id="SketchPlugin_ResultLine"/>
+		</sketch_constraint_shape_selector>
+		
 		<sketch_constraint_shape_selector id="ConstraintEntityB" label="Last line" tooltip="Select an line in the viewer" 
 			shape_types="edge" use_subshapes="true">
+			<validator id="SketchPlugin_ResultLine"/>
 			<validator id="SketchPlugin_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">
-		<sketch_constraint_shape_selector id="ConstraintEntityA" label="First line" tooltip="Select an line in the viewer" 
-			shape_types="edge" use_subshapes="true"/>
+		<sketch_constraint_shape_selector id="ConstraintEntityA" 
+			label="First line" tooltip="Select an line in the viewer" 
+			shape_types="edge" use_subshapes="true">
+			<validator id="SketchPlugin_ResultLine"/>
+		</sketch_constraint_shape_selector>
+		
 		<sketch_constraint_shape_selector id="ConstraintEntityB" 
 			label="Last line" tooltip="Select an line in the viewer" 
 			shape_types="edge" use_subshapes="true">
+			<validator id="SketchPlugin_ResultLine"/>
 			<validator id="SketchPlugin_DifferentObjects"/>
 		</sketch_constraint_shape_selector>
         <validator id="PartSet_PerpendicularValidator"/>
       </feature>
-
+	<!--  SketchConstraintRigid  -->
       <feature id="SketchConstraintRigid" title="Fixed" tooltip="Create constraint defining fixed object" icon=":icons/fixed.png">
-	      <shape_selector id="ConstraintEntityA" label="Object" tooltip="Select any object in the viewer" 
-			shape_types="edge vertex"/>
+	    <shape_selector id="ConstraintEntityA" label="Object" tooltip="Select any object in the viewer" 
+			shape_types="edge vertex">
+   		    <validator id="SketchPlugin_ResultPoint"/>
+			<validator id="SketchPlugin_ResultLine"/>
+			<validator id="SketchPlugin_ResultArc"/>
+		</shape_selector>
       </feature>
     </group>
   </workbench>
-- 
2.39.2