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 from PortingMED3 07Apr11
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshUtils.h
diff --git
a/src/SMESHGUI/SMESHGUI_MeshUtils.h
b/src/SMESHGUI/SMESHGUI_MeshUtils.h
index 5edffe9f31512874dc84aeadffd24db5909f5656..a5371f56b88dfcdcf2d9458f532ee24f9c6438a9 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MeshUtils.h
+++ b/
src/SMESHGUI/SMESHGUI_MeshUtils.h
@@
-36,9
+36,15
@@
// SALOME GUI includes
#include <SALOME_InteractiveObject.hxx>
// SALOME GUI includes
#include <SALOME_InteractiveObject.hxx>
+// SALOME KERNEL includes
+#include <SALOMEDSClient_definitions.hxx>
+
// IDL includes
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Mesh)
// IDL includes
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Mesh)
+#include CORBA_SERVER_HEADER(SMESH_Measurements)
+
+class SALOMEDSClient_SObject;
namespace SMESH
{
namespace SMESH
{
@@
-47,6
+53,10
@@
namespace SMESH
SMESHGUI_EXPORT
QString UniqueMeshName( const QString&, const QString& = QString() );
SMESHGUI_EXPORT
QString UniqueMeshName( const QString&, const QString& = QString() );
+ SMESHGUI_EXPORT
+ QString UniqueName( const QString&, _PTR(SObject) = _PTR(SObject)(), const QString& = QString() );
+
+ SMESHGUI_EXPORT SMESH::Measurements_var& GetMeasurements();
}
#endif // SMESHGUI_MESHUTILS_H
}
#endif // SMESHGUI_MESHUTILS_H