diff --git a/Graphics/Axes.cpp b/Graphics/Axes.cpp index 4deb224a8eede75038ebee485df7d96428a64c13..05537d1f295bb05954d74c639e2003a6db89a07a 100644 --- a/Graphics/Axes.cpp +++ b/Graphics/Axes.cpp @@ -1,4 +1,4 @@ -// $Id: Axes.cpp,v 1.22 2004-11-01 15:10:36 geuzaine Exp $ +// $Id: Axes.cpp,v 1.23 2004-12-21 03:13:02 geuzaine Exp $ // // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle // @@ -97,7 +97,8 @@ void Draw_Axes(double s) glEnd(); glEnable(GL_LINE_STIPPLE); - glLineStipple(2, 0x0F0F); + glLineStipple(1, 0x087F); + gl2psEnable(GL2PS_LINE_STIPPLE); glBegin(GL_LINES); if(CTX.range[2] != 0.) { glVertex3d(f, 0., 0.); @@ -115,7 +116,7 @@ void Draw_Axes(double s) glVertex3d(f, 0., 0.); glEnd(); glDisable(GL_LINE_STIPPLE); - + gl2psDisable(GL2PS_LINE_STIPPLE); } void Draw_SmallAxes(void) @@ -160,5 +161,4 @@ void Draw_SmallAxes(void) Draw_String("Y"); glRasterPos2d(cx + zx + o, cy + zy + o); Draw_String("Z"); - } diff --git a/Graphics/Geom.cpp b/Graphics/Geom.cpp index a0219b56273951612de87234f76a6360f335a354..80ac9084c5bfe824105124798b2e1955d5fece78 100644 --- a/Graphics/Geom.cpp +++ b/Graphics/Geom.cpp @@ -1,4 +1,4 @@ -// $Id: Geom.cpp,v 1.74 2004-12-07 04:52:26 geuzaine Exp $ +// $Id: Geom.cpp,v 1.75 2004-12-21 03:13:02 geuzaine Exp $ // // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle // @@ -478,7 +478,7 @@ void Draw_Plane_Surface(Surface * s) if(CTX.geom.surfaces) { glEnable(GL_LINE_STIPPLE); - glLineStipple(1, 0x0F0F); + glLineStipple(1, 0x1F1F); gl2psEnable(GL2PS_LINE_STIPPLE); glBegin(GL_LINES); for(i = 0; i < List_Nbr(s->Orientations); i++) { @@ -543,7 +543,7 @@ void Draw_NonPlane_Surface(Surface * s) } else{ glEnable(GL_LINE_STIPPLE); - glLineStipple(1, 0x0F0F); + glLineStipple(1, 0x1F1F); gl2psEnable(GL2PS_LINE_STIPPLE); int N = 50; glBegin(GL_LINE_STRIP); @@ -613,14 +613,14 @@ void Draw_Surface(void *a, void *b) } if(s->ipar[4]) { - glLineWidth(CTX.geom.line_sel_width); - gl2psLineWidth(CTX.geom.line_sel_width * + glLineWidth(CTX.geom.line_sel_width / 2.); + gl2psLineWidth(CTX.geom.line_sel_width / 2. * CTX.print.eps_line_width_factor); glColor4ubv((GLubyte *) & CTX.color.geom.surface_sel); } else { - glLineWidth(CTX.geom.line_width); - gl2psLineWidth(CTX.geom.line_width * CTX.print.eps_line_width_factor); + glLineWidth(CTX.geom.line_width / 2.); + gl2psLineWidth(CTX.geom.line_width / 2. * CTX.print.eps_line_width_factor); glColor4ubv((GLubyte *) & CTX.color.geom.surface); } diff --git a/doc/VERSIONS b/doc/VERSIONS index f100dbfdd3742d998daee579e785f02dae65e0a7..97de1b6afaefaf9f6d5cee139220980a071c0c7f 100644 --- a/doc/VERSIONS +++ b/doc/VERSIONS @@ -1,4 +1,4 @@ -$Id: VERSIONS,v 1.275 2004-12-13 15:58:39 geuzaine Exp $ +$Id: VERSIONS,v 1.276 2004-12-21 03:13:02 geuzaine Exp $ New in 1.57: generalized displacement maps to display arbitrary view types; the arrows representing a vector field can now also be colored @@ -14,7 +14,8 @@ triangular/tetrahadral meshes; the solver interface now supports TCP/IP connections; new generalized raise mode (allows to use complex expressions to offset post-processing maps); upgraded netgen kernel to version 4.4; new optional TIME list in parsed views to specify the -values of the time steps; various small bug fixes and enhancements; +values of the time steps; several bug fixes in the Elliptic mesh +algorithm; various other small bug fixes and enhancements; New in 1.56: new post-processing option to draw a scalar view raised by a displacement view without using Plugin(DisplacementRaise) (makes diff --git a/doc/gmsh.html b/doc/gmsh.html index 739bb96f63249ba14bdf0185e5265d60029a8c5c..528837992eb03cec51ea9900498f25e58cbd11ba 100644 --- a/doc/gmsh.html +++ b/doc/gmsh.html @@ -174,9 +174,8 @@ thumbnail"></a> <li>Mesh cut: <a href="/gmsh/gallery/cut2.png">pict1</a>. <li>Streamlines: - <a href="/gmsh/gallery/streamline.jpg">pict1</a>, - <a href="/gmsh/gallery/f16_stream.jpg">pict2</a>, - <a href="/gmsh/gallery/f18_stream.jpg">pict3</a> + <a href="/gmsh/gallery/f16_stream.jpg">pict1</a>, + <a href="/gmsh/gallery/f18_stream.jpg">pict2</a> (P. Geuzaine). <li>Lenna as background mesh: <a href="/gmsh/gallery/lenna.gif">pict1</a>.