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

Mantis issue 0020545: error in Partition with keep non-limit shapes.

Browse Source
This commit is contained in:
jfa 2009-11-05 08:55:21 +00:00
parent 27e9b15d0a
commit c34e09e68d
1 changed files with 104 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
src/GEOMAlgo/GEOMAlgo_Splitter.cxx
View File

@ -19,11 +19,9 @@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// File: GEOMAlgo_Splitter.cxx
// Created:
// Author: Peter KURNEV
// <pkv@irinox>
//
// File: GEOMAlgo_Splitter.cxx
// Author: Peter KURNEV
#include <GEOMAlgo_Splitter.ixx>
#include <TopAbs_ShapeEnum.hxx>
@ -47,7 +45,7 @@
static
void TreatCompound(const TopoDS_Shape& aC,
TopTools_ListOfShape& aLSX);
TopTools_ListOfShape& aLSX);
//=======================================================================
//function :
@ -163,19 +161,19 @@ static
aType=aS.ShapeType();
if (aType==theType && !myMapTools.Contains(aS)) {
if (myImages.HasImage(aS)) {
const TopTools_ListOfShape& aLSIm=myImages.Image(aS);
aItIm.Initialize(aLSIm);
for (; aItIm.More(); aItIm.Next()) {
const TopoDS_Shape& aSIm=aItIm.Value();
if (aM.Add(aSIm)) {
aBB.Add(myShape, aSIm);
}
}
const TopTools_ListOfShape& aLSIm=myImages.Image(aS);
aItIm.Initialize(aLSIm);
for (; aItIm.More(); aItIm.Next()) {
const TopoDS_Shape& aSIm=aItIm.Value();
if (aM.Add(aSIm)) {
aBB.Add(myShape, aSIm);
}
}
}
else {
if (aM.Add(aS)) {
aBB.Add(myShape, aS);
}
if (aM.Add(aS)) {
aBB.Add(myShape, aS);
}
}
}
}
@ -200,7 +198,7 @@ static
const TopoDS_Shape& aS=aMx(i);
aBB.Add(aC, aS);
}
//modified by NIZNHY-PKV Thu Feb 15 17:09:32 2007f
//
if (myLimitMode) {
Standard_Integer iType, iLimit, iTypeX;
TopAbs_ShapeEnum aType, aTypeX;
@ -213,58 +211,72 @@ static
// 1. Collect the shapes to process aLSP
aIt.Initialize(myShapes);
for (; aIt.More(); aIt.Next()) {
const TopoDS_Shape& aS=aIt.Value();
if (myMapTools.Contains(aS)) {
continue;
}
//
aType=aS.ShapeType();
iType=(Standard_Integer)aType;
//
if (iType>iLimit) {
aLSP.Append(aS);
}
//
else if (aType==TopAbs_COMPOUND) {
aLSX.Clear();
//
TreatCompound(aS, aLSX);
//
aItX.Initialize(aLSX);
for (; aItX.More(); aItX.Next()) {
const TopoDS_Shape& aSX=aItX.Value();
aTypeX=aSX.ShapeType();
iTypeX=(Standard_Integer)aTypeX;
//
if (iTypeX>iLimit) {
aLSP.Append(aSX);
}
}
}
const TopoDS_Shape& aS=aIt.Value();
if (myMapTools.Contains(aS)) {
continue;
}
//
aType=aS.ShapeType();
iType=(Standard_Integer)aType;
//
if (iType>iLimit) {
aLSP.Append(aS);
}
//
else if (aType==TopAbs_COMPOUND) {
aLSX.Clear();
//
TreatCompound(aS, aLSX);
//
aItX.Initialize(aLSX);
for (; aItX.More(); aItX.Next()) {
const TopoDS_Shape& aSX=aItX.Value();
aTypeX=aSX.ShapeType();
iTypeX=(Standard_Integer)aTypeX;
//
if (iTypeX>iLimit) {
aLSP.Append(aSX);
}
}
}
}// for (; aIt.More(); aIt.Next()) {
//
//modified by NIZNHY-PKV Fri Oct 30 11:07:08 2009 f
aMx.Clear();
TopExp::MapShapes(aC, aMx);
//modified by NIZNHY-PKV Fri Oct 30 11:12:30 2009t
//
// 2. Add them to aC
aIt.Initialize(aLSP);
for (; aIt.More(); aIt.Next()) {
const TopoDS_Shape& aS=aIt.Value();
if (myImages.HasImage(aS)) {
const TopTools_ListOfShape& aLSIm=myImages.Image(aS);
aItIm.Initialize(aLSIm);
for (; aItIm.More(); aItIm.Next()) {
const TopoDS_Shape& aSIm=aItIm.Value();
if (aM.Add(aSIm)) {
aBB.Add(aC, aSIm);
}
}
}
else {
if (aM.Add(aS)) {
aBB.Add(aC, aS);
}
}
const TopoDS_Shape& aS=aIt.Value();
if (myImages.HasImage(aS)) {
const TopTools_ListOfShape& aLSIm=myImages.Image(aS);
aItIm.Initialize(aLSIm);
for (; aItIm.More(); aItIm.Next()) {
const TopoDS_Shape& aSIm=aItIm.Value();
if (aM.Add(aSIm)) {
//modified by NIZNHY-PKV Fri Oct 30 11:09:57 2009f
if (!aMx.Contains(aSIm)) {
aBB.Add(aC, aSIm);
}
//aBB.Add(aC, aSIm);
//modified by NIZNHY-PKV Fri Oct 30 11:10:02 2009
}
}
}
else {
if (aM.Add(aS)) {
//modified by NIZNHY-PKV Fri Oct 30 11:10:46 2009f
if (!aMx.Contains(aS)) {
aBB.Add(aC, aS);
}
//aBB.Add(aC, aS);
//modified by NIZNHY-PKV Fri Oct 30 11:11:00 2009t
}
}
}
}// if (myLimitMode) {
//modified by NIZNHY-PKV Thu Feb 15 17:09:34 2007t
myShape=aC;
}//if (myLimit!=TopAbs_SHAPE) {
//
@ -275,7 +287,7 @@ static
//purpose :
//=======================================================================
void TreatCompound(const TopoDS_Shape& aC1,
TopTools_ListOfShape& aLSX)
TopTools_ListOfShape& aLSX)
{
Standard_Integer aNbC1;
TopAbs_ShapeEnum aType;
@ -292,14 +304,14 @@ void TreatCompound(const TopoDS_Shape& aC1,
//
aItC.Initialize(aC);
for (; aItC.More(); aItC.Next()) {
const TopoDS_Shape& aS=aItC.Value();
aType=aS.ShapeType();
if (aType==TopAbs_COMPOUND) {
aLC1.Append(aS);
}
else {
aLSX.Append(aS);
}
const TopoDS_Shape& aS=aItC.Value();
aType=aS.ShapeType();
if (aType==TopAbs_COMPOUND) {
aLC1.Append(aS);
}
else {
aLSX.Append(aS);
}
}
}
//