From e5c3090e02c47c2fb7552f55aaf71e1458b1a3ff Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 17 Oct 2011 14:36:42 +0000
Subject: [PATCH] onelab
---
Fltk/FlGui.cpp | 2 +-
Fltk/menuWindow.cpp | 2 +-
Fltk/onelabWindow.cpp | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Fltk/FlGui.cpp b/Fltk/FlGui.cpp
index b6ea2aa985..2bb959e743 100644
--- a/Fltk/FlGui.cpp
+++ b/Fltk/FlGui.cpp
@@ -654,7 +654,7 @@ int FlGui::testGlobalShortcuts(int event)
}
#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
else if(Fl::test_shortcut('@')) {
- onelab_cb(0, (void*)"check");
+ onelab_cb(0, (void*)"initial check");
status = 1;
}
#endif
diff --git a/Fltk/menuWindow.cpp b/Fltk/menuWindow.cpp
index 02491b0ee4..b066e75d1e 100644
--- a/Fltk/menuWindow.cpp
+++ b/Fltk/menuWindow.cpp
@@ -1598,7 +1598,7 @@ void mesh_save_cb(Fl_Widget *w, void *data)
bool force_overwrite = false;
if(data){
std::string str((const char*)data);
- if(str == "force_overwrite") force_overwrite = true;
+ if(str == "force overwrite") force_overwrite = true;
}
std::string name = CTX::instance()->outputFileName;
diff --git a/Fltk/onelabWindow.cpp b/Fltk/onelabWindow.cpp
index b4ca70bc35..58ae8ba2db 100644
--- a/Fltk/onelabWindow.cpp
+++ b/Fltk/onelabWindow.cpp
@@ -253,7 +253,7 @@ void onelab_cb(Fl_Widget *w, void *data)
else if(action == "compute"){
geometry_reload_cb(0, 0);
mesh_3d_cb(0, 0);
- mesh_save_cb(0, (void*)"force_overwrite");
+ mesh_save_cb(0, (void*)"force overwrite");
onelab::server::instance()->setChanged(false, "Gmsh");
}
}
@@ -265,7 +265,7 @@ void onelab_cb(Fl_Widget *w, void *data)
onelab::client *c = it->second;
if(c->getName() == "Gmsh") continue;
std::string what = FlGui::instance()->onelab->getModelName();
- if(action == "check"){
+ if(action == "initial check" || action == "check"){
c->run(what);
}
else if(action == "compute"){
--
GitLab