bos #29483 Merge branch 'eap/29483_gmsh_sub'

[plugins/gmshplugin.git] / src / GMSHPlugin / GMSHPlugin_Mesher.hxx

diff --git a/src/GMSHPlugin/GMSHPlugin_Mesher.hxx b/src/GMSHPlugin/GMSHPlugin_Mesher.hxx
index ecfbb3357e1b8d393c72418ce5124b486771b094..a291d621f195df2d2fd1c59e2fd39ef6c623803d 100644 (file)
--- a/src/GMSHPlugin/GMSHPlugin_Mesher.hxx
+++ b/src/GMSHPlugin/GMSHPlugin_Mesher.hxx
@@ -43,12 +43,9 @@
 #include "MElement.h"
 
 #include "GMSHPlugin_Defs.hxx"
-#include "StdMeshers_FaceSide.hxx"
-#include "SMDS_MeshElement.hxx"
 #include "SMESH_Algo.hxx"
 
 #include <map>
-#include <vector>
 #include <set>
 
 class SMESH_Mesh;
@@ -71,7 +68,7 @@ class GMSHPLUGIN_EXPORT GMSHPlugin_Mesher
  public:
   // ---------- PUBLIC METHODS ----------
 
-  GMSHPlugin_Mesher (SMESH_Mesh* mesh, const TopoDS_Shape& aShape);
+  GMSHPlugin_Mesher (SMESH_Mesh* mesh, const TopoDS_Shape& aShape, bool is2D);
 
   void SetParameters(const GMSHPlugin_Hypothesis*          hyp);
 
@@ -103,9 +100,21 @@ class GMSHPLUGIN_EXPORT GMSHPlugin_Mesher
 
   std::set<std::string> _compounds;
 
+  int                                               _nodeNumShift;
+  std::map< const MVertex *, const SMDS_MeshNode* > _nodeMap;
+
+  smIdType NodeID( const MVertex* v, bool checkMap = false );
+  const SMDS_MeshNode* Node( const MVertex* v, bool checkMap = false );
+  SMESHDS_SubMesh* HasSubMesh( const TopoDS_Shape& s );
+
   void SetGmshOptions();
   void CreateGmshCompounds();
   void FillSMesh();
+  void HideComputedEntities( GModel* gModel );
+  void RestoreVisibility( GModel* gModel );
+  void Set1DSubMeshes( GModel* );
+  void Set2DSubMeshes( GModel* );
+  void toPython( GModel* );
 #if GMSH_MAJOR_VERSION >=4 && GMSH_MINOR_VERSION >=3
   void SetMaxThreadsGmsh();
   void SetCompoundMeshVisibility();