From: eap <eap@opencascade.com>
Date: Wed, 15 Sep 2010 11:50:48 +0000 (+0000)
Subject: 0020746: EDF 1274 SMESH : MergeAllNodesButNodesFromGroup feature
X-Git-Tag: V5_1_5a1~51
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d1d0bb638cb2e704658625e5d544173e45b00248;p=modules%2Fsmesh.git

0020746: EDF 1274 SMESH : MergeAllNodesButNodesFromGroup feature

+    TPythonDump&
+    operator<<(const SMESH::ListOfIDSources& theList);
+
---

diff --git a/src/SMESH_I/SMESH_DumpPython.cxx b/src/SMESH_I/SMESH_DumpPython.cxx
index c50fa07ed..91aaa656e 100644
--- a/src/SMESH_I/SMESH_DumpPython.cxx
+++ b/src/SMESH_I/SMESH_DumpPython.cxx
@@ -152,7 +152,7 @@ namespace SMESH
   }
 
   template<class TArray>
-  void DumpArray(const TArray& theArray, std::ostringstream & theStream)
+  void DumpArray(const TArray& theArray, TPythonDump & theStream)
   {
     theStream << "[ ";
     for (int i = 1; i <= theArray.length(); i++) {
@@ -166,14 +166,14 @@ namespace SMESH
   TPythonDump& 
   TPythonDump::operator<<(const SMESH::long_array& theArg)
   {
-    DumpArray( theArg, myStream );
+    DumpArray( theArg, *this );
     return *this;
   }
 
   TPythonDump& 
   TPythonDump::operator<<(const SMESH::double_array& theArg)
   {
-    DumpArray( theArg, myStream );
+    DumpArray( theArg, *this );
     return *this;
   }
 
@@ -356,21 +356,12 @@ namespace SMESH
 
   TPythonDump& TPythonDump::operator<<(const SMESH::ListOfGroups& theList)
   {
-    SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen();
-    SALOMEDS::Study_ptr aStudy = aSMESHGen->GetCurrentStudy();
-    myStream << "[";
-    int aListLen = theList.length();
-    for(int i = 0 ; i < aListLen; i++)
-    {
-      SALOMEDS::SObject_var aSObject = SMESH_Gen_i::ObjectToSObject(aStudy,theList[i]);
-      if(!aSObject->_is_nil()) {
-        CORBA::String_var entry = aSObject->GetID();
-        myStream << entry;
-        if ( i < (aListLen - 1) )
-          myStream<<", ";
-      }
-    }
-    myStream<<"]";
+    DumpArray( theList, *this );
+    return *this;
+  }
+  TPythonDump& TPythonDump::operator<<(const SMESH::ListOfIDSources& theList)
+  {
+    DumpArray( theList, *this );
     return *this;
   }
 
diff --git a/src/SMESH_I/SMESH_PythonDump.hxx b/src/SMESH_I/SMESH_PythonDump.hxx
index f8567b41d..031b3c415 100644
--- a/src/SMESH_I/SMESH_PythonDump.hxx
+++ b/src/SMESH_I/SMESH_PythonDump.hxx
@@ -163,6 +163,9 @@ namespace SMESH
     TPythonDump&
     operator<<(const SMESH::ListOfGroups& theList);
 
+    TPythonDump&
+    operator<<(const SMESH::ListOfIDSources& theList);
+
     static const char* SMESHGenName() { return "smeshgen"; }
     static const char* MeshEditorName() { return "mesh_editor"; }