Skip to content
Snippets Groups Projects
Commit 44ef70fe authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

speed up initialize

parent 12612c94
No related branches found
No related tags found
No related merge requests found
...@@ -659,15 +659,17 @@ void onelab_cb(Fl_Widget *w, void *data) ...@@ -659,15 +659,17 @@ void onelab_cb(Fl_Widget *w, void *data)
if(FlGui::instance()->onelab->stop()) break; if(FlGui::instance()->onelab->stop()) break;
} }
updateOnelabGraphs(); if(action != "initialize"){
FlGui::instance()->onelab->rebuildTree(); updateOnelabGraphs();
FlGui::instance()->onelab->rebuildTree();
}
} while(action == "compute" && !FlGui::instance()->onelab->stop() && } while(action == "compute" && !FlGui::instance()->onelab->stop() &&
incrementLoop()); incrementLoop());
FlGui::instance()->onelab->stop(false); FlGui::instance()->onelab->stop(false);
FlGui::instance()->onelab->setButtonMode("compute"); FlGui::instance()->onelab->setButtonMode("compute");
FlGui::instance()->onelab->show(); if(action != "initialize") FlGui::instance()->onelab->show();
} }
static void onelab_check_button_cb(Fl_Widget *w, void *data) static void onelab_check_button_cb(Fl_Widget *w, void *data)
...@@ -832,6 +834,7 @@ void onelabWindow::rebuildTree() ...@@ -832,6 +834,7 @@ void onelabWindow::rebuildTree()
std::vector<onelab::number> numbers; std::vector<onelab::number> numbers;
onelab::server::instance()->get(numbers); onelab::server::instance()->get(numbers);
for(unsigned int i = 0; i < numbers.size(); i++){ for(unsigned int i = 0; i < numbers.size(); i++){
if(!numbers[i].getVisible()) continue;
Fl_Tree_Item *n = _tree->add(numbers[i].getName().c_str()); Fl_Tree_Item *n = _tree->add(numbers[i].getName().c_str());
n->labelsize(FL_NORMAL_SIZE + 5); n->labelsize(FL_NORMAL_SIZE + 5);
std::string label = numbers[i].getShortName(); std::string label = numbers[i].getShortName();
...@@ -868,6 +871,7 @@ void onelabWindow::rebuildTree() ...@@ -868,6 +871,7 @@ void onelabWindow::rebuildTree()
std::vector<onelab::string> strings; std::vector<onelab::string> strings;
onelab::server::instance()->get(strings); onelab::server::instance()->get(strings);
for(unsigned int i = 0; i < strings.size(); i++){ for(unsigned int i = 0; i < strings.size(); i++){
if(!strings[i].getVisible()) continue;
Fl_Tree_Item *n = _tree->add(strings[i].getName().c_str()); Fl_Tree_Item *n = _tree->add(strings[i].getName().c_str());
n->labelsize(FL_NORMAL_SIZE + 5); n->labelsize(FL_NORMAL_SIZE + 5);
std::string label = strings[i].getShortName(); std::string label = strings[i].getShortName();
...@@ -1065,6 +1069,7 @@ bool onelab::localNetworkClient::kill() ...@@ -1065,6 +1069,7 @@ bool onelab::localNetworkClient::kill()
Msg::Error("The solver interface requires OneLab and FLTK 1.3"); Msg::Error("The solver interface requires OneLab and FLTK 1.3");
return false; return false;
} }
#endif #endif
void solver_cb(Fl_Widget *w, void *data) void solver_cb(Fl_Widget *w, void *data)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment