COTECH: Update names of DISTENE products

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

and

GHS3DPRL -> MG-Tetra Parallel

diff --git a/resources/BLSURFPlugin.xml b/resources/BLSURFPlugin.xml
index e2da7677434b358b5a834dafeec3d451287b3657..125004926b585e96dbe56f4201fc9848cfe4eccf 100644 (file)
--- a/resources/BLSURFPlugin.xml
+++ b/resources/BLSURFPlugin.xml
@@ -31,7 +31,7 @@
                server-lib="BLSURFEngine"
                gui-lib="BLSURFPluginGUI">
   <hypotheses>
-    <hypothesis type="MG_CADSurf_Parameters"
+    <hypothesis type="MG-CADSurf Parameters"
                label-id="MG-CADSurf Parameters"
                icon-id="mesh_hypo_BLSURF.png"
                dim="2">
@@ -65,16 +65,16 @@
   </hypotheses>
   <algorithms>
 
-    <algorithm type="MG_CADSurf"
+    <algorithm type="MG-CADSurf"
                label-id="MG-CADSurf"
                icon-id="mesh_algo_BLSURF.png"
-               opt-hypos="MG_CADSurf_Parameters,ViscousLayers2D"
+               opt-hypos="MG-CADSurf Parameters,ViscousLayers2D"
                output="TRIA,QUAD"
                dim="2"
               support-submeshes="true">
       <python-wrap>
-        <algo>BLSURF=Triangle(algo=smeshBuilder.MG_CADSurf)</algo>
-        <hypo>BLSURF_Parameters=Parameters()</hypo>
+        <algo>MG-CADSurf=Triangle(algo=smeshBuilder.MG_CADSurf)</algo>
+        <hypo>MG-CADSurf Parameters=Parameters()</hypo>
         <hypo>ViscousLayers2D=ViscousLayers2D(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreEdges())</hypo>
       </python-wrap>
     </algorithm>

diff --git a/src/BLSURFPlugin/BLSURFPluginBuilder.py b/src/BLSURFPlugin/BLSURFPluginBuilder.py
index b60ce41604047c1d90dbae06f91706a37d59400b..7eb158f830b3633b871d1dca7b8708d80b89b7b2 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPluginBuilder.py
+++ b/src/BLSURFPlugin/BLSURFPluginBuilder.py
@@ -44,9 +44,9 @@ except ImportError:
 # Mesh algo type identifiers
 #----------------------------
 
-## Algorithm type: BLSurf triangle 2D algorithm, see BLSURF_Algorithm
-BLSURF = "MG_CADSurf"
-MG_CADSurf = "MG_CADSurf"
+## Algorithm type: MG-CADSurf triangle algorithm, see BLSURF_Algorithm
+MG_CADSurf = "MG-CADSurf"
+BLSURF = MG_CADSurf
 
 #----------------------
 # Algorithms
@@ -66,7 +66,7 @@ class BLSURF_Algorithm(Mesh_Algorithm):
   algoType   = BLSURF
   ## doc string of the method
   #  @internal
-  docHelper  = "Creates triangle 2D algorithm for faces"
+  docHelper  = "Creates triangle algorithm for faces"
 
   _anisotropic_ratio = 0
   _bad_surface_element_aspect_ratio = 1000
@@ -431,7 +431,7 @@ class BLSURF_Algorithm(Mesh_Algorithm):
   #  @return hypothesis object
   def Parameters(self):
     if not self.params:
-      self.params = self.Hypothesis("MG_CADSurf_Parameters", [],
+      self.params = self.Hypothesis("MG-CADSurf Parameters", [],
                                     "libBLSURFEngine.so", UseExisting=0)
       pass
     return self.params

diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
index 7624e36a40ce9beef0f8af6e350d677f08f451e7..d968a6d0561baa63bf5118e91bd0c1d7c69acc73 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
@@ -241,7 +241,7 @@ BLSURFPlugin_BLSURF::BLSURFPlugin_BLSURF(int hypId, int studyId,
 {
   MESSAGE("BLSURFPlugin_BLSURF::BLSURFPlugin_BLSURF");
 
-  _name = "MG_CADSurf";//"BLSURF";
+  _name = "MG-CADSurf";//"BLSURF";
   _shapeType = (1 << TopAbs_FACE); // 1 bit /shape type
   _compatibleHypothesis.push_back(BLSURFPlugin_Hypothesis::GetHypType());
   _compatibleHypothesis.push_back(StdMeshers_ViscousLayers2D::GetHypType());

diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx
index 324e26ee37b7b788105b7afed93b7005aabcd41f..37c9afe3b0c6934afc00b3b8d1e8191bdbdff15d 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx
@@ -64,7 +64,7 @@ public:
     GeometricalLocalSize
   };
 
-  static const char* GetHypType() { return "MG_CADSurf_Parameters"; }
+  static const char* GetHypType() { return "MG-CADSurf Parameters"; }
   
   TopoDS_Shape entryToShape(std::string entry);
 

diff --git a/src/BLSURFPlugin/BLSURFPlugin_i.cxx b/src/BLSURFPlugin/BLSURFPlugin_i.cxx
index 4e2aed267c3ffdbbd601c13ae8038fdb4567b3af..cd78a173e8903449d0e9073b6c3505e08f0f3b55 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_i.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_i.cxx
@@ -60,11 +60,11 @@ extern "C"
 
     // Algorithms
     if (strcmp(aHypName, "BLSURF") == 0 ||
-        strcmp(aHypName, "MG_CADSurf") == 0 )
+        strcmp(aHypName, "MG-CADSurf") == 0 )
       aCreator = new BLSURFPlugin_Creator_i<BLSURFPlugin_BLSURF_i>;
     // Hypotheses
     else if (strcmp(aHypName, "BLSURF_Parameters") == 0 ||
-             strcmp(aHypName, "MG_CADSurf_Parameters") == 0 )
+             strcmp(aHypName, "MG-CADSurf Parameters") == 0 )
       aCreator = new BLSURFPlugin_Creator_i<BLSURFPlugin_Hypothesis_i>;
     else ;
 

diff --git a/src/GUI/BLSURFPluginGUI.cxx b/src/GUI/BLSURFPluginGUI.cxx
index ce97e99767f6e1ce4a843e04666b7b1637752e8c..369fc3766fce8b474aad239325b38d8909c67647 100755 (executable)
--- a/src/GUI/BLSURFPluginGUI.cxx
+++ b/src/GUI/BLSURFPluginGUI.cxx
@@ -44,7 +44,7 @@ extern "C"
   {
     SMESHGUI_GenericHypothesisCreator* aCreator = NULL;
     if( aHypType=="BLSURF_Parameters" ||
-        aHypType=="MG_CADSurf_Parameters")
+        aHypType=="MG-CADSurf Parameters")
       aCreator =  new BLSURFPluginGUI_HypothesisCreator( aHypType );
     return aCreator;
   }

diff --git a/src/GUI/BLSURFPlugin_images.ts b/src/GUI/BLSURFPlugin_images.ts
index 3fdee3c2a0b05218b8fc373d5d5a4b84734baf98..db5c9a54aca3ee2fe82f816e165db06fd58e7a20 100644 (file)
--- a/src/GUI/BLSURFPlugin_images.ts
+++ b/src/GUI/BLSURFPlugin_images.ts
@@ -4,7 +4,7 @@
     <context>
         <name>@default</name>
         <message>
-            <source>MG_CADSurf_ICON_SELECT</source>
+            <source>MG-CADSurf_ICON_SELECT</source>
             <translation>mesh_select_BLSURF.png</translation>
         </message>
         <message>
@@ -12,11 +12,11 @@
             <translation>mesh_hypo_BLSURF.png</translation>
         </message>
         <message>
-            <source>ICON_SMESH_TREE_ALGO_MG_CADSurf</source>
+            <source>ICON_SMESH_TREE_ALGO_MG-CADSurf</source>
             <translation>mesh_tree_algo_BLSURF.png</translation>
         </message>
         <message>
-            <source>ICON_SMESH_TREE_HYPO_MG_CADSurf_Parameters</source>
+            <source>ICON_SMESH_TREE_HYPO_MG-CADSurf Parameters</source>
             <translation>mesh_tree_hypo_BLSURF.png</translation>
         </message>
     </context>