X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM_I%2FGEOM_Object_i.hh;h=9a1d5adc6857f017bee0c8750745d2cf41945046;hb=5d340bb0d6761b4a61913395814a5f18845c96a9;hp=b2002026960df70b98e94ee10e380ac53195a5a2;hpb=3d1e657101782970c41d3d00d2271a4f4b7579d5;p=modules%2Fgeom.git diff --git a/src/GEOM_I/GEOM_Object_i.hh b/src/GEOM_I/GEOM_Object_i.hh index b20020269..9a1d5adc6 100644 --- a/src/GEOM_I/GEOM_Object_i.hh +++ b/src/GEOM_I/GEOM_Object_i.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 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 @@ -36,7 +36,7 @@ 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(); @@ -47,6 +47,8 @@ class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public virtual GEOM::shape_type GetMaxShapeType(); + virtual char* GetSubShapeName(CORBA::Long subID); + virtual void SetColor(const SALOMEDS::Color& theColor); virtual SALOMEDS::Color GetColor(); @@ -79,11 +81,11 @@ class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public virtual bool IsShape(); - Handle(GEOM_Object) GetImpl() { return _impl; } + Handle(::GEOM_Object) GetImpl() { return _impl; } private: - Handle(GEOM_Object) _impl; + Handle(::GEOM_Object) _impl; TopoDS_Shape _geom; };