Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge C++ part of kleontev/38044_auto_repair
[modules/geom.git]
/
src
/
GEOM
/
GEOM_PythonDump.cxx
diff --git
a/src/GEOM/GEOM_PythonDump.cxx
b/src/GEOM/GEOM_PythonDump.cxx
index 2a2e498d8050aa302405fd3142273ce2d29c0ccc..31900a1606f5fc2a6e6cafc84dabb7ef7c162533 100644
(file)
--- a/
src/GEOM/GEOM_PythonDump.cxx
+++ b/
src/GEOM/GEOM_PythonDump.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 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
//
// 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 (--myCounter == 0) {
TCollection_AsciiString aDescr;
- if ( myAppend )
{
+ if ( myAppend )
aDescr = myFunction->GetDescription();
aDescr = myFunction->GetDescription();
- if ( !aDescr.IsEmpty() ) aDescr += "\n\t";
- }
std::string aString = myStream.str();
std::string aString = myStream.str();
+ if ( !aDescr.IsEmpty() && !aString.empty())
+ aDescr += "\n\t";
aDescr += (char *)aString.c_str();
myFunction->SetDescription( aDescr );
}
aDescr += (char *)aString.c_str();
myFunction->SetDescription( aDescr );
}
@@
-110,7
+110,14
@@
namespace GEOM
TPythonDump& TPythonDump::operator<< (const TopAbs_ShapeEnum theArg)
{
myStream<<"geompy.ShapeType[\"";
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;
}
myStream<<"\"]";
return *this;
}
@@
-144,7
+151,7
@@
namespace GEOM
TPythonDump::operator<< (const std::list<Handle(GEOM_Object)>& theObjects)
{
Standard_Integer aLength = theObjects.size();
TPythonDump::operator<< (const std::list<Handle(GEOM_Object)>& theObjects)
{
Standard_Integer aLength = theObjects.size();
- if ( aLength
>
1 ) {
+ if ( aLength
!=
1 ) {
myStream << "[";
}
std::list<Handle(GEOM_Object)>::const_iterator obj = theObjects.begin();
myStream << "[";
}
std::list<Handle(GEOM_Object)>::const_iterator obj = theObjects.begin();
@@
-152,7
+159,7
@@
namespace GEOM
*this << *obj;
if ( i < aLength ) myStream << ", ";
}
*this << *obj;
if ( i < aLength ) myStream << ", ";
}
- if ( aLength
>
1 ) {
+ if ( aLength
!=
1 ) {
myStream << "]";
}
return *this;
myStream << "]";
}
return *this;
@@
-170,37
+177,44
@@
namespace GEOM
return *this;
}
return *this;
}
- Handle(GEOM_
Object) GetCreatedLast(const Handle(GEOM_Objec
t)& theObj1,
-
const Handle(GEOM_Objec
t)& theObj2)
+ Handle(GEOM_
BaseObject) GetCreatedLast(const Handle(Standard_Transien
t)& theObj1,
+
const Handle(Standard_Transien
t)& 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;
TColStd_ListOfInteger aTags1, aTags2;
- TDF_Tool::TagList(
theObj
1->GetEntry(), aTags1);
- TDF_Tool::TagList(
theObj
2->GetEntry(), aTags2);
+ TDF_Tool::TagList(
bo
1->GetEntry(), aTags1);
+ TDF_Tool::TagList(
bo
2->GetEntry(), aTags2);
TColStd_ListIteratorOfListOfInteger aListIter1(aTags1), aListIter2(aTags2);
for (; aListIter1.More(); aListIter1.Next(), aListIter2.Next()) {
if (!aListIter2.More())
TColStd_ListIteratorOfListOfInteger aListIter1(aTags1), aListIter2(aTags2);
for (; aListIter1.More(); aListIter1.Next(), aListIter2.Next()) {
if (!aListIter2.More())
- return
theObj
1; // anObj1 is stored under anObj2
+ return
bo
1; // anObj1 is stored under anObj2
if (aListIter1.Value() > aListIter2.Value())
if (aListIter1.Value() > aListIter2.Value())
- return
theObj
1;
+ return
bo
1;
else if (aListIter1.Value() < aListIter2.Value())
else if (aListIter1.Value() < aListIter2.Value())
- return
theObj
2;
+ return
bo
2;
}
}
- return
theObj
1;
+ return
bo
1;
}
}
- Handle(GEOM_Object) GetCreatedLast(const Handle(TColStd_HSequenceOfTransient)& theObjects)
+ Handle(GEOM_
Base
Object) GetCreatedLast(const Handle(TColStd_HSequenceOfTransient)& theObjects)
{
{
- Handle(GEOM_Object) anObject, aLatest;
+ Handle(GEOM_
Base
Object) anObject, aLatest;
int i, aLen = theObjects->Length();
if (aLen < 1)
return aLatest;
for (i = 1; i <= aLen; i++) {
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;
aLatest = GetCreatedLast(aLatest, anObject);
}
return aLatest;