23352: [CEA] Order and naming of meshing algorithms

diff --git a/doc/salome/examples/netgendemo.py b/doc/salome/examples/netgendemo.py
index 8ef585b41a8f273086c8d3c8d71a2bbc14614587..2cc73a0ed84bb26b8d04ec54e1b3da11b755e90a 100644 (file)
--- a/doc/salome/examples/netgendemo.py
+++ b/doc/salome/examples/netgendemo.py
@@ -18,7 +18,7 @@ geompy.addToStudy(box, "Box")
 # 1. Create a triangular 2D mesh on the box with NETGEN_1D2D algorithm
 triaN = smesh.Mesh(box, "Box : triangular mesh by NETGEN_1D2D")
 
-# create a Netgen_1D2D algorithm for solids
+# create a NETGEN_1D2D algorithm for solids
 algo2D = triaN.Triangle(smeshBuilder.NETGEN_1D2D)
 
 # define hypotheses
@@ -33,7 +33,7 @@ n12_params.SetMaxSize(300)
 # 2. Create a tetrahedral mesh on the box with NETGEN_1D2D3D algorithm (full netgen)
 tetraN = smesh.Mesh(box, "Box : tetrahedrical mesh by NETGEN_1D2D3D")
 
-# create a Netgen_1D2D3D algorithm for solids
+# create a NETGEN_1D2D3D algorithm for solids
 algo3D = tetraN.Tetrahedron(smeshBuilder.FULL_NETGEN)
 
 # define hypotheses

diff --git a/doc/salome/gui/NETGENPLUGIN/input/additional_hypo.doc b/doc/salome/gui/NETGENPLUGIN/input/additional_hypo.doc
index 0463e30798a76ff4c737d3d4a05127dfede853eb..7e4523c56aef828ed5ae13c6d6cecfc97841becb 100644 (file)
--- a/doc/salome/gui/NETGENPLUGIN/input/additional_hypo.doc
+++ b/doc/salome/gui/NETGENPLUGIN/input/additional_hypo.doc
@@ -15,8 +15,8 @@ computations. The prisms constructed on the quadrangular mesh faces are
 actually the hexahedrons.</li>
 
 <li><b>Quadrangle Preference</b> - This additional hypothesis can be
-  used together with Netgen 2D algorithm.
-It allows Netgen 2D to build quad-dominant meshes.</li>
+  used together with NETGEN 2D algorithm.
+It allows NETGEN 2D to build quad-dominant meshes.</li>
 </ul>
 <br>
 

diff --git a/doc/salome/gui/NETGENPLUGIN/input/netgen_2d_3d_hypo.doc b/doc/salome/gui/NETGENPLUGIN/input/netgen_2d_3d_hypo.doc
index 30ea99329b9367931b18a20d1515ba51b608300b..ff7555a734f816dc5c6a12ae596ff7b1cf2f79a5 100644 (file)
--- a/doc/salome/gui/NETGENPLUGIN/input/netgen_2d_3d_hypo.doc
+++ b/doc/salome/gui/NETGENPLUGIN/input/netgen_2d_3d_hypo.doc
@@ -1,24 +1,24 @@
 /*!
 
-\page netgen_2d_3d_hypo_page Netgen 2D and 3D hypotheses
+\page netgen_2d_3d_hypo_page NETGEN 2D and 3D hypotheses
 
-<b>Netgen 2D Parameters</b> and <b>Netgen 3D  Parameters</b> hypotheses work only with
-<b>Netgen 1D-2D</b>, <b>Netgen 2D</b>, <b>Netgen 1D-2D-3D</b> and
-<b>Netgen 3D</b> algorithms. <b>Netgen 1D-2D</b> and <b>Netgen
+<b>NETGEN 2D Parameters</b> and <b>NETGEN 3D  Parameters</b> hypotheses work only with
+<b>NETGEN 1D-2D</b>, <b>NETGEN 2D</b>, <b>NETGEN 1D-2D-3D</b> and
+<b>NETGEN 3D</b> algorithms. <b>NETGEN 1D-2D</b> and <b>NETGEN
 1D-2D-3D</b>  algorithms do not require definition of lower-level
 hypotheses and algorithms (2D and 1D for meshing 3D objects and 1D for
 meshing 2D objects).
 
 \image html netgen2d3d.png
-<center><em>Hypothesis dialog boxes of <b>Netgen 1D-2D</b> and <b>Netgen
+<center><em>Hypothesis dialog boxes of <b>NETGEN 1D-2D</b> and <b>NETGEN
       1D-2D-3D</b> algorithms are same</em></center>
 <br>
 
 \image html netgen2d3d_only.png
-<center><em>Dialog boxes of <b>Netgen 2D</b> and <b>Netgen 3D</b>
+<center><em>Dialog boxes of <b>NETGEN 2D</b> and <b>NETGEN 3D</b>
     algorithms </em></center>
 
-- <b>Name</b> - allows to define the name for the algorithm (Netgen
+- <b>Name</b> - allows to define the name for the algorithm (NETGEN
 2D (or 3D) Parameters by default).
 - <b>Max Size</b> - maximum linear dimensions for mesh cells.
 - <b>Min Size</b> - minimum linear dimensions for mesh cells. It is
@@ -70,7 +70,7 @@ can be changed.
 
 \image html netgen2d3d_simple.png
 
-<b>Netgen 2D simple parameters</b> and <b>Netgen 3D simple
+<b>NETGEN 2D simple parameters</b> and <b>NETGEN 3D simple
 parameters</b> allow defining the size of elements for each
 dimension.
 
@@ -94,7 +94,7 @@ volumic elements will be equal to an average area of 2D elements, else
 - <b>Max. Element Volume</b> specifies expected maximum element volume
 of 3d elements.
 
-\note Netgen algorithm does not strictly follow the input
+\note NETGEN algorithm does not strictly follow the input
 parameters. The actual mesh can be more or less dense than
 required. There are several factors in it:
 - NETGEN does not actually use <b>Number of Segments</b> parameter for

diff --git a/resources/NETGENPlugin.xml b/resources/NETGENPlugin.xml
index 135bc923fbde332c4283a6624ff761680b663126..9e0c77e24ed572b2bde3bf0de122db753f4ace0d 100644 (file)
--- a/resources/NETGENPlugin.xml
+++ b/resources/NETGENPlugin.xml
@@ -28,16 +28,16 @@
 
 <meshers>
 
-<meshers-group name="NETGEN"
-               resources="NETGENPlugin"
+<meshers-group name      ="NETGEN"
+               resources ="NETGENPlugin"
                idl-module="NETGENPlugin"
                server-lib="NETGENEngine"
-               gui-lib="NETGENPluginGUI">
+               gui-lib   ="NETGENPluginGUI">
   <hypotheses>
-    <hypothesis type="NETGEN_Parameters"
+    <hypothesis type    ="NETGEN_Parameters"
                label-id="NETGEN 3D Parameters"
-               icon-id="mesh_hypo_netgen.png"
-               dim="3">
+               icon-id ="mesh_hypo_netgen.png"
+               dim     ="3">
       <python-wrap>
         <accumulative-methods>
           SetLocalSizeOnShape,
@@ -45,10 +45,10 @@
         </accumulative-methods>
       </python-wrap>
     </hypothesis>
-    <hypothesis type="NETGEN_Parameters_2D"
+    <hypothesis type    ="NETGEN_Parameters_2D"
                label-id="NETGEN 2D Parameters"
-               icon-id="mesh_hypo_netgen_2d.png"
-               dim="2">
+               icon-id ="mesh_hypo_netgen_2d.png"
+               dim     ="2">
       <python-wrap>
         <accumulative-methods>
           SetLocalSizeOnShape,
@@ -56,10 +56,10 @@
         </accumulative-methods>
       </python-wrap>
     </hypothesis>
-    <hypothesis type="NETGEN_Parameters_3D"
+    <hypothesis type    ="NETGEN_Parameters_3D"
                label-id="NETGEN 3D Parameters"
-               icon-id="mesh_hypo_netgen.png"
-               dim="3">
+               icon-id ="mesh_hypo_netgen.png"
+               dim     ="3">
       <python-wrap>
         <accumulative-methods>
           SetLocalSizeOnShape,
@@ -67,10 +67,10 @@
         </accumulative-methods>
       </python-wrap>
     </hypothesis>
-    <hypothesis type="NETGEN_Parameters_2D_ONLY"
+    <hypothesis type    ="NETGEN_Parameters_2D_ONLY"
                label-id="NETGEN 2D Parameters"
-               icon-id="mesh_hypo_netgen_2d.png"
-               dim="2">
+               icon-id ="mesh_hypo_netgen_2d.png"
+               dim     ="2">
       <python-wrap>
         <accumulative-methods>
           SetLocalSizeOnShape,
@@ -78,25 +78,28 @@
         </accumulative-methods>
       </python-wrap>
     </hypothesis>
-    <hypothesis type="NETGEN_SimpleParameters_2D"
+    <hypothesis type    ="NETGEN_SimpleParameters_2D"
                label-id="NETGEN 2D Simple Parameters"
-               icon-id="mesh_hypo_netgen_2d.png"
-               dim="2"/>
-    <hypothesis type="NETGEN_SimpleParameters_3D"
+               icon-id ="mesh_hypo_netgen_2d.png"
+               dim     ="2"/>
+    <hypothesis type    ="NETGEN_SimpleParameters_3D"
                label-id="NETGEN 3D Simple Parameters"
-               icon-id="mesh_hypo_netgen.png"
-               dim="3"/>
+               icon-id ="mesh_hypo_netgen.png"
+               dim     ="3"/>
   </hypotheses>
+
   <algorithms>
-    <algorithm type="NETGEN_3D"
-               label-id="Tetrahedron (Netgen)"
-               icon-id="mesh_algo_tetra.png"
-               hypos="MaxElementVolume,NETGEN_Parameters_3D"
+    <algorithm type     ="NETGEN_3D"
+               label-id ="NETGEN 3D"
+               icon-id  ="mesh_algo_tetra.png"
+               group-id ="1"
+               priority ="20"
+               hypos    ="MaxElementVolume,NETGEN_Parameters_3D"
                opt-hypos="ViscousLayers"
               need-geom="false"
-               input="TRIA,QUAD"
-               output="TETRA,PYRAMID"
-               dim="3">
+               input    ="TRIA,QUAD"
+               output   ="TETRA,PYRAMID"
+               dim      ="3">
       <python-wrap>
         <algo>NETGEN_3D=Tetrahedron()</algo>
         <hypo>MaxElementVolume=MaxElementVolume(SetMaxElementVolume())</hypo>
@@ -105,14 +108,16 @@
       </python-wrap>
     </algorithm>
 
-    <algorithm type="NETGEN_2D_ONLY"
-               label-id="Netgen 2D"
-               icon-id="mesh_algo_netgen_2d.png"
-               hypos="LengthFromEdges,MaxElementArea,NETGEN_Parameters_2D_ONLY"
+    <algorithm type     ="NETGEN_2D_ONLY"
+               label-id ="NETGEN 2D"
+               icon-id  ="mesh_algo_netgen_2d.png"
+               group-id ="1"
+               priority ="20"
+               hypos    ="LengthFromEdges,MaxElementArea,NETGEN_Parameters_2D_ONLY"
                opt-hypos="QuadranglePreference,ViscousLayers2D"
-               input="EDGE"
-               output="TRIA,QUAD"
-               dim="2">
+               input    ="EDGE"
+               output   ="TRIA,QUAD"
+               dim      ="2">
        <python-wrap>
         <algo>NETGEN_2D_ONLY=Triangle(algo=smeshBuilder.NETGEN_2D)</algo>
         <hypo>LengthFromEdges=LengthFromEdges()</hypo>
@@ -123,13 +128,15 @@
       </python-wrap>
     </algorithm>
 
-    <algorithm type="NETGEN_2D"
-               label-id="Netgen 1D-2D"
-               icon-id="mesh_algo_netgen_2d.png"
-               hypos="NETGEN_Parameters_2D, NETGEN_SimpleParameters_2D"
-               opt-hypos="ViscousLayers2D"
-               output="TRIA,QUAD"
-               dim="2"
+    <algorithm type             ="NETGEN_2D"
+               label-id         ="NETGEN 1D-2D"
+               icon-id          ="mesh_algo_netgen_2d.png"
+               group-id         ="1"
+               priority         ="10"
+               hypos            ="NETGEN_Parameters_2D, NETGEN_SimpleParameters_2D"
+               opt-hypos        ="ViscousLayers2D"
+               output           ="TRIA,QUAD"
+               dim              ="2"
                support-submeshes="true">
       <python-wrap>
         <algo>NETGEN_2D=Triangle(algo=smeshBuilder.NETGEN_1D2D)</algo>
@@ -139,12 +146,14 @@
       </python-wrap>
     </algorithm>
 
-    <algorithm type="NETGEN_2D3D"
-               label-id="Netgen 1D-2D-3D"
-               icon-id="mesh_algo_netgen_2d3d.png"
-               hypos="NETGEN_Parameters, NETGEN_SimpleParameters_3D"
-               output="TETRA,PYRAMID"
-               dim="3"
+    <algorithm type             ="NETGEN_2D3D"
+               label-id         ="NETGEN 1D-2D-3D"
+               icon-id          ="mesh_algo_netgen_2d3d.png"
+               group-id         ="1"
+               priority         ="10"
+               hypos            ="NETGEN_Parameters, NETGEN_SimpleParameters_3D"
+               output           ="TETRA,PYRAMID"
+               dim              ="3"
                support-submeshes="true">
       <python-wrap>
         <algo>NETGEN_2D3D=Tetrahedron(algo=smeshBuilder.NETGEN_1D2D3D)</algo>
@@ -158,11 +167,11 @@
 
 <hypotheses-set-group>
 
-    <hypotheses-set name="Automatic Tetrahedralization"
+    <hypotheses-set name ="Automatic Tetrahedralization"
                     hypos="NETGEN_Parameters"
                     algos="NETGEN_2D3D"/>
 
-    <hypotheses-set name="Automatic Triangulation"
+    <hypotheses-set name ="Automatic Triangulation"
                     hypos="NETGEN_Parameters_2D"
                     algos="NETGEN_2D"/>
 

diff --git a/src/GUI/NETGENPlugin_msg_en.ts b/src/GUI/NETGENPlugin_msg_en.ts
index d7263d55ba87babfebe7c3123814ea1ac4fe612f..c90b5044f5b073b75c42fe994cb9dfa4f301c485 100644 (file)
--- a/src/GUI/NETGENPlugin_msg_en.ts
+++ b/src/GUI/NETGENPlugin_msg_en.ts
@@ -5,7 +5,7 @@
     <name>@default</name>
     <message>
         <source>NETGEN_2D_HYPOTHESIS</source>
-        <translation>Netgen 2D</translation>
+        <translation>NETGEN 2D</translation>
     </message>
     <message>
         <source>NETGEN_2D_TITLE</source>
@@ -13,7 +13,7 @@
     </message>
     <message>
         <source>NETGEN_3D_HYPOTHESIS</source>
-        <translation>Netgen 3D</translation>
+        <translation>NETGEN 3D</translation>
     </message>
     <message>
         <source>NETGEN_3D_TITLE</source>
@@ -21,7 +21,7 @@
     </message>
     <message>
         <source>NETGEN_SimpleParameters_3D_HYPOTHESIS</source>
-        <translation>Netgen 3D simple parameters</translation>
+        <translation>NETGEN 3D simple parameters</translation>
     </message>
     <message>
         <source>NETGEN_SimpleParameters_3D_TITLE</source>
@@ -29,7 +29,7 @@
     </message>
     <message>
         <source>NETGEN_SimpleParameters_2D_HYPOTHESIS</source>
-        <translation>Netgen 2D simple parameters</translation>
+        <translation>NETGEN 2D simple parameters</translation>
     </message>
     <message>
         <source>NETGEN_SimpleParameters_2D_TITLE</source>

diff --git a/src/GUI/NETGENPlugin_msg_fr.ts b/src/GUI/NETGENPlugin_msg_fr.ts
index 45a940a65aba250cb8367ea9d9de9c39dab7525c..64005ea75d61721a73582f84f828eb9d74264252 100755 (executable)
--- a/src/GUI/NETGENPlugin_msg_fr.ts
+++ b/src/GUI/NETGENPlugin_msg_fr.ts
@@ -5,7 +5,7 @@
     <name>@default</name>
     <message>
         <source>NETGEN_2D_HYPOTHESIS</source>
-        <translation>Netgen 2D</translation>
+        <translation>NETGEN 2D</translation>
     </message>
     <message>
         <source>NETGEN_2D_TITLE</source>
@@ -13,7 +13,7 @@
     </message>
     <message>
         <source>NETGEN_3D_HYPOTHESIS</source>
-        <translation>Netgen 3D</translation>
+        <translation>NETGEN 3D</translation>
     </message>
     <message>
         <source>NETGEN_3D_TITLE</source>
@@ -21,7 +21,7 @@
     </message>
     <message>
         <source>NETGEN_SimpleParameters_3D_HYPOTHESIS</source>
-        <translation>Netgen 3D paramètres simplifiés</translation>
+        <translation>NETGEN 3D paramètres simplifiés</translation>
     </message>
     <message>
         <source>NETGEN_SimpleParameters_3D_TITLE</source>
@@ -29,7 +29,7 @@
     </message>
     <message>
         <source>NETGEN_SimpleParameters_2D_HYPOTHESIS</source>
-        <translation>Netgen 2D paramètres simplifiés</translation>
+        <translation>NETGEN 2D paramètres simplifiés</translation>
     </message>
     <message>
         <source>NETGEN_SimpleParameters_2D_TITLE</source>

diff --git a/src/GUI/NETGENPlugin_msg_ja.ts b/src/GUI/NETGENPlugin_msg_ja.ts
index 76a325332d328b3934f363eaf098fef3c1f7a0bc..73b3c29600801515acbb2f5bdfee1d83fecd16ad 100644 (file)
--- a/src/GUI/NETGENPlugin_msg_ja.ts
+++ b/src/GUI/NETGENPlugin_msg_ja.ts
@@ -5,7 +5,7 @@
     <name>@default</name>
     <message>
       <source>NETGEN_2D_HYPOTHESIS</source>
-      <translation>Netgen 2D</translation>
+      <translation>NETGEN 2D</translation>
     </message>
     <message>
       <source>NETGEN_2D_TITLE</source>
@@ -13,7 +13,7 @@
     </message>
     <message>
       <source>NETGEN_3D_HYPOTHESIS</source>
-      <translation>Netgen 3D</translation>
+      <translation>NETGEN 3D</translation>
     </message>
     <message>
       <source>NETGEN_3D_TITLE</source>
@@ -21,7 +21,7 @@
     </message>
     <message>
       <source>NETGEN_SimpleParameters_3D_HYPOTHESIS</source>
-      <translation>Netgen 3D 簡易パラメーター</translation>
+      <translation>NETGEN 3D 簡易パラメーター</translation>
     </message>
     <message>
       <source>NETGEN_SimpleParameters_3D_TITLE</source>
@@ -29,7 +29,7 @@
     </message>
     <message>
       <source>NETGEN_SimpleParameters_2D_HYPOTHESIS</source>
-      <translation>Netgen 2D 簡易パラメーター</translation>
+      <translation>NETGEN 2D 簡易パラメーター</translation>
     </message>
     <message>
       <source>NETGEN_SimpleParameters_2D_TITLE</source>