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
Merge tag 'V8_3_0a2' into ngr/python3_dev
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_HypothesesUtils.h
diff --git
a/src/SMESHGUI/SMESHGUI_HypothesesUtils.h
b/src/SMESHGUI/SMESHGUI_HypothesesUtils.h
index 1b2046f3ef708c153ffabac8300ead578a46df3b..0bf059af123b72b55da2d0c322e0b10250e69198 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_HypothesesUtils.h
+++ b/
src/SMESHGUI/SMESHGUI_HypothesesUtils.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
//
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-58,8
+58,6
@@
class SALOMEDSClient_SObject;
class algo_error_array;
class algo_error_array;
-#define PLUGIN_NAME "PLUGIN_NAME"
-
namespace SMESH
{
SMESHGUI_EXPORT
namespace SMESH
{
SMESHGUI_EXPORT
@@
-72,7
+70,7
@@
namespace SMESH
const bool = true,
const bool = false);
SMESHGUI_EXPORT
const bool = true,
const bool = false);
SMESHGUI_EXPORT
- QStringList GetHypothesesSets( int
, const QString&
);
+ QStringList GetHypothesesSets( int );
SMESHGUI_EXPORT
HypothesesSet* GetHypothesesSet( const QString& );
SMESHGUI_EXPORT
HypothesesSet* GetHypothesesSet( const QString& );
@@
-80,6
+78,9
@@
namespace SMESH
SMESHGUI_EXPORT
HypothesisData* GetHypothesisData( const QString& );
SMESHGUI_EXPORT
HypothesisData* GetHypothesisData( const QString& );
+ SMESHGUI_EXPORT
+ HypothesisData* GetGroupTitle( const HypothesisData* hyp, const bool isAlgo );
+
SMESHGUI_EXPORT
bool IsAvailableHypothesis( const HypothesisData*,
const QString&,
SMESHGUI_EXPORT
bool IsAvailableHypothesis( const HypothesisData*,
const QString&,
@@
-96,6
+97,10
@@
namespace SMESH
SMESH::SMESH_Hypothesis_ptr CreateHypothesis( const QString&,
const QString&,
const bool = false );
SMESH::SMESH_Hypothesis_ptr CreateHypothesis( const QString&,
const QString&,
const bool = false );
+ SMESHGUI_EXPORT
+ bool IsApplicable( const QString&,
+ GEOM::GEOM_Object_ptr,
+ const bool = false );
SMESHGUI_EXPORT
bool AddHypothesisOnMesh( SMESH::SMESH_Mesh_ptr, SMESH::SMESH_Hypothesis_ptr );
SMESHGUI_EXPORT
bool AddHypothesisOnMesh( SMESH::SMESH_Mesh_ptr, SMESH::SMESH_Hypothesis_ptr );
@@
-115,6
+120,10
@@
namespace SMESH
SMESHGUI_EXPORT
QString GetMessageOnAlgoStateErrors( const algo_error_array& );
SMESHGUI_EXPORT
QString GetMessageOnAlgoStateErrors( const algo_error_array& );
+
+ SMESHGUI_EXPORT
+ // name of proprty saving plug-in of a hypothesis
+ inline const char* Plugin_Name() { return "PLUGIN_NAME"; }
}
#endif // SMESHGUI_HYPOTHESESUTILS_H
}
#endif // SMESHGUI_HYPOTHESESUTILS_H