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
Copyright update 2022
[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 c903c61aa9208770cb0be21d0332d1420def9138..332e8ef3b0772b13e815fb78f875cecae5c0e447 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-20
13
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
22
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
@@
-23,32
+23,22
@@
#ifndef _GEOM_Object_i_HeaderFile
#define _GEOM_Object_i_HeaderFile
#ifndef _GEOM_Object_i_HeaderFile
#define _GEOM_Object_i_HeaderFile
-#include "GEOM_GEOM_I.hxx"
-
#include "GEOMImpl_Gen.hxx"
#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 <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>
#include <TopoDS_Shape.hxx>
-class GEOM_I_EXPORT 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:
{
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();
~GEOM_Object_i();
- virtual char* GetEntry();
-
- virtual CORBA::Long GetStudyID();
-
- virtual CORBA::Long GetType();
-
virtual GEOM::shape_type GetShapeType();
virtual GEOM::shape_type GetTopologyType();
virtual GEOM::shape_type GetShapeType();
virtual GEOM::shape_type GetTopologyType();
@@
-57,9
+47,7
@@
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 void SetName(const char* theName);
-
- virtual char* GetName();
+ virtual char* GetSubShapeName(CORBA::Long subID);
virtual void SetColor(const SALOMEDS::Color& theColor);
virtual void SetColor(const SALOMEDS::Color& theColor);
@@
-69,23
+57,15
@@
class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public
virtual CORBA::Boolean GetAutoColor();
virtual CORBA::Boolean GetAutoColor();
- void SetMarkerStd(GEOM::marker_type theType, GEOM::marker_size theSize);
-
- void SetMarkerTexture(CORBA::Long theTextureId);
-
- GEOM::marker_type GetMarkerType();
-
- GEOM::marker_size GetMarkerSize();
+ virtual void SetMarkerStd(GEOM::marker_type theType, GEOM::marker_size theSize);
- CORBA::Long GetMarkerTexture();
-
- virtual void SetStudyEntry(const char* theEntry);
+ virtual void SetMarkerTexture(CORBA::Long theTextureId);
- virtual
char* GetStudyEntry
();
+ virtual
GEOM::marker_type GetMarkerType
();
- virtual GEOM::
ListOfGO* GetDependency
();
+ virtual GEOM::
marker_size GetMarkerSize
();
- virtual
GEOM::ListOfGO* GetLastDependency
();
+ virtual
CORBA::Long GetMarkerTexture
();
virtual SALOMEDS::TMPFile* GetShapeStream();
virtual SALOMEDS::TMPFile* GetShapeStream();
@@
-97,20
+77,18
@@
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();
- virtual
void SetParameters(const char* theParameters);
+ virtual
bool IsParametrical() { return false; }
- virtual char* GetParameters();
- Handle(GEOM_Object) GetImpl() { return _impl; }
+ Handle(
::
GEOM_Object) GetImpl() { return _impl; }
private:
private:
- GEOM::GEOM_Gen_var _engine;
- Handle(GEOM_Object) _impl;
+ Handle(::GEOM_Object) _impl;
TopoDS_Shape _geom;
};
TopoDS_Shape _geom;
};