X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM_I%2FGEOM_Object_i.hh;h=115a23a72bb91ce57d609c100322e009bc460c39;hb=e067674b75266d9f67a2c474d8dc901d9f65fe48;hp=da7f035edec011d7aefcd2b5efe1dd2e95464aa2;hpb=3cd92817cb4c5ee5911d6f40fe977b5e57b980e1;p=modules%2Fgeom.git diff --git a/src/GEOM_I/GEOM_Object_i.hh b/src/GEOM_I/GEOM_Object_i.hh old mode 100755 new mode 100644 index da7f035ed..115a23a72 --- 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-2024 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 @@ -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(); @@ -75,15 +77,18 @@ class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public virtual GEOM::GEOM_Object_ptr GetMainShape(); - virtual bool IsSame(GEOM::GEOM_Object_ptr other); + virtual bool IsSame(GEOM::GEOM_BaseObject_ptr other); virtual bool IsShape(); - Handle(GEOM_Object) GetImpl() { return _impl; } + virtual bool IsParametrical() { return false; } + + + Handle(::GEOM_Object) GetImpl() { return _impl; } private: - Handle(GEOM_Object) _impl; + Handle(::GEOM_Object) _impl; TopoDS_Shape _geom; };