X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMClient%2FGEOM_Client.cxx;h=0e07e69d3bbd9a8ae93aeff9206695e316728869;hb=16f91b82f447624718787d47955b307588fa9fa8;hp=5c39bff4524c4e195a3007d9d35920d376e8d1fc;hpb=f505d638da4d75d3fe3daf6ce3bf7fab668bfad5;p=modules%2Fgeom.git diff --git a/src/GEOMClient/GEOM_Client.cxx b/src/GEOMClient/GEOM_Client.cxx index 5c39bff45..0e07e69d3 100644 --- a/src/GEOMClient/GEOM_Client.cxx +++ b/src/GEOMClient/GEOM_Client.cxx @@ -1,40 +1,40 @@ -// GEOM GEOMClient : tool to transfer BREP files from GEOM server to GEOM client +// Copyright (C) 2007-2010 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. // -// Copyright (C) 2003 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 -// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// 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 // + +// GEOM GEOMClient : tool to transfer BREP files from GEOM server to GEOM client // File : GEOM_Client.cxx // Author : Yves FRICAUD/Lucien PIGNOLONI // Module : GEOM // $Header$ - +// #include #include -#include +#include #include "GEOM_Client.hxx" #include -#include "OpUtil.hxx" +#include "Basics_Utils.hxx" #include "utilities.h" #include @@ -59,43 +59,42 @@ #define HST_CLIENT_LEN 256 - //======================================================================= // function : Load() -// purpose : +// purpose : //======================================================================= TopoDS_Shape GEOM_Client::Load( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_ptr aShape ) { - string hst_client = GetHostname(); - - Engines::Container_var ctn_server = geom->GetContainerRef(); - long pid_server = ctn_server->getPID(); - - if ( (pid_client==pid_server) && (strcmp(hst_client.c_str(), ctn_server->getHostName())==0) ) { - TopoDS_Shape* S = (TopoDS_Shape*)(aShape->getShape()); - return(*S); - } else { - /* get sequence of bytes of resulting brep shape from GEOM server */ - TopoDS_Shape S; - SALOMEDS::TMPFile_var SeqFile = aShape->GetShapeStream(); - int sizebuf = SeqFile->length(); - char* buf; - buf = (char*) &SeqFile[0]; - istrstream streamBrep(buf,sizebuf); - BRep_Builder aBuilder; - BRepTools::Read(S, streamBrep, aBuilder); - return(S); - }; + std::string hst_client = Kernel_Utils::GetHostname(); + + Engines::Container_var ctn_server = geom->GetContainerRef(); + long pid_server = ctn_server->getPID(); + + CORBA::String_var hostname = ctn_server->getHostName(); + if ( pid_client == pid_server && !strcmp(hst_client.c_str(), hostname.in()) ) { + TopoDS_Shape* S = (TopoDS_Shape*)(aShape->getShape()); + return(*S); + } else { + /* get sequence of bytes of resulting brep shape from GEOM server */ + TopoDS_Shape S; + SALOMEDS::TMPFile_var SeqFile = aShape->GetShapeStream(); + int sizebuf = SeqFile->length(); + char* buf; + buf = (char*) &SeqFile[0]; + std::istringstream streamBrep(buf); + BRep_Builder aBuilder; + BRepTools::Read(S, streamBrep, aBuilder); + return(S); + } } - //======================================================================= // function : Create() // purpose : Create in client not in a container //======================================================================= GEOM_Client::GEOM_Client() { - pid_client = + pid_client = #ifdef WNT (long)_getpid(); #else @@ -105,7 +104,7 @@ GEOM_Client::GEOM_Client() //======================================================================= // function : Create() -// purpose : +// purpose : //======================================================================= GEOM_Client::GEOM_Client(Engines::Container_ptr client) { @@ -114,7 +113,7 @@ GEOM_Client::GEOM_Client(Engines::Container_ptr client) //======================================================================= // function : Find() -// purpose : +// purpose : //======================================================================= Standard_Integer GEOM_Client::Find( const TCollection_AsciiString& IOR, TopoDS_Shape& S ) { @@ -129,7 +128,7 @@ Standard_Integer GEOM_Client::Find( const TCollection_AsciiString& IOR, TopoDS_S //======================================================================= // function : Find() -// purpose : +// purpose : //======================================================================= Standard_Integer GEOM_Client::Find( const TopoDS_Shape& S, TCollection_AsciiString& IOR ) { @@ -159,18 +158,17 @@ void GEOM_Client::Bind( const TCollection_AsciiString& IOR, const TopoDS_Shape& void GEOM_Client::RemoveShapeFromBuffer( const TCollection_AsciiString& IOR) { if( myIORs.IsEmpty() ) - return ; - - TopoDS_Shape S ; - Standard_Integer anIndex = Find( IOR, S ) ; + return; + + TopoDS_Shape S; + Standard_Integer anIndex = Find( IOR, S ); if( anIndex != 0 ) { - myIORs.Remove(anIndex) ; - myShapes.Remove(anIndex) ; + myIORs.Remove(anIndex); + myShapes.Remove(anIndex); } - return ; + return; } - //======================================================================= // function : ClearClientBuffer() // purpose : purge buffer @@ -178,10 +176,10 @@ void GEOM_Client::RemoveShapeFromBuffer( const TCollection_AsciiString& IOR) void GEOM_Client::ClearClientBuffer() { if( myIORs.IsEmpty() ) - return ; - myIORs.Clear() ; - myShapes.Clear() ; - return ; + return; + myIORs.Clear(); + myShapes.Clear(); + return; } //======================================================================= @@ -190,18 +188,18 @@ void GEOM_Client::ClearClientBuffer() //======================================================================= unsigned int GEOM_Client::BufferLength() { - return myIORs.Length() ; + return myIORs.Length(); } - //======================================================================= // function : GetShape() -// purpose : +// purpose : //======================================================================= TopoDS_Shape GEOM_Client::GetShape( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_ptr aShape ) { TopoDS_Shape S; - TCollection_AsciiString IOR = geom->GetStringFromIOR(aShape); + CORBA::String_var anIOR = geom->GetStringFromIOR(aShape); + TCollection_AsciiString IOR = (char*)anIOR.in(); Standard_Integer anIndex = Find(IOR, S); if (anIndex != 0) return S; @@ -222,7 +220,7 @@ TopoDS_Shape GEOM_Client::GetShape( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_p TopExp::MapShapes(aMainShape, anIndices); /* Case of only one subshape */ - if (list->length() == 1) { + if (list->length() == 1 && list[0] > 0) { S = anIndices.FindKey(list[0]); } else {