From: dbv@opencascade.com Date: Wed, 7 Mar 2012 13:00:48 +0000 (+0400) Subject: 0022922: Clean up warnings on uninitialized / unused variables X-Git-Tag: V6_5_3_beta1~47 X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=6e6cd5d949e088d453c5b3cd5da9ddabeee2317a 0022922: Clean up warnings on uninitialized / unused variables --- diff --git a/src/AIS2D/AIS2D_InteractiveContext.cxx b/src/AIS2D/AIS2D_InteractiveContext.cxx index be28903320..08913b2055 100755 --- a/src/AIS2D/AIS2D_InteractiveContext.cxx +++ b/src/AIS2D/AIS2D_InteractiveContext.cxx @@ -466,10 +466,6 @@ Standard_Integer AIS2D_InteractiveContext::OpenLocalContext( const Standard_Bool const Standard_Boolean AcceptEraseOfObj ) { if ( !IsCurrent( myLastPicked ) ) if ( !myLastPicked.IsNull() ) { -#ifdef DEB - AIS2D_TypeOfDetection HiMod = myLastPicked -> HasHighlightMode() ? - myLastPicked->HighlightMode() : myLastPicked->DefaultHighlightMode(); -#endif myLastPicked->Unhighlight(); } @@ -528,9 +524,6 @@ void AIS2D_InteractiveContext::CloseLocalContext( const Standard_Integer ind, if ( GoodIndex == myCurLocalIndex ) { myCurLocalIndex = HighestIndex(); -#ifdef DEB - const Handle(AIS2D_LocalContext)& LocCtx = myLocalContexts(myCurLocalIndex); -#endif } } @@ -1755,10 +1748,6 @@ void AIS2D_InteractiveContext::Highlight( const Handle(AIS2D_InteractiveObject)& break; } case AIS2D_DS_Erased: { -#ifdef DEB - Standard_Integer HiMode = anIObj->HasHighlightMode() ? - anIObj->HighlightMode() : anIObj->DefaultHighlightMode(); -#endif anIObj->Highlight(myCollectorVwr->InitializeColor( mySelectionColor )); if ( updateVwr ) myCollectorVwr->Update(); break; @@ -1804,7 +1793,6 @@ void AIS2D_InteractiveContext::HighlightWithColor( const Handle(AIS2D_Interactiv } case AIS2D_DS_Erased: { #ifdef DEB - Standard_Integer HiMode = anIObj->HasHighlightMode()? anIObj->HighlightMode():0; Standard_Integer indCol = myCollectorVwr->InitializeColor( aCol ); #endif if ( updateVwr) myCollectorVwr->Update(); @@ -2148,10 +2136,7 @@ AIS2D_StatusOfPick AIS2D_InteractiveContext::Select( const Standard_Boolean Upda myLocalContexts( myCurLocalIndex )->SetSelected( myLastPicked, UpdateVwr ); return AIS2D_SOP_OneSelected; } -#ifdef DEB - AIS2D_StatusOfPick PS( AIS2D_SOP_NothingSelected ); -#endif - + if ( ! mySeqOfDetIO->IsEmpty() ) { Handle(AIS2D_InteractiveObject) theIO; Handle(AIS2D_HSequenceOfPrimArchit) thePA; diff --git a/src/AIS2D/AIS2D_LocalContext.cxx b/src/AIS2D/AIS2D_LocalContext.cxx index 65067e0c4d..3bc7e6a78d 100755 --- a/src/AIS2D/AIS2D_LocalContext.cxx +++ b/src/AIS2D/AIS2D_LocalContext.cxx @@ -322,11 +322,7 @@ AIS2D_StatusOfDetection AIS2D_LocalContext::MoveTo( } if ( !myLastPicked.IsNull() ) if ( !myLastPicked->State() ) { -#ifdef DEB - AIS2D_TypeOfDetection HiMod = myLastPicked->HasHighlightMode() ? - myLastPicked->HighlightMode() : myLastPicked->DefaultHighlightMode(); -#endif - myLastPicked->Unhighlight(); + myLastPicked->Unhighlight(); UpdVwr = Standard_True; } // end if the last picked object isn't selected one @@ -379,9 +375,6 @@ AIS2D_StatusOfDetection AIS2D_LocalContext::MoveTo( } case AIS2D_TOD_VERTEX: { myLastPickPrim = myLastPicked->Primitive(myLastPicked->PickedIndex()); -#ifdef DEB - Standard_Integer pInd = myLastPicked->PickedIndex(); -#endif if ( myLastPickPrim != myLastSelPrim || ( myLastPickPrim == myLastSelPrim && myLastPickPrim->PickedIndex() != myLastSelElInd ) || diff --git a/src/AlienImage/AlienImage_X11XWDAlienData.cxx b/src/AlienImage/AlienImage_X11XWDAlienData.cxx index 5d27c71d4c..56a2feda66 100755 --- a/src/AlienImage/AlienImage_X11XWDAlienData.cxx +++ b/src/AlienImage/AlienImage_X11XWDAlienData.cxx @@ -340,10 +340,6 @@ Standard_Boolean AlienImage_X11XWDAlienData::Read( OSD_File& file ) } } -#ifdef DEB - AlienImage_X11XColor *p = ( AlienImage_X11XColor * )myColors ; -#endif - #ifdef TRACE if ( Verbose ) { AlienImage_X11XColor *p = ( AlienImage_X11XColor * )myColors; diff --git a/src/Approx/Approx_ComputeLine.gxx b/src/Approx/Approx_ComputeLine.gxx index 0788363242..896386a657 100755 --- a/src/Approx/Approx_ComputeLine.gxx +++ b/src/Approx/Approx_ComputeLine.gxx @@ -75,7 +75,6 @@ static void DUMP(const AppParCurves_MultiCurve& C) { static Standard_Integer nbappel = 0; Standard_Integer i; Standard_Integer nbpoles = C.NbPoles(); - Standard_Integer deg = C.Degree(); Handle(Geom_BezierCurve) BSp; Handle(Geom2d_BezierCurve) BSp2d; diff --git a/src/ApproxInt/ApproxInt_PrmPrmSvSurfaces.gxx b/src/ApproxInt/ApproxInt_PrmPrmSvSurfaces.gxx index 5d51647132..37d021db04 100755 --- a/src/ApproxInt/ApproxInt_PrmPrmSvSurfaces.gxx +++ b/src/ApproxInt/ApproxInt_PrmPrmSvSurfaces.gxx @@ -92,11 +92,7 @@ Standard_Boolean ApproxInt_PrmPrmSvSurfaces::Compute( Standard_Real& u1 Param(1) = u1; Param(2) = v1; Param(3) = u2; Param(4) = v2; math_FunctionSetRoot Rsnld(MyIntersectionOn2S.Function()); -#ifdef DEB - IntImp_ConstIsoparametric ChoixIso = MyIntersectionOn2S.Perform(Param,Rsnld); -#else MyIntersectionOn2S.Perform(Param,Rsnld); -#endif if (!MyIntersectionOn2S.IsDone()) { MyHasBeenComputed = MyHasBeenComputedbis = Standard_False; return(Standard_False); diff --git a/src/BOPTools/BOPTools_PaveFiller_2.cxx b/src/BOPTools/BOPTools_PaveFiller_2.cxx index b64a2fc239..9e129c20a7 100755 --- a/src/BOPTools/BOPTools_PaveFiller_2.cxx +++ b/src/BOPTools/BOPTools_PaveFiller_2.cxx @@ -252,7 +252,7 @@ BOPTools_ListIteratorOfListOfCommonBlock anItCB(aLCB); for (; anItCB.More(); anItCB.Next()) { BOPTools_CommonBlock& aCB=anItCB.Value(); - BOPTools_PaveBlock& aPB1=aCB.PaveBlock1(nE1); + //BOPTools_PaveBlock& aPB1=aCB.PaveBlock1(nE1); BOPTools_PaveBlock& aPB2=aCB.PaveBlock2(nE1); nE=aPB2.OriginalEdge(); if (nE==nE2) { diff --git a/src/BOPTools/BOPTools_Tools3D.cxx b/src/BOPTools/BOPTools_Tools3D.cxx index 80b0aa7804..2e3f0c8245 100755 --- a/src/BOPTools/BOPTools_Tools3D.cxx +++ b/src/BOPTools/BOPTools_Tools3D.cxx @@ -1129,7 +1129,7 @@ static void GetApproxNormalToFaceOnEdgeEx(const TopoDS_Edge& aE, for( iKey = 1; iKey <= nbKeys; iKey++ ) { const TopoDS_Vertex& iV = TopoDS::Vertex(mapVE.FindKey(iKey)); if( iV.IsNull() ) continue; - Standard_Real TolV = BRep_Tool::Tolerance(iV); + //Standard_Real TolV = BRep_Tool::Tolerance(iV); const TopTools_ListOfShape& iLE = mapVE.FindFromIndex(iKey); Standard_Integer nbE = iLE.Extent(); if( nbE != 2 ) { @@ -1251,7 +1251,7 @@ static Standard_Boolean PseudoSDFaces(const BRepAdaptor_Surface& BS1, const TopoDS_Face& aF1 = BS1.Face(); - Standard_Real maxTolE1 = 1.e-7, maxTolV1 = 1.e-7; + Standard_Real maxTolE1 = 1.e-7; Standard_Integer nbE1 = 0, nbOnE1 = 0; for(anExpE.Init(aF1, TopAbs_EDGE); anExpE.More(); anExpE.Next()) { const TopoDS_Edge& aE = TopoDS::Edge(anExpE.Current()); @@ -1307,7 +1307,7 @@ static Standard_Boolean PseudoSDFaces(const BRepAdaptor_Surface& BS1, return Standard_False; const TopoDS_Face& aF2 = BS1.Face(); - Standard_Real maxTolE2 = 1.e-7, maxTolV2 = 1.e-7; + Standard_Real maxTolE2 = 1.e-7; Standard_Integer nbE2 = 0, nbOnE2 = 0; for(anExpE.Init(aF2, TopAbs_EDGE); anExpE.More(); anExpE.Next()) { const TopoDS_Edge& aE = TopoDS::Edge(anExpE.Current()); diff --git a/src/BRepAlgo/BRepAlgo_BooleanOperation.cxx b/src/BRepAlgo/BRepAlgo_BooleanOperation.cxx index b1e2aaff7e..e388fc8b94 100755 --- a/src/BRepAlgo/BRepAlgo_BooleanOperation.cxx +++ b/src/BRepAlgo/BRepAlgo_BooleanOperation.cxx @@ -116,11 +116,7 @@ Standard_IMPORT void FDSSDM_Close();// see TopOpeBRepDS_samdom.cxx // define face/face intersection tolerances Standard_Boolean forcetoli = Standard_False; if (forcetoli) { -#ifndef DEB Standard_Real tolarc=0,toltang=0; -#else - Standard_Real tolarc,toltang; -#endif TopOpeBRep_ShapeIntersector& tobsi = DSFiller.ChangeShapeIntersector(); TopOpeBRep_FacesIntersector& tobfi = tobsi.ChangeFacesIntersector(); tobfi.ForceTolerances(tolarc,toltang); diff --git a/src/BRepBlend/BRepBlend_RstRstConstRad.cxx b/src/BRepBlend/BRepBlend_RstRstConstRad.cxx index 69152647b5..e1ea2e2c98 100755 --- a/src/BRepBlend/BRepBlend_RstRstConstRad.cxx +++ b/src/BRepBlend/BRepBlend_RstRstConstRad.cxx @@ -812,9 +812,6 @@ Standard_Boolean BRepBlend_RstRstConstRad::Section(const Blend_Point& P, math_Matrix gradsol(1, 2, 1, 2); Standard_Real prm = P.Parameter(); -#ifdef DEB - Standard_Integer NbSpan = (Poles.Length() - 1) / 2; -#endif Standard_Integer low = Poles.Lower(); Standard_Integer upp = Poles.Upper(); Standard_Boolean istgt; diff --git a/src/BRepBlend/BRepBlend_RstRstEvolRad.cxx b/src/BRepBlend/BRepBlend_RstRstEvolRad.cxx index 1c928ff7c2..b277397660 100755 --- a/src/BRepBlend/BRepBlend_RstRstEvolRad.cxx +++ b/src/BRepBlend/BRepBlend_RstRstEvolRad.cxx @@ -915,9 +915,6 @@ Standard_Boolean BRepBlend_RstRstEvolRad::Section(const Blend_Point& P, math_Matrix gradsol(1, 2, 1, 2); Standard_Real prm = P.Parameter(); -#ifdef DEB - Standard_Integer NbSpan = (Poles.Length() - 1) / 2; -#endif Standard_Integer low = Poles.Lower(); Standard_Integer upp = Poles.Upper(); Standard_Boolean istgt; diff --git a/src/BRepBlend/BRepBlend_SurfCurvConstRadInv.cxx b/src/BRepBlend/BRepBlend_SurfCurvConstRadInv.cxx index 8a03cca015..f98f598137 100755 --- a/src/BRepBlend/BRepBlend_SurfCurvConstRadInv.cxx +++ b/src/BRepBlend/BRepBlend_SurfCurvConstRadInv.cxx @@ -102,9 +102,6 @@ Standard_Boolean BRepBlend_SurfCurvConstRadInv::Derivatives(const math_Vector& X Standard_Real normd1gui = d1gui.Magnitude(); Standard_Real unsurnormd1gui = 1./normd1gui; gp_Vec nplan = d1gui.Multiplied(unsurnormd1gui); -#ifdef DEB - Standard_Real theD = -(nplan.XYZ().Dot(ptgui.XYZ())); -#endif gp_Vec dnplan; dnplan.SetLinearForm(-nplan.Dot(d2gui),nplan,d2gui); dnplan.Multiply(unsurnormd1gui); diff --git a/src/BRepBlend/BRepBlend_SurfCurvEvolRadInv.cxx b/src/BRepBlend/BRepBlend_SurfCurvEvolRadInv.cxx index cc4b2de817..e4a41fa53b 100755 --- a/src/BRepBlend/BRepBlend_SurfCurvEvolRadInv.cxx +++ b/src/BRepBlend/BRepBlend_SurfCurvEvolRadInv.cxx @@ -100,9 +100,6 @@ const Handle(Adaptor3d_HCurve)& Cg, ray=sg1*ray; dray=sg1*dray; gp_Vec nplan = d1gui.Multiplied(unsurnormd1gui); -#ifdef DEB - Standard_Real theD = -(nplan.XYZ().Dot(ptgui.XYZ())); -#endif gp_Vec dnplan; dnplan.SetLinearForm(-nplan.Dot(d2gui),nplan,d2gui); dnplan.Multiply(unsurnormd1gui); diff --git a/src/BRepBlend/BRepBlend_SurfRstConstRad.cxx b/src/BRepBlend/BRepBlend_SurfRstConstRad.cxx index db4e9e5089..b289d0dd39 100755 --- a/src/BRepBlend/BRepBlend_SurfRstConstRad.cxx +++ b/src/BRepBlend/BRepBlend_SurfRstConstRad.cxx @@ -869,9 +869,6 @@ Standard_Boolean BRepBlend_SurfRstConstRad::Section math_Matrix gradsol(1,3,1,3); Standard_Real prm = P.Parameter(); -#ifdef DEB - Standard_Integer NbSpan=(Poles.Length()-1)/2; -#endif Standard_Integer low = Poles.Lower(); Standard_Integer upp = Poles.Upper(); Standard_Boolean istgt; diff --git a/src/BRepBlend/BRepBlend_SurfRstEvolRad.cxx b/src/BRepBlend/BRepBlend_SurfRstEvolRad.cxx index dc4ce52531..c6b43c656e 100755 --- a/src/BRepBlend/BRepBlend_SurfRstEvolRad.cxx +++ b/src/BRepBlend/BRepBlend_SurfRstEvolRad.cxx @@ -877,9 +877,6 @@ TColStd_Array1OfReal& DWeigths) math_Matrix gradsol(1,3,1,3); Standard_Real prm = P.Parameter(),rayprim; -#ifdef DEB - Standard_Integer NbSpan=(Poles.Length()-1)/2; -#endif Standard_Integer low = Poles.Lower(); Standard_Integer upp = Poles.Upper(); Standard_Boolean istgt; diff --git a/src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx b/src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx index 7a0db28fa1..15a3880598 100755 --- a/src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx +++ b/src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx @@ -909,9 +909,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfCurvFuncInv& Handle(Adaptor3d_HVertex)& Vtx) { Standard_Boolean recadre = Standard_False; -#ifdef DEB - Standard_Boolean byinter = (line->NbPoints() != 0); -#endif + gp_Pnt2d pt2d, lastpt2d; Standard_Integer IndexSol, nbarc; Standard_Real pmin; diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx index 9f41bcf223..cb0d21d3b5 100755 --- a/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx +++ b/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx @@ -1479,7 +1479,6 @@ Standard_Boolean BRepBuilderAPI_Sewing::FindCandidates(TopTools_SequenceOfShape& Standard_Boolean isInserted = Standard_False; Standard_Integer j, ori = (arrForward(i)? 1 : 0); for (j = 1; (j <= seqCandidates.Length()) && !isInserted; j++) { - Standard_Integer aInd = seqCandidates.Value(j);//debug Standard_Real aDelta = arrDistance(i) - arrDistance(seqCandidates.Value(j)); //if (arrDistance(i) <= arrDistance(seqCandidates.Value(j))) { if( aDelta < Precision::Confusion()) { diff --git a/src/BRepCheck/BRepCheck_Edge.cxx b/src/BRepCheck/BRepCheck_Edge.cxx index 9243600de9..3b5cec01a4 100755 --- a/src/BRepCheck/BRepCheck_Edge.cxx +++ b/src/BRepCheck/BRepCheck_Edge.cxx @@ -562,7 +562,7 @@ Standard_Boolean Validate(const Adaptor3d_Curve& CRef, fabs( Other.LastParameter()-Last) > aPC); if (!proj) { Standard_Integer i; - Standard_Real Tol2, prm, aD2, dD; + Standard_Real Tol2, prm, dD; gp_Pnt pref, pother; //modified by NIZNHY-PKV Thu May 05 09:06:41 2011f //OCC22428 diff --git a/src/BRepCheck/BRepCheck_Face.cxx b/src/BRepCheck/BRepCheck_Face.cxx index 0ba73dd3ea..786638552d 100755 --- a/src/BRepCheck/BRepCheck_Face.cxx +++ b/src/BRepCheck/BRepCheck_Face.cxx @@ -266,10 +266,7 @@ BRepCheck_Status BRepCheck_Face::ClassifyWires(const Standard_Boolean Update) TopoDS_Shape aLocalShape = myShape.EmptyCopied(); TopoDS_Face newFace = TopoDS::Face(aLocalShape); // TopoDS_Face newFace = TopoDS::Face(myShape.EmptyCopied()); -#ifdef DEB - TopAbs_Orientation orWire = -#endif - wir1.Orientation(); + newFace.Orientation(TopAbs_FORWARD); B.Add(newFace,wir1); diff --git a/src/BRepCheck/BRepCheck_Shell.cxx b/src/BRepCheck/BRepCheck_Shell.cxx index a45c86efb6..34c42b29fa 100755 --- a/src/BRepCheck/BRepCheck_Shell.cxx +++ b/src/BRepCheck/BRepCheck_Shell.cxx @@ -433,7 +433,6 @@ BRepCheck_Status BRepCheck_Shell::Orientation(const Standard_Boolean Update) if (BRepCheck_Trace(0) > 1) { TopTools_DataMapIteratorOfDataMapOfShapeInteger itt(MapOfShapeOrientation); Standard_Integer upper = MapOfShapeOrientation.NbBuckets(); - Standard_Integer code = 0; cout << "La map shape Orientation :" << endl; for (; itt.More(); itt.Next()) { PrintShape(itt.Key(), upper); diff --git a/src/BRepCheck/BRepCheck_Wire.cxx b/src/BRepCheck/BRepCheck_Wire.cxx index 1a4918551d..9e5384b5f3 100755 --- a/src/BRepCheck/BRepCheck_Wire.cxx +++ b/src/BRepCheck/BRepCheck_Wire.cxx @@ -887,7 +887,7 @@ BRepCheck_Status BRepCheck_Wire::SelfIntersect(const TopoDS_Face& F, // if(Inter.IsDone()) { Standard_Integer nbp = Inter.NbPoints(); - Standard_Integer nbs = Inter.NbSegments(); + //Standard_Integer nbs = Inter.NbSegments(); // for(Standard_Integer p=1;p<=nbp;p++) { const IntRes2d_IntersectionPoint& IP=Inter.Point(p); diff --git a/src/BRepClass3d/BRepClass3d_SolidExplorer.cxx b/src/BRepClass3d/BRepClass3d_SolidExplorer.cxx index 5f9ec0a55c..cf0ae95066 100755 --- a/src/BRepClass3d/BRepClass3d_SolidExplorer.cxx +++ b/src/BRepClass3d/BRepClass3d_SolidExplorer.cxx @@ -102,10 +102,6 @@ Standard_Boolean BRepClass3d_SolidExplorer::FindAPointInTheFace { TopoDS_Edge Edge = TopoDS::Edge (faceexplorer.Current()); c.Initialize (Edge, face); -#ifdef DEB - Standard_Integer nbinterval = -#endif - c.NbIntervals(GeomAbs_C1); c.D1((c.LastParameter() - c.FirstParameter()) * param_ + c.FirstParameter(),P,T); Standard_Real x = T.X(); diff --git a/src/BRepExtrema/BRepExtrema_DistanceSS.cxx b/src/BRepExtrema/BRepExtrema_DistanceSS.cxx index cb4eb3665e..74d439bc48 100755 --- a/src/BRepExtrema/BRepExtrema_DistanceSS.cxx +++ b/src/BRepExtrema/BRepExtrema_DistanceSS.cxx @@ -773,7 +773,6 @@ void BRepExtrema_DistanceSS::Perform(const TopoDS_Vertex& S1, const TopoDS_Face& gp_Pnt Pt,P1=BRep_Tool::Pnt(S1); BRepClass_FaceClassifier classifier; const Standard_Real tol = BRep_Tool::Tolerance(S2); - const Standard_Real epsP = Precision::PConfusion(); for (i = 1; i <= NbExtrema; i++) { @@ -830,7 +829,6 @@ void BRepExtrema_DistanceSS::Perform(const TopoDS_Face& S1, const TopoDS_Vertex& gp_Pnt Pt,P1=BRep_Tool::Pnt(S2); BRepClass_FaceClassifier classifier; const Standard_Real tol = BRep_Tool::Tolerance(S1); - const Standard_Real epsP = Precision::PConfusion(); for (i = 1; i <= NbExtrema; i++) { @@ -1079,7 +1077,6 @@ void BRepExtrema_DistanceSS::Perform(const TopoDS_Edge& S1, const TopoDS_Face& S BRepExtrema_SeqOfSolution seqSol1; BRepExtrema_SeqOfSolution seqSol2; - Standard_Boolean bIsMini = Standard_False; if (SeqSolution1.Length() > 0 && SeqSolution2.Length() > 0) MIN_SOLUTION(SeqSolution1, SeqSolution2, myDstRef, myEps, seqSol1, seqSol2); @@ -1225,7 +1222,6 @@ void BRepExtrema_DistanceSS::Perform(const TopoDS_Face& S1, const TopoDS_Edge& S BRepExtrema_SeqOfSolution seqSol1; BRepExtrema_SeqOfSolution seqSol2; - Standard_Boolean bIsMini = Standard_False; if (SeqSolution1.Length() > 0 && SeqSolution2.Length() > 0) MIN_SOLUTION(SeqSolution1, SeqSolution2, myDstRef, myEps, seqSol1, seqSol2); @@ -1269,7 +1265,6 @@ void BRepExtrema_DistanceSS::Perform(const TopoDS_Face& S1, const TopoDS_Face& S gp_Pnt2d PUV; Standard_Real U1,V1,U2,V2; BRepClass_FaceClassifier classifier; - const Standard_Real epsP=Precision::PConfusion(); for (i = 1; i <= NbExtrema; i++) { diff --git a/src/BRepFeat/BRepFeat_MakeLinearForm.cxx b/src/BRepFeat/BRepFeat_MakeLinearForm.cxx index a5e932d4af..2d82aeb831 100755 --- a/src/BRepFeat/BRepFeat_MakeLinearForm.cxx +++ b/src/BRepFeat/BRepFeat_MakeLinearForm.cxx @@ -622,10 +622,6 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase, counter1++; NewListOfEdges.Append(edg); theEdge = eeee; -#ifdef DEB - Standard_Real dist1 = -#endif - theLastPnt.Distance(myLastPnt); if(dist <= myTol) theFEdge = edg; @@ -1148,13 +1144,7 @@ void BRepFeat_MakeLinearForm::Perform() // end by chaining the section return Standard_False; } -// #ifdef DEB -// Standard_Boolean isnb= -// #endif TopTools_ListOfShape thelist1; -#ifdef DEB - Standard_Boolean isnb= -#endif mySlface.Bind(CurrentFace, thelist1); mySlface(CurrentFace).Append(edg1); myListOfEdges.Append(edg1); diff --git a/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx b/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx index 8ee1198524..cd03f8b423 100755 --- a/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx +++ b/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx @@ -437,14 +437,6 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase, if(Sliding && !PtOnFirstEdge) { BRepExtrema_ExtCF ext1(TopoDS::Edge(ee1.Shape()), FirstFace); -#ifdef DEB - Standard_Integer nb = -#endif - ext1.NbExt(); -#ifdef DEB - Standard_Real dist = -#endif - ext1.SquareDistance(1); if(ext1.NbExt() < 1 || ext1.SquareDistance(1) > Precision::Confusion() * Precision::Confusion()) Sliding = Standard_False; } @@ -754,10 +746,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase, counter1++; NewListOfEdges.Append(edg); theEdge = eeee; -#ifdef DEB - Standard_Real dist1 = -#endif - theLastPnt.Distance(myLastPnt); + if(dist <= myTol) theFEdge = edg; theLastPnt = BRep_Tool::Pnt(TopExp::LastVertex(theEdge,Standard_True)); diff --git a/src/BRepFill/BRepFill_CompatibleWires.cxx b/src/BRepFill/BRepFill_CompatibleWires.cxx index 812e5b6a98..24f4678a54 100755 --- a/src/BRepFill/BRepFill_CompatibleWires.cxx +++ b/src/BRepFill/BRepFill_CompatibleWires.cxx @@ -475,10 +475,6 @@ static Standard_Boolean EdgeIntersectOnWire (const gp_Pnt& P1, TopoDS_Shape aLocalShape = DSS.SupportOnShape2(isol); TopoDS_Edge E = TopoDS::Edge(aLocalShape); // TopoDS_Edge E = TopoDS::Edge(DSS.SupportOnShape2(isol)); -#ifdef DEB - Standard_Real tol = -#endif - Precision::PConfusion(); Standard_Real first,last,param; DSS.ParOnEdgeS2(isol,param); BRep_Tool::Range(E,first,last); diff --git a/src/BRepFill/BRepFill_Draft.cxx b/src/BRepFill/BRepFill_Draft.cxx index 44c30f8335..eda0d81781 100755 --- a/src/BRepFill/BRepFill_Draft.cxx +++ b/src/BRepFill/BRepFill_Draft.cxx @@ -387,9 +387,6 @@ static Standard_Boolean GoodOrientation(const Bnd_Box& B, // bounding box of the stop shape Bnd_Box BSurf;//, TheBox; Standard_Real Umin, Umax, Vmin, Vmax; -#ifdef DEB - Standard_Real Tol = Precision::Confusion()/10; -#endif // BRepTools B; // BRep_Tool BT; Handle(Geom_Surface) Surf; diff --git a/src/BRepFill/BRepFill_Evolved.cxx b/src/BRepFill/BRepFill_Evolved.cxx index 019d80b867..0fc0b78daa 100755 --- a/src/BRepFill/BRepFill_Evolved.cxx +++ b/src/BRepFill/BRepFill_Evolved.cxx @@ -327,10 +327,6 @@ static Standard_Boolean IsPlanar(const TopoDS_Edge& E) static Standard_Integer Side(const TopoDS_Wire& Profil, const Standard_Real Tol) { -#ifdef DEB - Standard_Boolean OnLeft = Standard_False; - Standard_Boolean OnRight = Standard_False; -#endif TopoDS_Vertex V1,V2; // Rem : it is enough to test the first edge of the Wire. // ( Correctly cut in PrepareProfil) @@ -1834,15 +1830,8 @@ void BRepFill_Evolved::Add( BRepFill_Evolved& Vevo, // if one remains on the same edge. // if one passes from left to the right they are inverted. //------------------------------------------------- ------------- -#ifndef DEB Standard_Boolean Commun = Standard_False; -#else - Standard_Boolean Commun; -#endif -#ifdef DEB - TopAbs_Orientation OriSide = -#endif - Relative(myProfile,Prof, + Relative(myProfile,Prof, TopoDS::Vertex(VV), Commun); @@ -2933,11 +2922,6 @@ TopAbs_Orientation OriEdgeInFace (const TopoDS_Edge& E, const TopoDS_Face& F ) { -#ifdef DEB - TopAbs_Orientation O = -#endif - F.Orientation(); - TopExp_Explorer Exp(F.Oriented(TopAbs_FORWARD),TopAbs_EDGE); for (; Exp.More() ;Exp.Next()) { diff --git a/src/BRepFill/BRepFill_OffsetWire.cxx b/src/BRepFill/BRepFill_OffsetWire.cxx index 079bf7e603..0e9de174b5 100755 --- a/src/BRepFill/BRepFill_OffsetWire.cxx +++ b/src/BRepFill/BRepFill_OffsetWire.cxx @@ -1827,10 +1827,6 @@ void MakeOffset (const TopoDS_Edge& E, // if the offset is greater otr equal to the radius and the side of the // concavity of the circle => edge null. gp_Circ2d C1(AC.Circle()); -#ifdef DEB - Standard_Real radius = -#endif - C1.Radius(); gp_Ax22d axes( C1.Axis()); gp_Dir2d Xd = axes.XDirection(); gp_Dir2d Yd = axes.YDirection(); diff --git a/src/BRepFill/BRepFill_PipeShell.cxx b/src/BRepFill/BRepFill_PipeShell.cxx index c2a92cf608..bbf0f11b84 100755 --- a/src/BRepFill/BRepFill_PipeShell.cxx +++ b/src/BRepFill/BRepFill_PipeShell.cxx @@ -1043,7 +1043,6 @@ void BRepFill_PipeShell::BuildHistory(const BRepFill_Sweep& theSweep) } for(j = myLocation->NbLaw(); j >= 1; j--) { - Standard_Boolean ismodified = Standard_False; TopTools_ListOfShape aListOfFace; if(bPrevModified) { diff --git a/src/BRepGProp/BRepGProp_Face.cxx b/src/BRepGProp/BRepGProp_Face.cxx index 9c48f441e1..946e91b176 100755 --- a/src/BRepGProp/BRepGProp_Face.cxx +++ b/src/BRepGProp/BRepGProp_Face.cxx @@ -365,8 +365,8 @@ void BRepGProp_Face::VKnots(TColStd_Array1OfReal& Knots) const Standard_Integer BRepGProp_Face::LIntOrder(const Standard_Real Eps) const { Bnd_Box2d aBox; - BndLib_Add2dCurve aB; - aB.Add(myCurve, 1.e-7, aBox); + + BndLib_Add2dCurve::Add(myCurve, 1.e-7, aBox); Standard_Real aXmin, aXmax, aYmin, aYmax; aBox.Get(aXmin, aYmin, aXmax, aYmax); Standard_Real aVmin = mySurface.FirstVParameter(); diff --git a/src/BRepMesh/BRepMesh_FastDiscret.cxx b/src/BRepMesh/BRepMesh_FastDiscret.cxx index 15f1c4d223..3c306dcb0e 100755 --- a/src/BRepMesh/BRepMesh_FastDiscret.cxx +++ b/src/BRepMesh/BRepMesh_FastDiscret.cxx @@ -318,7 +318,6 @@ void BRepMesh_FastDiscret::Add(const TopoDS_Face& theface, gp_Pnt2d uvFirst, uvLast; - TopAbs_Orientation orFace = face.Orientation(); Handle(Poly_Triangulation) T; TopLoc_Location loc; diff --git a/src/BRepMesh/BRepMesh_FastDiscretFace.cxx b/src/BRepMesh/BRepMesh_FastDiscretFace.cxx index 27bf026d70..2dbb5e422f 100755 --- a/src/BRepMesh/BRepMesh_FastDiscretFace.cxx +++ b/src/BRepMesh/BRepMesh_FastDiscretFace.cxx @@ -1186,7 +1186,6 @@ Standard_Real BRepMesh_FastDiscretFace::Control(const Handle(BRepAdaptor_HSurfac //IMPORTANT: Constants used in calculations const Standard_Real MinimalArea2d = 1.e-9; const Standard_Real MinimalSqLength3d = 1.e-12; - const Standard_Real aDef2 = theDefFace*theDefFace; // Define the number of iterations Standard_Integer myNbIterations = 11; @@ -1212,8 +1211,6 @@ Standard_Real BRepMesh_FastDiscretFace::Control(const Handle(BRepAdaptor_HSurfac Standard_Boolean caninsert; Standard_Real sqdefface = theDefFace * theDefFace; - Standard_Real ddu = theCaro->UResolution(theDefFace); - Standard_Real ddv = theCaro->VResolution(theDefFace); GeomAbs_SurfaceType thetype = theCaro->GetType(); Handle(Geom_Surface) BSpl; @@ -1551,7 +1548,6 @@ void BRepMesh_FastDiscretFace::AddInShape(const TopoDS_Face& theFace, const BRepMesh_Edge& ve1=myStructure->GetLink(e1); const BRepMesh_Edge& ve2=myStructure->GetLink(e2); - const BRepMesh_Edge& ve3=myStructure->GetLink(e3); if (o1) { v1=ve1.FirstNode(); diff --git a/src/BRepOffset/BRepOffset_Inter2d.cxx b/src/BRepOffset/BRepOffset_Inter2d.cxx index b50ba74d36..d09e151645 100755 --- a/src/BRepOffset/BRepOffset_Inter2d.cxx +++ b/src/BRepOffset/BRepOffset_Inter2d.cxx @@ -1117,8 +1117,6 @@ static void ExtentEdge(const TopoDS_Edge& E,TopoDS_Edge& NE, const Standard_Real MinLoc = E.Location() * MinLoc; if (!C3d.IsNull()) { - Standard_Real FirstPar = C3d->FirstParameter(); - Standard_Real LastPar = C3d->LastParameter(); if (MinPC->IsClosed()) { f = FirstParOnPC; diff --git a/src/BRepOffset/BRepOffset_MakeOffset.cxx b/src/BRepOffset/BRepOffset_MakeOffset.cxx index cf2c262398..b29d900f7b 100755 --- a/src/BRepOffset/BRepOffset_MakeOffset.cxx +++ b/src/BRepOffset/BRepOffset_MakeOffset.cxx @@ -1020,9 +1020,6 @@ void BRepOffset_MakeOffset::BuildOffsetByInter() TopoDS_Shape NE; TopoDS_Edge TNE; TopoDS_Face NF; -#ifdef DEB - TopAbs_Orientation Or; -#endif for (Exp.Init(myShape,TopAbs_FACE) ; Exp.More(); Exp.Next()) { const TopoDS_Face& FI = TopoDS::Face(Exp.Current()); @@ -1549,9 +1546,6 @@ void BRepOffset_MakeOffset::BuildOffsetByArc() BRepOffset_Type RT = BRepOffset_Concave; if (myOffset < 0.) RT = BRepOffset_Convex; BRepOffset_DataMapIteratorOfDataMapOfShapeOffset It(MapSF); -#ifdef DEB - Standard_Integer MapSFNb = MapSF.Extent(); -#endif for ( ; It.More(); It.Next()) { const TopoDS_Shape& SI = It.Key(); const BRepOffset_Offset& SF = It.Value(); diff --git a/src/BRepOffset/BRepOffset_Tool.cxx b/src/BRepOffset/BRepOffset_Tool.cxx index 2541296612..97060d8041 100755 --- a/src/BRepOffset/BRepOffset_Tool.cxx +++ b/src/BRepOffset/BRepOffset_Tool.cxx @@ -185,10 +185,6 @@ TopAbs_Orientation BRepOffset_Tool::OriEdgeInFace (const TopoDS_Edge& E, const TopoDS_Face& F ) { -#ifdef DEB - TopAbs_Orientation O = -#endif - F.Orientation(); TopExp_Explorer Exp; Exp.Init(F.Oriented(TopAbs_FORWARD),TopAbs_EDGE); diff --git a/src/BRepTest/BRepTest_CurveCommands.cxx b/src/BRepTest/BRepTest_CurveCommands.cxx index c9e23364fe..6b684b05c1 100755 --- a/src/BRepTest/BRepTest_CurveCommands.cxx +++ b/src/BRepTest/BRepTest_CurveCommands.cxx @@ -1128,7 +1128,6 @@ static Standard_Integer bsplineprof(Draw_Interpretor& di, return 0; #ifdef DEB - badargs: di << "profile : bad number of arguments"; return 1; #endif diff --git a/src/BRepTest/BRepTest_FillingCommands.cxx b/src/BRepTest/BRepTest_FillingCommands.cxx index f81b4cecaa..67ee87ef68 100755 --- a/src/BRepTest/BRepTest_FillingCommands.cxx +++ b/src/BRepTest/BRepTest_FillingCommands.cxx @@ -193,10 +193,6 @@ static Standard_Integer plate (Draw_Interpretor & di,Standard_Integer n,const ch DBRep::Set(name, E); MW.Add(E); if (MW.IsDone()==Standard_False) { -#if DEB - BRepBuilderAPI_WireError err = -#endif - MW.Error(); Standard_Failure::Raise("mkWire is over "); } @@ -429,10 +425,6 @@ static Standard_Integer approxplate (Draw_Interpretor & di,Standard_Integer n,co BRepLib::BuildCurve3d(E); MW.Add(E); if (MW.IsDone()==Standard_False) { -#ifdef DEB - BRepBuilderAPI_WireError err = -#endif - MW.Error(); Standard_Failure::Raise("mkWire is over "); } } diff --git a/src/BRepTools/BRepTools_Quilt.cxx b/src/BRepTools/BRepTools_Quilt.cxx index 29b5803684..5ded198e45 100755 --- a/src/BRepTools/BRepTools_Quilt.cxx +++ b/src/BRepTools/BRepTools_Quilt.cxx @@ -194,11 +194,6 @@ void BRepTools_Quilt::Add(const TopoDS_Shape& S) TopoDS_Wire NW; B.MakeWire(NW); TopoDS_Iterator ite(W,Standard_False); -#ifdef DEB - Standard_Real Tol = BRep_Tool::Tolerance(F); -#else - BRep_Tool::Tolerance(F); -#endif Standard_Real UFirst,ULast; // Reconstruction des wires. @@ -444,8 +439,6 @@ TopoDS_Shape BRepTools_Quilt::Shells() const TopoDS_Shape arefShape = SH.Oriented(TopAbs_FORWARD) ; B.Add ( arefShape ,Fo.Oriented(NewO)); } - Standard_Integer kk =1; - Standard_Integer p =0; // Rebind the free edges of the old shell to the new shell //gka BUG 6491 TopExp_Explorer aexp(SH,TopAbs_EDGE); diff --git a/src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.cxx b/src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.cxx index 639604e84c..fbc0c77043 100755 --- a/src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.cxx +++ b/src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.cxx @@ -269,7 +269,7 @@ BRepTopAdaptor_FClass2d::BRepTopAdaptor_FClass2d(const TopoDS_Face& aFace,const { //Standard_Real anglep=0,anglem=0; TColgp_Array1OfPnt2d PClass(1,nbpnts); - Standard_Real angle = 0.0, square = 0.0; + Standard_Real square = 0.0; //------------------------------------------------------------------- //-- ** The mode of calculation was somewhat changed diff --git a/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx b/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx index fbab7f6ecd..5ce06c04af 100755 --- a/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx +++ b/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx @@ -95,7 +95,6 @@ void BinMDataStd_ExtStringArrayDriver::Paste const TColStd_Array1OfExtendedString& aSourceArray = anAtt->Array()->Array1(); const Standard_Integer aFirstInd = aSourceArray.Lower(); const Standard_Integer aLastInd = aSourceArray.Upper(); - const Standard_Integer aLength = aLastInd - aFirstInd + 1; theTarget << aFirstInd << aLastInd; for (Standard_Integer i = aFirstInd; i <= aLastInd; i ++) theTarget << anAtt->Value( i ); diff --git a/src/BinMDataStd/BinMDataStd_ExtStringListDriver.cxx b/src/BinMDataStd/BinMDataStd_ExtStringListDriver.cxx index f41effb838..937fe3393c 100755 --- a/src/BinMDataStd/BinMDataStd_ExtStringListDriver.cxx +++ b/src/BinMDataStd/BinMDataStd_ExtStringListDriver.cxx @@ -68,7 +68,6 @@ void BinMDataStd_ExtStringListDriver::Paste(const Handle(TDF_Attribute)& theSour Handle(TDataStd_ExtStringList) anAtt = Handle(TDataStd_ExtStringList)::DownCast(theSource); const Standard_Integer aFirstInd = 1; const Standard_Integer aLastInd = anAtt->Extent(); - const Standard_Integer aLength = aLastInd - aFirstInd + 1; theTarget << aFirstInd << aLastInd; TDataStd_ListIteratorOfListOfExtendedString itr(anAtt->List()); for (; itr.More(); itr.Next()) diff --git a/src/Blend/Blend_CSWalking_4.gxx b/src/Blend/Blend_CSWalking_4.gxx index 32c3e0fbd6..e2c7e12561 100755 --- a/src/Blend/Blend_CSWalking_4.gxx +++ b/src/Blend/Blend_CSWalking_4.gxx @@ -11,13 +11,8 @@ void Blend_CSWalking::InternalPerform(Blend_CSFunction& Func, TopAbs_State situ; Standard_Real w,U,V; Standard_Integer nbarc; -#ifndef DEB Standard_Integer Index = 0; Standard_Boolean Isvtx = Standard_False; -#else - Standard_Integer Index; - Standard_Boolean Isvtx; -#endif Standard_Integer Nbvar = Func.NbVariables(); Standard_Boolean Arrive,recad,echecrecad; gp_Pnt2d p2d; diff --git a/src/BlendFunc/BlendFunc_CSConstRad.cxx b/src/BlendFunc/BlendFunc_CSConstRad.cxx index f706712aa0..cc3c3f2e0c 100755 --- a/src/BlendFunc/BlendFunc_CSConstRad.cxx +++ b/src/BlendFunc/BlendFunc_CSConstRad.cxx @@ -871,9 +871,6 @@ Standard_Boolean BlendFunc_CSConstRad::Section math_Matrix gradsol(1,3,1,3); Standard_Real prm = P.Parameter(); -#ifdef DEB - Standard_Integer NbSpan=(Poles.Length()-1)/2; -#endif Standard_Integer low = Poles.Lower(); Standard_Integer upp = Poles.Upper(); Standard_Boolean istgt; diff --git a/src/BlendFunc/BlendFunc_RuledInv.cxx b/src/BlendFunc/BlendFunc_RuledInv.cxx index 6ade769d59..6f2f2b1d55 100755 --- a/src/BlendFunc/BlendFunc_RuledInv.cxx +++ b/src/BlendFunc/BlendFunc_RuledInv.cxx @@ -152,7 +152,6 @@ Standard_Boolean BlendFunc_RuledInv::Derivatives(const math_Vector& X, const Standard_Real normtgcur = d1cur.Magnitude(); const gp_Vec nplan = d1cur.Normalized(); - const Standard_Real theD = -(nplan.XYZ().Dot(ptcur.XYZ())); gp_Vec dnplan; dnplan.SetLinearForm(-nplan.Dot(d2cur),nplan,d2cur); diff --git a/src/ChFi2d/ChFi2d_Builder.cxx b/src/ChFi2d/ChFi2d_Builder.cxx index c57a6cc49c..185ba4c991 100755 --- a/src/ChFi2d/ChFi2d_Builder.cxx +++ b/src/ChFi2d/ChFi2d_Builder.cxx @@ -623,10 +623,6 @@ TopoDS_Edge ChFi2d_Builder::BuildNewEdge(const TopoDS_Edge& E1, TopoDS_Edge anEdge = makeEdge; anEdge.Orientation(E1.Orientation()); // anEdge.Location(E1.Location()); -#ifdef DEB - BRepLib_EdgeError error = -#endif - makeEdge.Error(); return anEdge; } diff --git a/src/DDocStd/DDocStd.cxx b/src/DDocStd/DDocStd.cxx index 11a9e12aa3..ffd62b646b 100755 --- a/src/DDocStd/DDocStd.cxx +++ b/src/DDocStd/DDocStd.cxx @@ -77,9 +77,6 @@ Standard_Boolean DDocStd::Find (const Handle(TDocStd_Document)& D, const Standard_Boolean Complain) { Label.Nullify(); -#ifdef DEB - Standard_Boolean Found; -#endif TDF_Tool::Label(D->GetData(),Entry,Label,Standard_False); if (Label.IsNull() && Complain) cout<<"No label for entry "<Label(), aFun->Label().FindChild(FUNCTION_RESULT_LABEL)); //result is here - Standard_Integer aSurfaceType = 0; - Standard_Real aRadius = atof(theArg[3]); DNaming::GetReal(aFun,FILLET_RADIUS)->Set(aRadius); @@ -1373,7 +1371,7 @@ static Standard_Integer DNaming_SphereRadius (Draw_Interpretor& theDI, return 0; } } - ERR: + cout << "DNaming_SphRadius : Error" << endl; return 1; } @@ -1644,7 +1642,6 @@ static Standard_Boolean MakeSelection (const Handle(TDataStd_UAttribute)& Obj, TDF_Label aResultLabel = aFun->Label().FindChild(FUNCTION_RESULT_LABEL, Standard_True); TDF_Reference::Set(Obj->Label(), aResultLabel ); //result of the object aResultLabel.ForgetAllAttributes(Standard_True); - Standard_Boolean aKeepOrientation(Standard_False); Handle(TNaming_NamedShape) aNS = DNaming::GetObjectValue( ContextObj); try{ const TopoDS_Shape& aContext = aNS->Get(); @@ -1703,7 +1700,6 @@ static Standard_Boolean MakeXSelection (const Handle(TDataStd_UAttribute)& Obj, TDF_Reference::Set(Obj->Label(), aResultLabel ); //result of the object aResultLabel.ForgetAllAttributes(Standard_True); - Standard_Boolean aKeepOrientation(Standard_False); Handle(TNaming_NamedShape) aNS = DNaming::GetObjectValue( ContextObj); try{ const TopoDS_Shape& aContext = aNS->Get(); @@ -1867,7 +1863,6 @@ static Standard_Integer DNaming_TestSingle (Draw_Interpretor& theDI, if(!aNS.IsNull() && !aNS->IsEmpty()) { const TopoDS_Shape& aRootShape = aNS->Get(); - TopAbs_ShapeEnum aType = aRootShape.ShapeType(); //TopTools_MapOfOrientedShape aMap0; //MapOfOrientedShapes(aRootShape, aMap0); TopTools_ListOfShape aList, aFailedList; @@ -1971,7 +1966,7 @@ static Standard_Integer DNaming_TestSingle (Draw_Interpretor& theDI, return 0; } } - ERR: + cout << "DNaming_TestSingle : Error" << endl; return 1; } @@ -2007,7 +2002,6 @@ static Standard_Integer DNaming_Multiple (Draw_Interpretor& theDI, if(!aNS.IsNull() && !aNS->IsEmpty()) { const TopoDS_Shape& aRootShape = aNS->Get(); - TopAbs_ShapeEnum aType = aRootShape.ShapeType(); TopTools_MapOfOrientedShape aMap0; MapOfOrientedShapes(aRootShape, aMap0); TopTools_ListOfShape aList, aFailedList; @@ -2102,7 +2096,7 @@ static Standard_Integer DNaming_Multiple (Draw_Interpretor& theDI, return 0; } } - ERR: + cout << "DNaming_TestMultiple : Error" << endl; return 1; } diff --git a/src/DNaming/DNaming_ToolsCommands.cxx b/src/DNaming/DNaming_ToolsCommands.cxx index aec0875879..862fe45a44 100755 --- a/src/DNaming/DNaming_ToolsCommands.cxx +++ b/src/DNaming/DNaming_ToolsCommands.cxx @@ -142,7 +142,6 @@ void DNaming::ToolsCommands (Draw_Interpretor& theCommands) if (done) return; done = Standard_True; const char* g = "Naming data commands " ; - const char* g2 = "Naming modeling commands" ; theCommands.Add ("CopyShape", "CopyShape (Shape1 [Shape2] ...)", diff --git a/src/Draw/Draw_Main.cxx b/src/Draw/Draw_Main.cxx index 7a7021af86..2fafd34a86 100755 --- a/src/Draw/Draw_Main.cxx +++ b/src/Draw/Draw_Main.cxx @@ -107,7 +107,6 @@ Standard_Integer _main_ (int argc, char* argv[], char* envp[], const FDraw_InitA Draw_IsConsoleSubsystem = Standard_True; //return _WinMain_(::GetModuleHandle(NULL), NULL, GetCommandLine(), SW_SHOW, fDraw_InitAppli); theDraw_InitAppli = fDraw_InitAppli; - Standard_Boolean CONSOLE = Standard_True; //ParseCommandLine(GetCommandLine()); // MKV 01.02.05 diff --git a/src/Draw/Draw_Viewer.cxx b/src/Draw/Draw_Viewer.cxx index d27270514e..93aaca02e9 100755 --- a/src/Draw/Draw_Viewer.cxx +++ b/src/Draw/Draw_Viewer.cxx @@ -498,9 +498,6 @@ void Draw_Viewer::RotateView (const Standard_Integer id, if (Draw_Batch) return; if (myViews[id]) { gp_Trsf T = myViews[id]->Matrix; -#ifdef DEB - Standard_Real z = myViews[id]->Zoom; -#endif T.Invert(); gp_Pnt PP(0,0,0); diff --git a/src/DrawDim/DrawDim_Angle.cxx b/src/DrawDim/DrawDim_Angle.cxx index c2f3d168df..a52fc9ac3a 100755 --- a/src/DrawDim/DrawDim_Angle.cxx +++ b/src/DrawDim/DrawDim_Angle.cxx @@ -168,10 +168,7 @@ void DrawDim_Angle::DrawOn(Draw_Display& ) const gp_Vec curvec (AxePosition, curpt); gp_XYZ curXYZ = curvec.XYZ(); gp_XYZ Norm (curXYZ.Crossed(AxeXYZ)); -#ifdef DEB - Standard_Real NormMod = -#endif - Norm.Modulus(); + if (Norm.Modulus() > gp::Resolution()) { Standard_Real curdist = curpos.Distance (curpt); if (curdist < dist) { diff --git a/src/DrawFairCurve/DrawFairCurve_Batten.cxx b/src/DrawFairCurve/DrawFairCurve_Batten.cxx index 58a310eccd..448ddb5dd4 100755 --- a/src/DrawFairCurve/DrawFairCurve_Batten.cxx +++ b/src/DrawFairCurve/DrawFairCurve_Batten.cxx @@ -22,10 +22,7 @@ DrawFairCurve_Batten::DrawFairCurve_Batten(const Standard_Address TheBatten) void DrawFairCurve_Batten::Compute() { FairCurve_AnalysisCode Iana; -#ifdef DEB - Standard_Boolean Ok = -#endif - ((FairCurve_Batten*)MyBatten)->Compute(Iana, 50, 1.0e-2); + ((FairCurve_Batten*)MyBatten)->Compute(Iana, 50, 1.0e-2); curv = ((FairCurve_Batten*)MyBatten)->Curve(); } void DrawFairCurve_Batten::SetPoint(const Standard_Integer Side, const gp_Pnt2d& Point) diff --git a/src/DsgPrs/DsgPrs_ShapeDirPresentation.cxx b/src/DsgPrs/DsgPrs_ShapeDirPresentation.cxx index dbce5f5e63..a4d53e554d 100755 --- a/src/DsgPrs/DsgPrs_ShapeDirPresentation.cxx +++ b/src/DsgPrs/DsgPrs_ShapeDirPresentation.cxx @@ -118,10 +118,7 @@ static Standard_Boolean FindPointOnFace(const TopoDS_Face& face, gp_Pnt2d& pt2d) // verify that (upar vpar) is a point on the face BRepClass_FaceClassifier fClass(face, pt2d, gp::Resolution()); -#ifdef DEB - TopAbs_State state = -#endif - fClass.State(); + if ((fClass.State() == TopAbs_OUT) || (fClass.State() == TopAbs_UNKNOWN)) { // try to find a point on face pt2d=points(1); diff --git a/src/DsgPrs/DsgPrs_XYZAxisPresentation.cxx b/src/DsgPrs/DsgPrs_XYZAxisPresentation.cxx index 004c227698..1244aed396 100755 --- a/src/DsgPrs/DsgPrs_XYZAxisPresentation.cxx +++ b/src/DsgPrs/DsgPrs_XYZAxisPresentation.cxx @@ -71,11 +71,6 @@ void DsgPrs_XYZAxisPresentation::Add(const Handle(Prs3d_Presentation)& aPresenta A(1).SetCoord(xo,yo,zo); A(2).SetCoord(x,y,z); -#ifdef DEB - Quantity_Length arrowAngle = anArrowAspect->Angle(); - Quantity_Length textHeight = aTextAspect->Height(); -#endif - G->SetPrimitivesAspect(aLineAspect->Aspect()); G->Polyline(A); G->SetPrimitivesAspect( anArrowAspect->Aspect() ); diff --git a/src/ExprIntrp/ExprIntrp_yaccintrf.cxx b/src/ExprIntrp/ExprIntrp_yaccintrf.cxx index 3926ead1ff..93a4112b6a 100755 --- a/src/ExprIntrp/ExprIntrp_yaccintrf.cxx +++ b/src/ExprIntrp/ExprIntrp_yaccintrf.cxx @@ -84,10 +84,7 @@ extern "C" void ExprIntrp_Derivation() { ExprIntrp_Recept.PushValue(1); char name[100]; -#ifdef DEB - Standard_Integer nbcar = -#endif - ExprIntrp_GetResult(name); + ExprIntrp_GetResult(name); TCollection_AsciiString thename(name); Handle(Expr_NamedExpression) namexp = ExprIntrp_Recept.GetNamed(thename); if (namexp.IsNull()) { @@ -127,10 +124,7 @@ extern "C" void ExprIntrp_StartDifferential() extern "C" void ExprIntrp_DiffDegreeVar() { char name[100]; -#ifdef DEB - Standard_Integer nbcar = -#endif - ExprIntrp_GetResult(name); + ExprIntrp_GetResult(name); #ifndef WNT if (strncasecmp(name,"X",1)) { #else @@ -154,10 +148,7 @@ extern "C" void ExprIntrp_DiffVar() extern "C" void ExprIntrp_DiffDegree() { char name[100]; -#ifdef DEB - Standard_Integer nbcar = -#endif - ExprIntrp_GetResult(name); + ExprIntrp_GetResult(name); Standard_Integer deg = atoi(name); ExprIntrp_Recept.PushValue(deg); } @@ -165,10 +156,7 @@ extern "C" void ExprIntrp_DiffDegree() extern "C" void ExprIntrp_VerDiffDegree() { char name[100]; -#ifdef DEB - Standard_Integer nbcar = -#endif - ExprIntrp_GetResult(name); + ExprIntrp_GetResult(name); Standard_Integer deg = atoi(name); Standard_Integer thedeg = ExprIntrp_Recept.PopValue(); if (deg != thedeg) { @@ -604,10 +592,7 @@ extern "C" void ExprIntrp_EndOfFuncDef() extern "C" void ExprIntrp_ConstantIdentifier() { char name[100]; -#ifdef DEB - Standard_Integer nbcar = -#endif - ExprIntrp_GetResult(name); + ExprIntrp_GetResult(name); TCollection_AsciiString thename(name); ExprIntrp_Recept.PushName(thename); } diff --git a/src/Extrema/Extrema_ExtCS.cxx b/src/Extrema/Extrema_ExtCS.cxx index 7c17e03915..36974f855d 100755 --- a/src/Extrema/Extrema_ExtCS.cxx +++ b/src/Extrema/Extrema_ExtCS.cxx @@ -126,8 +126,7 @@ void Extrema_ExtCS::Perform(const Adaptor3d_Curve& C, if(Precision::IsInfinite(Abs(cfirst)) || Precision::IsInfinite(Abs(clast))) { Bnd_Box aSurfBox; - BndLib_AddSurface anAddSurf; - anAddSurf.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; diff --git a/src/Extrema/Extrema_ExtElC.cxx b/src/Extrema/Extrema_ExtElC.cxx index 1e29282473..6fc764c3c6 100755 --- a/src/Extrema/Extrema_ExtElC.cxx +++ b/src/Extrema/Extrema_ExtElC.cxx @@ -53,7 +53,6 @@ class ExtremaExtElC_TrigonometricRoots { } // Standard_Boolean IsARoot(Standard_Real u) { - Standard_Integer i; Standard_Real PIpPI, aEps; // aEps=RealEpsilon(); diff --git a/src/Extrema/Extrema_ExtPElC.cxx b/src/Extrema/Extrema_ExtPElC.cxx index e7fb74c8dd..a81a9a2bb0 100755 --- a/src/Extrema/Extrema_ExtPElC.cxx +++ b/src/Extrema/Extrema_ExtPElC.cxx @@ -278,11 +278,6 @@ Method: Standard_Real R = C.MajorRadius(); Standard_Real r = C.MinorRadius(); gp_Vec OPp (O,Pp); -#ifdef DEB - Standard_Real OPpMagn = OPp.Magnitude(); -#else - OPp.Magnitude(); -#endif Standard_Real X = OPp.Dot(gp_Vec(C.XAxis().Direction())); Standard_Real Y = OPp.Dot(gp_Vec(C.YAxis().Direction())); @@ -371,11 +366,6 @@ Method: Standard_Real F = C.Focal(); gp_Vec OPp (O,Pp); -#ifdef DEB - Standard_Real OPpMagn = OPp.Magnitude(); -#else - OPp.Magnitude(); -#endif Standard_Real X = OPp.Dot(gp_Vec(C.XAxis().Direction())); // Standard_Real Y = Sqrt(OPpMagn*OPpMagn-X*X); Standard_Real Y = OPp.Dot(gp_Vec(C.YAxis().Direction())); diff --git a/src/Extrema/Extrema_ExtPElC2d.cxx b/src/Extrema/Extrema_ExtPElC2d.cxx index abff2fb5b5..496e2f0a52 100755 --- a/src/Extrema/Extrema_ExtPElC2d.cxx +++ b/src/Extrema/Extrema_ExtPElC2d.cxx @@ -144,11 +144,6 @@ void Extrema_ExtPElC2d::Perform (const gp_Pnt2d& P, myDone = Standard_False; } else { -#ifdef DEB - Standard_Real VMagn = V.Magnitude(); -#else - V.Magnitude(); -#endif Standard_Real X = V.Dot(gp_Vec2d(E.XAxis().Direction())); Standard_Real Y = V.Dot(gp_Vec2d(E.YAxis().Direction())); @@ -195,11 +190,6 @@ void Extrema_ExtPElC2d::Perform(const gp_Pnt2d& P, Standard_Real R = H.MajorRadius(); Standard_Real r = H.MinorRadius(); gp_Vec2d OPp(O,P); -#ifdef DEB - Standard_Real OPpMagn = OPp.Magnitude(); -#else - OPp.Magnitude(); -#endif Standard_Real Tol2 = Tol * Tol; Standard_Real X = OPp.Dot(gp_Vec2d(H.XAxis().Direction())); Standard_Real Y = OPp.Dot(gp_Vec2d(H.YAxis().Direction())); @@ -263,11 +253,6 @@ void Extrema_ExtPElC2d::Perform(const gp_Pnt2d& P, Standard_Real Tol2 = Tol * Tol; Standard_Real F = C.Focal(); gp_Vec2d OPp (O,P); -#ifdef DEB - Standard_Real OPpMagn = OPp.Magnitude(); -#else - OPp.Magnitude(); -#endif Standard_Real X = OPp.Dot(gp_Vec2d(C.MirrorAxis().Direction())); Standard_Real Y = OPp.Dot(gp_Vec2d(C.Axis().YAxis().Direction())); diff --git a/src/Extrema/Extrema_ExtPElS.cxx b/src/Extrema/Extrema_ExtPElS.cxx index 49b48289fc..0b1c445c47 100755 --- a/src/Extrema/Extrema_ExtPElS.cxx +++ b/src/Extrema/Extrema_ExtPElS.cxx @@ -121,11 +121,6 @@ void Extrema_ExtPElS::Perform(const gp_Pnt& P, Standard_Real L2 = MP.SquareMagnitude(); Standard_Real Vm = -(S.RefRadius() / Sin(A)); -#ifdef DEB - Standard_Real Zm = gp_Vec(O, M).Dot(OZ); -#else - gp_Vec(O, M).Dot(OZ); -#endif // Case when P is mixed with S ... if (L2 < Tol * Tol) { diff --git a/src/FEmTool/FEmTool_Assembly.cxx b/src/FEmTool/FEmTool_Assembly.cxx index 1e7d4f398d..dc66e68791 100755 --- a/src/FEmTool/FEmTool_Assembly.cxx +++ b/src/FEmTool/FEmTool_Assembly.cxx @@ -80,11 +80,8 @@ FEmTool_Assembly::FEmTool_Assembly(const TColStd_Array2OfInteger& Dependence, TColStd_Array1OfInteger FirstIndexes(1, B.Length()); FirstIndexes.Init(B.Length()); -#ifdef DEB - Standard_Integer dim, el, nvar, Imax, Imin, I0 = 1 - B.Lower(), i; -#else Standard_Integer dim, el, nvar, Imin, I0 = 1 - B.Lower(), i; -#endif + Standard_Integer diml = Table->LowerRow(), dimu = Table->UpperRow(), ell = Table->LowerCol(), elu = Table->UpperCol(), nvarl, nvaru; @@ -137,11 +134,9 @@ void FEmTool_Assembly::AddMatrix(const Standard_Integer Element, Standard_Integer nvarl = T1.Lower(), nvaru = Min(T1.Upper(), nvarl + Mat.RowNumber() - 1); -#ifdef DEB - Standard_Integer I, J, I0 = 1 - B.Lower(), i, ii, j, jj, -#else + Standard_Integer I, J, I0 = 1 - B.Lower(), i, ii, j, -#endif + i0 = Mat.LowerRow() - nvarl, j0 = Mat.LowerCol() - nvarl; for(i = nvarl; i <= nvaru; i++) { diff --git a/src/GCPnts/GCPnts_UniformAbscissa.gxx b/src/GCPnts/GCPnts_UniformAbscissa.gxx index 7cda2b4028..8f63a17cba 100755 --- a/src/GCPnts/GCPnts_UniformAbscissa.gxx +++ b/src/GCPnts/GCPnts_UniformAbscissa.gxx @@ -161,10 +161,6 @@ PerformLengthParametrized( Handle(TColStd_HArray1OfReal)& HParameters, // Standard_Real UCurrent; Standard_Real Delta, Ui; Standard_Real UU2 = Max(U1, U2); -#ifdef DEB - Standard_Real L = -#endif - CPnts_AbscissaPoint::Length(C, UU1, UU2); Standard_Integer Index ; // Ratio is defined as dl = Ratio * du diff --git a/src/GProp/GProp_TFunction.gxx b/src/GProp/GProp_TFunction.gxx index 237f3ae11f..2b1014bd8d 100755 --- a/src/GProp/GProp_TFunction.gxx +++ b/src/GProp/GProp_TFunction.gxx @@ -75,7 +75,7 @@ Standard_Boolean GProp_TFunction::Value(const Standard_Real X, // Compute the integral from myUMin to aUMax of myUFunction. Standard_Integer i; Standard_Real aCoeff = aV2d.Y(); - Standard_Integer aNbUIntervals = anUKnots->Length() - 1; + //Standard_Integer aNbUIntervals = anUKnots->Length() - 1; //Standard_Real aTol = myTolerance/aNbUIntervals; Standard_Real aTol = myTolerance; diff --git a/src/GccAna/GccAna_Circ2d2TanOn.cxx b/src/GccAna/GccAna_Circ2d2TanOn.cxx index 5873a35a65..4799c57f46 100755 --- a/src/GccAna/GccAna_Circ2d2TanOn.cxx +++ b/src/GccAna/GccAna_Circ2d2TanOn.cxx @@ -71,11 +71,7 @@ GccAna_Circ2d2TanOn:: gp_Pnt2d center1(C1.Location()); gp_Pnt2d center2(C2.Location()); TColStd_Array1OfReal Radius(1,2); -#ifdef DEB - Standard_Real distance = center1.Distance(center2); -#else - center1.Distance(center2); -#endif + Standard_Real dist1 = OnLine.Distance(center1); Standard_Real dist2 = OnLine.Distance(center2); Standard_Real d1 = dist1+R1; diff --git a/src/GccAna/GccAna_Circ2d2TanOn_10.cxx b/src/GccAna/GccAna_Circ2d2TanOn_10.cxx index 28e17f2d8d..77d7437d00 100755 --- a/src/GccAna/GccAna_Circ2d2TanOn_10.cxx +++ b/src/GccAna/GccAna_Circ2d2TanOn_10.cxx @@ -77,12 +77,7 @@ gp_Dir2d dir(OnCirc.Location().XY()-Point2.XY()); gp_Pnt2d pinterm(Point2.XY()+(distpc+Ron)*dir.XY()); Standard_Real dist1 = L1.Distance(pinterm); - if (Abs(dist1-distpc-Ron) > Tol) { -#ifdef DEB - gp_Pnt2d pinterm(Point2.XY()+(distpc-Ron)*dir.XY()); // Unused ! BUG ??? - Standard_Real dist1 = L1.Distance(pinterm); // Unused ! BUG ??? -#endif - } + if (Abs(dist1-distpc+Ron) <= Tol) { dir = gp_Dir2d(-dirL1.Y(),dirL1.X()); gp_Dir2d direc(originL1.XY()-pinterm.XY()); diff --git a/src/GccAna/GccAna_Circ2d2TanOn_6.cxx b/src/GccAna/GccAna_Circ2d2TanOn_6.cxx index ca2d35a265..a3f2a17bb6 100755 --- a/src/GccAna/GccAna_Circ2d2TanOn_6.cxx +++ b/src/GccAna/GccAna_Circ2d2TanOn_6.cxx @@ -70,11 +70,7 @@ GccAna_Circ2d2TanOn:: TColStd_Array1OfReal Rradius(1,2); gp_Pnt2d center1(C1.Location()); gp_Pnt2d center2(C2.Location()); -#ifdef DEB - Standard_Real distance = center1.Distance(center2); -#else - center1.Distance(center2); -#endif + Standard_Real R1 = C1.Radius(); Standard_Real R2 = C2.Radius(); diff --git a/src/GccAna/GccAna_Circ2d2TanOn_9.cxx b/src/GccAna/GccAna_Circ2d2TanOn_9.cxx index bfffb57263..8c363c52b9 100755 --- a/src/GccAna/GccAna_Circ2d2TanOn_9.cxx +++ b/src/GccAna/GccAna_Circ2d2TanOn_9.cxx @@ -43,9 +43,6 @@ GccAna_Circ2d2TanOn:: NbrSol = 0; gp_Dir2d dirx(1.,0.); -#ifdef DEB - Standard_Real Tol = Abs(Tolerance); -#endif if (!(Qualified1.IsEnclosed() || Qualified1.IsOutside() || Qualified1.IsUnqualified()) || !(Qualified2.IsEnclosed() || diff --git a/src/GccAna/GccAna_Circ2d2TanRad_4.cxx b/src/GccAna/GccAna_Circ2d2TanRad_4.cxx index 3ca3eabe4f..c95d30f3c1 100755 --- a/src/GccAna/GccAna_Circ2d2TanRad_4.cxx +++ b/src/GccAna/GccAna_Circ2d2TanRad_4.cxx @@ -53,9 +53,6 @@ GccAna_Circ2d2TanRad:: { gp_Dir2d dirx(1.0,0.0); -#ifdef DEB - Standard_Real Tol = Abs(Tolerance); -#endif TColStd_Array1OfReal cote1(1,2); TColStd_Array1OfReal cote2(1,2); Standard_Integer nbrcote1=0; diff --git a/src/GccAna/GccAna_Circ2d3Tan_3.cxx b/src/GccAna/GccAna_Circ2d3Tan_3.cxx index a1b26ae05f..bdf3fd84ec 100755 --- a/src/GccAna/GccAna_Circ2d3Tan_3.cxx +++ b/src/GccAna/GccAna_Circ2d3Tan_3.cxx @@ -57,9 +57,6 @@ GccAna_Circ2d3Tan:: TheSame2.Init(0); TheSame3.Init(0); gp_Dir2d dirx(1.0,0.0); -#ifdef DEB - Standard_Real Tol = Abs(Tolerance); -#endif WellDone = Standard_False; NbrSol = 0; if (!(Qualified1.IsEnclosed() || diff --git a/src/GccAna/GccAna_Circ2d3Tan_8.cxx b/src/GccAna/GccAna_Circ2d3Tan_8.cxx index ff5ea6d898..f4e0c17324 100755 --- a/src/GccAna/GccAna_Circ2d3Tan_8.cxx +++ b/src/GccAna/GccAna_Circ2d3Tan_8.cxx @@ -95,11 +95,7 @@ GccAna_Circ2d3Tan:: gp_Pnt2d Center(Intp.Point(j).Value()); Standard_Real dist1 = L1.Distance(Center); Standard_Real dist2 = Center.Distance(Point2); -#ifdef DEB - Standard_Real dist3 = Center.Distance(Point3); -#else - Center.Distance(Point3); -#endif + Standard_Real Radius=0; Standard_Integer nbsol1 = 0; // Standard_Integer nbsol2 = 0; diff --git a/src/GccAna/GccAna_Circ2dTanOnRad_1.cxx b/src/GccAna/GccAna_Circ2dTanOnRad_1.cxx index 8d7a99f71a..0b6f82d1f9 100755 --- a/src/GccAna/GccAna_Circ2dTanOnRad_1.cxx +++ b/src/GccAna/GccAna_Circ2dTanOnRad_1.cxx @@ -94,11 +94,6 @@ GccAna_Circ2dTanOnRad:: cirsol(NbrSol)=gp_Circ2d(gp_Ax2d(Center,dirx),Radius); // ===================================================== gp_Dir2d dc1(origin1.XY()-Center.XY()); -#ifdef DEB - Standard_Real sign = dc1.Dot(normL1); -#else - dc1.Dot(normL1); -#endif if (!Qualified1.IsUnqualified()) { qualifier1(NbrSol) = Qualified1.Qualifier(); } diff --git a/src/GccGeo/GccGeo_Circ2dTanOnRad.gxx b/src/GccGeo/GccGeo_Circ2dTanOnRad.gxx index a37b959828..82a108b284 100755 --- a/src/GccGeo/GccGeo_Circ2dTanOnRad.gxx +++ b/src/GccGeo/GccGeo_Circ2dTanOnRad.gxx @@ -447,13 +447,6 @@ GccGeo_Circ2dTanOnRad:: cote1(1) = Radius; cote1(2) = -Radius; } -#ifdef DEB - Standard_Real x1dir = dir1.X(); - Standard_Real y1dir = dir1.Y(); -#else - dir1.X(); - dir1.Y(); -#endif TheIntConicCurve Intp; for (Standard_Integer jcote1 = 1 ; jcote1 <= nbrcote1 ; jcote1++) { gp_Pnt2d Point(dir1.XY()+cote1(jcote1)*norm1.XY()); @@ -472,11 +465,6 @@ GccGeo_Circ2dTanOnRad:: cirsol(NbrSol) = gp_Circ2d(gp_Ax2d(Center,dirx),Radius); // ======================================================= gp_Dir2d dc1(origin1.XY()-Center.XY()); -#ifdef DEB - Standard_Real sign = dc1.Dot(norm1); -#else - dc1.Dot(norm1); -#endif if (!Qualified1.IsUnqualified()) { qualifier1(NbrSol) = Qualified1.Qualifier(); } diff --git a/src/GccIter/GccIter_Circ2d2TanOn.gxx b/src/GccIter/GccIter_Circ2d2TanOn.gxx index 1ce82f9c5c..d1f3d4a395 100755 --- a/src/GccIter/GccIter_Circ2d2TanOn.gxx +++ b/src/GccIter/GccIter_Circ2d2TanOn.gxx @@ -76,11 +76,7 @@ GccIter_Circ2d2TanOn:: Ufirst(4) = (point3.Distance(point2)+point3.Distance(point1))/2.; GccIter_FuncTCuCuOnCu Func(L1,Cu2,OnLine,Ufirst(4)); math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif if (Root.IsDone()) { Root.Root(Ufirst); // gp_Vec2d Tan1,Tan2,Nor1,Nor2; @@ -187,11 +183,7 @@ GccIter_Circ2d2TanOn:: Ufirst(4) = (point3.Distance(point2)+point3.Distance(point1))/2.; GccIter_FuncTCuCuOnCu Func(Cu1,Cu2,OnLine,Ufirst(4)); math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif if (Root.IsDone()) { Root.Root(Ufirst); gp_Vec2d Tan1,Tan2; @@ -287,11 +279,7 @@ GccIter_Circ2d2TanOn:: Ufirst(3) = (point3.Distance(Point2)+point3.Distance(point1))/2.; GccIter_FuncTCuCuOnCu Func(Cu1,Point2,OnLine,Ufirst(3)); math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif if (Root.IsDone()) { Root.Root(Ufirst); gp_Pnt2d point1,point3; @@ -384,11 +372,7 @@ GccIter_Circ2d2TanOn:: Ufirst(4) = (point3.Distance(point2)+point3.Distance(point1))/2.; GccIter_FuncTCuCuOnCu Func(C1,Cu2,OnLine,Ufirst(4)); math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif if (Root.IsDone()) { Root.Root(Ufirst); // gp_Vec2d Tan1,Tan2,Nor1,Nor2; @@ -501,11 +485,7 @@ GccIter_Circ2d2TanOn:: Ufirst(4) = (point3.Distance(point2)+point3.Distance(point1))/2.; GccIter_FuncTCuCuOnCu Func(C1,Cu2,OnCirc,Ufirst(4)); math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif if (Root.IsDone()) { Root.Root(Ufirst); // gp_Vec2d Tan1,Tan2,Nor1; @@ -615,11 +595,7 @@ GccIter_Circ2d2TanOn:: Ufirst(4) = (point3.Distance(point2)+point3.Distance(point1))/2.; GccIter_FuncTCuCuOnCu Func(L1,Cu2,OnCirc,Ufirst(4)); math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif if (Root.IsDone()) { Root.Root(Ufirst); gp_Pnt2d point1,point2; @@ -729,11 +705,7 @@ GccIter_Circ2d2TanOn:: Ufirst(4) = (point3.Distance(point2)+point3.Distance(point1))/2.; GccIter_FuncTCuCuOnCu Func(Cu1,Cu2,OnCirc,Ufirst(4)); math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif if (Root.IsDone()) { Root.Root(Ufirst); // gp_Vec2d Tan1,Tan2,Nor1; @@ -833,11 +805,7 @@ GccIter_Circ2d2TanOn:: Ufirst(3) = (point3.Distance(Point2)+point3.Distance(point1))/2.; GccIter_FuncTCuCuOnCu Func(Cu1,Point2,OnCirc,Ufirst(3)); math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif if (Root.IsDone()) { Root.Root(Ufirst); gp_Pnt2d point1,point3; @@ -930,11 +898,7 @@ GccIter_Circ2d2TanOn:: Ufirst(4) = (point3.Distance(point2)+point3.Distance(point1))/2.; GccIter_FuncTCuCuOnCu Func(Cu1,Cu2,OnCurv,Ufirst(4)); math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif if (Root.IsDone()) { Root.Root(Ufirst); gp_Vec2d Tan1,Tan2,Tan3; @@ -1039,11 +1003,7 @@ GccIter_Circ2d2TanOn:: Ufirst(4) = (point3.Distance(point2)+point3.Distance(point1))/2.; GccIter_FuncTCuCuOnCu Func(C1,Cu2,OnCurv,Ufirst(4)); math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif if (Root.IsDone()) { Root.Root(Ufirst); gp_Vec2d Tan1,Tan2,Tan3; @@ -1150,11 +1110,7 @@ GccIter_Circ2d2TanOn:: Ufirst(4) = (point3.Distance(point2)+point3.Distance(point1))/2.; GccIter_FuncTCuCuOnCu Func(L1,Cu2,OnCurv,Ufirst(4)); math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif if (Root.IsDone()) { Root.Root(Ufirst); gp_Vec2d Tan1,Tan2,Tan3; @@ -1251,11 +1207,7 @@ GccIter_Circ2d2TanOn:: Ufirst(3) = (point3.Distance(Point2)+point3.Distance(point1))/2.; GccIter_FuncTCuCuOnCu Func(Cu1,Point2,OnCurv,Ufirst(3)); math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif if (Root.IsDone()) { Root.Root(Ufirst); // gp_Vec2d Tan1,Tan2,Tan3; diff --git a/src/GccIter/GccIter_Circ2d3Tan.gxx b/src/GccIter/GccIter_Circ2d3Tan.gxx index 54c3fbce19..ed7d1cd487 100755 --- a/src/GccIter/GccIter_Circ2d3Tan.gxx +++ b/src/GccIter/GccIter_Circ2d3Tan.gxx @@ -76,11 +76,7 @@ GccIter_Circ2d3Tan:: math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); if (Root.IsDone()) { Root.Root(Ufirst); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif gp_Pnt2d point1,point2,point3; gp_Vec2d Tan1,Tan2,Tan3; TheCurveTool::D1(Cu1,Ufirst(1),point1,Tan1); @@ -203,11 +199,7 @@ GccIter_Circ2d3Tan:: math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); if (Root.IsDone()) { Root.Root(Ufirst); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif gp_Pnt2d centre1(C1.Location()); Standard_Real R1 = C1.Radius(); gp_Pnt2d point1(centre1.XY()+R1*gp_XY(Cos(Ufirst(1)),Sin(Ufirst(1)))); @@ -335,11 +327,7 @@ GccIter_Circ2d3Tan:: math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); if (Root.IsDone()) { Root.Root(Ufirst); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif gp_Pnt2d centre1(C1.Location()); Standard_Real R1 = C1.Radius(); gp_Pnt2d point1(centre1.XY()+R1*gp_XY(Cos(Ufirst(1)),Sin(Ufirst(1)))); @@ -470,11 +458,7 @@ GccIter_Circ2d3Tan:: math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); if (Root.IsDone()) { Root.Root(Ufirst); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif gp_Pnt2d centre1(L1.Location()); gp_Pnt2d point1(centre1.XY()+Ufirst(1)*L1.Direction().XY()); gp_Pnt2d point2,point3; @@ -605,11 +589,7 @@ GccIter_Circ2d3Tan:: math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); if (Root.IsDone()) { Root.Root(Ufirst); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif gp_Pnt2d centre1(L1.Location()); gp_Pnt2d point1(centre1.XY()+Ufirst(1)*L1.Direction().XY()); gp_Pnt2d centre2(L2.Location()); @@ -733,11 +713,7 @@ GccIter_Circ2d3Tan:: math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); if (Root.IsDone()) { Root.Root(Ufirst); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif gp_Pnt2d point1,point2; // gp_Vec2d Tan1,Tan2,Nor1,Nor2; gp_Vec2d Tan1,Tan2; @@ -850,11 +826,7 @@ GccIter_Circ2d3Tan:: math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); if (Root.IsDone()) { Root.Root(Ufirst); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif gp_Pnt2d point3; // gp_Vec2d Tan3,Nor3; gp_Vec2d Tan3; @@ -964,11 +936,7 @@ GccIter_Circ2d3Tan:: math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); if (Root.IsDone()) { Root.Root(Ufirst); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif gp_Pnt2d centre1(L1.Location()); gp_Pnt2d point1(centre1.XY()+Ufirst(2)*L1.Direction().XY()); gp_Pnt2d point2; @@ -1086,11 +1054,7 @@ GccIter_Circ2d3Tan:: tol(3) = TheCurveTool::EpsX(Cu3,Abs(Tolerance)); math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); if (Root.IsDone()) { -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif Root.Root(Ufirst); gp_Pnt2d centre1(C1.Location()); Standard_Real R1 = C1.Radius(); @@ -1218,11 +1182,7 @@ GccIter_Circ2d3Tan:: math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax); if (Root.IsDone()) { Root.Root(Ufirst); -#ifdef DEB - Standard_Boolean Ok = Func.Value(Ufirst,Umin); -#else Func.Value(Ufirst,Umin); -#endif gp_Pnt2d centre1(C1.Location()); Standard_Real R1 = C1.Radius(); gp_Pnt2d point1(centre1.XY()+R1*gp_XY(Cos(Ufirst(1)),Sin(Ufirst(1)))); diff --git a/src/GccIter/GccIter_FunctionTanCirCu.gxx b/src/GccIter/GccIter_FunctionTanCirCu.gxx index 5d7e53acbe..9d380e5ba0 100755 --- a/src/GccIter/GccIter_FunctionTanCirCu.gxx +++ b/src/GccIter/GccIter_FunctionTanCirCu.gxx @@ -87,11 +87,6 @@ Standard_Boolean GccIter_FunctionTanCirCu:: TheCurveTool::D2(Curve,X,Point,Vect1,Vect2); Standard_Real NormeD1 = Vect1.SquareMagnitude(); gp_Vec2d TheDirection(TheCirc.Location(),Point); -#ifdef DEB - Standard_Real squaredir = TheDirection.SquareMagnitude(); -#else - TheDirection.SquareMagnitude(); -#endif Standard_Real cp1dott = TheDirection.Dot(Vect1); Deriv = -2.*(cp1dott/NormeD1)* ((TheDirection.Dot(Vect2))-cp1dott*Vect1.Dot(Vect2)/NormeD1); diff --git a/src/GccIter/GccIter_FunctionTanCuCuOnCu.gxx b/src/GccIter/GccIter_FunctionTanCuCuOnCu.gxx index 544fc243e7..e7f24e24d0 100755 --- a/src/GccIter/GccIter_FunctionTanCuCuOnCu.gxx +++ b/src/GccIter/GccIter_FunctionTanCuCuOnCu.gxx @@ -290,11 +290,6 @@ Standard_Boolean GccIter_FunctionTanCuCuOnCu:: //norme des Tani. Standard_Real nnor1 = Tan1.Magnitude(); Standard_Real nnor2 = Tan2.Magnitude(); -#ifdef DEB - Standard_Real nnor3 = Tan3.Magnitude(); -#else - Tan3.Magnitude(); -#endif // Fonctions Fui. // ============== Fval(1) = (P3P1.Dot(P3P1)-X(4)*X(4))/(FirstRad*FirstRad); @@ -323,11 +318,6 @@ Standard_Boolean GccIter_FunctionTanCuCuOnCu:: //normales au courbes normees Nori et non nromees nori et norme des nori. Standard_Real nnor1 = Tan1.Magnitude(); Standard_Real nnor2 = Tan2.Magnitude(); -#ifdef DEB - Standard_Real nnor3 = Tan3.Magnitude(); -#else - Tan3.Magnitude(); -#endif // Derivees dFui/uj 1 <= ui <= 3 , 1 <= uj <= 3 // ============================================= Deriv(1,1) = 2.*Tan1.Dot(P3P1)/(FirstRad*FirstRad); @@ -374,11 +364,6 @@ Standard_Boolean GccIter_FunctionTanCuCuOnCu:: //normales au courbes normees Nori et non nromees nori et norme des nori. Standard_Real nnor1 = Tan1.Magnitude(); Standard_Real nnor2 = Tan2.Magnitude(); -#ifdef DEB - Standard_Real nnor3 = Tan3.Magnitude(); -#else - Tan3.Magnitude(); -#endif // Fonctions Fui. // ============== Fval(1) = (P3P1.Dot(P3P1)-X(4)*X(4))/(FirstRad*FirstRad); diff --git a/src/GccIter/GccIter_Lin2d2Tan.gxx b/src/GccIter/GccIter_Lin2d2Tan.gxx index 18deb35c05..dd4ccaf516 100755 --- a/src/GccIter/GccIter_Lin2d2Tan.gxx +++ b/src/GccIter/GccIter_Lin2d2Tan.gxx @@ -26,9 +26,9 @@ GccIter_Lin2d2Tan:: par1sol = 0.; pararg1 = 0.; -#ifdef DEB - Standard_Real Tol = Abs(Tolang); -#endif + + //Standard_Real Tol = Abs(Tolang); + WellDone = Standard_False; if (Qualified1.IsEnclosed()) { GccEnt_BadQualifier::Raise(); } gp_Circ2d C1 = Qualified1.Qualified(); diff --git a/src/Geom/Geom_CylindricalSurface.cxx b/src/Geom/Geom_CylindricalSurface.cxx index 7bc5311445..fd76a3814f 100755 --- a/src/Geom/Geom_CylindricalSurface.cxx +++ b/src/Geom/Geom_CylindricalSurface.cxx @@ -191,17 +191,6 @@ void Geom_CylindricalSurface::Coefficients (Standard_Real& A1, Standard_Real& A2 Standard_Real T22 = T.Value (2, 2); Standard_Real T23 = T.Value (2, 3); Standard_Real T24 = T.Value (2, 4); -#ifdef DEB - Standard_Real T31 = T.Value (3, 1); - Standard_Real T32 = T.Value (3, 2); - Standard_Real T33 = T.Value (3, 3); - Standard_Real T34 = T.Value (3, 4); -#else - T.Value (3, 1); - T.Value (3, 2); - T.Value (3, 3); - T.Value (3, 4); -#endif A1 = T11 * T11 + T21 * T21; A2 = T12 * T12 + T22 * T22; A3 = T13 * T13 + T23 * T23; diff --git a/src/Geom/Geom_OffsetCurve.cxx b/src/Geom/Geom_OffsetCurve.cxx index 01217fcad0..d10e7849ad 100755 --- a/src/Geom/Geom_OffsetCurve.cxx +++ b/src/Geom/Geom_OffsetCurve.cxx @@ -529,12 +529,6 @@ void Geom_OffsetCurve::D1 ( const Standard_Real U, // P'(u) = p'(u) + (Offset / R**2) * (DNdir/DU * R - Ndir * (DR/R)) - -#ifdef DEB - GeomAbs_Shape Continuity = basisCurve->Continuity(); -#else - basisCurve->Continuity(); -#endif basisCurve->D2 (U, PBasis, V1basis, V2basis); V1 = V1basis; Vec V2 = V2basis; @@ -590,12 +584,6 @@ void Geom_OffsetCurve::D2 (const Standard_Real U, // P"(u) = p"(u) + (Offset / R) * (D2Ndir/DU - DNdir * (2.0 * Dr/ R**2) + // Ndir * ( (3.0 * Dr**2 / R**4) - (D2r / R**2))) -#ifdef DEB - GeomAbs_Shape Continuity = basisCurve->Continuity(); -#else - basisCurve->Continuity(); -#endif - basisCurve->D3 (U, PBasis, V1basis, V2basis, V3basis); Standard_Integer Index = 2; V1 = V1basis; diff --git a/src/Geom2d/Geom2d_OffsetCurve.cxx b/src/Geom2d/Geom2d_OffsetCurve.cxx index cbc7d8941d..806e1224f6 100755 --- a/src/Geom2d/Geom2d_OffsetCurve.cxx +++ b/src/Geom2d/Geom2d_OffsetCurve.cxx @@ -191,12 +191,6 @@ void Geom2d_OffsetCurve::D1 (const Standard_Real U, Pnt2d& P, Vec2d& V1) const { // P'(u) = p'(u) + (Offset / R**2) * (DNdir/DU * R - Ndir * (DR/R)) - -#ifdef DEB - GeomAbs_Shape Continuity = basisCurve->Continuity(); -#else - basisCurve->Continuity(); -#endif Vec2d V2; basisCurve->D2 (U, P, V1, V2); Standard_Integer Index = 2; @@ -248,11 +242,6 @@ void Geom2d_OffsetCurve::D2 (const Standard_Real U, // P"(u) = p"(u) + (Offset / R) * (D2Ndir/DU - DNdir * (2.0 * Dr/ R**2) + // Ndir * ( (3.0 * Dr**2 / R**4) - (D2r / R**2))) -#ifdef DEB - GeomAbs_Shape Continuity = basisCurve->Continuity(); -#else - basisCurve->Continuity(); -#endif Vec2d V3; basisCurve->D3 (U, P, V1, V2, V3); Standard_Integer Index = 2; @@ -483,12 +472,6 @@ void Geom2d_OffsetCurve::D1 (const Standard_Real U, // P'(u) = p'(u) + (Offset / R**2) * (DNdir/DU * R - Ndir * (DR/R)) -#ifdef DEB - GeomAbs_Shape Continuity = basisCurve->Continuity(); -#else - basisCurve->Continuity(); -#endif - basisCurve->D2 (U, Pbasis, V1basis, V2basis); V1 = V1basis; Vec2d V2 = V2basis; @@ -546,12 +529,6 @@ void Geom2d_OffsetCurve::D2 (const Standard_Real U, // P"(u) = p"(u) + (Offset / R) * (D2Ndir/DU - DNdir * (2.0 * Dr/ R**2) + // Ndir * ( (3.0 * Dr**2 / R**4) - (D2r / R**2))) -#ifdef DEB - GeomAbs_Shape Continuity = basisCurve->Continuity(); -#else - basisCurve->Continuity(); -#endif - basisCurve->D3 (U, Pbasis, V1basis, V2basis, V3basis); Standard_Integer Index = 2; V1 = V1basis; diff --git a/src/GeomFill/GeomFill_CorrectedFrenet.cxx b/src/GeomFill/GeomFill_CorrectedFrenet.cxx index 3636945c93..6cf6835d37 100755 --- a/src/GeomFill/GeomFill_CorrectedFrenet.cxx +++ b/src/GeomFill/GeomFill_CorrectedFrenet.cxx @@ -592,10 +592,6 @@ Standard_Real GeomFill_CorrectedFrenet::GetAngleAT(const Standard_Real Param) co }; if(HArrPoles->Value(iC) == Param || Param == HArrPoles->Value(iC+1)) return TLaw->Value(Param); }; -#ifdef DEB - Standard_Real Po = -#endif - HArrPoles->Value(iC); // Calculate differenciation between apporoximated and local values of AngleAT Standard_Real AngP = TLaw->Value(Param), AngPo = HArrAngle->Value(iC), dAng = AngP - AngPo; gp_Vec Tangent, Normal, BN; diff --git a/src/GeomFill/GeomFill_Curved.cxx b/src/GeomFill/GeomFill_Curved.cxx index 6a8690fd48..1db817823f 100755 --- a/src/GeomFill/GeomFill_Curved.cxx +++ b/src/GeomFill/GeomFill_Curved.cxx @@ -268,10 +268,6 @@ void GeomFill_Curved::Init(const TColgp_Array1OfPnt& P1, IsRational = Standard_False; -#ifdef DEB - Standard_Real NU = NPolU - 1; - Standard_Real NV = NPolV - 1; -#endif myPoles = new TColgp_HArray2OfPnt( 1, NPolU, 1, NPolV); Standard_Integer i,j; diff --git a/src/GeomFill/GeomFill_DraftTrihedron.cxx b/src/GeomFill/GeomFill_DraftTrihedron.cxx index f8bff6ad75..80e0cce9f9 100755 --- a/src/GeomFill/GeomFill_DraftTrihedron.cxx +++ b/src/GeomFill/GeomFill_DraftTrihedron.cxx @@ -17,11 +17,7 @@ static gp_Vec DDeriv(const gp_Vec& F, const gp_Vec& DF, const gp_Vec& D2F) { Standard_Real Norma = F.Magnitude(); -#ifdef DEB - Standard_Real dot = F.Dot(DF); -#else - F.Dot(DF); -#endif + gp_Vec Result = (D2F - 2*DF*(F*DF)/(Norma*Norma))/Norma - F*((DF.SquareMagnitude() + F*D2F - 3*(F*DF)*(F*DF)/(Norma*Norma))/(Norma*Norma*Norma)); diff --git a/src/GeomFill/GeomFill_GuideTrihedronAC.cxx b/src/GeomFill/GeomFill_GuideTrihedronAC.cxx index 21895445b3..7f819adf03 100755 --- a/src/GeomFill/GeomFill_GuideTrihedronAC.cxx +++ b/src/GeomFill/GeomFill_GuideTrihedronAC.cxx @@ -182,11 +182,6 @@ gp_Vec n(P, PG); // vecteur definissant la normale Standard_Real Norm = n.Magnitude(), ndn; -#ifdef DEB - Standard_Real Norm2 = n.SquareMagnitude(); -#else - n.SquareMagnitude(); -#endif //derivee de n par rapport a Param gp_Vec dn, d2n; dn.SetLinearForm(dtg_dt, TG, -1, To); diff --git a/src/GeomFill/GeomFill_LocationGuide.cxx b/src/GeomFill/GeomFill_LocationGuide.cxx index 607b38ed5f..9d9b7865c2 100755 --- a/src/GeomFill/GeomFill_LocationGuide.cxx +++ b/src/GeomFill/GeomFill_LocationGuide.cxx @@ -629,12 +629,6 @@ static void InGoodPeriod(const Standard_Real Prec, gp_Vec T, N, B; gp_Pnt P; Standard_Boolean Ok; -#ifdef DEB - Standard_Real U = myFirstS + ratio*(Param-myCurve->FirstParameter()); -#else - myCurve->FirstParameter() ; -#endif - myCurve->D0(Param, P); V.SetXYZ(P.XYZ()); @@ -650,12 +644,6 @@ static void InGoodPeriod(const Standard_Real Prec, } if (rotation) { -#ifdef DEB - Standard_Real U = myFirstS + ratio*(Param-myCurve->FirstParameter()); -#else - myCurve->FirstParameter() ; -#endif - //initialisation du germe InitX(Param); Standard_Integer Iter = 100; @@ -689,6 +677,7 @@ static void InGoodPeriod(const Standard_Real Prec, } else { #if DEB + Standard_Real U = myFirstS + ratio*(Param-myCurve->FirstParameter()); cout << "LocationGuide::D0 : No Result !"<Degree(); -#else - myPath->Degree(); -#endif Standard_Integer NSpans = myPath->NbKnots()-1; myNbSections = 21 * NSpans; diff --git a/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx b/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx index 6c55b42e91..ae8a49d0da 100755 --- a/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx +++ b/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx @@ -2353,11 +2353,6 @@ VerifSurface(const Standard_Integer NbBoucle) new TColStd_HArray1OfReal(1,NbPts_i-1); Handle(TColStd_HArray1OfReal) tcourb = new TColStd_HArray1OfReal(1,NbPts_i-1); -#ifdef DEB - Standard_Integer Cont_i=myLinCont->Value(i)->Order(); -#else - myLinCont->Value(i)->Order(); -#endif EcartContraintesMil (i,tdist,tang,tcourb); diff --git a/src/GeomPlate/GeomPlate_PlateG0Criterion.cxx b/src/GeomPlate/GeomPlate_PlateG0Criterion.cxx index 8f3ffcd0f4..2fadabc585 100755 --- a/src/GeomPlate/GeomPlate_PlateG0Criterion.cxx +++ b/src/GeomPlate/GeomPlate_PlateG0Criterion.cxx @@ -71,10 +71,6 @@ void GeomPlate_PlateG0Criterion::Value(AdvApp2Var_Patch& P, TColStd_Array1OfReal Curve(1, dimension); TColStd_Array1OfReal Point(1, 3); Standard_Real * Coeffs = (Standard_Real *) &Patch.ChangeValue(1); -#ifdef DEB - Standard_Real * Result = -#endif - (Standard_Real *) &Curve.ChangeValue(1); Standard_Real * Digit = (Standard_Real *) &Point.ChangeValue(1); Standard_Integer k1, k2, pos, ll=1; diff --git a/src/GeomPlate/GeomPlate_PlateG1Criterion.cxx b/src/GeomPlate/GeomPlate_PlateG1Criterion.cxx index 2743297dbb..498ea75b3a 100755 --- a/src/GeomPlate/GeomPlate_PlateG1Criterion.cxx +++ b/src/GeomPlate/GeomPlate_PlateG1Criterion.cxx @@ -68,11 +68,6 @@ void GeomPlate_PlateG1Criterion::Value(AdvApp2Var_Patch& P, TColStd_Array1OfReal Curve(1, 2*dimension); TColStd_Array1OfReal Point(1, 3); Standard_Real * Coeffs = (Standard_Real *) &Patch.ChangeValue(1); -#ifdef DEB - Standard_Real * Result = (Standard_Real *) &Curve.ChangeValue(1); -#else - Curve.ChangeValue(1); -#endif Standard_Real * Digit = (Standard_Real *) &Point.ChangeValue(1); Standard_Integer k1, k2, pos, ll=1; diff --git a/src/GeomProjLib/GeomProjLib.cxx b/src/GeomProjLib/GeomProjLib.cxx index fee78aaf16..77b8ca8558 100755 --- a/src/GeomProjLib/GeomProjLib.cxx +++ b/src/GeomProjLib/GeomProjLib.cxx @@ -327,11 +327,6 @@ Handle(Geom_Curve) GeomProjLib::Project( const Handle(Geom_Curve)& C, Standard_Real TolV = Pow(Tol, 2./3); ProjLib_CompProjectedCurve Proj(HS,HC,TolU,TolV,-1.); -#ifdef DEB - Standard_Integer NbCurves = Proj.NbCurves(); -#else - Proj.NbCurves(); -#endif Standard_Real f,l; Proj.Bounds(1,f,l); Handle(Adaptor2d_HCurve2d) HC2d = Proj.Trim(f,l,TolU); diff --git a/src/GeomToIGES/GeomToIGES_GeomSurface.cxx b/src/GeomToIGES/GeomToIGES_GeomSurface.cxx index 6bc7849716..6a12b5b618 100755 --- a/src/GeomToIGES/GeomToIGES_GeomSurface.cxx +++ b/src/GeomToIGES/GeomToIGES_GeomSurface.cxx @@ -785,12 +785,6 @@ Handle(IGESData_IGESEntity) GeomToIGES_GeomSurface::TransferSurface Standard_Real V1 = Vdeb; Standard_Real V2 = Vfin; - // debug mjm du 28/03/96 -#ifdef DEB - Standard_Boolean IsDirect = -#endif - start->Torus().Direct(); - // creation de la generatrice : Generatrix (cercle) gp_Ax2 Axe = gp_Ax2(gp_Pnt((start->Torus().MajorRadius()), 0., 0.), -gp::DY(), gp::DX()); diff --git a/src/GeometryTest/GeometryTest_ConstraintCommands.cxx b/src/GeometryTest/GeometryTest_ConstraintCommands.cxx index d537aa96a1..9dd57b7c02 100755 --- a/src/GeometryTest/GeometryTest_ConstraintCommands.cxx +++ b/src/GeometryTest/GeometryTest_ConstraintCommands.cxx @@ -757,10 +757,7 @@ static Standard_Integer gcarc (Draw_Interpretor& di,Standard_Integer n, const ch if (DrawTrSurf::GetPoint(a[5], P3)) { // if (DrawTrSurf::GetPoint(a[6], P4)) { if (n>6) { -#ifdef DEB - Standard_Boolean ip4 = -#endif - DrawTrSurf::GetPoint(a[6], P4); + DrawTrSurf::GetPoint(a[6], P4); gp_Vec V1 = gp_Vec(P2,P3); Handle(Geom_Curve)thearc = GC_MakeArcOfCircle(P1,V1,P4).Value(); DrawTrSurf::Set(a[1], thearc); diff --git a/src/GeometryTest/GeometryTest_CurveCommands.cxx b/src/GeometryTest/GeometryTest_CurveCommands.cxx index 4888092eb5..2e88d3c790 100755 --- a/src/GeometryTest/GeometryTest_CurveCommands.cxx +++ b/src/GeometryTest/GeometryTest_CurveCommands.cxx @@ -831,8 +831,7 @@ static void ComputeDeviation(const Handle(Geom_Curve)& theCurve, theUfMax = 0.; theUlMax = 0.; theImax = 0; - Standard_Real dmax = 0., ufmax = 0., ulmax = 0.; - Standard_Integer imax = 0; + Standard_Real ufmax = 0., ulmax = 0.; //take knots Standard_Integer nbp = thePnts->NbKnots(); @@ -1234,7 +1233,7 @@ static Standard_Integer mypoints (Draw_Interpretor& di, Standard_Integer /*n*/, Draw::Set(a[1], aDrCrv); - Standard_Real dmax = 0., ufmax = 0., ulmax = 0., uf, ul; + Standard_Real dmax = 0., ufmax = 0., ulmax = 0.; Standard_Integer imax = 0; ComputeDeviation(C,aPnts,dmax,ufmax,ulmax,imax); diff --git a/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx b/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx index 679cd12543..81d285dcdd 100755 --- a/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx +++ b/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx @@ -585,11 +585,6 @@ static Standard_Integer smoothingbybezier (Draw_Interpretor& di, Standard_Boolean mySquare = (methode == 2); Standard_Integer degmin = 4; Standard_Integer NbIteration = 5; -#ifdef DEB - Standard_Integer NbConst = -#endif - NbConstraint(TABofCC->Value(1).Constraint(), - TABofCC->Value(NbPoints).Constraint()); if (Degree < 4) degmin = Max(1, Degree -1); degmin = Max(degmin, NbConstraint(TABofCC->Value(1).Constraint(), diff --git a/src/Graphic2d/Graphic2d_Paragraph.cxx b/src/Graphic2d/Graphic2d_Paragraph.cxx index d55991d1b9..fa1ede47d3 100755 --- a/src/Graphic2d/Graphic2d_Paragraph.cxx +++ b/src/Graphic2d/Graphic2d_Paragraph.cxx @@ -298,10 +298,7 @@ void Graphic2d_Paragraph::ChangeText (const TCollection_ExtendedString &aText, const Standard_Integer aRow, const Standard_Integer aColumn) { Standard_Integer i,length = myTextDescriptorList.Length() ; -#ifdef DEB -Standard_Integer row = (aRow > 0) ? Min(aRow,MAXROW-1) : MAXROW-1 ; -Standard_Integer column = (aColumn > 0) ? Min(aColumn,MAXCOLUMN-1) : MAXCOLUMN-1 ; -#endif + Standard_Integer descriptor = TEXT_DESCRIPTOR(aRow,aColumn,0,0,0,0) ; Standard_Integer the_position = TEXT_POSITION(descriptor) ; @@ -533,10 +530,6 @@ Standard_Boolean Graphic2d_Paragraph::Pick (const Standard_ShortReal X, const Handle(Graphic2d_Drawer)& aDrawer) { Standard_Boolean theStatus = Standard_False; -#ifdef DEB -Standard_ShortReal scale = -#endif - (myIsZoomable) ? myScale*aDrawer->Scale() : myScale; Standard_ShortReal TX = X, TY = Y; if (IsInMinMax (X, Y, aPrecision)) { diff --git a/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cxx b/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cxx index cec6f296cb..603451a435 100755 --- a/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cxx +++ b/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cxx @@ -796,7 +796,7 @@ Standard_Boolean Graphic3d_ArrayOfPrimitives::IsValid() { Standard_Integer nvertexs = myPrimitiveArray->num_vertexs; Standard_Integer nbounds = myPrimitiveArray->num_bounds; Standard_Integer nedges = myPrimitiveArray->num_edges; - Standard_Integer i,j,k,n; + Standard_Integer i,n; #if TRACE > 0 Standard_CString name = StringType(); diff --git a/src/HLRTopoBRep/HLRTopoBRep_OutLiner.cxx b/src/HLRTopoBRep/HLRTopoBRep_OutLiner.cxx index d3ec0c8941..f0cf6a0b60 100755 --- a/src/HLRTopoBRep/HLRTopoBRep_OutLiner.cxx +++ b/src/HLRTopoBRep/HLRTopoBRep_OutLiner.cxx @@ -91,7 +91,7 @@ void HLRTopoBRep_OutLiner::ProcessFace(const TopoDS_Face& F, { BRep_Builder B; TopExp_Explorer exE, exW; - Standard_Boolean splitted = Standard_False; + //Standard_Boolean splitted = Standard_False; TopTools_IndexedDataMapOfShapeListOfShape aVEMap; TopExp::MapShapesAndAncestors(F, TopAbs_VERTEX, TopAbs_EDGE, aVEMap); diff --git a/src/HatchGen/HatchGen_Hatcher.gxx b/src/HatchGen/HatchGen_Hatcher.gxx index a0b257d8d9..e8e312727e 100755 --- a/src/HatchGen/HatchGen_Hatcher.gxx +++ b/src/HatchGen/HatchGen_Hatcher.gxx @@ -753,10 +753,6 @@ Standard_Boolean HatchGen_Hatcher::GlobalTransition (HatchGen_PointOnHatching& P printf("\n P:%+10.5g Tg2d:%+10.5g , %+10.5g N2d:%+10.5g , %+10.5g Crv:%+10.5g\n\n", Point.Parameter(),Tangente.X(),Tangente.Y(),Normale.X(),Normale.Y(),Courbure); #endif -#ifdef DEB - Standard_Real ParamAtIntersection = -#endif - Point.Parameter(); for (Standard_Integer IPntE = 1 ; IPntE <= Point.NbPoints() ; IPntE++) { const HatchGen_PointOnElement& PntE = Point.Point (IPntE) ; diff --git a/src/IFSelect/IFSelect_WorkSession.cxx b/src/IFSelect/IFSelect_WorkSession.cxx index 4bd6ec87a6..119cb57701 100755 --- a/src/IFSelect/IFSelect_WorkSession.cxx +++ b/src/IFSelect/IFSelect_WorkSession.cxx @@ -958,10 +958,7 @@ Standard_Boolean IFSelect_WorkSession::RemoveName { Handle(Standard_Transient) item = NamedItem(name); if (item.IsNull()) return Standard_False; -#ifdef DEB - Standard_Integer bid = -#endif - theitems.Add(item,item); // reste mais sans nom + theitems.Add(item,item); // reste mais sans nom return thenames->RemoveItem(name); } diff --git a/src/IntCurve/IntCurve_IntConicConic_1.cxx b/src/IntCurve/IntCurve_IntConicConic_1.cxx index 1128f278b8..b02bb85d36 100755 --- a/src/IntCurve/IntCurve_IntConicConic_1.cxx +++ b/src/IntCurve/IntCurve_IntConicConic_1.cxx @@ -1193,8 +1193,6 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1 ProdVectTan=Tan1.Crossed(Tan2); - Standard_Boolean IsInDomain=Standard_True; - //##################################################################### //## Longueur Minimale d un segment Sur Courbe 1 //##################################################################### diff --git a/src/IntCurve/IntCurve_IntPolyPolyGen.gxx b/src/IntCurve/IntCurve_IntPolyPolyGen.gxx index 12ae042ef1..cdc1d09351 100755 --- a/src/IntCurve/IntCurve_IntPolyPolyGen.gxx +++ b/src/IntCurve/IntCurve_IntPolyPolyGen.gxx @@ -247,8 +247,6 @@ void IntCurve_IntPolyPolyGen::Perform( const TheCurve& C1 ,const Standard_Real TheTol) { - Standard_Boolean AnErrorOccurred = Standard_False; - this->ResetFields(); DomainOnCurve1=D1; DomainOnCurve2=D1; diff --git a/src/IntCurveSurface/IntCurveSurface_Inter.gxx b/src/IntCurveSurface/IntCurveSurface_Inter.gxx index b28faa45ed..29d02ece91 100755 --- a/src/IntCurveSurface/IntCurveSurface_Inter.gxx +++ b/src/IntCurveSurface/IntCurveSurface_Inter.gxx @@ -1069,11 +1069,6 @@ void IntCurveSurface_Inter::InternalPerformCurveQuadric(const TheCurve& IntCurveSurface_TheQuadCurvExactInter QuadCurv(surface,curve); if(QuadCurv.IsDone()) { Standard_Integer NbRoots = QuadCurv.NbRoots(); -#ifdef DEB - Standard_Integer NbInter = QuadCurv.NbIntervals(); -#else - QuadCurv.NbIntervals(); -#endif Standard_Real u,v,w; for(Standard_Integer i = 1; i<= NbRoots; i++) { w = QuadCurv.Root(i); @@ -1127,11 +1122,6 @@ void IntCurveSurface_Inter::InternalPerform(const TheCurve& curve, IntCurveSurface_TheQuadCurvExactInter QuadCurv(surface,curve); if(QuadCurv.IsDone()) { Standard_Integer NbRoots = QuadCurv.NbRoots(); -#ifdef DEB - Standard_Integer NbInter = QuadCurv.NbIntervals(); -#else - QuadCurv.NbIntervals(); -#endif Standard_Real u,v,w; for(Standard_Integer i = 1; i<= NbRoots; i++) { w = QuadCurv.Root(i); diff --git a/src/IntCurveSurface/IntCurveSurface_Polygon.gxx b/src/IntCurveSurface/IntCurveSurface_Polygon.gxx index 1f2b9615f1..fdc18303b2 100755 --- a/src/IntCurveSurface/IntCurveSurface_Polygon.gxx +++ b/src/IntCurveSurface/IntCurveSurface_Polygon.gxx @@ -126,7 +126,6 @@ void IntCurveSurface_Polygon::Init(const TheCurve& C, //ddout << "IntCurveSurface_Polygon::Init" << endl; Standard_Real u=Binf; - Standard_Real u1=Bsup; Standard_Integer i=1, i0 = Upars.Lower()-1; gp_Pnt P; diff --git a/src/IntCurveSurface/IntCurveSurface_Polyhedron.gxx b/src/IntCurveSurface/IntCurveSurface_Polyhedron.gxx index d77403f0e8..f3c6eff025 100755 --- a/src/IntCurveSurface/IntCurveSurface_Polyhedron.gxx +++ b/src/IntCurveSurface/IntCurveSurface_Polyhedron.gxx @@ -420,10 +420,6 @@ Standard_Integer IntCurveSurface_Polyhedron::TriConnex Standard_Integer& TriCon, Standard_Integer& OtherP) const { -#ifdef DEB - Standard_Integer nbdeltaUp1 = nbdeltaU + 1; - Standard_Integer nbdeltaUm2 = nbdeltaU + nbdeltaU; -#endif Standard_Integer Pivotm1 = Pivot-1; Standard_Integer nbdeltaVp1 = nbdeltaV+1; Standard_Integer nbdeltaVm2 = nbdeltaV + nbdeltaV; diff --git a/src/IntPatch/IntPatch_ALine.cxx b/src/IntPatch/IntPatch_ALine.cxx index 35da104491..8642550df6 100755 --- a/src/IntPatch/IntPatch_ALine.cxx +++ b/src/IntPatch/IntPatch_ALine.cxx @@ -488,11 +488,6 @@ void IntPatch_ALine::ComputeVertexParameters(const Standard_Real Tol) { nbvtx = NbVertex(); if(nbvtx>1) { IntPatch_Point& VTX0 = svtx.ChangeValue(1); -#ifdef DEB - //Standard_Real d; - IntPatch_Point& VTX1 = -#endif - svtx.ChangeValue(2); if( (VTX0.IsOnDomS1() == Standard_False) && (VTX0.IsOnDomS2() == Standard_False)) { svtx.Remove(1); @@ -504,10 +499,6 @@ void IntPatch_ALine::ComputeVertexParameters(const Standard_Real Tol) { } if(nbvtx>1) { IntPatch_Point& VTX0 = svtx.ChangeValue(nbvtx); -#ifdef DEB - IntPatch_Point& VTX1 = -#endif - svtx.ChangeValue(nbvtx-1); if( (VTX0.IsOnDomS1() == Standard_False) && (VTX0.IsOnDomS2() == Standard_False)) { svtx.Remove(nbvtx); diff --git a/src/IntPatch/IntPatch_ImpImpIntersection_0.gxx b/src/IntPatch/IntPatch_ImpImpIntersection_0.gxx index 32705947f4..fd4946b5c6 100755 --- a/src/IntPatch/IntPatch_ImpImpIntersection_0.gxx +++ b/src/IntPatch/IntPatch_ImpImpIntersection_0.gxx @@ -1075,9 +1075,9 @@ Standard_Boolean FindLine (gp_Pnt& Psurf, //-- le point n a pas ete trouve par bete projection. //-- on essaie l intersection avec la restriction en 2d Standard_Real theparamonarc = theparameteronarc; -#ifdef DEB - Standard_Real anpara=para; -#endif +//#ifdef DEB +// Standard_Real anpara=para; +//#endif gp_Pnt CopiePsurf=Psurf; Standard_Boolean ok=IntersectionWithAnArc(CopiePsurf,alin,para,thearc,theparamonarc,thepointonarc,QuadSurf,lower,upper,dist); diff --git a/src/IntPatch/IntPatch_ImpPrmIntersection.cxx b/src/IntPatch/IntPatch_ImpPrmIntersection.cxx index 3d2e28bd93..f6b839311b 100755 --- a/src/IntPatch/IntPatch_ImpPrmIntersection.cxx +++ b/src/IntPatch/IntPatch_ImpPrmIntersection.cxx @@ -2337,7 +2337,7 @@ void DecomposeResult(Handle(IntPatch_Line)& Line, Standard_Real BSEAM = 1.5*M_PI; // delta U crossing seam Standard_Real BAPEX = M_PI/16.; // delta U crossing apex - Standard_Integer i = 0, k = 0; + Standard_Integer k = 0; Standard_Real U1 = 0., U2 = 0., V1 = 0., V2 = 0., AnU1 = 0., AnV1 = 0., DU1 = 0., DV1 = 0.; Standard_Integer Findex = 1, Lindex = NbPnts, Bindex = 0; diff --git a/src/IntPatch/IntPatch_LineConstructor.cxx b/src/IntPatch/IntPatch_LineConstructor.cxx index b24e020dd3..1b4d000add 100755 --- a/src/IntPatch/IntPatch_LineConstructor.cxx +++ b/src/IntPatch/IntPatch_LineConstructor.cxx @@ -1395,10 +1395,6 @@ void IntPatch_LineConstructor::Perform(const IntPatch_SequenceOfLine& slinref, } else if (typl != IntPatch_Restriction) { // JAG 01.07.96 Standard_Real u1,v1,u2,v2; -#ifdef DEB - Standard_Real paramminonvtx=RealLast(); - Standard_Real parammaxonvtx=-paramminonvtx; -#endif Handle(IntPatch_GLine)& GLine = *((Handle(IntPatch_GLine) *)&L); slin.Clear(); diff --git a/src/IntPatch/IntPatch_Polyhedron.cxx b/src/IntPatch/IntPatch_Polyhedron.cxx index 36c5014ebc..27a2c88f13 100755 --- a/src/IntPatch/IntPatch_Polyhedron.cxx +++ b/src/IntPatch/IntPatch_Polyhedron.cxx @@ -194,9 +194,6 @@ Standard_Real IntPatch_Polyhedron::DeflectionOnTriangle gp_XYZ XYZ3=P1.XYZ()-P3.XYZ(); gp_Vec NormalVector((XYZ1^XYZ2)+(XYZ2^XYZ3)+(XYZ3^XYZ1)); NormalVector.Normalize(); -#ifdef DEB - Standard_Real PolarDistance = NormalVector * P1.XYZ(); -#endif //-- Calcul du point u,v au centre du triangle Standard_Real u = (u1+u2+u3)/3.0; Standard_Real v = (v1+v2+v3)/3.0; @@ -317,10 +314,6 @@ Standard_Integer IntPatch_Polyhedron::TriConnex (const Standard_Integer Triang, Standard_Integer& TriCon, Standard_Integer& OtherP) const { -#ifdef DEB - Standard_Integer nbdeltaUp1 = nbdeltaU + 1; - Standard_Integer nbdeltaUm2 = nbdeltaU + nbdeltaU; -#endif Standard_Integer Pivotm1 = Pivot-1; Standard_Integer nbdeltaVp1 = nbdeltaV+1; Standard_Integer nbdeltaVm2 = nbdeltaV + nbdeltaV; diff --git a/src/IntPatch/IntPatch_PrmPrmIntersection_T3Bits.cxx b/src/IntPatch/IntPatch_PrmPrmIntersection_T3Bits.cxx index 2662d159d8..ec18e3f17a 100755 --- a/src/IntPatch/IntPatch_PrmPrmIntersection_T3Bits.cxx +++ b/src/IntPatch/IntPatch_PrmPrmIntersection_T3Bits.cxx @@ -28,7 +28,6 @@ Standard_Integer IntPatch_PrmPrmIntersection_T3Bits::And(IntPatch_PrmPrmIntersec Standard_Integer& indice) { int k=indice>>5; - Standard_Integer r=0; while(kGetType(); - GeomAbs_SurfaceType ST2 = mySurf2->GetType(); + //GeomAbs_SurfaceType ST1 = mySurf1->GetType(); + //GeomAbs_SurfaceType ST2 = mySurf2->GetType(); // if(ST1 == GeomAbs_Torus || ST2 == GeomAbs_Torus) // startFromAdvanced = Standard_True; diff --git a/src/IntPolyh/IntPolyh_MaillageAffinage.cxx b/src/IntPolyh/IntPolyh_MaillageAffinage.cxx index 2fb23f992e..24e0a98b95 100755 --- a/src/IntPolyh/IntPolyh_MaillageAffinage.cxx +++ b/src/IntPolyh/IntPolyh_MaillageAffinage.cxx @@ -373,7 +373,7 @@ void IntPolyh_MaillageAffinage::FillArrayOfPnt Standard_Boolean bDegI, bDeg; Standard_Integer aNbU, aNbV, iCnt, i, j; Standard_Integer aID1, aID2, aJD1, aJD2; - Standard_Real aTol, aU, aV, aX, aY, aZ, aDegX, aTol2; + Standard_Real aTol, aU, aV, aX, aY, aZ; gp_Pnt aP; // aNbU=(SurfID==1)? NbSamplesU1 : NbSamplesU2; diff --git a/src/IntRes2d/IntRes2d_Intersection.cxx b/src/IntRes2d/IntRes2d_Intersection.cxx index 0aa00cf884..b54931af0b 100755 --- a/src/IntRes2d/IntRes2d_Intersection.cxx +++ b/src/IntRes2d/IntRes2d_Intersection.cxx @@ -233,41 +233,10 @@ void IntRes2d_Intersection::Append( const IntRes2d_Intersection& Other const IntRes2d_IntersectionPoint& AnP1=lseg(j).FirstPoint(); Standard_Real AnP1PParamOnFirst=AnP1.ParamOnFirst(); Standard_Real AnP1PParamOnSecond=AnP1.ParamOnSecond(); -#if DEB - const IntRes2d_Transition& AnP1T1=AnP1.TransitionOfFirst(); -#else - AnP1.TransitionOfFirst(); -#endif -#if DEB - const IntRes2d_Transition& AnP1T2=AnP1.TransitionOfSecond(); -#else - AnP1.TransitionOfSecond(); -#endif -#if DEB - const gp_Pnt2d& AnPt1=AnP1.Value(); -#else - AnP1.Value(); -#endif const IntRes2d_IntersectionPoint& AnP2=lseg(j).LastPoint(); Standard_Real AnP2PParamOnFirst=AnP2.ParamOnFirst(); Standard_Real AnP2PParamOnSecond=AnP2.ParamOnSecond(); -#if DEB - const IntRes2d_Transition& AnP2T1=AnP2.TransitionOfFirst(); -#else - AnP2.TransitionOfFirst(); -#endif -#if DEB - const IntRes2d_Transition& AnP2T2=AnP2.TransitionOfSecond(); -#else - AnP2.TransitionOfSecond(); -#endif -#if DEB - const gp_Pnt2d& AnPt2=AnP2.Value(); -#else - AnP2.Value(); -#endif - if(Opposite == lseg(j).IsOpposite()) { //--------------------------------------------------------------- diff --git a/src/IntStart/IntStart_SearchOnBoundaries_1.gxx b/src/IntStart/IntStart_SearchOnBoundaries_1.gxx index 5fc0cd4078..88bc1d3f29 100755 --- a/src/IntStart/IntStart_SearchOnBoundaries_1.gxx +++ b/src/IntStart/IntStart_SearchOnBoundaries_1.gxx @@ -304,7 +304,6 @@ void BoundedArc (const TheArc& A, //Standard_Integer aNbNodes = 23; Standard_Real aDelta = (parap1 - para)/(aNbNodes + 1.); Standard_Integer ii; - Standard_Real aMinPar = Pdeb - 1.; Standard_Real aCurPar; Standard_Real aCurVal; diff --git a/src/IntTools/IntTools_EdgeFace.cxx b/src/IntTools/IntTools_EdgeFace.cxx index e6f6eb3521..4e924c037f 100755 --- a/src/IntTools/IntTools_EdgeFace.cxx +++ b/src/IntTools/IntTools_EdgeFace.cxx @@ -404,7 +404,6 @@ void IntTools_EdgeFace::CheckData() Standard_Boolean bFlag; Standard_Real Umin, Usup, Vmin, Vsup; - const Handle(Geom_Surface)& GS=BRep_Tool::Surface(myFace); Umin=myS.FirstUParameter(); Usup=myS.LastUParameter(); Vmin=myS.FirstVParameter(); @@ -460,8 +459,6 @@ void IntTools_EdgeFace::CheckData() aD=aD-myCriteria; return aD; } - // - const Handle(Geom_Surface)& GS=BRep_Tool::Surface(myFace); Umin=myS.FirstUParameter(); Usup=myS.LastUParameter(); diff --git a/src/IntTools/IntTools_FaceFace.cxx b/src/IntTools/IntTools_FaceFace.cxx index 3156a2c525..20c331b3ad 100755 --- a/src/IntTools/IntTools_FaceFace.cxx +++ b/src/IntTools/IntTools_FaceFace.cxx @@ -751,7 +751,6 @@ void IntTools_FaceFace::SetList(IntSurf_ListOfPntOn2S& aListOfPnts) //ZZ {// Check the distances - Standard_Boolean bIsDone; Standard_Integer i, j, aNbP; Standard_Real aT, aT1, aT2, dT, aD2, aD2Max; // diff --git a/src/IntWalk/IntWalk_IWalking_1.gxx b/src/IntWalk/IntWalk_IWalking_1.gxx index 5e70f9d74a..e3cbc241ac 100755 --- a/src/IntWalk/IntWalk_IWalking_1.gxx +++ b/src/IntWalk/IntWalk_IWalking_1.gxx @@ -79,9 +79,6 @@ void IntWalk_IWalking::Perform(const ThePOPIterator& Pnts1, etat1(I) = etat1(I) + 1; Standard_Integer etat1I=etat1(I); -#ifdef DEB - Standard_Integer multi=0; -#endif //-- cout<<" \n Etat1("<NbPoints(); Standard_Integer Indextg; Line->TangentVector(Indextg); @@ -738,10 +726,7 @@ void IntWalk_IWalking::TestArretCadre Irang = -Irang; // jag 941017 static math_Vector bidF(1,1); static math_Matrix bidD(1,1,1,2); -#ifdef DEB - Standard_Boolean bidB = -#endif - sp.Values(UV,bidF,bidD); + sp.Values(UV,bidF,bidD); return; } } diff --git a/src/IntWalk/IntWalk_IWalking_3.gxx b/src/IntWalk/IntWalk_IWalking_3.gxx index f986a1f74e..6c4236c87e 100755 --- a/src/IntWalk/IntWalk_IWalking_3.gxx +++ b/src/IntWalk/IntWalk_IWalking_3.gxx @@ -484,10 +484,7 @@ static Standard_Boolean TestPassedSolutionWithNegativeState(const TColStd_Sequen if (Arrive) { static math_Vector bidF(1,1); static math_Matrix bidD(1,1,1,2); -#ifdef DEB - Standard_Boolean bidB = -#endif - sp.Values(UV,bidF,bidD); + sp.Values(UV,bidF,bidD); break; } } diff --git a/src/IntWalk/IntWalk_IWalking_6.gxx b/src/IntWalk/IntWalk_IWalking_6.gxx index 6a2f2a881b..16e581a1ab 100755 --- a/src/IntWalk/IntWalk_IWalking_6.gxx +++ b/src/IntWalk/IntWalk_IWalking_6.gxx @@ -38,9 +38,6 @@ void IntWalk_IWalking::MakeWalkingPoint if (Case == 1) Psol.SetValue(sp.Point(),reversed, U, V); else if (Case == 2) { -#ifdef DEB - Standard_Boolean foo = sp.IsTangent(); -#endif Psol.SetValue(sp.Point(),reversed, U, V); } else if (Case == 11 || Case == 12 ) { diff --git a/src/IntWalk/IntWalk_PWalking_1.gxx b/src/IntWalk/IntWalk_PWalking_1.gxx index 8cb1a63151..ef71c69111 100755 --- a/src/IntWalk/IntWalk_PWalking_1.gxx +++ b/src/IntWalk/IntWalk_PWalking_1.gxx @@ -400,7 +400,6 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep, const Standard_Real v2max) { //xf - Standard_Integer iCnt=0; Standard_Integer i, NbPasOKConseq; Standard_Real UFirst1, VFirst1, ULast1, VLast1, UFirst2, VFirst2, ULast2, VLast2; Standard_Real pasMaxSV[4], aTmp; diff --git a/src/Interface/Interface_Graph.cxx b/src/Interface/Interface_Graph.cxx index d8b5cc9218..310e758d61 100755 --- a/src/Interface/Interface_Graph.cxx +++ b/src/Interface/Interface_Graph.cxx @@ -100,7 +100,7 @@ void Interface_Graph::Evaluate() { // Evaluation d un Graphe de dependances : sur chaque Entite, on prend sa // liste "Shared". On en deduit les "Sharing" directement - Standard_Integer n = Size(), total = 0; + Standard_Integer n = Size(); thesharings = new TColStd_HArray1OfListOfInteger(1,n);//TColStd_HArray1OfTransient(1,n);//Clear(); if(themodel->GTool().IsNull()) return; diff --git a/src/Intf/Intf_InterferencePolygonPolyhedron.gxx b/src/Intf/Intf_InterferencePolygonPolyhedron.gxx index 7bcd55f2fa..ab54172e11 100755 --- a/src/Intf/Intf_InterferencePolygonPolyhedron.gxx +++ b/src/Intf/Intf_InterferencePolygonPolyhedron.gxx @@ -578,7 +578,6 @@ void Intf_InterferencePolygonPolyhedron::Interference while (clt.More()) { indTri=clt.Value(); // Modified by MKK - Thu Oct 25 12:40:11 2007 Begin - Standard_Integer prevSize = mySPoins.Length(); Standard_Integer pTri[3]; ToolPolyh::Triangle(thePolyh, indTri, pTri[0], pTri[1], pTri[2]); @@ -1039,7 +1038,7 @@ void Intf_InterferencePolygonPolyhedron::Intersect Standard_Integer pTri[3]; ToolPolyh::Triangle(thePolyh, TTri, pTri[0], pTri[1], pTri[2]); gp_XYZ triNor = TriNormal; // Vecteur normal. - Standard_Real triDp = TriDp; // Distance polaire. + //Standard_Real triDp = TriDp; // Distance polaire. // Standard_Real dBegTri=(triNor*BegO.XYZ())-triDp; // Distance plan diff --git a/src/Law/Law_Interpol.cxx b/src/Law/Law_Interpol.cxx index 672dd6dcf8..f66d28355d 100755 --- a/src/Law/Law_Interpol.cxx +++ b/src/Law/Law_Interpol.cxx @@ -91,10 +91,6 @@ void Law_Interpol::Set(const TColgp_Array1OfPnt2d& ParAndRad, const Standard_Boolean Periodic) { Standard_Integer l = ParAndRad.Lower(); -#ifdef DEB - Standard_Integer u = -#endif - ParAndRad.Upper(); Standard_Integer nbp = ParAndRad.Length(); Handle(TColStd_HArray1OfReal) par = new TColStd_HArray1OfReal(1,nbp); @@ -169,10 +165,6 @@ void Law_Interpol::Set(const TColgp_Array1OfPnt2d& ParAndRad, const Standard_Boolean Periodic) { Standard_Integer l = ParAndRad.Lower(); -#ifdef DEB - Standard_Integer u = -#endif - ParAndRad.Upper(); Standard_Integer nbp = ParAndRad.Length(); Handle(TColStd_HArray1OfReal) par = new TColStd_HArray1OfReal(1,nbp); diff --git a/src/LocOpe/LocOpe_CSIntersector.cxx b/src/LocOpe/LocOpe_CSIntersector.cxx index 3b3e8e9a1c..7f0748c15b 100755 --- a/src/LocOpe/LocOpe_CSIntersector.cxx +++ b/src/LocOpe/LocOpe_CSIntersector.cxx @@ -137,10 +137,6 @@ void LocOpe_CSIntersector::Perform(const LocOpe_SequenceOfCirc& Scir) for (; exp.More(); exp.Next()) { const TopoDS_Face& theface = TopoDS::Face(exp.Current()); IntCurvesFace_Intersector theInt(theface,0.); -#ifdef DEB - TopAbs_Orientation orface = -#endif - theface.Orientation(); for (Standard_Integer i = 1; i<=myNbelem; i++) { HC->ChangeCurve().Load(new Geom_Circle(Scir(i))); @@ -179,10 +175,6 @@ void LocOpe_CSIntersector::Perform(const TColGeom_SequenceOfCurve& Scur) for (; exp.More(); exp.Next()) { const TopoDS_Face& theface = TopoDS::Face(exp.Current()); IntCurvesFace_Intersector theInt(theface,0.); -#ifdef DEB - TopAbs_Orientation orface = -#endif - theface.Orientation(); for (Standard_Integer i = 1; i<=myNbelem; i++) { if (Scur(i).IsNull()) { continue; @@ -599,10 +591,6 @@ static void AddPoints(IntCurvesFace_Intersector& theInt, Standard_Integer nbpoints = theSeq.Length(); Standard_Integer newpnt = theInt.NbPnt(); Standard_Real param,paramu,paramv; -#ifdef DEB - TopAbs_Orientation orface = -#endif - theface.Orientation(); for (Standard_Integer j = 1; j<=newpnt; j++) { const gp_Pnt& thept = theInt.Pnt(j); param = theInt.WParameter(j); diff --git a/src/LocOpe/LocOpe_Generator.cxx b/src/LocOpe/LocOpe_Generator.cxx index 6838b8ae7d..8c3eeda1c2 100755 --- a/src/LocOpe/LocOpe_Generator.cxx +++ b/src/LocOpe/LocOpe_Generator.cxx @@ -910,10 +910,6 @@ void LocOpe_Generator::Perform(const Handle(LocOpe_GeneratedShape)& G) L.AddConstEdges(listofedg); L.Perform(); L.WiresToFaces(); -#ifdef DEB - const TopTools_ListOfShape& listofwires = -#endif - L.NewWires(); const TopTools_ListOfShape& listoffaces = L.NewFaces(); toRemove.Add(fac); // if (!HasWire) { diff --git a/src/LocOpe/LocOpe_SplitDrafts.cxx b/src/LocOpe/LocOpe_SplitDrafts.cxx index 0369b26933..01d1043374 100755 --- a/src/LocOpe/LocOpe_SplitDrafts.cxx +++ b/src/LocOpe/LocOpe_SplitDrafts.cxx @@ -1139,10 +1139,8 @@ void LocOpe_SplitDrafts::Perform(const TopoDS_Face& F, TopoDS_Vertex Vf2,Vl2; TopExp::Vertices(TopoDS::Edge(Gvf),Vf2,Vl2); -#ifdef DEB - TopAbs_Orientation ornw = -#endif - NewEdg.Orientation(); + + //TopAbs_Orientation ornw = NewEdg.Orientation(); // ici bug orientation : voir tspdrft6 @@ -1170,10 +1168,8 @@ void LocOpe_SplitDrafts::Perform(const TopoDS_Face& F, TopoDS_Vertex Vf2,Vl2; TopExp::Vertices(TopoDS::Edge(Gvl),Vf2,Vl2); -#ifdef DEB - TopAbs_Orientation ornw = -#endif - NewEdg.Orientation(); + + //TopAbs_Orientation ornw = NewEdg.Orientation(); // ici bug orientation : voir tspdrft6 diff --git a/src/LocOpe/LocOpe_SplitShape.cxx b/src/LocOpe/LocOpe_SplitShape.cxx index bfec58569b..a553263628 100755 --- a/src/LocOpe/LocOpe_SplitShape.cxx +++ b/src/LocOpe/LocOpe_SplitShape.cxx @@ -948,10 +948,9 @@ static Standard_Boolean IsInside(const TopoDS_Face& F, TopoDS_Shape aLocalShape = F.EmptyCopied(); TopoDS_Face newFace = TopoDS::Face(aLocalShape); // TopoDS_Face newFace = TopoDS::Face(F.EmptyCopied()); -#ifdef DEB - TopAbs_Orientation orWire = -#endif - W2.Orientation(); + + //TopAbs_Orientation orWire = W2.Orientation(); + newFace.Orientation(TopAbs_FORWARD); B.Add(newFace,W2); // GProp_GProps GP; diff --git a/src/MAT2d/MAT2d_Tool2d.cxx b/src/MAT2d/MAT2d_Tool2d.cxx index 85ed625b24..69cbd02eaf 100755 --- a/src/MAT2d/MAT2d_Tool2d.cxx +++ b/src/MAT2d/MAT2d_Tool2d.cxx @@ -397,9 +397,6 @@ void MAT2d_Tool2d::TrimBisec ( Bisector_Bisec& B1, //gp_Vec2d Tan1,Tan2; gp_Pnt2d Ori; //PEdge; Standard_Integer IPrec,INext; -#ifdef DEB - Standard_Real Tolerance = MAT2d_TOLCONF; -#endif IPrec = (IndexEdge == 1) ? theCircuit->NumberOfItems() : (IndexEdge - 1); INext = (IndexEdge == theCircuit->NumberOfItems()) ? 1 : (IndexEdge + 1); diff --git a/src/MXCAFDoc/MXCAFDoc_AreaRetrievalDriver.cxx b/src/MXCAFDoc/MXCAFDoc_AreaRetrievalDriver.cxx index 2666a53f6e..a2c8272bfb 100755 --- a/src/MXCAFDoc/MXCAFDoc_AreaRetrievalDriver.cxx +++ b/src/MXCAFDoc/MXCAFDoc_AreaRetrievalDriver.cxx @@ -57,9 +57,5 @@ Standard_Integer MXCAFDoc_AreaRetrievalDriver::VersionNumber() const Handle(PXCAFDoc_Area) S = Handle(PXCAFDoc_Area)::DownCast (Source); Handle(XCAFDoc_Area) T = Handle(XCAFDoc_Area)::DownCast (Target); -#ifdef DEB - PTColStd_PersistentTransientMap& PTMap = -#endif - RelocTable->OtherTable(); T->Set(S->Get()); } diff --git a/src/MXCAFDoc/MXCAFDoc_AreaStorageDriver.cxx b/src/MXCAFDoc/MXCAFDoc_AreaStorageDriver.cxx index af5361b5a5..b666e19664 100755 --- a/src/MXCAFDoc/MXCAFDoc_AreaStorageDriver.cxx +++ b/src/MXCAFDoc/MXCAFDoc_AreaStorageDriver.cxx @@ -57,9 +57,5 @@ Standard_Integer MXCAFDoc_AreaStorageDriver::VersionNumber() const Handle(XCAFDoc_Area) S = Handle(XCAFDoc_Area)::DownCast (Source); Handle(PXCAFDoc_Area) T = Handle(PXCAFDoc_Area)::DownCast (Target); -#ifdef DEB - PTColStd_TransientPersistentMap& TPMap = -#endif - RelocTable->OtherTable(); T->Set(S->Get()); } diff --git a/src/MXCAFDoc/MXCAFDoc_CentroidRetrievalDriver.cxx b/src/MXCAFDoc/MXCAFDoc_CentroidRetrievalDriver.cxx index efc9e98247..dd3bfc1fb1 100755 --- a/src/MXCAFDoc/MXCAFDoc_CentroidRetrievalDriver.cxx +++ b/src/MXCAFDoc/MXCAFDoc_CentroidRetrievalDriver.cxx @@ -62,9 +62,5 @@ MXCAFDoc_CentroidRetrievalDriver::MXCAFDoc_CentroidRetrievalDriver(const Handle( Handle(PXCAFDoc_Centroid) S = Handle(PXCAFDoc_Centroid)::DownCast (Source); Handle(XCAFDoc_Centroid) T = Handle(XCAFDoc_Centroid)::DownCast (Target); -#ifdef DEB - PTColStd_PersistentTransientMap& PTMap = -#endif - RelocTable->OtherTable(); T->Set(S->Get()); } diff --git a/src/MXCAFDoc/MXCAFDoc_CentroidStorageDriver.cxx b/src/MXCAFDoc/MXCAFDoc_CentroidStorageDriver.cxx index a04b22b15c..cd925dd153 100755 --- a/src/MXCAFDoc/MXCAFDoc_CentroidStorageDriver.cxx +++ b/src/MXCAFDoc/MXCAFDoc_CentroidStorageDriver.cxx @@ -60,9 +60,5 @@ MXCAFDoc_CentroidStorageDriver::MXCAFDoc_CentroidStorageDriver(const Handle(CDM_ Handle(XCAFDoc_Centroid) S = Handle(XCAFDoc_Centroid)::DownCast (Source); Handle(PXCAFDoc_Centroid) T = Handle(PXCAFDoc_Centroid)::DownCast (Target); -#ifdef DEB - PTColStd_TransientPersistentMap& TPMap = -#endif - RelocTable->OtherTable(); T->Set(S->Get()); } diff --git a/src/MXCAFDoc/MXCAFDoc_DatumRetrievalDriver.cxx b/src/MXCAFDoc/MXCAFDoc_DatumRetrievalDriver.cxx index 4195b84031..98ceb58a85 100755 --- a/src/MXCAFDoc/MXCAFDoc_DatumRetrievalDriver.cxx +++ b/src/MXCAFDoc/MXCAFDoc_DatumRetrievalDriver.cxx @@ -61,10 +61,6 @@ void MXCAFDoc_DatumRetrievalDriver::Paste(const Handle(PDF_Attribute)& Source, Handle(PXCAFDoc_Datum) S = Handle(PXCAFDoc_Datum)::DownCast (Source); Handle(XCAFDoc_Datum) T = Handle(XCAFDoc_Datum)::DownCast (Target); -#ifdef DEB - PTColStd_PersistentTransientMap& PTMap = -#endif - RelocTable->OtherTable(); Handle(TCollection_HAsciiString) aName, aDescr, anId; if ( !S->GetName().IsNull() ) aName = new TCollection_HAsciiString( (S->GetName())->Convert() ); diff --git a/src/MXCAFDoc/MXCAFDoc_DatumStorageDriver.cxx b/src/MXCAFDoc/MXCAFDoc_DatumStorageDriver.cxx index 14fda2cecc..ecb2d5efc7 100755 --- a/src/MXCAFDoc/MXCAFDoc_DatumStorageDriver.cxx +++ b/src/MXCAFDoc/MXCAFDoc_DatumStorageDriver.cxx @@ -59,10 +59,6 @@ void MXCAFDoc_DatumStorageDriver::Paste(const Handle(TDF_Attribute)& Source, { Handle(XCAFDoc_Datum) S = Handle(XCAFDoc_Datum)::DownCast (Source); Handle(PXCAFDoc_Datum) T = Handle(PXCAFDoc_Datum)::DownCast (Target); -#ifdef DEB - PTColStd_TransientPersistentMap& TPMap = -#endif - RelocTable->OtherTable(); Handle(TCollection_HAsciiString) aNameStr = S->GetName(); Handle(TCollection_HAsciiString) aDescrStr = S->GetDescription(); Handle(TCollection_HAsciiString) anIdStr = S->GetIdentification(); diff --git a/src/MXCAFDoc/MXCAFDoc_DimTolRetrievalDriver.cxx b/src/MXCAFDoc/MXCAFDoc_DimTolRetrievalDriver.cxx index 133a0b9930..6838fc5fef 100755 --- a/src/MXCAFDoc/MXCAFDoc_DimTolRetrievalDriver.cxx +++ b/src/MXCAFDoc/MXCAFDoc_DimTolRetrievalDriver.cxx @@ -63,10 +63,6 @@ void MXCAFDoc_DimTolRetrievalDriver::Paste(const Handle(PDF_Attribute)& Source, Handle(PXCAFDoc_DimTol) S = Handle(PXCAFDoc_DimTol)::DownCast (Source); Handle(XCAFDoc_DimTol) T = Handle(XCAFDoc_DimTol)::DownCast (Target); -#ifdef DEB - PTColStd_PersistentTransientMap& PTMap = -#endif - RelocTable->OtherTable(); Handle(TColStd_HArray1OfReal) aVals; Handle(PColStd_HArray1OfReal) aPArr = S->GetVal(); if ( !aPArr.IsNull() ) diff --git a/src/MXCAFDoc/MXCAFDoc_DimTolStorageDriver.cxx b/src/MXCAFDoc/MXCAFDoc_DimTolStorageDriver.cxx index 14dac6ed11..bb9d3bfeda 100755 --- a/src/MXCAFDoc/MXCAFDoc_DimTolStorageDriver.cxx +++ b/src/MXCAFDoc/MXCAFDoc_DimTolStorageDriver.cxx @@ -61,10 +61,6 @@ void MXCAFDoc_DimTolStorageDriver::Paste(const Handle(TDF_Attribute)& Source, { Handle(XCAFDoc_DimTol) S = Handle(XCAFDoc_DimTol)::DownCast (Source); Handle(PXCAFDoc_DimTol) T = Handle(PXCAFDoc_DimTol)::DownCast (Target); -#ifdef DEB - PTColStd_TransientPersistentMap& TPMap = -#endif - RelocTable->OtherTable(); Handle(TColStd_HArray1OfReal) aHArr = S->GetVal(); Handle(PColStd_HArray1OfReal) aVals; if ( !aHArr.IsNull() ) diff --git a/src/MXCAFDoc/MXCAFDoc_MaterialRetrievalDriver.cxx b/src/MXCAFDoc/MXCAFDoc_MaterialRetrievalDriver.cxx index be95d948d0..ffcfb803c4 100755 --- a/src/MXCAFDoc/MXCAFDoc_MaterialRetrievalDriver.cxx +++ b/src/MXCAFDoc/MXCAFDoc_MaterialRetrievalDriver.cxx @@ -61,10 +61,6 @@ void MXCAFDoc_MaterialRetrievalDriver::Paste(const Handle(PDF_Attribute)& Source Handle(PXCAFDoc_Material) S = Handle(PXCAFDoc_Material)::DownCast (Source); Handle(XCAFDoc_Material) T = Handle(XCAFDoc_Material)::DownCast (Target); -#ifdef DEB - PTColStd_PersistentTransientMap& PTMap = -#endif - RelocTable->OtherTable(); Handle(TCollection_HAsciiString) aName, aDescr, aDensName, aDensValType; if ( !S->GetName().IsNull() ) aName = new TCollection_HAsciiString( (S->GetName())->Convert() ); diff --git a/src/MXCAFDoc/MXCAFDoc_MaterialStorageDriver.cxx b/src/MXCAFDoc/MXCAFDoc_MaterialStorageDriver.cxx index 7be8dafc2e..7ea408b028 100755 --- a/src/MXCAFDoc/MXCAFDoc_MaterialStorageDriver.cxx +++ b/src/MXCAFDoc/MXCAFDoc_MaterialStorageDriver.cxx @@ -61,10 +61,6 @@ void MXCAFDoc_MaterialStorageDriver::Paste(const Handle(TDF_Attribute)& Source, { Handle(XCAFDoc_Material) S = Handle(XCAFDoc_Material)::DownCast (Source); Handle(PXCAFDoc_Material) T = Handle(PXCAFDoc_Material)::DownCast (Target); -#ifdef DEB - PTColStd_TransientPersistentMap& TPMap = -#endif - RelocTable->OtherTable(); Handle(TCollection_HAsciiString) aNameStr = S->GetName(); Handle(TCollection_HAsciiString) aDescrStr = S->GetDescription(); Handle(TCollection_HAsciiString) aDensNameStr = S->GetDensName(); diff --git a/src/MXCAFDoc/MXCAFDoc_VolumeRetrievalDriver.cxx b/src/MXCAFDoc/MXCAFDoc_VolumeRetrievalDriver.cxx index 6979a2015a..a2cdfbdeb0 100755 --- a/src/MXCAFDoc/MXCAFDoc_VolumeRetrievalDriver.cxx +++ b/src/MXCAFDoc/MXCAFDoc_VolumeRetrievalDriver.cxx @@ -56,9 +56,5 @@ Standard_Integer MXCAFDoc_VolumeRetrievalDriver::VersionNumber() const Handle(PXCAFDoc_Volume) S = Handle(PXCAFDoc_Volume)::DownCast (Source); Handle(XCAFDoc_Volume) T = Handle(XCAFDoc_Volume)::DownCast (Target); -#ifdef DEB - PTColStd_PersistentTransientMap& PTMap = -#endif - RelocTable->OtherTable(); T->Set(S->Get()); } diff --git a/src/MXCAFDoc/MXCAFDoc_VolumeStorageDriver.cxx b/src/MXCAFDoc/MXCAFDoc_VolumeStorageDriver.cxx index c33c300b24..ae4183c6fd 100755 --- a/src/MXCAFDoc/MXCAFDoc_VolumeStorageDriver.cxx +++ b/src/MXCAFDoc/MXCAFDoc_VolumeStorageDriver.cxx @@ -57,9 +57,5 @@ Standard_Integer MXCAFDoc_VolumeStorageDriver::VersionNumber() const Handle(XCAFDoc_Volume) S = Handle(XCAFDoc_Volume)::DownCast (Source); Handle(PXCAFDoc_Volume) T = Handle(PXCAFDoc_Volume)::DownCast (Target); -#ifdef DEB - PTColStd_TransientPersistentMap& TPMap = -#endif - RelocTable->OtherTable(); T->Set(S->Get()); } diff --git a/src/MeshVS/MeshVS_TextPrsBuilder.cxx b/src/MeshVS/MeshVS_TextPrsBuilder.cxx index fa7629c701..e97bf1762f 100755 --- a/src/MeshVS/MeshVS_TextPrsBuilder.cxx +++ b/src/MeshVS/MeshVS_TextPrsBuilder.cxx @@ -162,7 +162,6 @@ void MeshVS_TextPrsBuilder::Build ( const Handle(Prs3d_Presentation)& Prs, Aspect_TypeOfDisplayText ADisplayType = Aspect_TODT_NORMAL; TCollection_AsciiString AFontString; Standard_Integer ADispInt; - Standard_Boolean ATexFont; // Bold font is used by default for better text readability OSD_FontAspect AFontAspectType = OSD_FA_Bold; Standard_Integer AAspect; diff --git a/src/OpenGl/OpenGl_QuadrangleStrip.cxx b/src/OpenGl/OpenGl_QuadrangleStrip.cxx index 6e7645145a..0f4430023a 100644 --- a/src/OpenGl/OpenGl_QuadrangleStrip.cxx +++ b/src/OpenGl/OpenGl_QuadrangleStrip.cxx @@ -35,7 +35,6 @@ void OpenGl_QuadrangleStrip::draw_qstrip (const Tint front_lighting_model, Tint nf, nv, nr, nc; Tint lighting_model; - tel_point pfn = myData.fnormals; tel_colour pfc = myData.fcolours; tel_point pv = myData.vertices; tel_colour pvc = myData.vcolours; @@ -374,7 +373,6 @@ void OpenGl_QuadrangleStrip::draw_edges (const TEL_COLOUR *edge_colour, const As const OpenGl_AspectLine *aspect_line_old = AWorkspace->SetAspectLine( aspect_face->AspectEdge() ); AWorkspace->AspectLine( Standard_True ); - tel_point pv = myData.vertices; Tint nc = myData.num_columns; Tint nf = myData.num_rows * myData.num_columns; diff --git a/src/OpenGl/OpenGl_TriangleStrip.cxx b/src/OpenGl/OpenGl_TriangleStrip.cxx index 45996c933f..12d6d3fa82 100644 --- a/src/OpenGl/OpenGl_TriangleStrip.cxx +++ b/src/OpenGl/OpenGl_TriangleStrip.cxx @@ -29,7 +29,6 @@ void OpenGl_TriangleStrip::draw_tmesh (const Tint front_lighting_model, { Tint i, newList = 0; - tel_point pfn = myData.fnormals; tel_colour pfc = myData.fcolours; tel_point pv = myData.vertices; tel_colour pvc = myData.vcolours; diff --git a/src/OpenGl/OpenGl_Workspace_2.cxx b/src/OpenGl/OpenGl_Workspace_2.cxx index c3a49e8479..9baa5cd559 100644 --- a/src/OpenGl/OpenGl_Workspace_2.cxx +++ b/src/OpenGl/OpenGl_Workspace_2.cxx @@ -517,7 +517,6 @@ Standard_Boolean OpenGl_Workspace::Print // setup printing context and viewport GLint aViewPortBack[4]; - GLint aReadBufferPrev = GL_BACK; GLint anAlignBack = 1; OpenGl_PrinterContext aPrinterContext (myGContext); diff --git a/src/ProjLib/ProjLib_PrjResolve.cxx b/src/ProjLib/ProjLib_PrjResolve.cxx index 18bfb74670..d51e99effa 100755 --- a/src/ProjLib/ProjLib_PrjResolve.cxx +++ b/src/ProjLib/ProjLib_PrjResolve.cxx @@ -97,9 +97,6 @@ F.Value(X, FVal); -#ifdef DEB - Standard_Real FuncVal= FVal(1)*FVal(1) + FVal(2)*FVal(2); -#endif if ((FVal(1)*FVal(1) + FVal(2)*FVal(2)) > FuncTol) myDone = Standard_False; } diff --git a/src/RWStepShape/RWStepShape_RWFaceBound.cxx b/src/RWStepShape/RWStepShape_RWFaceBound.cxx index 9d8475bc5b..2b900f3a79 100755 --- a/src/RWStepShape/RWStepShape_RWFaceBound.cxx +++ b/src/RWStepShape/RWStepShape_RWFaceBound.cxx @@ -131,10 +131,6 @@ void RWStepShape_RWFaceBound::Check else { myShRef = aShto.Sharings(theEL2); myShRef.SelectType (STANDARD_TYPE(StepShape_FaceBound),Standard_True); -#ifdef DEB - Standard_Integer nbRef = -#endif - myShRef.NbEntities(); myShRef.Start(); Handle(StepShape_FaceBound) theFB2 = Handle(StepShape_FaceBound)::DownCast(myShRef.Value()); diff --git a/src/Select2D/Select2D_SensitivePoint.cxx b/src/Select2D/Select2D_SensitivePoint.cxx index 115b6d254f..36a98f2e47 100755 --- a/src/Select2D/Select2D_SensitivePoint.cxx +++ b/src/Select2D/Select2D_SensitivePoint.cxx @@ -62,9 +62,6 @@ Matches (const Standard_Real XMin, const Standard_Real YMax, const Standard_Real aTol) {//distance point-Line.... -#ifdef DEB - Standard_Real TheTol = HasOwnTolerance()? myOwnTolerance : aTol; -#endif Standard_Real MinDist = gp_Lin2d(gp_Pnt2d(XMin,YMin), gp_Vec2d(gp_Pnt2d(XMin,YMin), gp_Pnt2d(XMax,YMax)) diff --git a/src/Select3D/Select3D_SensitiveTriangle.cxx b/src/Select3D/Select3D_SensitiveTriangle.cxx index 6d9dd94494..a2c1cf5dba 100755 --- a/src/Select3D/Select3D_SensitiveTriangle.cxx +++ b/src/Select3D/Select3D_SensitiveTriangle.cxx @@ -218,8 +218,6 @@ Standard_Integer Select3D_SensitiveTriangle::Status(const gp_XY& p0, gp_XY V02(p2);V02-=p0; gp_XY V12(p2);V12-=p1; - Standard_Real TolTol = aTol*aTol; - // check these particular cases... // if one of vectors is almost null (2 points are mixed), // leave at once (it is already in the bounding box, which is good...) diff --git a/src/Select3D/Select3D_SensitiveTriangulation.cxx b/src/Select3D/Select3D_SensitiveTriangulation.cxx index 3be96f093f..9326d76655 100755 --- a/src/Select3D/Select3D_SensitiveTriangulation.cxx +++ b/src/Select3D/Select3D_SensitiveTriangulation.cxx @@ -623,7 +623,6 @@ DetectedTriangle2d(gp_Pnt2d& P1, if(myDetectedTr==-1) return Standard_False; // currently not implemented... const Poly_Array1OfTriangle& triangles = myTriangul->Triangles(); - const TColgp_Array1OfPnt& Nodes = myTriangul->Nodes(); Standard_Integer n1,n2,n3; triangles( myDetectedTr ).Get(n1,n2,n3); diff --git a/src/SelectBasics/SelectBasics_BasicTool.cxx b/src/SelectBasics/SelectBasics_BasicTool.cxx index 9b55d4c98a..296bbec8f7 100755 --- a/src/SelectBasics/SelectBasics_BasicTool.cxx +++ b/src/SelectBasics/SelectBasics_BasicTool.cxx @@ -57,7 +57,6 @@ Standard_Boolean SelectBasics_BasicTool::MatchSegment(const gp_Pnt2d& pBegin,con const Standard_Real aTol, Standard_Real& DMin) { - Standard_Boolean Found= Standard_False; const Standard_Real SqTol = aTol * aTol; gp_Vec2d AB, AC, BC; const gp_Pnt2d apoint(X,Y); diff --git a/src/ShapeAnalysis/ShapeAnalysis.cxx b/src/ShapeAnalysis/ShapeAnalysis.cxx index 0020bb5f75..c5c8fd7b69 100755 --- a/src/ShapeAnalysis/ShapeAnalysis.cxx +++ b/src/ShapeAnalysis/ShapeAnalysis.cxx @@ -172,7 +172,7 @@ Standard_Real ShapeAnalysis::ContourArea(const TopoDS_Wire& theWire) //const Handle(ShapeExtend_WireData)& sewd) { - Standard_Integer i =1, nbc = 0; + Standard_Integer nbc = 0; gp_Pnt fuv,luv, uv0; //Standard_Real totcross=0; gp_XYZ aTotal(0.,0.,0.); diff --git a/src/ShapeBuild/ShapeBuild_ReShape.cxx b/src/ShapeBuild/ShapeBuild_ReShape.cxx index b0823400e2..79f7b1923e 100755 --- a/src/ShapeBuild/ShapeBuild_ReShape.cxx +++ b/src/ShapeBuild/ShapeBuild_ReShape.cxx @@ -63,7 +63,7 @@ TopoDS_Shape ShapeBuild_ReShape::Apply (const TopoDS_Shape& shape, return res; } - TopAbs_ShapeEnum st = shape.ShapeType(), subt; + TopAbs_ShapeEnum st = shape.ShapeType(); if ( st >= until ) return newsh; // critere d arret if(st == TopAbs_VERTEX || st == TopAbs_SHAPE) return shape; diff --git a/src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.cxx b/src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.cxx index 32600443d3..dd38392859 100755 --- a/src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.cxx @@ -229,7 +229,6 @@ void ShapeUpgrade_RemoveInternalWires::removeSmallFaces () if(!myRemoveEdges.IsBound(aE) ) { const TopTools_ListOfShape& aLface3 = myEdgeFaces.FindFromKey(aE); TopTools_ListIteratorOfListOfShape aliter3(aLface3); - Standard_Boolean isRemoved = Standard_True; for( ; aliter3.More();aliter3.Next()) { TopoDS_Shape aF2 = Context()->Apply(aliter3.Value()); if(aF2.IsNull()) diff --git a/src/StlTransfer/StlTransfer.cxx b/src/StlTransfer/StlTransfer.cxx index 92d503abc2..cc2642791c 100755 --- a/src/StlTransfer/StlTransfer.cxx +++ b/src/StlTransfer/StlTransfer.cxx @@ -116,11 +116,6 @@ void StlTransfer::BuildIncrementalMesh (const TopoDS_Shape& Shape, theTriangles.Assign(theTriangulation->Triangles()); Mesh->AddDomain (Deflection); -#ifdef DEB - TopAbs_Orientation orientation = -#endif - face.Orientation(); - TColgp_Array1OfPnt thePoints(1, theTriangulation->NbNodes()); thePoints.Assign(theTriangulation->Nodes()); //compute normal of face diff --git a/src/TDF/TDF_ComparisonTool.cxx b/src/TDF/TDF_ComparisonTool.cxx index 59769633a3..865730d482 100755 --- a/src/TDF/TDF_ComparisonTool.cxx +++ b/src/TDF/TDF_ComparisonTool.cxx @@ -224,10 +224,6 @@ void TDF_ComparisonTool::Cut { if (aDataSet->IsEmpty()) return; -#ifdef DEB - TDF_LabelMap& refLabs = -#endif - aDataSet->Labels(); const TDF_AttributeMap& refAtts = aDataSet->Attributes(); // Removes the attributes. diff --git a/src/TFunction/TFunction_Iterator.cxx b/src/TFunction/TFunction_Iterator.cxx index 13eedbeba3..2e6c990df5 100755 --- a/src/TFunction/TFunction_Iterator.cxx +++ b/src/TFunction/TFunction_Iterator.cxx @@ -174,7 +174,6 @@ void TFunction_Iterator::Next() TFunction_IFunction iFunction(L); Handle(TFunction_GraphNode) graphNode = iFunction.GetGraphNode(); - const TColStd_MapOfInteger& prev = graphNode->GetPrevious(); const TColStd_MapOfInteger& next = graphNode->GetNext(); TFunction_ExecutionStatus status = graphNode->GetStatus(); diff --git a/src/TNaming/TNaming_Naming.cxx b/src/TNaming/TNaming_Naming.cxx index 867c54d422..546bdfb613 100755 --- a/src/TNaming/TNaming_Naming.cxx +++ b/src/TNaming/TNaming_Naming.cxx @@ -632,7 +632,6 @@ static Standard_Boolean IsMultipleCase(const TopoDS_Shape& S, isCommon = Standard_True; // statement: this shape (itm.Key()) is common (to be checked below) TNaming_DataMapIteratorOfDataMapOfShapeMapOfShape itdm(aDMM); for (;itdm.More();itdm.Next()) { - const TopoDS_Shape& aKey1 = itdm.Key(); const TNaming_MapOfShape& aMap = itdm.Value(); if(!aMap.Contains(itm.Key())) { isCommon = Standard_False; diff --git a/src/TPrsStd/TPrsStd_ConstraintTools.cxx b/src/TPrsStd/TPrsStd_ConstraintTools.cxx index 058728a81b..d80717617c 100755 --- a/src/TPrsStd/TPrsStd_ConstraintTools.cxx +++ b/src/TPrsStd/TPrsStd_ConstraintTools.cxx @@ -753,11 +753,6 @@ void TPrsStd_ConstraintTools::ComputeAngleForOneFace (const Handle(TDataXtd_Cons TCollection_ExtendedString txt; TPrsStd_ConstraintTools::ComputeTextAndValue (aConst,val1,txt,Standard_True); -// Unused : -#ifdef DEB - Standard_Boolean isface(shape.ShapeType()==TopAbs_FACE); -#endif - Handle(AIS_AngleDimension) ais; TopoDS_Face face; if (!anAIS.IsNull()) { @@ -777,11 +772,6 @@ void TPrsStd_ConstraintTools::ComputeAngleForOneFace (const Handle(TDataXtd_Cons ais = new AIS_AngleDimension ( face, val1, txt); } -// Unused : -#ifdef DEB - Standard_Integer ExtShape(0); -#endif - anAIS = ais; } @@ -1149,10 +1139,6 @@ void TPrsStd_ConstraintTools::ComputeRadius (const Handle(TDataXtd_Constraint)& ComputeTextAndValue(aConst,val1,txt,Standard_False); // Update de l'AIS -// Unused : -#ifdef DEB - Standard_Boolean tocreate = Standard_True; -#endif Standard_Boolean isplanar(aConst->IsPlanar()); if (isplanar) GetGoodShape(shape1); @@ -1233,10 +1219,6 @@ void TPrsStd_ConstraintTools::ComputeMinRadius (const Handle(TDataXtd_Constraint ComputeTextAndValue(aConst,val1,txt,Standard_False); // Update de l'AIS -// Unused : -#ifdef DEB - Standard_Boolean tocreate = Standard_True; -#endif Standard_Boolean isplanar(aConst->IsPlanar()); if (isplanar) GetGoodShape(shape1); @@ -1316,10 +1298,6 @@ void TPrsStd_ConstraintTools::ComputeMaxRadius (const Handle(TDataXtd_Constraint ComputeTextAndValue(aConst,val1,txt,Standard_False); // Update de l'AIS -// Unused : -#ifdef DEB - Standard_Boolean tocreate = Standard_True; -#endif Standard_Boolean isplanar(aConst->IsPlanar()); if (isplanar) GetGoodShape(shape1); diff --git a/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx b/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx index d473404fb8..1c634c6aab 100755 --- a/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx +++ b/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx @@ -194,14 +194,7 @@ Standard_Integer TOPOC(Draw_Interpretor& interpretor,Standard_Integer na,const c DBRep::Set(namie.ToCString(),es); if (eca) { TCollection_AsciiString s; -#ifdef DEB - Standard_Integer i1 = -#endif - BDS.Shape(F1); -#ifdef DEB - Standard_Integer i2 = -#endif - BDS.Shape(F2); + if (outdraw) { if (outclear) s = s + "clear; "; ::CATSHA(s,F1,BDS,"tsee f ","; "); diff --git a/src/TestTopOpe/TestTopOpe_CORCommands.cxx b/src/TestTopOpe/TestTopOpe_CORCommands.cxx index 35a5891cf7..cf8c423a02 100755 --- a/src/TestTopOpe/TestTopOpe_CORCommands.cxx +++ b/src/TestTopOpe/TestTopOpe_CORCommands.cxx @@ -256,10 +256,6 @@ Standard_Integer reguso(Draw_Interpretor& di, Standard_Integer n, const char** a TopOpeBRepBuild_ShellToSolid SheToSo; for (; itm.More(); itm.Next()) { const TopTools_ListOfShape& lns = itm.Value(); -#ifdef DEB - Standard_Integer nlns = -#endif - lns.Extent(); TopTools_ListIteratorOfListOfShape itsh(lns); for (; itsh.More(); itsh.Next()) { const TopoDS_Shell& she = TopoDS::Shell(itsh.Value()); @@ -602,9 +598,6 @@ static Standard_Integer classifBnd2d(Draw_Interpretor& di, Standard_Integer n, c TopoDS_Shape W1 = DBRep::Get(a[1]); TopoDS_Shape W2 = DBRep::Get(a[2]); TopoDS_Shape F = DBRep::Get(a[3]); -#ifdef DEB - Standard_Integer i = atoi(a[4]); -#endif TopoDS_Wire w1 = TopoDS::Wire(W1); TopoDS_Wire w2 = TopoDS::Wire(W2); diff --git a/src/TestTopOpe/TestTopOpe_DSACommands.cxx b/src/TestTopOpe/TestTopOpe_DSACommands.cxx index a91094b25d..fd19ce6b8a 100755 --- a/src/TestTopOpe/TestTopOpe_DSACommands.cxx +++ b/src/TestTopOpe/TestTopOpe_DSACommands.cxx @@ -103,14 +103,7 @@ Standard_Integer DSACCESSCOMMANDS(Draw_Interpretor& interpretor,Standard_Integer for(i = 1;i<=nbsh;i++) { TopTools_ListOfShape& los = DS.ChangeShapeSameDomain(i); j = los.Extent(); -#ifdef DEB - Standard_Integer iref = -#endif - DS.SameDomainRef(i); -#ifdef DEB - Standard_Integer iind = -#endif - DS.SameDomainInd(i); + TopTools_ListIteratorOfListOfShape li(los); for(; li.More(); li.Next()) { #ifdef DEB diff --git a/src/TestTopOpe/TestTopOpe_HDSCommands.cxx b/src/TestTopOpe/TestTopOpe_HDSCommands.cxx index b5e0cb2449..44a26e6df5 100755 --- a/src/TestTopOpe/TestTopOpe_HDSCommands.cxx +++ b/src/TestTopOpe/TestTopOpe_HDSCommands.cxx @@ -364,10 +364,6 @@ static Standard_Integer SeeSectionEdge(const Standard_Integer ISE) if ( ISE < 1 || ISE > nse ) return 0; const TopoDS_Shape& SE = PHDSD->CurrentBDS().SectionEdge(ISE); if (SE.IsNull()) return 0; -#ifdef DEB - Standard_Integer ids = -#endif - PHDSD->CurrentBDS().Shape(SE,SFindKeep); TCollection_AsciiString namedbrep; PHDSD->SectionEdgeName(ISE,SE,namedbrep); TCollection_AsciiString namedisp; PHDSD->SectionEdgeDisplayName(ISE,SE,namedisp); @@ -534,9 +530,6 @@ static Standard_Integer SeeGeometry(const TopOpeBRepDS_Kind TK) const TopOpeBRepDS_DataStructure& BDS = PHDSD->CurrentBDS(); -#ifdef DEB - Standard_Integer ig,ng = 0; -#endif if (TK == TopOpeBRepDS_POINT) { TopOpeBRepDS_PointExplorer pex(BDS,GFindKeep); for (; pex.More(); pex.Next()) { @@ -1133,10 +1126,7 @@ Standard_Integer tds(Draw_Interpretor& di,Standard_Integer na,const char** a) if (PHDSD == NULL) return 0; const Handle(TopOpeBRepDS_HDataStructure)& HDS = PHDSD->CurrentHDS(); if (HDS.IsNull()) {COUTNOHDS(di);return 0;} -#ifdef DEB - const TopOpeBRepDS_DataStructure& BDS = -#endif - PHDSD->CurrentBDS(); + PHDSD->CurrentBDS(); TopOpeBRepDS_Dumper Dumper(HDS); if ( na == 1 ) { Dumper.Dump(cout,TDSkeep,TDScompact); return 0; } diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_Displayer.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_Displayer.cxx index 51f2b307cf..2eaa5033c7 100755 --- a/src/TestTopOpeDraw/TestTopOpeDraw_Displayer.cxx +++ b/src/TestTopOpeDraw/TestTopOpeDraw_Displayer.cxx @@ -467,10 +467,6 @@ void TestTopOpeDraw_SurfaceDisplayer::InitSurfaceDisplayer() void TestTopOpeDraw_SurfaceDisplayer::DisplaySurface(const Handle(Geom_Surface& S)) { if (S.IsNull()) return; -#ifdef DEB - Draw_ColorKind isocol = -#endif - TestTopOpeDraw_TTOT::GeometryColor(TopOpeBRepDS_SURFACE); Handle(TestTopOpeDraw_DrawableSUR) D; D = new TestTopOpeDraw_DrawableSUR (S,mySDIsoColor,mySDBoundColor,mySDNormalColor, diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.cxx index e412deb50c..594f393fa9 100755 --- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.cxx +++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.cxx @@ -109,10 +109,6 @@ static Standard_CString makename2(const gp_Pnt& P) C = "";C = C + P.Coord(2); TCollection_AsciiString S1 = C.Token(".",1); -#ifdef DEB - Standard_Integer l = -#endif - S1.Length(); S1.RightJustify(15, ' '); TCollection_AsciiString S2 = C.Token(".",2); S2.Trunc(2); diff --git a/src/TopOpeBRep/TopOpeBRep_DSFiller.cxx b/src/TopOpeBRep/TopOpeBRep_DSFiller.cxx index 225e88a376..89e5d96356 100755 --- a/src/TopOpeBRep/TopOpeBRep_DSFiller.cxx +++ b/src/TopOpeBRep/TopOpeBRep_DSFiller.cxx @@ -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); diff --git a/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx b/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx index f31f12739b..69d57f38ec 100755 --- a/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx +++ b/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx @@ -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 in BDS Standard_Integer E1index = myPDS->AddShape(E1,1); Standard_Integer E2index = myPDS->AddShape(E2,2); // --- get list of interferences connected to edges , 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); diff --git a/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx b/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx index 4951ebd106..55edd2e88d 100755 --- a/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx +++ b/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx @@ -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)); diff --git a/src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller.cxx b/src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller.cxx index 6636e5460f..c13f5abfd7 100755 --- a/src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller.cxx +++ b/src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller.cxx @@ -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 diff --git a/src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller_DEB.cxx b/src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller_DEB.cxx index 00b00dc652..2194186e4f 100755 --- a/src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller_DEB.cxx +++ b/src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller_DEB.cxx @@ -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<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 "<Curve(); diff --git a/src/TopOpeBRep/TopOpeBRep_Hctxee2d.cxx b/src/TopOpeBRep/TopOpeBRep_Hctxee2d.cxx index 7f47ed3abf..a4d388091a 100755 --- a/src/TopOpeBRep/TopOpeBRep_Hctxee2d.cxx +++ b/src/TopOpeBRep/TopOpeBRep_Hctxee2d.cxx @@ -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 //======================================================================= diff --git a/src/TopOpeBRep/TopOpeBRep_Point2d.cxx b/src/TopOpeBRep/TopOpeBRep_Point2d.cxx index 96fcfb7df6..cb0804a2b4 100755 --- a/src/TopOpeBRep/TopOpeBRep_Point2d.cxx +++ b/src/TopOpeBRep/TopOpeBRep_Point2d.cxx @@ -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<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 diff --git a/src/TopOpeBRep/TopOpeBRep_vprclo.cxx b/src/TopOpeBRep/TopOpeBRep_vprclo.cxx index bdc3093eec..7cfbb5ce82 100755 --- a/src/TopOpeBRep/TopOpeBRep_vprclo.cxx +++ b/src/TopOpeBRep/TopOpeBRep_vprclo.cxx @@ -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 ! diff --git a/src/TopOpeBRep/TopOpeBRep_vprdeg.cxx b/src/TopOpeBRep/TopOpeBRep_vprdeg.cxx index 3f9b583f77..4bfaa9577f 100755 --- a/src/TopOpeBRep/TopOpeBRep_vprdeg.cxx +++ b/src/TopOpeBRep/TopOpeBRep_vprdeg.cxx @@ -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);// is shared by edge of 1 and edge of 2. diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_2d.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_2d.cxx index dd0199a01b..4d3d2ddad7 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_2d.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_2d.cxx @@ -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); diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_BoxSort.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_BoxSort.cxx index f277d3d8ab..3be6de7ee2 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_BoxSort.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_BoxSort.cxx @@ -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; } diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_CORRISO.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_CORRISO.cxx index a4e43672d6..3f03372460 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_CORRISO.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_CORRISO.cxx @@ -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 // (boundary of ): 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, // : 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; diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_GEOMETRY.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_GEOMETRY.cxx index d7d5278455..e98f660f22 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_GEOMETRY.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_GEOMETRY.cxx @@ -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) // lof : the list of untouched faces connexed to e in 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 , and a reference face (= ) // - parameter on = . diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_REGUW.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_REGUW.cxx index 9328d5724e..bf2805b6fb 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_REGUW.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_REGUW.cxx @@ -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"< 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<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); diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_TOOL.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_TOOL.cxx index c64236ab53..e8007e732e 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_TOOL.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_TOOL.cxx @@ -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); diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_TOPOLOGY.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_TOPOLOGY.cxx index 01830c3da7..ee31f0fff2 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_TOPOLOGY.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_TOPOLOGY.cxx @@ -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; diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_closing.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_closing.cxx index 4672ca30d8..b751fb1ed7 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_closing.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_closing.cxx @@ -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; diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_connexity.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_connexity.cxx index 53115436c9..c402adf338 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_connexity.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_connexity.cxx @@ -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(); diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_mkTondgE.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_mkTondgE.cxx index 1df0d0c34b..5203aefde5 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_mkTondgE.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_mkTondgE.cxx @@ -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); } diff --git a/src/Viewer2dTest/Viewer2dTest_DisplayCommands.cxx b/src/Viewer2dTest/Viewer2dTest_DisplayCommands.cxx index 2756abaad3..e083922015 100755 --- a/src/Viewer2dTest/Viewer2dTest_DisplayCommands.cxx +++ b/src/Viewer2dTest/Viewer2dTest_DisplayCommands.cxx @@ -2122,8 +2122,6 @@ static int v2dtable (Draw_Interpretor& , Standard_Integer argc, const char** arg Standard_Real x1 = 24, y1 = 24; Standard_Integer numberOfColumn = 1, numberOfRows = 1; - Quantity_PlaneAngle anAngle = 0.0; - Quantity_Factor aScale = 1.0; if( argc >= 3 ) x1 = atof( argv[2] ); @@ -2297,11 +2295,11 @@ static int drawLengthDim1( Draw_Interpretor& , Standard_Integer argc, const char double text_scale = 15; double length = 0; - int distance_type = 0; - double arrow_angle = 24; - double arrow_length = 24; - int arrow_type = 2; - int arrow_side = 3; + //int distance_type = 0; + //double arrow_angle = 24; + //double arrow_length = 24; + //int arrow_type = 2; + //int arrow_side = 3; double distance = FirstPt.Distance(LastPt); @@ -2400,7 +2398,6 @@ static int drawRadiusDim( Draw_Interpretor& , Standard_Integer argc, const char* gp_Pnt2d anAp2(240, 240); gp_Circ2d aCirc(gp_Ax2d(anAp2,gp_Dir2d(0,1)),100.); - Quantity_Length aRadius = 100; TCollection_ExtendedString aText("Rad = 10%"); Handle(Prs2d_Radius) theRadius; @@ -2434,7 +2431,6 @@ static int drawSymbDim( Draw_Interpretor& , Standard_Integer argc, const char** gp_Pnt2d anAp2(240, 240); gp_Circ2d aCirc(gp_Ax2d(anAp2,gp_Dir2d(0,1)),100.); - Quantity_Length aRadius = 100; TCollection_ExtendedString aText("Rad = 10%"); Handle(AIS2D_InteractiveObject) aIO = new AIS2D_InteractiveObject(); diff --git a/src/ViewerTest/ViewerTest.cxx b/src/ViewerTest/ViewerTest.cxx index f518baaf73..6d63e657b0 100755 --- a/src/ViewerTest/ViewerTest.cxx +++ b/src/ViewerTest/ViewerTest.cxx @@ -671,12 +671,6 @@ Handle(AIS_InteractiveObject) DetectedFromContext( Handle(AIS_InteractiveObject) aisPickedShape = Handle(AIS_InteractiveObject)::DownCast(aContext->DetectedInteractive()); ret = aisPickedShape; -#ifdef DEB - const char *name = -#endif - ( GetMapOfAIS().IsBound1(aisPickedShape) )? - GetMapOfAIS().Find1(aisPickedShape).ToCString() : - (char *) "????"; } } return ret; @@ -3184,7 +3178,6 @@ static int VSetTransMode ( Draw_Interpretor& di, Standard_Integer argc, const ch } Standard_Boolean IsBound = GetMapOfAIS().IsBound2(shapeName); - Standard_Boolean IsDatum = Standard_False; Handle(Standard_Transient) anObj; if ( IsBound ) { anObj = GetMapOfAIS().Find2(shapeName); @@ -3241,7 +3234,7 @@ Standard_Integer hlrtest(Draw_Interpretor&, Standard_Integer n, const char** ///////////////////// TopoDS_Shape aShape = DBRep::Get(a[1]); aContext2D->EraseAll(Standard_True); - Standard_Integer aPolyAlgo = 0; + //Standard_Integer aPolyAlgo = 0; Standard_Boolean IsPoly = Standard_False; gp_Ax2 anAx2 = gp::XOY(); @@ -3301,7 +3294,7 @@ Standard_Integer phlrtest(Draw_Interpretor&, Standard_Integer n, const char* ///////////////////// TopoDS_Shape aShape = DBRep::Get(a[1]); aContext2D->EraseAll(Standard_True); - Standard_Integer aPolyAlgo = 0; + //Standard_Integer aPolyAlgo = 0; Standard_Boolean IsPoly = Standard_True; gp_Ax2 anAx2 = gp::XOY(); diff --git a/src/ViewerTest/ViewerTest_FilletCommands.cxx b/src/ViewerTest/ViewerTest_FilletCommands.cxx index 26df044971..985aa7a32c 100755 --- a/src/ViewerTest/ViewerTest_FilletCommands.cxx +++ b/src/ViewerTest/ViewerTest_FilletCommands.cxx @@ -105,9 +105,6 @@ static Standard_Integer VBLEND(Draw_Interpretor& di, Standard_Integer narg, cons if (narg<5) return 1; Standard_Integer NbToPick = (narg -4)/2; -#ifdef DEB - Standard_Boolean autonaming = !strcasecmp(a[3],"."); -#endif Handle(TopTools_HArray1OfShape) arr = new TopTools_HArray1OfShape(1,NbToPick); if(ViewerTest::PickShapes(TopAbs_EDGE,arr)){ for(Standard_Integer i=1;i<=NbToPick;i++){ diff --git a/src/Visual3d/Visual3d_ViewManager.cxx b/src/Visual3d/Visual3d_ViewManager.cxx index e94d330fd5..0279b0976c 100755 --- a/src/Visual3d/Visual3d_ViewManager.cxx +++ b/src/Visual3d/Visual3d_ViewManager.cxx @@ -114,11 +114,6 @@ void Visual3d_ViewManager::Remove () { // // Destroy all defined views // -#ifdef DEB - Standard_Integer Length = MyDefinedView.Extent (); -#else - MyDefinedView.Extent (); -#endif #ifdef DESTROY cout << "The Manager " << MyId << " have " << Length << " defined views\n"; @@ -141,11 +136,6 @@ void Visual3d_ViewManager::ChangeDisplayPriority (const Handle(Graphic3d_Structu // // Change structure priority in all defined views // -#ifdef DEB - Standard_Integer Length = MyDefinedView.Extent (); -#else - MyDefinedView.Extent (); -#endif Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView); while (MyIterator.More ()) { @@ -196,8 +186,6 @@ void Visual3d_ViewManager::ReCompute (const Handle(Graphic3d_Structure)& AStruct #endif Standard_Integer ViewId = theView->Identification (); - Standard_Integer indexD = 0; - // Even if physically the structure cannot // be displayed (pb of visualisation type) // it has status Displayed. @@ -221,11 +209,6 @@ void Visual3d_ViewManager::ReCompute (const Handle(Graphic3d_Structure)& AStruct void Visual3d_ViewManager::Clear (const Handle(Graphic3d_Structure)& AStructure, const Standard_Boolean WithDestruction) { -#ifdef DEB - Standard_Integer Length = MyDefinedView.Extent (); -#else - MyDefinedView.Extent (); -#endif Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView); while (MyIterator.More ()) { @@ -239,11 +222,6 @@ void Visual3d_ViewManager::Clear (const Handle(Graphic3d_Structure)& AStructure, void Visual3d_ViewManager::Connect (const Handle(Graphic3d_Structure)& AMother, const Handle(Graphic3d_Structure)& ADaughter) { -#ifdef DEB - Standard_Integer Length = MyDefinedView.Extent (); -#else - MyDefinedView.Extent (); -#endif Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView); while (MyIterator.More ()) { @@ -257,11 +235,6 @@ void Visual3d_ViewManager::Connect (const Handle(Graphic3d_Structure)& AMother, void Visual3d_ViewManager::Disconnect (const Handle(Graphic3d_Structure)& AMother, const Handle(Graphic3d_Structure)& ADaughter) { -#ifdef DEB - Standard_Integer Length = MyDefinedView.Extent (); -#else - MyDefinedView.Extent (); -#endif Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView); while (MyIterator.More ()) { @@ -310,11 +283,6 @@ void Visual3d_ViewManager::Erase (const Handle(Graphic3d_Structure)& AStructure) // // Erase structure in all defined views // -#ifdef DEB - Standard_Integer Length = MyDefinedView.Extent (); -#else - MyDefinedView.Extent (); -#endif Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView); while (MyIterator.More ()) { @@ -348,11 +316,6 @@ void Visual3d_ViewManager::Highlight (const Handle(Graphic3d_Structure)& AStruct // // Highlight in all activated views // -#ifdef DEB - Standard_Integer Length = MyDefinedView.Extent (); -#else - MyDefinedView.Extent (); -#endif Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView); while (MyIterator.More ()) { @@ -366,11 +329,6 @@ void Visual3d_ViewManager::Highlight (const Handle(Graphic3d_Structure)& AStruct void Visual3d_ViewManager::SetTransform (const Handle(Graphic3d_Structure)& AStructure, const TColStd_Array2OfReal& ATrsf) { -#ifdef DEB - Standard_Integer Length = MyDefinedView.Extent (); -#else - MyDefinedView.Extent (); -#endif Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView); while (MyIterator.More ()) { @@ -402,11 +360,6 @@ void Visual3d_ViewManager::UnHighlight (const Handle(Graphic3d_Structure)& AStru // // UnHighlight in all activated views // -#ifdef DEB - Standard_Integer Length = MyDefinedView.Extent (); -#else - MyDefinedView.Extent (); -#endif Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView); while (MyIterator.More ()) { @@ -479,11 +432,6 @@ Handle(Visual3d_HSetOfView) Visual3d_ViewManager::ActivatedView () const { Handle (Visual3d_HSetOfView) SG = new Visual3d_HSetOfView (); -#ifdef DEB - Standard_Integer Length = MyDefinedView.Extent (); -#else - MyDefinedView.Extent (); -#endif Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView); while (MyIterator.More ()) { @@ -577,11 +525,6 @@ Standard_Real Dx, Dy, Ratio; Standard_Real APT; Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView); -#ifdef DEB - Standard_Integer Length = MyDefinedView.Extent (); -#else - MyDefinedView.Extent (); -#endif Standard_Integer stop = 0; @@ -1037,12 +980,6 @@ void Visual3d_ViewManager::Activate () { // Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView); -#ifdef DEB - Standard_Integer Length = MyDefinedView.Extent (); -#else - MyDefinedView.Extent (); -#endif - while (MyIterator.More ()) { if (! (MyIterator.Value ())->IsActive ()) (MyIterator.Value ())->Activate (); @@ -1058,11 +995,6 @@ void Visual3d_ViewManager::Deactivate () { // // Deactivates all activated views // -#ifdef DEB - Standard_Integer Length = MyDefinedView.Extent (); -#else - MyDefinedView.Extent (); -#endif Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView); while (MyIterator.More ()) { diff --git a/src/VrmlData/VrmlData_Scene.cxx b/src/VrmlData/VrmlData_Scene.cxx index d419a28fc7..6c479284d7 100755 --- a/src/VrmlData/VrmlData_Scene.cxx +++ b/src/VrmlData/VrmlData_Scene.cxx @@ -433,7 +433,6 @@ VrmlData_ErrorStatus VrmlData_Scene::createNode VrmlData_ErrorStatus aStatus; Handle(VrmlData_Node) aNode; TCollection_AsciiString aName; - Standard_Boolean isReused (Standard_False); // Read the DEF token to assign the node name if (VrmlData_Node::OK(aStatus, ReadLine(theBuffer))) diff --git a/src/WNT/WNT_Allocator.cxx b/src/WNT/WNT_Allocator.cxx index 0f7b898fec..021611d55c 100755 --- a/src/WNT/WNT_Allocator.cxx +++ b/src/WNT/WNT_Allocator.cxx @@ -594,7 +594,6 @@ WNT_ArcNote :: WNT_ArcNote ( void WNT_ArcNote :: Play ( BOOL fDummy ) { Xform (); - HDC hdc = ALLOCATOR -> myHDC; SetArcDirection ( ALLOCATOR -> myHDC, myDirect ); Arc ( ALLOCATOR -> myHDC, myTX - myTXr, myTY - myTYr, myTX + myTXr, myTY + myTYr, @@ -941,7 +940,6 @@ void WNT_TextNote :: Play ( BOOL fDummy ) void WNT_TextNote :: Xform ( void ) { - HDC hdc = ALLOCATOR -> myHDC; WNT_PointNote :: Xform (); RMatrix.eDx = float ( myTX ); RMatrix.eDy = float ( myTY ); diff --git a/src/WNT/WNT_FontMapEntry.cxx b/src/WNT/WNT_FontMapEntry.cxx index 0cc860eb05..a19ca9bb62 100755 --- a/src/WNT/WNT_FontMapEntry.cxx +++ b/src/WNT/WNT_FontMapEntry.cxx @@ -14,7 +14,6 @@ WNT_FontMapEntry :: WNT_FontMapEntry ( const Standard_CString aFontName ) { int i; char* p; - BOOL fUseDefault = FALSE; char* fName = new char[ strlen ( aFontName ) + 1 ]; diff --git a/src/WNT/WNT_WDriver.cxx b/src/WNT/WNT_WDriver.cxx index 69090b9a16..73d863dad8 100755 --- a/src/WNT/WNT_WDriver.cxx +++ b/src/WNT/WNT_WDriver.cxx @@ -1258,7 +1258,6 @@ Standard_Address WNT_WDriver :: InternalOpenBuffer ( ) { PW32_Allocator aNew = NULL; - Aspect_TypeOfDrawMode DrawMode = Aspect_TODM_REPLACE; MyDrawMode = aDrawMode; aNew = _FindAllocator ( myAllocators, aRetainBuffer ); diff --git a/src/XDEDRAW/XDEDRAW_Props.cxx b/src/XDEDRAW/XDEDRAW_Props.cxx index 185b4d0772..5f4053d591 100755 --- a/src/XDEDRAW/XDEDRAW_Props.cxx +++ b/src/XDEDRAW/XDEDRAW_Props.cxx @@ -781,7 +781,6 @@ static Standard_Boolean GetMassProps(const TDF_Label& aLabel, gp_XYZ& theCenterG TColStd_Array1OfReal anArrMass(1,comp.Length()); anArrMass.Init(0.0); Standard_Real aTotalMass =0.0; - Standard_Boolean isFind = Standard_True; Standard_Integer k=1; for ( ; k <= comp.Length(); k++ ) { TDF_Label lab = comp(k); diff --git a/src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx b/src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx index c8385f8b43..fb9682b12d 100755 --- a/src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx +++ b/src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx @@ -198,7 +198,6 @@ static Standard_Integer storevrml di << "use: storevrml shape file defl type_of_conversion (0, 1, 2)" << "\n"; } else { - TopAbs_ShapeEnum Types[3] = {TopAbs_FACE, TopAbs_WIRE, TopAbs_EDGE}; TopoDS_Shape shape = DBRep::Get(argv[1]); Standard_Real defl = atof(argv[3]); Standard_Integer type = 1; diff --git a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx index 05dc332f91..d5414975dc 100755 --- a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx +++ b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx @@ -266,7 +266,7 @@ void XmlLDrivers_DocumentRetrievalDriver::ReadFromDomDocument try { OCC_CATCH_SIGNALS TCollection_AsciiString anInf(anInfo,'?'); - Standard_Integer aRefCounter = anInf.Token(" ",2).IntegerValue(); + //Standard_Integer aRefCounter = anInf.Token(" ",2).IntegerValue(); //theNewDocument->SetReferenceCounter(aRefCounter); } catch (Standard_Failure) { diff --git a/src/XmlMDataStd/XmlMDataStd_BooleanArrayDriver.cxx b/src/XmlMDataStd/XmlMDataStd_BooleanArrayDriver.cxx index 05f6ff2fc6..63f1a91a49 100755 --- a/src/XmlMDataStd/XmlMDataStd_BooleanArrayDriver.cxx +++ b/src/XmlMDataStd/XmlMDataStd_BooleanArrayDriver.cxx @@ -39,7 +39,7 @@ Standard_Boolean XmlMDataStd_BooleanArrayDriver::Paste(const XmlObjMgt_Persisten const Handle(TDF_Attribute)& theTarget, XmlObjMgt_RRelocationTable& ) const { - Standard_Integer aFirstInd, aLastInd, aValue, ind; + Standard_Integer aFirstInd, aLastInd, aValue; const XmlObjMgt_Element& anElement = theSource; // Read the FirstIndex; if the attribute is absent initialize to 1 diff --git a/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cxx b/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cxx index c20af2cdeb..aec2a0ce29 100755 --- a/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cxx +++ b/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cxx @@ -125,7 +125,7 @@ Standard_Boolean XmlMDataStd_NamedDataDriver::Paste(const XmlObjMgt_Persistent& const Handle(TDF_Attribute)& theTarget, XmlObjMgt_RRelocationTable& ) const { - Standard_Integer aFirstInd, aLastInd, aValue, ind; + Standard_Integer aFirstInd, aLastInd, ind; const XmlObjMgt_Element& anElement = theSource; //DataMapOfStringInteger: Read the FirstIndex; if the attribute is absent initialize to 1 diff --git a/src/XmlMFunction/XmlMFunction_ScopeDriver.cxx b/src/XmlMFunction/XmlMFunction_ScopeDriver.cxx index 6ee47ed3ac..4fbe97eeae 100755 --- a/src/XmlMFunction/XmlMFunction_ScopeDriver.cxx +++ b/src/XmlMFunction/XmlMFunction_ScopeDriver.cxx @@ -136,7 +136,6 @@ Standard_Boolean XmlMFunction_ScopeDriver::Paste(const XmlObjMgt_Persistent& th LDOM_Node aCurNode = anElement.getFirstChild()/*.getNextSibling().getNextSibling()*/; LDOM_Element* aCurElement = (LDOM_Element*)&aCurNode; XmlObjMgt_DOMString aValueStr; - Standard_Integer i = aFirstInd; while (*aCurElement != anElement.getLastChild()) { aValueStr = XmlObjMgt::GetStringValue( *aCurElement ); diff --git a/src/gp/gp_Mat.cxx b/src/gp/gp_Mat.cxx index 1350732add..27fa6885be 100755 --- a/src/gp/gp_Mat.cxx +++ b/src/gp/gp_Mat.cxx @@ -58,7 +58,6 @@ void gp_Mat::SetCols (const gp_XYZ& Col1, const gp_XYZ& Col2, const gp_XYZ& Col3) { - const Standard_Address M = (Standard_Address)&(matrix[0][0]); Mat00 = Col1.X(); Mat10 = Col1.Y(); Mat20 = Col1.Z(); Mat01 = Col2.X(); Mat11 = Col2.Y(); Mat21 = Col2.Z(); Mat02 = Col3.X(); Mat12 = Col3.Y(); Mat22 = Col3.Z(); diff --git a/src/math/math_BFGS.cxx b/src/math/math_BFGS.cxx index eac4897b23..dac64b0abd 100755 --- a/src/math/math_BFGS.cxx +++ b/src/math/math_BFGS.cxx @@ -121,10 +121,6 @@ static Standard_Boolean MinimizeDirection(math_Vector& P, F.Initialize(P, Dir); Standard_Real dy1, Hnr1, lambda, alfa=0; -#ifdef DEB - Standard_Integer n = -#endif - Dir.Length(); dy1 = Gr*Dir; if (dy1 != 0) { Hnr1 = Dir.Norm2(); diff --git a/src/math/math_BrentMinimum.cxx b/src/math/math_BrentMinimum.cxx index e51e339143..200b85b1f0 100755 --- a/src/math/math_BrentMinimum.cxx +++ b/src/math/math_BrentMinimum.cxx @@ -130,7 +130,7 @@ math_BrentMinimum::math_BrentMinimum(const Standard_Real TolX, // Standard_Boolean math_BrentMinimum::IsSolutionReached(math_Function& F) { Standard_Boolean math_BrentMinimum::IsSolutionReached(math_Function& ) { - Standard_Real xm = 0.5 * (a + b); +// Standard_Real xm = 0.5 * (a + b); // modified by NIZHNY-MKK Mon Oct 3 17:45:57 2005.BEGIN // Standard_Real tol = XTol * fabs(x) + EPSZ; // return fabs(x - xm) <= 2.0 * tol - 0.5 * (b - a); diff --git a/src/math/math_DoubleTab.gxx b/src/math/math_DoubleTab.gxx index 70fa841957..be1bb3685e 100755 --- a/src/math/math_DoubleTab.gxx +++ b/src/math/math_DoubleTab.gxx @@ -89,9 +89,6 @@ math_DoubleTab::math_DoubleTab(const math_DoubleTab& Other) : void math_DoubleTab::Free() { - Standard_Integer RowNumber = UppR - LowR + 1; - Standard_Integer ColNumber = UppC - LowC + 1; - // free the data if(isAllocated) { Standard_Address it = (Standard_Address)&Value(LowR,LowC); diff --git a/src/math/math_FunctionRoot.cxx b/src/math/math_FunctionRoot.cxx index d6940e2e38..3124039b8b 100755 --- a/src/math/math_FunctionRoot.cxx +++ b/src/math/math_FunctionRoot.cxx @@ -66,11 +66,7 @@ class math_MyFunctionSetWithDerivatives : public math_FunctionSetWithDerivatives math_FunctionSetRoot Sol(Ff,V,Tol,NbIterations); Done = Sol.IsDone(); if (Done) { -#ifdef DEB - Standard_Integer Ier=F.GetStateNumber(); -#else F.GetStateNumber(); -#endif TheRoot = Sol.Root()(1); TheDerivative = Sol.Derivative()(1,1); Ok = F.Value(TheRoot,TheError); @@ -93,11 +89,7 @@ class math_MyFunctionSetWithDerivatives : public math_FunctionSetWithDerivatives math_FunctionSetRoot Sol(Ff,V,Tol,Aa,Bb,NbIterations); Done = Sol.IsDone(); if (Done) { -#ifdef DEB - Standard_Integer Ier =F.GetStateNumber(); -#else F.GetStateNumber(); -#endif TheRoot = Sol.Root()(1); TheDerivative = Sol.Derivative()(1,1); Ok = F.Value(TheRoot,TheError); diff --git a/src/math/math_FunctionRoots.cxx b/src/math/math_FunctionRoots.cxx index 7610829d87..5c0e741178 100755 --- a/src/math/math_FunctionRoots.cxx +++ b/src/math/math_FunctionRoots.cxx @@ -980,16 +980,6 @@ math_FunctionRoots::math_FunctionRoots(math_FunctionWithDerivative& F, if(n1>n2) n=n2; for(Standard_Integer i=1;i<=n;i++) { Standard_Real t = Sol(i)-StaticSol(i); -#ifdef NEWSEQ -# ifdef DEB - Standard_Real t1= -# endif - Sol(i); -# ifdef DEB - Standard_Real t2= -# endif - StaticSol(i); -#endif if(Abs(t)>NEpsX) { printf("\n mathFunctionRoots : i:%d/%d delta: %g",i,n,t); } diff --git a/src/math/math_IntegerVector.cxx b/src/math/math_IntegerVector.cxx index 6d47227924..5ab38cfc46 100755 --- a/src/math/math_IntegerVector.cxx +++ b/src/math/math_IntegerVector.cxx @@ -328,9 +328,6 @@ math_IntegerVector& math_IntegerVector::Initialized (const math_IntegerVector& O Standard_DimensionError_Raise_if(Length() != Other.Length(), " "); -#ifdef DEB - Standard_Integer I = Other.FirstIndex; -#endif (Other.Array).Copy(Array); return *this; } diff --git a/src/math/math_KronrodSingleIntegration.cxx b/src/math/math_KronrodSingleIntegration.cxx index bcdcdf7781..84d910118a 100755 --- a/src/math/math_KronrodSingleIntegration.cxx +++ b/src/math/math_KronrodSingleIntegration.cxx @@ -74,7 +74,7 @@ void math_KronrodSingleIntegration::Perform const Standard_Real theUpper, const Standard_Integer theNbPnts) { - const Standard_Real aMinVol = Epsilon(1.); + //const Standard_Real aMinVol = Epsilon(1.); const Standard_Real aPtol = 1.e-9; myNbIterReached = 0; @@ -110,7 +110,7 @@ void math_KronrodSingleIntegration::Perform if(!myIsDone) return; - Standard_Real anAbsVal = Abs(myValue); + //Standard_Real anAbsVal = Abs(myValue); myAbsolutError = myErrorReached; @@ -267,7 +267,6 @@ Standard_Boolean math_KronrodSingleIntegration::GKRule( Standard_Boolean IsDone; - Standard_Integer aNGauss = theGaussP.Length(); Standard_Integer aNKronrod = theKronrodP.Length(); Standard_Real aGaussVal; diff --git a/src/math/math_TrigonometricFunctionRoots.cxx b/src/math/math_TrigonometricFunctionRoots.cxx index e06a8b63a7..ed72236aa8 100755 --- a/src/math/math_TrigonometricFunctionRoots.cxx +++ b/src/math/math_TrigonometricFunctionRoots.cxx @@ -63,9 +63,6 @@ class MyTrigoFunction: public math_FunctionWithDerivative { //-- F= AA*CN*CN+2*BB*CN*SN+CC*CN+DD*SN+EE; //-- D = -2*AA*CN*SN+2*BB*(CN*CN-SN*SN)-CC*SN+DD*CN; Standard_Real AACN = AA*CN; -#ifdef DEB - Standard_Real BBCN = BB*CN; -#endif Standard_Real BBSN = BB*SN; F = AACN*CN + BBSN*(CN+CN) + CC*CN + DD*SN + EE; diff --git a/src/math/math_Vector.cxx b/src/math/math_Vector.cxx index 193f9764f3..5a2fe9f76f 100755 --- a/src/math/math_Vector.cxx +++ b/src/math/math_Vector.cxx @@ -429,9 +429,6 @@ math_Vector math_Vector::Multiplied(const math_Matrix& Right)const { Standard_DimensionError_Raise_if(Length() != Right.RowNumber(), ""); math_Vector Result(Right.LowerColIndex, Right.UpperColIndex); -#ifdef DEB - Standard_Integer Index = LowerIndex; -#endif for(Standard_Integer J2 = Right.LowerColIndex; J2 <= Right.UpperColIndex; J2++) { Array(J2) = 0.0;