X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FFeaturesPlugin%2Fpipe_widget.xml;h=a258e00fe16c0f0ada8adf9b400ca2016ce181a3;hb=34c2ee35f2b8ae2ef7a0673c7841f11078e06f3c;hp=10b07cad8f8f4f61f10e749452a7e92e0359debe;hpb=5315361b0c34c6e603474413024db5485c850d80;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/pipe_widget.xml b/src/FeaturesPlugin/pipe_widget.xml
index 10b07cad8..a258e00fe 100644
--- a/src/FeaturesPlugin/pipe_widget.xml
+++ b/src/FeaturesPlugin/pipe_widget.xml
@@ -1,34 +1,42 @@
-<!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+<!--
+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"
+                  use_choice="false"
+                  concealment="true">
+    <validator id="FeaturesPlugin_ValidatorBaseForGeneration" parameters="vertex,edge,wire,face,shell,compound"/>
+  </multi_selector>
+  <shape_selector id="path_object"
+                  label="Path object:"
+                  tooltip="Select an edge or wire for path"
+                  shape_types="edge wire">
+    <validator id="FeaturesPlugin_ValidatorPipePath"/>
+  </shape_selector>
   <toolbox id="creation_method">
-    <box id="simple" title="Simple pipe by objects and path" icon=":icons/pipe_simple_32x32.png">
-      <multi_selector id="base_objects"
-                      label="Base objects:"
-                      tooltip="Select a base objects"
-                      type_choice="face objects"
-                      use_choice="false">
-        <validator id="GeomValidators_BaseForGeneration"/>
-      </multi_selector>
-      <shape_selector id="path_object"
-                      label="Path object:"
-                      tooltip="Select an edge or wire for path"
-                      shape_types="edge wire">
-      </shape_selector>
-    </box>
-    <box id="binormal" title="Pipe by objects, path and Bi-Normal" icon=":icons/pipe_binormal_32x32.png">
-      <multi_selector id="base_objects"
-                      label="Base objects:"
-                      tooltip="Select a base objects"
-                      type_choice="face objects"
-                      use_choice="false">
-        <validator id="GeomValidators_BaseForGeneration"/>
-      </multi_selector>
-      <shape_selector id="path_object"
-                      label="Path object:"
-                      tooltip="Select an edge or wire for path"
-                      shape_types="edge wire">
-      </shape_selector>
+    <box id="simple" title="Simple pipe by objects and path" icon="icons/Features/pipe_simple_32x32.png"/>
+    <box id="binormal" title="Pipe by objects, path and Bi-Normal" icon="icons/Features/pipe_binormal_32x32.png">
       <shape_selector id="binormal"
                       label="Bi-Normal:"
                       tooltip="Select an edge for Bi-Normal"
@@ -36,25 +44,14 @@
         <validator id="GeomValidators_ShapeType" parameters="line"/>
       </shape_selector>
     </box>
-    <box id="locations" title="Pipe by objects, path and locations" icon=":icons/pipe_locations_32x32.png">
-      <multi_selector id="base_objects"
-                      label="Base objects:"
-                      tooltip="Select a base objects"
-                      type_choice="face objects"
-                      use_choice="false">
-        <validator id="GeomValidators_BaseForGeneration"/>
-      </multi_selector>
+    <box id="locations" title="Pipe by objects, path and locations" icon="icons/Features/pipe_locations_32x32.png">
       <multi_selector id="locations_objects"
                       label="Locations:"
                       tooltip="Select one or more vertices to specify the locations"
                       type_choice="vertex">
       </multi_selector>
-      <shape_selector id="path_object"
-                      label="Path object:"
-                      tooltip="Select an edge or wire for path"
-                      shape_types="edge wire">
-      </shape_selector>
     </box>
   </toolbox>
-  <validator id="FeaturesPlugin_PipeLocationsValidator"/>
+  <validator id="FeaturesPlugin_ValidatorPipeLocations"/>
+  <validator id="FeaturesPlugin_ValidatorBaseForGenerationSketchOrSketchObjects" parameters="base_objects"/>
 </source>