ADD a end user module (services.py) to help the manipulation of SALOME KERNEL service...

[modules/kernel.git] / src / SALOMEDS / SALOMEDS_ChildIterator_i.cxx

diff --git a/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx b/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx
index 7feabbddd4d8e8943b4ef6b710aac53e14c1c84c..59fcff14c3b7f4851ec7d53567416bd7fa6fe946 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx
@@ -1,30 +1,47 @@
-using namespace std;
-//  File      : SALOMEDS_ChildIterator_i.cxx
-//  Created   : Wed Nov 28 16:15:25 2001
-//  Author    : Yves FRICAUD
-
-//  Project   : SALOME
-//  Module    : SALOMEDS
-//  Copyright : Open CASCADE 2001
-//  $Header$
+// Copyright (C) 2007-2011  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
+//
 
+//  File   : SALOMEDS_ChildIterator_i.cxx
+//  Author : Sergey RUIN
+//  Module : SALOME
+//
 #include "SALOMEDS_ChildIterator_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
+#include "SALOMEDS.hxx"
+#include "SALOMEDSImpl_SObject.hxx"
+#include "SALOMEDSImpl_Study.hxx"
 #include "utilities.h"
 
-
-
 //============================================================================
 /*! Function : constructor
  *  Purpose  :
  */
 //============================================================================
-SALOMEDS_ChildIterator_i::SALOMEDS_ChildIterator_i(TDF_Label lab,
-                                                  CORBA::ORB_ptr orb) 
-  : _lab(lab)
+SALOMEDS_ChildIterator_i::SALOMEDS_ChildIterator_i(const SALOMEDSImpl_ChildIterator& theImpl,
+                                                   CORBA::ORB_ptr orb) 
+  : _it(theImpl.GetPersistentCopy())
 {
+  SALOMEDS::Locker lock;
   _orb = CORBA::ORB::_duplicate(orb);
-  _it.Initialize (lab);
 }
 
 //============================================================================
@@ -34,6 +51,7 @@ SALOMEDS_ChildIterator_i::SALOMEDS_ChildIterator_i(TDF_Label lab,
 //============================================================================
 SALOMEDS_ChildIterator_i::~SALOMEDS_ChildIterator_i()
 {
+    if(_it) delete _it;
 }
 
 //============================================================================
@@ -43,7 +61,8 @@ SALOMEDS_ChildIterator_i::~SALOMEDS_ChildIterator_i()
 //============================================================================
 void SALOMEDS_ChildIterator_i::Init()
 { 
-  _it.Initialize (_lab);
+  SALOMEDS::Locker lock;
+  _it->Init();
 }
 
 //============================================================================
@@ -53,7 +72,8 @@ void SALOMEDS_ChildIterator_i::Init()
 //============================================================================
 void SALOMEDS_ChildIterator_i::InitEx(CORBA::Boolean allLevels)
 { 
-  _it.Initialize (_lab, allLevels);
+  SALOMEDS::Locker lock;
+  _it->InitEx (allLevels);
 }
 
 //============================================================================
@@ -63,7 +83,8 @@ void SALOMEDS_ChildIterator_i::InitEx(CORBA::Boolean allLevels)
 //============================================================================
 CORBA::Boolean SALOMEDS_ChildIterator_i::More()
 {
-  return _it.More();
+  SALOMEDS::Locker lock;
+  return _it->More();
 }
 
  //============================================================================
@@ -73,21 +94,22 @@ CORBA::Boolean SALOMEDS_ChildIterator_i::More()
 //============================================================================
 void SALOMEDS_ChildIterator_i::Next()
 {
-  _it.Next();
+  SALOMEDS::Locker lock;
+  _it->Next();
 }
 
 
 //============================================================================
-/*! Function :
+/*! Function : Value
  *  Purpose  :
  */
 //============================================================================
 
 SALOMEDS::SObject_ptr SALOMEDS_ChildIterator_i::Value()
 {
-  TDF_Label L = _it.Value();
-  SALOMEDS_SObject_i *  so_servant = new SALOMEDS_SObject_i (L,_orb);
-  SALOMEDS::SObject_var so = SALOMEDS::SObject::_narrow(so_servant->_this());
-  return so;
+  SALOMEDS::Locker lock;
+  SALOMEDSImpl_SObject aSO = _it->Value();
+  SALOMEDS::SObject_var so = SALOMEDS_SObject_i::New (aSO, _orb);
+  return so._retn();
 }