X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMClient%2FGEOM_Client.cxx;h=52e007c2893f7279b307367c8c53a2c4cf910e1a;hb=08a90cb03f6d2befe6f0b923bd690182ded48378;hp=c1e43f616bbd285e59b68c10b9904107087da8d9;hpb=aab55c4f104405b4539e5a96f07f89bffb8201db;p=modules%2Fgeom.git diff --git a/src/GEOMClient/GEOM_Client.cxx b/src/GEOMClient/GEOM_Client.cxx index c1e43f616..52e007c28 100644 --- a/src/GEOMClient/GEOM_Client.cxx +++ b/src/GEOMClient/GEOM_Client.cxx @@ -1,25 +1,24 @@ -// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2012 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 // -// 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 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 -// Lesser General Public License for more details. +// 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 +// 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// GEOM GEOMClient : tool to transfer BREP files from GEOM server to GEOM client // File : GEOM_Client.cxx // Author : Yves FRICAUD/Lucien PIGNOLONI // Module : GEOM @@ -56,7 +55,6 @@ #define HST_CLIENT_LEN 256 - //======================================================================= // function : Load() // purpose : @@ -106,10 +104,8 @@ GEOM_Client::GEOM_Client() //======================================================================= GEOM_Client::GEOM_Client(const GEOM_Client& client) { - myIORs = client.myIORs; - myShapes = client.myShapes; - _myIndexes = client._myIndexes; _mySubShapes = client._mySubShapes; + myShapesMap = client.myShapesMap; pid_client = client.pid_client; } @@ -143,30 +139,29 @@ GEOM_Client GEOM_Client::get_client() // function : Find() // purpose : //======================================================================= -Standard_Integer GEOM_Client::Find( const TCollection_AsciiString& IOR, TopoDS_Shape& S ) +Standard_Boolean GEOM_Client::Find (const TCollection_AsciiString& IOR, TopoDS_Shape& S) { - if (_myIndexes.count(IOR) != 0) - { - Standard_Integer i = _myIndexes[IOR]; - S = myShapes.Value(i); - return i; + if (myShapesMap.count(IOR) != 0) { + S = myShapesMap[IOR]; + return Standard_True; } - return 0; + return Standard_False; } //======================================================================= // function : Find() // purpose : //======================================================================= -Standard_Integer GEOM_Client::Find( const TopoDS_Shape& S, TCollection_AsciiString& IOR ) +Standard_Boolean GEOM_Client::Find (const TopoDS_Shape& S, TCollection_AsciiString& IOR) { - for ( Standard_Integer i = 1; i<= myShapes.Length(); i++ ) { - if (myShapes.Value(i) == S) { - IOR = myIORs.Value(i); - return i; + std::map< TCollection_AsciiString, TopoDS_Shape >::const_iterator it; + for (it = myShapesMap.begin(); it != myShapesMap.end(); ++it) { + if ((*it).second == S) { + IOR = (*it).first; + return Standard_True; } } - return 0; + return Standard_False; } //======================================================================= @@ -175,9 +170,7 @@ Standard_Integer GEOM_Client::Find( const TopoDS_Shape& S, TCollection_AsciiStri //======================================================================= void GEOM_Client::Bind( const TCollection_AsciiString& IOR, const TopoDS_Shape& S ) { - myIORs.Append(IOR); - myShapes.Append(S); - _myIndexes[IOR] = myIORs.Length(); + myShapesMap[IOR] = S; } //======================================================================= @@ -186,15 +179,11 @@ void GEOM_Client::Bind( const TCollection_AsciiString& IOR, const TopoDS_Shape& //======================================================================= void GEOM_Client::RemoveShapeFromBuffer( const TCollection_AsciiString& IOR) { - if( myIORs.IsEmpty() ) + if (myShapesMap.size() == 0) return; - TopoDS_Shape S; - Standard_Integer anIndex = Find( IOR, S ); - if( anIndex != 0 ) { - myIORs.Remove(anIndex); - myShapes.Remove(anIndex); - _myIndexes.erase(IOR); + if (myShapesMap.count(IOR) != 0) { + myShapesMap.erase(IOR); _mySubShapes.erase(IOR); } } @@ -205,13 +194,11 @@ void GEOM_Client::RemoveShapeFromBuffer( const TCollection_AsciiString& IOR) //======================================================================= void GEOM_Client::ClearClientBuffer() { - if( myIORs.IsEmpty() ) + if (myShapesMap.size() == 0) return; - myIORs.Clear(); - myShapes.Clear(); - _myIndexes.clear(); + _mySubShapes.clear(); - return; + myShapesMap.clear(); } //======================================================================= @@ -220,7 +207,7 @@ void GEOM_Client::ClearClientBuffer() //======================================================================= unsigned int GEOM_Client::BufferLength() { - return myIORs.Length(); + return myShapesMap.size(); } //======================================================================= @@ -232,9 +219,9 @@ TopoDS_Shape GEOM_Client::GetShape( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_p TopoDS_Shape S; CORBA::String_var anIOR = geom->GetStringFromIOR(aShape); TCollection_AsciiString IOR = (char*)anIOR.in(); - Standard_Integer anIndex = Find(IOR, S); + Standard_Boolean anIndex = Find(IOR, S); - if (anIndex != 0) return S; + if (anIndex) return S; /******* in case of a MAIN GEOM::SHAPE ********/ if (aShape->IsMainShape()) { @@ -252,7 +239,7 @@ TopoDS_Shape GEOM_Client::GetShape( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_p TCollection_AsciiString mainIOR = (char*)aMainIOR.in(); //find subshapes only one time - if(_mySubShapes.count(mainIOR)==0) + if (_mySubShapes.count(mainIOR) == 0) { TopTools_IndexedMapOfShape anIndices; TopExp::MapShapes(aMainShape, anIndices);