diff --git a/Plugin/CutMap.cpp b/Plugin/CutMap.cpp index 62391784656a7abaaa74e3d75efa49aa3c3aeef4..2361fee279680ba408bdfd5609e69d9fe0620ec0 100644 --- a/Plugin/CutMap.cpp +++ b/Plugin/CutMap.cpp @@ -1,4 +1,4 @@ -// $Id: CutMap.cpp,v 1.20 2001-08-09 18:28:23 remacle Exp $ +// $Id: CutMap.cpp,v 1.21 2001-08-09 20:53:23 geuzaine Exp $ #include "CutMap.h" #include "List.h" @@ -13,13 +13,12 @@ extern "C" { GMSH_Plugin *GMSH_RegisterCutMapPlugin () { - return new GMSH_CutMapPlugin (CutMapOptions_Number[0].def); + return new GMSH_CutMapPlugin (); } } -GMSH_CutMapPlugin::GMSH_CutMapPlugin(double a) - :A(a) +GMSH_CutMapPlugin::GMSH_CutMapPlugin() { } @@ -58,7 +57,7 @@ double GMSH_CutMapPlugin :: levelset (double x, double y, double z, double val) // we must look into the map for A - Map(x,y,z) // this is the case when the map is the same as the view, // the result is the extraction of isovalue A - return A - val; + return CutMapOptions_Number[0].def - val; } extern List_T *Post_ViewList; @@ -66,7 +65,6 @@ extern List_T *Post_ViewList; Post_View *GMSH_CutMapPlugin::execute (Post_View *v) { Post_View *vv; - A = CutMapOptions_Number[0].def; int iView = (int)CutMapOptions_Number[1].def; _ith_field_to_draw_on_the_iso = (int)CutMapOptions_Number[2].def; diff --git a/Plugin/CutMap.h b/Plugin/CutMap.h index 2a1ec869e9ba28f8666b92efe86726a7b341a8cd..75565549a11d22384eb8f8175b6ae553a0b44b66 100644 --- a/Plugin/CutMap.h +++ b/Plugin/CutMap.h @@ -8,10 +8,9 @@ extern "C" class GMSH_CutMapPlugin : public GMSH_LevelsetPlugin { - double A; virtual double levelset (double x, double y, double z, double val) const; public: - GMSH_CutMapPlugin(double A); + GMSH_CutMapPlugin(); virtual void getName (char *name) const; virtual void getInfos (char *author, char *copyright, diff --git a/Plugin/CutPlane.cpp b/Plugin/CutPlane.cpp index f0d90b50fc65bee083a450ecc8b12272d57699fc..825bc61209fbbb8a33e6f3a54cc8db415c476302 100644 --- a/Plugin/CutPlane.cpp +++ b/Plugin/CutPlane.cpp @@ -1,4 +1,4 @@ -// $Id: CutPlane.cpp,v 1.16 2001-08-06 11:00:26 geuzaine Exp $ +// $Id: CutPlane.cpp,v 1.17 2001-08-09 20:53:23 geuzaine Exp $ #include "CutPlane.h" #include "List.h" @@ -15,16 +15,12 @@ extern "C" { GMSH_Plugin *GMSH_RegisterCutPlanePlugin () { - return new GMSH_CutPlanePlugin (CutPlaneOptions_Number[0].def, - CutPlaneOptions_Number[1].def, - CutPlaneOptions_Number[2].def, - CutPlaneOptions_Number[3].def); + return new GMSH_CutPlanePlugin (); } } -GMSH_CutPlanePlugin::GMSH_CutPlanePlugin(double A, double B, double C, double D) - :a(A),b(B),c(C),d(D) +GMSH_CutPlanePlugin::GMSH_CutPlanePlugin() { } @@ -60,7 +56,10 @@ void GMSH_CutPlanePlugin::CatchErrorMessage (char *errorMessage) const double GMSH_CutPlanePlugin :: levelset (double x, double y, double z, double val) const { - return a * x + b * y + c * z + d; + return CutPlaneOptions_Number[0].def * x + + CutPlaneOptions_Number[1].def * y + + CutPlaneOptions_Number[2].def * z + + CutPlaneOptions_Number[3].def ; } extern List_T *Post_ViewList; @@ -68,10 +67,7 @@ extern List_T *Post_ViewList; Post_View *GMSH_CutPlanePlugin::execute (Post_View *v) { Post_View *vv; - a = CutPlaneOptions_Number[0].def; - b = CutPlaneOptions_Number[1].def; - c = CutPlaneOptions_Number[2].def; - d = CutPlaneOptions_Number[3].def; + int iView = (int)CutPlaneOptions_Number[4].def; if(v && iView < 0) diff --git a/Plugin/CutPlane.h b/Plugin/CutPlane.h index 4575add1a984d3f3339dfcadcbba8a31a9060450..3d88bd048d62fd3bc5759fab24cd1c1dc82f2115 100644 --- a/Plugin/CutPlane.h +++ b/Plugin/CutPlane.h @@ -10,11 +10,9 @@ extern "C" class GMSH_CutPlanePlugin : public GMSH_LevelsetPlugin { - /*Plane a x + b y + c z + d = 0*/ - double a,b,c,d; virtual double levelset (double x, double y, double z, double val) const; public: - GMSH_CutPlanePlugin(double A, double B, double C, double D); + GMSH_CutPlanePlugin(); virtual void getName (char *name) const; virtual void getInfos (char *author, char *copyright, diff --git a/Plugin/CutSphere.cpp b/Plugin/CutSphere.cpp index 33a5354d11d4fa2538d5e9863eb5bcbdab425463..bd60ccd59ccd06f129aada9fc26dff57dc4c8577 100644 --- a/Plugin/CutSphere.cpp +++ b/Plugin/CutSphere.cpp @@ -1,4 +1,4 @@ -// $Id: CutSphere.cpp,v 1.15 2001-08-06 11:00:26 geuzaine Exp $ +// $Id: CutSphere.cpp,v 1.16 2001-08-09 20:53:23 geuzaine Exp $ #include <string.h> #include "CutSphere.h" @@ -16,16 +16,12 @@ extern "C" { GMSH_Plugin *GMSH_RegisterCutSpherePlugin () { - return new GMSH_CutSpherePlugin (CutSphereOptions_Number[0].def, - CutSphereOptions_Number[1].def, - CutSphereOptions_Number[2].def, - CutSphereOptions_Number[3].def); + return new GMSH_CutSpherePlugin (); } } -GMSH_CutSpherePlugin::GMSH_CutSpherePlugin(double A, double B, double C, double D) - :a(A),b(B),c(C),r(D) +GMSH_CutSpherePlugin::GMSH_CutSpherePlugin() { } @@ -61,6 +57,10 @@ void GMSH_CutSpherePlugin::CatchErrorMessage (char *errorMessage) const double GMSH_CutSpherePlugin :: levelset (double x, double y, double z, double val) const { + double a = CutSphereOptions_Number[0].def; + double b = CutSphereOptions_Number[1].def; + double c = CutSphereOptions_Number[2].def; + double r = CutSphereOptions_Number[3].def; return (x-a)*(x-a) + (y-b)*(y-b) + (z-c)*(z-c) - r*r; } @@ -69,10 +69,6 @@ extern List_T *Post_ViewList; Post_View *GMSH_CutSpherePlugin::execute (Post_View *v) { Post_View *vv; - a = CutSphereOptions_Number[0].def; - b = CutSphereOptions_Number[1].def; - c = CutSphereOptions_Number[2].def; - r = CutSphereOptions_Number[3].def; int iView = (int)CutSphereOptions_Number[4].def; if(v && iView < 0) diff --git a/Plugin/CutSphere.h b/Plugin/CutSphere.h index bee21ba1e26bf338c19f8ff9df0aa5dff01dc9c3..26b2e3a167a35b49ccb208d2a3e04a46c7bfd6d0 100644 --- a/Plugin/CutSphere.h +++ b/Plugin/CutSphere.h @@ -10,11 +10,9 @@ extern "C" class GMSH_CutSpherePlugin : public GMSH_LevelsetPlugin { - /*Sphere (x-a)^2 + (y-b)^2 + (z-c)^2 - r^2 = 0*/ - double a,b,c,r; virtual double levelset (double x, double y, double z, double val) const; public: - GMSH_CutSpherePlugin(double A, double B, double C, double R); + GMSH_CutSpherePlugin(); virtual void getName (char *name) const; virtual void getInfos (char *author, char *copyright, diff --git a/Plugin/Transform.cpp b/Plugin/Transform.cpp index 4510faaa0a52dce8dec524ad824c9dbc35cd3d15..dbaeec60b3808f6718681fef63f797d1ac254b0d 100644 --- a/Plugin/Transform.cpp +++ b/Plugin/Transform.cpp @@ -1,4 +1,4 @@ -// $Id: Transform.cpp,v 1.6 2001-08-06 11:13:25 geuzaine Exp $ +// $Id: Transform.cpp,v 1.7 2001-08-09 20:53:23 geuzaine Exp $ #include "Plugin.h" #include "Transform.h" @@ -22,26 +22,13 @@ extern "C" { GMSH_Plugin *GMSH_RegisterTransformPlugin () { - return new GMSH_TransformPlugin (TransformOptions_Number[0].def, - TransformOptions_Number[1].def, - TransformOptions_Number[2].def, - TransformOptions_Number[3].def, - TransformOptions_Number[4].def, - TransformOptions_Number[5].def, - TransformOptions_Number[6].def, - TransformOptions_Number[7].def, - TransformOptions_Number[8].def); + return new GMSH_TransformPlugin (); } } -GMSH_TransformPlugin::GMSH_TransformPlugin(double d11, double d12, double d13, - double d21, double d22, double d23, - double d31, double d32, double d33) +GMSH_TransformPlugin::GMSH_TransformPlugin() { - mat[0][0] = d11; mat[0][1] = d12; mat[0][2] = d13; - mat[1][0] = d21; mat[1][1] = d22; mat[1][2] = d23; - mat[2][0] = d31; mat[2][1] = d32; mat[2][2] = d33; } void GMSH_TransformPlugin::getName(char *name) const @@ -78,6 +65,7 @@ extern List_T *Post_ViewList; Post_View *GMSH_TransformPlugin::execute (Post_View *v) { Post_View *vv; + double mat[3][3]; mat[0][0] = TransformOptions_Number[0].def; mat[0][1] = TransformOptions_Number[1].def; diff --git a/Plugin/Transform.h b/Plugin/Transform.h index 025fdd29068376a203a0b39147ab015d5915b121..7bfcb589c2178e24617005f72dc20975803d22f2 100644 --- a/Plugin/Transform.h +++ b/Plugin/Transform.h @@ -8,11 +8,8 @@ extern "C" class GMSH_TransformPlugin : public GMSH_Post_Plugin { - double mat[3][3]; public: - GMSH_TransformPlugin(double a11, double a12, double a13, - double a21, double a22, double a23, - double a31, double a32, double a33); + GMSH_TransformPlugin(); virtual void Run(); virtual void Save(); virtual void getName (char *name) const;