From: sbh <sergey.belash@opencascade.com>
Date: Thu, 26 Mar 2015 09:55:57 +0000 (+0300)
Subject: Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0
X-Git-Tag: V_1.1.0~78^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a731f82dccbfdb67cbf8e8d617222a4d3e32018a;p=modules%2Fshaper.git

Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

Conflicts:
	src/SketchPlugin/SketchPlugin_Plugin.cpp
---

a731f82dccbfdb67cbf8e8d617222a4d3e32018a
diff --cc src/SketchPlugin/plugin-Sketch.xml
index af51a5dd6,2d5e884e1..2691caeba
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@@ -64,22 -59,12 +59,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="SketchPlugin_ExternalValidator" 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"/>
          
@@@ -125,30 -113,14 +123,31 @@@
              shape_types="edge">
              <validator id="GeomValidators_Edge" parameters="line"/>
              <validator id="PartSet_DifferentObjects"/>
-             <validator id="SketchPlugin_ShapeValidator" parameters="ConstraintEntityA"/>
+             <validator id="SketchPlugin_ExternalValidator" 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">
@@@ -160,27 -132,21 +159,36 @@@
              label="Last line" tooltip="Select an line" 
              shape_types="edge">
              <validator id="PartSet_DifferentObjects"/>
-           <validator id="SketchPlugin_ShapeValidator" parameters="ConstraintEntityA"/>
+           <validator id="SketchPlugin_ExternalValidator" 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  -->
+ 
+       <!--  SketchConstraintCoincedence  -->
+       <feature id="SketchConstraintCoincidence" title="Coincident" tooltip="Create constraint for the coincidence of two points" icon=":icons/coincedence.png">
+         <sketch_shape_selector id="ConstraintEntityA" label="First point" tooltip="Select a first point" shape_types="vertex"/>
+         <sketch_shape_selector id="ConstraintEntityB" label="Second point" tooltip="Select a second point" shape_types="vertex">
+           <validator id="PartSet_DifferentObjects"/>
+         </sketch_shape_selector>
+       </feature>
+ 
+       <!--  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">