X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2Fextrusioncut_widget.xml;h=1f894d22344227ac2f139042c2a8434e87bcd6ee;hb=530f5aff42069e844c4a4ef164088ea23ba0e2dd;hp=7e510b16deb2d701cbac28752078dfe6b45df1da;hpb=98713097930edb46d37ffb835d685ec2ef9439dc;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/extrusioncut_widget.xml b/src/FeaturesPlugin/extrusioncut_widget.xml
index 7e510b16d..1f894d223 100755
--- a/src/FeaturesPlugin/extrusioncut_widget.xml
+++ b/src/FeaturesPlugin/extrusioncut_widget.xml
@@ -1,65 +1,95 @@
 <!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
 
 <source>
-  <groupbox title="Revolution">
-    <shape_selector id="main_objects"
-    label="Select an object"
-    icon=":icons/sketch.png"
-    tooltip="Select a destination element"
-    shape_types="face edge vertex"
-    default="&lt;sketch&gt;"
-  />
-  <shape_selector id="axis_object"
+  <groupbox title="Extrusion">
+    <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="face objects">
+    </sketch_launcher>
+    <composite_multi_selector id="base"
+      label="Select a sketch face"
+      icon=":icons/sketch.png"
+      tooltip="Select a sketch face"
+      type_choice="Faces Objects">
+      <validator id="FeaturesPlugin_ValidatorCompositeLauncher" parameters="face,shell"/>
+    </composite_multi_selector>
+    <shape_selector id="direction_object"
                     icon=":icons/axis.png"
-                    label="Axis"
-                    tooltip="Select an edge for axis"
+                    label="Direction"
+                    tooltip="Select an edge for direction"
                     shape_types="edge"
                     default="">
-    <validator id="GeomValidators_ShapeType" parameters="line"/>
+      <validator id="GeomValidators_ShapeType" parameters="empty,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_size"
-      label="Angle"
-      min="0"
-      step="1.0"
-      default="0"
-      icon=":icons/angle_down.png"
-      tooltip="Height">
-    </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_size"
-      label="Angle"
-      min="0"
-      step="1.0"
-      default="0"
-      icon=":icons/angle_down.png"
-      tooltip="Height">
-    </doublevalue>
-  </groupbox>
+    <toolbox id="CreationMethod">
+      <box id="BySizes" title="By sizes" icon=":icons/dimension_up_down_32x32.png">
+        <groupbox>
+          <doublevalue
+            id="to_size"
+            label="Size"
+            step="1.0"
+            default="0"
+            icon=":icons/dimension_up.png"
+            tooltip="To size">
+          </doublevalue>
+        </groupbox>
+        <groupbox>
+          <doublevalue
+            id="from_size"
+            label="Size"
+            step="1.0"
+            default="10"
+            icon=":icons/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="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="Offset" step="1.0" default="0"
+            icon=":icons/dimension_up_down.png"
+            tooltip="Offset for 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="Offset" step="1.0" default="0"
+            icon=":icons/dimension_up_down.png"
+            tooltip="Offset for bounding plane">
+          </doublevalue>
+        </groupbox>
+      </box>
+    </toolbox>
   </groupbox>
   <multi_selector id="main_objects"
     label="Cut from:"
     icon=":icons/cut_shape.png"
-    tooltip="Select a sketch face"
-    type_choice="Solids">
+    tooltip="Objects to Cut"
+    type_choice="Solids"
+    concealment="true">
+    <validator id="GeomValidators_ShapeType" parameters="solid"/>
   </multi_selector>
+  <validator id="GeomValidators_ZeroOffset" parameters="CreationMethod,BySizes,sketch_selection,to_size,from_size,to_object,to_offset,from_object,from_offset"/>
+  <validator id="FeaturesPlugin_ValidatorCanBeEmpty" parameters="CreationMethod,BySizes,base,to_object,from_object,direction_object"/>
 </source>