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

Test case bugs/N4. A fix by PKV.

Browse Source
This commit is contained in:
jfa 2012-11-29 09:27:24 +00:00
parent 7e6fb2310b
commit 48f5c2df58
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/GEOMAlgo/GEOMAlgo_Builder_2.cxx
View File

@ -101,11 +101,10 @@ static
const Standard_Integer , const Standard_Integer ,
NMTTools_IndexedDataMapOfIndexedMapOfInteger& ); NMTTools_IndexedDataMapOfIndexedMapOfInteger& );
//modified by NIZNHY-PKV Thu Feb 16 12:24:52 2012f
static static
Standard_Boolean IsClosed(const TopoDS_Edge& , Standard_Boolean IsClosed(const TopoDS_Edge& ,
const TopoDS_Face& ); const TopoDS_Face&,
//modified by NIZNHY-PKV Thu Feb 16 12:24:56 2012t Standard_Boolean& );
//======================================================================= //=======================================================================
//function : FillImagesFaces //function : FillImagesFaces
@ -216,6 +215,7 @@ void GEOMAlgo_Builder::BuildSplitFaces()
const Handle(IntTools_Context)& aCtx= pPF->Context(); const Handle(IntTools_Context)& aCtx= pPF->Context();
// //
Standard_Boolean bToReverse, bIsClosed, bIsDegenerated; Standard_Boolean bToReverse, bIsClosed, bIsDegenerated;
Standard_Boolean bFlagClosed;
Standard_Integer i, aNb, aNbF, nF; Standard_Integer i, aNb, aNbF, nF;
TopTools_MapOfShape aMFence; TopTools_MapOfShape aMFence;
TColStd_IndexedMapOfInteger aMFP; TColStd_IndexedMapOfInteger aMFP;
@ -312,10 +312,7 @@ void GEOMAlgo_Builder::BuildSplitFaces()
} }
// //
bIsDegenerated=BRep_Tool::Degenerated(aE); bIsDegenerated=BRep_Tool::Degenerated(aE);
//modified by NIZNHY-PKV Wed Mar 07 07:46:09 2012f bIsClosed=IsClosed(aE, aF, bFlagClosed);
bIsClosed=IsClosed(aE, aF);
//bIsClosed=BRep_Tool::IsClosed(aE, aF);
//modified by NIZNHY-PKV Wed Mar 07 07:46:13 2012t
// //
const TopTools_ListOfShape& aLIE=myImages.Image(aE); const TopTools_ListOfShape& aLIE=myImages.Image(aE);
aIt.Initialize(aLIE); aIt.Initialize(aLIE);
@ -349,7 +346,16 @@ void GEOMAlgo_Builder::BuildSplitFaces()
aWES.AddStartElement(aSp); aWES.AddStartElement(aSp);
} }
continue; continue;
}// if (aMFence.Add(aSp)) }// if (bIsClosed){
//
//modified by NIZNHY-PKV Wed Nov 28 13:50:34 2012f
if (!bIsClosed && bFlagClosed) {
if (!BRep_Tool::IsClosed(aSp, aF)){
BOPTools_Tools3D::DoSplitSEAMOnFace(aSp, aF);
}
}
//modified by NIZNHY-PKV Wed Nov 28 13:50:36 2012t
//
// //
aSp.Orientation(anOriE); aSp.Orientation(anOriE);
bToReverse=BOPTools_Tools3D::IsSplitToReverse1(aSp, aE, aCtx); bToReverse=BOPTools_Tools3D::IsSplitToReverse1(aSp, aE, aCtx);
@ -942,11 +948,13 @@ void UpdateCandidates(const Standard_Integer theNF,
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Boolean IsClosed(const TopoDS_Edge& aE, Standard_Boolean IsClosed(const TopoDS_Edge& aE,
const TopoDS_Face& aF) const TopoDS_Face& aF,
Standard_Boolean& bFlag)
{ {
Standard_Boolean bRet; Standard_Boolean bRet;
// //
bRet=BRep_Tool::IsClosed(aE, aF); bRet=BRep_Tool::IsClosed(aE, aF);
bFlag=bRet;
if (bRet) { if (bRet) {
Standard_Integer iCnt; Standard_Integer iCnt;
TopoDS_Shape aE1; TopoDS_Shape aE1;