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 branch 'master' into gni/adaptation
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GEOMGenUtils.h
diff --git
a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.h
b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.h
index 0aa10bd7a9bb493a9a431f867eefffab9dca2190..e8b9b6e1fdeca80377849682de2096ae9b77f229 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GEOMGenUtils.h
+++ b/
src/SMESHGUI/SMESHGUI_GEOMGenUtils.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
@@
-33,27
+33,31
@@
// SALOME KERNEL includes
#include <SALOMEDSClient_definitions.hxx>
// SALOME KERNEL includes
#include <SALOMEDSClient_definitions.hxx>
+// GUI includes
+#include <SALOME_InteractiveObject.hxx>
+
// IDL includes
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(GEOM_Gen)
class SALOMEDSClient_SObject;
// IDL includes
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(GEOM_Gen)
class SALOMEDSClient_SObject;
-class Handle_SALOME_InteractiveObject;
class QString;
namespace SMESH
{
class QString;
namespace SMESH
{
- SMESHGUI_EXPORT GEOM::GEOM_Gen_var GetGEOMGen();
+ SMESHGUI_EXPORT GEOM::GEOM_Gen_var GetGEOMGen(
GEOM::GEOM_Object_ptr go
);
SMESHGUI_EXPORT GEOM::GEOM_Object_var GetShapeOnMeshOrSubMesh( _PTR(SObject), bool* isMesh=0 );
SMESHGUI_EXPORT GEOM::GEOM_Object_var GetGeom( _PTR(SObject) );
SMESHGUI_EXPORT GEOM::GEOM_Object_var GetShapeOnMeshOrSubMesh( _PTR(SObject), bool* isMesh=0 );
SMESHGUI_EXPORT GEOM::GEOM_Object_var GetGeom( _PTR(SObject) );
- SMESHGUI_EXPORT char* GetGeomName( _PTR(SObject) smeshSO );
+ SMESHGUI_EXPORT GEOM::GEOM_Object_var GetGeom( Handle(SALOME_InteractiveObject) io );
+
+ SMESHGUI_EXPORT char* GetGeomName( _PTR(SObject) smeshSO );
SMESHGUI_EXPORT GEOM::GEOM_Object_ptr GetSubShape( GEOM::GEOM_Object_ptr, long );
SMESHGUI_EXPORT GEOM::GEOM_Object_ptr GetSubShape( GEOM::GEOM_Object_ptr, long );
- SMESHGUI_EXPORT bool GetGeomEntries( Handle
_SALOME_InteractiveObject
& hypIO,
+ SMESHGUI_EXPORT bool GetGeomEntries( Handle
(SALOME_InteractiveObject)
& hypIO,
QString& subGeom, QString& meshGeom);
}
QString& subGeom, QString& meshGeom);
}