From 4afafa3c364d046bb7a4906037d46896ba9caac4 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 19 May 2004 18:43:16 +0000
Subject: [PATCH] missed these bits in my commit yesterday
---
Graphics/Geom.cpp | 7 ++++---
Plugin/StreamLines.cpp | 26 +++++++++++---------------
2 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/Graphics/Geom.cpp b/Graphics/Geom.cpp
index c92cad2289..844b991839 100644
--- a/Graphics/Geom.cpp
+++ b/Graphics/Geom.cpp
@@ -1,4 +1,4 @@
-// $Id: Geom.cpp,v 1.60 2004-05-18 19:22:08 geuzaine Exp $
+// $Id: Geom.cpp,v 1.61 2004-05-19 18:43:15 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -113,7 +113,7 @@ void Draw_Curve(void *a, void *b)
glPushName(c->Num);
}
- if((c)->ipar[3]) {
+ if(c->ipar[3]) {
glLineWidth(CTX.geom.line_sel_width);
gl2psLineWidth(CTX.geom.line_sel_width * CTX.print.eps_line_width_factor);
glColor4ubv((GLubyte *) & CTX.color.geom.line_sel);
@@ -163,7 +163,8 @@ void Draw_Curve(void *a, void *b)
x[1] = dv.Pos.X;
y[1] = dv.Pos.Y;
z[1] = dv.Pos.Z;
- Draw_Cylinder(CTX.geom.line_width, x, y, z, CTX.geom.light);
+ Draw_Cylinder(c->ipar[3] ? CTX.geom.line_sel_width : CTX.geom.line_width,
+ x, y, z, CTX.geom.light);
}
}
else {
diff --git a/Plugin/StreamLines.cpp b/Plugin/StreamLines.cpp
index a717787746..0e4978378a 100644
--- a/Plugin/StreamLines.cpp
+++ b/Plugin/StreamLines.cpp
@@ -1,4 +1,4 @@
-// $Id: StreamLines.cpp,v 1.6 2004-05-12 02:02:30 geuzaine Exp $
+// $Id: StreamLines.cpp,v 1.7 2004-05-19 18:43:16 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -203,21 +203,17 @@ Post_View * GMSH_StreamLinesPlugin::GenerateView(Post_View * v) const
Post_View *GMSH_StreamLinesPlugin::execute(Post_View * v)
{
- Post_View *vv;
-
int iView = (int)StreamLinesOptions_Number[13].def;
- if(v && iView < 0)
- vv = v;
- else {
- if(!v && iView < 0)
- iView = 0;
- if(!(vv = (Post_View *) List_Pointer_Test(CTX.post.list, iView))) {
- return 0;
- }
+ if(iView < 0)
+ iView = v ? v->Index : 0;
+
+ if(!List_Pointer_Test(CTX.post.list, iView)) {
+ Msg(GERROR, "View[%d] does not exist", iView);
+ return v;
}
-
- Post_View *newView = GenerateView(vv);
-
- return newView;
+
+ Post_View *v1 = (Post_View*)List_Pointer(CTX.post.list, iView);
+
+ return GenerateView(v1);
}
--
GitLab