From d2bafc69e0435e21578b21ca3f6cde8994ea6afe Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Tue, 28 Dec 2004 17:24:25 +0000 Subject: [PATCH] missing line_width/point_size calls --- Graphics/Mesh.cpp | 4 +++- Plugin/CutPlane.cpp | 4 +++- Plugin/CutSphere.cpp | 4 +++- Plugin/Probe.cpp | 3 ++- Plugin/StreamLines.cpp | 4 ++-- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Graphics/Mesh.cpp b/Graphics/Mesh.cpp index 35b2790dc3..b700803ba2 100644 --- a/Graphics/Mesh.cpp +++ b/Graphics/Mesh.cpp @@ -1,4 +1,4 @@ -// $Id: Mesh.cpp,v 1.114 2004-12-07 04:52:26 geuzaine Exp $ +// $Id: Mesh.cpp,v 1.115 2004-12-28 17:24:25 geuzaine Exp $ // // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle // @@ -147,6 +147,8 @@ void Draw_Mesh(Mesh * M) (!CTX.mesh.draw && Tree_Nbr(M->Vertices) && !Tree_Nbr(M->Points))) { glColor4ubv((GLubyte *) & CTX.color.fg); glLineWidth(CTX.line_width); + gl2psLineWidth(CTX.line_width * CTX.print.eps_line_width_factor); + glBegin(GL_LINE_LOOP); glVertex3d(CTX.min[0], CTX.min[1], CTX.min[2]); glVertex3d(CTX.max[0], CTX.min[1], CTX.min[2]); diff --git a/Plugin/CutPlane.cpp b/Plugin/CutPlane.cpp index bc17afe056..870b2f6fe6 100644 --- a/Plugin/CutPlane.cpp +++ b/Plugin/CutPlane.cpp @@ -1,4 +1,4 @@ -// $Id: CutPlane.cpp,v 1.40 2004-12-27 16:13:45 geuzaine Exp $ +// $Id: CutPlane.cpp,v 1.41 2004-12-28 17:24:25 geuzaine Exp $ // // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle // @@ -62,6 +62,8 @@ void GMSH_CutPlanePlugin::draw() if(num < 0) num = iview; Post_View **vv = (Post_View **)List_Pointer_Test(CTX.post.list, num); if(!vv) return; + glLineWidth(CTX.line_width); + gl2psLineWidth(CTX.line_width * CTX.print.eps_line_width_factor); Draw_PlaneInBoundingBox((*vv)->BBox[0], (*vv)->BBox[2], (*vv)->BBox[4], (*vv)->BBox[1], (*vv)->BBox[3], (*vv)->BBox[5], CutPlaneOptions_Number[0].def, diff --git a/Plugin/CutSphere.cpp b/Plugin/CutSphere.cpp index aceb3f18df..55c7a0930c 100644 --- a/Plugin/CutSphere.cpp +++ b/Plugin/CutSphere.cpp @@ -1,4 +1,4 @@ -// $Id: CutSphere.cpp,v 1.37 2004-12-27 16:13:45 geuzaine Exp $ +// $Id: CutSphere.cpp,v 1.38 2004-12-28 17:24:25 geuzaine Exp $ // // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle // @@ -67,6 +67,8 @@ void GMSH_CutSpherePlugin::draw() glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); glPushMatrix(); glColor4ubv((GLubyte *) & CTX.color.fg); + glLineWidth(CTX.line_width); + gl2psLineWidth(CTX.line_width * CTX.print.eps_line_width_factor); glTranslated(CutSphereOptions_Number[0].def, CutSphereOptions_Number[1].def, CutSphereOptions_Number[2].def); diff --git a/Plugin/Probe.cpp b/Plugin/Probe.cpp index dd436a0f90..73fb886698 100644 --- a/Plugin/Probe.cpp +++ b/Plugin/Probe.cpp @@ -1,4 +1,4 @@ -// $Id: Probe.cpp,v 1.3 2004-12-27 16:13:45 geuzaine Exp $ +// $Id: Probe.cpp,v 1.4 2004-12-28 17:24:25 geuzaine Exp $ // // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle // @@ -67,6 +67,7 @@ void GMSH_ProbePlugin::draw() double z = ProbeOptions_Number[2].def; glColor4ubv((GLubyte *) & CTX.color.fg); glLineWidth(CTX.line_width); + gl2psLineWidth(CTX.line_width * CTX.print.eps_line_width_factor); if(x >= v->BBox[0] && x <= v->BBox[1] && y >= v->BBox[2] && y <= v->BBox[3] && z >= v->BBox[4] && z <= v->BBox[5]){ diff --git a/Plugin/StreamLines.cpp b/Plugin/StreamLines.cpp index 47fc48cddf..58bb049bfb 100644 --- a/Plugin/StreamLines.cpp +++ b/Plugin/StreamLines.cpp @@ -1,4 +1,4 @@ -// $Id: StreamLines.cpp,v 1.16 2004-12-27 16:13:45 geuzaine Exp $ +// $Id: StreamLines.cpp,v 1.17 2004-12-28 17:24:25 geuzaine Exp $ // // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle // @@ -71,7 +71,7 @@ void GMSH_StreamLinesPlugin::draw() for(int i = 0; i < getNbU(); ++i){ for(int j = 0; j < getNbV(); ++j){ getPoint(i, j, p); - Draw_Point(1, 3., &p[0], &p[1], &p[2], 1); + Draw_Point(1, CTX.point_size, &p[0], &p[1], &p[2], 1); } } #endif -- GitLab