diff --git a/Common/GmshRemote.cpp b/Common/GmshRemote.cpp
index adb0b3b01013848868ed2bb9dd0cd9a57ec732bd..bbdf5a9d9f5fa18fdb7b7537aacd9096f00b113f 100644
--- a/Common/GmshRemote.cpp
+++ b/Common/GmshRemote.cpp
@@ -70,13 +70,18 @@ void GmshRemote::runCommand(int commandIndex, int optionIndex, int optionChoice)
return;
}
- if(optionChoice < 0 || optionChoice >= (int)optionValue[optionIndex].size()){
- Msg::Error("Wrong option choice");
- return;
+ std::string commandArg;
+ if(optionValue[optionIndex].size()){
+ if(optionChoice < 0 || optionChoice >= (int)optionValue[optionIndex].size()){
+ Msg::Error("Wrong option choice");
+ return;
+ }
+ commandArg = ReplacePercentS
+ (buttonSwitch[commandIndex], optionValue[optionIndex][optionChoice]);
+ }
+ else{ // no options
+ commandArg = buttonSwitch[commandIndex];
}
-
- std::string commandArg = ReplacePercentS
- (buttonSwitch[commandIndex], optionValue[optionIndex][optionChoice]);
run(inputArg + " " + meshArg + " " + commandArg);
}
diff --git a/Fltk/solverWindow.cpp b/Fltk/solverWindow.cpp
index d7e49f4999634864fac8180a3977d0b6153fea16..2b4733b3f61b22158ae5aaf2c6aeceace120d1e0 100644
--- a/Fltk/solverWindow.cpp
+++ b/Fltk/solverWindow.cpp
@@ -91,22 +91,22 @@ void GmshRemote::run(std::string args)
return;
}
- // find solver num
- int num = -1;
+ // find associated solver window if there is one
+ solverWindow *window = 0;
for(std::map<int, GmshRemote*>::iterator it = _all.begin();
it != _all.end(); it++){
if(this == it->second){
- num = it->first;
- break;
+ if(it->first >= 0 && it->first < NB_SOLVER_MAX){
+ window = FlGui::instance()->solver[it->first];
+ break;
+ }
}
}
// make command buttons inactive while running
- if(num >= 0 && num < NB_SOLVER_MAX){
- for(unsigned int i = 0; i < buttonName.size(); i++)
- if(buttonName[i].size())
- FlGui::instance()->solver[num]->command[i]->deactivate();
- }
+ if(window)
+ for(unsigned int i = 0; i < window->command.size(); i++)
+ window->command[i]->deactivate();
_pid = 0;
_server = 0;
@@ -136,11 +136,9 @@ void GmshRemote::run(std::string args)
server->Shutdown();
delete server;
// reactivate buttons
- if(num >= 0 && num < NB_SOLVER_MAX){
- for(unsigned int i = 0; i < buttonName.size(); i++)
- if(buttonName[i].size())
- FlGui::instance()->solver[num]->command[i]->activate();
- }
+ if(window)
+ for(unsigned int i = 0; i < window->command.size(); i++)
+ window->command[i]->activate();
return;
}
@@ -237,22 +235,24 @@ void GmshRemote::run(std::string args)
}
}
- if(num >= 0 && num < NB_SOLVER_MAX){
+ if(window){
// some options have been changed: refill the menus
- if(!initOption[0] || !initOption[1] || !initOption[2] || !initOption[3] ||
- !initOption[4]){
- for(unsigned int i = 0; i < optionName.size(); i++) {
- if(optionName[i].empty()) break;
- FlGui::instance()->solver[num]->choice[i]->clear();
+ if(!initOption[0] || !initOption[1] || !initOption[2] ||
+ !initOption[3] || !initOption[4]){
+ for(unsigned int i = 0; i < window->choice.size(); i++) {
+ int old = window->choice[i]->value();
+ window->choice[i]->clear();
for(unsigned int j = 0; j < optionValue[i].size(); j++)
- FlGui::instance()->solver[num]->choice[i]->add(optionValue[i][j].c_str());
- FlGui::instance()->solver[num]->choice[i]->value(0);
+ window->choice[i]->add(optionValue[i][j].c_str());
+ if(old >= 0 && old < window->choice[i]->size())
+ window->choice[i]->value(old);
+ else
+ window->choice[i]->value(0);
}
}
// reactivate buttons
- for(unsigned int i = 0; i < buttonName.size(); i++)
- if(buttonName[i].size())
- FlGui::instance()->solver[num]->command[i]->activate();
+ for(unsigned int i = 0; i < window->command.size(); i++)
+ window->command[i]->activate();
}
_server = 0;
@@ -399,7 +399,9 @@ static void solver_command_cb(Fl_Widget *w, void *data)
for(int i = 0; i < idx; i++)
optionIndex += numPercentS(GmshRemote::get(num)->buttonSwitch[i]);
- int optionChoice = FlGui::instance()->solver[num]->choice[optionIndex]->value();
+ int optionChoice = 0;
+ if(optionIndex >= 0 && optionIndex < FlGui::instance()->solver[num]->choice.size())
+ optionChoice = FlGui::instance()->solver[num]->choice[optionIndex]->value();
GmshRemote::get(num)->runCommand(idx, optionIndex, optionChoice);
}
@@ -476,22 +478,24 @@ solverWindow::solverWindow(int num, int deltaFontSize)
}
for(int i = 0; i < numOptions; i++) {
- choice[i] = new Fl_Choice
+ Fl_Choice *c = new Fl_Choice
(2 * WB, 2 * WB + (4 + i) * BH, LL, BH,
GmshRemote::get(num)->optionName[i].c_str());
- choice[i]->align(FL_ALIGN_RIGHT);
+ c->align(FL_ALIGN_RIGHT);
+ choice.push_back(c);
}
static int arg[NB_SOLVER_MAX][5][2];
- for(unsigned int i = 0; i < GmshRemote::get(num)->buttonName.size(); i++) {
- if(GmshRemote::get(num)->buttonName[i].size()){
- arg[num][i][0] = num;
- arg[num][i][1] = i;
- command[i] = new Fl_Button
- ((2 + i) * WB + i * BBS, 3 * WB + (4 + numOptions) * BH,
- BBS, BH, GmshRemote::get(num)->buttonName[i].c_str());
- command[i]->callback(solver_command_cb, (void *)arg[num][i]);
- }
+ command.resize(GmshRemote::get(num)->buttonName.size());
+ for(unsigned int i = 0; i < command.size(); i++) {
+ arg[num][i][0] = num;
+ arg[num][i][1] = i;
+ command[i] = new Fl_Button
+ ((2 + i) * WB + i * BBS, 3 * WB + (4 + numOptions) * BH,
+ BBS, BH, GmshRemote::get(num)->buttonName[i].c_str());
+ command[i]->callback(solver_command_cb, (void *)arg[num][i]);
+ if(GmshRemote::get(num)->buttonName[i].empty())
+ command[i]->hide();
}
{
diff --git a/Fltk/solverWindow.h b/Fltk/solverWindow.h
index d69c7bb4db294642b1fc44fda9a481d24ac8d4e7..38a0d444bfe132bda19c5fc20cc4ca89c5b2d784 100644
--- a/Fltk/solverWindow.h
+++ b/Fltk/solverWindow.h
@@ -6,6 +6,7 @@
#ifndef _SOLVER_WINDOW_H_
#define _SOLVER_WINDOW_H_
+#include <vector>
#include <FL/Fl_Window.H>
#include <FL/Fl_Input.H>
#include <FL/Fl_Choice.H>
@@ -15,10 +16,10 @@
class solverWindow{
public:
Fl_Window *win;
- Fl_Input *input[50];
- Fl_Choice *choice[10];
+ Fl_Input *input[5];
Fl_Menu_Button *menu;
- Fl_Button *command[10];
+ std::vector<Fl_Choice*> choice;
+ std::vector<Fl_Button*> command;
public:
solverWindow(int solverIndex, int deltaFontSize=0);
};
diff --git a/Post/PViewDataGModelIO.cpp b/Post/PViewDataGModelIO.cpp
index 92e5a926e3f3258f4a3f7944d10de7e64ae505ca..6979d617c9e18e450c589afcde5a04f170902f8e 100644
--- a/Post/PViewDataGModelIO.cpp
+++ b/Post/PViewDataGModelIO.cpp
@@ -174,6 +174,9 @@ bool PViewDataGModel::writeMSH(std::string fileName, bool binary)
int mult = 1;
if(_type == ElementNodeData)
mult = e->getNumVertices();
+ // Warning: this will not work if the mesh we just saved
+ // above changed the renumbering of the elements (which is
+ // usually the case)...
int num = e->getNum();
if(binary){
fwrite(&num, sizeof(int), 1, fp);