diff --git a/src/BRepFill/BRepFill_Evolved.cxx b/src/BRepFill/BRepFill_Evolved.cxx index 9956308944..d23cd97bd6 100644 --- a/src/BRepFill/BRepFill_Evolved.cxx +++ b/src/BRepFill/BRepFill_Evolved.cxx @@ -126,9 +126,6 @@ #include #include #include -#endif - -#ifdef DEB static Standard_Boolean AffichGeom = Standard_False; static Standard_Boolean AffichEdge = Standard_False; static Standard_Integer NbFACES = 0; @@ -136,10 +133,6 @@ static Standard_Integer NbTRIMFACES = 0; static Standard_Integer NbVEVOS = 0; static Standard_Integer NbPROFILS = 0; static Standard_Integer NbEDGES = 0; -// POP for NT -#ifndef WNT -static char name[100]; -#endif #endif static const Standard_Real BRepFill_Confusion() @@ -687,6 +680,7 @@ void BRepFill_Evolved::ElementaryPerform (const TopoDS_Face& Sp, #ifdef DRAW if (AffichEdge) { + char name[100]; sprintf(name,"PROFIL_%d",++NbPROFILS); DBRep::Set(name,Pr); } @@ -984,6 +978,7 @@ void BRepFill_Evolved::ElementaryPerform (const TopoDS_Face& Sp, #ifdef DRAW if (AffichEdge) { + char name[100]; sprintf(name,"ARCEDGE_%d_%d_%d",i,vv,Ti); DBRep::Set(name,CurrentEdge); } @@ -1069,7 +1064,7 @@ void BRepFill_Evolved::ElementaryPerform (const TopoDS_Face& Sp, } } -#ifdef DEB +#ifdef DRAW if (AffichEdge) { cout << " End of Construction of edges and vertices on bissectrices"< -#endif - -#ifdef DEB static Standard_Boolean AffichCurve = Standard_False; static Standard_Integer NbProj = 1; #endif + //POP pour NT #include @@ -506,9 +504,7 @@ void BRepFill_MultiLine::Curves(Handle(Geom_Curve)& Curve, #ifdef DRAW if ( AffichCurve) { -//POP pour NT - // char name[100]; - char* name = new char[100]; + char name[100]; sprintf(name,"C2_%d",NbProj); DrawTrSurf::Set(name,TLine); sprintf(name,"C3_%d",NbProj); diff --git a/src/BRepFill/BRepFill_OffsetWire.cxx b/src/BRepFill/BRepFill_OffsetWire.cxx index a2a0f2420c..97d06be376 100644 --- a/src/BRepFill/BRepFill_OffsetWire.cxx +++ b/src/BRepFill/BRepFill_OffsetWire.cxx @@ -105,9 +105,6 @@ #include #include #include -#endif - -#ifdef DEB static Standard_Boolean AffichGeom = Standard_False; static Standard_Boolean Affich2d = Standard_False; static Standard_Boolean AffichEdge = Standard_False; @@ -115,10 +112,6 @@ static Standard_Integer NbTRIMEDGES = 0; static Standard_Integer NbOFFSET = 0; static Standard_Integer NbEDGES = 0; static Standard_Integer NbBISSEC = 0; -#ifndef WNT -static char tname[100]; -static Standard_CString name = tname ; -#endif #endif // Modified by Sergey KHROMOV - Thu Nov 16 17:24:39 2000 Begin @@ -602,8 +595,6 @@ void BRepFill_OffsetWire::Perform (const Standard_Real Offset, if(aSubst.IsCopied(myWorkSpine)) { myWorkSpine = TopoDS::Face(aSubst.Copy(myWorkSpine).First()); - //sprintf(name,"WS1"); - //DBRep::Set(name,myWorkSpine); BRepMAT2d_Explorer newExp; newExp.Perform(myWorkSpine); @@ -788,7 +779,7 @@ void BRepFill_OffsetWire::PerformWithBiLo } -#ifdef DEB +#ifdef DRAW if (AffichEdge) { cout << " End Construction of geometric primitives "< #include -#ifdef DRAW -#include -#endif -#ifdef DEB -#ifndef WNT -extern Standard_Integer AffichInt2d; -#else -Standard_IMPORT Standard_Boolean AffichInt2d; -#endif -static Standard_Integer NbF2d = 0; -static Standard_Integer NbE2d = 0; -static Standard_Integer NbNewVertices = 0; -#endif - #include #include #include @@ -94,6 +80,13 @@ static Standard_Integer NbNewVertices = 0; #include #include +#ifdef DRAW +#include +Standard_IMPORT extern Standard_Boolean AffichInt2d; +static Standard_Integer NbF2d = 0; +static Standard_Integer NbE2d = 0; +static Standard_Integer NbNewVertices = 0; +#endif //======================================================================= //function : CommonVertex @@ -253,8 +246,7 @@ static void Store (const TopoDS_Edge& E1, #ifdef DRAW if (AffichInt2d) { if (!OnE1 && !OnE2) { - //POP pour NT - char* name = new char[100]; + char name[256]; sprintf(name,"VV_%d",NbNewVertices++); DBRep::Set(name,V); } @@ -280,8 +272,7 @@ static void EdgeInter(const TopoDS_Face& F, { #ifdef DRAW if (AffichInt2d) { - //POP pour NT - char* name = new char[100]; + char name[256]; sprintf(name,"E2d_%d_%d",NbF2d,NbE2d++); DBRep::Set(name,E1); sprintf(name,"E2d_%d_%d",NbF2d,NbE2d++); @@ -552,8 +543,7 @@ static void RefEdgeInter(const TopoDS_Face& F, { #ifdef DRAW if (AffichInt2d) { - //POP for NT - char* name = new char[100]; + char name[256]; sprintf(name,"E2d_%d_%d",NbF2d,NbE2d++); DBRep::Set(name,E1); sprintf(name,"E2d_%d_%d",NbF2d,NbE2d++); @@ -1410,7 +1400,7 @@ void BRepOffset_Inter2d::Compute (const Handle(BRepAlgo_AsDes)& AsDes, const TopTools_IndexedMapOfShape& NewEdges, const Standard_Real Tol) { -#ifdef DEB +#ifdef DRAW NbF2d++; NbE2d = 0; #endif diff --git a/src/BRepOffset/BRepOffset_MakeLoops.cxx b/src/BRepOffset/BRepOffset_MakeLoops.cxx index 6aed54f558..3d5c593be3 100644 --- a/src/BRepOffset/BRepOffset_MakeLoops.cxx +++ b/src/BRepOffset/BRepOffset_MakeLoops.cxx @@ -35,15 +35,10 @@ #ifdef DRAW #include -#endif -#ifdef DEB Standard_Integer NbF = 1; static Standard_Boolean Affich = Standard_False; -//POP pour NT -//char name[100]; #endif - BRepOffset_MakeLoops::BRepOffset_MakeLoops() { } @@ -444,9 +439,8 @@ void BRepOffset_MakeLoops::BuildFaces(const TopTools_ListOfShape& LF, } if (ToRebuild) { #ifdef DRAW -//POP for NT if ( Affich) { - char* name = new char[100]; + char name[256]; sprintf(name,"CF_%d",NbF++); DBRep::Set(name,F); } diff --git a/src/BRepOffset/BRepOffset_Tool.cxx b/src/BRepOffset/BRepOffset_Tool.cxx index 854cf312f7..c47a4a9614 100644 --- a/src/BRepOffset/BRepOffset_Tool.cxx +++ b/src/BRepOffset/BRepOffset_Tool.cxx @@ -143,20 +143,17 @@ #ifdef DRAW #include -#endif - -#ifdef DEB Standard_Boolean AffichInter = Standard_False; -static Standard_Boolean AffichExtent = Standard_False; static Standard_Integer NbNewEdges = 1; static Standard_Integer NbFaces = 1; static Standard_Integer NbFOB = 1; static Standard_Integer NbFTE = 1; static Standard_Integer NbExtE = 1; -//POP pour NT -//char* name = new char[100]; #endif +#ifdef DEB +static Standard_Boolean AffichExtent = Standard_False; +#endif //======================================================================= //function : EdgeVertices @@ -730,8 +727,7 @@ void BRepOffset_Tool::PipeInter(const TopoDS_Face& F1, { #ifdef DRAW if (AffichInter) { - // POP pour NT - char* name = new char[100]; + char name[256]; sprintf(name,"FF_%d",NbFaces++); DBRep::Set(name,F1); sprintf(name,"FF_%d",NbFaces++); @@ -779,8 +775,7 @@ void BRepOffset_Tool::PipeInter(const TopoDS_Face& F1, L2.Append (E.Oriented(O2)); #ifdef DRAW if (AffichInter) { - // POP pour NT - char* name = new char[100]; + char name[256]; sprintf(name,"EI_%d",NbNewEdges++); DBRep::Set(name,E.Oriented(O1)); } @@ -1572,8 +1567,7 @@ void BRepOffset_Tool::Inter3D(const TopoDS_Face& F1, { #ifdef DRAW if (AffichInter) { - // POP pour NT - char* name = new char[100]; + char name[256]; sprintf(name,"FF_%d",NbFaces++); DBRep::Set(name,F1); sprintf(name,"FF_%d",NbFaces++); @@ -1695,7 +1689,7 @@ void BRepOffset_Tool::Inter3D(const TopoDS_Face& F1, #ifdef DRAW if (AffichInter) { - char* name = new char[100]; + char name[256]; sprintf(name,"EI_%d",NbNewEdges++); DBRep::Set(name,anEdge.Oriented(O1)); @@ -1943,8 +1937,7 @@ Standard_Boolean BRepOffset_Tool::TryProject { #ifdef DRAW if (AffichInter) { - // POP pour NT - char* name = new char[100]; + char name[256]; sprintf(name,"FF_%d",NbFaces++); DBRep::Set(name,F1); sprintf(name,"FF_%d",NbFaces++); @@ -1987,9 +1980,8 @@ Standard_Boolean BRepOffset_Tool::TryProject LInt2.Append (CurE.Oriented(O2)); #ifdef DRAW if (AffichInter) { - // POP pour NT - char* name = new char[100]; - sprintf(name,"EI_%d",NbNewEdges++); + char name[256]; + sprintf(name,"EI_%d",NbNewEdges++); DBRep::Set(name,CurE.Oriented(O1)); } #endif @@ -2014,8 +2006,7 @@ void BRepOffset_Tool::InterOrExtent(const TopoDS_Face& F1, { #ifdef DRAW if (AffichInter) { - // POP pour NT - char* name = new char[100]; + char name[256]; sprintf(name,"FF_%d",NbFaces++); DBRep::Set(name,F1); sprintf(name,"FF_%d",NbFaces++); @@ -2064,8 +2055,7 @@ void BRepOffset_Tool::InterOrExtent(const TopoDS_Face& F1, L2.Append (E.Oriented(O2)); #ifdef DRAW if (AffichInter) { - // POP pour NT - char* name = new char[100]; + char name[256]; sprintf(name,"EI_%d",NbNewEdges++); DBRep::Set(name,E.Oriented(O1)); } @@ -2153,7 +2143,7 @@ static void ExtentEdge(const TopoDS_Face& F, NE.Orientation(E.Orientation()); #ifdef DRAW if (AffichExtent) { - char* name = new char[100]; + char name[256]; sprintf (name,"F_%d",NbExtE); DBRep::Set(name,EF); sprintf (name,"OE_%d",NbExtE); @@ -3467,8 +3457,7 @@ void BRepOffset_Tool::ExtentFace (const TopoDS_Face& F, { #ifdef DRAW if (AffichInter) { - // POP pour NT - char* name = new char[100]; + char name[256]; sprintf(name,"FTE_%d",NbFTE++); DBRep::Set(name,F); } @@ -3886,8 +3875,7 @@ void BRepOffset_Tool::ExtentFace (const TopoDS_Face& F, #ifdef DRAW if (AffichInter) { - // POP pour NT - char* name = new char[100]; + char name[256]; sprintf(name,"FOB_%d",NbFOB++); DBRep::Set(name,NF); } diff --git a/src/Bisector/Bisector_Inter.cxx b/src/Bisector/Bisector_Inter.cxx index a39b5b446b..afc86683b9 100644 --- a/src/Bisector/Bisector_Inter.cxx +++ b/src/Bisector/Bisector_Inter.cxx @@ -38,8 +38,6 @@ #include #include #include -#endif -#ifdef DEB static Standard_Boolean Affich = Standard_False; #endif diff --git a/src/Blend/Blend_CSWalking_4.gxx b/src/Blend/Blend_CSWalking_4.gxx index e7d0043dc7..539333c75a 100644 --- a/src/Blend/Blend_CSWalking_4.gxx +++ b/src/Blend/Blend_CSWalking_4.gxx @@ -265,10 +265,9 @@ void Blend_CSWalking::InternalPerform(Blend_CSFunction& Func, Arrive = Standard_True; } break; -#ifndef DEB + default: break; -#endif } if (Arrive) { if (sens > 0.) { diff --git a/src/Expr/Expr_BinaryExpression.cxx b/src/Expr/Expr_BinaryExpression.cxx index 87e6b46137..cb43954fde 100644 --- a/src/Expr/Expr_BinaryExpression.cxx +++ b/src/Expr/Expr_BinaryExpression.cxx @@ -74,9 +74,7 @@ const Handle(Expr_GeneralExpression)& Expr_BinaryExpression::SubExpression (cons Standard_OutOfRange::Raise(); } } -#if defined (WNT) || !defined (DEB) return *( ( Handle_Expr_GeneralExpression* )NULL ); -#endif // WNT || !DEB } Standard_Boolean Expr_BinaryExpression::ContainsUnknowns () const diff --git a/src/Extrema/Extrema_ExtCS.cxx b/src/Extrema/Extrema_ExtCS.cxx index 5494321bdc..538fa647e0 100644 --- a/src/Extrema/Extrema_ExtCS.cxx +++ b/src/Extrema/Extrema_ExtCS.cxx @@ -130,6 +130,7 @@ void Extrema_ExtCS::Perform(const Adaptor3d_Curve& C, case GeomAbs_BSplineSurface: case GeomAbs_SurfaceOfRevolution: case GeomAbs_SurfaceOfExtrusion: + case GeomAbs_OffsetSurface: case GeomAbs_OtherSurface: { Standard_Real cfirst = myucinf, clast = myucsup; @@ -139,7 +140,7 @@ void Extrema_ExtCS::Perform(const Adaptor3d_Curve& C, if(Precision::IsInfinite(Abs(cfirst)) || Precision::IsInfinite(Abs(clast))) { Bnd_Box aSurfBox; - BndLib_AddSurface::Add(*myS, ufirst, ulast, vfirst, vlast, Precision::Confusion(), aSurfBox); + BndLib_AddSurface::Add(*myS, ufirst, ulast, vfirst, vlast, Precision::Confusion(), aSurfBox); Standard_Real xmin, ymin, zmin, xmax, ymax, zmax; aSurfBox.Get(xmin, ymin, zmin, xmax, ymax, zmax); Standard_Real tmin = Precision::Infinite(), tmax = -tmin; @@ -207,10 +208,6 @@ void Extrema_ExtCS::Perform(const Adaptor3d_Curve& C, return; } -#ifndef DEB - default: -#endif - break; } break; } diff --git a/src/GeomFill/GeomFill_SweepSectionGenerator.cxx b/src/GeomFill/GeomFill_SweepSectionGenerator.cxx index 934c43e817..bba3f202c6 100644 --- a/src/GeomFill/GeomFill_SweepSectionGenerator.cxx +++ b/src/GeomFill/GeomFill_SweepSectionGenerator.cxx @@ -38,11 +38,10 @@ #ifdef DRAW #include -#endif -#ifdef DEB static Standard_Boolean Affich = Standard_False; static Standard_Integer NbSECTIONS = 0; #endif + //#define GF_DEB //======================================================================= //function : GeomFill_SweepSectionGenerator @@ -580,9 +579,7 @@ void GeomFill_SweepSectionGenerator::Section } #ifdef DRAW if ( Affich) { -//POP pour NT -// char name[100]; - char* name = new char[100]; + char name[256]; sprintf(name,"SECTION_%d",++NbSECTIONS); DrawTrSurf::Set(name,myFirstSect->Transformed(cumulTR)); } @@ -651,9 +648,7 @@ void GeomFill_SweepSectionGenerator::Section #ifdef DRAW if ( Affich) { -// POP pour NT -// char name[100]; - char* name = new char[100]; + char name[256]; sprintf(name,"SECTION_%d",++NbSECTIONS); DrawTrSurf::Set(name,BS); } diff --git a/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx b/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx index 8592562a31..4069277ce6 100644 --- a/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx +++ b/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx @@ -69,10 +69,23 @@ #include #include -// pour mes tests -#ifdef DEB -#include +#include +#include +#include +#include +#include +#include +// pour mes tests +#ifdef PLATE_DEB +#include +#endif + +#ifdef DRAW +#include +#include +#include +#include static Standard_Integer Affich=0; // 0 : Pas de display // 1 : Display des Geometries et controle intermediaire @@ -84,21 +97,6 @@ static Standard_Integer NbMark = 0; static Standard_Integer NbProj = 0; #endif -#ifdef DRAW -#include -#include -#include -#include -#endif - -#include -#include -#include -#include -#include -#include - - //\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\// // ========================================================= // C O N S T R U C T E U R S @@ -315,7 +313,7 @@ Handle(Geom2d_Curve) GeomPlate_BuildPlateSurface::ProjectCurve(const Handle(Ada } #if DRAW if (Affich) { - char* name = new char[100]; + char name[256]; sprintf(name,"proj_%d",++NbProj); DrawTrSurf::Set(name, Curve2d); } @@ -457,7 +455,7 @@ void GeomPlate_BuildPlateSurface:: //--------------------------------------------------------- void GeomPlate_BuildPlateSurface::Perform() { -#ifdef DEB +#ifdef PLATE_DEB // Chronmetrage OSD_Chronometer Chrono; Chrono.Reset(); @@ -1628,7 +1626,7 @@ void GeomPlate_BuildPlateSurface::ComputeSurfInit() myPlanarSurfInit = mySurfInit; #if DRAW if (Affich) { - char* name = new char[100]; + char name[256]; sprintf(name,"planinit_%d",NbPlan+1); DrawTrSurf::Set(name, mySurfInit); } @@ -1715,7 +1713,7 @@ void GeomPlate_BuildPlateSurface::ComputeSurfInit() #if DRAW if (Affich) { - char* name = new char[100]; + char name[256]; sprintf(name,"surfinit_%d",++NbPlan); DrawTrSurf::Set(name, mySurfInit); } @@ -1934,7 +1932,7 @@ Intersect(Handle(GeomPlate_HArray1OfSequenceOfReal)& PntInter, if (Affich > 1) { Handle(Draw_Marker3D) mark = new (Draw_Marker3D)(P1, Draw_X, Draw_vert); - char* name = new char[100]; + char name[256]; sprintf(name,"mark_%d",++NbMark); Draw::Set(name, mark); } @@ -2419,8 +2417,7 @@ VerifSurface(const Standard_Integer NbBoucle) LinCont->D0(U,P); Handle(Draw_Marker3D) mark = new (Draw_Marker3D)(P, Draw_X, Draw_orange); - char* name = new char[100]; - + char name[256]; sprintf(name,"mark_%d",++NbMark); Draw::Set(name, mark); if (!LinCont->ProjectedCurve().IsNull()) @@ -2451,7 +2448,7 @@ VerifSurface(const Standard_Integer NbBoucle) LinCont->D0(U,P); Handle(Draw_Marker3D) mark = new Draw_Marker3D(P, Draw_X, Draw_or); - char* name = new char[100]; + char name[256]; sprintf(name,"mark_%d",++NbMark); Draw::Set(name, mark); } diff --git a/src/GeomProjLib/GeomProjLib.cxx b/src/GeomProjLib/GeomProjLib.cxx index 59ffcfa437..40c4730971 100644 --- a/src/GeomProjLib/GeomProjLib.cxx +++ b/src/GeomProjLib/GeomProjLib.cxx @@ -59,8 +59,6 @@ #ifdef DRAW #include -#endif -#ifdef DEB static Standard_Boolean Affich = Standard_False; static Standard_Integer NBPROJ = 1; #endif @@ -83,9 +81,7 @@ Handle(Geom2d_Curve) GeomProjLib::Curve2d(const Handle(Geom_Curve)& C, { #ifdef DRAW if ( Affich) { -//POP pour NT -// char name[100]; - char* name = new char[100]; + char name[256]; Sprintf(name,"PROJCURV_%d",NBPROJ); DrawTrSurf::Set(name,C); Sprintf(name,"PROJSURF_%d",NBPROJ); diff --git a/src/IntCurveSurface/IntCurveSurface_Inter.gxx b/src/IntCurveSurface/IntCurveSurface_Inter.gxx index 694e0a4190..c99376a265 100644 --- a/src/IntCurveSurface/IntCurveSurface_Inter.gxx +++ b/src/IntCurveSurface/IntCurveSurface_Inter.gxx @@ -1610,9 +1610,8 @@ void IntCurveSurface_ComputeParamsOnQuadric(const TheSurface& surface, ElSLib::Parameters(TheSurfaceTool::Sphere(surface),P,u,v); break; } -#ifndef DEB - default: break; -#endif + default: + break; } } //======================================================================= diff --git a/src/IntPatch/IntPatch_ImpImpIntersection_0.gxx b/src/IntPatch/IntPatch_ImpImpIntersection_0.gxx index ead0c8cc80..44d73eb8ec 100644 --- a/src/IntPatch/IntPatch_ImpImpIntersection_0.gxx +++ b/src/IntPatch/IntPatch_ImpImpIntersection_0.gxx @@ -73,18 +73,10 @@ static void ProcessSegments (const IntPatch_SequenceOfSegmentOfTheSOnBounds&, const Standard_Real); static void ProcessRLine (IntPatch_SequenceOfLine&, -#ifndef DEB const IntSurf_Quadric&, const IntSurf_Quadric&, -#else - const Handle(Adaptor3d_HSurface)&, - const Handle(Adaptor3d_HSurface)&, -#endif const Standard_Real); - - - //-- le calcul de dist est completement faux ds la routine ci dessous a revoir (lbr le 18 nov 97) Standard_Boolean IntersectionWithAnArc(gp_Pnt& PSurf, const Handle(IntPatch_ALine)& alin, diff --git a/src/LocOpe/LocOpe_CSIntersector.cxx b/src/LocOpe/LocOpe_CSIntersector.cxx index 2c08028e1f..770c6ca559 100644 --- a/src/LocOpe/LocOpe_CSIntersector.cxx +++ b/src/LocOpe/LocOpe_CSIntersector.cxx @@ -51,21 +51,10 @@ static Standard_Boolean LocAfter (const LocOpe_SequenceOfPntFace&, Standard_Integer&, Standard_Integer&); -#ifdef DEB -static Standard_Boolean LocBefore (const LocOpe_SequenceOfPntFace&, - const Standard_Integer, - Standard_Integer&, - Standard_Integer&); -#endif - - static void AddPoints(IntCurvesFace_Intersector&, LocOpe_SequenceOfPntFace&, const TopoDS_Face&); - - - //======================================================================= //function : Init //purpose : diff --git a/src/TopOpeBRep/TopOpeBRep_Point2d.cxx b/src/TopOpeBRep/TopOpeBRep_Point2d.cxx index 51999a484f..18a74e125d 100644 --- a/src/TopOpeBRep/TopOpeBRep_Point2d.cxx +++ b/src/TopOpeBRep/TopOpeBRep_Point2d.cxx @@ -120,8 +120,11 @@ void TopOpeBRep_Point2d::Dump(const Standard_Integer E1index,const Standard_Inte #ifdef DRAW cout<