OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

0022922: Clean up warnings on uninitialized / unused variables

Browse Source
This commit is contained in:
dbv@opencascade.com
2012-03-07 17:00:48 +04:00
committed by bugmaster
parent 25289ec1e1
commit 6e6cd5d949
226 changed files with 151 additions and 1471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/TopOpeBRepTool/TopOpeBRepTool_2d.cxx
View File

@@ -282,9 +282,6 @@ static void FC2D_translate(Handle(Geom2d_Curve) C2D,
if (isperio && uviso && !EFnull) {
// C2D prend comme origine dans F l'origine de la pcurve de EF dans F
#ifdef DEB
Standard_Real period = S1->IsUPeriodic() ? S1->UPeriod() : S1->IsVPeriodic() ? S1->VPeriod() : 0.;
#endif
TopoDS_Face FFOR = F;
FFOR.Orientation(TopAbs_FORWARD);
gp_Pnt2d p1,p2; BRep_Tool::UVPoints(EF,FFOR,p1,p2);

4
src/TopOpeBRepTool/TopOpeBRepTool_BoxSort.cxx
View File

@@ -290,10 +290,6 @@ const Bnd_Box& TopOpeBRepTool_BoxSort::Box(const TopoDS_Shape& S) const
}
if ( myHBT->HasBox(S) ) {
#ifdef DEB
Standard_Integer i =
#endif
myHBT->Index(S);
const Bnd_Box& B = myHBT->Box(S);
return B;
}

42
src/TopOpeBRepTool/TopOpeBRepTool_CORRISO.cxx
View File

@@ -72,10 +72,8 @@ TopOpeBRepTool_CORRISO::TopOpeBRepTool_CORRISO()
TopOpeBRepTool_CORRISO::TopOpeBRepTool_CORRISO(const TopoDS_Face& Fref)
{
myFref = Fref;
#ifdef DEB
Standard_Boolean closed =
#endif
FUN_tool_closedS(myFref,myUclosed,myUper,myVclosed,myVper);
FUN_tool_closedS(myFref,myUclosed,myUper,myVclosed,myVper);
const Handle(Geom_Surface)& SU = BRep_Tool::Surface(myFref);
myGAS = GeomAdaptor_Surface(SU);
@@ -153,10 +151,6 @@ Standard_Boolean TopOpeBRepTool_CORRISO::Init(const TopoDS_Shape& S)
// Standard_Real f,l,tol; Handle(Geom2d_Curve) PC = FC2D_CurveOnSurface(E,myFref,f,l,tol);
Handle(Geom2d_Curve) PC; Standard_Real f,l,tol;
Standard_Boolean hasold = FC2D_HasOldCurveOnSurface(E,myFref,PC);
#ifdef DEB
Standard_Boolean hasnew =
#endif
FC2D_HasNewCurveOnSurface(E,myFref,PC);
PC = FC2D_EditableCurveOnSurface(E,myFref,f,l,tol);
if (!hasold) FC2D_AddNewCurveOnSurface(PC,E,myFref,f,l,tol);
if (PC.IsNull()) return Standard_False;
@@ -380,10 +374,8 @@ Standard_Boolean TopOpeBRepTool_CORRISO::PurgeFyClosingE(const TopTools_ListOfSh
if (fyceds.Extent() == 1) {// ivf == 3 : cto016G*
TopTools_DataMapOfOrientedShapeInteger fyeds;
#ifdef DEB
Standard_Boolean found =
#endif
EdgesWithFaultyUV(myEds,3,fyeds);
EdgesWithFaultyUV(myEds,3,fyeds);
Standard_Integer nfy = fyeds.Extent();
TopTools_DataMapIteratorOfDataMapOfOrientedShapeInteger itm(fyceds);
@@ -547,10 +539,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::PurgeFyClosingE(const TopTools_ListOfSh
// <vce> (boundary of <cE>):
const TopoDS_Vertex& vce = TopoDS::Vertex(vcE(ivce));
TopTools_ListOfShape loe; isb = Connexity(vce,loe);
#ifdef DEB
Standard_Integer nloe =
#endif
loe.Extent(); // DEB
if (!isb) return Standard_False; // NYIRAISE
Standard_Real parvce = TopOpeBRepTool_TOOL::ParE(ivce,cE); gp_Pnt2d UVvce = TopOpeBRepTool_TOOL::UVF(parvce,cE2d);
@@ -684,9 +673,6 @@ Standard_Integer TopOpeBRepTool_CORRISO::EdgeOUTofBoundsUV(const TopoDS_Edge& E,
Standard_Real xlast = onU ? myGAS.LastUParameter() : myGAS.LastVParameter(); // xlast=xfirst+xperiod
Standard_Real xperiod = onU ? myUper : myVper;
#ifdef DEB
Standard_Boolean inbounds=Standard_False;
#endif
Standard_Boolean isou,isov; gp_Pnt2d o2d; gp_Dir2d d2d;
Standard_Boolean iso = TopOpeBRepTool_TOOL::UVISO(PC,isou,isov,d2d,o2d);
@@ -834,10 +820,7 @@ Standard_Boolean TopOpeBRepTool_CORRISO::EdgeWithFaultyUV(const TopoDS_Edge& E,
// <vEok> :
Standard_Boolean vEok = Standard_False;
const TopTools_ListOfShape& loe = myVEds.Find(vE);
#ifdef DEB
Standard_Integer nloe =
#endif
loe.Extent(); //DEB
for (TopTools_ListIteratorOfListOfShape ite(loe); ite.More(); ite.Next()) {
const TopoDS_Edge& e = TopoDS::Edge(ite.Value());
TopAbs_Orientation oe = e.Orientation();
@@ -852,9 +835,6 @@ Standard_Boolean TopOpeBRepTool_CORRISO::EdgeWithFaultyUV(const TopoDS_Edge& E,
Standard_Real tttole =
#endif
BRep_Tool::Tolerance(e);
#ifdef DEB
Standard_Real tttuve = Max(Tol(1,tttole),Tol(2,tttole));
#endif
Standard_Boolean isb = myERep2d.IsBound(e);
if (!isb) {FUN_RaiseError(); return Standard_False;}
@@ -979,16 +959,10 @@ Standard_Boolean TopOpeBRepTool_CORRISO::TrslUV(const Standard_Boolean onU, cons
{
gp_Vec2d tt2d;
if (onU) {Standard_Real uper;
#ifdef DEB
Standard_Boolean ok =
#endif
Refclosed(1,uper);
if (!uper) return Standard_False;
tt2d = gp_Vec2d(uper,0.);}
else {Standard_Real vper;
#ifdef DEB
Standard_Boolean ok =
#endif
Refclosed(2,vper);
if (!vper) return Standard_False;
tt2d = gp_Vec2d(0.,vper);}
@@ -1079,10 +1053,6 @@ Standard_Boolean TopOpeBRepTool_CORRISO::AddNewConnexity(const TopoDS_Vertex& ,
if (!isb) {
Handle(Geom2d_Curve) PC; Standard_Real f,l,tol;
Standard_Boolean hasold = FC2D_HasOldCurveOnSurface(E,myFref,PC);
#ifdef DEB
Standard_Boolean hasnew =
#endif
FC2D_HasNewCurveOnSurface(E,myFref,PC);
PC = FC2D_EditableCurveOnSurface(E,myFref,f,l,tol);
if (!hasold) FC2D_AddNewCurveOnSurface(PC,E,myFref,f,l,tol);
if (PC.IsNull()) return Standard_False;

12
src/TopOpeBRepTool/TopOpeBRepTool_GEOMETRY.cxx
View File

@@ -79,10 +79,6 @@ Standard_EXPORT Standard_Boolean FUN_tool_onapex(const gp_Pnt2d& p2d,const Handl
}
if (ST == GeomAbs_Sphere) {
Standard_Real pisur2 = M_PI*.5;
#ifdef DEB
Standard_Real u =
#endif
p2d.X();
Standard_Real v = p2d.Y();
Standard_Boolean vpisur2 = (Abs(v-pisur2) < toluv);
Standard_Boolean vmoinspisur2 = (Abs(v+pisur2) < toluv);
@@ -118,10 +114,6 @@ Standard_EXPORT gp_Dir FUN_tool_ngS(const gp_Pnt2d& p2d,const Handle(Geom_Surfac
}
else if (du < tol) {
Standard_Real vf = GS.FirstVParameter();
#ifdef DEB
Standard_Real vl =
#endif
GS.LastVParameter();
Standard_Boolean onvf = Abs(p2d.Y()-vf)<toluv;
Standard_Real x = p2d.X(); Standard_Real y = p2d.Y();
@@ -217,9 +209,7 @@ Standard_EXPORT Standard_Boolean FUN_tool_line(const Handle(Geom2d_Curve)& pc)
if (pcb.IsNull()) return Standard_False;
Geom2dAdaptor_Curve GC2d(pcb);
GeomAbs_CurveType typ = GC2d.GetType();
#ifdef DEB
Standard_Boolean isquad = Standard_False;
#endif
if (typ == GeomAbs_Line) return Standard_True;
return Standard_False ;

4
src/TopOpeBRepTool/TopOpeBRepTool_HBoxTool.cxx
View File

@@ -126,10 +126,6 @@ const Bnd_Box& TopOpeBRepTool_HBoxTool::Box(const TopoDS_Shape& S)
Standard_ProgramError::Raise("HBT::Box1");
}
#ifdef DEB
Standard_Integer im =
#endif
Index(S);
const Bnd_Box& B = myIMS.FindFromKey(S);
return B;
}

8
src/TopOpeBRepTool/TopOpeBRepTool_PURGE.cxx
View File

@@ -138,10 +138,6 @@ Standard_EXPORT Standard_Boolean FUN_tool_ClosedW(const TopoDS_Wire& W)
TopTools_DataMapIteratorOfDataMapOfShapeListOfShape itvFine(mapvFine);
for (; itvFine.More(); itvFine.Next()){
const TopoDS_Shape& vFine = itvFine.Key();
#ifdef DEB
const TopTools_ListOfShape& edsvFine =
#endif
itvFine.Value();
Standard_Boolean vIine = mapvIine.IsBound(vFine);
if (vIine) {mapvok.Add(vFine); continue;}
Standard_Boolean vRine = mapvRine.IsBound(vFine);
@@ -153,10 +149,6 @@ Standard_EXPORT Standard_Boolean FUN_tool_ClosedW(const TopoDS_Wire& W)
TopTools_DataMapIteratorOfDataMapOfShapeListOfShape itvRine(mapvRine);
for (; itvRine.More(); itvRine.Next()){
const TopoDS_Shape& vRine = itvRine.Key();
#ifdef DEB
const TopTools_ListOfShape& edsvRine =
#endif
itvRine.Value();
Standard_Boolean vok = mapvok.Contains(vRine);
if (vok) continue;
Standard_Boolean vIine = mapvIine.IsBound(vRine);

14
src/TopOpeBRepTool/TopOpeBRepTool_REGUS.cxx
View File

@@ -340,10 +340,7 @@ Standard_Boolean TopOpeBRepTool_REGUS::SplitFaces()
// splitting face :
const TopoDS_Face& f = TopoDS::Face(exf.Current());
TopTools_ListOfShape lfsp; Standard_Boolean issp = TopOpeBRepTool_REGUS::SplitF(f,lfsp);
#ifdef DEB
Standard_Integer nf =
#endif
lfsp.Extent();
if (!issp) continue;
myFsplits.Bind(f,lfsp);
@@ -599,10 +596,7 @@ Standard_Boolean TopOpeBRepTool_REGUS::NextinBlock()
// lofc : the list of faces connexed to e in <myS>
// lof : the list of untouched faces connexed to e in <myS>
const TopTools_ListOfShape& lofc = mymapeFsstatic.Find(e);
#ifdef DEB
Standard_Integer nfc =
#endif
lofc.Extent();
itff.Initialize(lofc);
TopoDS_Face fref;
for (; itff.More(); itff.Next()) {
@@ -689,10 +683,6 @@ Standard_Boolean TopOpeBRepTool_REGUS::NearestF(const TopoDS_Edge& e, const TopT
#endif
ffound.Nullify();
TopoDS_Face fref = TopoDS::Face(myf);
#ifdef DEB
Standard_Integer nf =
#endif
lof.Extent();//deb
// Give us egde <e>, and a reference face <fref> (= <myf>)
// - parameter on <e> = <pare>.

26
src/TopOpeBRepTool/TopOpeBRepTool_REGUW.cxx
View File

@@ -298,10 +298,6 @@ Standard_Boolean TopOpeBRepTool_REGUW::MapS()
TopExp_Explorer exe(CS, TopAbs_EDGE);
for (; exe.More(); exe.Next()){
const TopoDS_Edge& ed = TopoDS::Edge(exe.Current());
#ifdef DEB
TopAbs_Orientation oed =
#endif
ed.Orientation();
Standard_Boolean isdgE = BRep_Tool::Degenerated(ed);
Standard_Boolean iscE = TopOpeBRepTool_TOOL::IsClosingE(ed,myCORRISO.S(),Fref());
@@ -482,9 +478,9 @@ Standard_Boolean TopOpeBRepTool_REGUW::InitBlock()
for (; exv.More(); exv.Next()){
const TopoDS_Shape& vcur = exv.Current();
TopOpeBRepTool_connexity& cco = mymapvEds.ChangeFromKey(vcur);
#ifdef DEB
Standard_Boolean ok =
#endif
//#ifdef DEB
// Standard_Boolean ok =
//#endif
cco.RemoveItem(myed);
// if (!ok) return Standard_False; see for closing vertices
}
@@ -525,9 +521,6 @@ Standard_Boolean TopOpeBRepTool_REGUW::NearestE(const TopTools_ListOfShape& loe,
Standard_Real fac = 0.45678;
Standard_Real tola = Precision::Angular();
Standard_Integer iv0e1 = (iStep == 1) ? REVERSED : FORWARD;
#ifdef DEB
Standard_Integer iv1e1 = (iStep == 1) ? FORWARD : REVERSED;
#endif
// initializing
TopTools_ListIteratorOfListOfShape ite(loe);
@@ -570,9 +563,6 @@ Standard_Boolean TopOpeBRepTool_REGUW::NearestE(const TopTools_ListOfShape& loe,
if (trc) cout<<"ang(e"<<FUN_adds(myed)<<",e"<<FUN_adds(ei)<<")="<<angi<<endl;
#endif
if (eq) {
#ifdef DEB
Standard_Boolean dummy=Standard_True;//DEB
#endif
FUN_Raise();
return Standard_False;
}
@@ -645,16 +635,12 @@ Standard_Boolean TopOpeBRepTool_REGUW::NextinBlock()
myed = efound;
}
#ifdef DEB
TopOpeBRepTool_connexity& newco =
#endif
mymapvEds.ChangeFromKey(myv);
TopExp_Explorer exv(myed, TopAbs_VERTEX);
for (; exv.More(); exv.Next()){
TopOpeBRepTool_connexity& cco = mymapvEds.ChangeFromKey(exv.Current());
#ifdef DEB
Standard_Boolean ok =
#endif
//#ifdef DEB
// Standard_Boolean ok =
//#endif
cco.RemoveItem(myed);
// if (!ok) {FUN_Raise(); return Standard_False;} closed edges
}

13
src/TopOpeBRepTool/TopOpeBRepTool_RegularizeW.cxx
View File

@@ -626,10 +626,6 @@ Standard_EXPORT Standard_Boolean FUN_tool_ClassifW(const TopoDS_Face& F,
// noldW = 1
// ---------
if (noldW == 1) {
#ifdef DEB
const TopoDS_Shape& owi =
#endif
itm.Key(); // DEB
const TopTools_ListOfShape& low = itm.Value();
Standard_Boolean ok = CLASSI.Classilist(low,mapWlow);
if (!ok) return Standard_False;
@@ -662,10 +658,7 @@ Standard_EXPORT Standard_Boolean FUN_tool_ClassifW(const TopoDS_Face& F,
if (!isb1) continue;
const TopTools_ListOfShape& lw1 = mapOwNw.Find(Ow1);
#ifdef DEB
Standard_Integer nw1 =
#endif
lw1.Extent();
if (nOw == 1) {
// all wires of <mapWs> have been treated, except the last one
// if (nw1 == 0) mapWlow binds already (Ow1,null);
@@ -706,10 +699,6 @@ Standard_EXPORT Standard_Boolean FUN_tool_ClassifW(const TopoDS_Face& F,
cout<<endl;}
#endif
const TopTools_ListOfShape& lw2 = mapOwNw.Find(Ow2);
#ifdef DEB
Standard_Integer nw2 =
#endif
lw2.Extent();
TopTools_ListOfShape lw1r; FUN_addOwlw(Ow1,lw1,lw1r);
TopTools_ListOfShape lw2r; FUN_addOwlw(Ow2,lw2,lw2r);

4
src/TopOpeBRepTool/TopOpeBRepTool_ShapeClassifier.cxx
View File

@@ -556,10 +556,6 @@ void TopOpeBRepTool_ShapeClassifier::StateP2DReference
myP2Ddef = Standard_True;
TopoDS_Face F = TopoDS::Face(myRef);
F.Orientation(TopAbs_FORWARD);
#ifdef DEB
Standard_Real tol2d =
#endif
Precision::PConfusion();
Standard_Real TolClass = 1e-8;
BRepTopAdaptor_FClass2d FClass2d(F,TolClass);
myState = FClass2d.Perform(P2D);

12
src/TopOpeBRepTool/TopOpeBRepTool_ShapeTool.cxx
View File

@@ -192,18 +192,18 @@ void TopOpeBRepTool_ShapeTool::AdjustOnPeriodic(const TopoDS_Shape& F,
if (isUperio) {
Standard_Real Uperiod = Surf->UPeriod();
#ifdef DEB
Standard_Real ubid = UFfirst;
#endif
// Standard_Real ubid = UFfirst;
// ElCLib::AdjustPeriodic(UFfirst,UFfirst + Uperiod,tol,ubid,u);
if (Abs(u - UFfirst-Uperiod) > tol)
u = ElCLib::InPeriod(u,UFfirst,UFfirst + Uperiod);
}
if (isVperio) {
Standard_Real Vperiod = Surf->VPeriod();
#ifdef DEB
Standard_Real vbid = VFfirst;
#endif
// Standard_Real vbid = VFfirst;
// ElCLib::AdjustPeriodic(VFfirst,VFfirst + Vperiod,tol,vbid,v);
if (Abs(v - VFfirst-Vperiod) > tol)
v = ElCLib::InPeriod(v,VFfirst,VFfirst + Vperiod);

32
src/TopOpeBRepTool/TopOpeBRepTool_TOOL.cxx
View File

@@ -494,13 +494,13 @@ Standard_Boolean TopOpeBRepTool_TOOL::TgINSIDE(const TopoDS_Vertex& v, const Top
Standard_Boolean TopOpeBRepTool_TOOL::TggeomE(const Standard_Real par, const BRepAdaptor_Curve& BC,
gp_Vec& Tg)
{
#ifdef DEB
GeomAbs_CurveType ct =
#endif
BC.GetType();
#ifdef DEB
Standard_Boolean apoles = (ct == GeomAbs_BezierCurve)||(ct == GeomAbs_BSplineCurve);
#endif
//#ifdef DEB
// GeomAbs_CurveType ct =
//#endif
// BC.GetType();
//#ifdef DEB
// Standard_Boolean apoles = (ct == GeomAbs_BezierCurve)||(ct == GeomAbs_BSplineCurve);
//#endif
Standard_Real f = BC.FirstParameter(), l = BC.LastParameter();
Standard_Real tolE = BC.Tolerance(); Standard_Real tolp = BC.Resolution(tolE);
@@ -948,10 +948,6 @@ Standard_Boolean TopOpeBRepTool_TOOL::UVISO(const TopoDS_Edge& E, const TopoDS_F
// Standard_Real f,l,tol; Handle(Geom2d_Curve) PC = FC2D_CurveOnSurface(E,F,f,l,tol);
Handle(Geom2d_Curve) PC; Standard_Real f,l,tol;
Standard_Boolean hasold = FC2D_HasOldCurveOnSurface(E,F,PC);
#ifdef DEB
Standard_Boolean hasnew =
#endif
FC2D_HasNewCurveOnSurface(E,F,PC);
PC = FC2D_EditableCurveOnSurface(E,F,f,l,tol);
if (!hasold) FC2D_AddNewCurveOnSurface(PC,E,F,f,l,tol);
@@ -1117,17 +1113,10 @@ Standard_Boolean TopOpeBRepTool_TOOL::Getduv(const TopoDS_Face& f,const gp_Pnt2d
Bnd_Box bndf; BRepBndLib::AddClose(f,bndf);
Standard_Real f1,f2,f3,l1,l2,l3; bndf.Get(f1,f2,f3,l1,l2,l3);
gp_Vec d123(f1-l1, f2-l2, f3-l3);
#ifdef DEB
Standard_Real dmax =
#endif
d123.Dot(dir);
gp_Pnt p; FUN_tool_value(uv,f,p); p.Translate(dir.Multiplied(factor));
Standard_Real d; gp_Pnt2d uvtr;
#ifdef DEB
Standard_Boolean ok =
#endif
FUN_tool_projPonF(p,f, uvtr,d);
FUN_tool_projPonF(p,f, uvtr,d);
Standard_Real tolf = BRep_Tool::Tolerance(f); tolf *= 1.e2; //NYIXPUTOL
if (d > tolf) return Standard_False;
@@ -1340,9 +1329,8 @@ Standard_Boolean TopOpeBRepTool_TOOL::MatterKPtg(const TopoDS_Face& f1,const Top
Standard_Real x = 0.45678; Standard_Real pare = (1-x)*f+x*l;
Standard_Real eps = 0.123; //NYIXPU190199
#ifdef DEB
Standard_Real tola = Precision::Angular()*1.e3;
#endif
//Standard_Real tola = Precision::Angular()*1.e3;
gp_Pnt2d uv1; FUN_tool_paronEF(e,pare,f1,uv1);
gp_Dir nt1; Standard_Boolean ok1 = TopOpeBRepTool_TOOL::Nt(uv1,f1,nt1);

44
src/TopOpeBRepTool/TopOpeBRepTool_TOPOLOGY.cxx
View File

@@ -129,10 +129,10 @@ Standard_EXPORT Standard_Boolean FUN_tool_isobounds(const TopoDS_Shape& Sh,
if (S.IsNull()) return Standard_False;
Standard_Boolean uclosed,vclosed; Standard_Real uperiod,vperiod;
#ifdef DEB
Standard_Boolean uvclosed =
#endif
FUN_tool_closedS(F,uclosed,uperiod,vclosed,vperiod);
// Standard_Boolean uvclosed =
FUN_tool_closedS(F,uclosed,uperiod,vclosed,vperiod);
// Standard_Real uf,ul,vf,vl; S->Bounds(uf,ul,vf,vl);
@@ -174,10 +174,7 @@ Standard_EXPORT Standard_Boolean FUN_tool_outbounds(const TopoDS_Shape& Sh,
const TopoDS_Face& F = TopoDS::Face(Sh);
Standard_Boolean uclosed,vclosed; Standard_Real uperiod,vperiod;
#ifdef DEB
Standard_Boolean uvclosed =
#endif
FUN_tool_closedS(F,uclosed,uperiod,vclosed,vperiod);
FUN_tool_closedS(F,uclosed,uperiod,vclosed,vperiod);
Standard_Real tolp = 1.e-6;
if (uclosed) {
@@ -302,9 +299,6 @@ Standard_EXPORT Standard_Boolean FUN_tool_orientEinF(const TopoDS_Edge& E,const
TopExp_Explorer e(F,TopAbs_EDGE);
for (;e.More();e.Next()) {
const TopoDS_Shape& EF = e.Current();
#ifdef DEB
Standard_Boolean b = EF.IsSame(E);
#endif
if (EF.IsSame(E)) {
oriEinF=EF.Orientation();
break;
@@ -882,12 +876,10 @@ Standard_EXPORT Standard_Real FUN_tool_maxtol(const TopoDS_Shape& S)
Standard_Boolean hasedge = FUN_tool_maxtol(ff,TopAbs_EDGE,maxtol);
if (hasedge) {
TopExp_Explorer exe(S,TopAbs_FACE);
for (; exe.More(); exe.Next()){
for (; exe.More(); exe.Next())
{
const TopoDS_Shape& ee = exe.Current();
#ifdef DEB
Standard_Boolean hasvertex =
#endif
FUN_tool_maxtol(ee,TopAbs_VERTEX,maxtol);
FUN_tool_maxtol(ee,TopAbs_VERTEX,maxtol);
}
}
}
@@ -896,19 +888,14 @@ Standard_EXPORT Standard_Real FUN_tool_maxtol(const TopoDS_Shape& S)
Standard_Boolean hasedge = FUN_tool_maxtol(S,TopAbs_EDGE,maxtol);
if (hasedge) {
TopExp_Explorer exe(S,TopAbs_FACE);
for (; exe.More(); exe.Next()){
const TopoDS_Shape& ee = exe.Current();
#ifdef DEB
Standard_Boolean hasvertex =
#endif
FUN_tool_maxtol(ee,TopAbs_VERTEX,maxtol);
for (; exe.More(); exe.Next())
{
const TopoDS_Shape& ee = exe.Current();
FUN_tool_maxtol(ee,TopAbs_VERTEX,maxtol);
}
}
if (!hasedge) {
#ifdef DEB
Standard_Boolean hasvertex =
#endif
FUN_tool_maxtol(S,TopAbs_VERTEX,maxtol);
FUN_tool_maxtol(S,TopAbs_VERTEX,maxtol);
}
}
return maxtol;
@@ -1232,10 +1219,7 @@ Standard_EXPORT Standard_Boolean FUN_tool_getEclo(const TopoDS_Face& F, const St
if (clo) {
Standard_Boolean isou,isov; gp_Pnt2d o2d; gp_Dir2d d2d;
Standard_Real f,l,tol; Handle(Geom2d_Curve) PC = FC2D_CurveOnSurface(E,F,f,l,tol);
#ifdef DEB
Standard_Boolean isouv =
#endif
TopOpeBRepTool_TOOL::UVISO(PC,isou,isov,d2d,o2d);
TopOpeBRepTool_TOOL::UVISO(PC,isou,isov,d2d,o2d);
if (UISO && isou) {
Eclo=E;
return Standard_True;

37
src/TopOpeBRepTool/TopOpeBRepTool_closing.cxx
View File

@@ -76,28 +76,15 @@ Standard_EXPORT Standard_Boolean FUN_tool_correctCLO(TopoDS_Edge& E, const TopoD
// Standard_Real f,l,tolpc; Standard_Boolean trim3d = Standard_True;
// Handle(Geom2d_Curve) PC = FC2D_CurveOnSurface(E,F,f,l,tolpc,trim3d);
Standard_Real f,l,tol; Handle(Geom2d_Curve) PC;
#ifdef DEB
Standard_Boolean hasold =
#endif
FC2D_HasOldCurveOnSurface(E,FFOR,PC);
#ifdef DEB
Standard_Boolean hasnew =
#endif
FC2D_HasNewCurveOnSurface(E,FFOR,PC);
PC = FC2D_EditableCurveOnSurface(E,FFOR,f,l,tol);
Standard_Boolean isoU,isoV; gp_Pnt2d o2d; gp_Dir2d d2d;
#ifdef DEB
Standard_Boolean ISO =
#endif
TopOpeBRepTool_TOOL::UVISO(PC,isoU,isoV,d2d,o2d);
TopOpeBRepTool_TOOL::UVISO(PC,isoU,isoV,d2d,o2d);
Standard_Boolean xiso = (inU && isoU)||((!inU) && isoV);
if (!xiso) return Standard_False;
Standard_Real par = dx*f + (1-dx)*l; gp_Vec2d dxx;
#ifdef DEB
Standard_Boolean ok =
#endif
FUN_tool_getdxx(FFOR,E,par,dxx);
FUN_tool_getdxx(FFOR,E,par,dxx);
TopExp_Explorer ex(FFOR, TopAbs_EDGE);
for (; ex.More(); ex.Next()){
@@ -107,28 +94,14 @@ Standard_EXPORT Standard_Boolean FUN_tool_correctCLO(TopoDS_Edge& E, const TopoD
// Standard_Real f1,l1; Handle(Geom2d_Curve) PC1 = BRep_Tool::CurveOnSurface(e1,F,f1,l1);
Standard_Real f1,l1,tol1; Handle(Geom2d_Curve) PC1;
#ifdef DEB
Standard_Boolean hasold1 =
#endif
FC2D_HasOldCurveOnSurface(e1,FFOR,PC1);
#ifdef DEB
Standard_Boolean hasnew1 =
#endif
FC2D_HasNewCurveOnSurface(e1,FFOR,PC1);
PC1 = FC2D_EditableCurveOnSurface(e1,FFOR,f1,l1,tol1);
Standard_Boolean isoU1,isoV1; gp_Pnt2d o2d1; gp_Dir2d d2d1;
#ifdef DEB
Standard_Boolean ISO1 =
#endif
TopOpeBRepTool_TOOL::UVISO(PC1,isoU1,isoV1,d2d1,o2d1);
TopOpeBRepTool_TOOL::UVISO(PC1,isoU1,isoV1,d2d1,o2d1);
// 2d(e1,FFOR) and 2d(E,FFOR) describe the same side of matter
Standard_Real par1 = dx*f1 + (1-dx)*l1; gp_Vec2d dxx1;
#ifdef DEB
Standard_Boolean ok1 =
#endif
FUN_tool_getdxx(FFOR,e1,par1,dxx1);
FUN_tool_getdxx(FFOR,e1,par1,dxx1);
Standard_Real dot = dxx.Dot(dxx1);
if (dot < 0.) continue;

8
src/TopOpeBRepTool/TopOpeBRepTool_connexity.cxx
View File

@@ -198,10 +198,6 @@ Standard_Integer TopOpeBRepTool_connexity::IsInternal(TopTools_ListOfShape& Item
// all subshapes of INTERNAL(EXTERNAL) are oriented INTERNAL(EXTERNAL)
TopTools_ListOfShape lINT; lINT.Assign(theItems.Value(INTERNAL));
#ifdef DEB
Standard_Integer n1 =
#endif
lINT.Extent();
TopTools_ListIteratorOfListOfShape it1(lINT);
while (it1.More()) {
const TopoDS_Shape& item1 = it1.Value();
@@ -213,10 +209,6 @@ Standard_Integer TopOpeBRepTool_connexity::IsInternal(TopTools_ListOfShape& Item
}
TopTools_ListOfShape lEXT; lEXT.Assign(theItems.Value(EXTERNAL));
#ifdef DEB
Standard_Integer n2 =
#endif
lEXT.Extent();
TopTools_ListIteratorOfListOfShape it2(lEXT);
while (it2.More()) {
const TopoDS_Shape& item2 = it2.Value();

5
src/TopOpeBRepTool/TopOpeBRepTool_mkTondgE.cxx
View File

@@ -149,10 +149,7 @@ Standard_Integer TopOpeBRepTool_mkTondgE::GetAllRest(TopTools_ListOfShape& lEi)
if (!ok) continue;
Standard_Real parei;
#ifdef DEB
Standard_Boolean oki =
#endif
TopOpeBRepTool_TOOL::ParISO(myuvi,ei,myFi, parei);
TopOpeBRepTool_TOOL::ParISO(myuvi,ei,myFi, parei);
myEpari.Bind(ei,parei);
lEi.Append(ei);
}