ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-03-26 09:07:55 +05:00
Code Issues Packages Projects Releases Wiki Activity

PAL11298: Problem with MakePartition in one time (SIGSEGV) solved.

Browse Source
This commit is contained in:
jfa 2006-01-27 08:11:53 +00:00
parent fefe8068ce
commit b3bc1fb824
1 changed files with 70 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

191
src/NMTTools/NMTTools_PaveFiller_6.cxx
View File

@ -11,6 +11,7 @@
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>
#include <Geom2d_Curve.hxx> #include <Geom2d_Curve.hxx>
#include <Geom2d_TrimmedCurve.hxx>
#include <Geom_TrimmedCurve.hxx> #include <Geom_TrimmedCurve.hxx>
#include <GeomAdaptor_Curve.hxx> #include <GeomAdaptor_Curve.hxx>
@ -25,6 +26,7 @@
#include <BRep_Builder.hxx> #include <BRep_Builder.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <BRepBndLib.hxx> #include <BRepBndLib.hxx>
#include <BRepLib.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
@ -60,10 +62,7 @@
#include <NMTDS_ShapesDataStructure.hxx> #include <NMTDS_ShapesDataStructure.hxx>
#include <NMTTools_IndexedDataMapOfShapePaveBlock.hxx> #include <NMTTools_IndexedDataMapOfShapePaveBlock.hxx>
#include <NMTTools_CommonBlockAPI.hxx> #include <NMTTools_CommonBlockAPI.hxx>
#include <Geom2d_Curve.hxx>
#include <NMTTools_Tools.hxx> #include <NMTTools_Tools.hxx>
#include <BRepLib.hxx>
#include <Geom2d_TrimmedCurve.hxx>
static static
Standard_Boolean IsPairFound(const Standard_Integer nF1, Standard_Boolean IsPairFound(const Standard_Integer nF1,
@ -241,7 +240,6 @@ static
// //
BOPTools_ListOfPaveBlock aLPB, aLPBC; BOPTools_ListOfPaveBlock aLPB, aLPBC;
// //
//modified by NIZNHY-PKV Fri Mar 11 15:43:02 2005 f
{ {
Standard_Integer nFj1, nFj2, nE; Standard_Integer nFj1, nFj2, nE;
TColStd_IndexedMapOfInteger aMFence; TColStd_IndexedMapOfInteger aMFence;
@ -273,7 +271,6 @@ static
} }
} }
// //
//modified by NIZNHY-PKV Fri Apr 1 09:49:57 2005t
// //
RealSplitsInFace (aBid, nF1, nF2, aLPB); RealSplitsInFace (aBid, nF1, nF2, aLPB);
RealSplitsInFace (aBid, nF2, nF1, aLPB); RealSplitsInFace (aBid, nF2, nF1, aLPB);
@ -296,10 +293,8 @@ static
// //
BOPTools_PaveSet aPSF; BOPTools_PaveSet aPSF;
// //
//modified by NIZNHY-PKV Fri Apr 1 10:53:09 2005f
PrepareSetForFace (nF1, nF2, aLPBC, aPSF); PrepareSetForFace (nF1, nF2, aLPBC, aPSF);
//PrepareSetForFace (nF1, nF2, aPSF); //PrepareSetForFace (nF1, nF2, aPSF);
//modified by NIZNHY-PKV Thu Mar 31 16:16:47 2005t
// //
// Put Paves On Curves // Put Paves On Curves
for (j=1; j<=aNbCurves; ++j) { for (j=1; j<=aNbCurves; ++j) {
@ -339,7 +334,6 @@ static
continue;// mkk ft continue;// mkk ft
} }
// //
//modified by NIZNHY-PKV Fri Apr 1 09:56:11 2005f
// 1 // 1
const BOPTools_ListOfPaveBlock& aLPBFF=aFFi.PaveBlocks(); const BOPTools_ListOfPaveBlock& aLPBFF=aFFi.PaveBlocks();
bIsExistingPaveBlock=IsExistingPaveBlock(aPBNew, aLPBFF, aTolR3D); bIsExistingPaveBlock=IsExistingPaveBlock(aPBNew, aLPBFF, aTolR3D);
@ -352,7 +346,6 @@ static
if (bIsExistingPaveBlock) { if (bIsExistingPaveBlock) {
continue; continue;
} }
//modified by NIZNHY-PKV Fri Apr 1 09:56:14 2005t
// Checking of validity in 2D // Checking of validity in 2D
// //
bIsValidIn2D=myContext.IsValidBlockForFaces(aT1, aT2, aIC, aF1, aF2, aTol2D); bIsValidIn2D=myContext.IsValidBlockForFaces(aT1, aT2, aIC, aF1, aF2, aTol2D);
@ -554,8 +547,11 @@ static
// //
nF1=aPBSE.Face1(); nF1=aPBSE.Face1();
nF2=aPBSE.Face2(); nF2=aPBSE.Face2();
const TopoDS_Face& aF1=TopoDS::Face(myDS->Shape(nF1)); //
const TopoDS_Face& aF2=TopoDS::Face(myDS->Shape(nF2)); //modified by NIZNHY-PKV Thu Jan 26 10:17:04 2006f
//const TopoDS_Face& aF1=TopoDS::Face(myDS->Shape(nF1));
//const TopoDS_Face& aF2=TopoDS::Face(myDS->Shape(nF2));
//modified by NIZNHY-PKV Thu Jan 26 10:17:08 2006t
// //
const NMTTools_ListOfCommonBlock& aLCB=aCBP(tDS.RefEdge(i)); const NMTTools_ListOfCommonBlock& aLCB=aCBP(tDS.RefEdge(i));
NMTTools_CommonBlockAPI aCBAPI(aLCB); NMTTools_CommonBlockAPI aCBAPI(aLCB);
@ -564,6 +560,11 @@ static
for (; aIt.More(); aIt.Next()) { for (; aIt.More(); aIt.Next()) {
BOPTools_PaveBlock aPB=aIt.Value(); BOPTools_PaveBlock aPB=aIt.Value();
// //
////modified by NIZNHY-PKV Thu Jan 26 10:16:36 2006f
const TopoDS_Face& aF1=TopoDS::Face(myDS->Shape(nF1));
const TopoDS_Face& aF2=TopoDS::Face(myDS->Shape(nF2));
////modified by NIZNHY-PKV Thu Jan 26 10:16:39 2006t
//
if (aCBAPI.IsCommonBlock(aPB)) { if (aCBAPI.IsCommonBlock(aPB)) {
// it can be Common Block // it can be Common Block
Standard_Real aTolEx; Standard_Real aTolEx;
@ -578,59 +579,8 @@ static
const TopoDS_Edge& aEx=TopoDS::Edge(tDS.Shape(mE)); const TopoDS_Edge& aEx=TopoDS::Edge(tDS.Shape(mE));
aTolEx=BRep_Tool::Tolerance(aEx); aTolEx=BRep_Tool::Tolerance(aEx);
// //
// Commented out by EAP in the frame of PAL9151 // <- Block A was here
//
// Standard_Boolean bHasPCOnF, bFound;
// Standard_Integer nF, k, nEOrx, nF1x, nF2x;
// Standard_Real aTolEx, aT1x, aT2x;
// BOPTools_ListIteratorOfListOfPaveBlock aItPBx;
// //
// for (k=0; k<2; ++k) {
// nF=(!k) ? nF1 : nF2;
// const TopoDS_Face& aF=TopoDS::Face(myDS->Shape(nF));
// //
// bHasPCOnF=BOPTools_Tools2D::HasCurveOnSurface(aEx, aF);
// if (bHasPCOnF) {
// continue;
// }
// //
// bFound=Standard_False;
// aItPBx.Initialize(aLPBx);
// for (; aItPBx.More(); aItPBx.Next()) {
// BOPTools_PaveBlock& aPBx=aIt.Value();
// nEOrx=aPBx.OriginalEdge();
// const TopoDS_Shape& aEOrx=tDS.Shape(nEOrx);
// BOPTools_PaveBlock& aPBSEx=aMEPB.ChangeFromKey(aEOrx);
// aT1x=aPBSEx.Pave1().Param();
// aT2x=aPBSEx.Pave2().Param();
// const IntTools_Curve& aICx=aPBSEx.Curve();
// //
// nF1x=aPBSEx.Face1();
// nF2x=aPBSEx.Face2();
// //
// if (nF1x==nF) {
// Handle(Geom2d_Curve) aC2D1x=aICx.FirstCurve2d();
// Handle(Geom2d_TrimmedCurve)aC2D1xT =new Geom2d_TrimmedCurve(aC2D1x, aT1x, aT2x);
// aBB.UpdateEdge(aEx, aC2D1xT, aF, aTolEx);
// bFound=!bFound;
// break;
// }
// //
// if (nF2x==nF) {
// Handle(Geom2d_Curve) aC2D2x=aICx.SecondCurve2d();
// Handle(Geom2d_TrimmedCurve)aC2D2xT =new Geom2d_TrimmedCurve(aC2D2x, aT1x, aT2x);
// aBB.UpdateEdge(aEx, aC2D2xT, aF, aTolEx);
// bFound=!bFound;
// break;
// }
// }
// if (bFound){
// BRepLib::SameParameter(aEx, aTolEx, Standard_True);
// }
// }
//
// The code till the if block end is restored from V2_2_2 revision
//
aF1FWD=aF1; aF1FWD=aF1;
aF1FWD.Orientation(TopAbs_FORWARD); aF1FWD.Orientation(TopAbs_FORWARD);
NMTTools_Tools::MakePCurve(aEx, aF1FWD, aC2D1, aTolEx); NMTTools_Tools::MakePCurve(aEx, aF1FWD, aC2D1, aTolEx);
@ -737,7 +687,6 @@ static
} }
} }
} }
//modified by NIZNHY-PKV Fri Apr 1 09:36:06 2005f
//======================================================================= //=======================================================================
// function: IsExistingPaveBlock // function: IsExistingPaveBlock
// purpose: // purpose:
@ -769,7 +718,6 @@ static
} }
return bFlag; return bFlag;
} }
//modified by NIZNHY-PKV Fri Apr 1 09:36:06 2005t
//======================================================================= //=======================================================================
// function: CheckIntermediatePoint // function: CheckIntermediatePoint
// purpose: // purpose:
@ -1143,59 +1091,60 @@ Standard_Boolean IsFound(const TColStd_IndexedMapOfInteger& aMapWhat,
} }
return bFlag; return bFlag;
} }
/* //
//======================================================================= // Block A
// function: PrepareSetForFace //
// purpose: //
//======================================================================= // Commented out by EAP in the frame of PAL9151
void NMTTools_PaveFiller::PrepareSetForFace(const Standard_Integer nF1, //
const Standard_Integer nF2, // Standard_Boolean bHasPCOnF, bFound;
BOPTools_PaveSet& aPSF) // Standard_Integer nF, k, nEOrx, nF1x, nF2x;
{ // Standard_Real aTolEx, aT1x, aT2x;
Standard_Integer nV1, nV2; // BOPTools_ListIteratorOfListOfPaveBlock aItPBx;
TColStd_MapOfInteger aMap; //
BOPTools_ListOfPaveBlock aLPB1, aLPB2; // for (k=0; k<2; ++k) {
BOPTools_ListIteratorOfListOfPaveBlock anIt; // nF=(!k) ? nF1 : nF2;
// // const TopoDS_Face& aF=TopoDS::Face(myDS->Shape(nF));
RealSplitsFace(nF1, aLPB1); // //
RealSplitsFace(nF2, aLPB2); // bHasPCOnF=BOPTools_Tools2D::HasCurveOnSurface(aEx, aF);
// // if (bHasPCOnF) {
aLPB1.Append(aLPB2); // continue;
// // }
anIt.Initialize(aLPB1); // //
for (; anIt.More(); anIt.Next()) { // bFound=Standard_False;
const BOPTools_PaveBlock& aPB=anIt.Value(); // aItPBx.Initialize(aLPBx);
const BOPTools_Pave& aPave1=aPB.Pave1(); // for (; aItPBx.More(); aItPBx.Next()) {
nV1=aPave1.Index(); // BOPTools_PaveBlock& aPBx=aIt.Value();
if (!aMap.Contains(nV1)) { // nEOrx=aPBx.OriginalEdge();
aMap.Add(nV1); // const TopoDS_Shape& aEOrx=tDS.Shape(nEOrx);
aPSF.Append(aPave1); // BOPTools_PaveBlock& aPBSEx=aMEPB.ChangeFromKey(aEOrx);
} // aT1x=aPBSEx.Pave1().Param();
const BOPTools_Pave& aPave2=aPB.Pave2(); // aT2x=aPBSEx.Pave2().Param();
nV2=aPave2.Index(); // const IntTools_Curve& aICx=aPBSEx.Curve();
if (!aMap.Contains(nV2)) { // //
aMap.Add(nV2); // nF1x=aPBSEx.Face1();
aPSF.Append(aPave2); // nF2x=aPBSEx.Face2();
} // //
} // if (nF1x==nF) {
} // Handle(Geom2d_Curve) aC2D1x=aICx.FirstCurve2d();
*/ // Handle(Geom2d_TrimmedCurve)aC2D1xT =new Geom2d_TrimmedCurve(aC2D1x, aT1x, aT2x);
/* // aBB.UpdateEdge(aEx, aC2D1xT, aF, aTolEx);
//======================================================================= // bFound=!bFound;
// function: IsExistingPaveBlock // break;
// purpose: // }
//======================================================================= // //
Standard_Boolean NMTTools_PaveFiller::IsExistingPaveBlock(const BOPTools_PaveBlock& aPBNew, // if (nF2x==nF) {
const BOPTools_SSInterference& aFFi) // Handle(Geom2d_Curve) aC2D2x=aICx.SecondCurve2d();
{ // Handle(Geom2d_TrimmedCurve)aC2D2xT =new Geom2d_TrimmedCurve(aC2D2x, aT1x, aT2x);
Standard_Boolean bFlag; // aBB.UpdateEdge(aEx, aC2D2xT, aF, aTolEx);
Standard_Real aTolR3D; // bFound=!bFound;
// // break;
aTolR3D=aFFi.TolR3D(); // }
const BOPTools_ListOfPaveBlock& aLPBR=aFFi.PaveBlocks(); // }
// // if (bFound){
bFlag=IsExistingPaveBlock(aPBNew, aLPBR, aTolR3D); // BRepLib::SameParameter(aEx, aTolEx, Standard_True);
// // }
return bFlag; // }
} //
*/ // The code till the if block end is restored from V2_2_2 revision