X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConstructionPlugin%2Faxis_widget.xml;h=c67dff3e10fc5d65576bbe76fcf452643d6090df;hb=1039115c4a6f73a56e97ba9d9e84fad11216a613;hp=44f6f0e94d6bca405d8c21adb68aea071d51113f;hpb=a5e05254be62b4bbb070e0b9e1659a6c68b587d7;p=modules%2Fshaper.git

diff --git a/src/ConstructionPlugin/axis_widget.xml b/src/ConstructionPlugin/axis_widget.xml
index 44f6f0e94..c67dff3e1 100644
--- a/src/ConstructionPlugin/axis_widget.xml
+++ b/src/ConstructionPlugin/axis_widget.xml
@@ -2,29 +2,32 @@
 
 <source>
   <toolbox id="CreationMethod">
-    <box id="AxisByPointsCase" title="By two points">
+    <box id="AxisByPointsCase" title="By two points" icon="icons/Construction/by_two_points_32x32.png">
       <shape_selector id="FirstPoint"
         label="First point"
-        icon=":icons/point.png"
+        icon="icons/Construction/point.png"
         tooltip="Select a first point"
         shape_types="vertex">
-        <selection_filter id="NoConstructionSubShapesFilter"/>
+        <validator id="GeomValidators_ConstructionComposite"/>
+        <validator id="GeomValidators_ShapeType" parameters="vertex"/>
       </shape_selector>
       <shape_selector id="SecondPoint"
         label="Second point"
-        icon=":icons/point.png"
+        icon="icons/Construction/point.png"
         tooltip="Select a second point"
         shape_types="vertex">
-        <selection_filter id="NoConstructionSubShapesFilter"/>
-        <validator id="PartSet_DifferentShapes"/>
+        <validator id="GeomValidators_ConstructionComposite"/>
+        <validator id="GeomValidators_ShapeType" parameters="vertex"/>
+        <validator id="GeomValidators_DifferentShapes"/>
       </shape_selector>
     </box>
-    <box id="AxisByCylindricalFaceCase" title="As axis of cylindrical face">
+    <box id="AxisByCylindricalFaceCase" title="As axis of cylindrical face" icon="icons/Construction/cylindrical_face_32x32.png">
       <shape_selector id="CylindricalFace"
         label="Main object" 
-        icon=":icons/circle.png" 
+        icon="icons/Construction/circle.png" 
         tooltip="Select a cylindrical object"
-        shape_types="face solid shell">
+        shape_types="face">
+        <validator id="GeomValidators_Face" parameters="cylinder"/>
       </shape_selector>
     </box>
   </toolbox>