ILMAB project.

[modules/geom.git] / src / GEOM / GEOM_PythonDump.cxx

diff --git a/src/GEOM/GEOM_PythonDump.cxx b/src/GEOM/GEOM_PythonDump.cxx
index 41b9c184f84e1e9acb5ecbcb57e3fbd92cfd20b6..e8f2ee33f7adb2e86ce073bce1619d6f923b0a0c 100644 (file)
--- a/src/GEOM/GEOM_PythonDump.cxx
+++ b/src/GEOM/GEOM_PythonDump.cxx
@@ -1,21 +1,24 @@
-//  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 
-// 
+// Copyright (C) 2007-2013  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_PythonDump.hxx"
 
@@ -30,7 +33,7 @@ namespace GEOM
 {
   size_t TPythonDump::myCounter = 0;
 
-  TPythonDump::TPythonDump (Handle(GEOM_Function)& theFunction, bool theAppend)
+  TPythonDump::TPythonDump (const Handle(GEOM_Function)& theFunction, bool theAppend)
   {
     myFunction = theFunction;
     myCounter++;
@@ -41,14 +44,25 @@ namespace GEOM
   {
     if (--myCounter == 0) {
       TCollection_AsciiString aDescr;
-      if ( myAppend )
-        aDescr = myFunction->GetDescription() + "\n\t";
+      if ( myAppend ) {
+        aDescr = myFunction->GetDescription();
+        if ( !aDescr.IsEmpty() ) aDescr += "\n\t";
+      }
       std::string aString = myStream.str();
       aDescr += (char *)aString.c_str();
       myFunction->SetDescription( aDescr );
     }
   }
 
+  TPythonDump& TPythonDump::operator<< (bool theArg)
+  {
+    if (theArg)
+      myStream << "True";
+    else
+      myStream << "False";
+    return *this;
+  }
+
   TPythonDump& TPythonDump::operator<< (long int theArg)
   {
     myStream<<theArg;
@@ -87,6 +101,12 @@ namespace GEOM
     return *this;
   }
 
+  TPythonDump& TPythonDump::operator<< (const TCollection_AsciiString theArg)
+  {
+    myStream<<theArg;
+    return *this;
+  }
+
   TPythonDump& TPythonDump::operator<< (const TopAbs_ShapeEnum theArg)
   {
     myStream<<"geompy.ShapeType[\"";
@@ -95,10 +115,20 @@ namespace GEOM
     return *this;
   }
 
-  TPythonDump& TPythonDump::operator<< (const Handle(GEOM_Object)& theObject)
+  TPythonDump& TPythonDump::operator<< (const Handle(GEOM_BaseObject)& theObject)
   {
     if (theObject.IsNull()) {
       myStream << "None";
+    } else {
+      *this << theObject.operator->();
+    }
+    return *this;
+  }
+
+  TPythonDump& TPythonDump::operator<< (const GEOM_BaseObject* theObject)
+  {
+    if ( !theObject ) {
+      myStream << "None";
     } else {
       TCollection_AsciiString anEntry;
       TDF_Tool::Entry(theObject->GetEntry(), anEntry);
@@ -117,7 +147,7 @@ namespace GEOM
     TDF_Tool::TagList(theObj1->GetEntry(), aTags1);
     TDF_Tool::TagList(theObj2->GetEntry(), aTags2);
     TColStd_ListIteratorOfListOfInteger aListIter1(aTags1), aListIter2(aTags2);
-    for (; aListIter1.More(); aListIter1.Next()) {
+    for (; aListIter1.More(); aListIter1.Next(), aListIter2.Next()) {
       if (!aListIter2.More())
         return theObj1; // anObj1 is stored under anObj2