X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=resources%2FStdMeshers.xml;h=853f8ea2b44f2d19616ed1d289214b4f06f8b29e;hb=e9d9ec4df8fad4ec7d471eee0c9b30255b665e26;hp=49aae9d0d494975bd5a5f2a085d15ce5236b2dad;hpb=c3bf92bd87b770fd81631a3853f7f5bb1ac6a4e8;p=modules%2Fsmesh.git

diff --git a/resources/StdMeshers.xml b/resources/StdMeshers.xml
index 49aae9d0d..853f8ea2b 100644
--- a/resources/StdMeshers.xml
+++ b/resources/StdMeshers.xml
@@ -8,51 +8,109 @@
 <meshers-group name="Standard Meshers"
                resources="StdMeshers"
                server-lib="libStdMeshersEngine.so"
-	       gui-lib="libStdMeshersGUI.so">
+               gui-lib="libStdMeshersGUI.so">
   <hypotheses>
 
     <hypothesis type="LocalLength"
-		label-id="Average length"
-		icon-id="mesh_hypo_length.png"/>
+                label-id="Average length"
+                icon-id="mesh_hypo_length.png"
+                dim="1"/>
 
-    <hypothesis type="LengthFromEdges"
-		label-id="Length From Edges (2D Hyp. for Triangulator)"
-		icon-id="mesh_hypo_length.png"/>
+    <hypothesis type="Arithmetic1D"
+                label-id="Arithmetic 1D"
+                icon-id="mesh_hypo_length.png"
+                dim="1"/>
+
+    <hypothesis type="StartEndLength"
+                label-id="Start and End Length"
+                icon-id="mesh_hypo_length.png"
+                dim="1"/>
 
     <hypothesis type="NumberOfSegments"
-		label-id="Nb. Segments"
-		icon-id="mesh_hypo_segment.png"/>
+                label-id="Nb. Segments"
+                icon-id="mesh_hypo_segment.png"
+                dim="1"/>
+
+    <hypothesis type="Deflection1D"
+                label-id="Deflection 1D"
+                icon-id="mesh_hypo_length.png"
+                dim="1"/>
+
+    <hypothesis type="Propagation"
+                label-id="Propagation of 1D Hyp. on opposite edges"
+                icon-id="mesh_hypo_length.png"
+                dim="1"
+                auxiliary="true"/>
+
+    <hypothesis type="AutomaticLength"
+                label-id="Automatic length"
+                icon-id="mesh_hypo_length.png"
+                dim="1"/>
 
-    <hypothesis type="MaxElementArea"
-		label-id="Max. Triangle Area"
-		icon-id="mesh_hypo_area.png"/>
+    <hypothesis type="LengthFromEdges"
+                label-id="Length From Edges (2D Hyp. for Triangulator)"
+                icon-id="mesh_hypo_length.png"
+                dim="2"/>
 
-    <hypothesis type="MaxElementVolume"
-		label-id="Max. Hexahedron or Tetrahedron Volume"
-		icon-id="mesh_hypo_volume.png"/>
+    <hypothesis type="QuadranglePreference"
+                label-id="Quadrangle Preference"
+                icon-id="mesh_algo_quad.png"
+                dim="2"/>
+
+    <hypothesis type="QuadraticMesh"
+                label-id="Quadratic Mesh"
+                icon-id="mesh_algo_quad.png"
+                dim="1"
+                auxiliary="true"/>                
 
+    <hypothesis type="MaxElementArea"
+                label-id="Max. Element Area"
+                icon-id="mesh_hypo_area.png"
+                dim="2"/>
+                
     <hypothesis type="NotConformAllowed"
-		label-id="Not Conform Mesh Allowed"
-		icon-id="mesh_hypo_length.png"/>
+                label-id="Not Conform Mesh Allowed"
+                icon-id="mesh_hypo_length.png"
+                dim="1,2,3"
+                auxiliary="true"/>                
+
+    <hypothesis type="MaxElementVolume"
+                label-id="Max. Element Volume"
+                icon-id="mesh_hypo_volume.png"
+                dim="3"/>
   </hypotheses>
 
   <algorithms>
 
     <algorithm type="Regular_1D"
 	       label-id="Wire discretisation"
-	       icon-id="mesh_algo_regular.png"/>
+	       icon-id="mesh_algo_regular.png"
+               hypos="LocalLength,Arithmetic1D,StartEndLength,NumberOfSegments,Deflection1D,AutomaticLength"
+               opt-hypos="Propagation,QuadraticMesh"
+               output="EDGE"
+               dim="1"/>
 
     <algorithm type="MEFISTO_2D"
 	       label-id="Triangle (Mefisto)"
-	       icon-id="mesh_algo_mefisto.png"/>
+	       icon-id="mesh_algo_mefisto.png"
+               hypos="LengthFromEdges,MaxElementArea"
+               input="EDGE"
+               output="TRIA"
+               dim="2"/>
 
     <algorithm type="Quadrangle_2D"
                label-id="Quadrangle (Mapping)"
-               icon-id="mesh_algo_quad.png"/>
+               icon-id="mesh_algo_quad.png"
+               opt-hypos="QuadranglePreference"
+               input="EDGE"
+               output="QUAD"
+               dim="2"/>
 
     <algorithm type="Hexa_3D"
                label-id="Hexahedron (i,j,k)"
-               icon-id="mesh_algo_hexa.png"/>
+               icon-id="mesh_algo_hexa.png"
+               input="QUAD"
+               dim="3"/>
   </algorithms>
 </meshers-group>
 
@@ -75,4 +133,17 @@
   </algorithms>
 </meshers-group>
 
+
+<hypotheses-set-group>
+
+    <hypotheses-set name="Automatic Tetrahedralization"
+                    hypos="AutomaticLength, LengthFromEdges"
+                    algos="Regular_1D, MEFISTO_2D, NETGEN_3D"/>
+
+    <hypotheses-set name="Automatic Hexahedralization"
+                    hypos="AutomaticLength"
+                    algos="Regular_1D, Quadrangle_2D, Hexa_3D"/>
+
+</hypotheses-set-group>
+
 </meshers>