Merge branch 'master' into V9_3_BR

[modules/shaper.git] / src / FeaturesPlugin / revolutionfuse_widget.xml

diff --git a/src/FeaturesPlugin/revolutionfuse_widget.xml b/src/FeaturesPlugin/revolutionfuse_widget.xml
index 1a6055aca205263df7e037be158d4e44de67adfa..575c6c4bf37718d97e5db09cd64328184b3505d8 100644 (file)
--- a/src/FeaturesPlugin/revolutionfuse_widget.xml
+++ b/src/FeaturesPlugin/revolutionfuse_widget.xml
@@ -1,5 +1,3 @@
-<!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
-
 <source>
   <groupbox title="Revolution">
     <sketch_launcher id="sketch"
@@ -8,21 +6,23 @@
 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 face objects">
+      shape_types="vertices edges wires faces shells compounds">
       <validator id="FeaturesPlugin_ValidatorCompositeLauncher" parameters="base,Sketch"/>
     </sketch_launcher>
     <multi_selector id="base"
       label="Select a sketch face"
       icon="icons/Features/sketch.png"
       tooltip="Select a sketch face"
-      type_choice="wires faces objects">
-      <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="vertex,edge,wire,face,shell"/>
+      type_choice="vertices edges wires faces shells compounds"
+      concealment="true">
+      <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="vertex,edge,wire,face,shell,compound"/>
     </multi_selector>
     <shape_selector id="axis_object"
                     icon="icons/Features/axis.png"
                     label="Axis"
                     tooltip="Select an edge for axis"
                     shape_types="edge"
+                    geometrical_selection="true"
                     default="">
       <validator id="GeomValidators_ShapeType" parameters="line"/>
     </shape_selector>
@@ -56,6 +56,7 @@
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
+                          geometrical_selection="true"
                           default="&lt;sketch&gt;">
             <validator id="GeomValidators_Face" parameters="plane"/>
           </shape_selector>
@@ -71,6 +72,7 @@
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
+                          geometrical_selection="true"
                           default="&lt;sketch&gt;">
             <validator id="GeomValidators_Face" parameters="plane"/>
           </shape_selector>
@@ -87,9 +89,12 @@
     label="Fuse with:"
     icon="icons/Features/cut_shape.png"
     tooltip="Objects to Fuse"
-    type_choice="Solids"
-    concealment="true">
+    type_choice="Objects"
+    use_choice="false"
+    concealment="true"
+    main_argument="true">
     <validator id="GeomValidators_ShapeType" parameters="solid"/>
   </multi_selector>
   <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,ByAngles,sketch_selection,to_angle,from_angle,to_object,to_offset,from_object,from_offset"/>
+  <validator id="FeaturesPlugin_ValidatorBaseForGenerationSketchOrSketchObjects" parameters="base"/>
 </source>