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

NPAL19578 EDF 588 GEOM : Partition does not work properly on common part of 2 volumes

Browse Source
This commit is contained in:
maintenance team 2008-05-20 11:17:51 +00:00
parent f3dc6a8a84
commit 67a00ae7a4
1 changed files with 67 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
src/NMTTools/NMTTools_PaveFiller_5.cxx
View File

@ -98,16 +98,18 @@ static
//======================================================================= //=======================================================================
void NMTTools_PaveFiller::PerformEF() void NMTTools_PaveFiller::PerformEF()
{ {
myIsDone=Standard_False;
Standard_Integer n1, n2, anIndexIn=0, nE, nF, aNbEFs, aBlockLength;
Standard_Boolean bJustAdd; Standard_Boolean bJustAdd;
Standard_Real aTolE, aTolF, aDeflection=0.01; Standard_Integer n1, n2, anIndexIn, nE, nF, aNbEFs, aBlockLength;
Standard_Integer aDiscretize=35; Standard_Integer aDiscretize;
Standard_Real aTolE, aTolF, aDeflection;
BooleanOperations_IndexedDataMapOfShapeInteger aMapVI; BooleanOperations_IndexedDataMapOfShapeInteger aMapVI;
BOPTools_IDMapOfPaveBlockIMapOfInteger aMapCB; BOPTools_IDMapOfPaveBlockIMapOfInteger aMapCB;
BOPTools_IMapOfPaveBlock aIMPBx; BOPTools_IMapOfPaveBlock aIMPBx;
// //
myIsDone=Standard_False;
aDeflection=0.01;
aDiscretize=35;
//
BOPTools_CArray1OfESInterference& aEFs=myIP->ESInterferences(); BOPTools_CArray1OfESInterference& aEFs=myIP->ESInterferences();
// //
myDSIt->Initialize(TopAbs_EDGE, TopAbs_FACE); myDSIt->Initialize(TopAbs_EDGE, TopAbs_FACE);
@ -121,11 +123,12 @@ static
// //
for (; myDSIt->More(); myDSIt->Next()) { for (; myDSIt->More(); myDSIt->Next()) {
myDSIt->Current(n1, n2, bJustAdd); myDSIt->Current(n1, n2, bJustAdd);
anIndexIn = 0;
// //
//if (myIntrPool->IsComputed(n1, n2)) { if(bJustAdd) {
// continue; continue;
//} }
//
anIndexIn = 0;
// //
nE=n1; nE=n1;
nF=n2; nF=n2;
@ -133,44 +136,29 @@ static
nE=n2; nE=n2;
nF=n1; nF=n1;
} }
//SortTypes(nE, nF);
// //
// all Common Blocks for face nF // all Common Blocks for face nF
//XXX
NMTTools_ListOfCommonBlock aLCBF; NMTTools_ListOfCommonBlock aLCBF;
CommonBlocksFace(nF, aLCBF); CommonBlocksFace(nF, aLCBF);
NMTTools_CommonBlockAPI aCBAPIF(aLCBF); NMTTools_CommonBlockAPI aCBAPIF(aLCBF);
//XXX //
if(bJustAdd) {
//myIntrPool->AddInterference (nE, nF, BooleanOperations_EdgeSurface, anIndexIn);
continue;
}
// Edge // Edge
const TopoDS_Edge aE=TopoDS::Edge(myDS->GetShape(nE));//mpv const TopoDS_Edge aE=TopoDS::Edge(myDS->Shape(nE));
if (BRep_Tool::Degenerated(aE)){ if (BRep_Tool::Degenerated(aE)){
continue; continue;
} }
//
// Face // Face
const TopoDS_Face aF=TopoDS::Face(myDS->GetShape(nF));//mpv const TopoDS_Face aF=TopoDS::Face(myDS->Shape(nF));
// //
// Modified
// to avoid intersection between face and edge from that face
// Thu Sep 14 14:35:18 2006
// Contribution of Samtech www.samcef.com BEGIN
TopTools_IndexedMapOfShape aME; TopTools_IndexedMapOfShape aME;
//
TopExp::MapShapes(aF, TopAbs_EDGE, aME); TopExp::MapShapes(aF, TopAbs_EDGE, aME);
if (aME.Contains(aE)) { if (aME.Contains(aE)) {
continue; continue;
} }
// Contribution of Samtech www.samcef.com END
// //
aTolF=BRep_Tool::Tolerance(aF); aTolF=BRep_Tool::Tolerance(aF);
// Modified Thu Sep 14 14:35:18 2006
// Contribution of Samtech www.samcef.com BEGIN
aTolE=BRep_Tool::Tolerance(aE); aTolE=BRep_Tool::Tolerance(aE);
// Contribution of Samtech www.samcef.com END
const Bnd_Box& aBBF=myDS->GetBoundingBox(nF); const Bnd_Box& aBBF=myDS->GetBoundingBox(nF);
// //
@ -180,14 +168,13 @@ static
BOPTools_ListIteratorOfListOfPaveBlock anIt(aLPB); BOPTools_ListIteratorOfListOfPaveBlock anIt(aLPB);
for (; anIt.More(); anIt.Next()) { for (; anIt.More(); anIt.Next()) {
BOPTools_PaveBlock& aPB=anIt.Value(); BOPTools_PaveBlock& aPB=anIt.Value();
//XXX
if (aCBAPIF.IsCommonBlock(aPB)) { if (aCBAPIF.IsCommonBlock(aPB)) {
continue; continue;
} }
//XXX //
const IntTools_ShrunkRange& aShrunkRange=aPB.ShrunkRange(); const IntTools_ShrunkRange& aShrunkRange=aPB.ShrunkRange();
const IntTools_Range& aSR =aShrunkRange.ShrunkRange(); const IntTools_Range& aSR =aShrunkRange.ShrunkRange();
const Bnd_Box& aBBE=aShrunkRange.BndBox(); const Bnd_Box& aBBE=aShrunkRange.BndBox();
// //
if (aBBF.IsOut (aBBE)) { if (aBBF.IsOut (aBBE)) {
continue; continue;
@ -213,17 +200,21 @@ static
aEF.Perform(); aEF.Perform();
// //
if (aEF.IsDone()) { if (aEF.IsDone()) {
const IntTools_SequenceOfCommonPrts& aCPrts=aEF.CommonParts(); Standard_Boolean bCoinsideFlag;
Standard_Integer i, aNbCPrts; Standard_Integer i, aNbCPrts;
TopAbs_ShapeEnum aType;
//
const IntTools_SequenceOfCommonPrts& aCPrts=aEF.CommonParts();
//
aNbCPrts=aCPrts.Length(); aNbCPrts=aCPrts.Length();
for (i=1; i<=aNbCPrts; i++) { for (i=1; i<=aNbCPrts; ++i) {
//
anIndexIn=0; anIndexIn=0;
// //
const IntTools_CommonPrt& aCPart=aCPrts(i); const IntTools_CommonPrt& aCPart=aCPrts(i);
TopAbs_ShapeEnum aType=aCPart.Type(); aType=aCPart.Type();
//
switch (aType) { switch (aType) {
//
case TopAbs_VERTEX: { case TopAbs_VERTEX: {
Standard_Boolean bIsOnPave1, bIsOnPave2; Standard_Boolean bIsOnPave1, bIsOnPave2;
Standard_Integer nVF; Standard_Integer nVF;
@ -238,7 +229,6 @@ static
// //
//decide to add pave or not //decide to add pave or not
aTolToDecide=5.e-8; aTolToDecide=5.e-8;
//
bIsOnPave1=IsOnPave(anewSR.First(), aR, aTolToDecide); bIsOnPave1=IsOnPave(anewSR.First(), aR, aTolToDecide);
bIsOnPave2=IsOnPave(anewSR.Last() , aR, aTolToDecide); bIsOnPave2=IsOnPave(anewSR.Last() , aR, aTolToDecide);
// //
@ -253,24 +243,27 @@ static
// //
aMapVI.Add(aNewVertex, anIndexIn); aMapVI.Add(aNewVertex, anIndexIn);
aIMPBx.Add(aPB); aIMPBx.Add(aPB);
// qqf //
{ myIP->Add(nE, nF, Standard_True, NMTDS_TI_EF);
myIP->Add(nE, nF, Standard_True, NMTDS_TI_EF);
}
// qqt
// //
}// if (!nVF) }// if (!nVF)
}// if (!bIsOnPave1 && !bIsOnPave2) }// if (!bIsOnPave1 && !bIsOnPave2)
//myIntrPool->AddInterference (nE, nF, BooleanOperations_EdgeSurface, anIndexIn); //
//modified by NIZNHY-PKV Fri Apr 18 10:55:38 2008f
else {
const BOPTools_Pave& aPave=(bIsOnPave1)? aPB.Pave1() : aPB.Pave2();
nVF=aPave.Index();
const TopoDS_Vertex& aVF=TopoDS::Vertex(myDS->Shape(nVF));
BOPTools_Tools::UpdateVertex (aVF, aNewVertex);
}
//modified by NIZNHY-PKV Fri Apr 18 10:55:40 2008t
//
}// case TopAbs_VERTEX: }// case TopAbs_VERTEX:
break; break;
// //
case TopAbs_EDGE: { case TopAbs_EDGE: {
Standard_Boolean aCoinsideFlag; bCoinsideFlag=BOPTools_Tools::IsBlockInOnFace(aPB, aF, myContext);
// if (!bCoinsideFlag) {
aCoinsideFlag=BOPTools_Tools::IsBlockInOnFace(aPB, aF, myContext);
if (!aCoinsideFlag) {
//myIntrPool->AddInterference (nE, nF, BooleanOperations_EdgeSurface, anIndexIn);
break; break;
} }
// //
@ -284,12 +277,9 @@ static
aMapF.Add(nF); aMapF.Add(nF);
aMapCB.Add(aPB, aMapF); aMapCB.Add(aPB, aMapF);
} }
//
aIMPBx.Add(aPB); aIMPBx.Add(aPB);
// qqf myIP->Add(nE, nF, Standard_True, NMTDS_TI_EF);
{
myIP->Add(nE, nF, Standard_True, NMTDS_TI_EF);
}
// qqt
}// case TopAbs_EDGE: }// case TopAbs_EDGE:
break; break;
@ -343,12 +333,12 @@ static
// function:EFCommonBlocks // function:EFCommonBlocks
// purpose: // purpose:
//======================================================================= //=======================================================================
void NMTTools_PaveFiller::EFCommonBlocks(const BOPTools_IDMapOfPaveBlockIMapOfInteger& aMapCB) void NMTTools_PaveFiller::EFCommonBlocks
(const BOPTools_IDMapOfPaveBlockIMapOfInteger& aMapCB)
{ {
Standard_Integer i, aNbPB, nE, j, aNbF, nF; Standard_Integer i, aNbPB, nE, j, aNbF, nF;
// //
aNbPB=aMapCB.Extent(); aNbPB=aMapCB.Extent();
//
for (i=1; i<=aNbPB; ++i) { for (i=1; i<=aNbPB; ++i) {
const BOPTools_PaveBlock& aPB=aMapCB.FindKey(i); const BOPTools_PaveBlock& aPB=aMapCB.FindKey(i);
const TColStd_IndexedMapOfInteger& aMapF=aMapCB.FindFromIndex(i); const TColStd_IndexedMapOfInteger& aMapF=aMapCB.FindFromIndex(i);
@ -382,7 +372,8 @@ static
// function:EFNewVertices // function:EFNewVertices
// purpose: // purpose:
//======================================================================= //=======================================================================
void NMTTools_PaveFiller::EFNewVertices (const BooleanOperations_IndexedDataMapOfShapeInteger& aMapVI) void NMTTools_PaveFiller::EFNewVertices
(const BooleanOperations_IndexedDataMapOfShapeInteger& aMapVI)
{ {
Standard_Integer i, j, aNb, aNewShape, aFlag, iX, aNbVV, aNbSimple; Standard_Integer i, j, aNb, aNewShape, aFlag, iX, aNbVV, aNbSimple;
Standard_Integer aWhat, aWith, nE, nF, nV, aNbIEF, aNbEdges, iTmp; Standard_Integer aWhat, aWith, nE, nF, nV, aNbIEF, aNbEdges, iTmp;
@ -395,14 +386,13 @@ static
BooleanOperations_AncestorsSeqAndSuccessorsSeq anASSeq; BooleanOperations_AncestorsSeqAndSuccessorsSeq anASSeq;
TopTools_IndexedMapOfShape aMNVComplex, aMNVSimple; TopTools_IndexedMapOfShape aMNVComplex, aMNVSimple;
// //
BOPTools_CArray1OfESInterference& aEFs=myIP->ESInterferences();
//
aNb=aMapVI.Extent(); aNb=aMapVI.Extent();
//
if (!aNb) { // no new vertices, no new problems if (!aNb) { // no new vertices, no new problems
return; return;
} }
// //
BOPTools_CArray1OfESInterference& aEFs=myIP->ESInterferences();
//
// 0. // 0.
if (aNb==1) { if (aNb==1) {
aNewVertex=TopoDS::Vertex(aMapVI.FindKey(1)); aNewVertex=TopoDS::Vertex(aMapVI.FindKey(1));
@ -425,12 +415,9 @@ static
// //
tPF.Init(); tPF.Init();
tPF.PerformVV(); tPF.PerformVV();
//tPF.PerformNewVertices(); qq
// //
NMTDS_ShapesDataStructure& tDS=*(tPF.DS()); NMTDS_ShapesDataStructure& tDS=*(tPF.DS());
//const BOPTools_InterferencePool& tInterfPool=*(tPF.InterfPool());
NMTDS_InterfPool& tInterfPool=*(tPF.IP()); NMTDS_InterfPool& tInterfPool=*(tPF.IP());
//const BOPTools_CArray1OfVVInterference& aVVInterfs=tInterfPool.VVInterfs();
BOPTools_CArray1OfVVInterference& aVVInterfs=tInterfPool.VVInterferences(); BOPTools_CArray1OfVVInterference& aVVInterfs=tInterfPool.VVInterferences();
// //
// 3. Separate Comlex and Simple new vertices // 3. Separate Comlex and Simple new vertices
@ -486,7 +473,7 @@ static
iX=aMapVI.FindFromKey(aV1); iX=aMapVI.FindFromKey(aV1);
const BOPTools_ESInterference& aEF1=aEFs(iX); const BOPTools_ESInterference& aEF1=aEFs(iX);
aEF1.Indices(nE, nF); aEF1.Indices(nE, nF);
//SortTypes(nE, nF); //
if (myDS->GetShapeType(nF)==TopAbs_EDGE) { if (myDS->GetShapeType(nF)==TopAbs_EDGE) {
iTmp=nE; iTmp=nE;
nE=nF; nE=nF;
@ -499,7 +486,7 @@ static
iX=aMapVI.FindFromKey(aV2); iX=aMapVI.FindFromKey(aV2);
const BOPTools_ESInterference& aEF2=aEFs(iX); const BOPTools_ESInterference& aEF2=aEFs(iX);
aEF2.Indices(nE, nF); aEF2.Indices(nE, nF);
//SortTypes(nE, nF); //
if (myDS->GetShapeType(nF)==TopAbs_EDGE) { if (myDS->GetShapeType(nF)==TopAbs_EDGE) {
iTmp=nE; iTmp=nE;
nE=nF; nE=nF;
@ -507,7 +494,8 @@ static
} }
aME.Add(nE); aME.Add(nE);
aMIEF.Add(iX); aMIEF.Add(iX);
} }// for (i=1; i<=aNb; ++i) {
//
// 4. Process new vertices // 4. Process new vertices
aNb=aMNVE.Extent(); aNb=aMNVE.Extent();
for (i=1; i<=aNb; ++i) { // xx for (i=1; i<=aNb; ++i) { // xx
@ -555,8 +543,9 @@ static
// function:EFNewVertices // function:EFNewVertices
// purpose: // purpose:
//======================================================================= //=======================================================================
void NMTTools_PaveFiller::EFNewVertices (const TopoDS_Vertex& aNewVertex, void NMTTools_PaveFiller::EFNewVertices
const BooleanOperations_IndexedDataMapOfShapeInteger& aMapVI) (const TopoDS_Vertex& aNewVertex,
const BooleanOperations_IndexedDataMapOfShapeInteger& aMapVI)
{ {
Standard_Integer i, aNewShape, nE, nF; Standard_Integer i, aNewShape, nE, nF;
Standard_Real aT; Standard_Real aT;
@ -569,13 +558,13 @@ static
myDS->InsertShapeAndAncestorsSuccessors(aNewVertex, anASSeq); myDS->InsertShapeAndAncestorsSuccessors(aNewVertex, anASSeq);
aNewShape=myDS->NumberOfInsertedShapes(); aNewShape=myDS->NumberOfInsertedShapes();
myDS->SetState (aNewShape, BooleanOperations_ON); myDS->SetState (aNewShape, BooleanOperations_ON);
//
// Insert New Vertex in EFInterference // Insert New Vertex in EFInterference
i=aMapVI.FindFromKey(aNewVertex); i=aMapVI.FindFromKey(aNewVertex);
BOPTools_ESInterference& aEFInterf= aEFs(i); BOPTools_ESInterference& aEFInterf= aEFs(i);
aEFInterf.SetNewShape(aNewShape); aEFInterf.SetNewShape(aNewShape);
// Extract interference info // Extract interference info
aEFInterf.Indices(nE, nF); aEFInterf.Indices(nE, nF);
//SortTypes(nE, nF);
if (myDS->GetShapeType(nF)==TopAbs_EDGE) { if (myDS->GetShapeType(nF)==TopAbs_EDGE) {
nE=nF; nE=nF;
} }
@ -596,15 +585,17 @@ static
// function: CheckFacePaves // function: CheckFacePaves
// purpose: // purpose:
//======================================================================= //=======================================================================
Standard_Integer NMTTools_PaveFiller::CheckFacePaves (const TopoDS_Vertex& aNewVertex, Standard_Integer NMTTools_PaveFiller::CheckFacePaves
const Standard_Integer nF) (const TopoDS_Vertex& aNewVertex,
const Standard_Integer nF)
{ {
Standard_Integer nEF, nVF, iFlag, i, aNbV; Standard_Integer nEF, nVF, iFlag, i, aNbV, iRet;
BOPTools_ListIteratorOfListOfPave anIt; BOPTools_ListIteratorOfListOfPave anIt;
TColStd_IndexedMapOfInteger aMVF; TColStd_IndexedMapOfInteger aMVF;
//
BooleanOperations_OnceExplorer aExp(*myDS);
// //
iRet=0;
//
BooleanOperations_OnceExplorer aExp(*myDS);
aExp.Init(nF, TopAbs_EDGE); aExp.Init(nF, TopAbs_EDGE);
for (; aExp.More(); aExp.Next()) { for (; aExp.More(); aExp.Next()) {
nEF=aExp.Current(); nEF=aExp.Current();
@ -621,15 +612,14 @@ static
aNbV=aMVF.Extent(); aNbV=aMVF.Extent();
for (i=1; i<=aNbV; ++i) { for (i=1; i<=aNbV; ++i) {
nVF=aMVF(i); nVF=aMVF(i);
const TopoDS_Vertex aVF=TopoDS::Vertex(myDS->Shape(nVF));//mpv const TopoDS_Vertex aVF=TopoDS::Vertex(myDS->Shape(nVF));
iFlag=IntTools_Tools::ComputeVV(aNewVertex, aVF); iFlag=IntTools_Tools::ComputeVV(aNewVertex, aVF);
if (!iFlag) { if (!iFlag) {
return nVF; return nVF;
} }
} }
return 0; return iRet;
} }
// //
//======================================================================= //=======================================================================
// function: VertexParameter // function: VertexParameter
@ -640,7 +630,6 @@ void VertexParameter(const IntTools_CommonPrt& aCPart,
{ {
const IntTools_Range& aR=aCPart.Range1(); const IntTools_Range& aR=aCPart.Range1();
aT=0.5*(aR.First()+aR.Last()); aT=0.5*(aR.First()+aR.Last());
//
if((aCPart.VertexParameter1() >= aR.First()) && if((aCPart.VertexParameter1() >= aR.First()) &&
(aCPart.VertexParameter1() <= aR.Last())) { (aCPart.VertexParameter1() <= aR.Last())) {
aT = aCPart.VertexParameter1(); aT = aCPart.VertexParameter1();
@ -663,6 +652,7 @@ Standard_Boolean IsOnPave(const Standard_Real& aTR,
if (bIsOnPave) { if (bIsOnPave) {
return bIsOnPave; return bIsOnPave;
} }
//
dT1=Abs(aTR-aT1); dT1=Abs(aTR-aT1);
dT2=Abs(aTR-aT2); dT2=Abs(aTR-aT2);
bIsOnPave=(dT1<=aTolerance || dT2<=aTolerance); bIsOnPave=(dT1<=aTolerance || dT2<=aTolerance);