From b575740a8a18dd465fa332ba0d723433a9b5e5c0 Mon Sep 17 00:00:00 2001
From: Jean-Francois Remacle <jean-francois.remacle@uclouvain.be>
Date: Mon, 30 Jul 2001 13:47:18 +0000
Subject: [PATCH] *** empty log message ***
---
Parser/Gmsh.tab.cpp | 2 +-
Parser/Gmsh.yy.cpp | 4 ++--
Plugin/CutMap.cpp | 6 +++---
Plugin/CutPlane.cpp | 8 +++-----
Plugin/LevelsetPlugin.cpp | 5 +++--
5 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index b15989fa82..80233f7a1d 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -172,7 +172,7 @@
#line 1 "Gmsh.y"
-// $Id: Gmsh.tab.cpp,v 1.95 2001-07-30 12:54:40 geuzaine Exp $
+// $Id: Gmsh.tab.cpp,v 1.96 2001-07-30 13:47:18 remacle Exp $
//
// Generaliser sprintf avec des chaines de caracteres
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index daed6b4dd6..d8bb53a832 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.95 2001-07-30 12:54:41 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.96 2001-07-30 13:47:18 remacle Exp $
*/
#define FLEX_SCANNER
@@ -990,7 +990,7 @@ char *yytext;
#define INITIAL 0
#line 2 "Gmsh.l"
-// $Id: Gmsh.yy.cpp,v 1.95 2001-07-30 12:54:41 geuzaine Exp $
+// $Id: Gmsh.yy.cpp,v 1.96 2001-07-30 13:47:18 remacle Exp $
#include <stdio.h>
#include <stdlib.h>
diff --git a/Plugin/CutMap.cpp b/Plugin/CutMap.cpp
index 8fa2e7c5f6..0186337139 100644
--- a/Plugin/CutMap.cpp
+++ b/Plugin/CutMap.cpp
@@ -1,4 +1,4 @@
-// $Id: CutMap.cpp,v 1.6 2001-07-30 13:22:21 geuzaine Exp $
+// $Id: CutMap.cpp,v 1.7 2001-07-30 13:47:18 remacle Exp $
#include "CutMap.h"
#include "List.h"
@@ -24,7 +24,7 @@ GMSH_CutMapPlugin::GMSH_CutMapPlugin(double a, int I)
void GMSH_CutMapPlugin::getName(char *name) const
{
- strcpy(name,"Cut Map");
+ strcpy(name,"CutMap");
}
void GMSH_CutMapPlugin::getInfos(char *author, char *copyright, char *help_text) const
@@ -79,7 +79,7 @@ Post_View *GMSH_CutMapPlugin::execute (Post_View *v)
return 0;
}
- return GMSH_LevelsetPlugin::execute((Post_View*)List_Pointer_Test(Post_ViewList,iView));
+ return GMSH_LevelsetPlugin::execute((Post_View*)List_Pointer_Test(Post_ViewList,iView-1));
}
}
diff --git a/Plugin/CutPlane.cpp b/Plugin/CutPlane.cpp
index c40f664d6d..ba419f7406 100644
--- a/Plugin/CutPlane.cpp
+++ b/Plugin/CutPlane.cpp
@@ -1,5 +1,3 @@
-// $Id: CutPlane.cpp,v 1.5 2001-07-30 13:22:21 geuzaine Exp $
-
#include "CutPlane.h"
#include "List.h"
@@ -39,7 +37,7 @@ void GMSH_CutPlanePlugin::getInfos(char *author, char *copyright, char *help_tex
int GMSH_CutPlanePlugin::getNbOptions() const
{
- return 4;
+ return 5;
}
StringXNumber* GMSH_CutPlanePlugin:: GetOption (int iopt)
@@ -66,7 +64,7 @@ Post_View *GMSH_CutPlanePlugin::execute (Post_View *v)
c = CutPlaneOptions_Number[2].def;
d = CutPlaneOptions_Number[3].def;
int iView = (int)CutPlaneOptions_Number[4].def;
-
+
if(v)return GMSH_LevelsetPlugin::execute(v);
else
{
@@ -75,7 +73,7 @@ Post_View *GMSH_CutPlanePlugin::execute (Post_View *v)
Msg(WARNING,"Plugin CutPlane, view %d not loaded\n",iView);
return 0;
}
- return GMSH_LevelsetPlugin::execute((Post_View*)List_Pointer_Test(Post_ViewList,iView));
+ return GMSH_LevelsetPlugin::execute((Post_View*)List_Pointer_Test(Post_ViewList,iView-1));
}
}
diff --git a/Plugin/LevelsetPlugin.cpp b/Plugin/LevelsetPlugin.cpp
index af1b0e6229..b5cd403c8b 100644
--- a/Plugin/LevelsetPlugin.cpp
+++ b/Plugin/LevelsetPlugin.cpp
@@ -34,8 +34,6 @@ Post_View *GMSH_LevelsetPlugin::execute (Post_View *v)
int k,i,nb,edtet[6][2] = {{0,1},{0,2},{0,3},{1,2},{1,3},{2,3}};
// for all scalar simplices
- printf("processing view with %d tets\n",v->NbSS);
-
if(v->NbSS)
{
BeginView(1);
@@ -74,12 +72,15 @@ Post_View *GMSH_LevelsetPlugin::execute (Post_View *v)
double xx = Xp[3];
double yy = Yp[3];
double zz = Zp[3];
+ double vv = myVals[3];
Xp[3] = Xp[2];
Yp[3] = Yp[2];
Zp[3] = Zp[2];
+ myVals[3] = myVals[2];
Xp[2] = xx;
Yp[2] = yy;
Zp[2] = zz;
+ myVals[2] = vv;
for(k=1;k<4;k++)List_Add(ActualView->ST, &Xp[k %4]);
for(k=1;k<4;k++)List_Add(ActualView->ST, &Yp[k % 4]);
for(k=1;k<4;k++)List_Add(ActualView->ST, &Zp[k % 4]);
--
GitLab