diff --git a/Common/Options.cpp b/Common/Options.cpp
index a83c107343312f97dd266b731b06e40435b193cb..8221434d24881301b6bc629d557d7e3812092d27 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.16 2001-05-04 20:16:37 geuzaine Exp $
+// $Id: Options.cpp,v 1.17 2001-05-04 22:42:21 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -461,7 +461,7 @@ char * opt_solver_getdp_command(OPT_ARGS_STR){
if(action & GMSH_SET) strcpy(GetDP_Info.command, val);
#ifdef _FLTK
if(WID && (action & GMSH_GUI))
- WID->getdp_input[0]->value(GetDP_Info.command);
+ WID->getdp_input[2]->value(GetDP_Info.command);
#endif
return GetDP_Info.command;
}
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index d074bb21962429444d1403571ab76839936595ea..944ebbe3a67156dca901bd453c8ed845574f12ee 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,5 +1,7 @@
-// $Id: Callbacks.cpp,v 1.50 2001-05-04 20:16:37 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.51 2001-05-04 22:42:21 geuzaine Exp $
+#include <sys/types.h>
+#include <signal.h>
#include <map>
#include "Gmsh.h"
#include "GmshUI.h"
@@ -1306,46 +1308,47 @@ void mesh_define_transfinite_volume_cb(CALLBACK_ARGS){
#include "Solvers.h"
void getdp_cb(CALLBACK_ARGS){
+ char file[256];
static int first=1;
if(first){
first = 0;
- strcpy(GetDP_Info.file,CTX.basefilename);
- strcat(GetDP_Info.file,".pro");
- strcpy(GetDP_Info.mesh,"");
+ strcpy(file,CTX.basefilename);
+ strcat(file,".pro");
+ WID->getdp_input[0]->value(file);
}
- WID->getdp_value[0]->value(GetDP_Info.file);
- GetDP(GetDP_Info.file);
+ GetDP((char*)WID->getdp_input[0]->value());
WID->create_getdp_window();
}
void getdp_file_open_cb(CALLBACK_ARGS){
char *newfile;
newfile = fl_file_chooser("Open Problem Definition File", "*", NULL);
- if (newfile != NULL) strcpy(GetDP_Info.file,newfile);
- WID->getdp_value[0]->value(GetDP_Info.file);
- GetDP(GetDP_Info.file);
+ if (newfile != NULL){
+ WID->getdp_input[0]->value(newfile);
+ GetDP(newfile);
+ }
}
void getdp_file_edit_cb(CALLBACK_ARGS){
char cmd[1000];
- sprintf(cmd, CTX.editor, GetDP_Info.file);
+ sprintf(cmd, CTX.editor, WID->getdp_input[0]->value());
Msg(INFO, "Starting text editor '%s'", cmd);
system(cmd);
}
void getdp_choose_mesh_cb(CALLBACK_ARGS){
char *newfile;
newfile = fl_file_chooser("Open Mesh File", "*", NULL);
- if (newfile != NULL) strcpy(GetDP_Info.mesh,newfile);
- WID->getdp_value[1]->value(GetDP_Info.mesh);
+ if (newfile != NULL) WID->getdp_input[1]->value(newfile);
}
void getdp_pre_cb(CALLBACK_ARGS){
char arg[256];
if(GetDP_Info.popupmessages) WID->create_message_window();
- if(strlen(GetDP_Info.mesh))
+ if(strlen(WID->getdp_input[1]->value()))
sprintf(arg, "%s -msh %s -pre %s",
- GetDP_Info.file, GetDP_Info.mesh,
+ WID->getdp_input[0]->value(),
+ WID->getdp_input[1]->value(),
GetDP_Info.res[WID->getdp_choice[0]->value()]);
else
sprintf(arg, "%s -pre %s",
- GetDP_Info.file,
+ WID->getdp_input[0]->value(),
GetDP_Info.res[WID->getdp_choice[0]->value()]);
GetDP(arg);
@@ -1353,35 +1356,42 @@ void getdp_pre_cb(CALLBACK_ARGS){
void getdp_cal_cb(CALLBACK_ARGS){
char arg[256];
if(GetDP_Info.popupmessages) WID->create_message_window();
- if(strlen(GetDP_Info.mesh))
- sprintf(arg, "%s -msh %s -cal", GetDP_Info.file, GetDP_Info.mesh);
+ if(strlen(WID->getdp_input[1]->value()))
+ sprintf(arg, "%s -msh %s -cal",
+ WID->getdp_input[0]->value(),
+ WID->getdp_input[1]->value());
else
- sprintf(arg, "%s -cal", GetDP_Info.file);
+ sprintf(arg, "%s -cal", WID->getdp_input[0]->value());
GetDP(arg);
}
void getdp_post_cb(CALLBACK_ARGS){
char arg[256];
if(GetDP_Info.popupmessages) WID->create_message_window();
- if(strlen(GetDP_Info.mesh))
+ if(strlen(WID->getdp_input[1]->value()))
sprintf(arg, "%s -msh %s -bin -pos %s",
- GetDP_Info.file, GetDP_Info.mesh,
+ WID->getdp_input[0]->value(),
+ WID->getdp_input[1]->value(),
GetDP_Info.postop[WID->getdp_choice[1]->value()]);
else
sprintf(arg, "%s -bin -pos %s",
- GetDP_Info.file,
+ WID->getdp_input[0]->value(),
GetDP_Info.postop[WID->getdp_choice[1]->value()]);
GetDP(arg);
}
+void getdp_kill_cb(CALLBACK_ARGS){
+ if(GetDP_Info.pid > 0) kill(GetDP_Info.pid, 9);
+ GetDP_Info.pid = -1;
+}
void getdp_choose_command_cb(CALLBACK_ARGS){
char *newfile;
newfile = fl_file_chooser("Choose executable", "*", NULL);
- if (newfile != NULL) WID->getdp_input[0]->value(newfile);
+ if (newfile != NULL) WID->getdp_input[2]->value(newfile);
}
void getdp_ok_cb(CALLBACK_ARGS){
opt_solver_getdp_popupmessages(0, GMSH_SET, WID->getdp_butt[0]->value());
opt_solver_getdp_mergeviews(0, GMSH_SET, WID->getdp_butt[1]->value());
- opt_solver_getdp_command(0, GMSH_SET, (char*)WID->getdp_input[0]->value());
+ opt_solver_getdp_command(0, GMSH_SET, (char*)WID->getdp_input[2]->value());
}
diff --git a/Fltk/Callbacks.h b/Fltk/Callbacks.h
index bdf822681e297f74f01894662e7a564944c77ddc..2b96b7e11a3d6dd18970d25673675271e5802769 100644
--- a/Fltk/Callbacks.h
+++ b/Fltk/Callbacks.h
@@ -190,6 +190,7 @@ void getdp_choose_mesh_cb(CALLBACK_ARGS);
void getdp_pre_cb(CALLBACK_ARGS);
void getdp_cal_cb(CALLBACK_ARGS);
void getdp_post_cb(CALLBACK_ARGS);
+void getdp_kill_cb(CALLBACK_ARGS);
void getdp_choose_command_cb(CALLBACK_ARGS);
void getdp_ok_cb(CALLBACK_ARGS);
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 91d9491c8567e1d9145bf2de12a86a7a23cc1ed6..8ad9f018cf4dc209bad9e25b77a02f84673643f0 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.68 2001-05-04 20:16:37 geuzaine Exp $
+// $Id: GUI.cpp,v 1.69 2001-05-04 22:42:21 geuzaine Exp $
// To make the interface as visually consistent as possible, please:
// - use the BH, BW, WB, IW values for button heights/widths, window borders, etc.
@@ -2348,19 +2348,19 @@ void GUI::create_getdp_window(){
if(!init_getdp_window){
init_getdp_window = 1 ;
- int width = 24*CTX.fontsize;
- int height = 5*WB+9*BH + WB;
+ int width = 5*BB+6*WB;
+ int height = 10*WB+ 8*BH ;
getdp_window = new Fl_Window(width,height);
getdp_window->box(WINDOW_BOX);
getdp_window->label("GetDP Solver");
{
- Fl_Tabs* o = new Fl_Tabs(WB, WB, width-2*WB, height-3*WB-BH);
+ Fl_Tabs* o = new Fl_Tabs(WB, WB, width-2*WB, height-3*WB-1*BH);
{
g[0] = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "General");
g[0]->labelsize(CTX.fontsize);
- getdp_value[0] = new Fl_Output(2*WB, 2*WB+1*BH, BW, BH, "Problem");
+ getdp_input[0] = new Fl_Input(2*WB, 2*WB+1*BH, BW, BH, "Problem");
Fl_Button *b1 = new Fl_Button(2*WB, 3*WB+2*BH, BB, BH, "Choose");
b1->callback(getdp_file_open_cb);
b1->labelsize(CTX.fontsize);
@@ -2371,17 +2371,15 @@ void GUI::create_getdp_window(){
getdp_choice[0] = new Fl_Choice(2*WB, 4*WB+3*BH, BW, BH,"Resolution");
getdp_choice[1] = new Fl_Choice(2*WB, 5*WB+4*BH, BW, BH,"PostOperation");
- getdp_value[1] = new Fl_Output(2*WB, 6*WB+5*BH, BW, BH, "Mesh");
+ getdp_input[1] = new Fl_Input(2*WB, 6*WB+5*BH, BW, BH, "Mesh");
Fl_Button *b3 = new Fl_Button(2*WB, 7*WB+6*BH, BB, BH, "Choose");
b3->callback(getdp_choose_mesh_cb);
b3->labelsize(CTX.fontsize);
for(i=0 ; i<2 ; i++){
- getdp_value[i]->labelsize(CTX.fontsize);
- getdp_value[i]->textsize(CTX.fontsize);
- getdp_value[i]->type(FL_HORIZONTAL);
- getdp_value[i]->align(FL_ALIGN_RIGHT);
- getdp_value[i]->value(0);
+ getdp_input[i]->labelsize(CTX.fontsize);
+ getdp_input[i]->textsize(CTX.fontsize);
+ getdp_input[i]->align(FL_ALIGN_RIGHT);
}
for(i=0 ; i<2 ; i++){
getdp_choice[i]->textsize(CTX.fontsize);
@@ -2395,10 +2393,7 @@ void GUI::create_getdp_window(){
g[1] = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Options");
g[1]->labelsize(CTX.fontsize);
- getdp_input[0] = new Fl_Input(2*WB, 2*WB+1*BH, BW, BH, "Command");
- getdp_input[0]->labelsize(CTX.fontsize);
- getdp_input[0]->textsize(CTX.fontsize);
- getdp_input[0]->align(FL_ALIGN_RIGHT);
+ getdp_input[2] = new Fl_Input(2*WB, 2*WB+1*BH, BW, BH, "Command");
Fl_Button *b = new Fl_Button(2*WB, 3*WB+2*BH, BB, BH, "Choose");
b->callback(getdp_choose_command_cb);
b->labelsize(CTX.fontsize);
@@ -2407,6 +2402,10 @@ void GUI::create_getdp_window(){
"Automatic message display");
getdp_butt[1] = new Fl_Check_Button(2*WB, 4*WB+4*BH, BW, BH,
"Automatic view merge");
+
+ getdp_input[2]->labelsize(CTX.fontsize);
+ getdp_input[2]->textsize(CTX.fontsize);
+ getdp_input[2]->align(FL_ALIGN_RIGHT);
for(i=0 ; i<2 ; i++){
getdp_butt[i]->type(FL_TOGGLE_BUTTON);
getdp_butt[i]->down_box(FL_DOWN_BOX);
@@ -2420,24 +2419,30 @@ void GUI::create_getdp_window(){
g[0]->end();
}
+
o->end();
}
{
- Fl_Button* o = new Fl_Button(width-4*BB-4*WB, height-BH-WB, BB, BH, "Pre");
+ Fl_Button* o = new Fl_Button(width-5*BB-5*WB, height-BH-WB, BB, BH, "Pre");
o->labelsize(CTX.fontsize);
o->callback(getdp_pre_cb);
}
{
- Fl_Button* o = new Fl_Button(width-3*BB-3*WB, height-BH-WB, BB, BH, "Cal");
+ Fl_Button* o = new Fl_Button(width-4*BB-4*WB, height-BH-WB, BB, BH, "Cal");
o->labelsize(CTX.fontsize);
o->callback(getdp_cal_cb);
}
{
- Fl_Button* o = new Fl_Button(width-2*BB-2*WB, height-BH-WB, BB, BH, "Post");
+ Fl_Button* o = new Fl_Button(width-3*BB-3*WB, height-BH-WB, BB, BH, "Post");
o->labelsize(CTX.fontsize);
o->callback(getdp_post_cb);
}
+ {
+ Fl_Button* o = new Fl_Button(width-2*BB-2*WB, height-BH-WB, BB, BH, "Kill");
+ o->labelsize(CTX.fontsize);
+ o->callback(getdp_kill_cb);
+ }
{
Fl_Button* o = new Fl_Button(width-BB-WB, height-BH-WB, BB, BH, "Cancel");
o->labelsize(CTX.fontsize);
diff --git a/Fltk/GUI.h b/Fltk/GUI.h
index ae24396cb55390f4dde309769e8f4d7bf48b8b50..14a5a23aba528b663143e35855715b78eca88a23 100644
--- a/Fltk/GUI.h
+++ b/Fltk/GUI.h
@@ -172,7 +172,6 @@ public:
// solver windows
int init_getdp_window;
Fl_Window *getdp_window ;
- Fl_Output *getdp_value[50] ;
Fl_Input *getdp_input[50] ;
Fl_Choice *getdp_choice[10] ;
Fl_Check_Button *getdp_butt[10] ;
diff --git a/Fltk/Socket.cpp b/Fltk/Socket.cpp
index e37b672e88af24f549cfb2978dc4046d31c20aff..d7f35076459cf55793652ab55402bf94ac7c2992 100644
--- a/Fltk/Socket.cpp
+++ b/Fltk/Socket.cpp
@@ -1,4 +1,4 @@
-/* $Id: Socket.cpp,v 1.6 2001-05-04 20:16:37 geuzaine Exp $ */
+/* $Id: Socket.cpp,v 1.7 2001-05-04 22:42:21 geuzaine Exp $ */
#include <stdio.h>
#include <stdlib.h>
diff --git a/Fltk/Solvers.cpp b/Fltk/Solvers.cpp
index 22c86251c15b1630f485db1f8bb165a3b7e3e880..b594c76876d698f0ebbefe2f86c618f344e5fa22 100644
--- a/Fltk/Solvers.cpp
+++ b/Fltk/Solvers.cpp
@@ -1,4 +1,4 @@
-// $Id: Solvers.cpp,v 1.4 2001-05-04 13:54:03 geuzaine Exp $
+// $Id: Solvers.cpp,v 1.5 2001-05-04 22:42:21 geuzaine Exp $
#include "Gmsh.h"
@@ -43,7 +43,7 @@ extern GUI *WID;
_GetDP_Info GetDP_Info ;
int GetDP(char *args){
- int sock, type, i, n ;
+ int sock, type, i, n;
char progname[1000], sockname[1000], str[1000];
GET_PATH(sockname);
@@ -56,12 +56,16 @@ int GetDP(char *args){
return 0;
}
+ Socket_ReceiveInt(sock, &GetDP_Info.pid);
+
Msg(INFO, "GetDP start (%s)", progname);
GetDP_Info.nbres = 0;
GetDP_Info.nbpostop = 0;
while(1){
+ if(GetDP_Info.pid < 0) break;
+
Socket_ReceiveInt(sock, &type);
if(type == GETDP_END) break;
@@ -112,10 +116,12 @@ int GetDP(char *args){
WID->getdp_choice[1]->value(0);
}
- Msg(STATUS3N, "");
+ Msg(STATUS3N, "Ready");
Socket_StopProgram(progname, sockname, sock);
+ GetDP_Info.pid = -1;
+
Msg(INFO, "GetDP stop (%s)", progname);
return 1;
diff --git a/Fltk/Solvers.h b/Fltk/Solvers.h
index 9b7743dbc36e21861e61ebd7ccc4401576901118..9cfdc646e907ea5f18e9c59d67db88c167bba4e2 100644
--- a/Fltk/Solvers.h
+++ b/Fltk/Solvers.h
@@ -13,10 +13,10 @@
typedef struct{
char command[256];
int popupmessages, mergeviews;
+ int pid;
int nbres, nbpostop;
char res[100][100];
char postop[100][100];
- char file[256], mesh[256];
} _GetDP_Info ;
extern _GetDP_Info GetDP_Info ;