Merge remote branch 'origin/eap/23307'

[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 e3d3d42f02c5a03bf276c2080ff03955c76c03c9..eeb20c385ed369fa27db97a250291cc6414968cd 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -66,39 +66,58 @@ public:
   CORBA::Double GetMaxSize();
   CORBA::Boolean IsMaxSizeRel();
 
+  void SetUseGradation(CORBA::Boolean theValue);
+  CORBA::Boolean GetUseGradation();
   void SetGradation(CORBA::Double theValue);
   CORBA::Double GetGradation();
 
+  void SetUseVolumeGradation(CORBA::Boolean theValue);
+  CORBA::Boolean GetUseVolumeGradation();
+  void SetVolumeGradation(CORBA::Double theValue);
+  CORBA::Double GetVolumeGradation();
+
   void SetQuadAllowed(CORBA::Boolean theValue);
   CORBA::Boolean GetQuadAllowed();
 
   void SetAngleMesh(CORBA::Double theValue);
   CORBA::Double GetAngleMesh();
-  
+
   void SetChordalError(CORBA::Double distance);
   CORBA::Double GetChordalError();
-  
+
   void SetAnisotropic(CORBA::Boolean anisotropic);
   CORBA::Boolean GetAnisotropic();
-  
+
   void SetAnisotropicRatio(CORBA::Double ratio);
   CORBA::Double GetAnisotropicRatio();
-  
+
   void SetRemoveTinyEdges(CORBA::Boolean remove);
   CORBA::Boolean GetRemoveTinyEdges();
-  
+
   void SetTinyEdgeLength(CORBA::Double length);
   CORBA::Double GetTinyEdgeLength();
-  
+
+  void SetOptimiseTinyEdges(CORBA::Boolean toOptimise);
+  CORBA::Boolean GetOptimiseTinyEdges();
+
+  void SetTinyEdgeOptimisationLength(CORBA::Double length);
+  CORBA::Double GetTinyEdgeOptimisationLength();
+
+  void SetCorrectSurfaceIntersection(CORBA::Boolean toOptimise);
+  CORBA::Boolean GetCorrectSurfaceIntersection();
+
+  void SetCorrectSurfaceIntersectionMaxCost(CORBA::Double maxCost);
+  CORBA::Double GetCorrectSurfaceIntersectionMaxCost();
+
   void SetBadElementRemoval(CORBA::Boolean remove);
   CORBA::Boolean GetBadElementRemoval();
-  
+
   void SetBadElementAspectRatio(CORBA::Double ratio);
   CORBA::Double GetBadElementAspectRatio();
-  
+
   void SetOptimizeMesh(CORBA::Boolean optimize);
   CORBA::Boolean GetOptimizeMesh();
-  
+
   void SetQuadraticMesh(CORBA::Boolean quadratic);
   CORBA::Boolean GetQuadraticMesh();
 
@@ -108,9 +127,51 @@ public:
   void SetVerbosity(CORBA::Short theVal) throw (SALOME::SALOME_Exception);
   CORBA::Short GetVerbosity();
 
+  void SetEnforceCadEdgesSize( CORBA::Boolean toEnforce );
+  CORBA::Boolean GetEnforceCadEdgesSize();
+
+  void SetJacobianRectificationRespectGeometry( CORBA::Boolean allowRectification );
+  CORBA::Boolean GetJacobianRectificationRespectGeometry();
+
+  void SetJacobianRectification( CORBA::Boolean allowRectification );
+  CORBA::Boolean GetJacobianRectification();
+
+  void SetMaxNumberOfPointsPerPatch( CORBA::Long nb ) throw (SALOME::SALOME_Exception);
+  CORBA::Long GetMaxNumberOfPointsPerPatch();
+
+  void SetRespectGeometry( CORBA::Boolean toRespect );
+  CORBA::Boolean GetRespectGeometry();
+
+  void SetTinyEdgesAvoidSurfaceIntersections( CORBA::Boolean toAvoidIntersection );
+  CORBA::Boolean GetTinyEdgesAvoidSurfaceIntersections();
+
+  void SetClosedGeometry( CORBA::Boolean isClosed );
+  CORBA::Boolean GetClosedGeometry();
+
+  void SetDebug( CORBA::Boolean isDebug );
+  bool GetDebug();
+
+  void SetPeriodicTolerance( CORBA::Double tol ) throw (SALOME::SALOME_Exception);
+  double GetPeriodicTolerance() throw (SALOME::SALOME_Exception);
+
+  void SetRequiredEntities( const char* howToTreat ) throw (SALOME::SALOME_Exception);
+  char* GetRequiredEntities();
+
+  void SetSewingTolerance( CORBA::Double tol ) throw (SALOME::SALOME_Exception);
+  CORBA::Double GetSewingTolerance() throw (SALOME::SALOME_Exception);
+
+  void SetTags( const char* howToTreat ) throw (SALOME::SALOME_Exception);
+  char* GetTags();
+
   void SetPreCADMergeEdges(CORBA::Boolean theValue);
   CORBA::Boolean GetPreCADMergeEdges();
 
+  void SetPreCADRemoveTinyUVEdges(CORBA::Boolean theValue);
+  CORBA::Boolean GetPreCADRemoveTinyUVEdges();
+
+  void SetPreCADRemoveDuplicateCADFaces(CORBA::Boolean theValue);
+  CORBA::Boolean GetPreCADRemoveDuplicateCADFaces();
+
   void SetPreCADProcess3DTopology(CORBA::Boolean theValue);
   CORBA::Boolean GetPreCADProcess3DTopology();
 
@@ -127,9 +188,12 @@ public:
 
   BLSURFPlugin::string_array* GetOptionValues();
   BLSURFPlugin::string_array* GetPreCADOptionValues();
+  BLSURFPlugin::string_array* GetAdvancedOptionValues();
 
   void SetOptionValues(const BLSURFPlugin::string_array& options) throw (SALOME::SALOME_Exception);
   void SetPreCADOptionValues(const BLSURFPlugin::string_array& options) throw (SALOME::SALOME_Exception);
+  void SetAdvancedOptionValues(const BLSURFPlugin::string_array& options);
+  void SetAdvancedOption(const char* optionsAndValues) throw (SALOME::SALOME_Exception);
 
   void AddOption(const char* optionName, const char* optionValue);
   void AddPreCADOption(const char* optionName, const char* optionValue);
@@ -294,29 +358,6 @@ public:
       const BLSURFPlugin::TEntryList& theSourceVerticesEntries, const BLSURFPlugin::TEntryList& theTargetVerticesEntries)
       throw (SALOME::SALOME_Exception);
 
-  void AddFacePeriodicity(GEOM::GEOM_Object_ptr theFace1, GEOM::GEOM_Object_ptr theFace2)
-      throw (SALOME::SALOME_Exception);
-
-  void AddFacePeriodicityEntry(const char* theFace1Entry, const char* theFace2Entry)
-    throw (SALOME::SALOME_Exception);
-
-  void AddEdgePeriodicity(GEOM::GEOM_Object_ptr theFace1, GEOM::GEOM_Object_ptr theEdge1,
-                          GEOM::GEOM_Object_ptr theFace2, GEOM::GEOM_Object_ptr theEdge2, CORBA::Long edge_orientation = 0)
-      throw (SALOME::SALOME_Exception);
-
-  void AddEdgePeriodicityWithoutFaces(GEOM::GEOM_Object_ptr theEdge1, GEOM::GEOM_Object_ptr theEdge2, CORBA::Long edge_orientation = 0)
-      throw (SALOME::SALOME_Exception);
-
-  void AddEdgePeriodicityEntry(const char* theFace1Entry, const char* theEdge1Entry, const char* theFace2Entry, const char* theEdge2Entry, const long edge_orientation = 0)
-    throw (SALOME::SALOME_Exception);
-
-  void AddVertexPeriodicity(GEOM::GEOM_Object_ptr theEdge1, GEOM::GEOM_Object_ptr theVertex1,
-      GEOM::GEOM_Object_ptr theEdge2, GEOM::GEOM_Object_ptr theVertex2)
-      throw (SALOME::SALOME_Exception);
-
-  void AddVertexPeriodicityEntry(const char* theEdge1Entry, const char* theVertex1Entry, const char* theEdge2Entry, const char* theVertex2Entry)
-    throw (SALOME::SALOME_Exception);
-
   ///////////////////////
   
   /*!