X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FFeaturesPlugin%2Fextrusioncut_widget.xml;h=fb9607c85c8c7d2fb14a85725c765b85a2758fe7;hb=4f565b2204d3fba046aa8c851abada2a5a17bf6c;hp=8160f493661b1548b0571b8fd99ef49d54fa607e;hpb=0a04bcd634373c65391611ca0e818d432e71ada5;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/extrusioncut_widget.xml b/src/FeaturesPlugin/extrusioncut_widget.xml
index 8160f4936..fb9607c85 100755
--- a/src/FeaturesPlugin/extrusioncut_widget.xml
+++ b/src/FeaturesPlugin/extrusioncut_widget.xml
@@ -3,75 +3,96 @@
 <source>
   <groupbox title="Extrusion">
     <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"
+      type_choice="wires faces shells"
+      concealment="true">
+      <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="face,shell"/>
+    </multi_selector>
+    <shape_selector id="direction_object"
+                    icon="icons/Features/axis.png"
+                    label="Direction"
+                    tooltip="Select an edge for direction"
+                    shape_types="edge"
+                    default="&lt;base normal&gt;">
+      <validator id="GeomValidators_ShapeType" parameters="empty,line"/>
+    </shape_selector>
     <toolbox id="CreationMethod">
-      <box id="BySizes" title="By sizes" icon=":icons/dimension_up_32x32.png">
+      <box id="BySizes" title="By sizes" icon="icons/Features/dimension_up_down_32x32.png">
         <groupbox>
           <doublevalue
             id="to_size"
             label="Size"
-            min="0"
             step="1.0"
             default="0"
-            icon=":icons/dimension_up.png"
-            tooltip="Size">
+            icon="icons/Features/dimension_up.png"
+            tooltip="To size">
           </doublevalue>
         </groupbox>
         <groupbox>
           <doublevalue
             id="from_size"
             label="Size"
-            min="0"
             step="1.0"
             default="10"
-            icon=":icons/dimension_down.png"
-            tooltip="Size">
+            icon="icons/Features/dimension_down.png"
+            tooltip="From size">
           </doublevalue>
         </groupbox>
       </box>
-      <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
-        <groupbox title="To">
-          <shape_selector id="to_object"
-                          icon=":icons/plane_inverted.png"
+      <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon="icons/Features/plane_inverted_32x32.png">
+        <groupbox title="From">
+          <shape_selector id="from_object"
+                          icon="icons/Features/plane.png"
                           label="Plane face"
-                          tooltip="Select a planar 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="Offset" min="0" step="1.0" default="0"
-            icon=":icons/dimension_up.png"
-            tooltip="Offset">
+          <doublevalue id="from_offset"
+            label="Offset" step="1.0" default="0"
+            icon="icons/Features/dimension_up_down.png"
+            tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
-        <groupbox title="From">
-          <shape_selector id="from_object"
-                          icon=":icons/plane.png"
+        <groupbox title="To">
+          <shape_selector id="to_object"
+                          icon="icons/Features/plane_inverted.png"
                           label="Plane face"
-                          tooltip="Select a planar 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="Offset" min="0" step="1.0" default="0"
-            icon=":icons/dimension_down.png"
-            tooltip="Offset">
+          <doublevalue  id="to_offset"
+            label="Offset" step="1.0" default="0"
+            icon="icons/Features/dimension_up_down.png"
+            tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
       </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"
+    type_choice="Objects"
+    use_choice="false"
     concealment="true">
+    <validator id="GeomValidators_ShapeType" parameters="solid"/>
   </multi_selector>
-  <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,BySizes,to_size,from_size,to_object,to_offset,from_object,from_offset"/>
+  <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,BySizes,sketch_selection,to_size,from_size,to_object,to_offset,from_object,from_offset"/>
+  <validator id="FeaturesPlugin_ValidatorExtrusionDir" parameters="base,direction_object"/>
 </source>