X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Fextrusion_widget.xml;h=4a566d21e1c5be69d6ea92747957fead1b0e22d3;hb=64e46b3895c0492f991b27503206f6210f5b7830;hp=95bc4841bc4548de04bdf05f6c6b71f554a6268d;hpb=41695176c748943485f8844fea6e89cef9a0b6f5;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/extrusion_widget.xml b/src/FeaturesPlugin/extrusion_widget.xml
index 95bc4841b..4a566d21e 100644
--- a/src/FeaturesPlugin/extrusion_widget.xml
+++ b/src/FeaturesPlugin/extrusion_widget.xml
@@ -1,78 +1,96 @@
-<!-- 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/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="Select a sketch face"
-    icon=":icons/sketch.png"
-    tooltip="Select a sketch face"
-    type_choice="Faces">
-    <validator id="PartSet_SketchEntityValidator" parameters="Sketch"/>
+                  label="Base objects:"
+                  tooltip="Select a base 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>
+  <shape_selector id="direction_object"
+                  icon="icons/Features/axis.png"
+                  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>
   <toolbox id="CreationMethod">
-    <box id="BySizes" title="By sizes" icon=":icons/dimension_up.png">
+    <box id="BySizes"
+         title="By sizes"
+         icon="icons/Features/dimension_up_down_32x32.png">
       <groupbox>
-        <doublevalue
-          id="to_size"
-          label="Size"
-          min="0"
-          step="1.0"
-          default="10"
-          icon=":icons/dimension_up.png"
-          tooltip="Size">
-        </doublevalue>
+        <doublevalue id="to_size"
+                     label="Size"
+                     step="1.0"
+                     default="10"
+                     icon="icons/Features/dimension_up.png"
+                     tooltip="To size"/>
       </groupbox>
       <groupbox>
-        <doublevalue
-          id="from_size"
-          label="Size"
-          min="0"
-          step="1.0"
-          default="0"
-          icon=":icons/dimension_down.png"
-          tooltip="Size">
-        </doublevalue>
+        <doublevalue id="from_size"
+                     label="Size"
+                     step="1.0"
+                     default="0"
+                     icon="icons/Features/dimension_down.png"
+                     tooltip="From size"/>
       </groupbox>
     </box>
-    <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted.png">
-      <groupbox title="To">
-        <shape_selector id="to_object"
-                        icon=":icons/plane_inverted.png"
-                        label="Plane face"
-                        tooltip="Select a planar face"
+    <box id="ByPlanesAndOffsets"
+         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="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="to_offset"
-          label="Offset"
-          min="0"
-          step="1.0"
-          default="0"
-          icon=":icons/dimension_up.png"
-          tooltip="Offset">
-        </doublevalue>
+        <doublevalue id="from_offset"
+                     label="Offset"
+                     step="1.0"
+                     default="0"
+                     icon="icons/Features/dimension_up_down.png"
+                     tooltip="Offset for &quot;from&quot; bounding plane"/>
       </groupbox>
-      <groupbox title="From">
-        <shape_selector id="from_object"
-                        icon=":icons/plane.png"
-                        label="Plane face"
-                        tooltip="Select a planar face"
+      <groupbox title="To">
+        <shape_selector id="to_object"
+                        icon="icons/Features/plane_inverted.png"
+                        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="from_offset"
-          label="Offset"
-          min="0"
-          step="1.0"
-          default="0"
-          icon=":icons/dimension_down.png"
-          tooltip="Offset">
-        </doublevalue>
+        <doublevalue id="to_offset"
+                     label="Offset"
+                     step="1.0"
+                     default="0"
+                     icon="icons/Features/dimension_up_down.png"
+                     tooltip="Offset for &quot;to&quot; bounding plane"/>
       </groupbox>
-    </box>    
+    </box>
   </toolbox>
-  <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,BySizes,to_size,from_size,to_object,to_offset,from_object,from_offset"/>
+  <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,BySizes,base,to_size,from_size,to_object,to_offset,from_object,from_offset"/>
+  <validator id="FeaturesPlugin_ValidatorExtrusionDir" parameters="base,direction_object"/>
+  <validator id="FeaturesPlugin_ValidatorBaseForGenerationSketchOrSketchObjects" parameters="base"/>
 </source>