Join modifications from branch BR_DEBUG_3_2_0b1

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_HypothesesUtils.h

diff --git a/src/SMESHGUI/SMESHGUI_HypothesesUtils.h b/src/SMESHGUI/SMESHGUI_HypothesesUtils.h
index 16d935b1e3f70e6fb842d70d32d2b22bb08111e0..b8ea3f846c12dcd8fb3fea4ce04548863f7a2e7d 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_HypothesesUtils.h
+++ b/src/SMESHGUI/SMESHGUI_HypothesesUtils.h
@@ -16,11 +16,11 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.salome-platform.org or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
-//  File   : SMESHGUI_Hypotheses.h
+//  File   : SMESHGUI_HypothesesUtils.h
 //  Author : Julia DOROVSKIKH
 //  Module : SMESH
 //  $Header$
@@ -42,17 +42,32 @@
 #include <vector>
 
 class HypothesisData;
+class HypothesesSet;
 class SMESHGUI_GenericHypothesisCreator;
 class SALOMEDSClient_SObject;
+class algo_error_array;
 
 namespace SMESH{
 
   void InitAvailableHypotheses();
 
-  QStringList GetAvailableHypotheses(const bool isAlgo);
+  QStringList GetAvailableHypotheses( const bool isAlgo, 
+                                      const int theDim = -1, 
+                                      const bool isAux = false);
+
+  QStringList GetHypothesesSets();
+
+  HypothesesSet* GetHypothesesSet(const QString theSetName);
 
   HypothesisData* GetHypothesisData(const char* aHypType);
 
+  bool IsAvailableHypothesis(const HypothesisData* algoData,
+                             const QString&        hypType,
+                             bool&                 isOptional);
+
+  bool IsCompatibleAlgorithm(const HypothesisData* algo1Data,
+                             const HypothesisData* algo2Data);
+
   SMESHGUI_GenericHypothesisCreator* GetHypothesisCreator(const char* aHypType);
 
   SMESH::SMESH_Hypothesis_ptr CreateHypothesis(const char* aHypType,
@@ -71,6 +86,7 @@ namespace SMESH{
   typedef std::vector<_PTR(SObject)> SObjectList;
   SObjectList GetMeshesUsingAlgoOrHypothesis(SMESH::SMESH_Hypothesis_ptr AlgoOrHyp ) ;
 
+  QString GetMessageOnAlgoStateErrors(const algo_error_array& errors);
 }
 
 #endif