From 2347f3d6468921d61ffee8f5251424af5bd85604 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 3 Oct 2011 06:14:13 +0000
Subject: [PATCH] onelab work
---
Fltk/FlGui.cpp | 4 ++++
Fltk/onelabWindow.cpp | 17 ++++++++---------
Fltk/onelabWindow.h | 3 +++
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/Fltk/FlGui.cpp b/Fltk/FlGui.cpp
index 607205240d..e9502850d9 100644
--- a/Fltk/FlGui.cpp
+++ b/Fltk/FlGui.cpp
@@ -272,7 +272,9 @@ FlGui::FlGui(int argc, char **argv)
geoContext = new geometryContextWindow(CTX::instance()->deltaFontSize);
meshContext = new meshContextWindow(CTX::instance()->deltaFontSize);
about = new aboutWindow();
+#if defined(HAVE_FL_TREE)
onelab = new onelabWindow();
+#endif
for(int i = 0; i < NB_SOLVER_MAX; i++)
solver.push_back(new solverWindow(i, CTX::instance()->deltaFontSize));
@@ -650,10 +652,12 @@ int FlGui::testGlobalShortcuts(int event)
show = !show;
status = 2;
}
+#if defined(HAVE_FL_TREE)
else if(Fl::test_shortcut('@')) {
onelab_cb(0, (void*)"laucnhed_from_shortcut");
status = 1;
}
+#endif
else if(testArrowShortcuts()) {
status = 1;
}
diff --git a/Fltk/onelabWindow.cpp b/Fltk/onelabWindow.cpp
index 690bd11bb6..9f3e9370bd 100644
--- a/Fltk/onelabWindow.cpp
+++ b/Fltk/onelabWindow.cpp
@@ -4,6 +4,8 @@
// bugs and problems to <gmsh@geuz.org>.
#include "onelab.h"
+
+#if defined(HAVE_FL_TREE)
#include "GmshMessage.h"
#include "Context.h"
#include "OS.h"
@@ -102,8 +104,6 @@ bool onelab::localNetworkClient::run(const std::string &what)
break;
}
- double timer = GetTimeInSeconds();
-
std::string message(length, ' ');
if(!server->ReceiveMessage(length, &message[0])){
Msg::Error("Did not receive message body: stopping server");
@@ -226,10 +226,8 @@ onelabWindow::onelabWindow(int deltaFontSize)
_win = new paletteWindow
(width, height, CTX::instance()->nonModalWindows ? true : false, "ONELAB");
_win->box(GMSH_WINDOW_BOX);
- {
- _tree = new Fl_Tree(WB, WB, width - 2 * WB, height - 3 * WB - BH);
- }
-
+
+ _tree = new Fl_Tree(WB, WB, width - 2 * WB, height - 3 * WB - BH);
_run = new Fl_Button(width - WB - BB, height - WB - BH, BB, BH, "Compute");
_run->callback(onelab_compute_cb);
@@ -239,8 +237,8 @@ onelabWindow::onelabWindow(int deltaFontSize)
FL_NORMAL_SIZE += deltaFontSize;
- onelab::server::instance()->registerClient(new onelab::localNetworkClient
- ("getdp", "/Users/geuzaine/src/getdp/bin/getdp"));
+ onelab::server::instance()->registerClient
+ (new onelab::localNetworkClient("getdp", "/Users/geuzaine/src/getdp/bin/getdp"));
}
void number_cb(Fl_Widget *w, void *data)
@@ -252,7 +250,6 @@ void number_cb(Fl_Widget *w, void *data)
numbers[0].setValue(v->value());
onelab::server::instance()->set(numbers[0]);
}
- FlGui::instance()->onelab->redrawTree();
}
void onelabWindow::rebuildTree()
@@ -286,3 +283,5 @@ void onelabWindow::redrawTree()
{
_tree->redraw();
}
+
+#endif
diff --git a/Fltk/onelabWindow.h b/Fltk/onelabWindow.h
index 284c32c1c5..6c694cbb22 100644
--- a/Fltk/onelabWindow.h
+++ b/Fltk/onelabWindow.h
@@ -6,6 +6,8 @@
#ifndef _ONELAB_WINDOW_H_
#define _ONELAB_WINDOW_H_
+#include "GmshConfig.h"
+#if defined(HAVE_FL_TREE)
#include <vector>
#include <FL/Fl_Window.H>
#include <FL/Fl_Tree.H>
@@ -27,3 +29,4 @@ class onelabWindow{
void onelab_cb(Fl_Widget *w, void *data);
#endif
+#endif
--
GitLab