X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Frevolutioncut_widget.xml;h=d0ad1d37a590065c6223e62aead76617f0919511;hb=530f5aff42069e844c4a4ef164088ea23ba0e2dd;hp=899a6ab571a83abbb5dbd16ee9f3c76989b9c11d;hpb=a48ce23147176e95a71738cd1aeab5ff79a58b3a;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/revolutioncut_widget.xml b/src/FeaturesPlugin/revolutioncut_widget.xml
index 899a6ab57..d0ad1d37a 100644
--- a/src/FeaturesPlugin/revolutioncut_widget.xml
+++ b/src/FeaturesPlugin/revolutioncut_widget.xml
@@ -3,50 +3,52 @@
 <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">
     </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_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="from_angle"
+            id="to_angle"
             label="Angle"
             step="1.0"
             default="10"
-            icon=":icons/angle_down.png"
-            tooltip="From angle">
+            icon=":icons/angle_up.png"
+            tooltip="To angle">
           </doublevalue>
         </groupbox>
         <groupbox>
           <doublevalue
-            id="to_angle"
+            id="from_angle"
             label="Angle"
             step="1.0"
             default="0"
-            icon=":icons/angle_up.png"
-            tooltip="To angle">
+            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">
-        <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>
+      <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"
@@ -56,10 +58,10 @@
                           default="&lt;sketch&gt;">
             <validator id="GeomValidators_Face" parameters="plane"/>
           </shape_selector>
-          <doublevalue id="from_offset" label="Offset"
+          <doublevalue id="from_offset" label="Angle"
             step="1.0" default="0"
             icon=":icons/angle_up_down.png"
-            tooltip="Offset for bounding plane">
+            tooltip="Angle for &quot;from&quot; bounding plane">
           </doublevalue>
         </groupbox>
         <groupbox title="To">
@@ -71,16 +73,16 @@
                           default="&lt;sketch&gt;">
             <validator id="GeomValidators_Face" parameters="plane"/>
           </shape_selector>
-          <doublevalue  id="to_offset" label="Offset"
+          <doublevalue  id="to_offset" label="Angle"
             step="1.0" default="0"
             icon=":icons/angle_up_down.png"
-            tooltip="Offset for bounding plane">
+            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"
@@ -88,5 +90,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>