0052898: TC 7.7.0: Regression "Glue Faces" dialog glues all faces instead selected...

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

diff --git a/src/GEOM/GEOM_PythonDump.cxx b/src/GEOM/GEOM_PythonDump.cxx
index 8f41434040417df82c8bbaa67760ca988c1177a9..bcee3dc0451d34d56c8d965f6f372df7482226b8 100644 (file)
--- a/src/GEOM/GEOM_PythonDump.cxx
+++ b/src/GEOM/GEOM_PythonDump.cxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  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
+// 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 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, or (at your option) any later version.
 //
-//  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.
+// 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
+// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "GEOM_PythonDump.hxx"
 
 #include <TDF_Tool.hxx>
@@ -32,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++;
@@ -44,13 +45,24 @@ namespace GEOM
     if (--myCounter == 0) {
       TCollection_AsciiString aDescr;
       if ( myAppend )
-        aDescr = myFunction->GetDescription() + "\n\t";
+        aDescr = myFunction->GetDescription();
       std::string aString = myStream.str();
+      if ( !aDescr.IsEmpty() && !aString.empty())
+        aDescr += "\n\t";
       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;
@@ -89,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[\"";
@@ -97,10 +115,53 @@ 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 Handle(TColStd_HSequenceOfTransient)& theObjects)
+  {
+    Standard_Integer aLength = theObjects->Length();
+    if ( aLength > 1 ) {
+      myStream << "[";
+    }
+    for ( Standard_Integer i = 1; i <= aLength; i++ ) {
+      *this << Handle(GEOM_Object)::DownCast(theObjects->Value(i));
+      if ( i < aLength ) myStream << ", ";
+    }
+    if ( aLength > 1 ) {
+      myStream << "]";
+    }
+    return *this;
+  }
+  Standard_EXPORT TPythonDump&
+  TPythonDump::operator<< (const std::list<Handle(GEOM_Object)>& theObjects)
+  {
+    Standard_Integer aLength = theObjects.size();
+    if ( aLength != 1 ) {
+      myStream << "[";
+    }
+    std::list<Handle(GEOM_Object)>::const_iterator obj = theObjects.begin();
+    for ( Standard_Integer i = 1; i <= aLength; i++, ++obj ) {
+      *this << *obj;
+      if ( i < aLength ) myStream << ", ";
+    }
+    if ( aLength != 1 ) {
+      myStream << "]";
+    }
+    return *this;
+  }
+
+  TPythonDump& TPythonDump::operator<< (const GEOM_BaseObject* theObject)
+  {
+    if ( !theObject ) {
+      myStream << "None";
     } else {
       TCollection_AsciiString anEntry;
       TDF_Tool::Entry(theObject->GetEntry(), anEntry);
@@ -140,6 +201,11 @@ namespace GEOM
 
     for (i = 1; i <= aLen; i++) {
       anObject = Handle(GEOM_Object)::DownCast(theObjects->Value(i));
+      if ( anObject.IsNull() ) {
+        Handle(GEOM_Function) fun = Handle(GEOM_Function)::DownCast(theObjects->Value(i));
+        if ( !fun.IsNull() )
+          anObject = GEOM_Object::GetObject( fun->GetOwnerEntry() );
+      }
       aLatest = GetCreatedLast(aLatest, anObject);
     }
     return aLatest;