OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-06 18:26:22 +03:00
Code Packages Releases Activity

0024069: Confusion in the name of variables

Browse Source
This commit is contained in:
emv 2013-07-12 10:36:44 +04:00
parent 381a6d0e99
commit 95978b2851
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/TestTopOpe/TestTopOpe_CORCommands.cxx
View File

@ -691,8 +691,8 @@ static Standard_Integer projponf(Draw_Interpretor& di, Standard_Integer n, const
Standard_Boolean ok; Standard_Boolean ok;
gp_Pnt2d uv; gp_Pnt2d uv;
gp_Pnt p, pproj; gp_Pnt p, pproj;
Extrema_ExtAlgo aExtAlgo = Extrema_ExtAlgo_Grad; Extrema_ExtAlgo anExtAlgo = Extrema_ExtAlgo_Grad;
Extrema_ExtFlag aExtFlag = Extrema_ExtFlag_MINMAX; Extrema_ExtFlag anExtFlag = Extrema_ExtFlag_MINMAX;
// //
DrawTrSurf::GetPoint(a[2], p); 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; const char* key2 = (n > 4) ? a[4] : NULL;
if (key1) { if (key1) {
if (!strcasecmp(key1,"-min")) { if (!strcasecmp(key1,"-min")) {
aExtFlag = Extrema_ExtFlag_MIN; anExtFlag = Extrema_ExtFlag_MIN;
} else if (!strcasecmp(key1,"-max")) { } else if (!strcasecmp(key1,"-max")) {
aExtFlag = Extrema_ExtFlag_MAX; anExtFlag = Extrema_ExtFlag_MAX;
} else { } else {
aExtAlgo = (!strcasecmp(key1,"-t")) ? Extrema_ExtAlgo_Tree : aExtAlgo; anExtAlgo = (!strcasecmp(key1,"-t")) ? Extrema_ExtAlgo_Tree : anExtAlgo;
} }
} }
if (key2) { 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) { if (!ok) {
di<<"projection failed"<<"\n"; di<<"projection failed"<<"\n";

16
src/TopOpeBRepTool/TopOpeBRepTool_PROJECT.cxx
View File

@ -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, Standard_EXPORT Standard_Boolean FUN_tool_projPonS(const gp_Pnt& P,
const Handle(Geom_Surface)& S, const Handle(Geom_Surface)& S,
gp_Pnt2d& UV,Standard_Real& dist, gp_Pnt2d& UV,Standard_Real& dist,
const Extrema_ExtFlag aExtFlag, const Extrema_ExtFlag anExtFlag,
const Extrema_ExtAlgo aExtAlgo) const Extrema_ExtAlgo anExtAlgo)
{ {
Standard_Real UMin, UMax, VMin, VMax; Standard_Real UMin, UMax, VMin, VMax;
GeomAPI_ProjectPointOnSurf PonS; GeomAPI_ProjectPointOnSurf PonS;
// //
S->Bounds(UMin, UMax, VMin, VMax); S->Bounds(UMin, UMax, VMin, VMax);
PonS.Init(S, UMin, UMax, VMin, VMax, aExtAlgo); PonS.Init(S, UMin, UMax, VMin, VMax, anExtAlgo);
Extrema_ExtPS& anExtAlgo = const_cast<Extrema_ExtPS&>(PonS.Extrema()); Extrema_ExtPS& anExtPS = const_cast<Extrema_ExtPS&>(PonS.Extrema());
anExtAlgo.SetFlag(aExtFlag); anExtPS.SetFlag(anExtFlag);
// //
PonS.Perform(P); 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, Standard_EXPORT Standard_Boolean FUN_tool_projPonF(const gp_Pnt& P,const TopoDS_Face& F,
gp_Pnt2d& UV,Standard_Real& dist, gp_Pnt2d& UV,Standard_Real& dist,
const Extrema_ExtFlag aExtFlag, const Extrema_ExtFlag anExtFlag,
const Extrema_ExtAlgo aExtAlgo) const Extrema_ExtAlgo anExtAlgo)
{ {
dist = 1.; dist = 1.;
Handle(Geom_Surface) S = BRep_Tool::Surface(F); 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; return ok;
} }

8
src/TopOpeBRepTool/TopOpeBRepTool_PROJECT.hxx
View File

@ -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,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_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, 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_ExtFlag anExtFlag=Extrema_ExtFlag_MINMAX,
const Extrema_ExtAlgo aExtAlgo=Extrema_ExtAlgo_Grad); const Extrema_ExtAlgo anExtAlgo=Extrema_ExtAlgo_Grad);
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// project point <P> on topologies (edge <E>,face <F>) // project point <P> on topologies (edge <E>,face <F>)
@ -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_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_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, 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_ExtFlag anExtFlag=Extrema_ExtFlag_MINMAX,
const Extrema_ExtAlgo aExtAlgo=Extrema_ExtAlgo_Grad); const Extrema_ExtAlgo anExtAlgo=Extrema_ExtAlgo_Grad);
#endif #endif