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 a258e00fe16c0f0ada8adf9b400ca2016ce181a3..ce17e7cd1aab1a4ecbdfa1914a1c1a844c49d7d1 100644 (file)
--- a/src/FeaturesPlugin/pipe_widget.xml
+++ b/src/FeaturesPlugin/pipe_widget.xml
@@ -1,29 +1,8 @@
-<!--
-Copyright (C) 2014-2017  CEA/DEN, EDF R&D
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-See http:##www.salome-platform.org/ or
-email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
--->
-
 <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"/>
@@ -31,7 +10,8 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
   <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">
@@ -40,7 +20,8 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
       <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>
@@ -48,10 +29,12 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
       <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>