X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConstructionPlugin%2Faxis_widget.xml;h=b683cceed5d72b9cb7e935821273f66c0183a17b;hb=eef14b29d313b9dd16453d12f20aa02383ee139c;hp=f612a83d08e470a660ae85390bfd57f6d2badecc;hpb=3190305afd2b86b05365e51589822856d6937a1b;p=modules%2Fshaper.git

diff --git a/src/ConstructionPlugin/axis_widget.xml b/src/ConstructionPlugin/axis_widget.xml
index f612a83d0..b683cceed 100644
--- a/src/ConstructionPlugin/axis_widget.xml
+++ b/src/ConstructionPlugin/axis_widget.xml
@@ -1,19 +1,35 @@
 <!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
 
 <source>
-  <shape_selector id="firstPoint"
-    label="First point"
-    icon=":icons/point.png"
-    tooltip="Select a first point"
-    shape_types="vertex">
-    <selection_filter id="NoConstructionSubShapesFilter"/>
-  </shape_selector>
-  <shape_selector id="secondPoint"
-    label="Second point"
-    icon=":icons/point.png"
-    tooltip="Select a second point"
-    shape_types="vertex">
-    <selection_filter id="NoConstructionSubShapesFilter"/>
-    <validator id="PartSet_DifferentObjects"/>
-  </shape_selector>
+  <toolbox id="CreationMethod">
+    <box id="AxisByPointsCase" title="By two points" icon=":icons/by_two_points_32x32.png">
+      <shape_selector id="FirstPoint"
+        label="First point"
+        icon=":icons/point.png"
+        tooltip="Select a first point"
+        shape_types="vertex">
+        <validator id="GeomValidators_ConstructionComposite"/>
+        <validator id="GeomValidators_ShapeType" parameters="vertex"/>
+      </shape_selector>
+      <shape_selector id="SecondPoint"
+        label="Second point"
+        icon=":icons/point.png"
+        tooltip="Select a second point"
+        shape_types="vertex">
+        <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" icon=":icons/cylindrical_face_32x32.png">
+      <shape_selector id="CylindricalFace"
+        label="Main object" 
+        icon=":icons/circle.png" 
+        tooltip="Select a cylindrical object"
+        shape_types="face solid shell">
+        <validator id="GeomValidators_Face" parameters="cylinder"/>
+      </shape_selector>
+    </box>
+  </toolbox>
+  
 </source>