Issue #1343 Fixes for creating extrusion on vertex

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

diff --git a/src/FeaturesPlugin/revolutioncut_widget.xml b/src/FeaturesPlugin/revolutioncut_widget.xml
index 00a98448665fc9b71fbbc401ad95bf98e0823356..d0ad1d37a590065c6223e62aead76617f0919511 100644 (file)
--- a/src/FeaturesPlugin/revolutioncut_widget.xml
+++ b/src/FeaturesPlugin/revolutioncut_widget.xml
@@ -15,18 +15,18 @@
       icon=":icons/sketch.png"
       tooltip="Select a sketch face"
       type_choice="Faces Objects">
-      <validator id="FeaturesPlugin_ValidatorExtrusionBase" parameters="Sketch"/>
+      <validator id="FeaturesPlugin_ValidatorCompositeLauncher" parameters="face,shell"/>
     </composite_multi_selector>
+    <shape_selector id="axis_object"
+                    icon=":icons/axis.png"
+                    label="Axis"
+                    tooltip="Select an edge for axis"
+                    shape_types="edge"
+                    default="">
+      <validator id="GeomValidators_ShapeType" parameters="line"/>
+    </shape_selector>
     <toolbox id="CreationMethod">
       <box id="ByAngles" title="By angles" icon=":icons/angle_up_down_32x32.png">
-        <shape_selector id="axis_object"
-                        icon=":icons/axis.png"
-                        label="Axis"
-                        tooltip="Select an edge for axis"
-                        shape_types="edge"
-                        default="">
-          <validator id="GeomValidators_ShapeType" parameters="line"/>
-        </shape_selector>
         <groupbox>
           <doublevalue
             id="to_angle"
@@ -49,14 +49,6 @@
         </groupbox>
       </box>
       <box id="ByPlanesAndOffsets" title="By bounding planes and angles" icon=":icons/plane_inverted_32x32.png">
-        <shape_selector id="axis_object"
-                        icon=":icons/axis.png"
-                        label="Axis"
-                        tooltip="Select an edge for axis"
-                        shape_types="edge"
-                        default="">
-          <validator id="GeomValidators_ShapeType" parameters="line"/>
-        </shape_selector>
         <groupbox title="From">
           <shape_selector id="from_object"
                           icon=":icons/plane.png"
@@ -90,7 +82,7 @@
       </box>
     </toolbox>
   </groupbox>
-  <multi_selector id="boolean_objects"
+  <multi_selector id="main_objects"
     label="Cut from:"
     icon=":icons/cut_shape.png"
     tooltip="Objects to Cut"
@@ -99,4 +91,5 @@
     <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_ValidatorCanBeEmpty" parameters="CreationMethod,ByAngles,base,to_object,from_object"/>
 </source>