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

diff --git a/src/FeaturesPlugin/revolutioncut_widget.xml b/src/FeaturesPlugin/revolutioncut_widget.xml
index 9f0ca3732..47b7f6873 100644
--- a/src/FeaturesPlugin/revolutioncut_widget.xml
+++ b/src/FeaturesPlugin/revolutioncut_widget.xml
@@ -5,46 +5,80 @@
     <sketch_launcher id="sketch"
       label="Sketch"
       icon=":icons/sketch.png"
-      tooltip="Create or edit a sketch">/>
+      tooltip="Create or edit a sketch">
     </sketch_launcher>
-    <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"
-                      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/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"
+            label="Angle"
+            step="1.0"
+            default="10"
+            icon=":icons/angle_up.png"
+            tooltip="To angle">
+          </doublevalue>
+        </groupbox>
+        <groupbox>
+          <doublevalue
+            id="from_angle"
+            label="Angle"
+            step="1.0"
+            default="0"
+            icon=":icons/angle_down.png"
+            tooltip="From angle">
+          </doublevalue>
+        </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"
+                          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="Angle"
+            step="1.0" default="0"
+            icon=":icons/angle_up_down.png"
+            tooltip="Angle for &quot;from&quot; bounding plane">
+          </doublevalue>
+        </groupbox>
+        <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="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"
     label="Cut from:"
@@ -52,5 +86,7 @@
     tooltip="Objects to Cut"
     type_choice="Solids"
     concealment="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"/>
 </source>