X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2Fplugin-Sketch.xml;h=45cb3cec847c52b5fa4f71ba300640e64c82d750;hb=b5893b0a30fac08134c24de4565cb513a43affa6;hp=416f478d370ea9460c3ac876fb2fdb1809a90bb4;hpb=01460d486f1f4e3ba95ef528bfe71cdc9674da58;p=modules%2Fshaper.git

diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index 416f478d3..45cb3cec8 100644
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -32,7 +32,7 @@
 
       <!-- SketchPoint -->
       <feature id="SketchPoint" title="Point" tooltip="Create point" icon="icons/Sketch/point.png">
-        <sketch-2dpoint_selector id="PointCoordindates" accept_expressions="0" title="Point" tooltip="Point coordinates"
+        <sketch-2dpoint_selector id="PointCoordinates" accept_expressions="0" title="Point" tooltip="Point coordinates"
                                  enable_value="enable_by_preferences"/>
         <boolvalue id="Auxiliary" label="Auxiliary" default="false" tooltip="Construction element" obligatory="0"/>
       </feature>
@@ -76,7 +76,7 @@
                icon="icons/Sketch/circle.png"
                title="Circle"
                tooltip="Create circle">
-        <toolbox id="circle_type" modified_in_edit="false">
+        <toolbox id="circle_type" modified_in_edit="edit_circle_type">
           <box id="circle_type_by_center_and_passed_points"
                icon="icons/Sketch/circle_pt_rad_32x32.png"
                title="Center and passed points">
@@ -195,7 +195,7 @@
         title="Arc"
         tooltip="Create arc"
         icon="icons/Sketch/arc.png">
-        <toolbox id="arc_type">
+        <toolbox id="arc_type" modified_in_edit="edit_arc_type">
           <box id="by_center_and_points"
                icon="icons/Sketch/arc_base_32x32.png"
                title="Center and two points">
@@ -205,36 +205,40 @@
                                      tooltip="Center of a circle"
                                      accept_expressions="0"
                                      enable_value="enable_by_preferences" />
-            <sketch-2dpoint_selector id="start_point"
+            <sketch-2dpoint_selector id="start_point_1"
                                      reference_attribute="start_point_ref"
                                      title="Start point"
                                      tooltip="Start point"
                                      accept_expressions="0"
                                      enable_value="enable_by_preferences"/>
-            <sketch-2dpoint_selector id="end_point"
+            <sketch-2dpoint_selector id="end_point_1"
                                      reference_attribute="end_point_ref"
                                      title="End point"
                                      tooltip="End point"
                                      accept_expressions="0"
-                                     enable_value="enable_by_preferences"/>
-            <validator id="GeomValidators_Different" parameters="center_point,start_point,end_point"/>
+                                     enable_value="enable_by_preferences">
+              <validator id="SketchPlugin_ArcEndPointValidator" parameters="end_point_ref"/>
+              <validator id="SketchPlugin_ArcEndPointIntersectionValidator" parameters="end_point_ref"/>
+            </sketch-2dpoint_selector>
+            <validator id="GeomValidators_Different" parameters="center_point,start_point_1,end_point_1"/>
           </box>
           <box id="by_three_points"
                icon="icons/Sketch/arc_3pt_32x32.png"
                title="Three points on arc">
-            <sketch-2dpoint_selector id="start_point"
+            <sketch-2dpoint_selector id="start_point_2"
                                      reference_attribute="start_point_ref"
                                      title="Start point"
                                      tooltip="Start point"
                                      accept_expressions="0"
                                      enable_value="enable_by_preferences"/>
-            <sketch-2dpoint_selector id="end_point"
+            <sketch-2dpoint_selector id="end_point_2"
                                      reference_attribute="end_point_ref"
                                      title="End point"
                                      tooltip="End point"
                                      accept_expressions="0"
                                      enable_value="enable_by_preferences">
-              <validator id="SketchPlugin_DifferentReference" parameters="start_point_ref,end_point_ref"/>
+              <validator id="GeomValidators_Different" parameters="start_point_2,end_point_2"/>
+              <validator id="SketchPlugin_DifferentPointReference" parameters="start_point_ref,end_point_ref"/>
             </sketch-2dpoint_selector>
             <sketch-2dpoint_selector id="passed_point"
                                      reference_attribute="passed_point_ref"
@@ -245,7 +249,7 @@
               <validator id="SketchPlugin_DifferentReference" parameters="start_point_ref,end_point_ref,passed_point_ref"/>
               <validator id="SketchPlugin_ThirdPointValidator" parameters="passed_point_ref"/>
             </sketch-2dpoint_selector>
-            <validator id="GeomValidators_Different" parameters="start_point,end_point,passed_point"/>
+            <validator id="GeomValidators_Different" parameters="start_point_2,end_point_2,passed_point"/>
           </box>
           <box id="by_tangent_edge"
                icon="icons/Sketch/arc_tang_32x32.png"
@@ -256,12 +260,14 @@
                                    shape_types="vertex">
               <validator id="SketchPlugin_ArcTangentPoint"/>
             </sketch_shape_selector>
-            <sketch-2dpoint_selector id="end_point"
+            <sketch-2dpoint_selector id="end_point_3"
                                      reference_attribute="end_point_ref"
                                      title="End point"
                                      tooltip="End point"
                                      accept_expressions="0"
-                                     enable_value="enable_by_preferences"/>
+                                     enable_value="enable_by_preferences">
+              <validator id="SketchPlugin_ArcEndPointValidator" parameters="end_point_ref"/>
+            </sketch-2dpoint_selector>
           </box>
         </toolbox>
         <labelvalue id="radius"
@@ -308,8 +314,8 @@
                icon="icons/Sketch/split.png">
         <sketch_sub_shape_selector
             id="ConstraintValue"
-            label="Split feature"
-            tooltip="Select feature for split"
+            label="Segment"
+            tooltip="Select segment for split"
             shape_types="edge"
             use_external="false"
             use_graphic_intersection="false">
@@ -323,8 +329,8 @@
                icon="icons/Sketch/trim.png">
         <sketch_feature_point_selector
             id="SelectedObject"
-            label="Split feature"
-            tooltip="Select feature for split"
+            label="Segment"
+            tooltip="Select segment for trim"
             shape_types="edge"
             use_external="false"
             use_graphic_intersection="true">
@@ -602,6 +608,7 @@
         <sketch_shape_selector id="ConstraintEntityA"
             label="Line" tooltip="Select a line" shape_types="edge" use_external="false">
           <validator id="GeomValidators_ShapeType" parameters="line"/>
+          <validator id="SketchPlugin_HasNoConstraint" parameters="SketchConstraintHorizontal, SketchConstraintVertical"/>
         </sketch_shape_selector>
         <validator id="PartSet_HVDirSelection"/>
       </feature>
@@ -611,6 +618,7 @@
         <sketch_shape_selector id="ConstraintEntityA"
             label="Line" tooltip="Select a line" shape_types="edge" use_external="false">
           <validator id="GeomValidators_ShapeType" parameters="line"/>
+          <validator id="SketchPlugin_HasNoConstraint" parameters="SketchConstraintHorizontal, SketchConstraintVertical"/>
         </sketch_shape_selector>
         <validator id="PartSet_HVDirSelection"/>
       </feature>