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

NPAL14978: EDF373: GEOM Script working on 3.2.1, not in 3.2.4, 3.2.5. Improved Partition to correctly process shapes, contained in compounds several times. A fix by PKV.

Browse Source
This commit is contained in:
jfa 2007-03-06 10:44:59 +00:00
parent 4a894b8328
commit 3b0a356cbc
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/NMTDS/NMTDS_ShapesDataStructure.cxx
View File

@ -24,17 +24,19 @@
#include <NMTDS_ShapesDataStructure.ixx> #include <NMTDS_ShapesDataStructure.ixx>
#include <TColStd_MapOfInteger.hxx>
#include <TopoDS_Iterator.hxx> #include <TopoDS_Iterator.hxx>
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors.hxx>
#include <NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx>
#include <NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx>
#include <BooleanOperations_ShapeAndInterferences.hxx> #include <BooleanOperations_ShapeAndInterferences.hxx>
#include <NMTDS_IndexRange.hxx>
//
#include <BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors.hxx> #include <BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors.hxx>
#include <BooleanOperations_AncestorsSeqAndSuccessorsSeq.hxx> #include <BooleanOperations_AncestorsSeqAndSuccessorsSeq.hxx>
#include <TColStd_MapOfInteger.hxx>
#include <NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx>
#include <NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx>
#include <NMTDS_IndexRange.hxx>
//=========================================================================== //===========================================================================
//function : NMTDS_ShapesDataStructure::NMTDS_ShapesDataStructure //function : NMTDS_ShapesDataStructure::NMTDS_ShapesDataStructure
@ -152,27 +154,29 @@
NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors aLx; NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors aLx;
NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors aLit; NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors aLit;
TopoDS_Iterator anIt; TopoDS_Iterator anIt;
// Modified Thu Sep 14 14:35:18 2006
// Contribution of Samtech www.samcef.com BEGIN
BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors aMSA; BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors aMSA;
// Contribution of Samtech www.samcef.com END
// //
anIt.Initialize(myCompositeShape); anIt.Initialize(myCompositeShape);
for (i=0; anIt.More(); anIt.Next(), ++i) { for (; anIt.More(); anIt.Next()) {
// Modified Thu Sep 14 14:35:18 2006
// Contribution of Samtech www.samcef.com BEGIN
const TopoDS_Shape& aSx=anIt.Value(); const TopoDS_Shape& aSx=anIt.Value();
BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors aMS; BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors aMS;
FillMap(aSx, aMSA, aMS); //modified by NIZNHY-PKV Tue Feb 27 17:05:47 2007f
aLx.Append(aMS); //FillMap(aSx, aMSA, aMS);
// Contribution of Samtech www.samcef.com END //aLx.Append(aMS);
//
if (!aMSA.Contains(aSx)) {
FillMap(aSx, aMSA, aMS);
aLx.Append(aMS);
}
//modified by NIZNHY-PKV Tue Feb 27 17:06:03 2007t
} }
// Modified Thu Sep 14 14:35:18 2006 //
// Contribution of Samtech www.samcef.com BEGIN
aNbS=aMSA.Extent(); aNbS=aMSA.Extent();
// Contribution of Samtech www.samcef.com END
// //
// Fill myRanges // Fill myRanges
//modified by NIZNHY-PKV Tue Feb 27 17:10:07 2007f
i=aLx.Extent();
//modified by NIZNHY-PKV Tue Feb 27 17:10:10 2007t
myRanges.Resize(i); myRanges.Resize(i);
aLit.Initialize(aLx); aLit.Initialize(aLx);
for (i=1; aLit.More(); aLit.Next(), ++i) { for (i=1; aLit.More(); aLit.Next(), ++i) {
@ -210,8 +214,6 @@
// Contribution of Samtech www.samcef.com BEGIN // Contribution of Samtech www.samcef.com BEGIN
// //
// Fill the table // Fill the table
//modified by NIZNHY-PKV Tue May 16 11:47:28 2006f
//aShift=0; //aShift=0;
//for (i=0; i<2; ++i) { //for (i=0; i<2; ++i) {
// if (i) { // if (i) {
@ -224,7 +226,7 @@
// InsertShapeAndAncestorsSuccessors(aSx, aASx, aShift); // InsertShapeAndAncestorsSuccessors(aSx, aASx, aShift);
// } // }
//} //}
aShift=0; aShift=0;
for (j=1; j<=aNbS; ++j) { for (j=1; j<=aNbS; ++j) {
const TopoDS_Shape& aSx=aMSA.FindKey(j); const TopoDS_Shape& aSx=aMSA.FindKey(j);