1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-03 14:10:33 +03:00

0022922: Clean up warnings on uninitialized / unused variables

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

View File

@@ -159,10 +159,6 @@ void BREP_correctgbound(const Handle(TopOpeBRepDS_HDataStructure)& HDS)
if ( GK != TopOpeBRepDS_VERTEX ) continue;
const TopoDS_Shape& v = BDS.Shape(GI);
#ifdef DEB
Standard_Boolean isb =
#endif
SSI->GBound();
Standard_Boolean vofe = imev.Contains(v);
SSI->SetGBound(vofe);
} // it.More()
@@ -274,10 +270,7 @@ static
const TopoDS_Edge& e2 = TopoDS::Edge(BDS.Shape(S1));
if (!map2.Contains(e2)) continue;
#ifdef DEB
Standard_Integer G1 =
#endif
I1->Geometry(); TopOpeBRepDS_Kind GT1 = I1->GeometryType();
TopOpeBRepDS_Kind GT1 = I1->GeometryType();
if (GT1 == TopOpeBRepDS_POINT) {
Handle(TopOpeBRepDS_CurvePointInterference) CPI1 = Handle(TopOpeBRepDS_CurvePointInterference)::DownCast(I1);
Standard_Real par1 = CPI1->Parameter();
@@ -450,14 +443,6 @@ void TopOpeBRep_DSFiller::InsertIntersection(const TopoDS_Shape& aS1,
const TopoDS_Shape& gs2 = myShapeIntersector.CurrentGeomShape(2);
TopAbs_ShapeEnum t1 = gs1.ShapeType();
TopAbs_ShapeEnum t2 = gs2.ShapeType();
#ifdef DEB
TopAbs_Orientation o1 =
#endif
gs1.Orientation();
#ifdef DEB
TopAbs_Orientation o2 =
#endif
gs2.Orientation();
// si le couple courant apres un couple facefacesamedomain n'est
// pas un couple edgeedge ==> facefacesamedomain est deconnecte
@@ -689,10 +674,6 @@ void TopOpeBRep_DSFiller::RemoveUnsharedGeometry(const Handle(TopOpeBRepDS_HData
TopTools_ListIteratorOfListOfShape itsd(lSsd);
for (; itsd.More(); itsd.Next()){
TopoDS_Shape Ssd = itsd.Value(); //xpuxpu
#ifdef DEB
Standard_Integer iSsd =
#endif
BDS.Shape(Ssd);
Standard_Integer rkSsd = BDS.AncestorRank(Ssd);
if (rkSsd == 1) continue;
@@ -768,14 +749,6 @@ void TopOpeBRep_DSFiller::InsertIntersection2d
const TopoDS_Shape& gs2 = myShapeIntersector2d.CurrentGeomShape(2);
TopAbs_ShapeEnum t1 = gs1.ShapeType();
TopAbs_ShapeEnum t2 = gs2.ShapeType();
#ifdef DEB
TopAbs_Orientation o1 =
#endif
gs1.Orientation();
#ifdef DEB
TopAbs_Orientation o2 =
#endif
gs2.Orientation();
// si le couple courant apres un couple facefacesamedomain n'est
// pas un couple edgeedge ==> facefacesamedomain est deconnecte
@@ -814,10 +787,6 @@ void TopOpeBRep_DSFiller::InsertIntersection2d
else if ((t1 == TopAbs_EDGE) && (t2 == TopAbs_EDGE)) {
TopOpeBRep_EdgesIntersector& EE = myShapeIntersector2d.ChangeEdgesIntersector();
EE.Dimension(2);
#ifdef DEB
Standard_Boolean EEsamedomain =
#endif
EE.SameDomain();
myEdgesFiller.Face(1,lFF1);
myEdgesFiller.Face(2,lFF2);
myEdgesFiller.Insert(gs1,gs2,EE,HDS);

View File

@@ -83,25 +83,12 @@ void TopOpeBRep_EdgesFiller::Insert(const TopoDS_Shape& E1,const TopoDS_Shape& E
Standard_Boolean reducesegment = (hs && !esd);
#endif
#ifdef DEB
TopAbs_Orientation E1ori =
#endif
E1.Orientation();
#ifdef DEB
TopAbs_Orientation E2ori =
#endif
E2.Orientation();
// --- Add <E1,E2> in BDS
Standard_Integer E1index = myPDS->AddShape(E1,1);
Standard_Integer E2index = myPDS->AddShape(E2,2);
// --- get list of interferences connected to edges <E1>,<E2>
TopOpeBRepDS_ListOfInterference& EIL1 = myPDS->ChangeShapeInterferences(E1);
#ifdef DEB
TopOpeBRepDS_ListOfInterference& EIL2 =
#endif
myPDS->ChangeShapeInterferences(E2);
Handle(TopOpeBRepDS_Interference) EPI; //edge/point interference
Handle(TopOpeBRepDS_Interference) EVI; //edge/vertex interference
@@ -119,9 +106,6 @@ void TopOpeBRep_EdgesFiller::Insert(const TopoDS_Shape& E1,const TopoDS_Shape& E
Standard_Boolean pointofsegment =
#endif
P2D.IsPointOfSegment();
#ifdef DEB
Standard_Boolean reducesegmentpoint = (reducesegment && pointofsegment);
#endif
#ifdef DEB
if (trc) {
@@ -377,10 +361,7 @@ Standard_Boolean TopOpeBRep_EdgesFiller::MakeGeometry(const TopOpeBRep_Point2d&
Standard_Boolean isvertex2 = P2D.IsVertex(2);
if (isvertex1 && isvertex2) {
Standard_Integer G1 = myPDS->AddShape(P2D.Vertex(1),1);
#ifdef DEB
Standard_Integer G2 =
#endif
myPDS->AddShape(P2D.Vertex(2),2);
myPDS->AddShape(P2D.Vertex(2),2);
G = G1;
K = TopOpeBRepDS_VERTEX;
}
@@ -466,15 +447,6 @@ Handle(TopOpeBRepDS_Interference) TopOpeBRep_EdgesFiller::StoreVI(const TopOpeBR
Standard_Boolean TopOpeBRep_EdgesFiller::ToRecompute(const TopOpeBRep_Point2d& P2D,const Handle(TopOpeBRepDS_Interference)& I,const Standard_Integer IEmother)
{
Standard_Boolean b = Standard_True;
const TopOpeBRepDS_Transition& T = I->Transition();
#ifdef DEB
TopAbs_State sb =
#endif
T.Before();
#ifdef DEB
TopAbs_State sa =
#endif
T.After();
Standard_Boolean pointofsegment = P2D.IsPointOfSegment();
Standard_Boolean esd = myPEI->SameDomain();
b = b && (pointofsegment && !esd);

View File

@@ -108,9 +108,6 @@ void TopOpeBRep_EdgesIntersector::SetFaces(const TopoDS_Shape& F1,const TopoDS_S
//=======================================================================
void TopOpeBRep_EdgesIntersector::SetFaces(const TopoDS_Shape& F1,const TopoDS_Shape& F2,const Bnd_Box& B1,const Bnd_Box& B2)
{
#ifdef DEB
Standard_Boolean memesfaces = F1.IsSame(F2);
#endif
Standard_Boolean computerestriction = Standard_False;
Standard_Boolean so11 = Standard_True;
@@ -282,14 +279,7 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed
{
mysp2d.Clear();
myip2d = 1; mynp2d = 0;
#ifdef DEB
TopAbs_Orientation E1ori =
#endif
E1.Orientation();
#ifdef DEB
TopAbs_Orientation E2ori =
#endif
E2.Orientation();
myEdge1 = TopoDS::Edge(E1);
myEdge2 = TopoDS::Edge(E2);
@@ -374,13 +364,7 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed
Standard_Real toll =
#endif
BRep_Tool::Tolerance(vl);
#ifdef DEB
Standard_Real tol = Max (tolf,toll);
#endif
Standard_Boolean onf = (df < tolf);
#ifdef DEB
Standard_Boolean onl = (dl < toll);
#endif
TopoDS_Vertex v1 = onf ? vf : vl;
TopTools_IndexedDataMapOfShapeListOfShape mapVE; TopExp::MapShapesAndAncestors(myFace1,TopAbs_VERTEX,TopAbs_EDGE,mapVE);
const TopTools_ListOfShape& Edsanc = mapVE.FindFromKey(v1);
@@ -559,7 +543,6 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed
Standard_Boolean T1INT = (T1.Orientation(TopAbs_IN) == TopAbs_INTERNAL);
#ifdef DEB
Standard_Boolean T1EXT = (T1.Orientation(TopAbs_IN) == TopAbs_EXTERNAL);
Standard_Boolean INTEXT1 = T1INT || T1EXT;
#endif
if (T1INT && isvertex2 && !isvertex1) {
const TopoDS_Vertex& V2 = P2D.Vertex(2);
@@ -656,15 +639,6 @@ Standard_Boolean TopOpeBRep_EdgesIntersector::ComputeSameDomain()
Standard_Boolean rr = (Abs(r1-r2) < Precision::Confusion()); //xpu281098 (cto019D2) tolerance a revoir
if (!rr) return SetSameDomain(Standard_False);
#ifdef DEB
const gp_Ax22d& pos1 =
#endif
c1.Position();
#ifdef DEB
const gp_Ax22d& pos2 =
#endif
c2.Position();
const gp_Pnt2d& p1 = c1.Location();
const gp_Pnt2d& p2 = c2.Location();
@@ -739,10 +713,6 @@ Standard_Boolean TopOpeBRep_EdgesIntersector::ReduceSegment(TopOpeBRep_Point2d&
Standard_Boolean pospsa = psa.IsPointOfSegment();
TopOpeBRep_P2Dstatus stspsa = psa.Status();
#ifdef DEB
const gp_Pnt& Ppsa =
#endif
psa.Value();
Standard_Real tpsa1 = psa.Parameter(1);
Standard_Real tpsa2 = psa.Parameter(2);
const TopOpeBRepDS_Transition& Tpsa1 = psa.Transition(1);
@@ -750,10 +720,6 @@ Standard_Boolean TopOpeBRep_EdgesIntersector::ReduceSegment(TopOpeBRep_Point2d&
Standard_Boolean pospsb = psb.IsPointOfSegment();
TopOpeBRep_P2Dstatus stspsb = psb.Status();
#ifdef DEB
const gp_Pnt& Ppsb =
#endif
psb.Value();
Standard_Real tpsb1 = psb.Parameter(1);
Standard_Real tpsb2 = psb.Parameter(2);
const TopOpeBRepDS_Transition& Tpsb1 = psb.Transition(1);
@@ -801,10 +767,7 @@ Standard_Boolean TopOpeBRep_EdgesIntersector::ReduceSegment(TopOpeBRep_Point2d&
psb.SetKeep(Standard_False);
TopOpeBRepDS_Config cpsa = psa.EdgesConfig();
#ifdef DEB
TopOpeBRepDS_Config cpsb =
#endif
psb.EdgesConfig();
Pn.SetEdgesConfig(cpsa);
Standard_Boolean isvpsa1 = psa.IsVertex(1);if (isvpsa1) Pn.SetVertex(1,psa.Vertex(1));

View File

@@ -77,10 +77,6 @@ void TopOpeBRep_FaceEdgeFiller::Insert
for (; FEINT.MorePoint(); FEINT.NextPoint() ) {
gp_Pnt2d pUV; FEINT.UVPoint(pUV);
#ifdef DEB
TopAbs_State sta =
#endif
FEINT.State();
Standard_Real parE = FEINT.Parameter();
#ifdef DEB

View File

@@ -55,7 +55,6 @@ void FEINT_DUMPPOINTS(TopOpeBRep_FaceEdgeIntersector& FEINT,
Standard_Boolean isvertexF = FEINT.IsVertex(1,V1);
TopoDS_Vertex V2;
Standard_Boolean isvertexE = FEINT.IsVertex(2,V2);
Standard_Boolean isvertex = isvertexF || isvertexE;
cout<<endl;
cout<<"P"<<ip<<" : ";

View File

@@ -467,9 +467,6 @@ void TopOpeBRep_FacesFiller::VP_PositionOnR(TopOpeBRep_LineInter& L)
for (; VPI.More(); VPI.Next()) {
TopOpeBRep_VPointInter& VP = VPI.ChangeCurrentVP();
#ifdef DEB
Standard_Integer VPsi = VP.ShapeIndex();
#endif
Standard_Boolean isvertex = VP.IsVertex(Esi);
if ( isvertex ) {

View File

@@ -734,10 +734,7 @@ void TopOpeBRep_FacesFiller::ProcessRLine()
Standard_Integer iOO = myDS->AddShape(OOE,OOrank);
Standard_Real OOpar;
#ifdef DEB
Standard_Boolean okOO =
#endif
VP.ParonE(OOE,OOpar);
VP.ParonE(OOE,OOpar);
// xpu091198 : 1d interf done in EdgesFiller processing (cto cylcong *)
Standard_Boolean sdmeds = FUN_ds_sdm((*myDS),Erest,OOE);
@@ -1187,10 +1184,6 @@ void TopOpeBRep_FacesFiller::StoreCurveInterference(const Handle(TopOpeBRepDS_In
TopOpeBRepDS_Curve DSC;
myDSCIndex = myDS->AddCurve(DSC);
#ifdef DEB
const TopOpeBRepDS_Curve& CCC = myDS->Curve(myDSCIndex);
#endif
#ifdef DEB
if (TopOpeBRepDS_GettraceDSF() || TopOpeBRepDS_GettraceDSNC())
cout<<"new DSC "<<myDSCIndex<<endl;

View File

@@ -219,10 +219,6 @@ void TopOpeBRep_FacesIntersector::Perform(const TopoDS_Shape& F1,const TopoDS_Sh
for (InitLine(); MoreLine(); NextLine()) {
TopOpeBRep_LineInter& L = CurrentLine();
if (L.TypeLineCurve() == TopOpeBRep_RESTRICTION) {
#ifdef DEB
Standard_Boolean isedge1 = L.ArcIsEdge(1); //DEB
Standard_Boolean isedge2 = L.ArcIsEdge(2); //DEB
#endif
const TopoDS_Shape& E = L.Arc();
myEdgeRestrictionMap.Add(E);
}
@@ -289,9 +285,9 @@ Standard_Boolean TopOpeBRep_FacesIntersector::SameDomain () const
Standard_ProgramError::Raise("FacesIntersector : bad SameDomain");
Standard_Boolean sd = myIntersector.TangentFaces();
#ifdef DEB
Standard_Boolean plpl = (mySurfaceType1 == GeomAbs_Plane) && (mySurfaceType2 == GeomAbs_Plane);
#endif
//Standard_Boolean plpl = (mySurfaceType1 == GeomAbs_Plane) && (mySurfaceType2 == GeomAbs_Plane);
// if (!plpl) return Standard_False;
return sd;
}
@@ -730,14 +726,6 @@ Handle(IntPatch_RLine) BuildRLineBasedOnWLine(const Handle(IntPatch_WLine)& theW
return anRLine;
Standard_Boolean IsOnFirst = (theRank == 1);
#ifdef DEB
Standard_Integer ParamMinOnLine = (Standard_Integer)
#endif
Vtx1.ParameterOnLine();
#ifdef DEB
Standard_Integer ParamMaxOnLine = (Standard_Integer)
#endif
Vtx2.ParameterOnLine();
Handle(IntSurf_LineOn2S) aLineOn2S = new IntSurf_LineOn2S();
const Handle(IntSurf_LineOn2S)& Lori = theWLine->Curve();

View File

@@ -113,13 +113,7 @@ void TopOpeBRep_Hctxee2d::SetEdges(const TopoDS_Edge& E1,const TopoDS_Edge& E2,
Standard_Real toll =
#endif
BRep_Tool::Tolerance(vl);
#ifdef DEB
Standard_Real tol = Max (tolf,toll);
#endif
Standard_Boolean onf = (df < tolf);
#ifdef DEB
Standard_Boolean onl = (dl < toll);
#endif
TopoDS_Vertex v1 = onf ? vf : vl;
TopTools_IndexedDataMapOfShapeListOfShape mapVE; TopExp::MapShapesAndAncestors(F1,TopAbs_VERTEX,TopAbs_EDGE,mapVE);
const TopTools_ListOfShape& Edsanc = mapVE.FindFromKey(v1);
@@ -161,11 +155,6 @@ void TopOpeBRep_Hctxee2d::SetEdges(const TopoDS_Edge& E1,const TopoDS_Edge& E2,
}
}
#ifdef DEB
GeomAbs_CurveType myCurveType1 = myCurve1.GetType();
GeomAbs_CurveType myCurveType2 = myCurve2.GetType();
#endif
} // SetEdges
//=======================================================================

View File

@@ -90,7 +90,6 @@ void TopOpeBRep_Point2d::Dump(const Standard_Integer E1index,const Standard_Inte
Standard_Boolean isvertex1 = IsVertex(1); TopoDS_Vertex V1; if (isvertex1) V1 = Vertex(1);
Standard_Boolean isvertex2 = IsVertex(2); TopoDS_Vertex V2; if (isvertex2) V2 = Vertex(2);
Standard_Boolean isvertex = isvertex1 || isvertex2;
Standard_Integer ia1,ia2; SegmentAncestors(ia1,ia2);
cout<<endl<<"p2d "<<index<<" k="<<keep<<" pos="<<pos;

View File

@@ -315,10 +315,6 @@ Standard_Real TopOpeBRep_FacesFiller::VPParamOnER(const TopOpeBRep_VPointInter&
// If vp(index) is an edge boundary returns the point's parameter.
const TopoDS_Edge& E = TopoDS::Edge(Lrest.Arc());
#ifdef DEB
Standard_Boolean isdg =
#endif
BRep_Tool::Degenerated(E);
Standard_Boolean isedge1 = Lrest.ArcIsEdge(1);
Standard_Boolean isedge2 = Lrest.ArcIsEdge(2);
if (isedge1 && vp.IsVertexOnS1()) {

View File

@@ -58,10 +58,6 @@ void TopOpeBRep_FacesFiller::GetESL(TopTools_ListOfShape& LES)
if (isrest) {
const TopoDS_Edge& E = TopoDS::Edge(L.Arc());
#ifdef DEB
Standard_Boolean FIisrest =
#endif
myFacesIntersector->IsRestriction(E);
#ifdef DEB
if (trRL) {
@@ -101,7 +97,7 @@ Standard_Boolean TopOpeBRep_FacesFiller::KeepRLine
(const TopOpeBRep_LineInter& L,const Standard_Boolean checkkeep) const
{
#ifdef DEB
Standard_Boolean trc = (TopOpeBRepDS_GettraceDSF() || TopOpeBRepDS_GettraceDSNC());
//Standard_Boolean trc = (TopOpeBRepDS_GettraceDSF() || TopOpeBRepDS_GettraceDSNC());
#endif
TopOpeBRep_TypeLineCurve t = L.TypeLineCurve();
@@ -340,10 +336,7 @@ void TopOpeBRep_FacesFiller::ProcessSectionEdges()
itLES.Next(),itLOI.Next()) {
const TopoDS_Shape& E1 = itLES.Value();
Standard_Integer rE1 = itLOI.Value();
#ifdef DEB
Standard_Integer iE1 =
#endif
myDS->AddShape(E1,rE1);
myDS->AddShape(E1,rE1);
}
// determination des aretes SameDomain en 3d pur

View File

@@ -377,8 +377,6 @@ Standard_Boolean TopOpeBRep_ShapeIntersector::MoreIntersection() const
Standard_Boolean res = myIntersectionDone;
#ifdef DEB
Standard_Integer i1 = Index(1);
Standard_Integer i2 = Index(2);
if (TopOpeBRep_GettraceSI() && res) {
if ( myFFDone ) cout<<"FF : ";
else if ( myEEFFDone ) cout<<" EE : ";
@@ -581,8 +579,6 @@ void TopOpeBRep_ShapeIntersector::FindFFIntersection()
#ifdef DEB
SAVFFi1 = myFaceScanner.Index(); SAVFFi2 = myFaceExplorer.Index();
if (TopOpeBRep_GettraceSI()) {
Standard_Integer i1 = myFaceScanner.Index();
Standard_Integer i2 = myFaceExplorer.Index();
cout<<"?? FF : ";
myFaceScanner.DumpCurrent(cout); myFaceExplorer.DumpCurrent(cout);
cout<<endl;
@@ -716,8 +712,6 @@ void TopOpeBRep_ShapeIntersector::FindEEFFIntersection()
myEEIntersector.Perform(GS1,GS2);
#ifdef DEB
Standard_Integer i1 = Index(1);
Standard_Integer i2 = Index(2);
if (TopOpeBRep_GettraceSI() && myEEIntersector.IsEmpty()) {
cout<<" EE : ";
myEdgeScanner.DumpCurrent(cout);

View File

@@ -119,8 +119,6 @@ Standard_Boolean TopOpeBRep_ShapeIntersector2d::MoreIntersection() const
Standard_Boolean res = myIntersectionDone;
#ifdef DEB
Standard_Integer i1 = Index(1);
Standard_Integer i2 = Index(2);
if (TopOpeBRep_GettraceSI() && res) {
if ( myFFDone ) cout<<"FF : ";
else if ( myEEFFDone ) cout<<" EE : ";
@@ -252,8 +250,6 @@ void TopOpeBRep_ShapeIntersector2d::FindFFIntersection()
#ifdef DEB
if (TopOpeBRep_GettraceSI()) {
Standard_Integer i1 = myFaceScanner.Index();
Standard_Integer i2 = myFaceExplorer.Index();
cout<<"?? FF : ";
myFaceScanner.DumpCurrent(cout);
myFaceExplorer.DumpCurrent(cout);
@@ -262,14 +258,8 @@ void TopOpeBRep_ShapeIntersector2d::FindFFIntersection()
#endif
const TopOpeBRepTool_BoxSort& BS = myFaceScanner.BoxSort();
#ifdef DEB
const Bnd_Box& B1 =
#endif
BS.Box(GS1);
#ifdef DEB
const Bnd_Box& B2 =
#endif
BS.Box(GS2);
BS.Box(GS1);
BS.Box(GS2);
myFFDone = Standard_True;
break;
NextFFCouple();
@@ -365,8 +355,6 @@ void TopOpeBRep_ShapeIntersector2d::FindEEFFIntersection()
myEEIntersector.Perform(GS1,GS2);
#ifdef DEB
Standard_Integer i1 = Index(1);
Standard_Integer i2 = Index(2);
if (TopOpeBRep_GettraceSI() && myEEIntersector.IsEmpty()) {
cout<<" EE : ";
myEdgeScanner.DumpCurrent(cout);

View File

@@ -85,10 +85,6 @@ TopAbs_State TopOpeBRep_VPointInterClassifier::VPointPosition
return myState;
}
#ifdef DEB
const gp_Pnt& P3D = VP.Value();
#endif
TopoDS_Face FF = TopoDS::Face(F);
TopOpeBRepTool_ShapeTool::AdjustOnPeriodic(FF,u,v);
gp_Pnt2d p2d(u,v);

View File

@@ -467,9 +467,6 @@ Standard_Boolean FUNBREP_topogline_new
Standard_ProgramError::Raise("FUNBREP_topogline_new : line is not a GLine");
return Standard_False;
}
#ifdef DEB
Standard_Boolean trc = TopOpeBRepDS_GettraceDSF();
#endif
Standard_Integer iVP = VP.Index();
Standard_Integer iINON1,iINONn,nINON; L.VPBounds(iINON1,iINONn,nINON);
@@ -583,10 +580,6 @@ Standard_Boolean FUNBREP_topogline
Standard_Real& parline,TopOpeBRepDS_Transition& transLine)
//----------------------------------------------------------------------
{
#ifdef DEB
Standard_Boolean trc = TopOpeBRepDS_GettraceDSF();
#endif
if (L.TypeLineCurve() == TopOpeBRep_WALKING) {
Standard_ProgramError::Raise("FUNBREP_topogline : line is not a GLine");
return Standard_False;

View File

@@ -184,10 +184,6 @@ static void FUN_VPgeometryfound
const TopOpeBRepDS_DataStructure& BDS = HDS->DS();
if (BDS.HasShape(edge)) {
#ifdef DEB
Standard_Integer iedge =
#endif
BDS.Shape(edge);
const TopOpeBRepDS_ListOfInterference& EPIL = BDS.ShapeInterferences(edge);
TopOpeBRepDS_ListIteratorOfListOfInterference itEPIL(EPIL);
EPIfound = FF.GetGeometry(itEPIL,VP,PVIndex,PVKind);
@@ -233,10 +229,6 @@ static void FUN_VPgeometryfound
Standard_Real tolOOe = FUN_tool_maxtol(OOedge);
Standard_Real OOtolp = Precision::Parametric(tolOOe);
if (BDS.HasShape(OOedge)) {
#ifdef DEB
Standard_Integer iooedge =
#endif
BDS.Shape(OOedge);
const TopOpeBRepDS_ListOfInterference& OOEPIL = BDS.ShapeInterferences(OOedge);
TopOpeBRepDS_ListIteratorOfListOfInterference OOitEPIL(OOEPIL);
OOEPIfound = FF.GetGeometry(OOitEPIL,VP,PVIndex,PVKind);
@@ -412,9 +404,6 @@ Standard_EXPORT Standard_Boolean FUN_newtransEdge
Standard_Boolean rest = inERL || isse;
Standard_Boolean interf2d = EtgOOF && Lonrest && rest;
Standard_Boolean interf3dtg = EtgOOF && rest && !interf2d; // xpu260898 :cto902D6,(e15,p3,f9)
#ifdef DEB
Standard_Boolean interf3d = !interf2d && !interf3dtg;
#endif
Standard_Real factor = 1.e-2;
TopOpeBRepTool_makeTransition MKT;
@@ -546,9 +535,6 @@ static void FUN_processCPI
Standard_Integer& keptVPnbr)
//-----------------------------------------------------------------------
{
#ifdef DEB
Standard_Boolean CPIfound = !Ifound.IsNull();
#endif
Standard_Integer OOShapeIndex = (ShapeIndex == 1) ? 2 : 1;
TopOpeBRepDS_Transition ttransLine = transLine;
@@ -990,13 +976,7 @@ void TopOpeBRep_FacesFiller::ProcessVPonR
}
}//myLineINL
#ifdef DEB
Standard_Integer SEPI = (EPIfound) ? IEPI->Support() : 0;
#endif
TopOpeBRepDS_Kind SKEPI; if(EPIfound) SKEPI=IEPI->SupportType();
#ifdef DEB
Standard_Integer SCPI = (CPIfound) ? ICPI->Support() : 0;
#endif
TopOpeBRepDS_Kind SKCPI; if(CPIfound) SKCPI=ICPI->SupportType();
// Gfound = VP corresponds with an existing geometry of ShapeIndex

View File

@@ -151,20 +151,12 @@ void TopOpeBRep_FacesFiller::ProcessVPonclosingR(const TopOpeBRep_VPointInter& V
// Standard_Boolean isvertex = VP.IsVertex(ShapeIndex);
Standard_Boolean isvertex = (PVKind == TopOpeBRepDS_VERTEX);
Standard_Integer absindex = VP.ShapeIndex(); // 0,1,2,3
#ifdef DEB
Standard_Integer iVP =
#endif
VP.Index();
Standard_Boolean OOShapeIndex = (ShapeIndex == 1) ? 2 : 1;
Standard_Boolean on2edges = (absindex == 3);
Standard_Boolean hasONedge = (VP.State(OOShapeIndex) == TopAbs_ON);
Standard_Boolean hasOOedge = (on2edges) ? Standard_True : hasONedge;
TopoDS_Face Face = (*this).Face(ShapeIndex);
#ifdef DEB
Standard_Integer iSIFace =
#endif
myDS->Shape(Face);
TopoDS_Face OOFace = (*this).Face(OOShapeIndex);
Standard_Integer iOOFace = myDS->Shape(OOFace);
if (iOOFace == 0) iOOFace = myDS->AddShape(OOFace,OOShapeIndex);
@@ -174,14 +166,7 @@ void TopOpeBRep_FacesFiller::ProcessVPonclosingR(const TopOpeBRep_VPointInter& V
const TopoDS_Edge& edge = TopoDS::Edge(VP.Edge(ShapeIndex));
if (myDS->HasShape(edge)) SIedgeIndex = myDS->Shape(edge);
else myDS->AddShape(edge,ShapeIndex);
#ifdef DEB
Standard_Boolean isrest =
#endif
myDS->IsSectionEdge(edge);
#ifdef DEB
Standard_Boolean closing =
#endif
TopOpeBRepTool_ShapeTool::Closed(edge,Face);
Standard_Real paredge = VP.EdgeParameter(ShapeIndex);
// dummy if !<hasOOedge>

View File

@@ -947,11 +947,6 @@ static Standard_Integer FUN_putInterfonDegenEd
TopoDS_Edge& OOEi, Standard_Real& paronOOEi, Standard_Boolean hasOOEi,
Standard_Boolean& isT2d)
{
#ifdef DEB
Standard_Boolean traceDSF = TopOpeBRepDS_GettraceDSF();
Standard_Boolean traceDEGEN = TopOpeBRepDS_GettraceDEGEN();
Standard_Boolean trace = traceDSF || traceDEGEN;
#endif
OOEi.Nullify();
Standard_Boolean on3 = (VP.ShapeIndex() == 3);// <VP> is shared by edge of 1 and edge of 2.