23352: [CEA] Order and naming of meshing algorithms

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

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.
+  used together with NETGEN 2D algorithm.
-It allows Netgen 2D to build quad-dominant meshes.</li>
+It allows NETGEN 2D to build quad-dominant meshes.</li>
 </ul>
 <br>
 

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 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 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 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

resources/NETGENPlugin.xml

@@ -87,10 +87,13 @@
 		icon-id ="mesh_hypo_netgen.png"
 		dim     ="3"/>
   </hypotheses>
+
   <algorithms>
     <algorithm type     ="NETGEN_3D"
-               label-id="Tetrahedron (Netgen)"
+               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"
@@ -106,8 +109,10 @@
     </algorithm>
 
     <algorithm type     ="NETGEN_2D_ONLY"
-               label-id="Netgen 2D"
+               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"
@@ -124,8 +129,10 @@
     </algorithm>
 
     <algorithm type             ="NETGEN_2D"
-               label-id="Netgen 1D-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"
@@ -140,8 +147,10 @@
     </algorithm>
 
     <algorithm type             ="NETGEN_2D3D"
-               label-id="Netgen 1D-2D-3D"
+               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"

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>

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>

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>