X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Fextrusion_widget.xml;h=4a566d21e1c5be69d6ea92747957fead1b0e22d3;hb=539608b3f0642b0fc2d8c914411e621e01d5c8e5;hp=5951fccb1ee1558a076a91ad49e1e0bb3e5d0b20;hpb=63c0bd9b8a64cc4b2c6f4177a7f727bef87d60d9;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/extrusion_widget.xml b/src/FeaturesPlugin/extrusion_widget.xml
index 5951fccb1..4a566d21e 100644
--- a/src/FeaturesPlugin/extrusion_widget.xml
+++ b/src/FeaturesPlugin/extrusion_widget.xml
@@ -1,19 +1,23 @@
-<!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
-
 <source>
   <sketch_launcher id="sketch"
                    attribute_list_id="base"
                    label="Select:&lt;br /&gt;
 1. Planar face of non-sketch object or a plane. Sketch creation will be started.&lt;br /&gt;
 2. An existing sketch face or contour. Extrusion will be filled by it.&lt;br /&gt;
-3. An existing result shape of kind: wires/edge/vertices.Extrusion will be filled by it."
-                   shape_types="wires faces objects">
+3. An existing result shape of kind: wires/edges/vertices. Extrusion will be filled by it."
+                  shape_types="Vertices Edges Faces|Wires"
+                  type_icons=":/icons/extrusion_vertex32.png :/icons/extrusion_edge32.png :/icons/extrusion_face32.png"
+                  default_type = "2"
+                  use_choice="true">
     <validator id="FeaturesPlugin_ValidatorCompositeLauncher" parameters="base,Sketch"/>
   </sketch_launcher>
   <multi_selector id="base"
                   label="Base objects:"
                   tooltip="Select a base objects"
-                  type_choice="wires faces objects"
+                  shape_types="Vertices Edges Faces|Wires"
+                  type_icons=":/icons/extrusion_vertex32.png :/icons/extrusion_edge32.png :/icons/extrusion_face32.png"
+                  default_type = "2"
+                  use_choice="true"
                   concealment="true">
     <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="vertex,edge,wire,face,shell,compound"/>
   </multi_selector>
@@ -22,6 +26,7 @@
                   label="Direction"
                   tooltip="Select an edge for direction"
                   shape_types="edge"
+                  geometrical_selection="true"
                   default="&lt;base normal&gt;">
     <validator id="GeomValidators_ShapeType" parameters="empty,line"/>
   </shape_selector>
@@ -47,16 +52,17 @@
       </groupbox>
     </box>
     <box id="ByPlanesAndOffsets"
-         title="By bounding planes and offsets"
+         title="By bounding faces and offsets"
          icon="icons/Features/plane_inverted_32x32.png">
       <groupbox title="From">
         <shape_selector id="from_object"
                         icon="icons/Features/plane.png"
-                        label="Plane face"
-                        tooltip="Bounding plane (select a planar face)"
+                        label="From face"
+                        tooltip="From face"
                         shape_types="face"
+                        geometrical_selection="true"
                         default="&lt;base sketch&gt;">
-          <validator id="GeomValidators_Face" parameters="plane"/>
+          <validator id="FeaturesPlugin_ValidatorExtrusionBoundary"/>
         </shape_selector>
         <doublevalue id="from_offset"
                      label="Offset"
@@ -68,11 +74,12 @@
       <groupbox title="To">
         <shape_selector id="to_object"
                         icon="icons/Features/plane_inverted.png"
-                        label="Plane face"
-                        tooltip="Bounding plane (select a planar face)"
+                        label="To face"
+                        tooltip="To face"
                         shape_types="face"
+                        geometrical_selection="true"
                         default="&lt;base sketch&gt;">
-          <validator id="GeomValidators_Face" parameters="plane"/>
+          <validator id="FeaturesPlugin_ValidatorExtrusionBoundary"/>
         </shape_selector>
         <doublevalue id="to_offset"
                      label="Offset"
@@ -84,5 +91,6 @@
     </box>
   </toolbox>
   <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,BySizes,base,to_size,from_size,to_object,to_offset,from_object,from_offset"/>
-  <validator id="FeaturesPlugin_ValidatorCanBeEmpty" parameters="base,direction_object"/>
+  <validator id="FeaturesPlugin_ValidatorExtrusionDir" parameters="base,direction_object"/>
+  <validator id="FeaturesPlugin_ValidatorBaseForGenerationSketchOrSketchObjects" parameters="base"/>
 </source>