X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Frotation_widget.xml;h=2ec8b40fdb16677ba1789b71bf6a4c15aa9d6baa;hb=21a0c85b52bb93f94680e2342370764e6510e387;hp=2b38c9a7ca8d8d30f583e85f84eb9d03b8365fbc;hpb=f9be1b7f715b7c630906cfde5a1c4ed25e1a1e63;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/rotation_widget.xml b/src/FeaturesPlugin/rotation_widget.xml
index 2b38c9a7c..2ec8b40fd 100755
--- a/src/FeaturesPlugin/rotation_widget.xml
+++ b/src/FeaturesPlugin/rotation_widget.xml
@@ -1,26 +1,72 @@
 <!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+<!-- Modified by Clarisse Genrault (CEA) : 02 Mar 2017 -->
 
 <source>
-  <multi_selector id="base"
-    label="Select a sketch face"
-    icon=":icons/cut_shape.png"
-    tooltip="Select a sketch face"
-    type_choice="Solids">
-  </multi_selector>
-  <shape_selector id="axis_object"
-                  icon=":icons/axis.png"
+  <toolbox id="CreationMethod">
+    <box id="ByAxisAndAngle"
+         title="By an axis and an angle"
+         icon="icons/Features/rotation_axis_32x32.png">
+      <multi_selector id="main_objects"
+                      label="Main objects"
+                      icon=""
+                      tooltip="Select solid objects"
+                      type_choice="objects"
+                      concealment="true">
+        <validator id="FeaturesPlugin_ValidatorTransform"/>
+      </multi_selector>
+      <shape_selector id="axis_object"
+                  icon="icons/Features/axis.png"
                   label="Axis"
                   tooltip="Select an edge for axis"
                   shape_types="edge"
                   default="">
-  </shape_selector>
-  <doublevalue
-    id="angle"
-    label="Angle"
-    min="0"
-    step="1.0"
-    default="0"
-    icon=":icons/radius.png"
-    tooltip="Angle">
-  </doublevalue>
-</source>
\ No newline at end of file
+        <validator id="GeomValidators_ShapeType" parameters="line"/>
+      </shape_selector>
+      <doublevalue id="angle"
+                   label="Angle"
+                   step="1.0"
+                   default="0"
+                   icon="icons/Features/angle.png"
+                   tooltip="Angle">
+      </doublevalue>
+    </box>
+    <box id="ByThreePoints"
+         title="By a center and two points"
+         icon="icons/Features/rotation_3pt_32x32.png">
+      <multi_selector id="main_objects"
+                      label="Main objects"
+                      icon=""
+                      tooltip="Select solid objects"
+                      type_choice="objects"
+                      concealment="true">
+        <validator id="FeaturesPlugin_ValidatorTransform"/>
+      </multi_selector>
+      <shape_selector id="center_point"
+                      label="Center point"
+                      icon="icons/Features/point.png"
+                      tooltip="Select a center point"
+                      shape_types="vertex">
+        <validator id="GeomValidators_ConstructionComposite"/>
+        <validator id="GeomValidators_ShapeType" parameters="vertex"/>
+      </shape_selector>
+      <shape_selector id="start_point"
+                      label="Start point"
+                      icon="icons/Features/point.png"  
+                      tooltip="Select a starting point"
+                      shape_types="vertex">
+        <validator id="GeomValidators_ConstructionComposite"/>
+        <validator id="GeomValidators_ShapeType" parameters="vertex"/>
+        <validator id="GeomValidators_DifferentShapes"/>
+      </shape_selector>
+      <shape_selector id="end_point"
+                      label="End point"
+                      icon="icons/Features/point.png"
+                      tooltip="Select an end point"
+                      shape_types="vertex">
+        <validator id="GeomValidators_ConstructionComposite"/>
+        <validator id="GeomValidators_ShapeType" parameters="vertex"/>
+        <validator id="GeomValidators_DifferentShapes"/>
+      </shape_selector>
+    </box>
+  </toolbox>
+</source>