X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FFeaturesPlugin%2Fboolean_widget.xml;h=7967f17753c5c7514f89bbfab4b7d5906cd15b2b;hb=b3f7b461d00b6ddf3736c8284498a9f33428577c;hp=8e6543d09ffcf4873e03000d86115cd26e2e5856;hpb=cbde248859fb0072f6012907391ea90cfc254574;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/boolean_widget.xml b/src/FeaturesPlugin/boolean_widget.xml
index 8e6543d09..7967f1775 100644
--- a/src/FeaturesPlugin/boolean_widget.xml
+++ b/src/FeaturesPlugin/boolean_widget.xml
@@ -1,32 +1,35 @@
-<!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
-
 <source>
-  <module_choice id="bool_type"
-    widget_type="radiobuttons"
-    buttons_dir="horizontal"
-    label="Operation type" 
-    tooltip="Type of boolean operation"
-    string_list="Cut Fuse Common"
-    icons_list=":icons/bool_cut.png :icons/bool_fuse.png :icons/bool_common.png"
-    default="0"
-  />
   <multi_selector id="main_objects"
     label="Main objects"
     icon=""
-    tooltip="Select a solid objects"
-    type_choice="Solids"
+    tooltip="Select objects"
+    shape_types="vertices edges wires faces shells solids compsolids compounds"
+    use_choice="false"
     concealment="true">
     <validator id="PartSet_DifferentObjects"/>
-    <validator id="GeomValidators_ShapeType" parameters="empty,solid"/>
+    <validator id="FeaturesPlugin_ValidatorBooleanSelection"/>
   </multi_selector>
-  <multi_selector id="tool_objects" 
-    label="Tool object" 
-    icon="" 
-    tooltip="Select a tool solid"
-    type_choice="Solids"
+  <multi_selector id="tool_objects"
+    label="Tool objects"
+    icon=""
+    tooltip="Select tools"
+    shape_types="vertices edges wires faces shells solids compsolids compounds"
+    use_choice="false"
     concealment="true" >
     <validator id="PartSet_DifferentObjects"/>
-    <validator id="GeomValidators_ShapeType" parameters="empty,solid"/>
+    <validator id="FeaturesPlugin_ValidatorBooleanSelection"/>
   </multi_selector>
-  <validator id="GeomValidators_BooleanArguments" parameters="main_objects,tool_objects,bool_type"/>
+  <optionalbox id="use_fuzzy">
+    <doublevalue id="fuzzy_param"
+                  label="Fuzzy parameter"
+                  tooltip="Additional tolerance to eliminate tiny result."
+                  min="1.e-7"
+                  max="10"
+                  step="1.e-5"
+                  default="1.e-5">
+      <validator id="GeomValidators_Positive"/>
+    </doublevalue>
+  </optionalbox>
+  <validator id="FeaturesPlugin_ValidatorBooleanArguments" parameters="main_objects,tool_objects"/>
+  <validator id="GeomValidators_NotSelfIntersected" parameters="main_objects,tool_objects"/>
 </source>