diff --git a/CMakeLists.txt b/CMakeLists.txt index 09742f650a57fdf20fc80f6e7a6bf4349eb79aa8..458df0e5a07537706b7e75f9d0c6ff9f4e941cd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ option(ENABLE_TETGEN_NEW "Enable experimental version of Tetgen" OFF) set(GMSH_MAJOR_VERSION 2) set(GMSH_MINOR_VERSION 4) -set(GMSH_PATCH_VERSION 2) +set(GMSH_PATCH_VERSION 3) set(GMSH_EXTRA_VERSION "" CACHE STRING "Gmsh extra version string") set(GMSH_VERSION "${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}") diff --git a/Fltk/menuWindow.cpp b/Fltk/menuWindow.cpp index 74df90df47f60ab85ba58b2cb176a0357e7d38b5..530489d0c3d4090c45efc10238ccde1c9bcfb19e 100644 --- a/Fltk/menuWindow.cpp +++ b/Fltk/menuWindow.cpp @@ -2199,7 +2199,7 @@ static void view_applybgmesh_cb(Fl_Widget *w, void *data) } } -//#define TEST_SERVER +#define TEST_SERVER // The static menus (we cannot use the 'g', 'm' 's' and 'p' mnemonics // since they are already defined as global shortcuts) diff --git a/Fltk/solverWindow.cpp b/Fltk/solverWindow.cpp index bacc4e380a862494e896072ae25b6976387adf31..d7e49f4999634864fac8180a3977d0b6153fea16 100644 --- a/Fltk/solverWindow.cpp +++ b/Fltk/solverWindow.cpp @@ -91,12 +91,14 @@ void GmshRemote::run(std::string args) return; } - // find solver index - int num = 0; + // find solver num + int num = -1; for(std::map<int, GmshRemote*>::iterator it = _all.begin(); it != _all.end(); it++){ - if(this == it->second) break; - num++; + if(this == it->second){ + num = it->first; + break; + } } // make command buttons inactive while running diff --git a/doc/VERSIONS.txt b/doc/VERSIONS.txt index 09e657e87bb31777127e1109a05c59d8ee5bbb48..e36e19c68b6333dde3a910c16c8e8a550cac23b5 100644 --- a/doc/VERSIONS.txt +++ b/doc/VERSIONS.txt @@ -1,6 +1,9 @@ -$Id: VERSIONS.txt,v 1.61 2009-09-21 17:38:55 geuzaine Exp $ +$Id: VERSIONS.txt,v 1.62 2009-09-22 06:28:09 geuzaine Exp $ -2.4.2 (Sep 21, 2009): solver code refactoring. +2.4.3 (?): + +2.4.2 (Sep 21, 2009): solver code refactoring + better IDE +integration. 2.4.1 (Sep 1, 2009): fixed surface mesh orientation bug introduced in 2.4.0; mesh and graphics code refactoring, small usability