Merge tag 'V_1.3.1' into HEAD

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

diff --git a/src/FeaturesPlugin/placement_widget.xml b/src/FeaturesPlugin/placement_widget.xml
index e5f67055ca4cf186eaada0a2ac0c33f760fcb76b..ec6f228b0d53e17cb32afd1427ee7e5345f27519 100644 (file)
--- a/src/FeaturesPlugin/placement_widget.xml
+++ b/src/FeaturesPlugin/placement_widget.xml
@@ -1,17 +1,32 @@
+<!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+
 <source>
-  <shape_selector id="placement_base_face" 
-    label="Select a face" 
-    icon=":icons/cut_shape.png" 
-    tooltip="Select a face a one object"
+  <multi_selector id="placement_objects_list"
+    label="Select a solid objects"
+    icon=":icons/cut_shape.png"
+    tooltip="Select a solid objects"
+    type_choice="Solids">
+  </multi_selector>
+  <shape_selector id="placement_start_face"
+    label="Select an object" 
+    icon=":icons/placement_from.png"
+    tooltip="Select a start face"
     shape_types="face"
-    use_subshapes="true"
   />
-  <shape_selector id="placement_attractable_face" 
-    label="Select a face" 
-    icon=":icons/cut_shape.png" 
-    tooltip="Select a face of another object"
+  <shape_selector id="placement_end_face"
+    label="Select an object" 
+    icon=":icons/placement_to.png"
+    tooltip="Select an end face"
     shape_types="face"
-    use_subshapes="true"
-       concealment="true"
-  />
+    concealment="true" >
+    <validator id="PartSet_DifferentObjects"/>
+  </shape_selector>
+  <boolvalue id="placement_reverse_direction"
+    label="Reverse"
+    default="false"
+    tooltip="Reverse placement direction"/>
+  <boolvalue id="placement_centering"
+    label="Centering"
+    default="false"
+    tooltip="Center faces under placement"/>
 </source>