[bos #39942] EDF 25230 - New problem with XYZtoUV

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

diff --git a/src/GEOM/GEOM_PythonDump.cxx b/src/GEOM/GEOM_PythonDump.cxx
index 395a3ab72458fcdea316a3336269a0dd843d2dff..b83d7accba9251fe5bf8d0984f0cfed0bde980af 100644 (file)
--- a/src/GEOM/GEOM_PythonDump.cxx
+++ b/src/GEOM/GEOM_PythonDump.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -44,11 +44,11 @@ namespace GEOM
   {
     if (--myCounter == 0) {
       TCollection_AsciiString aDescr;
-      if ( myAppend ) {
+      if ( myAppend )
         aDescr = myFunction->GetDescription();
-        if ( !aDescr.IsEmpty() ) aDescr += "\n\t";
-      }
       std::string aString = myStream.str();
+      if ( !aDescr.IsEmpty() && !aString.empty())
+        aDescr += "\n\t";
       aDescr += (char *)aString.c_str();
       myFunction->SetDescription( aDescr );
     }
@@ -110,7 +110,14 @@ namespace GEOM
   TPythonDump& TPythonDump::operator<< (const TopAbs_ShapeEnum theArg)
   {
     myStream<<"geompy.ShapeType[\"";
-    TopAbs::Print(theArg, myStream);
+    if (theArg == -1)
+      myStream<<"AUTO";
+    else if (theArg == 9)
+      myStream<<"FLAT";
+    else if (theArg >= TopAbs_COMPOUND && theArg <= TopAbs_SHAPE)
+      TopAbs::Print(theArg, myStream);
+    else
+      myStream<<int(theArg);
     myStream<<"\"]";
     return *this;
   }
@@ -140,6 +147,23 @@ namespace GEOM
     }
     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)
   {
@@ -153,37 +177,44 @@ namespace GEOM
     return *this;
   }
 
-  Handle(GEOM_Object) GetCreatedLast(const Handle(GEOM_Object)& theObj1,
-                                     const Handle(GEOM_Object)& theObj2)
+  Handle(GEOM_BaseObject) GetCreatedLast(const Handle(Standard_Transient)& theObj1,
+                                         const Handle(Standard_Transient)& theObj2)
   {
-    if (theObj1.IsNull()) return theObj2;
-    if (theObj2.IsNull()) return theObj1;
+    Handle(GEOM_BaseObject) bo1 = Handle(GEOM_Object)::DownCast(theObj1);
+    Handle(GEOM_BaseObject) bo2 = Handle(GEOM_Object)::DownCast(theObj2);
+    if (bo1.IsNull()) return bo2;
+    if (bo2.IsNull()) return bo1;
 
     TColStd_ListOfInteger aTags1, aTags2;
-    TDF_Tool::TagList(theObj1->GetEntry(), aTags1);
-    TDF_Tool::TagList(theObj2->GetEntry(), aTags2);
+    TDF_Tool::TagList(bo1->GetEntry(), aTags1);
+    TDF_Tool::TagList(bo2->GetEntry(), aTags2);
     TColStd_ListIteratorOfListOfInteger aListIter1(aTags1), aListIter2(aTags2);
     for (; aListIter1.More(); aListIter1.Next(), aListIter2.Next()) {
       if (!aListIter2.More())
-        return theObj1; // anObj1 is stored under anObj2
+        return bo1; // anObj1 is stored under anObj2
 
       if (aListIter1.Value() > aListIter2.Value())
-        return theObj1;
+        return bo1;
       else if (aListIter1.Value() < aListIter2.Value())
-        return theObj2;
+        return bo2;
     }
-    return theObj1;
+    return bo1;
   }
 
-  Handle(GEOM_Object) GetCreatedLast(const Handle(TColStd_HSequenceOfTransient)& theObjects)
+  Handle(GEOM_BaseObject) GetCreatedLast(const Handle(TColStd_HSequenceOfTransient)& theObjects)
   {
-    Handle(GEOM_Object) anObject, aLatest;
+    Handle(GEOM_BaseObject) anObject, aLatest;
     int i, aLen = theObjects->Length();
     if (aLen < 1)
       return aLatest;
 
     for (i = 1; i <= aLen; i++) {
-      anObject = Handle(GEOM_Object)::DownCast(theObjects->Value(i));
+      anObject = Handle(GEOM_BaseObject)::DownCast(theObjects->Value(i));
+      if ( anObject.IsNull() ) {
+        Handle(GEOM_Function) fun = Handle(GEOM_Function)::DownCast(theObjects->Value(i));
+        if ( !fun.IsNull() )
+          anObject = GEOM_BaseObject::GetObject( fun->GetOwnerEntry() );
+      }
       aLatest = GetCreatedLast(aLatest, anObject);
     }
     return aLatest;