X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FFeaturesPlugin%2Fextrusionfuse_widget.xml;h=5e9d7355698c63a689089848627233e0230331e6;hb=44b3aa1055279520a1b3d7a6a77f90bf8db5d087;hp=e65b6b4af990bcdcb52914206dae5522a2fd9ade;hpb=2714903267d23cd0c81166c506fb3edd1e069d40;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/extrusionfuse_widget.xml b/src/FeaturesPlugin/extrusionfuse_widget.xml
index e65b6b4af..5e9d73556 100644
--- a/src/FeaturesPlugin/extrusionfuse_widget.xml
+++ b/src/FeaturesPlugin/extrusionfuse_widget.xml
@@ -1,24 +1,3 @@
-<!--
-Copyright (C) 2014-2017  CEA/DEN, EDF R&D
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-See http:##www.salome-platform.org/ or
-email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
--->
-
 <source>
   <groupbox title="Extrusion">
     <sketch_launcher id="sketch"
@@ -26,7 +5,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
       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."
+3. An existing result shape of kind: wires/edge/vertices. Extrusion will be filled by it."
       shape_types="vertices edges wires faces shells compounds">
       <validator id="FeaturesPlugin_ValidatorCompositeLauncher" parameters="base,Sketch"/>
     </sketch_launcher>
@@ -34,7 +13,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
       label="Select a sketch face"
       icon="icons/Features/sketch.png"
       tooltip="Select a sketch face"
-      type_choice="vertices edges wires faces shells compounds"
+      shape_types="vertices edges wires faces shells compounds"
       concealment="true">
       <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="vertex,edge,wire,face,shell,compound"/>
     </multi_selector>
@@ -43,6 +22,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
                     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>
@@ -69,15 +49,16 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
           </doublevalue>
         </groupbox>
       </box>
-      <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon="icons/Features/plane_inverted_32x32.png">
+      <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="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" step="1.0" default="0"
@@ -88,11 +69,12 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
         <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" step="1.0" default="0"
@@ -101,13 +83,15 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
           </doublevalue>
         </groupbox>
       </box>
+      <box id="ThroughAll" title="Through all" icon="icons/Features/extrusion_throughall_32x32.png">
+      </box>
     </toolbox>
   </groupbox>
   <multi_selector id="main_objects"
     label="Fuse with:"
     icon="icons/Features/cut_shape.png"
     tooltip="Objects to Fuse"
-    type_choice="Objects"
+    shape_types="Objects"
     use_choice="false"
     concealment="true"
     main_argument="true">