From 78cfcee5a2c197e84ce7eeb5a98f2daba64241d3 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 1 Nov 2002 19:00:29 +0000
Subject: [PATCH] Enhance transfinite line GUI
---
Fltk/Callbacks.cpp | 5 +++--
Fltk/GUI.cpp | 11 +++++++++--
Fltk/GUI.h | 1 +
Geo/Geo.cpp | 8 ++++----
Geo/Geo.h | 2 +-
5 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 1da39cf60f..614951dcc8 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.144 2002-10-12 19:41:13 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.145 2002-11-01 19:00:29 geuzaine Exp $
//
// Copyright (C) 1997 - 2002 C. Geuzaine, J.-F. Remacle
//
@@ -2551,7 +2551,8 @@ void con_mesh_define_length_cb(CALLBACK_ARGS){
void con_mesh_define_transfinite_line_cb(CALLBACK_ARGS){
strcpy(trsf_pts_text, WID->context_mesh_input[1]->value());
- strcpy(trsf_type_text, WID->context_mesh_input[2]->value());
+ strcpy(trsf_type_text, (!WID->context_mesh_choice[0]->value()) ? "Progression" : "Bump");
+ strcpy(trsf_typearg_text, WID->context_mesh_input[2]->value());
}
void con_mesh_define_transfinite_volume_cb(CALLBACK_ARGS){
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index f648116bc3..ee326e6d46 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.201 2002-10-12 19:41:13 geuzaine Exp $
+// $Id: GUI.cpp,v 1.202 2002-11-01 19:00:29 geuzaine Exp $
//
// Copyright (C) 1997 - 2002 C. Geuzaine, J.-F. Remacle
//
@@ -2885,10 +2885,17 @@ void GUI::create_mesh_context_window(int num){
{
g[1] = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Transfinite line");
context_mesh_input[1] = new Fl_Input (2*WB, 2*WB+1*BH, IW, BH, "Number of points");
- context_mesh_input[2] = new Fl_Input (2*WB, 2*WB+2*BH, IW, BH, "Distribution");
+ context_mesh_input[2] = new Fl_Input (2*WB, 2*WB+2*BH, IW, BH);
for(i=1 ; i<3 ; i++){
context_mesh_input[i]->align(FL_ALIGN_RIGHT);
}
+ static Fl_Menu_Item menu_trsf_mesh[] = {
+ {"Progression", 0, 0, 0},
+ {"Bump", 0, 0, 0},
+ {0}
+ };
+ context_mesh_choice[0] = new Fl_Choice (2*WB+IW, 2*WB+2*BH, IW, BH);
+ context_mesh_choice[0]->menu(menu_trsf_mesh);
{
Fl_Return_Button* o = new Fl_Return_Button(width-BB-2*WB, 2*WB+3*BH, BB, BH, "Set");
o->callback(con_mesh_define_transfinite_line_cb);
diff --git a/Fltk/GUI.h b/Fltk/GUI.h
index 47ac8d3e10..191e8031d7 100644
--- a/Fltk/GUI.h
+++ b/Fltk/GUI.h
@@ -218,6 +218,7 @@ public:
// mesh context window
Fl_Window *context_mesh_window ;
Fl_Input *context_mesh_input[20] ;
+ Fl_Choice *context_mesh_choice[5] ;
// solver windows
SolverDialogBox solver[5] ;
diff --git a/Geo/Geo.cpp b/Geo/Geo.cpp
index ae1be7bb78..3c89c48b17 100644
--- a/Geo/Geo.cpp
+++ b/Geo/Geo.cpp
@@ -1,4 +1,4 @@
-// $Id: Geo.cpp,v 1.28 2002-05-20 18:28:25 geuzaine Exp $
+// $Id: Geo.cpp,v 1.29 2002-11-01 19:00:29 geuzaine Exp $
//
// Copyright (C) 1997 - 2002 C. Geuzaine, J.-F. Remacle
//
@@ -43,7 +43,7 @@ char angle_text[100] = "3.14159/2" ;
char ax_text[100] = "0.0", ay_text[100] = "0.0", az_text[100] = "1.0";
char dx_text[100] = "0.0", dy_text[100] = "0.0", dz_text[100] = "0.0", df_text[100] = "1.0";
char sa_text[100] = "0.0", sb_text[100] = "0.0", sc_text[100] = "0.0", sd_text[100] = "0.0";
-char trsf_pts_text[100] = "2", trsf_type_text[100] = "Progression 1.";
+char trsf_pts_text[100] = "2", trsf_type_text[100] = "Progression", trsf_typearg_text[100] = "1.";
char trsf_vol_text[100] = "1";
char char_length_text[100] = "1.";
@@ -179,8 +179,8 @@ void add_trsfline (int N, int *l, char *fich){
else sprintf(text2,",%d",l[i]);
strcat(text,text2);
}
- if(strlen(trsf_type_text))
- sprintf(text2,"} = %s Using %s;", trsf_pts_text, trsf_type_text);
+ if(strlen(trsf_typearg_text))
+ sprintf(text2,"} = %s Using %s %s;", trsf_pts_text, trsf_type_text, trsf_typearg_text);
else
sprintf(text2,"} = %s;", trsf_pts_text);
strcat(text,text2);
diff --git a/Geo/Geo.h b/Geo/Geo.h
index eee0a9fa33..3b3e461f50 100644
--- a/Geo/Geo.h
+++ b/Geo/Geo.h
@@ -101,7 +101,7 @@ extern char ax_text[100], ay_text[100], az_text[100];
extern char dx_text[100], dy_text[100], dz_text[100], df_text[100];
extern char sa_text[100], sb_text[100], sc_text[100], sd_text[100];
extern char nb_pts[100], mode_value[100];
-extern char trsf_pts_text[100], trsf_type_text[100];
+extern char trsf_pts_text[100], trsf_type_text[100], trsf_typearg_text[100];
extern char trsf_vol_text[100];
extern char char_length_text[100];
--
GitLab