ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-05-10 07:20:48 +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

22
src/GEOMAlgo/GEOMAlgo_Splitter.cxx
View File

@ -20,10 +20,8 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// File: GEOMAlgo_Splitter.cxx // File: GEOMAlgo_Splitter.cxx
// Created:
// Author: Peter KURNEV // Author: Peter KURNEV
// <pkv@irinox>
//
#include <GEOMAlgo_Splitter.ixx> #include <GEOMAlgo_Splitter.ixx>
#include <TopAbs_ShapeEnum.hxx> #include <TopAbs_ShapeEnum.hxx>
@ -200,7 +198,7 @@ static
const TopoDS_Shape& aS=aMx(i); const TopoDS_Shape& aS=aMx(i);
aBB.Add(aC, aS); aBB.Add(aC, aS);
} }
//modified by NIZNHY-PKV Thu Feb 15 17:09:32 2007f //
if (myLimitMode) { if (myLimitMode) {
Standard_Integer iType, iLimit, iTypeX; Standard_Integer iType, iLimit, iTypeX;
TopAbs_ShapeEnum aType, aTypeX; TopAbs_ShapeEnum aType, aTypeX;
@ -243,6 +241,11 @@ static
} }
}// for (; aIt.More(); aIt.Next()) { }// 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 // 2. Add them to aC
aIt.Initialize(aLSP); aIt.Initialize(aLSP);
for (; aIt.More(); aIt.Next()) { for (; aIt.More(); aIt.Next()) {
@ -253,18 +256,27 @@ static
for (; aItIm.More(); aItIm.Next()) { for (; aItIm.More(); aItIm.Next()) {
const TopoDS_Shape& aSIm=aItIm.Value(); const TopoDS_Shape& aSIm=aItIm.Value();
if (aM.Add(aSIm)) { 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);
} }
//aBB.Add(aC, aSIm);
//modified by NIZNHY-PKV Fri Oct 30 11:10:02 2009
}
} }
} }
else { else {
if (aM.Add(aS)) { 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);
} }
//aBB.Add(aC, aS);
//modified by NIZNHY-PKV Fri Oct 30 11:11:00 2009t
}
} }
} }
}// if (myLimitMode) { }// if (myLimitMode) {
//modified by NIZNHY-PKV Thu Feb 15 17:09:34 2007t
myShape=aC; myShape=aC;
}//if (myLimit!=TopAbs_SHAPE) { }//if (myLimit!=TopAbs_SHAPE) {
// //