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=ab57795893edff68a12aa2dfb9545da202bd9eca;hpb=a62a321c849518376e3aa4d24a0b902a24167c64;p=modules%2Fgeom.git

diff --git a/src/GEOM_I/GEOM_Object_i.hh b/src/GEOM_I/GEOM_Object_i.hh
index ab5779589..9a1d5adc6 100644
--- a/src/GEOM_I/GEOM_Object_i.hh
+++ b/src/GEOM_I/GEOM_Object_i.hh
@@ -1,66 +1,75 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// 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
-// 
+//
 // 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.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+// License as published by the Free Software Foundation; either
+// 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Lesser General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #ifndef _GEOM_Object_i_HeaderFile
 #define _GEOM_Object_i_HeaderFile
 
+#include "GEOMImpl_Gen.hxx"
+#include "GEOM_BaseObject_i.hh"
+#include "GEOM_Object.hxx"
 
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SALOMEDS)
 #include CORBA_SERVER_HEADER(GEOM_Gen)
 
-#include "SALOME_GenericObj_i.hh"
-
-#include "GEOM_Object.hxx"
-
 #include <TopoDS_Shape.hxx>
 
-class GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public virtual SALOME::GenericObj_i
+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 char* GetEntry();
+  virtual GEOM::shape_type GetShapeType();
 
-  virtual CORBA::Long GetStudyID();
+  virtual GEOM::shape_type GetTopologyType();
 
-  virtual CORBA::Long GetType();
+  virtual GEOM::shape_type GetMinShapeType();
 
-  virtual GEOM::shape_type GetShapeType();
+  virtual GEOM::shape_type GetMaxShapeType();
+
+  virtual char* GetSubShapeName(CORBA::Long subID);
+
+  virtual void SetColor(const SALOMEDS::Color& theColor);
 
-  virtual void SetName(const char* theName);
+  virtual SALOMEDS::Color GetColor();
 
-  virtual char* GetName();
+  virtual void SetAutoColor(CORBA::Boolean theAutoColor);
 
-  virtual void SetStudyEntry(const char* theEntry);
+  virtual CORBA::Boolean GetAutoColor();
 
-  virtual char* GetStudyEntry();
+  virtual void SetMarkerStd(GEOM::marker_type theType, GEOM::marker_size theSize);
 
-  virtual GEOM::ListOfGO* GetDependency();
+  virtual void SetMarkerTexture(CORBA::Long theTextureId);
 
-  virtual GEOM::ListOfGO* GetLastDependency();
+  virtual GEOM::marker_type GetMarkerType();
+
+  virtual GEOM::marker_size GetMarkerSize();
+
+  virtual CORBA::Long GetMarkerTexture();
 
   virtual SALOMEDS::TMPFile* GetShapeStream();
 
-  long getShape();
+  virtual CORBA::LongLong getShape();
 
   virtual bool IsMainShape() { return _impl->IsMainShape(); }
 
@@ -68,14 +77,15 @@ class GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public virtual SALOM
 
   virtual GEOM::GEOM_Object_ptr GetMainShape();
 
+  virtual bool IsSame(GEOM::GEOM_BaseObject_ptr other);
+
   virtual bool IsShape();
 
-  Handle(GEOM_Object) GetImpl() { return _impl; }
+  Handle(::GEOM_Object) GetImpl() { return _impl; }
 
  private:
 
-  GEOM::GEOM_Gen_ptr _engine;
-  Handle(GEOM_Object) _impl;
+  Handle(::GEOM_Object) _impl;
   TopoDS_Shape _geom;
 };