X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Frevolutioncut_widget.xml;h=c3b19383ebd73881dece0904956dd2bf9836b6dc;hb=c6071088b2f55168f5706ce97802095af868b5e3;hp=9f0ca37326987894450d95158a61d35615375080;hpb=7ae8f08629e5f99575f3cec07a8b701dd9209591;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/revolutioncut_widget.xml b/src/FeaturesPlugin/revolutioncut_widget.xml
index 9f0ca3732..c3b19383e 100644
--- a/src/FeaturesPlugin/revolutioncut_widget.xml
+++ b/src/FeaturesPlugin/revolutioncut_widget.xml
@@ -1,56 +1,102 @@
-<!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
-
 <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="wires faces shells">
+      <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"
+      shape_types="wires faces shells"
+      concealment="true">
+      <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="face,shell"/>
+    </multi_selector>
     <shape_selector id="axis_object"
-                    icon=":icons/axis.png"
+                    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>
-    <groupbox title="From">
-      <shape_selector id="from_object"
-                      icon=":icons/plane.png"
-                      label="Plane face"
-                      tooltip="Select a planar face"
-                      shape_types="face"
-                      default="&lt;sketch&gt;">
-        <validator id="GeomValidators_Face" parameters="plane"/>
-      </shape_selector>
-      <doublevalue id="from_angle" label="Angle"
-        min="0" step="1.0" default="0"
-        icon=":icons/angle_down.png"
-        tooltip="Angle">
-      </doublevalue>
-    </groupbox>
-    <groupbox title="To">
-      <shape_selector id="to_object"
-                      icon=":icons/plane_inverted.png"
-                      label="Plane face"
-                      tooltip="Select a planar face"
-                      shape_types="face"
-                      default="&lt;sketch&gt;">
-        <validator id="GeomValidators_Face" parameters="plane"/>
-      </shape_selector>
-      <doublevalue  id="to_angle" label="Angle"
-        min="0" step="1.0" default="0"
-        icon=":icons/angle_up.png"
-        tooltip="Angle">
-      </doublevalue>
-    </groupbox>
+    <toolbox id="CreationMethod">
+      <box id="ByAngles" title="By angles" icon="icons/Features/angle_up_down_32x32.png">
+        <groupbox>
+          <doublevalue
+            id="to_angle"
+            label="Angle"
+            step="1.0"
+            default="10"
+            icon="icons/Features/angle_up.png"
+            tooltip="To angle">
+          </doublevalue>
+        </groupbox>
+        <groupbox>
+          <doublevalue
+            id="from_angle"
+            label="Angle"
+            step="1.0"
+            default="0"
+            icon="icons/Features/angle_down.png"
+            tooltip="From angle">
+          </doublevalue>
+        </groupbox>
+      </box>
+      <box id="ByPlanesAndOffsets" title="By bounding planes and angles" 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)"
+                          shape_types="face"
+                          geometrical_selection="true"
+                          default="&lt;sketch&gt;">
+            <validator id="GeomValidators_Face" parameters="plane"/>
+          </shape_selector>
+          <doublevalue id="from_offset" label="Angle"
+            step="1.0" default="0"
+            icon="icons/Features/angle_up_down.png"
+            tooltip="Angle for &quot;from&quot; bounding plane">
+          </doublevalue>
+        </groupbox>
+        <groupbox title="To">
+          <shape_selector id="to_object"
+                          icon="icons/Features/plane_inverted.png"
+                          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>
+          <doublevalue  id="to_offset" label="Angle"
+            step="1.0" default="0"
+            icon="icons/Features/angle_up_down.png"
+            tooltip="Angle for &quot;to&quot; bounding plane">
+          </doublevalue>
+        </groupbox>
+      </box>
+      <box id="ThroughAll" title="Through all" icon="icons/Features/revol_throughall_32x32.png">
+      </box>
+    </toolbox>
   </groupbox>
-  <multi_selector id="boolean_objects"
+  <multi_selector id="main_objects"
     label="Cut from:"
-    icon=":icons/cut_shape.png"
+    icon="icons/Features/cut_shape.png"
     tooltip="Objects to Cut"
-    type_choice="Solids"
-    concealment="true">
+    shape_types="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>