ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-14 02:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Migration to OCCT > 6.9.0

Browse Source
This commit is contained in:
vsr 2015-06-11 10:20:52 +03:00
parent faf08d0c52
commit eba013acfe
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
View File

@ -53,6 +53,7 @@
#include <BRepExtrema_ShapeProximity.hxx> #include <BRepExtrema_ShapeProximity.hxx>
#if OCC_VERSION_LARGE > 0x06090000 #if OCC_VERSION_LARGE > 0x06090000
#include <BRepExtrema_SelfIntersection.hxx> #include <BRepExtrema_SelfIntersection.hxx>
#include <BRepExtrema_MapOfIntegerPackedMapOfInteger.hxx>
#endif #endif
#include <BRepGProp.hxx> #include <BRepGProp.hxx>
#include <BRepTools.hxx> #include <BRepTools.hxx>
@ -1624,11 +1625,11 @@ bool GEOMImpl_IMeasureOperations::CheckSelfIntersectionsFast
// Launch the checker // Launch the checker
aTool.Perform(); aTool.Perform();
const BRepExtrema_OverlapTool::OverlapSubShapes& intersections = aTool.OverlapElements(); const BRepExtrema_MapOfIntegerPackedMapOfInteger& intersections = aTool.OverlapElements();
std::set<Standard_Integer> processed; std::set<Standard_Integer> processed;
for (BRepExtrema_OverlapTool::OverlapSubShapes::Iterator it(intersections); it.More(); it.Next()) { for (BRepExtrema_MapOfIntegerPackedMapOfInteger::Iterator it(intersections); it.More(); it.Next()) {
Standard_Integer idxLeft = it.Key(); Standard_Integer idxLeft = it.Key();
if (processed.count(idxLeft) > 0) continue; // already added if (processed.count(idxLeft) > 0) continue; // already added
processed.insert(idxLeft); processed.insert(idxLeft);
@ -1715,7 +1716,7 @@ bool GEOMImpl_IMeasureOperations::FastIntersect (Handle(GEOM_Object) theShape1,
// 2. Get sets of IDs of overlapped faces // 2. Get sets of IDs of overlapped faces
#if OCC_VERSION_LARGE > 0x06090000 #if OCC_VERSION_LARGE > 0x06090000
for (BRepExtrema_OverlapTool::OverlapSubShapes::Iterator anIt1 (aBSP.OverlapSubShapes1()); anIt1.More(); anIt1.Next()) for (BRepExtrema_MapOfIntegerPackedMapOfInteger::Iterator anIt1 (aBSP.OverlapSubShapes1()); anIt1.More(); anIt1.Next())
#else #else
for (BRepExtrema_OverlappedSubShapes::Iterator anIt1 (aBSP.OverlapSubShapes1()); anIt1.More(); anIt1.Next()) for (BRepExtrema_OverlappedSubShapes::Iterator anIt1 (aBSP.OverlapSubShapes1()); anIt1.More(); anIt1.Next())
#endif #endif
@ -1725,7 +1726,7 @@ bool GEOMImpl_IMeasureOperations::FastIntersect (Handle(GEOM_Object) theShape1,
} }
#if OCC_VERSION_LARGE > 0x06090000 #if OCC_VERSION_LARGE > 0x06090000
for (BRepExtrema_OverlapTool::OverlapSubShapes::Iterator anIt2 (aBSP.OverlapSubShapes2()); anIt2.More(); anIt2.Next()) for (BRepExtrema_MapOfIntegerPackedMapOfInteger::Iterator anIt2 (aBSP.OverlapSubShapes2()); anIt2.More(); anIt2.Next())
#else #else
for (BRepExtrema_OverlappedSubShapes::Iterator anIt2 (aBSP.OverlapSubShapes2()); anIt2.More(); anIt2.Next()) for (BRepExtrema_OverlappedSubShapes::Iterator anIt2 (aBSP.OverlapSubShapes2()); anIt2.More(); anIt2.Next())
#endif #endif