diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 50b4e6ea01ccee479bd1aafbc0da1dae4d11557a..d36da609ebdd2753d957cd78ef3611ce77b18946 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -463,9 +463,9 @@ StringXNumber GeneralOptions_Number[] = {
{ F|O, "BackgroundGradient" , opt_general_background_gradient , 1. ,
"Draw background gradient (0=none, 1=vertical, 2=horizontal, 3=radial)" },
{ F|O, "BackgroundImagePositionX" , opt_general_background_image_position0 , 1.e5 ,
- "X position (in pixels) of background image (< 0: right alignment; > 1e5: centered)" },
+ "X position (in pixels) of background image (< 0: measure from right edge; >= 1e5: centered)" },
{ F|O, "BackgroundImagePositionY" , opt_general_background_image_position1 , 1.e5 ,
- "Y position (in pixels) of background image (< 0: right alignment; > 1e5: centered)" },
+ "Y position (in pixels) of background image (< 0: measure from bottom edge; >= 1e5: centered)" },
{ F, "Clip0A" , opt_general_clip0a , 1.0 ,
"First coefficient in equation for clipping plane 0 (`A' in `AX+BY+CZ+D=0')" },
@@ -743,9 +743,9 @@ StringXNumber GeneralOptions_Number[] = {
{ F|O, "SmallAxes" , opt_general_small_axes , 1. ,
"Display the small axes" },
{ F|O, "SmallAxesPositionX" , opt_general_small_axes_position0 , -60. ,
- "X position (in pixels) of small axes (< 0: right alignment; > 1e5: centered)" },
+ "X position (in pixels) of small axes (< 0: measure from right edge; >= 1e5: centered)" },
{ F|O, "SmallAxesPositionY" , opt_general_small_axes_position1 , -40. ,
- "Y position (in pixels) of small axes (< 0: right alignment; > 1e5: centered)" },
+ "Y position (in pixels) of small axes (< 0: measure from bottom edge; >= 1e5: centered)" },
{ F|O, "SmallAxesSize" , opt_general_small_axes_size , 30. ,
"Size (in pixels) of small axes" },
{ F|S, "SolverPositionX" , opt_general_solver_position0 , 650. ,
@@ -1385,9 +1385,9 @@ StringXNumber ViewOptions_Number[] = {
{ F|O, "PointType" , opt_view_point_type , 0. ,
"Display points as solid color dots (0), 3D spheres (1), scaled dots (2) or scaled spheres (3)" },
{ F|O, "PositionX" , opt_view_position0 , 100. ,
- "X position (in pixels) of the scale or 2D plot (< 0: right alignment; > 1e5: centered)" },
+ "X position (in pixels) of the scale or 2D plot (< 0: measure from right edge; >= 1e5: centered)" },
{ F|O, "PositionY" , opt_view_position1 , 50. ,
- "Y position (in pixels) of the scale or 2D plot (< 0: right alignment; > 1e5: centered)" },
+ "Y position (in pixels) of the scale or 2D plot (< 0: measure from bottom edge; >= 1e5: centered)" },
{ F, "RaiseX" , opt_view_raise0 , 0. ,
"Elevation of the view along X-axis (in model coordinates)" },
diff --git a/Geo/Geo.cpp b/Geo/Geo.cpp
index 3f1bbba3732603b15d1205044b0f3899e2852668..364c14842d5fd4279573c79aaf30f483a1cc02f6 100644
--- a/Geo/Geo.cpp
+++ b/Geo/Geo.cpp
@@ -2898,12 +2898,12 @@ bool ProjectPointOnSurface(Surface *s, Vertex &p, double uv[2])
x(1) = uv[1];
PointSurface ps = {&p, s};
- Vertex pp = InterpolateSurface(s, uv[0],uv[1], 0, 0);
- double d2 = (pp.Pos.X - p.Pos.X)*(pp.Pos.X - p.Pos.X) +
+ Vertex pp = InterpolateSurface(s, uv[0], uv[1], 0, 0);
+ double d2 =
+ (pp.Pos.X - p.Pos.X)*(pp.Pos.X - p.Pos.X) +
(pp.Pos.Y - p.Pos.Y)*(pp.Pos.Y - p.Pos.Y) +
(pp.Pos.Z - p.Pos.Z)*(pp.Pos.Z - p.Pos.Z) ;
- if (d2 < 1.e-12)return true;
-
+ if(d2 < 1.e-12) return true;
double UMIN = 0.;
double UMAX = 1.;
@@ -2916,7 +2916,9 @@ bool ProjectPointOnSurface(Surface *s, Vertex &p, double uv[2])
p = InterpolateSurface(s, x(0), x(1), 0, 0);
uv[0] = x(0);
uv[1] = x(1);
- if (ITER > 0)Msg::Info("ProjectPoint (%g,%g,%g) On Surface %d converged after %d iterations",p.Pos.X,p.Pos.Y,p.Pos.Z,s->Num,ITER);
+ if (ITER > 0)
+ Msg::Info("ProjectPoint (%g,%g,%g) On Surface %d converged after %d iterations",
+ p.Pos.X, p.Pos.Y, p.Pos.Z, s->Num, ITER);
return true;
}
x(0) = UMIN + (UMAX - UMIN) * ((rand() % 10000) / 10000.);
@@ -2925,16 +2927,17 @@ bool ProjectPointOnSurface(Surface *s, Vertex &p, double uv[2])
}
{
int NSAMPLES = 500;
- double uok,vok;
+ double uok, vok;
double dmin = 1.e22;
- for (int i=0;i<NSAMPLES;i++){
- const double U = i/(double)(NSAMPLES-1);
- for (int j=0;j<NSAMPLES;j++){
- const double V = j/(double)(NSAMPLES-1);
+ for (int i = 0; i < NSAMPLES; i++){
+ const double U = i / (double)(NSAMPLES - 1);
+ for (int j = 0; j < NSAMPLES; j++){
+ const double V = j / (double)(NSAMPLES - 1);
Vertex pp = InterpolateSurface(s, U, V, 0, 0);
- double d2 = (pp.Pos.X - p.Pos.X)*(pp.Pos.X - p.Pos.X) +
- (pp.Pos.Y - p.Pos.Y)*(pp.Pos.Y - p.Pos.Y) +
- (pp.Pos.Z - p.Pos.Z)*(pp.Pos.Z - p.Pos.Z) ;
+ double d2 =
+ (pp.Pos.X - p.Pos.X) * (pp.Pos.X - p.Pos.X) +
+ (pp.Pos.Y - p.Pos.Y) * (pp.Pos.Y - p.Pos.Y) +
+ (pp.Pos.Z - p.Pos.Z) * (pp.Pos.Z - p.Pos.Z);
if (d2 < dmin) {
dmin = d2;
uok = U;
@@ -2945,7 +2948,9 @@ bool ProjectPointOnSurface(Surface *s, Vertex &p, double uv[2])
p = InterpolateSurface(s, uok, vok, 0, 0);
uv[0] = uok;
uv[1] = vok;
- if (ITER > 0)Msg::Info("Brute force method used for projection of point (%g %g %g) on surface %d",p.Pos.X,p.Pos.Y,p.Pos.Z,s->Num);
+ if (ITER > 0)
+ Msg::Info("Brute force method used for projection of point (%g %g %g) on surface %d",
+ p.Pos.X, p.Pos.Y, p.Pos.Z, s->Num);
return true;
}
return false;
diff --git a/Graphics/drawContext.cpp b/Graphics/drawContext.cpp
index 10e18ce5ccf356c2fc3400603b01e475d0cf3c53..6872a6b7f1cbca2be5e54cf8e9984c232187e2ae 100644
--- a/Graphics/drawContext.cpp
+++ b/Graphics/drawContext.cpp
@@ -328,10 +328,9 @@ void drawContext::initProjection(int xpick, int ypick, int wpick, int hpick)
glLoadIdentity();
// restrict picking to a rectangular region around xpick,ypick
- if(render_mode == GMSH_SELECT){
+ if(render_mode == GMSH_SELECT)
gluPickMatrix((GLdouble)xpick, (GLdouble)(viewport[3] - ypick),
(GLdouble)wpick, (GLdouble)hpick, (GLint *)viewport);
- }
// draw background if not in selection mode
if(render_mode != GMSH_SELECT && (CTX::instance()->bgGradient ||
@@ -341,7 +340,7 @@ void drawContext::initProjection(int xpick, int ypick, int wpick, int hpick)
glLoadIdentity();
// the z values and the translation are only needed for GL2PS,
// which does not understand "no depth test" (hence we must make
- // sure that we draw the background behing the rest of the scene)
+ // sure that we draw the background behind the rest of the scene)
glOrtho((double)viewport[0], (double)viewport[2],
(double)viewport[1], (double)viewport[3],
clip_near, clip_far);