Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'V9_11_BR'
[modules/geom.git]
/
src
/
GEOM
/
GEOM_Object.hxx
diff --git
a/src/GEOM/GEOM_Object.hxx
b/src/GEOM/GEOM_Object.hxx
old mode 100755
(executable)
new mode 100644
(file)
index
214ca30
..
3c6ca23
--- a/
src/GEOM/GEOM_Object.hxx
+++ b/
src/GEOM/GEOM_Object.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
23 CEA, EDF
, 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
@@
-27,14
+27,17
@@
#include <Aspect_TypeOfMarker.hxx>
#include <Standard_GUID.hxx>
#include <Aspect_TypeOfMarker.hxx>
#include <Standard_GUID.hxx>
+#include <TColStd_HSequenceOfTransient.hxx>
#include <TDF_Label.hxx>
#include <TopoDS_Shape.hxx>
#include <TDF_Label.hxx>
#include <TopoDS_Shape.hxx>
+#include <list>
+
class GEOM_Object;
class GEOM_Object;
-class
Handle(TFunction_Driver)
;
+class
TFunction_Driver
;
class GEOM_Engine;
class GEOM_Engine;
-DEFINE_STANDARD_HANDLE( GEOM_Object, GEOM_BaseObject )
;
+DEFINE_STANDARD_HANDLE( GEOM_Object, GEOM_BaseObject )
class GEOM_Object : public GEOM_BaseObject
{
class GEOM_Object : public GEOM_BaseObject
{
@@
-58,10
+61,10
@@
class GEOM_Object : public GEOM_BaseObject
Standard_EXPORT ~GEOM_Object();
//Finds a GEOM_Object on the label theLabel
Standard_EXPORT ~GEOM_Object();
//Finds a GEOM_Object on the label theLabel
- Standard_EXPORT static Handle(GEOM_Object) GetObject(TDF_Label& theLabel);
+ Standard_EXPORT static Handle(GEOM_Object) GetObject(
const
TDF_Label& theLabel);
//Finds a GEOM_Object by a reference, stored on the label theLabel
//Finds a GEOM_Object by a reference, stored on the label theLabel
- Standard_EXPORT static Handle(GEOM_Object) GetReferencedObject(TDF_Label& theLabel);
+ Standard_EXPORT static Handle(GEOM_Object) GetReferencedObject(
const
TDF_Label& theLabel);
//###########################################################
//Access to properties
//###########################################################
//Access to properties
@@
-107,8
+110,12
@@
class GEOM_Object : public GEOM_BaseObject
//Returns false if the object is a sub-shape of another object
Standard_EXPORT bool IsMainShape();
//Returns false if the object is a sub-shape of another object
Standard_EXPORT bool IsMainShape();
+ //Comfort method
+ Standard_EXPORT static Handle(TColStd_HSequenceOfTransient)
+ GetLastFunctions( const std::list< Handle(GEOM_Object) >& theObjects );
+
public:
public:
- DEFINE_STANDARD_RTTI
( GEOM_Object );
+ DEFINE_STANDARD_RTTI
EXT(GEOM_Object,GEOM_BaseObject)
};
#endif
};
#endif