From: eap <eap@opencascade.com>
Date: Tue, 9 Sep 2014 10:16:20 +0000 (+0400)
Subject: COTECH: Update names of DISTENE products
X-Git-Tag: V7_5_0a1~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e3fa7c8dbf15328e6c879eca2d48dd1b43ced0f6;p=plugins%2Fghs3dplugin.git

COTECH: Update names of DISTENE products

BLSURF -> MG-CADSurf
GHS3D -> MG-Tetra
Hexotic -> MG-Hexa

and

GHS3DPRL -> MG-Tetra Parallel
---

diff --git a/doc/salome/gui/GHS3DPLUGIN/input/additional_hypo.doc b/doc/salome/gui/GHS3DPLUGIN/input/additional_hypo.doc
index 90873f2..509cefc 100644
--- a/doc/salome/gui/GHS3DPLUGIN/input/additional_hypo.doc
+++ b/doc/salome/gui/GHS3DPLUGIN/input/additional_hypo.doc
@@ -5,9 +5,9 @@
 \n <b>Additional Hypotheses</b> can be applied as a supplement to the
 main hypotheses, introducing additional concepts to mesh creation.
 
-One additional hypotheses can be used together with GHS3D algoritm:
+One additional hypotheses can be used together with MG-Tetra algorithm:
 <ul>
-<li><b>Viscous Layers</b> additional hypothesis can be used together with GHS3D.
+<li><b>Viscous Layers</b> additional hypothesis can be used together with MG-Tetra.
 This hypothesis allows creation of layers of highly stretched prisms near
 mesh boundary, which is beneficial for high quality viscous
 computations. The prisms constructed on the quadrangular mesh faces are
diff --git a/doc/salome/gui/GHS3DPLUGIN/input/ghs3d_hypo.doc b/doc/salome/gui/GHS3DPLUGIN/input/ghs3d_hypo.doc
index 27198b2..c800d80 100644
--- a/doc/salome/gui/GHS3DPLUGIN/input/ghs3d_hypo.doc
+++ b/doc/salome/gui/GHS3DPLUGIN/input/ghs3d_hypo.doc
@@ -1,12 +1,12 @@
 /*!
 
-\page ghs3d_hypo_page GHS3D Parameters hypothesis
+\page ghs3d_hypo_page MG-Tetra Parameters hypothesis
 
 \anchor ghs3d_top
-GHS3D Parameters hypothesis works only with <b>Tetrahedron (GHS3D)</b> 
+MG-Tetra Parameters hypothesis works only with <b>MG-Tetra</b> 
 algorithm. This algorithm is a commercial software.
 
-To get a licence, visit http://www.distene.com/en/corp/eval-distene.html
+To get a license, visit http://www.distene.com/en/corp/eval-distene.html
 
 \tableofcontents
 
@@ -14,7 +14,7 @@ To get a licence, visit http://www.distene.com/en/corp/eval-distene.html
 
 \image html ghs3d_parameters_basic.png
 
-- <b>Name</b> - allows to define the name of the hypothesis (GHS3D 
+- <b>Name</b> - allows to define the name of the hypothesis (MG-Tetra
 Parameters by default).
 
 - <b>Mesh holes</b> - if checked, the algorithm will 
@@ -27,7 +27,7 @@ create groups of just generated elements corresponding to each mesh
 domain.<br>
 
 - <b>Optimization level</b> - allows choosing the required
-optimization level (higher level of optimisation provides better mesh,
+optimization level (higher level of optimization provides better mesh,
 but can be time-consuming):
 
   - none
@@ -48,18 +48,18 @@ but can be time-consuming):
 
 \subsection memory_settings Memory settings
 
-- <b>Maximum memory size</b> - launches ghs3d software with
+- <b>Maximum memory size</b> - launches MG-Tetra software with
 work space limited to the specified amount of RAM, in Mbytes. If this option is
 checked off, the software will be launched with 7O% of the total RAM space.
 
-- <b>Initial memory size</b> - starts ghs3d software with
+- <b>Initial memory size</b> - starts MG-Tetra software with
 the specified amount of work space, in Mbytes. If this option is checked off, the
 software will be started with 100 Megabytes of working space.
 
 \subsection log Logs and debug
 
 - <b>Working directory</b> - allows defining the folder for input and output
-files of ghs3d software, which are the files starting with "GHS3D_" prefix.
+files of MG-Tetra software, which are the files starting with "GHS3D_" prefix.
 
 - <b>Verbose level</b> - to choose verbosity level in the range from
 0 to 10.
@@ -83,16 +83,16 @@ is enabled (there must be a log file to delete it) and <b>Keep all working files
 (in this case the log file is always kept). 
 
 - <b>Keep all working files</b> - allows checking input and output files
-of ghs3d software, while usually these files are removed after the
+of MG-Tetra software, while usually these files are removed after the
 launch of the mesher. The log file (if any) is also kept if this option is checked.
 
 \subsection advanced_meshing_options Advanced meshing options
 
-- <b>Create new nodes</b> - if this option is checked off, ghs3d
+- <b>Create new nodes</b> - if this option is checked off, MG-Tetra
 tries to create tetrahedrons using only the nodes of the 2D mesh.
 
-- <b>Remove the initial central point</b> TetMesh-GHS3D adds an internal point 
-at the gravity centre of the bounding box to speed up and to simplify 
+- <b>Remove the initial central point</b> MG-Tetra adds an internal point 
+at the gravity center of the bounding box to speed up and to simplify 
 the meshing process. However, it is possible to refrain from creating 
 this point by using the command line option -no initial central point. This can be
 particularly useful to generate a volume mesh without internal points at all and in some rare cases
@@ -118,7 +118,7 @@ positive volume).
 replacing overconstrained elements where it is possible. At first the process 
 slices the overconstrained edges and at second the overconstrained 
 facets. This ensures that there are no edges with two boundary
-vertices and that there are no facets with three boundary vertices. TetMesh-GHS3D gives the initial 
+vertices and that there are no facets with three boundary vertices. MG-Tetra gives the initial 
 and final overconstrained edges and facets. It also gives the facets
 which have three edges on the boundary.
 Note: when using this option, the speed of the meshing process may 
@@ -129,7 +129,7 @@ By default, the FEM correction is not used.
 WARNING: Changing the default value of this parameter may dramatically decrease the quality of the resulting mesh.
 
 - <b>Option as text</b> - allows to input in the command line any text
-for ghs3d, for example, advanced options.
+for MG-Tetra, for example, advanced options.
 
 \ref ghs3d_top "Back to top"
 
@@ -137,15 +137,15 @@ for ghs3d, for example, advanced options.
 
 \image html ghs3d_enforced_vertices.png
 
-GHS3D algorithm can locally make the mesh finer. It is possible to
+MG-Tetra algorithm can locally make the mesh finer. It is possible to
 define enforced vertices in the volume where the mesh will be detailed.
 A node will be created at the enforced vertex coordinates.
 
 An enforced vertex is defined by:
 - A vertex
-  - from GEOM (Vertex, Compound) - only avaible on meshes with no
+  - from GEOM (Vertex, Compound) - only available on meshes with no
   geometry attached
-  - or from (x,y,z) cartesian coordinates
+  - or from (x,y,z) Cartesian coordinates
 - A constant physical size
 - If a group name is given, the created node will be added to the
 group. If the group does not exist, it is created.
@@ -156,7 +156,7 @@ group. If the group does not exist, it is created.
 
 \image html ghs3d_enforced_meshes.png
 
-GHS3D algorithm can be forced by other meshes, sub-meshes or
+MG-Tetra algorithm can be forced by other meshes, sub-meshes or
 groups. The constraint elements should be contained
 entirely into the solid mesh.
 - The constraint element types are:
@@ -166,7 +166,7 @@ entirely into the solid mesh.
 - If a group name is given, the enforced elements will be added to
 the group. If the group does not exist, it is created.
 
-<br><b>See Also</b> a sample TUI Script of the \ref tui_ghs3d "creation of a Ghs3D hypothesis", including enforced vertices and meshes.
+<br><b>See Also</b> a sample TUI Script of the \ref tui_ghs3d "creation of a MG-Tetra hypothesis", including enforced vertices and meshes.
 
 \ref ghs3d_top "Back to top"
 
diff --git a/doc/salome/gui/GHS3DPLUGIN/input/ghs3dplugin_python_interface.doc b/doc/salome/gui/GHS3DPLUGIN/input/ghs3dplugin_python_interface.doc
index 6966121..7825164 100644
--- a/doc/salome/gui/GHS3DPLUGIN/input/ghs3dplugin_python_interface.doc
+++ b/doc/salome/gui/GHS3DPLUGIN/input/ghs3dplugin_python_interface.doc
@@ -14,31 +14,31 @@ Below you can see an example of usage of the GHS3DPluginBuilder Python API for m
 -# \ref tui_ghs3d_enforced_vertices
 -# \ref tui_ghs3d_enforced_meshes
 
-\section tui_ghs3d_basic Construction of Mesh using Ghs3D algorithm
+\section tui_ghs3d_basic Construction of Mesh using MG-Tetra algorithm
 
 \anchor example_BLSURFPlugin
-<h2>Example of mesh generation with GHS3D algorithm:</h2>
+<h2>Example of mesh generation with MG-Tetra algorithm:</h2>
 \tui_script{ghs3ddemo.py}
 
 
-\image html ghs3d_screenshot.png Ghs3d mesh without hypothesis
+\image html ghs3d_screenshot.png MG-Tetra mesh without hypothesis
 
 \ref tui_ghs3d "Back to top"
 
 \section tui_ghs3d_enforced_vertices Adding enforced vertices
 
-<h2>Example of enforced vertices with GHS3D algorithm:</h2>
+<h2>Example of enforced vertices with MG-Tetra algorithm:</h2>
 \tui_script{ghs3d_enfvert.py}
 
 
-\image html ghs3d_screenshot_enf1.png Ghs3d mesh with enforced vertex
-\image html ghs3d_screenshot_enf2.png Ghs3d mesh with enforced vertex from GEOM vertex
+\image html ghs3d_screenshot_enf1.png MG-Tetra mesh with enforced vertex
+\image html ghs3d_screenshot_enf2.png MG-Tetra mesh with enforced vertex from GEOM vertex
 
 \ref tui_ghs3d "Back to top"
 
 \section tui_ghs3d_enforced_meshes Adding enforced mesh
 
-<h2>Example of enforced meshes with GHS3D algorithm:</h2>
+<h2>Example of enforced meshes with MG-Tetra algorithm:</h2>
 \tui_script{ghs3d_enfmesh.py}
 
 \image html ghs3d_screenshot_enf3.png
diff --git a/resources/GHS3DPlugin.xml b/resources/GHS3DPlugin.xml
index 173a3a7..cc33989 100644
--- a/resources/GHS3DPlugin.xml
+++ b/resources/GHS3DPlugin.xml
@@ -31,8 +31,8 @@
                server-lib="GHS3DEngine"
                gui-lib="GHS3DPluginGUI">
   <hypotheses>
-    <hypothesis type="GHS3D_Parameters"
-		label-id="GHS3D Parameters"
+    <hypothesis type="MG-Tetra Parameters"
+		label-id="MG-Tetra Parameters"
 		icon-id="mesh_hypo_ghs3d.png"
 		dim="3">
       <python-wrap>
@@ -54,17 +54,17 @@
   </hypotheses>
 
   <algorithms>
-    <algorithm type="GHS3D_3D"
-               label-id="Tetrahedron (GHS3D)"
+    <algorithm type="MG-Tetra"
+               label-id="MG-Tetra"
                icon-id="mesh_tree_hypo_ghs3d.png"
                input="TRIA,QUAD"
                output="TETRA,PYRAMID"
 	       need-geom="false"
-               opt-hypos="GHS3D_Parameters, ViscousLayers"
+               opt-hypos="MG-Tetra Parameters,ViscousLayers"
                dim="3">
       <python-wrap>
-        <algo>GHS3D_3D=Tetrahedron(algo=smeshBuilder.GHS3D)</algo>
-        <hypo>GHS3D_Parameters=Parameters()</hypo>
+        <algo>MG-Tetra=Tetrahedron(algo=smeshBuilder.MG_Tetra)</algo>
+        <hypo>MG-Tetra Parameters=Parameters()</hypo>
         <hypo>ViscousLayers=ViscousLayers(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreFaces())</hypo>
       </python-wrap>
     </algorithm>
diff --git a/src/GHS3DPlugin/GHS3DPluginBuilder.py b/src/GHS3DPlugin/GHS3DPluginBuilder.py
index c58491e..e0b5ca1 100644
--- a/src/GHS3DPlugin/GHS3DPluginBuilder.py
+++ b/src/GHS3DPlugin/GHS3DPluginBuilder.py
@@ -43,7 +43,8 @@ None_Optimization, Light_Optimization, Standard_Optimization, StandardPlus_Optim
 #----------------------------
 
 ## Algorithm type: GHS3D tetrahedron 3D algorithm, see GHS3D_Algorithm
-GHS3D = "GHS3D_3D"
+GHS3D = "MG-Tetra"
+MG_Tetra = "MG-Tetra"
 
 ## Tetrahedron GHS3D 3D algorithm
 #  
@@ -75,7 +76,7 @@ class GHS3D_Algorithm(Mesh_Algorithm):
     #  @return hypothesis object
     def Parameters(self):
         if not self.params:
-            self.params = self.Hypothesis("GHS3D_Parameters", [],
+            self.params = self.Hypothesis("MG-Tetra Parameters", [],
                                           "libGHS3DEngine.so", UseExisting=0)
             pass
         return self.params
diff --git a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx
index ba632a1..519b2b4 100644
--- a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx
+++ b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx
@@ -80,7 +80,7 @@ public:
 
   bool         importGMFMesh(const char* aGMFFileName, SMESH_Mesh& aMesh);
 
-  static const char* Name() { return "GHS3D_3D"; }
+  static const char* Name() { return "MG-Tetra"; }
 
 protected:
   const GHS3DPlugin_Hypothesis*   _hyp;
diff --git a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx
index 646362d..f9f4e4d 100644
--- a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx
+++ b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx
@@ -68,7 +68,7 @@ GHS3DPlugin_Hypothesis::GHS3DPlugin_Hypothesis(int hypId, int studyId, SMESH_Gen
   _nodeIDToSizeMap(DefaultID2SizeMap()),
   _groupsToRemove(DefaultGroupsToRemove())
 {
-  _name = "GHS3D_Parameters";
+  _name = GetHypType();
   _param_algo_dim = 3;
 }
 
diff --git a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx
index 7f432f0..c3a7e1c 100644
--- a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx
+++ b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx
@@ -118,7 +118,7 @@ public:
   typedef std::map<const SMDS_MeshNode*, std::string, TIDMeshIDCompare > TIDSortedNodeGroupMap;
   typedef std::set<std::string> TSetStrings;
 
-  static const char* GetHypType() { return "GHS3D_Parameters"; }
+  static const char* GetHypType() { return "MG-Tetra Parameters"; }
   /*!
    * To mesh "holes" in a solid or not. Default is to mesh.
    */
diff --git a/src/GHS3DPlugin/GHS3DPlugin_i.cxx b/src/GHS3DPlugin/GHS3DPlugin_i.cxx
index b0c3b9b..c3f278d 100644
--- a/src/GHS3DPlugin/GHS3DPlugin_i.cxx
+++ b/src/GHS3DPlugin/GHS3DPlugin_i.cxx
@@ -56,10 +56,12 @@ extern "C"
     // Hypotheses
 
     // Algorithm
-    if (strcmp(aHypName, "GHS3D_3D") == 0)
+    if (strcmp(aHypName, "GHS3D_3D") == 0 ||
+        strcmp(aHypName, "MG-Tetra") == 0)
       aCreator = new GHS3DPlugin_Creator_i<GHS3DPlugin_GHS3D_i>;
     // Hypothesis
-    else if (strcmp(aHypName, "GHS3D_Parameters") == 0)
+    else if (strcmp(aHypName, "GHS3D_Parameters") == 0 ||
+             strcmp(aHypName, "MG-Tetra Parameters") == 0)
       aCreator = new GHS3DPlugin_Creator_i<GHS3DPlugin_Hypothesis_i>;
     else ;
 
diff --git a/src/GUI/GHS3DPluginGUI.cxx b/src/GUI/GHS3DPluginGUI.cxx
index 53b5f0e..933b362 100644
--- a/src/GUI/GHS3DPluginGUI.cxx
+++ b/src/GUI/GHS3DPluginGUI.cxx
@@ -35,7 +35,8 @@ extern "C"
   SMESHGUI_GenericHypothesisCreator* GetHypothesisCreator( const QString& aHypType )
   {
     SMESHGUI_GenericHypothesisCreator* aCreator = NULL;
-    if ( aHypType == "GHS3D_Parameters" )
+    if ( aHypType == "GHS3D_Parameters" ||
+         aHypType == "MG-Tetra Parameters" )
       aCreator =  new GHS3DPluginGUI_HypothesisCreator( aHypType );
     return aCreator;
   }
diff --git a/src/GUI/GHS3DPlugin_images.ts b/src/GUI/GHS3DPlugin_images.ts
index 7f59dfe..58d83e2 100644
--- a/src/GUI/GHS3DPlugin_images.ts
+++ b/src/GUI/GHS3DPlugin_images.ts
@@ -8,11 +8,11 @@
             <translation>mesh_hypo_ghs3d.png</translation>
         </message>
         <message>
-            <source>ICON_SMESH_TREE_ALGO_GHS3D_3D</source>
+            <source>ICON_SMESH_TREE_ALGO_MG-Tetra</source>
             <translation>mesh_tree_hypo_ghs3d.png</translation>
         </message>
         <message>
-            <source>ICON_SMESH_TREE_HYPO_GHS3D_Parameters</source>
+            <source>ICON_SMESH_TREE_HYPO_MG-Tetra Parameters</source>
             <translation>mesh_tree_hypo_ghs3d.png</translation>
         </message>
     </context>
diff --git a/src/GUI/GHS3DPlugin_msg_en.ts b/src/GUI/GHS3DPlugin_msg_en.ts
index a7e3aca..bca2a59 100644
--- a/src/GUI/GHS3DPlugin_msg_en.ts
+++ b/src/GUI/GHS3DPlugin_msg_en.ts
@@ -9,7 +9,7 @@
     </message>
     <message>
         <source>GHS3D_HYPOTHESIS</source>
-        <translation>GHS3D</translation>
+        <translation>MG-Tetra</translation>
     </message>
     <message>
         <source>GHS3D_OPTIMIZATIOL_LEVEL</source>