add access to 'packing of parallelograms' algorithm: patch from Maximilen SIAVELIS...

diff --git a/src/GMSHPlugin/GMSHPlugin_Hypothesis.hxx b/src/GMSHPlugin/GMSHPlugin_Hypothesis.hxx
index 48b271af71d89587b66314de465b9fe107fadbd4..f102dd1fc426d991155d8e676dba0bd7f2b57df7 100644 (file)
--- 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 0875a338da324bac2f9dd20eb0cfb3230f0afb0b..08c1cd08fe0f395c33d2d82fae63a8d1efe3c50e 100644 (file)
--- a/src/GMSHPlugin/GMSHPlugin_Mesher.cxx
+++ b/src/GMSHPlugin/GMSHPlugin_Mesher.cxx
@@ -142,9 +142,9 @@ void GMSHPlugin_Mesher::SetGmshOptions()
   //*/
   
   std::map <int,double> 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 <int,double> 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 fded7663d69de3749b6e54ceae1b0afb0c98027c..d5185b75956bfbd97126db24463dcc7e41ac207c 100644 (file)
--- 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 8e9e384243dc0ac348e5e53ac9ead2188b8425fd..98d0638be857ba171697cc2bdfff540aae1723b6 100644 (file)
--- a/src/GUI/GMSHPlugin_msg_en.ts
+++ b/src/GUI/GMSHPlugin_msg_en.ts
@@ -75,6 +75,10 @@
         <source>GMSH_DELAUNAY_FOR_QUAD</source>
         <translation>Delaunay for quads</translation>
     </message>
+    <message>
+        <source>GMSH_PACKING_OF_PARALLELOGRAMS</source>
+        <translation>Packing of parallelograms</translation>
+    </message>
     <message>
         <source>GMSH_3D_ALGO</source>
         <translation>3D Algorithm</translation>

diff --git a/src/GUI/GMSHPlugin_msg_fr.ts b/src/GUI/GMSHPlugin_msg_fr.ts
index 62900b330af78b517de0d848766795c9f2065a62..b796525d4f015d14f662251bf2333e6b130c9ed2 100644 (file)
--- a/src/GUI/GMSHPlugin_msg_fr.ts
+++ b/src/GUI/GMSHPlugin_msg_fr.ts
@@ -79,6 +79,10 @@
         <source>GMSH_DELAUNAY_FOR_QUAD</source>
         <translation>Delaunay pour quads</translation>
     </message>
+    <message>
+        <source>GMSH_PACKING_OF_PARALLELOGRAMS</source>
+        <translation>Remplissage de parallélogrammes</translation>
+    </message>
     <message>
         <source>GMSH_3D_ALGO</source>
         <translation>Algorithme 3D</translation>