Patch for MacOS (from SALOME forum)

[modules/smesh.git] / src / SMESH / SMESH_Hypothesis.hxx

diff --git a/src/SMESH/SMESH_Hypothesis.hxx b/src/SMESH/SMESH_Hypothesis.hxx
index 4c29ff333f7923fe42f6d59b168a4c639464aa5e..de77b1b97b7cb2413dd0a6a09c10d3ed972fc2a8 100644 (file)
--- a/src/SMESH/SMESH_Hypothesis.hxx
+++ b/src/SMESH/SMESH_Hypothesis.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -63,7 +63,8 @@ public:
     HYP_BAD_DIM,      // bad dimension
     HYP_BAD_SUBSHAPE, // shape is neither the main one, nor its sub-shape, nor a group
     HYP_BAD_GEOMETRY, // shape geometry mismatches algorithm's expectation
-    HYP_NEED_SHAPE    // algorithm can work on shape only
+    HYP_NEED_SHAPE,   // algorithm can work on shape only
+    HYP_INCOMPAT_HYPS // several additional hypotheses are incompatible one with other
   };
   static bool IsStatusFatal(Hypothesis_Status theStatus)
   { return theStatus >= HYP_UNKNOWN_FATAL; }
@@ -71,19 +72,22 @@ public:
   SMESH_Hypothesis(int hypId, int studyId, SMESH_Gen* gen);
   virtual ~SMESH_Hypothesis();
   virtual int GetDim() const;
-  int GetStudyId() const;
-  virtual void NotifySubMeshesHypothesisModification();
+  int         GetStudyId() const;
+  SMESH_Gen*  GetGen() const { return (SMESH_Gen*) _gen; }
   virtual int GetShapeType() const;
   virtual const char* GetLibName() const;
+  virtual void NotifySubMeshesHypothesisModification();
   void  SetLibName(const char* theLibName);
 
-  //void  SetParameters(const char *theParameters);
-  //char* GetParameters() const;
+  /*!
+   * \brief The returned value is used by NotifySubMeshesHypothesisModification()
+   *        to decide to call subMesh->AlgoStateEngine( MODIF_HYP, hyp ) or not
+   *        if subMesh is ready to be computed (algo+hyp==OK)  but not yet computed.
+   *        True result is reasonable for example if EventListeners depend on
+   *        parameters of hypothesis.
+   */
+  virtual bool DataDependOnParams() const { return false; }
 
-  // void SetLastParameters(const char* theParameters);
-  // char* GetLastParameters() const;
-  // void ClearParameters();
-  
   /*!
    * \brief Initialize my parameter values by the mesh built on the geometry
    *  \param theMesh - the built mesh