Merge branch 'master' into cgt/devCEA

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

diff --git a/src/FeaturesPlugin/pipe_widget.xml b/src/FeaturesPlugin/pipe_widget.xml
index 10b07cad8f8f4f61f10e749452a7e92e0359debe..f2807b069e7f6e211782f7b2e2ecec25c6649a7e 100644 (file)
--- a/src/FeaturesPlugin/pipe_widget.xml
+++ b/src/FeaturesPlugin/pipe_widget.xml
@@ -1,34 +1,23 @@
 <!-- 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"
+                  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 +25,13 @@
         <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"/>
 </source>