diff --git a/Common/Context.cpp b/Common/Context.cpp index 32322fb745389c3f640e707bf0e91165ae92b424..e013fd487cdeb6bd7f319b906b4e317b22b1a3fe 100644 --- a/Common/Context.cpp +++ b/Common/Context.cpp @@ -116,3 +116,4 @@ int CTX::unpackAlpha(unsigned int X) else return ( ( (X) >> 24 ) & 0xff ); } + diff --git a/Common/Context.h b/Common/Context.h index 694e850e023ef09a654bc798e3637fe4c3d14bb5..3f5b62f6b172b1fb0ef691b093be60ab6fcbb5d4 100644 --- a/Common/Context.h +++ b/Common/Context.h @@ -11,6 +11,8 @@ #include "CGNSOptions.h" #include "meshPartitionOptions.h" +class binding; + // The interface-independent context. struct contextMeshOptions { @@ -242,6 +244,7 @@ class CTX { int unpackGreen(unsigned int X); int unpackBlue(unsigned int X); int unpackAlpha(unsigned int X); + }; #endif diff --git a/Common/LuaBindings.cpp b/Common/LuaBindings.cpp index f2f6978b6cc8d3e7d1af76bd32b5360462e580e5..354b91f7765a4d30f04f9e0cfd5f9e65f144cfb7 100644 --- a/Common/LuaBindings.cpp +++ b/Common/LuaBindings.cpp @@ -29,6 +29,7 @@ #include "Bindings.h" #include "GmshMessage.h" #include "linearSystem.h" +#include "Options.h" #if defined(HAVE_OPENGL) #include "drawContext.h" @@ -83,6 +84,11 @@ class gmshOptions { { GmshSetOption(category, name, value, index); } + void initOptions(){ + ReInitOptions(0); + InitOptionsGUI(0); + } + static void registerBindings(binding *b) { classBinding *cb = b->addClass<gmshOptions>("gmshOptions"); @@ -112,6 +118,11 @@ class gmshOptions { mb->setDescription("return the value of a string option. This is equivalent " "to category[index].name"); mb->setArgNames("category", "index", "name", NULL); + + mb = cb->addMethod("initOptions", &gmshOptions::initOptions); + mb->setDescription("Re-initialize option file"); + mb->setArgNames(NULL); + mb = cb->setConstructor<gmshOptions>(); mb->setDescription("an instance of gmshOptions is needed to access the database"); } diff --git a/Geo/GFaceCompound.cpp b/Geo/GFaceCompound.cpp index 865f019b25c5f38c4e99cdaed964b05a75737b72..7f91547ba47bf04e061a95135f4e59fee4de9b83 100644 --- a/Geo/GFaceCompound.cpp +++ b/Geo/GFaceCompound.cpp @@ -1461,7 +1461,7 @@ GPoint GFaceCompound::point(double par1, double par2) const //curved PN triangle //------------------------- - + printf("normals size=%d vertex=%d \n", _normals.size(), lt->tri->getVertex(0)->getNum()); const SVector3 n1 = _normals[lt->tri->getVertex(0)]; const SVector3 n2 = _normals[lt->tri->getVertex(1)]; const SVector3 n3 = _normals[lt->tri->getVertex(2)];