X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=resources%2FStdMeshers.xml;h=41c83c997d219654952a24f665582a8fa104c929;hb=2e16ca1281e91b049388105e138619bfdb5d571f;hp=72fc3c05d8210c7ca188eefba4b149eccbb7e397;hpb=79b1ac2b6df9117f16f11d444b1f165d477a1813;p=modules%2Fsmesh.git

diff --git a/resources/StdMeshers.xml b/resources/StdMeshers.xml
index 72fc3c05d..41c83c997 100644
--- a/resources/StdMeshers.xml
+++ b/resources/StdMeshers.xml
@@ -1,5 +1,28 @@
 <?xml version='1.0' encoding='us-ascii'?>
 <!DOCTYPE meshers PUBLIC "" "desktop.dtd">
+<!--
+  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+
+  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+
+  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.
+
+  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
+
+-->
 
 <!--  GUI customization for MESH component  -->
 
@@ -17,7 +40,12 @@
                 dim="0"/>
 
     <hypothesis type="LocalLength"
-                label-id="Average length"
+                label-id="Local Length"
+                icon-id="mesh_hypo_length.png"
+                dim="1"/>
+
+    <hypothesis type="MaxLength"
+                label-id="Max Size"
                 icon-id="mesh_hypo_length.png"
                 dim="1"/>
 
@@ -26,6 +54,11 @@
                 icon-id="mesh_hypo_length.png"
                 dim="1"/>
 
+    <hypothesis type="FixedPoints1D"
+                label-id="Fixed points 1D"
+                icon-id="mesh_hypo_length.png"
+                dim="1"/>
+
     <hypothesis type="StartEndLength"
                 label-id="Start and End Length"
                 icon-id="mesh_hypo_length.png"
@@ -63,6 +96,12 @@
                 auxiliary="true"
                 dim="2"/>
 
+    <hypothesis	type="TrianglePreference"
+		label-id="Triangle Preference"
+                icon-id="mesh_algo_mefisto.png"
+		auxiliary="true"
+		dim="2"/>
+		
     <hypothesis type="QuadraticMesh"
                 label-id="Quadratic Mesh"
                 icon-id="mesh_algo_quad.png"
@@ -83,7 +122,6 @@
     <hypothesis type="MaxElementVolume"
                 label-id="Max. Element Volume"
                 icon-id="mesh_hypo_volume.png"
-		need-geom = "false"
                 dim="3"/>
 
     <hypothesis type="ProjectionSource3D"
@@ -101,6 +139,16 @@
                 icon-id="mesh_hypo_length.png"
                 dim="1"/>
 
+    <hypothesis type="ImportSource2D"
+                label-id="Source Faces"
+                icon-id="mesh_hypo_area.png"
+                dim="2"/>
+
+    <hypothesis type="ImportSource1D"
+                label-id="Source Edges"
+                icon-id="mesh_hypo_length.png"
+                dim="1"/>
+
     <hypothesis type="NumberOfLayers"
                 label-id="Number of Layers"
                 icon-id="mesh_hypo_length.png"
@@ -110,6 +158,22 @@
                 label-id="Distribution of Layers"
                 icon-id="mesh_hypo_length.png"
                 dim="3"/>
+
+    <hypothesis type="NumberOfLayers2D"
+                label-id="Number of Layers"
+                icon-id="mesh_hypo_length.png"
+                dim="2"/>
+
+    <hypothesis type="LayerDistribution2D"
+                label-id="Distribution of Layers"
+                icon-id="mesh_hypo_length.png"
+                dim="2"/>
+
+    <hypothesis type="QuadrangleParams"
+                label-id="Quadrangle Parameters"
+                icon-id="mesh_hypo_length.png"
+                dim="2"/>
+
   </hypotheses>
 
   <algorithms>
@@ -124,7 +188,7 @@
     <algorithm type="Regular_1D"
 	       label-id="Wire discretisation"
 	       icon-id="mesh_algo_regular.png"
-               hypos="LocalLength,Arithmetic1D,StartEndLength,NumberOfSegments,Deflection1D,AutomaticLength"
+               hypos="LocalLength,MaxLength,Arithmetic1D,StartEndLength,NumberOfSegments,Deflection1D,AutomaticLength,FixedPoints1D"
                opt-hypos="Propagation,QuadraticMesh"
                input="VERTEX"
                output="EDGE"
@@ -133,7 +197,7 @@
     <algorithm type="CompositeSegment_1D"
 	       label-id="Composite side discretisation"
 	       icon-id="mesh_algo_regular.png"
-               hypos="LocalLength,Arithmetic1D,StartEndLength,NumberOfSegments,Deflection1D,AutomaticLength"
+               hypos="LocalLength,MaxLength,Arithmetic1D,StartEndLength,NumberOfSegments,Deflection1D,AutomaticLength"
                opt-hypos="Propagation,QuadraticMesh"
                input="VERTEX"
                output="EDGE"
@@ -150,7 +214,8 @@
     <algorithm type="Quadrangle_2D"
                label-id="Quadrangle (Mapping)"
                icon-id="mesh_algo_quad.png"
-               opt-hypos="QuadranglePreference"
+               hypos="QuadrangleParams"
+               opt-hypos="QuadranglePreference,TrianglePreference"
                input="EDGE"
                output="QUAD"
                dim="2"/>
@@ -159,6 +224,7 @@
                label-id="Hexahedron (i,j,k)"
                icon-id="mesh_algo_hexa.png"
                input="QUAD"
+	       need-geom="false"
                dim="3"/>
 
     <algorithm type="Projection_1D"
@@ -183,6 +249,21 @@
                input="QUAD,TRIA"
                dim="3"/>
 
+    <algorithm type="Import_1D"
+               label-id="Use existing 1D elements"
+               icon-id="mesh_algo_regular.png"
+               hypos="ImportSource1D"
+               output="EDGE"
+               dim="1"/>
+
+    <algorithm type="Import_1D2D"
+               label-id="Use existing 2D elements"
+               icon-id="mesh_algo_quad.png"
+               hypos="ImportSource2D"
+               output="QUAD,TRIA"
+               support-submeshes="false"
+               dim="2"/>
+
     <algorithm type="Prism_3D"
                label-id="3D extrusion"
                icon-id="mesh_algo_hexa.png"
@@ -210,6 +291,14 @@
                output="QUAD,TRIA"
                dim="2"/>
 
+    <algorithm type="RadialQuadrangle_1D2D"
+               label-id="Radial quadrangle 1D2D"
+               icon-id="mesh_algo_quad.png"
+               hypos="NumberOfLayers2D, LayerDistribution2D"
+               input="EDGE"
+               output="QUAD,TRIA"
+               dim="2"/>
+
   </algorithms>
 </meshers-group>
 
@@ -236,11 +325,11 @@
 <hypotheses-set-group>
 
     <hypotheses-set name="Automatic Tetrahedralization"
-                    hypos="AutomaticLength, LengthFromEdges"
+                    hypos="MaxLength"
                     algos="Regular_1D, MEFISTO_2D, NETGEN_3D"/>
 
     <hypotheses-set name="Automatic Hexahedralization"
-                    hypos="AutomaticLength"
+                    hypos="NumberOfSegments"
                     algos="Regular_1D, Quadrangle_2D, Hexa_3D"/>
 
 </hypotheses-set-group>