X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Frevolution_widget.xml;h=f69065d75ff8bf58b30eb63d956d1c9a8983d48a;hb=3150815dd00d5d8fa3722e052077403420663872;hp=d64ceef234b493bd0e44db33662aec2d1c3610ce;hpb=a57ebcbce92f5113504466d88dc12cc722baeddb;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/revolution_widget.xml b/src/FeaturesPlugin/revolution_widget.xml
index d64ceef23..f69065d75 100644
--- a/src/FeaturesPlugin/revolution_widget.xml
+++ b/src/FeaturesPlugin/revolution_widget.xml
@@ -1,97 +1,89 @@
-<!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
-
 <source>
+  <sketch_launcher id="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="vertices edges wires faces shells compounds">
+    <validator id="FeaturesPlugin_ValidatorCompositeLauncher" parameters="base,Sketch"/>
+  </sketch_launcher>
+  <multi_selector id="base"
+                  label="Base objects:"
+                  tooltip="Select a base objects"
+                  shape_types="vertices edges wires faces shells compounds"
+                  concealment="true">
+    <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="vertex,edge,wire,face,shell,compound"/>
+  </multi_selector>
+  <shape_selector id="axis_object"
+                  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>
   <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>
+    <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="360"
-          icon=":icons/angle_up.png"
-          tooltip="To angle">
-        </doublevalue>
+        <doublevalue id="to_angle"
+                     label="Angle"
+                     step="1.0"
+                     default="360"
+                     icon="icons/Features/angle_up.png"
+                     tooltip="To angle"/>
       </groupbox>
       <groupbox>
-        <doublevalue
-          id="from_angle"
-          label="Angle"
-          step="1.0"
-          default="0"
-          icon=":icons/angle_down.png"
-          tooltip="From angle">
-        </doublevalue>
+        <doublevalue id="from_angle"
+                     label="Angle"
+                     step="1.0"
+                     default="0"
+                     icon="icons/Features/angle_down.png"
+                     tooltip="From angle"/>
       </groupbox>
     </box>
-    <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" 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>
+    <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/plane.png"
+                        icon="icons/Features/plane.png"
                         label="Plane face"
                         tooltip="Bounding plane (select a planar face)"
                         shape_types="face"
+                        geometrical_selection="true"
                         default="&lt;base sketch&gt;">
           <validator id="GeomValidators_Face" parameters="plane"/>
         </shape_selector>
-        <doublevalue
-          id="from_offset"
-          label="Offset"
-          step="1.0"
-          default="0"
-          icon=":icons/angle_up_down.png"
-          tooltip="Offset for bounding plane">
-        </doublevalue>
+        <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"/>
       </groupbox>
       <groupbox title="To">
         <shape_selector id="to_object"
-                        icon=":icons/plane_inverted.png"
+                        icon="icons/Features/plane_inverted.png"
                         label="Plane face"
                         tooltip="Bounding plane (select a planar face)"
                         shape_types="face"
+                        geometrical_selection="true"
                         default="&lt;base sketch&gt;">
           <validator id="GeomValidators_Face" parameters="plane"/>
         </shape_selector>
-        <doublevalue
-          id="to_offset"
-          label="Offset"
-          step="1.0"
-          default="0"
-          icon=":icons/angle_up_down.png"
-          tooltip="Offset for bounding plane">
-        </doublevalue>
+        <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"/>
       </groupbox>
     </box>
   </toolbox>
   <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,ByAngles,base,to_angle,from_angle,to_object,to_offset,from_object,from_offset"/>
-</source>
\ No newline at end of file
+  <validator id="FeaturesPlugin_ValidatorBaseForGenerationSketchOrSketchObjects" parameters="base"/>
+</source>