ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-29 10:50:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Bug 0020057: EDF GEOM: Impossible to explode an object to faces. Infinite loop.

Browse Source
This commit is contained in:
jfa 2008-11-21 07:37:05 +00:00
parent d613dabfc0
commit 1a9f6f8244
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
View File

@ -3130,6 +3130,7 @@ void GEOMImpl_IShapesOperations::SortShapes(TopTools_ListOfShape& SL)
Sort = Standard_False; Sort = Standard_False;
for (Index=1; Index < MaxShapes; Index++) for (Index=1; Index < MaxShapes; Index++)
{ {
exchange = Standard_False;
Standard_Real dMidXYZ = MidXYZ(OrderInd(Index)) - MidXYZ(OrderInd(Index+1)); Standard_Real dMidXYZ = MidXYZ(OrderInd(Index)) - MidXYZ(OrderInd(Index+1));
Standard_Real dLength = Length(OrderInd(Index)) - Length(OrderInd(Index+1)); Standard_Real dLength = Length(OrderInd(Index)) - Length(OrderInd(Index+1));
if ( dMidXYZ >= tol ) { if ( dMidXYZ >= tol ) {
@ -3162,13 +3163,14 @@ void GEOMImpl_IShapesOperations::SortShapes(TopTools_ListOfShape& SL)
val1 = (aXmin+aXmax)*999 + (aYmin+aYmax)*99 + (aZmin+aZmax)*0.9; val1 = (aXmin+aXmax)*999 + (aYmin+aYmax)*99 + (aZmin+aZmax)*0.9;
box2.Get(aXmin, aYmin, aZmin, aXmax, aYmax, aZmax); box2.Get(aXmin, aYmin, aZmin, aXmax, aYmax, aZmax);
val2 = (aXmin+aXmax)*999 + (aYmin+aYmax)*99 + (aZmin+aZmax)*0.9; val2 = (aXmin+aXmax)*999 + (aYmin+aYmax)*99 + (aZmin+aZmax)*0.9;
exchange = val1 > val2; //exchange = val1 > val2;
// cout << "box: " << val1<<" > "<<val2 << endl; if ((val1 - val2) >= tol) {
exchange = Standard_True;
}
//cout << "box: " << val1<<" > "<<val2 << endl;
} }
} }
else {
exchange = Standard_False;
}
if (exchange) if (exchange)
{ {
// cout << "exchange " << Index << " & " << Index+1 << endl; // cout << "exchange " << Index << " & " << Index+1 << endl;
@ -3179,7 +3181,7 @@ void GEOMImpl_IShapesOperations::SortShapes(TopTools_ListOfShape& SL)
} }
} }
} }
for (Index=1; Index <= MaxShapes; Index++) for (Index=1; Index <= MaxShapes; Index++)
SL.Append( aShapes( OrderInd(Index) )); SL.Append( aShapes( OrderInd(Index) ));
} }