From: sbh <sergey.belash@opencascade.com>
Date: Wed, 24 Sep 2014 11:53:49 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom.git
X-Git-Tag: V_0.4.4~28
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b669a9a22a6cde038878f727af42e3f27e52e0d6;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom.git

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

b669a9a22a6cde038878f727af42e3f27e52e0d6
diff --cc src/SketchPlugin/plugin-Sketch.xml
index 72b96c18b,307e60674..6ec011c98
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@@ -49,9 -49,11 +49,11 @@@
          <feature_selector id="ConstraintEntityA" label="Line" tooltip="Select an line in the viewer">
            <validator id="SketchPlugin_ResultLine"/>
          </feature_selector>
 -        <point_selector id="ConstraintFlyoutValuePnt" internal="1"/>
 +        <point_selector id="ConstraintFlyoutValuePnt" internal="1" obligatory="0"/>
-         <doublevalue_editor label="Value" tooltip="Constraint value" id="ConstraintValue" default="computed"/>
-         <validator id="PartSet_LengthValidator"/> 
+         <doublevalue_editor label="Value" tooltip="Constraint value" id="ConstraintValue" default="computed">
+           <validator id="GeomValidators_Positive"/>
+         </doublevalue_editor>
+         <validator id="PartSet_LengthValidator"/>
        </feature>
        
        <feature id="SketchConstraintRadius" title="Radius" tooltip="Create constraint for the given radius of a circle or an arc" icon=":icons/radius_constr.png">