Merge branch 'csgroup_IS2'

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

diff --git a/src/FeaturesPlugin/pipe_widget.xml b/src/FeaturesPlugin/pipe_widget.xml
index ba9e808a9a3264e23c6a6d3fddb5634f6dc1fbc7..ce17e7cd1aab1a4ecbdfa1914a1c1a844c49d7d1 100644 (file)
--- a/src/FeaturesPlugin/pipe_widget.xml
+++ b/src/FeaturesPlugin/pipe_widget.xml
@@ -1,10 +1,8 @@
-<!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
-
 <source>
   <multi_selector id="base_objects"
                   label="Base objects:"
                   tooltip="Select a base objects"
-                  type_choice="vertices edges wires faces shells compsolids"
+                  shape_types="vertices edges wires faces shells compsolids"
                   use_choice="false"
                   concealment="true">
     <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="vertex,edge,wire,face,shell,compound"/>
@@ -12,7 +10,8 @@
   <shape_selector id="path_object"
                   label="Path object:"
                   tooltip="Select an edge or wire for path"
-                  shape_types="edge wire">
+                  shape_types="edge wire"
+                  concealment="true">
     <validator id="FeaturesPlugin_ValidatorPipePath"/>
   </shape_selector>
   <toolbox id="creation_method">
@@ -21,7 +20,8 @@
       <shape_selector id="binormal"
                       label="Bi-Normal:"
                       tooltip="Select an edge for Bi-Normal"
-                      shape_types="edge">
+                      shape_types="edge"
+                      concealment="true">
         <validator id="GeomValidators_ShapeType" parameters="line"/>
       </shape_selector>
     </box>
@@ -29,10 +29,12 @@
       <multi_selector id="locations_objects"
                       label="Locations:"
                       tooltip="Select one or more vertices to specify the locations"
-                      type_choice="vertex">
+                      shape_types="vertex"
+                      concealment="true">
+        <validator id="FeaturesPlugin_ValidatorPipeLocations"/>
       </multi_selector>
     </box>
   </toolbox>
-  <validator id="FeaturesPlugin_ValidatorPipeLocations"/>
+  <validator id="FeaturesPlugin_ValidatorPipeLocationsNumber"/>
   <validator id="FeaturesPlugin_ValidatorBaseForGenerationSketchOrSketchObjects" parameters="base_objects"/>
 </source>