X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM_I%2FGEOM_IOperations_i.cc;h=4114d6647a0cfdcc579a6e6f276b1e139d9ec214;hb=8e1ef24a91d1db7af5b9e7b3bae0f39048846c49;hp=1c2b53ba3d491c59bf2763b361497207cb8e7e1d;hpb=f931ebe5b663153f8e276d607d870aa401a91048;p=modules%2Fgeom.git

diff --git a/src/GEOM_I/GEOM_IOperations_i.cc b/src/GEOM_I/GEOM_IOperations_i.cc
index 1c2b53ba3..4114d6647 100644
--- a/src/GEOM_I/GEOM_IOperations_i.cc
+++ b/src/GEOM_I/GEOM_IOperations_i.cc
@@ -1,15 +1,33 @@
-#include <Standard_Stream.hxx>
+//  Copyright (C) 2007-2008  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
+//  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
 
 #include "GEOM_IOperations_i.hh"
 
+#include "GEOM_Engine.hxx"
+
 #include "utilities.h"
 #include "OpUtil.hxx"
 #include "Utils_ExceptHandlers.hxx"
 
-#include "GEOM_Engine.hxx"
-
-//#include "GEOM_Gen_i.hh"
-
+#include <Standard_Stream.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TDF_Tool.hxx>
 
@@ -20,11 +38,8 @@
 //=============================================================================
 
 GEOM_IOperations_i::GEOM_IOperations_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, ::GEOM_IOperations* theImpl)
-#ifndef WNT
 :SALOME::GenericObj_i( thePOA ), _impl(theImpl), _engine(theEngine)
-#endif
 {
-  thePOA->activate_object(this);
 }
 
 //=============================================================================
@@ -38,46 +53,46 @@ GEOM_IOperations_i::~GEOM_IOperations_i()
 
 
 //=============================================================================
-/*!  
+/*!
  *  IsDone
  */
-//============================================================================= 
+//=============================================================================
 CORBA::Boolean GEOM_IOperations_i::IsDone()
 {
   return _impl->IsDone();
-}  
+}
 
 
 //=============================================================================
-/*!    
+/*!
  *  SetErrorCode
  */
-//============================================================================= 
+//=============================================================================
 void GEOM_IOperations_i::SetErrorCode(const char* theErrorCode)
 {
   _impl->SetErrorCode((char*)theErrorCode);
 }
- 
+
 //=============================================================================
 /*!
  *  GetErrorCode
  */
-//============================================================================= 
-char* GEOM_IOperations_i::GetErrorCode() 
+//=============================================================================
+char* GEOM_IOperations_i::GetErrorCode()
 {
-  return _impl->GetErrorCode();    
+  return CORBA::string_dup(_impl->GetErrorCode());
 }
-   
+
 //=============================================================================
 /*!
  *  GetStudyID
  */
-//============================================================================= 
-CORBA::Long GEOM_IOperations_i::GetStudyID() 
+//=============================================================================
+CORBA::Long GEOM_IOperations_i::GetStudyID()
 {
-  return _impl->GetDocID();    
+  return _impl->GetDocID();
 }
-   
+
 //=============================================================================
 /*!
  *  StartOperation
@@ -101,7 +116,7 @@ void GEOM_IOperations_i::FinishOperation()
 
 //=============================================================================
 /*!
- *  AboutOperation
+ *  AbortOperation
  */
 //=============================================================================
 void GEOM_IOperations_i::AbortOperation()
@@ -114,12 +129,28 @@ void GEOM_IOperations_i::AbortOperation()
  *  GetObject
  */
 //=============================================================================
-GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(Handle(GEOM_Object) theObject)         
+GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(Handle(GEOM_Object) theObject)
 {
-  if(theObject.IsNull()) return NULL;
+  GEOM::GEOM_Object_var GO;
+  if (theObject.IsNull()) return GO._retn();
   TCollection_AsciiString anEntry;
   TDF_Tool::Entry(theObject->GetEntry(), anEntry);
-  GEOM::GEOM_Object_var GO = GEOM::GEOM_Object::_duplicate(_engine->GetObject(theObject->GetDocID(), anEntry.ToCString()));
+  GO = _engine->GetObject(theObject->GetDocID(), anEntry.ToCString());
   return GO._retn();
-}  
+}
 
+//=============================================================================
+/*!
+ *  GetObjectImpl
+ */
+//=============================================================================
+Handle(GEOM_Object) GEOM_IOperations_i::GetObjectImpl(GEOM::GEOM_Object_ptr theObject)
+{
+  Handle(GEOM_Object) anImpl;
+  if (!CORBA::is_nil(theObject)) {
+    CORBA::String_var anEntry = theObject->GetEntry();
+    anImpl = GetImpl()->GetEngine()->GetObject
+      (theObject->GetStudyID(), anEntry);
+  }
+  return anImpl;
+}