X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Frevolution_widget.xml;h=80ad354cd995d1c865a3656e431fb1e9f77609bc;hb=5a4405dc843479d921b53b83c181cbe9359414fe;hp=66bd6be2c0d12493f275330a6367519e001c3e4a;hpb=49900dba3be9f2721f34d122f1d20475403f8fd7;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/revolution_widget.xml b/src/FeaturesPlugin/revolution_widget.xml
index 66bd6be2c..80ad354cd 100644
--- a/src/FeaturesPlugin/revolution_widget.xml
+++ b/src/FeaturesPlugin/revolution_widget.xml
@@ -1,58 +1,97 @@
 <!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
 
 <source>
-  <multi_selector id="base"
-    label="Select a sketch face"
-    icon=":icons/sketch.png"
-    tooltip="Select a sketch face"
-    type_choice="Faces">
-    <validator id="PartSet_SketchEntityValidator" parameters="Sketch"/>
-  </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>
-  <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="10"
-      icon=":icons/angle_up.png"
-      tooltip="Angle">
-    </doublevalue>
-  </groupbox>
-  <validator id="GeomValidators_ZeroOffset" parameters="from_object,to_object,from_angle,to_angle"/>
-</source>
\ No newline at end of file
+  <toolbox id="CreationMethod">
+    <box id="ByAngles" title="By angles" icon=":icons/angle_up_down_32x32.png">
+      <multi_selector id="base"
+        label="Select a sketch face"
+        icon=":icons/sketch.png"
+        tooltip="Select a sketch face"
+        type_choice="Faces">
+        <validator id="PartSet_SketchEntityValidator" parameters="Sketch"/>
+      </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>
+      <groupbox>
+        <doublevalue
+          id="to_angle"
+          label="Angle"
+          step="1.0"
+          default="360"
+          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">
+      <multi_selector id="base"
+        label="Select a sketch face"
+        icon=":icons/sketch.png"
+        tooltip="Select a sketch face"
+        type_choice="Faces">
+        <validator id="PartSet_SketchEntityValidator" parameters="Sketch"/>
+      </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>
+      <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;base 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;base 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>
+  <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,ByAngles,base,to_angle,from_angle,to_object,to_offset,from_object,from_offset"/>
+</source>