From bc750a43d84a6343eb4b76519494c82de125c13c Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 18 May 2013 19:39:33 +0000
Subject: [PATCH] simpler
---
Common/OpenFile.cpp | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/Common/OpenFile.cpp b/Common/OpenFile.cpp
index cfe2fd0f22..a5d23aff70 100644
--- a/Common/OpenFile.cpp
+++ b/Common/OpenFile.cpp
@@ -420,22 +420,17 @@ int MergeFile(const std::string &fileName, bool warnIfMissing)
CTX::instance()->launchSolverAtStartup = num;
return 1;
}
-#endif
-#if defined(HAVE_ONELAB_METAMODEL) && defined(HAVE_FLTK)
- else if(ext == ".ol"){
- // FIXME: this is a hack -- think about a better way
- status = metamodel_cb(fileName);
- }
else if(ext == ".py"){
- FlGui::instance()->onelab->addSolver("python", fileName, "", 1);
- //onelab_cb(0, (void*)"check");
- status = 1;
- /* tester ceci:*/
int num = defineSolver("python");
opt_solver_executable(num, GMSH_SET, fileName);
CTX::instance()->launchSolverAtStartup = num;
return 1;
- /**/
+ }
+#endif
+#if defined(HAVE_ONELAB_METAMODEL) && defined(HAVE_FLTK)
+ else if(ext == ".ol"){
+ // FIXME: this is a hack -- think about a better way
+ status = metamodel_cb(fileName);
}
#endif
else {
--
GitLab