Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 a3b93265772ece809f773ae9ffc7149617bd83dd..b8ea3f846c12dcd8fb3fea4ce04548863f7a2e7d 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_HypothesesUtils.h
+++ b/
src/SMESHGUI/SMESHGUI_HypothesesUtils.h
@@
-16,7
+16,7
@@
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// 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
//
//
//
//
//
//
@@
-45,6
+45,7
@@
class HypothesisData;
class HypothesesSet;
class SMESHGUI_GenericHypothesisCreator;
class SALOMEDSClient_SObject;
class HypothesesSet;
class SMESHGUI_GenericHypothesisCreator;
class SALOMEDSClient_SObject;
+class algo_error_array;
namespace SMESH{
namespace SMESH{
@@
-60,6
+61,13
@@
namespace SMESH{
HypothesisData* GetHypothesisData(const char* aHypType);
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,
SMESHGUI_GenericHypothesisCreator* GetHypothesisCreator(const char* aHypType);
SMESH::SMESH_Hypothesis_ptr CreateHypothesis(const char* aHypType,
@@
-78,6
+86,7
@@
namespace SMESH{
typedef std::vector<_PTR(SObject)> SObjectList;
SObjectList GetMeshesUsingAlgoOrHypothesis(SMESH::SMESH_Hypothesis_ptr AlgoOrHyp ) ;
typedef std::vector<_PTR(SObject)> SObjectList;
SObjectList GetMeshesUsingAlgoOrHypothesis(SMESH::SMESH_Hypothesis_ptr AlgoOrHyp ) ;
+ QString GetMessageOnAlgoStateErrors(const algo_error_array& errors);
}
#endif
}
#endif