]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Merge branch 'master' of newgeom:newgeom.git
authorsbh <sergey.belash@opencascade.com>
Wed, 24 Sep 2014 11:53:49 +0000 (15:53 +0400)
committersbh <sergey.belash@opencascade.com>
Wed, 24 Sep 2014 11:53:49 +0000 (15:53 +0400)
Conflicts:
src/SketchPlugin/plugin-Sketch.xml

1  2 
src/SketchPlugin/plugin-Sketch.xml
src/XGUI/XGUI_Workshop.cpp

index 72b96c18b9b062975da571a8bfb12973bea3df91,307e60674504929460db63478ef00745907d20f8..6ec011c98b66abc10368e815373c1b880b455516
          <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">
Simple merge