Merge multi-study removal branch.

[plugins/blsurfplugin.git] / src / BLSURFPlugin / BLSURFPlugin_Hypothesis_i.hxx

diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx
index 3e19cd4273d6e17c9e67a3fb2013dc536572d33f..020299e3531a8491cf1af1cab4b11ff55f7b8c21 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx
@@ -37,11 +37,15 @@ class GEOM_Object;
 
 // BLSURFPlugin parameters hypothesis
 
-class BLSURFPlugin_Hypothesis_i: public virtual POA_BLSURFPlugin::BLSURFPlugin_Hypothesis,
-    public virtual SMESH_Hypothesis_i {
+class BLSURFPlugin_Hypothesis_i:
+  public virtual POA_BLSURFPlugin::BLSURFPlugin_Hypothesis,
+  public virtual SMESH_Hypothesis_i
+{
 public:
   // Constructor
-  BLSURFPlugin_Hypothesis_i(PortableServer::POA_ptr thePOA, ::SMESH_Gen* theGenImpl);
+  BLSURFPlugin_Hypothesis_i(PortableServer::POA_ptr thePOA,
+                            ::SMESH_Gen*            theGenImpl,
+                            bool                    theHasGEOM);
   // Destructor
   virtual ~BLSURFPlugin_Hypothesis_i();
 
@@ -133,12 +137,18 @@ public:
   void SetJacobianRectificationRespectGeometry( CORBA::Boolean allowRectification );
   CORBA::Boolean GetJacobianRectificationRespectGeometry();
 
+  void SetUseDeprecatedPatchMesher( CORBA::Boolean useDeprecatedPatchMesher );
+  CORBA::Boolean GetUseDeprecatedPatchMesher();
+
   void SetJacobianRectification( CORBA::Boolean allowRectification );
   CORBA::Boolean GetJacobianRectification();
 
   void SetMaxNumberOfPointsPerPatch( CORBA::Long nb ) throw (SALOME::SALOME_Exception);
   CORBA::Long GetMaxNumberOfPointsPerPatch();
 
+  void SetMaxNumberOfThreads( CORBA::Long nb ) throw (SALOME::SALOME_Exception);
+  CORBA::Long GetMaxNumberOfThreads();
+
   void SetRespectGeometry( CORBA::Boolean toRespect );
   CORBA::Boolean GetRespectGeometry();
 
@@ -163,12 +173,12 @@ public:
   void SetTags( const char* howToTreat ) throw (SALOME::SALOME_Exception);
   char* GetTags();
 
+  void SetHyperPatches(const BLSURFPlugin::THyperPatchList& hpl);
+  BLSURFPlugin::THyperPatchList* GetHyperPatches();
+
   void SetPreCADMergeEdges(CORBA::Boolean theValue);
   CORBA::Boolean GetPreCADMergeEdges();
 
-  void SetPreCADRemoveTinyUVEdges(CORBA::Boolean theValue);
-  CORBA::Boolean GetPreCADRemoveTinyUVEdges();
-
   void SetPreCADRemoveDuplicateCADFaces(CORBA::Boolean theValue);
   CORBA::Boolean GetPreCADRemoveDuplicateCADFaces();
 
@@ -276,6 +286,7 @@ public:
   /*!
    * Set/get/unset an enforced vertex on geom object
    */
+  // OBSOLETE
   bool SetEnforcedVertex(GEOM::GEOM_Object_ptr theFace, CORBA::Double x, CORBA::Double y, CORBA::Double z)
       throw (SALOME::SALOME_Exception);
   bool SetEnforcedVertexNamed(GEOM::GEOM_Object_ptr theFace, CORBA::Double x, CORBA::Double y, CORBA::Double z, const char* theVertexName)
@@ -297,6 +308,26 @@ public:
       throw (SALOME::SALOME_Exception);
   bool UnsetEnforcedVertices(GEOM::GEOM_Object_ptr theFace) throw (SALOME::SALOME_Exception);
 
+  // NEW - no face
+  bool AddEnforcedVertex(CORBA::Double x, CORBA::Double y, CORBA::Double z)
+      throw (SALOME::SALOME_Exception);
+  bool AddEnforcedVertexNamed(CORBA::Double x, CORBA::Double y, CORBA::Double z, const char* theVertexName)
+      throw (SALOME::SALOME_Exception);
+  bool AddEnforcedVertexGeom(GEOM::GEOM_Object_ptr theVertex)
+      throw (SALOME::SALOME_Exception);
+  bool AddEnforcedVertexWithGroup(CORBA::Double x, CORBA::Double y, CORBA::Double z, const char* theGroupName)
+      throw (SALOME::SALOME_Exception);
+  bool AddEnforcedVertexNamedWithGroup(CORBA::Double x, CORBA::Double y, CORBA::Double z, const char* theVertexName, const char* theGroupName)
+      throw (SALOME::SALOME_Exception);
+  bool AddEnforcedVertexGeomWithGroup(GEOM::GEOM_Object_ptr theVertex, const char* theGroupName)
+      throw (SALOME::SALOME_Exception);
+
+  bool RemoveEnforcedVertex(CORBA::Double x, CORBA::Double y, CORBA::Double z)
+      throw (SALOME::SALOME_Exception);
+  bool RemoveEnforcedVertexGeom(GEOM::GEOM_Object_ptr theVertex)
+      throw (SALOME::SALOME_Exception);
+  bool RemoveEnforcedVertices() throw (SALOME::SALOME_Exception);
+
   /*!
    * Set/get/unset an enforced vertex on geom object given by entry
    */