Merge branch 'master' into V9_3_BR

[modules/shaper.git] / src / FeaturesPlugin / extrusioncut_widget.xml

diff --git a/src/FeaturesPlugin/extrusioncut_widget.xml b/src/FeaturesPlugin/extrusioncut_widget.xml
old mode 100755 (executable)
new mode 100644 (file)
index 541d567..e0c30ab
--- a/src/FeaturesPlugin/extrusioncut_widget.xml
+++ b/src/FeaturesPlugin/extrusioncut_widget.xml
@@ -1,5 +1,3 @@
-<!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
-
 <source>
   <groupbox title="Extrusion">
     <sketch_launcher id="sketch"
@@ -8,33 +6,35 @@
 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">
+      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/sketch.png"
+      icon="icons/Features/sketch.png"
       tooltip="Select a sketch face"
-      type_choice="Faces Objects">
+      type_choice="wires faces shells"
+      concealment="true">
       <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="face,shell"/>
     </multi_selector>
     <shape_selector id="direction_object"
-                    icon=":icons/axis.png"
+                    icon="icons/Features/axis.png"
                     label="Direction"
                     tooltip="Select an edge for direction"
                     shape_types="edge"
-                    default="">
+                    geometrical_selection="true"
+                    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_down_32x32.png">
+      <box id="BySizes" title="By sizes" icon="icons/Features/dimension_up_down_32x32.png">
         <groupbox>
           <doublevalue
             id="to_size"
             label="Size"
             step="1.0"
             default="0"
-            icon=":icons/dimension_up.png"
+            icon="icons/Features/dimension_up.png"
             tooltip="To size">
           </doublevalue>
         </groupbox>
@@ -44,39 +44,41 @@
             label="Size"
             step="1.0"
             default="10"
-            icon=":icons/dimension_down.png"
+            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">
+      <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/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/dimension_up_down.png"
+            icon="icons/Features/dimension_up_down.png"
             tooltip="Offset for bounding plane">
           </doublevalue>
         </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/dimension_up_down.png"
+            icon="icons/Features/dimension_up_down.png"
             tooltip="Offset for bounding plane">
           </doublevalue>
         </groupbox>
@@ -85,12 +87,15 @@
   </groupbox>
   <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"
-    concealment="true">
+    type_choice="Objects"
+    use_choice="false"
+    concealment="true"
+    main_argument="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"/>
+  <validator id="FeaturesPlugin_ValidatorExtrusionDir" parameters="base,direction_object"/>
+  <validator id="FeaturesPlugin_ValidatorBaseForGenerationSketchOrSketchObjects" parameters="base"/>
 </source>