From 4e3c039117d058b053d271f080059a4723d6fda8 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 25 Nov 2012 09:48:44 +0000
Subject: [PATCH] tweaks
---
Common/OpenFile.cpp | 2 ++
Fltk/onelabGroup.cpp | 7 ++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Common/OpenFile.cpp b/Common/OpenFile.cpp
index 1ea67bf527..5f773190d6 100644
--- a/Common/OpenFile.cpp
+++ b/Common/OpenFile.cpp
@@ -547,6 +547,7 @@ int MergePostProcessingFile(const std::string &fileName, bool showLastStep,
void ClearProject()
{
+ Msg::Info("Clearing all models and views...");
#if defined(HAVE_POST)
for(int i = PView::list.size() - 1; i >= 0; i--)
delete PView::list[i];
@@ -563,6 +564,7 @@ void ClearProject()
fclose(openedFiles[i]);
openedFiles.clear();
}
+ Msg::Info("Done clearing all models and views");
new GModel();
GModel::current()->setFileName(CTX::instance()->defaultFileName);
diff --git a/Fltk/onelabGroup.cpp b/Fltk/onelabGroup.cpp
index add0c8fcdb..58d2406bf4 100644
--- a/Fltk/onelabGroup.cpp
+++ b/Fltk/onelabGroup.cpp
@@ -74,11 +74,11 @@ class onelabGmshServer : public GmshServer{
// if asked, refresh the onelab GUI
std::vector<onelab::string> ps;
onelab::server::instance()->get(ps, "Gmsh/Action");
- if(FlGui::available() && ps.size() && ps[0].getValue() == "refresh"){
+ if(ps.size() && ps[0].getValue() == "refresh"){
ps[0].setVisible(false);
ps[0].setValue("");
onelab::server::instance()->set(ps[0]);
- onelab_cb(0, (void*)"refresh");
+ if(FlGui::available()) onelab_cb(0, (void*)"refresh");
}
// wait at most waitint seconds and respond to FLTK events
if(FlGui::available()) FlGui::instance()->wait(waitint);
@@ -1588,7 +1588,7 @@ void solver_batch_cb(Fl_Widget *w, void *data)
onelab::string o(c->getName() + "/Action");
// initialize
- onelabUtils::runGmshClient("initalize", CTX::instance()->solver.autoMesh);
+ onelabUtils::runGmshClient("initialize", CTX::instance()->solver.autoMesh);
o.setValue("initialize");
onelab::server::instance()->set(o);
c->run();
@@ -1601,6 +1601,7 @@ void solver_batch_cb(Fl_Widget *w, void *data)
// check
onelabUtils::runGmshClient("check", CTX::instance()->solver.autoMesh);
+ onelabUtils::guessModelName(c);
o.setValue("check");
onelab::server::instance()->set(o);
c->run();
--
GitLab