From 1cdb9e1c1ee05deb5196c50649bdc2fd14db5d1e Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 3 Oct 2011 14:55:55 +0000
Subject: [PATCH] onelab work
---
Fltk/onelabWindow.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Fltk/onelabWindow.cpp b/Fltk/onelabWindow.cpp
index a9dd15d2a6..b15c2d10ab 100644
--- a/Fltk/onelabWindow.cpp
+++ b/Fltk/onelabWindow.cpp
@@ -222,6 +222,10 @@ void onelab_cb(Fl_Widget *w, void *data)
FlGui::instance()->onelab->setModelName(fileChooserGetName(1));
action = "check";
}
+ if(FlGui::instance()->onelab->getModelName().empty()){
+ std::vector<std::string> split = SplitFileName(GModel::current()->getFileName());
+ FlGui::instance()->onelab->setModelName(split[0] + split[1] + ".pro");
+ }
for(onelab::server::citer it = onelab::server::instance()->firstClient();
it != onelab::server::instance()->lastClient(); it++){
@@ -286,8 +290,6 @@ onelabWindow::onelabWindow(int deltaFontSize)
_model->align(FL_ALIGN_RIGHT);
_model->callback(onelab_cb, (void*)"check");
_model->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);
- std::vector<std::string> split = SplitFileName(GModel::current()->getFileName());
- _model->value((split[0]+split[1]+".pro").c_str());
Fl_Button *choose = new Fl_Button(width - WB - (2*BB)/3, WB, (2*BB)/3, BH, "Choose");
choose->callback(onelab_cb, (void*)"choose model");
--
GitLab