From: vsv <vitaly.smetannikov@opencascade.com>
Date: Wed, 8 Apr 2015 14:41:53 +0000 (+0300)
Subject: Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
X-Git-Tag: V_1.1.0~54^2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=91540e31cc99e5f1eef3296b570b65abf580ca85;p=modules%2Fshaper.git

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

Conflicts:
	src/SketchPlugin/plugin-Sketch.xml
---

91540e31cc99e5f1eef3296b570b65abf580ca85
diff --cc src/SketchPlugin/plugin-Sketch.xml
index 03a092c82,208f2e689..6657008fd
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@@ -204,6 -204,22 +204,7 @@@
          <validator id="PartSet_TangentSelection"/>
        </feature>
        
 -    <!--  SketchConstraintMirror  -->
 -      <feature
 -        id="SketchConstraintMirror"
 -        title="Mirror" icon=":icons/mirror.png"
 -        tooltip="Create constraint, mirroring group of objects">
 -        <sketch_constraint_shape_selector id="ConstraintEntityA" 
 -            label="Mirror line" tooltip="Select mirror line" shape_types="edge">
 -            <validator id="GeomValidators_Edge" parameters="line"/>
 -        </sketch_constraint_shape_selector>
 -        <multi_selector id="ConstraintMirrorList" 
 -            label="List of objects"
 -            tooltip="Select list of mirroring objects"
 -            type_choice="Edges">
 -            <validator id="SketchPlugin_MirrorAttr" />
 -        </multi_selector>
 -      </feature>
++         
      </group>
      
      <group id="Edit">
@@@ -220,23 -236,6 +221,24 @@@
          <doublevalue_editor label="Value" tooltip="Fillet radius" id="ConstraintValue" min="0">
            <validator id="GeomValidators_Positive"/>
          </doublevalue_editor>
 +        <validator id="PartSet_FilletSelection"/>
 +      </feature>
 +      
 +      <!--  SketchConstraintMirror  -->
 +      <feature
 +        id="SketchConstraintMirror"
 +        title="Mirror" icon=":icons/mirror.png"
 +        tooltip="Create constraint, mirroring group of objects">
 +        <sketch_constraint_shape_selector id="ConstraintEntityA"
 +            label="Mirror line" tooltip="Select mirror line" shape_types="edge">
-           <validator id="GeomValidators_Edge" parameters="line"/>
++            <validator id="GeomValidators_Edge" parameters="line"/>
 +        </sketch_constraint_shape_selector>
 +        <multi_selector id="ConstraintMirrorList"
 +            label="List of objects"
 +            tooltip="Select list of mirroring objects"
 +            type_choice="Edges">
++            <validator id="SketchPlugin_MirrorAttr" />
 +        </multi_selector>
        </feature>
      </group>
    </workbench>