From 0b18fb075cc64a95ac4b54f66342a66efc383e27 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 31 May 2004 21:37:23 +0000
Subject: [PATCH] - set VectorType to Displacement in Plugin(StreamLines) -
shout when a plugin option/name does not exist
---
Parser/Gmsh.tab.cpp | 8 ++++----
Parser/Gmsh.y | 8 ++++----
Parser/Gmsh.yy.cpp | 4 ++--
Plugin/StreamLines.cpp | 7 +++----
doc/texinfo/opt_plugin.texi | 4 +---
5 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index ec7cc45551..6be7c84bd0 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -192,7 +192,7 @@
#line 1 "Gmsh.y"
-// $Id: Gmsh.tab.cpp,v 1.194 2004-05-30 21:21:41 geuzaine Exp $
+// $Id: Gmsh.tab.cpp,v 1.195 2004-05-31 21:37:22 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -6192,7 +6192,7 @@ case 229:
GMSH_PluginManager::instance()->setPluginOption(yyvsp[-6].c, yyvsp[-3].c, yyvsp[-1].d);
}
catch (...) {
- yymsg(WARNING, "Unknown option '%s' or plugin '%s'", yyvsp[-3].c, yyvsp[-6].c);
+ yymsg(GERROR, "Unknown option '%s' or plugin '%s'", yyvsp[-3].c, yyvsp[-6].c);
}
;
break;}
@@ -6203,7 +6203,7 @@ case 230:
GMSH_PluginManager::instance()->setPluginOption(yyvsp[-6].c, yyvsp[-3].c, yyvsp[-1].c);
}
catch (...) {
- yymsg(WARNING, "Unknown option '%s' or plugin '%s'", yyvsp[-3].c, yyvsp[-6].c);
+ yymsg(GERROR, "Unknown option '%s' or plugin '%s'", yyvsp[-3].c, yyvsp[-6].c);
}
;
break;}
@@ -7135,7 +7135,7 @@ case 286:
GMSH_PluginManager::instance()->action(yyvsp[-4].c, yyvsp[-1].c, 0);
}
catch(...) {
- yymsg(WARNING, "Unknown action '%s' or plugin '%s'", yyvsp[-1].c, yyvsp[-4].c);
+ yymsg(GERROR, "Unknown action '%s' or plugin '%s'", yyvsp[-1].c, yyvsp[-4].c);
}
;
break;}
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index 5a93453ba2..35cfc597a8 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1,5 +1,5 @@
%{
-// $Id: Gmsh.y,v 1.170 2004-05-30 21:21:42 geuzaine Exp $
+// $Id: Gmsh.y,v 1.171 2004-05-31 21:37:23 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -1625,7 +1625,7 @@ Affectation :
GMSH_PluginManager::instance()->setPluginOption($3, $6, $8);
}
catch (...) {
- yymsg(WARNING, "Unknown option '%s' or plugin '%s'", $6, $3);
+ yymsg(GERROR, "Unknown option '%s' or plugin '%s'", $6, $3);
}
}
| tPlugin '(' tSTRING ')' '.' tSTRING tAFFECT StringExpr tEND
@@ -1634,7 +1634,7 @@ Affectation :
GMSH_PluginManager::instance()->setPluginOption($3, $6, $8);
}
catch (...) {
- yymsg(WARNING, "Unknown option '%s' or plugin '%s'", $6, $3);
+ yymsg(GERROR, "Unknown option '%s' or plugin '%s'", $6, $3);
}
}
;
@@ -2515,7 +2515,7 @@ Command :
GMSH_PluginManager::instance()->action($3, $6, 0);
}
catch(...) {
- yymsg(WARNING, "Unknown action '%s' or plugin '%s'", $6, $3);
+ yymsg(GERROR, "Unknown action '%s' or plugin '%s'", $6, $3);
}
}
| tCombine tSTRING tEND
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index d3906aded8..74cc86716d 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -2,7 +2,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.193 2004-05-30 21:21:42 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.194 2004-05-31 21:37:23 geuzaine Exp $
*/
#define FLEX_SCANNER
@@ -1019,7 +1019,7 @@ char *yytext;
#line 1 "Gmsh.l"
#define INITIAL 0
#line 2 "Gmsh.l"
-// $Id: Gmsh.yy.cpp,v 1.193 2004-05-30 21:21:42 geuzaine Exp $
+// $Id: Gmsh.yy.cpp,v 1.194 2004-05-31 21:37:23 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
diff --git a/Plugin/StreamLines.cpp b/Plugin/StreamLines.cpp
index 18eb8a2519..6d87465fc2 100644
--- a/Plugin/StreamLines.cpp
+++ b/Plugin/StreamLines.cpp
@@ -1,4 +1,4 @@
-// $Id: StreamLines.cpp,v 1.8 2004-05-31 20:09:37 geuzaine Exp $
+// $Id: StreamLines.cpp,v 1.9 2004-05-31 21:37:23 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -86,9 +86,7 @@ void GMSH_StreamLinesPlugin::getInfos(char *author, char *copyright,
"scheme is a RK44. If `iView' < 0, the plugin is run\n"
"on the current view.\n"
"\n"
- "Plugin(StreamLines) creates one new view. It is\n"
- "nice to choose the displacement mode to see\n"
- "vectors and to animate the view ;-)\n");
+ "Plugin(StreamLines) creates one new view.\n");
}
int GMSH_StreamLinesPlugin::getNbOptions() const
@@ -135,6 +133,7 @@ Post_View * GMSH_StreamLinesPlugin::GenerateView(Post_View * v) const
{
Post_View * View = BeginView(1);
+ View->VectorType = DRAW_POST_DISPLACEMENT;
View->NbTimeStep = (int) StreamLinesOptions_Number[11].def;
double XINIT[3];
diff --git a/doc/texinfo/opt_plugin.texi b/doc/texinfo/opt_plugin.texi
index d05bb6716d..76f15a8896 100644
--- a/doc/texinfo/opt_plugin.texi
+++ b/doc/texinfo/opt_plugin.texi
@@ -280,9 +280,7 @@ the options `MaxIter' and `DT'. The time stepping
scheme is a RK44. If `iView' < 0, the plugin is run
on the current view.
-Plugin(StreamLines) creates one new view. It is
-nice to choose the displacement mode to see
-vectors and to animate the view ;-)
+Plugin(StreamLines) creates one new view.
Numeric options:
@table @code
--
GitLab