From: Paul RASCLE Date: Thu, 20 Dec 2018 13:42:11 +0000 (+0100) Subject: add access to 'packing of parallelograms' algorithm: patch from Maximilen SIAVELIS... X-Git-Tag: V9_3_0a1~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d0c5ffd68cedeffdf66c52870bdbe4738f2dc386;p=plugins%2Fgmshplugin.git add access to 'packing of parallelograms' algorithm: patch from Maximilen SIAVELIS (SimulEase) --- diff --git a/src/GMSHPlugin/GMSHPlugin_Hypothesis.hxx b/src/GMSHPlugin/GMSHPlugin_Hypothesis.hxx index 48b271a..f102dd1 100644 --- a/src/GMSHPlugin/GMSHPlugin_Hypothesis.hxx +++ b/src/GMSHPlugin/GMSHPlugin_Hypothesis.hxx @@ -44,7 +44,8 @@ public: meshadapt, delaunay, frontal, - delaunayforquad + delaunayforquad, + packingparallelograms }; void Set2DAlgo(Algo2D the2DAlgo); diff --git a/src/GMSHPlugin/GMSHPlugin_Mesher.cxx b/src/GMSHPlugin/GMSHPlugin_Mesher.cxx index 0875a33..08c1cd0 100644 --- a/src/GMSHPlugin/GMSHPlugin_Mesher.cxx +++ b/src/GMSHPlugin/GMSHPlugin_Mesher.cxx @@ -142,9 +142,9 @@ void GMSHPlugin_Mesher::SetGmshOptions() //*/ std::map mapAlgo2d; - mapAlgo2d[0]=2; mapAlgo2d[1]=1; mapAlgo2d[2]=5; mapAlgo2d[3]=6; mapAlgo2d[4]=8; + mapAlgo2d[0]=2; mapAlgo2d[1]=1; mapAlgo2d[2]=5; mapAlgo2d[3]=6; mapAlgo2d[4]=8; mapAlgo2d[5]=9; std::map mapAlgo3d; - mapAlgo3d[0]=1; mapAlgo3d[1]=4; mapAlgo3d[2]=5; mapAlgo3d[3]=6; mapAlgo3d[4]=7; mapAlgo3d[4]=9; + mapAlgo3d[0]=1; mapAlgo3d[1]=4; mapAlgo3d[2]=5; mapAlgo3d[3]=6; mapAlgo3d[4]=7; mapAlgo3d[5]=9; int ok; ok = GmshSetOption("Mesh", "Algorithm" , mapAlgo2d[_algo2d]) ; diff --git a/src/GUI/GMSHPluginGUI_HypothesisCreator.cxx b/src/GUI/GMSHPluginGUI_HypothesisCreator.cxx index fded766..d5185b7 100644 --- a/src/GUI/GMSHPluginGUI_HypothesisCreator.cxx +++ b/src/GUI/GMSHPluginGUI_HypothesisCreator.cxx @@ -51,7 +51,8 @@ enum Algo2D meshadapt, delaunay, frontal, - delaunayforquad + delaunayforquad, + packingparallelograms }; enum Algo3D @@ -147,7 +148,7 @@ QFrame* GMSHPluginGUI_HypothesisCreator::buildFrame() my2DAlgo = new QComboBox( GroupC1 ); QStringList types2DAlgo; types2DAlgo << tr( "GMSH_AUTOMATIC" ) << tr( "GMSH_MESH_ADAPT" ) << tr( "GMSH_DELAUNAY" ) << - tr( "GMSH_FRONTAL" ) << tr( "GMSH_DELAUNAY_FOR_QUAD" ); + tr( "GMSH_FRONTAL" ) << tr( "GMSH_DELAUNAY_FOR_QUAD" ) << tr( "GMSH_PACKING_OF_PARALLELOGRAMS" ); my2DAlgo->addItems( types2DAlgo ); aGroupLayout->addWidget( my2DAlgo, row, 1 ); row++; diff --git a/src/GUI/GMSHPlugin_msg_en.ts b/src/GUI/GMSHPlugin_msg_en.ts index 8e9e384..98d0638 100644 --- a/src/GUI/GMSHPlugin_msg_en.ts +++ b/src/GUI/GMSHPlugin_msg_en.ts @@ -75,6 +75,10 @@ GMSH_DELAUNAY_FOR_QUAD Delaunay for quads + + GMSH_PACKING_OF_PARALLELOGRAMS + Packing of parallelograms + GMSH_3D_ALGO 3D Algorithm diff --git a/src/GUI/GMSHPlugin_msg_fr.ts b/src/GUI/GMSHPlugin_msg_fr.ts index 62900b3..b796525 100644 --- a/src/GUI/GMSHPlugin_msg_fr.ts +++ b/src/GUI/GMSHPlugin_msg_fr.ts @@ -79,6 +79,10 @@ GMSH_DELAUNAY_FOR_QUAD Delaunay pour quads + + GMSH_PACKING_OF_PARALLELOGRAMS + Remplissage de parallélogrammes + GMSH_3D_ALGO Algorithme 3D