From 56eb08a1a6d0e802a5089d114a50ea8558915588 Mon Sep 17 00:00:00 2001 From: eap Date: Tue, 9 Sep 2014 14:17:24 +0400 Subject: [PATCH] COTECH: Update names of DISTENE products BLSURF -> MG-CADSurf GHS3D -> MG-Tetra Hexotic -> MG-Hexa and GHS3DPRL -> MG-Tetra Parallel --- .../gui/HexoticPLUGIN/input/hexotic_hypo.doc | 10 ++++---- .../input/hexoticplugin_python_interface.doc | 24 +++++++++---------- doc/salome/gui/HexoticPLUGIN/input/index.doc | 2 +- resources/HexoticPLUGIN.xml | 12 +++++----- src/GUI/HexoticPLUGIN_images.ts | 4 ++-- src/GUI/HexoticPLUGIN_msg_en.ts | 2 +- src/GUI/HexoticPluginGUI.cxx | 5 ++-- src/HexoticPlugin/HexoticPLUGINBuilder.py | 7 +++--- src/HexoticPlugin/HexoticPlugin_Hexotic.cxx | 10 ++++---- .../HexoticPlugin_Hypothesis.cxx | 2 +- .../HexoticPlugin_Hypothesis.hxx | 2 ++ src/HexoticPlugin/HexoticPlugin_i.cxx | 6 +++-- 12 files changed, 46 insertions(+), 40 deletions(-) diff --git a/doc/salome/gui/HexoticPLUGIN/input/hexotic_hypo.doc b/doc/salome/gui/HexoticPLUGIN/input/hexotic_hypo.doc index 3e5df46..23c33f7 100644 --- a/doc/salome/gui/HexoticPLUGIN/input/hexotic_hypo.doc +++ b/doc/salome/gui/HexoticPLUGIN/input/hexotic_hypo.doc @@ -1,8 +1,8 @@ /*! -\page hexotic_hypo_page Hexotic Parameters hypothesis +\page hexotic_hypo_page MG-Hexa Parameters hypothesis -\n Hexotic Parameters hypothesis works only with Hexotic +\n MG-Hexa Parameters hypothesis works only with MG-Hexa algorithm. This algorithm is a commercial software. \n To get a licence, visit http://www.distene.com/en/corp/eval-distene.html @@ -11,7 +11,7 @@ algorithm. This algorithm is a commercial software. \image html hexotic_parameters.png -\note If BLSURF is used as 2D algo, and if a GMF file is defined as output file (using SetGMFFile(my2Dmesh.mesh)), then Hexotic will use this file as input. +\note If BLSURF is used as 2D algo, and if a GMF file is defined as output file (using SetGMFFile(my2Dmesh.mesh)), then MG-Hexa will use this file as input. This allows to avoid the reconstruction of the GMF file from the SMESH structure and can improve the global computation time. -
See Also a sample TUI Script of the \ref tui_hexotic "creation of an Hexotic mesh" +
See Also a sample TUI Script of the \ref tui_hexotic "creation of a MG-Hexa mesh" \section hexotic_local_size_parameters Local size diff --git a/doc/salome/gui/HexoticPLUGIN/input/hexoticplugin_python_interface.doc b/doc/salome/gui/HexoticPLUGIN/input/hexoticplugin_python_interface.doc index b71eec5..3d8eb01 100644 --- a/doc/salome/gui/HexoticPLUGIN/input/hexoticplugin_python_interface.doc +++ b/doc/salome/gui/HexoticPLUGIN/input/hexoticplugin_python_interface.doc @@ -17,12 +17,12 @@ Below you can see an example of usage of the HexoticPLUGINBuilder Python API for -# \ref tui_hexotic_sd_mode3 -# \ref tui_hexotic_sd_mode4 -\section tui_hexotic_basic Construction of Mesh using Hexotic algorithm +\section tui_hexotic_basic Construction of Mesh using MG-Hexa algorithm -

Example of mesh generation with Hexotic algorithm:

+

Example of mesh generation with MG-Hexa algorithm:

\tui_script{hexoticdemo.py} -\image html hexotic_basic_subdivisions_4_8.png Left: Hexotic mesh without hypothesis, right: Hexotic mesh with an hypothesis defined by minl=4 and maxl=8 +\image html hexotic_basic_subdivisions_4_8.png Left: MG-Hexa mesh without hypothesis, right: MG-Hexa mesh with an hypothesis defined by minl=4 and maxl=8 \subsection tui_local_size Local size @@ -33,41 +33,41 @@ Below you can see an example of usage of the HexoticPLUGINBuilder Python API for \section tui_hexotic_sd_mode Effect of the sub-domain mode -This example illustrates the sub-domain mode of Hexotic. +This example illustrates the sub-domain mode of MG-Hexa. \subsection tui_hexotic_sd_mode1 Sub-domain mode = 1 -

Example of sub-domain mode 1 with Hexotic algorithm:

+

Example of sub-domain mode 1 with MG-Hexa algorithm:

\tui_script{hexoticsubdom1.py} -\image html hexotic_sd_mode_1.png Hexotic mesh of a box cut by a holed sphere ( sd = 1 ) +\image html hexotic_sd_mode_1.png MG-Hexa mesh of a box cut by a holed sphere ( sd = 1 ) \ref tui_hexotic "Back to top" \subsection tui_hexotic_sd_mode2 Sub-domain mode = 2 -

Example of sub-domain mode 2 with Hexotic algorithm:

+

Example of sub-domain mode 2 with MG-Hexa algorithm:

\tui_script{hexoticsubdom2.py} -\image html hexotic_sd_mode_2.png Hexotic mesh of a box cut by a holed sphere ( sd = 2 ) +\image html hexotic_sd_mode_2.png MG-Hexa mesh of a box cut by a holed sphere ( sd = 2 ) \ref tui_hexotic "Back to top" \subsection tui_hexotic_sd_mode3 Sub-domain mode = 3 -

Example of sub-domain mode 3 with Hexotic algorithm:

+

Example of sub-domain mode 3 with MG-Hexa algorithm:

\tui_script{hexoticsubdom3.py} -\image html hexotic_sd_mode_3.png Hexotic mesh of a box cut by a holed sphere ( sd = 3 ) +\image html hexotic_sd_mode_3.png MG-Hexa mesh of a box cut by a holed sphere ( sd = 3 ) \ref tui_hexotic "Back to top" \subsection tui_hexotic_sd_mode4 Sub-domain mode = 4 -

Example of sub-domain mode 4 with Hexotic algorithm:

+

Example of sub-domain mode 4 with MG-Hexa algorithm:

\tui_script{hexoticsubdom4.py} -\image html hexotic_sd_mode_4.png Hexotic mesh of a box cut by a plane ( On the left, sd = 3: the internal surface is ignored ; on the right sd = 4: all sub-domains are meshed ) +\image html hexotic_sd_mode_4.png MG-Hexa mesh of a box cut by a plane ( On the left, sd = 3: the internal surface is ignored ; on the right sd = 4: all sub-domains are meshed ) \ref tui_hexotic "Back to top" diff --git a/doc/salome/gui/HexoticPLUGIN/input/index.doc b/doc/salome/gui/HexoticPLUGIN/input/index.doc index ec94806..38f9089 100644 --- a/doc/salome/gui/HexoticPLUGIN/input/index.doc +++ b/doc/salome/gui/HexoticPLUGIN/input/index.doc @@ -6,7 +6,7 @@ - Meshing 3D geometric entities. - Generating 3D meshes from 2D meshes, working without geometrical objects. -\note HexoticPLUGIN plugin uses DISTENE Hexotic commercial meshing +\note HexoticPLUGIN plugin uses DISTENE MG-Hexa commercial meshing software and requires a license at the run time (to work within the Mesh module). diff --git a/resources/HexoticPLUGIN.xml b/resources/HexoticPLUGIN.xml index 05a0316..0d54497 100644 --- a/resources/HexoticPLUGIN.xml +++ b/resources/HexoticPLUGIN.xml @@ -31,8 +31,8 @@ server-lib="HexoticEngine" gui-lib="HexoticPluginGUI"> - @@ -45,16 +45,16 @@ - - Hexotic_3D=Hexahedron(algo=smeshBuilder.Hexotic) + Hexotic_3D=Hexahedron(algo=smeshBuilder.MG_Hexa) Hexotic_Parameters=Parameters() diff --git a/src/GUI/HexoticPLUGIN_images.ts b/src/GUI/HexoticPLUGIN_images.ts index 78717e0..8e7201d 100644 --- a/src/GUI/HexoticPLUGIN_images.ts +++ b/src/GUI/HexoticPLUGIN_images.ts @@ -12,7 +12,7 @@ mesh_hypo_Hexotic.png - ICON_SMESH_TREE_ALGO_Hexotic_2D3D + ICON_SMESH_TREE_ALGO_MG-Hexa mesh_tree_algo_Hexotic.png @@ -20,7 +20,7 @@ mesh_tree_algo_Hexotic.png - ICON_SMESH_TREE_HYPO_Hexotic_Parameters + ICON_SMESH_TREE_HYPO_MG-Hexa Parameters mesh_tree_hypo_Hexotic.png diff --git a/src/GUI/HexoticPLUGIN_msg_en.ts b/src/GUI/HexoticPLUGIN_msg_en.ts index 08c7c21..a0eeb3c 100644 --- a/src/GUI/HexoticPLUGIN_msg_en.ts +++ b/src/GUI/HexoticPLUGIN_msg_en.ts @@ -5,7 +5,7 @@ @default Hexotic_3D_HYPOTHESIS - Hexotic 3D + MG-Hexa Hexotic_3D_TITLE diff --git a/src/GUI/HexoticPluginGUI.cxx b/src/GUI/HexoticPluginGUI.cxx index 2af8246..29f4cf7 100755 --- a/src/GUI/HexoticPluginGUI.cxx +++ b/src/GUI/HexoticPluginGUI.cxx @@ -35,8 +35,9 @@ extern "C" SMESHGUI_GenericHypothesisCreator* GetHypothesisCreator( const QString& aHypType ) { SMESHGUI_GenericHypothesisCreator* aCreator = NULL; - if( aHypType=="Hexotic_Parameters" ) - aCreator = new HexoticPluginGUI_HypothesisCreator( aHypType ); + if( aHypType=="Hexotic_Parameters" || + aHypType=="MG-Hexa Parameters") + aCreator = new HexoticPluginGUI_HypothesisCreator( "MG-Hexa Parameters" ); return aCreator; } } diff --git a/src/HexoticPlugin/HexoticPLUGINBuilder.py b/src/HexoticPlugin/HexoticPLUGINBuilder.py index 39e7c39..eef51a1 100644 --- a/src/HexoticPlugin/HexoticPLUGINBuilder.py +++ b/src/HexoticPlugin/HexoticPLUGINBuilder.py @@ -36,8 +36,9 @@ except ImportError: # Mesh algo type identifiers #---------------------------- -## Algorithm type: Hexotic hexahedron 3D algorithm, see Hexotic_Algorithm -Hexotic = "Hexotic_3D" +## Algorithm type: MG-Hexa hexahedron 3D algorithm, see Hexotic_Algorithm +MG_Hexa = "MG-Hexa" +Hexotic = MG_Hexa #---------------------------- # Algorithms @@ -119,7 +120,7 @@ class Hexotic_Algorithm(Mesh_Algorithm): # @return hypothesis object def Parameters(self): if not self.params: - self.params = self.Hypothesis("Hexotic_Parameters", [], + self.params = self.Hypothesis("MG-Hexa Parameters", [], "libHexoticEngine.so", UseExisting=0) pass return self.params diff --git a/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx b/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx index 588d408..4f74c1f 100644 --- a/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx +++ b/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx @@ -99,14 +99,14 @@ HexoticPlugin_Hexotic::HexoticPlugin_Hexotic(int hypId, int studyId, SMESH_Gen* : SMESH_3D_Algo(hypId, studyId, gen) { MESSAGE("HexoticPlugin_Hexotic::HexoticPlugin_Hexotic"); - _name = "Hexotic_3D"; + _name = "MG-Hexa"; _shapeType = (1 << TopAbs_SHELL) | (1 << TopAbs_SOLID);// 1 bit /shape type // _onlyUnaryInput = false; _requireShape = false; _iShape=0; _nbShape=0; _hexoticFilesKept=false; - _compatibleHypothesis.push_back("Hexotic_Parameters"); + _compatibleHypothesis.push_back( HexoticPlugin_Hypothesis::GetHypType() ); #ifdef WITH_BLSURFPLUGIN _blsurfHypo = NULL; #endif @@ -147,7 +147,7 @@ bool HexoticPlugin_Hexotic::CheckBLSURFHypothesis( SMESH_Mesh& aMesh, // If a BLSURF hypothesis is applied, get it SMESH_HypoFilter blsurfFilter; - blsurfFilter.Init( blsurfFilter.HasName( "BLSURF_Parameters" )); + blsurfFilter.Init( blsurfFilter.HasName( BLSURFPlugin_Hypothesis::GetHypType() )); std::list appliedHyps; aMesh.GetHypotheses( aShape, blsurfFilter, appliedHyps, false ); @@ -155,7 +155,7 @@ bool HexoticPlugin_Hexotic::CheckBLSURFHypothesis( SMESH_Mesh& aMesh, itl = appliedHyps.begin(); theHyp = (*itl); // use only the first hypothesis std::string hypName = theHyp->GetName(); - if (hypName == "BLSURF_Parameters") { + if (hypName == BLSURFPlugin_Hypothesis::GetHypType()) { _blsurfHypo = static_cast (theHyp); ASSERT(_blsurfHypo); return true; @@ -192,7 +192,7 @@ bool HexoticPlugin_Hexotic::CheckHypothesis( SMESH_Mesh& theHyp = (*itl); // use only the first hypothesis std::string hypName = theHyp->GetName(); - if (hypName == "Hexotic_Parameters") { + if (hypName == HexoticPlugin_Hypothesis::GetHypType() ) { _hypothesis = static_cast (theHyp); ASSERT(_hypothesis); aStatus = SMESH_Hypothesis::HYP_OK; diff --git a/src/HexoticPlugin/HexoticPlugin_Hypothesis.cxx b/src/HexoticPlugin/HexoticPlugin_Hypothesis.cxx index 7cb1b7e..22dec1d 100644 --- a/src/HexoticPlugin/HexoticPlugin_Hypothesis.cxx +++ b/src/HexoticPlugin/HexoticPlugin_Hypothesis.cxx @@ -50,7 +50,7 @@ HexoticPlugin_Hypothesis::HexoticPlugin_Hypothesis (int hypId, int studyId, _sizeMaps(GetDefaultHexoticSizeMaps()) { MESSAGE("HexoticPlugin_Hypothesis::HexoticPlugin_Hypothesis"); - _name = "Hexotic_Parameters"; + _name = GetHypType(); _param_algo_dim = 3; } diff --git a/src/HexoticPlugin/HexoticPlugin_Hypothesis.hxx b/src/HexoticPlugin/HexoticPlugin_Hypothesis.hxx index 8a733d4..9c3f196 100644 --- a/src/HexoticPlugin/HexoticPlugin_Hypothesis.hxx +++ b/src/HexoticPlugin/HexoticPlugin_Hypothesis.hxx @@ -52,6 +52,8 @@ public: HexoticPlugin_Hypothesis(int hypId, int studyId, SMESH_Gen* gen); + static const char* GetHypType() { return "MG-Hexa Parameters"; } + void SetHexesMinLevel(int theVal); int GetHexesMinLevel() const { return _hexesMinLevel; } diff --git a/src/HexoticPlugin/HexoticPlugin_i.cxx b/src/HexoticPlugin/HexoticPlugin_i.cxx index d9c9ff6..8ef3514 100644 --- a/src/HexoticPlugin/HexoticPlugin_i.cxx +++ b/src/HexoticPlugin/HexoticPlugin_i.cxx @@ -51,10 +51,12 @@ extern "C" GenericHypothesisCreator_i* aCreator = 0; // Algorithms - if (strcmp(aHypName, "Hexotic_3D") == 0) + if (strcmp(aHypName, "Hexotic_3D") == 0 || + strcmp(aHypName, "MG-Hexa") == 0) aCreator = new HexoticPlugin_Creator_i; // Hypotheses - else if (strcmp(aHypName, "Hexotic_Parameters") == 0) + else if (strcmp(aHypName, "Hexotic_Parameters") == 0 || + strcmp(aHypName, "MG-Hexa Parameters") == 0) aCreator = new HexoticPlugin_Creator_i; else ; -- 2.39.2