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

Mantis issue 0021835: EDF 2070 GEOM : Problem with detecting Self-intersections. A fix by PKV.

Browse Source
This commit is contained in:
jfa 2012-11-02 12:21:36 +00:00
parent a1f72c843f
commit ab02921601
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/NMTTools/NMTTools_CheckerSI_1.cxx
View File

@ -42,14 +42,6 @@
#include <Geom_Curve.hxx> #include <Geom_Curve.hxx>
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
static
Standard_Boolean IsValid(const TopoDS_Edge& aE,
const TopoDS_Vertex& aV,
const Standard_Real aTV1,
const Standard_Real aTV2);
//======================================================================= //=======================================================================
// function: PreparePaveBlocks // function: PreparePaveBlocks
// purpose: // purpose:
@ -65,14 +57,13 @@ static
//======================================================================= //=======================================================================
void NMTTools_CheckerSI::PreparePaveBlocks(const Standard_Integer nE) void NMTTools_CheckerSI::PreparePaveBlocks(const Standard_Integer nE)
{ {
myIsDone=Standard_False; //Standard_Boolean bIsValid;
//
// char buf[32]={"SR"};
Standard_Boolean bIsValid;
Standard_Integer nV1, nV2, iErr; Standard_Integer nV1, nV2, iErr;
Standard_Real aT1, aT2; Standard_Real aT1, aT2;
TopoDS_Edge aE; TopoDS_Edge aE;
TopoDS_Vertex aV1, aV2; TopoDS_Vertex aV1, aV2;
//
myIsDone=Standard_False;
// //
BOPTools_ListOfPaveBlock& aLPB=mySplitShapesPool(myDS->RefEdge(nE)); BOPTools_ListOfPaveBlock& aLPB=mySplitShapesPool(myDS->RefEdge(nE));
// Edge // Edge
@ -99,21 +90,23 @@ static
aV2=TopoDS::Vertex(myDS->Shape(nV2)); aV2=TopoDS::Vertex(myDS->Shape(nV2));
aT2=aPave2.Param(); aT2=aPave2.Param();
// //
//modified by NIZNHY-PKV Thu Nov 01 13:46:00 2012f
//w/a: http://salome.mantis.opencascade.com/view.php?id=21835
/*
bIsValid=Standard_True; bIsValid=Standard_True;
if (nV1==nV2) { if (nV1==nV2) {
bIsValid=IsValid(aE, aV1, aT1, aT2); bIsValid=IsValid(aE, aV1, aT1, aT2);
if (!bIsValid) { if (!bIsValid) {
//printf(" pb SR: nV nE: %d nV1:( %d %15.10lf ) nV2:( %d %15.10lf )\n", nE, nV1, aT1, nV2, aT2);
myStopStatus=1; myStopStatus=1;
} }
} }
*/
//modified by NIZNHY-PKV Thu Nov 01 13:46:09 2012t
// //
IntTools_ShrunkRange aSR (aE, aV1, aV2, aRange, myContext); IntTools_ShrunkRange aSR (aE, aV1, aV2, aRange, myContext);
iErr=aSR.ErrorStatus(); iErr=aSR.ErrorStatus();
if (!aSR.IsDone()) { if (!aSR.IsDone()) {
//printf(" pb SR: Done nE: %d nV1:( %d %15.10lf ) nV2:( %d %15.10lf )\n", nE, nV1, aT1, nV2, aT2);
aSR.SetShrunkRange(aRange); aSR.SetShrunkRange(aRange);
//throw BOPTColStd_Failure(buf) ;
} }
else if (iErr!=6) { else if (iErr!=6) {
CorrectShrunkRanges (0, aPave1, aSR); CorrectShrunkRanges (0, aPave1, aSR);
@ -124,7 +117,9 @@ static
} //for (; aPBIt.More(); aPBIt.Next()) } //for (; aPBIt.More(); aPBIt.Next())
myIsDone=Standard_True; myIsDone=Standard_True;
} }
//modified by NIZNHY-PKV Thu Nov 01 13:46:55 2012f
//w/a: http://salome.mantis.opencascade.com/view.php?id=21835
/*
//======================================================================= //=======================================================================
//function : IsValid //function : IsValid
//purpose : //purpose :
@ -157,3 +152,5 @@ Standard_Boolean IsValid(const TopoDS_Edge& aE,
} }
return bRet; return bRet;
} }
*/
//modified by NIZNHY-PKV Thu Nov 01 13:47:07 2012t