X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Fextrusionfuse_widget.xml;h=b0c18a5c4d981744eb6f254aadf17ea394058c08;hb=ea593bc59e7e9461f6c4e2afd3f24d621edb1011;hp=d4105c496e9dfe4eceff943daf93893229886cc6;hpb=0fc732191ab734b184641afda92d024f80da812d;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/extrusionfuse_widget.xml b/src/FeaturesPlugin/extrusionfuse_widget.xml
index d4105c496..b0c18a5c4 100644
--- a/src/FeaturesPlugin/extrusionfuse_widget.xml
+++ b/src/FeaturesPlugin/extrusionfuse_widget.xml
@@ -1,5 +1,3 @@
-<!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
-
 <source>
   <groupbox title="Extrusion">
     <sketch_launcher id="sketch"
@@ -7,7 +5,7 @@
       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>
@@ -15,7 +13,7 @@
       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>
@@ -24,6 +22,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>
@@ -50,15 +49,16 @@
           </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"
@@ -69,11 +69,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" step="1.0" default="0"
@@ -88,11 +89,13 @@
     label="Fuse with:"
     icon="icons/Features/cut_shape.png"
     tooltip="Objects to Fuse"
-    type_choice="Objects"
+    shape_types="Objects"
     use_choice="false"
-    concealment="true">
+    concealment="true"
+    main_argument="true">
     <validator id="GeomValidators_ShapeType" parameters="solid"/>
   </multi_selector>
   <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,BySizes,sketch_selection,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>