From: nds <natalia.donis@opencascade.com>
Date: Fri, 27 Feb 2015 06:23:30 +0000 (+0300)
Subject: Issue #353 	constraint on 2 segments from not acive sketches
X-Git-Tag: V_1.1.0~163
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3cae2f674a9eb72a5196ec2c7f93507a4f9d9229;p=modules%2Fshaper.git

Issue #353 	constraint on 2 segments from not acive sketches
---

diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index 7447a8fa7..b59a5d4c5 100644
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -32,14 +32,14 @@
         <sketch-2dpoint_selector id="ArcEndPoint" title="End point" tooltip="End point"/>
       </feature>
     </group>
-	  
+      
     <group id="Constraints">
       <feature
         id="SketchConstraintCoincidence"
         title="Coincident"
         tooltip="Create constraint for the coincidence of two points"
         internal="1" />
-	<!--  SketchConstraintDistance  -->
+    <!--  SketchConstraintDistance  -->
       <feature
         id="SketchConstraintDistance"
         title="Distance"
@@ -52,32 +52,34 @@
               tooltip="Select point, line end point, line, center of circle or arc."
               shape_types="edge vertex">
           <selection_filter id="MultiFilter" parameters="line,vertex"/>
+          <validator id="SketchPlugin_ResultLine"/>
         </sketch_shape_selector>/>
-		<sketch_shape_selector 
+        <sketch_shape_selector 
           id="ConstraintEntityB" 
           label="Last object" 
           tooltip="Select point, line end point, line, center of circle or arc." 
-			    shape_types="edge vertex">
-			<validator id="SketchPlugin_DifferentObjects"/>
+                shape_types="edge vertex">
+            <validator id="SketchPlugin_DifferentObjects"/>
       <validator id="SketchPlugin_DistanceAttr" parameters="ConstraintEntityA"/>
       <selection_filter id="MultiFilter" parameters="line,vertex"/>
     </sketch_shape_selector>
-		
+        
         <sketch-2dpoint_selector id="ConstraintFlyoutValuePnt"  default="computed" internal="1" obligatory="0"/>
         
-		<doublevalue_editor label="Value" tooltip="Distance" id="ConstraintValue" default="computed" min="0">
+        <doublevalue_editor label="Value" tooltip="Distance" id="ConstraintValue" default="computed" min="0">
           <validator id="GeomValidators_Positive"/>
         </doublevalue_editor>
         
-		<validator id="PartSet_DistanceValidator"/>
+        <validator id="PartSet_DistanceValidator"/>
       </feature>
-	<!--  SketchConstraintLength  -->      
+    <!--  SketchConstraintLength  -->      
       <feature id="SketchConstraintLength" title="Length" tooltip="Set fixed 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" 
-			shape_types="edge" >
-			<validator id="SketchPlugin_ResultLine"/>
+        <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="SketchPlugin_ResultLine"/>
     </shape_selector>
         <sketch-2dpoint_selector id="ConstraintFlyoutValuePnt" default="computed" internal="1" obligatory="0"/>
         <doublevalue_editor label="Value" tooltip="Length" id="ConstraintValue" default="computed">
@@ -85,59 +87,59 @@
         </doublevalue_editor>
         <validator id="PartSet_LengthValidator"/>
       </feature>
-	<!--  SketchConstraintRadius  -->
+    <!--  SketchConstraintRadius  -->
       <feature id="SketchConstraintRadius" title="Radius" tooltip="Set fixed 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" 
-			shape_types="edge">
-			<validator id="SketchPlugin_ResultArc"/>
-			<selection_filter id="EdgeFilter" parameters="circle"/>
-		</shape_selector>
+        <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"/>
+        </shape_selector>
         <sketch-2dpoint_selector id="ConstraintFlyoutValuePnt"  default="computed" internal="1" obligatory="0"/>
         <doublevalue_editor label="Value" tooltip="Radius" id="ConstraintValue" default="computed"/>
         <validator id="PartSet_RadiusValidator"/>
       </feature>
-	<!--  SketchConstraintParallel  -->
+    <!--  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 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="SketchPlugin_DifferentObjects"/>
-		</sketch_constraint_shape_selector>
-		
+        <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="SketchPlugin_DifferentObjects"/>
+        </sketch_constraint_shape_selector>
+        
         <sketch-2dpoint_selector id="ConstraintFlyoutValuePnt" internal="1" obligatory="0"/>
         <validator id="PartSet_ParallelValidator"/>
       </feature>
-	<!--  SketchConstraintPerpendicular  -->
+    <!--  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" 
-			shape_types="edge">
+        <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="SketchPlugin_DifferentObjects"/>
+        
+        <sketch_constraint_shape_selector id="ConstraintEntityB" 
+            label="Last line" tooltip="Select an line" 
+            shape_types="edge">
+            <validator id="SketchPlugin_DifferentObjects"/>
       <selection_filter id="EdgeFilter" parameters="line"/>
     </sketch_constraint_shape_selector>
         <validator id="PartSet_PerpendicularValidator"/>
       </feature>
-	<!--  SketchConstraintRigid  -->
+    <!--  SketchConstraintRigid  -->
       <feature id="SketchConstraintRigid" title="Fixed" tooltip="Fix an object" icon=":icons/fixed.png">
         <shape_selector id="ConstraintEntityA" label="Object" tooltip="Select an object" 
-			shape_types="edge vertex">
-   		    <validator id="SketchPlugin_ResultPoint"/>
-			<validator id="SketchPlugin_ResultLine"/>
-			<validator id="SketchPlugin_ResultArc"/>
-		</shape_selector>
-	    <validator id="PartSet_RigidValidator"/>
+            shape_types="edge vertex">
+               <validator id="SketchPlugin_ResultPoint"/>
+            <validator id="SketchPlugin_ResultLine"/>
+            <validator id="SketchPlugin_ResultArc"/>
+        </shape_selector>
+        <validator id="PartSet_RigidValidator"/>
       </feature>
     </group>
   </workbench>