ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-24 16:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

PAL7441. Pb with MakePartition. Fix done by PKV.

Browse Source
This commit is contained in:
jfa 2005-01-21 09:09:45 +00:00
parent f94b3790c5
commit 1cfac3e905
2 changed files with 67 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/NMTTools/NMTTools_PaveFiller.cxx
View File

@ -8,7 +8,7 @@
#include <BOPTColStd_Failure.hxx> #include <BOPTColStd_Failure.hxx>
#include <NMTDS_ShapesDataStructure.hxx> #include <NMTDS_ShapesDataStructure.hxx>
#include <NMTTools_DEProcessor.hxx> #include <NMTTools_DEProcessor.hxx>
#include "utilities.h" //QQ #include "utilities.h"
//======================================================================= //=======================================================================
// function: NMTTools_PaveFiller::NMTTools_PaveFiller // function: NMTTools_PaveFiller::NMTTools_PaveFiller
@ -164,6 +164,7 @@
// 2.VE // 2.VE
myPavePool.Resize (myNbEdges); myPavePool.Resize (myNbEdges);
PrepareEdges(); PrepareEdges();
PerformVE(); PerformVE();
// //
// 3.VF // 3.VF
@ -206,6 +207,6 @@
// //
} }
catch (BOPTColStd_Failure& x) { catch (BOPTColStd_Failure& x) {
MESSAGE(x.Message() << flush); //QQ MESSAGE(x.Message() << flush);
} }
} }

111
src/NMTTools/NMTTools_PaveFiller_6.cxx
View File

@ -64,6 +64,9 @@
#include <NMTTools_Tools.hxx> #include <NMTTools_Tools.hxx>
#include <BRepLib.hxx> #include <BRepLib.hxx>
#include <Geom2d_TrimmedCurve.hxx> #include <Geom2d_TrimmedCurve.hxx>
//
#include <Geom_Surface.hxx>
#include <TopLoc_Location.hxx>
static static
Standard_Boolean IsPairFound(const Standard_Integer nF1, Standard_Boolean IsPairFound(const Standard_Integer nF1,
@ -524,10 +527,9 @@ static
// //
if (aCBAPI.IsCommonBlock(aPB)) { if (aCBAPI.IsCommonBlock(aPB)) {
// it can be Common Block // it can be Common Block
Standard_Boolean bHasPCOnF, bFound; Standard_Real aTolEx;
Standard_Integer nF, k, nEOrx, nF1x, nF2x; Handle(Geom2d_Curve) aC2D1, aC2D2;
Standard_Real aTolEx, aT1x, aT2x; TopoDS_Face aF1FWD, aF2FWD;
BOPTools_ListIteratorOfListOfPaveBlock aItPBx;
// //
NMTTools_CommonBlock& aCB=aCBAPI.CommonBlock(aPB); NMTTools_CommonBlock& aCB=aCBAPI.CommonBlock(aPB);
const BOPTools_ListOfPaveBlock& aLPBx=aCB.PaveBlocks(); const BOPTools_ListOfPaveBlock& aLPBx=aCB.PaveBlocks();
@ -537,49 +539,18 @@ 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);
// //
for (k=0; k<2; ++k) { //modified by NIZNHY-PKV Mon Dec 27 14:30:15 2004 f
nF=(!k) ? nF1 : nF2; //
const TopoDS_Face& aF=TopoDS::Face(myDS->Shape(nF)); aF1FWD=aF1;
// aF1FWD.Orientation(TopAbs_FORWARD);
bHasPCOnF=BOPTools_Tools2D::HasCurveOnSurface(aEx, aF); NMTTools_Tools::MakePCurve(aEx, aF1FWD, aC2D1, aTolEx);
if (bHasPCOnF) { //
continue; aF2FWD=aF2;
} aF2FWD.Orientation(TopAbs_FORWARD);
// NMTTools_Tools::MakePCurve(aEx, aF2FWD, aC2D2, aTolEx);
bFound=Standard_False; //
aItPBx.Initialize(aLPBx); // block A has been removed
for (; aItPBx.More(); aItPBx.Next()) { //modified by NIZNHY-PKV Mon Dec 27 14:33:26 2004 t
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);
}
}
} //if (aCBAPI.IsCommonBlock(aPB)) } //if (aCBAPI.IsCommonBlock(aPB))
// //
// new SE // new SE
@ -1149,3 +1120,49 @@ Standard_Boolean IsFound(const TColStd_IndexedMapOfInteger& aMapWhat,
} }
return bFlag; return bFlag;
} }
/*
// block A
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);
}
}
*/