Issue #1343. Improvement of Extrusion and Revolution operations: sketch creator setSe...

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

diff --git a/src/FeaturesPlugin/revolutioncut_widget.xml b/src/FeaturesPlugin/revolutioncut_widget.xml
index 9f497e864e53849c3f4bed10c15ed0d2db1ed492..9c8ab5febcf5ece4a24b84e464acd6facb68fcab 100644 (file)
--- a/src/FeaturesPlugin/revolutioncut_widget.xml
+++ b/src/FeaturesPlugin/revolutioncut_widget.xml
@@ -3,10 +3,21 @@
 <source>
   <groupbox title="Revolution">
     <sketch_launcher id="sketch"
-      label="Sketch"
-      icon=":icons/sketch.png"
-      tooltip="Create or edit a 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/edge/vertices.Extrusion will be filled by it."
+      shape_types="face objects">
+      <validator id="FeaturesPlugin_ValidatorCompositeLauncher" parameters="base,Sketch"/>
     </sketch_launcher>
+    <composite_multi_selector id="base"
+      label="Select a sketch face"
+      icon=":icons/sketch.png"
+      tooltip="Select a sketch face"
+      type_choice="Faces Objects">
+      <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="face,shell"/>
+    </composite_multi_selector>
     <shape_selector id="axis_object"
                     icon=":icons/axis.png"
                     label="Axis"
@@ -16,14 +27,13 @@
       <validator id="GeomValidators_ShapeType" parameters="line"/>
     </shape_selector>
     <toolbox id="CreationMethod">
-      <box id="ByAngles" title="By angles" icon=":icons/angle_up.png">
+      <box id="ByAngles" title="By angles" icon=":icons/angle_up_down_32x32.png">
         <groupbox>
           <doublevalue
             id="to_angle"
             label="Angle"
-            min="0"
             step="1.0"
-            default="0"
+            default="10"
             icon=":icons/angle_up.png"
             tooltip="To angle">
           </doublevalue>
@@ -32,49 +42,48 @@
           <doublevalue
             id="from_angle"
             label="Angle"
-            min="0"
             step="1.0"
-            default="10"
+            default="0"
             icon=":icons/angle_down.png"
             tooltip="From angle">
           </doublevalue>
         </groupbox>
       </box>
-      <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
-        <groupbox title="To">
-          <shape_selector id="to_object"
-                          icon=":icons/plane_inverted.png"
+      <box id="ByPlanesAndOffsets" title="By bounding planes and angles" icon=":icons/plane_inverted_32x32.png">
+        <groupbox title="From">
+          <shape_selector id="from_object"
+                          icon=":icons/plane.png"
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
                           default="&lt;sketch&gt;">
             <validator id="GeomValidators_Face" parameters="plane"/>
           </shape_selector>
-          <doublevalue  id="to_offset" label="Offset"
-            min="0" step="1.0" default="0"
-            icon=":icons/angle_up.png"
-            tooltip="Offset for bounding plane">
+          <doublevalue id="from_offset" label="Angle"
+            step="1.0" default="0"
+            icon=":icons/angle_up_down.png"
+            tooltip="Angle for &quot;from&quot; bounding plane">
           </doublevalue>
         </groupbox>
-        <groupbox title="From">
-          <shape_selector id="from_object"
-                          icon=":icons/plane.png"
+        <groupbox title="To">
+          <shape_selector id="to_object"
+                          icon=":icons/plane_inverted.png"
                           label="Plane face"
                           tooltip="Bounding plane (select a planar face)"
                           shape_types="face"
                           default="&lt;sketch&gt;">
             <validator id="GeomValidators_Face" parameters="plane"/>
           </shape_selector>
-          <doublevalue id="from_offset" label="Offset"
-            min="0" step="1.0" default="0"
-            icon=":icons/angle_down.png"
-            tooltip="Offset for bounding plane">
+          <doublevalue  id="to_offset" label="Angle"
+            step="1.0" default="0"
+            icon=":icons/angle_up_down.png"
+            tooltip="Angle for &quot;to&quot; bounding plane">
           </doublevalue>
         </groupbox>
       </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"
@@ -82,5 +91,6 @@
     concealment="true">
     <validator id="GeomValidators_ShapeType" parameters="solid"/>
   </multi_selector>
-  <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,ByAngles,to_angle,from_angle,to_object,to_offset,from_object,from_offset"/>
+  <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>