-// File : GEOM_Client.hxx
-// Created :
-// Author : Yves FRICAUD
-// Project : SALOME
-// Module : GEOM
-// Copyright : Open CASCADE
-// $Header$
+// Copyright (C) 2007-2020 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, 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File : GEOM_Client.hxx
+// Author : Yves FRICAUD
+// Module : GEOM
#ifndef _GEOM_Client_HeaderFile
#define _GEOM_Client_HeaderFile
#include <SALOMEconfig.h>
-#include CORBA_SERVER_HEADER(GEOM_Shape)
#include CORBA_SERVER_HEADER(GEOM_Gen)
-#
-#ifndef _TColStd_SequenceOfAsciiString_HeaderFile
-#include <TColStd_SequenceOfAsciiString.hxx>
-#endif
-#ifndef _TopTools_SequenceOfShape_HeaderFile
-#include <TopTools_SequenceOfShape.hxx>
-#endif
-#ifndef _Standard_Integer_HeaderFile
-#include <Standard_Integer.hxx>
-#endif
-class TCollection_AsciiString;
-class TopoDS_Shape;
+#include <Standard_Boolean.hxx>
+#include <TCollection_AsciiString.hxx>
+#include <TopoDS_Shape.hxx>
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
+#include <map>
+#include <vector>
+
+#ifdef WIN32
+ #if defined GEOMCLIENT_EXPORTS || defined GEOMClient_EXPORTS
+ #define GEOMCLIENT_EXPORT __declspec( dllexport )
+ #else
+ #define GEOMCLIENT_EXPORT __declspec( dllimport )
+ #endif
+#else
+ #define GEOMCLIENT_EXPORT
#endif
+/*
+ * if define SINGLE_CLIENT is not commented, the method get_client always returns the same GEOM_Client object (singleton object)
+ * and the SHAPE_READER macro can be used to define an object that is always this singleton object
+ * if define SINGLE_CLIENT is commented, we get the old way to define the GEOM_Client objects : get_client returns a new object
+ * and the SHAPE_READER macro defines also a new object
+ */
+#define SINGLE_CLIENT
+
//=====================================================================
// GEOM_Client : class definition
//=====================================================================
-class GEOM_Client {
+class GEOMCLIENT_EXPORT GEOM_Client {
-public:
-
- inline void* operator new(size_t,void* anAddress)
- {
- return anAddress;
- }
- inline void* operator new(size_t size)
- {
- return Standard::Allocate(size);
- }
- inline void operator delete(void *anAddress)
- {
- if (anAddress) Standard::Free((Standard_Address&)anAddress);
- }
+ public:
// Methods PUBLIC
- //
- Standard_EXPORT GEOM_Client();
- Standard_EXPORT Standard_Integer Find( const TCollection_AsciiString& ShapeIOR, TopoDS_Shape& S ) ;
- Standard_EXPORT void Bind( const TCollection_AsciiString& ShapeIOR, const TopoDS_Shape& S ) ;
- Standard_EXPORT TopoDS_Shape GetShape( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Shape_ptr aShape );
- Standard_EXPORT void RemoveShapeFromBuffer( const TCollection_AsciiString& shapeIOR ) ;
- Standard_EXPORT void ClearClientBuffer() ;
- Standard_EXPORT unsigned int BufferLength() ;
+ //
+ GEOM_Client();
+ GEOM_Client(Engines::Container_ptr client);
+ GEOM_Client(const GEOM_Client& client);
+
+ TopoDS_Shape GetShape( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_ptr aShape );
+ Standard_Boolean Find( const TopoDS_Shape& S, TCollection_AsciiString& IOR ) ;
+ void RemoveShapeFromBuffer( const TCollection_AsciiString& IOR ) ;
+ void ClearClientBuffer() ;
+
+#ifdef SINGLE_CLIENT
+ static GEOM_Client& get_client();
+#else
+ static GEOM_Client get_client();
+#endif
+
+ private:
+ // Methods PRIVATE
+ //
+ Standard_Boolean Find( const TCollection_AsciiString& IOR, TopoDS_Shape& S ) ;
+ void Bind( const TCollection_AsciiString& IOR, const TopoDS_Shape& S, int Tick ) ;
+ TopoDS_Shape Load( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_ptr aShape);
-private:
// Fields PRIVATE
//
- TColStd_SequenceOfAsciiString myIORs ;
- TopTools_SequenceOfShape myShapes ;
+ std::map< TCollection_AsciiString , std::vector<TopoDS_Shape> > _mySubShapes;
+ std::map< TCollection_AsciiString , TopoDS_Shape > myShapesMap;
+ std::map< TCollection_AsciiString , int > myTicksMap;
+ long pid_client;
};
+#ifdef SINGLE_CLIENT
+#define SHAPE_READER(obj) GEOM_Client& obj=GEOM_Client::get_client()
+#else
+#define SHAPE_READER(obj) GEOM_Client obj
+#endif
#endif
