Fix 17 regressions

[modules/smesh.git] / resources / StdMeshers.xml.in

diff --git a/resources/StdMeshers.xml.in b/resources/StdMeshers.xml.in
index 39307c745007b263334c44499999934d3b6f9ceb..c537c5adc9b1115e3ef318d155244315c2a11783 100644 (file)
--- a/resources/StdMeshers.xml.in
+++ b/resources/StdMeshers.xml.in
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='us-ascii'?>
 <!DOCTYPE meshers PUBLIC "" "desktop.dtd">
 <!--
-  Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2015  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
@@ -9,7 +9,7 @@
   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.
+  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
@@ -311,6 +311,34 @@
       </python-wrap>
     </algorithm>
 
+    <algorithm type     ="QuadFromMedialAxis_1D2D"
+               label-id ="Quadrangle (Medial Axis Projection)"
+               icon-id  ="mesh_algo_quad.png"
+               hypos    ="NumberOfLayers2D, LayerDistribution2D"
+               opt-hypos="ViscousLayers2D"
+               input    ="EDGE"
+               output   ="QUAD"
+               dim      ="2">
+      <python-wrap>
+        <algo>QuadFromMedialAxis_1D2D=Quadrangle(algo=smeshBuilder.QUAD_MA_PROJ)</algo>
+        <hypo>ViscousLayers2D=ViscousLayers2D(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreEdges())</hypo>
+        <hypo>NumberOfLayers2D=NumberOfLayers(SetNumberOfLayers())</hypo>
+      </python-wrap>
+    </algorithm>
+
+    <algorithm type     ="PolygonPerFace_2D"
+               label-id ="Polygon per Face"
+               icon-id  ="mesh_algo_polygon.png"
+               opt-hypos="ViscousLayers2D"
+               input    ="EDGE"
+               output   ="POLYGON,QUAD,TRIA"
+               dim      ="2">
+      <python-wrap>
+        <algo>PolygonPerFace_2D=Polygon()</algo>
+        <hypo>ViscousLayers2D=ViscousLayers2D(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreEdges())</hypo>
+      </python-wrap>
+    </algorithm>
+
     <algorithm type     ="Hexa_3D"
                label-id ="Hexahedron (i,j,k)"
                icon-id  ="mesh_algo_hexa.png"
@@ -321,7 +349,7 @@
                dim      ="3">
       <python-wrap>
         <algo>Hexa_3D=Hexahedron(algo=smeshBuilder.Hexa)</algo>
-        <hypo>ViscousLayers=ViscousLayers(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreFaces())</hypo>
+        <hypo>ViscousLayers=ViscousLayers(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetFaces(1),SetFaces(2),SetMethod())</hypo>
       </python-wrap>
     </algorithm>
 
@@ -379,7 +407,7 @@
     </algorithm>
 
     <algorithm type    ="Import_1D"
-               label-id="Use Existing 1D Elements"
+               label-id="Import 1D Elements from Another Mesh"
                icon-id ="mesh_algo_regular.png"
                hypos   ="ImportSource1D"
                output  ="EDGE"
@@ -392,7 +420,7 @@
     </algorithm>
 
     <algorithm type             ="Import_1D2D"
-               label-id         ="Use Existing 2D Elements"
+               label-id         ="Import 1D-2D Elements from Another Mesh"
                icon-id          ="mesh_algo_quad.png"
                hypos            ="ImportSource2D"
                output           ="QUAD,TRIA"
@@ -431,7 +459,7 @@
     </algorithm>
 
     <algorithm type    ="UseExisting_1D"
-               label-id="Use Existing Edges"
+               label-id="Use Edges to be Created Manually"
                icon-id ="mesh_algo_regular.png"
                input   ="VERTEX"
                output  ="EDGE"
@@ -442,7 +470,7 @@
     </algorithm>
 
     <algorithm type    ="UseExisting_2D"
-               label-id="Use Existing Faces"
+               label-id="Use Faces to be Created Manually"
                icon-id ="mesh_algo_quad.png"
                input   ="EDGE"
                output  ="QUAD,TRIA"