From 58b3982700f21289fc9408259db5c36ea97bf0f3 Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Thu, 16 Aug 2012 10:15:01 +0000 Subject: [PATCH] pp --- Fltk/onelabWindow.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Fltk/onelabWindow.cpp b/Fltk/onelabWindow.cpp index 36dbc47afc..29963cb6f7 100644 --- a/Fltk/onelabWindow.cpp +++ b/Fltk/onelabWindow.cpp @@ -345,7 +345,7 @@ bool onelab::localNetworkClient::kill() return false; } -static void initializeLoop() +static void initializeLoops() { onelabUtils::initializeLoop("1"); onelabUtils::initializeLoop("2"); @@ -355,7 +355,7 @@ static void initializeLoop() FlGui::instance()->onelab->rebuildTree(); } -static bool incrementLoop() +static bool incrementLoops() { bool ret = false; if(onelabUtils::incrementLoop("3")) ret = true; @@ -453,7 +453,7 @@ void onelab_cb(Fl_Widget *w, void *data) FlGui::instance()->onelab->setButtonMode("", "stop"); - if(action == "compute") initializeLoop(); + if(action == "compute") initializeLoops(); do{ // enter loop @@ -490,10 +490,8 @@ void onelab_cb(Fl_Widget *w, void *data) if(FlGui::instance()->onelab->stop()) break; } - // update geometry in Gmsh window which might have been changed by the - // metamodel - if(metamodel) - geometry_reload_cb(0, 0); + // update geometry which might have been changed by the metamodel + if(metamodel) geometry_reload_cb(0, 0); if(action != "initialize"){ updateGraphs(); @@ -501,7 +499,7 @@ void onelab_cb(Fl_Widget *w, void *data) } } while(action == "compute" && !FlGui::instance()->onelab->stop() && - incrementLoop()); + incrementLoops()); FlGui::instance()->onelab->stop(false); FlGui::instance()->onelab->setButtonMode("check", "compute"); -- GitLab