Merge branch 'master' into gni/evolution

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

diff --git a/src/FeaturesPlugin/boolean_widget.xml b/src/FeaturesPlugin/boolean_widget.xml
index d24a8af36658b9c617520799a085a75c436e4275..7967f17753c5c7514f89bbfab4b7d5906cd15b2b 100644 (file)
--- a/src/FeaturesPlugin/boolean_widget.xml
+++ b/src/FeaturesPlugin/boolean_widget.xml
@@ -1,21 +1,9 @@
-<!-- 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 Smash"
-    use_in_title="true"
-    icons_list="icons/Features/bool_cut.png icons/Features/bool_fuse.png icons/Features/bool_common.png icons/Features/bool_smash.png"
-    default="0"
-  />
   <multi_selector id="main_objects"
     label="Main objects"
     icon=""
-    tooltip="Select solid objects"
-    type_choice="Solids Objects"
+    tooltip="Select objects"
+    shape_types="vertices edges wires faces shells solids compsolids compounds"
     use_choice="false"
     concealment="true">
     <validator id="PartSet_DifferentObjects"/>
@@ -24,12 +12,24 @@
   <multi_selector id="tool_objects"
     label="Tool objects"
     icon=""
-    tooltip="Select a tool solid"
-    type_choice="Solids Objects"
+    tooltip="Select tools"
+    shape_types="vertices edges wires faces shells solids compsolids compounds"
     use_choice="false"
     concealment="true" >
     <validator id="PartSet_DifferentObjects"/>
     <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>