From 95978b285136cd9c197c6cbb9ccc69c3310f2a13 Mon Sep 17 00:00:00 2001 From: emv Date: Fri, 12 Jul 2013 10:36:44 +0400 Subject: [PATCH] 0024069: Confusion in the name of variables --- src/TestTopOpe/TestTopOpe_CORCommands.cxx | 14 +++++++------- src/TopOpeBRepTool/TopOpeBRepTool_PROJECT.cxx | 16 ++++++++-------- src/TopOpeBRepTool/TopOpeBRepTool_PROJECT.hxx | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/TestTopOpe/TestTopOpe_CORCommands.cxx b/src/TestTopOpe/TestTopOpe_CORCommands.cxx index d1dd627056..d0af324f77 100755 --- a/src/TestTopOpe/TestTopOpe_CORCommands.cxx +++ b/src/TestTopOpe/TestTopOpe_CORCommands.cxx @@ -691,8 +691,8 @@ static Standard_Integer projponf(Draw_Interpretor& di, Standard_Integer n, const Standard_Boolean ok; gp_Pnt2d uv; gp_Pnt p, pproj; - Extrema_ExtAlgo aExtAlgo = Extrema_ExtAlgo_Grad; - Extrema_ExtFlag aExtFlag = Extrema_ExtFlag_MINMAX; + Extrema_ExtAlgo anExtAlgo = Extrema_ExtAlgo_Grad; + Extrema_ExtFlag anExtFlag = Extrema_ExtFlag_MINMAX; // DrawTrSurf::GetPoint(a[2], p); // @@ -701,18 +701,18 @@ static Standard_Integer projponf(Draw_Interpretor& di, Standard_Integer n, const const char* key2 = (n > 4) ? a[4] : NULL; if (key1) { if (!strcasecmp(key1,"-min")) { - aExtFlag = Extrema_ExtFlag_MIN; + anExtFlag = Extrema_ExtFlag_MIN; } else if (!strcasecmp(key1,"-max")) { - aExtFlag = Extrema_ExtFlag_MAX; + anExtFlag = Extrema_ExtFlag_MAX; } else { - aExtAlgo = (!strcasecmp(key1,"-t")) ? Extrema_ExtAlgo_Tree : aExtAlgo; + anExtAlgo = (!strcasecmp(key1,"-t")) ? Extrema_ExtAlgo_Tree : anExtAlgo; } } if (key2) { - aExtAlgo = (!strcasecmp(key2,"-t")) ? Extrema_ExtAlgo_Tree : aExtAlgo; + anExtAlgo = (!strcasecmp(key2,"-t")) ? Extrema_ExtAlgo_Tree : anExtAlgo; } } - ok = FUN_tool_projPonF(p, f, uv, dist, aExtFlag, aExtAlgo); + ok = FUN_tool_projPonF(p, f, uv, dist, anExtFlag, anExtAlgo); // if (!ok) { di<<"projection failed"<<"\n"; diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_PROJECT.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_PROJECT.cxx index b55e9bae37..d25dd56653 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_PROJECT.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_PROJECT.cxx @@ -203,16 +203,16 @@ Standard_EXPORT Standard_Boolean FUN_tool_projPonC2D(const gp_Pnt& P, Standard_EXPORT Standard_Boolean FUN_tool_projPonS(const gp_Pnt& P, const Handle(Geom_Surface)& S, gp_Pnt2d& UV,Standard_Real& dist, - const Extrema_ExtFlag aExtFlag, - const Extrema_ExtAlgo aExtAlgo) + const Extrema_ExtFlag anExtFlag, + const Extrema_ExtAlgo anExtAlgo) { Standard_Real UMin, UMax, VMin, VMax; GeomAPI_ProjectPointOnSurf PonS; // S->Bounds(UMin, UMax, VMin, VMax); - PonS.Init(S, UMin, UMax, VMin, VMax, aExtAlgo); - Extrema_ExtPS& anExtAlgo = const_cast(PonS.Extrema()); - anExtAlgo.SetFlag(aExtFlag); + PonS.Init(S, UMin, UMax, VMin, VMax, anExtAlgo); + Extrema_ExtPS& anExtPS = const_cast(PonS.Extrema()); + anExtPS.SetFlag(anExtFlag); // PonS.Perform(P); // @@ -284,11 +284,11 @@ Standard_EXPORT Standard_Boolean FUN_tool_projPonboundedF(const gp_Pnt& P,const // ---------------------------------------------------------------------- Standard_EXPORT Standard_Boolean FUN_tool_projPonF(const gp_Pnt& P,const TopoDS_Face& F, gp_Pnt2d& UV,Standard_Real& dist, - const Extrema_ExtFlag aExtFlag, - const Extrema_ExtAlgo aExtAlgo) + const Extrema_ExtFlag anExtFlag, + const Extrema_ExtAlgo anExtAlgo) { dist = 1.; Handle(Geom_Surface) S = BRep_Tool::Surface(F); - Standard_Boolean ok = FUN_tool_projPonS(P,S,UV,dist, aExtFlag, aExtAlgo); + Standard_Boolean ok = FUN_tool_projPonS(P,S,UV,dist, anExtFlag, anExtAlgo); return ok; } diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_PROJECT.hxx b/src/TopOpeBRepTool/TopOpeBRepTool_PROJECT.hxx index daa63e9a05..00cddc08b7 100755 --- a/src/TopOpeBRepTool/TopOpeBRepTool_PROJECT.hxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_PROJECT.hxx @@ -47,8 +47,8 @@ Standard_EXPORT Standard_Boolean FUN_tool_projPonC2D(const gp_Pnt& P,const Stand Standard_EXPORT Standard_Boolean FUN_tool_projPonC2D(const gp_Pnt& P,const BRepAdaptor_Curve2d& BAC2D,const Standard_Real pmin,const Standard_Real pmax,Standard_Real& param,Standard_Real& dist); Standard_EXPORT Standard_Boolean FUN_tool_projPonC2D(const gp_Pnt& P,const BRepAdaptor_Curve2d& BAC2D,Standard_Real& param,Standard_Real& dist); Standard_EXPORT Standard_Boolean FUN_tool_projPonS(const gp_Pnt& P,const Handle(Geom_Surface)& S,gp_Pnt2d& UV,Standard_Real& dist, - const Extrema_ExtFlag aExtFlag=Extrema_ExtFlag_MINMAX, - const Extrema_ExtAlgo aExtAlgo=Extrema_ExtAlgo_Grad); + const Extrema_ExtFlag anExtFlag=Extrema_ExtFlag_MINMAX, + const Extrema_ExtAlgo anExtAlgo=Extrema_ExtAlgo_Grad); // ---------------------------------------------------------------------- // project point

on topologies (edge ,face ) @@ -57,7 +57,7 @@ Standard_EXPORT Standard_Boolean FUN_tool_projPonE(const gp_Pnt& P,const Standar Standard_EXPORT Standard_Boolean FUN_tool_projPonE(const gp_Pnt& P,const TopoDS_Edge& E,Standard_Real& param,Standard_Real& dist); Standard_EXPORT Standard_Boolean FUN_tool_projPonboundedF(const gp_Pnt& P,const TopoDS_Face& F,gp_Pnt2d& UV,Standard_Real& dist); Standard_EXPORT Standard_Boolean FUN_tool_projPonF(const gp_Pnt& P,const TopoDS_Face& F,gp_Pnt2d& UV,Standard_Real& dist, - const Extrema_ExtFlag aExtFlag=Extrema_ExtFlag_MINMAX, - const Extrema_ExtAlgo aExtAlgo=Extrema_ExtAlgo_Grad); + const Extrema_ExtFlag anExtFlag=Extrema_ExtFlag_MINMAX, + const Extrema_ExtAlgo anExtAlgo=Extrema_ExtAlgo_Grad); #endif