From cb11d65dff461956e246ad51c999f9f2b0e98d90 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 7 Sep 2009 05:36:39 +0000
Subject: [PATCH] small cleanup
---
Fltk/FlGui.cpp | 2 +-
Fltk/FlGui.h | 1 +
Fltk/solverWindow.cpp | 39 +++++++++------------------------------
3 files changed, 11 insertions(+), 31 deletions(-)
diff --git a/Fltk/FlGui.cpp b/Fltk/FlGui.cpp
index a4c39be1e9..70d25ad0aa 100644
--- a/Fltk/FlGui.cpp
+++ b/Fltk/FlGui.cpp
@@ -263,7 +263,7 @@ FlGui::FlGui(int argc, char **argv)
geoContext = new geometryContextWindow(CTX::instance()->deltaFontSize);
meshContext = new meshContextWindow(CTX::instance()->deltaFontSize);
about = new aboutWindow();
- for(int i = 0; i < 5; i++)
+ for(int i = 0; i < NB_SOLVER_MAX; i++)
solver.push_back(new solverWindow(i, CTX::instance()->deltaFontSize));
// init solver plugin stuff
diff --git a/Fltk/FlGui.h b/Fltk/FlGui.h
index b7f2bb69ff..5cd7469a4f 100644
--- a/Fltk/FlGui.h
+++ b/Fltk/FlGui.h
@@ -13,6 +13,7 @@
#define GMSH_WINDOW_BOX FL_FLAT_BOX
#define NB_BUTT_SCROLL 25
#define NB_HISTORY_MAX 1000
+#define NB_SOLVER_MAX 5
#define IW (10 * FL_NORMAL_SIZE) // input field width
#define BB (7 * FL_NORMAL_SIZE) // width of a button with internal label
#define BH (2 * FL_NORMAL_SIZE + 1) // button height
diff --git a/Fltk/solverWindow.cpp b/Fltk/solverWindow.cpp
index e8b322075e..6aa0270605 100644
--- a/Fltk/solverWindow.cpp
+++ b/Fltk/solverWindow.cpp
@@ -152,39 +152,18 @@ void GmshRemote::run(std::string args)
Msg::StatusBar(2, false, "%s %s", name.c_str(), message);
break;
case GmshSocket::GMSH_OPTION_1:
- if(initOption[0]){
- optionValue[0].clear();
- initOption[0] = false;
- }
- optionValue[0].push_back(message);
- break;
case GmshSocket::GMSH_OPTION_2:
- if(initOption[1]){
- optionValue[1].clear();
- initOption[1] = false;
- }
- optionValue[1].push_back(message);
- break;
case GmshSocket::GMSH_OPTION_3:
- if(initOption[2]){
- optionValue[2].clear();
- initOption[2] = false;
- }
- optionValue[2].push_back(message);
- break;
case GmshSocket::GMSH_OPTION_4:
- if(initOption[3]){
- optionValue[3].clear();
- initOption[3] = false;
- }
- optionValue[3].push_back(message);
- break;
case GmshSocket::GMSH_OPTION_5:
- if(initOption[4]){
- optionValue[4].clear();
- initOption[4] = false;
+ {
+ int i = (int)type - (int)GmshSocket::GMSH_OPTION_1;
+ if(initOption[i]){
+ optionValue[i].clear();
+ initOption[i] = false;
+ }
+ optionValue[i].push_back(message);
}
- optionValue[4].push_back(message);
break;
case GmshSocket::GMSH_MERGE_FILE:
if(mergeViews) {
@@ -240,7 +219,7 @@ void GmshRemote::run(std::string args)
if(this == it->second) break;
num++;
}
- if(num >= 0 && num < 5){
+ if(num >= 0 && num < NB_SOLVER_MAX){
for(unsigned int i = 0; i < optionName.size(); i++) {
if(optionName[i].empty()) break;
FlGui::instance()->solver[num]->choice[i]->clear();
@@ -478,7 +457,7 @@ solverWindow::solverWindow(int solverIndex, int deltaFontSize)
choice[i]->align(FL_ALIGN_RIGHT);
}
- static int arg[5][5][2];
+ static int arg[NB_SOLVER_MAX][5][2];
for(unsigned int i = 0; i < GmshRemote::get(solverIndex)->buttonName.size(); i++) {
if(GmshRemote::get(solverIndex)->buttonName[i].size()){
arg[solverIndex][i][0] = solverIndex;
--
GitLab