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 remote-tracking branch 'remotes/origin/hydro/imps_2017_salome_83' into HEAD
[modules/geom.git]
/
src
/
GEOM_I
/
GEOM_Object_i.hh
diff --git
a/src/GEOM_I/GEOM_Object_i.hh
b/src/GEOM_I/GEOM_Object_i.hh
index 47c1c301daac008cb175ec59db40c64c9a627f9e..9a1d5adc6857f017bee0c8750745d2cf41945046 100644
(file)
--- a/
src/GEOM_I/GEOM_Object_i.hh
+++ b/
src/GEOM_I/GEOM_Object_i.hh
@@
-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
@@
-36,7
+36,7
@@
class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public virtual GEOM_BaseObject_i
{
public:
class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public virtual GEOM_BaseObject_i
{
public:
- GEOM_Object_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(GEOM_Object) theImpl);
+ GEOM_Object_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(
::
GEOM_Object) theImpl);
~GEOM_Object_i();
virtual GEOM::shape_type GetShapeType();
~GEOM_Object_i();
virtual GEOM::shape_type GetShapeType();
@@
-47,6
+47,8
@@
class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public
virtual GEOM::shape_type GetMaxShapeType();
virtual GEOM::shape_type GetMaxShapeType();
+ virtual char* GetSubShapeName(CORBA::Long subID);
+
virtual void SetColor(const SALOMEDS::Color& theColor);
virtual SALOMEDS::Color GetColor();
virtual void SetColor(const SALOMEDS::Color& theColor);
virtual SALOMEDS::Color GetColor();
@@
-75,15
+77,15
@@
class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public
virtual GEOM::GEOM_Object_ptr GetMainShape();
virtual GEOM::GEOM_Object_ptr GetMainShape();
- virtual bool IsSame(GEOM::GEOM_Object_ptr other);
+ virtual bool IsSame(GEOM::GEOM_
Base
Object_ptr other);
virtual bool IsShape();
virtual bool IsShape();
- Handle(GEOM_Object) GetImpl() { return _impl; }
+ Handle(
::
GEOM_Object) GetImpl() { return _impl; }
private:
private:
- Handle(GEOM_Object) _impl;
+ Handle(
::
GEOM_Object) _impl;
TopoDS_Shape _geom;
};
TopoDS_Shape _geom;
};