*** empty log message ***

Fltk/Callbacks.cpp

-// $Id: Callbacks.cpp,v 1.6 2001-01-09 15:45:03 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.7 2001-01-10 08:41:04 geuzaine Exp $
 
 #include "Gmsh.h"
 #include "GmshUI.h"
@@ -67,7 +67,7 @@ void CancelMeshThread(void){
 // Common callbacks 
 
 void cancel_cb(CALLBACK_ARGS){
-  ((Fl_Window*)data)->hide();
+  if(data) ((Fl_Window*)data)->hide();
 }
 
 void ok_cb(CALLBACK_ARGS){
@@ -178,6 +178,12 @@ void file_save_as_geo_cb(CALLBACK_ARGS) {
     CreateFile(newfile, CTX.print.format = FORMAT_GEO); 
 }
 
+void file_save_as_geo_options_cb(CALLBACK_ARGS) {
+  char *newfile;
+  if((newfile = fl_file_chooser("Save Options File", "*", NULL)))
+    Print_Context(newfile); 
+}
+
 void file_save_as_msh_cb(CALLBACK_ARGS) {
   char *newfile;
   if((newfile = fl_file_chooser("Save MSH File", "*", NULL)))
@@ -468,49 +474,21 @@ void geometry_physical_cb(CALLBACK_ARGS){
   WID->set_context(menu_geometry_physical, 0);
 }
 void geometry_reload_cb(CALLBACK_ARGS){
-  printf("reload geometry\n");
+  OpenProblem(CTX.filename);
+  Init();
+  Draw();
 } 
 void geometry_elementary_add_cb(CALLBACK_ARGS){
   WID->set_context(menu_geometry_elementary_add, 0);
 }
-void geometry_elementary_translate_cb(CALLBACK_ARGS){
-  WID->set_context(menu_geometry_elementary_translate, 0);
-}
-void geometry_elementary_rotate_cb(CALLBACK_ARGS){
-  WID->set_context(menu_geometry_elementary_rotate, 0);
-}
-void geometry_elementary_dilate_cb(CALLBACK_ARGS){
-  WID->set_context(menu_geometry_elementary_dilate, 0);
-}
-void geometry_elementary_symmetry_cb(CALLBACK_ARGS){
-  WID->set_context(menu_geometry_elementary_symmetry, 0);
-}
-void geometry_elementary_extrude_cb(CALLBACK_ARGS){
-  WID->set_context(menu_geometry_elementary_extrude, 0);
-}
-void geometry_elementary_delete_cb(CALLBACK_ARGS){
-  WID->set_context(menu_geometry_elementary_delete, 0);
-}
 void geometry_elementary_add_new_cb(CALLBACK_ARGS){
   WID->set_context(menu_geometry_elementary_add_new, 0);
 }
-void geometry_elementary_add_translate_cb(CALLBACK_ARGS){
-  WID->set_context(menu_geometry_elementary_add_translate, 0);
-}
-void geometry_elementary_add_rotate_cb(CALLBACK_ARGS){
-  WID->set_context(menu_geometry_elementary_add_rotate, 0);
-}
-void geometry_elementary_add_dilate_cb(CALLBACK_ARGS){
-  WID->set_context(menu_geometry_elementary_add_dilate, 0);
-}
-void geometry_elementary_add_symmetry_cb(CALLBACK_ARGS){
-  WID->set_context(menu_geometry_elementary_add_symmetry, 0);
-}
 void geometry_elementary_add_new_parameter_cb(CALLBACK_ARGS){
-  printf("new param\n");
+  WID->create_geometry_context_window(0);
 }
 void geometry_elementary_add_new_point_cb(CALLBACK_ARGS){
-  printf("new point\n");
+  WID->create_geometry_context_window(1);
 }
 void geometry_elementary_add_new_line_cb(CALLBACK_ARGS){
   printf("new line\n");
@@ -533,87 +511,162 @@ void geometry_elementary_add_new_ruledsurface_cb(CALLBACK_ARGS){
 void geometry_elementary_add_new_volume_cb(CALLBACK_ARGS){
   printf("new vol\n");
 }
+void geometry_elementary_add_translate_cb(CALLBACK_ARGS){
+  WID->set_context(menu_geometry_elementary_add_translate, 0);
+}
 void geometry_elementary_add_translate_point_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(2);
   printf("translate point\n");
 }
 void geometry_elementary_add_translate_curve_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(2);
   printf("translate curve\n");
 }
 void geometry_elementary_add_translate_surface_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(2);
   printf("translate surface\n");
 }
+void geometry_elementary_add_rotate_cb(CALLBACK_ARGS){
+  WID->set_context(menu_geometry_elementary_add_rotate, 0);
+}
 void geometry_elementary_add_rotate_point_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(3);
   printf("rotate point\n");
 }
 void geometry_elementary_add_rotate_curve_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(3);
   printf("rotate curve\n");
 }
 void geometry_elementary_add_rotate_surface_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(3);
   printf("rotate surf\n");
 }
-void geometry_elementary_add_dilate_point_cb(CALLBACK_ARGS){
-  printf("dilate point\n");
+void geometry_elementary_add_scale_cb(CALLBACK_ARGS){
+  WID->set_context(menu_geometry_elementary_add_scale, 0);
+}
+void geometry_elementary_add_scale_point_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(4);
+  printf("scale point\n");
 }
-void geometry_elementary_add_dilate_curve_cb(CALLBACK_ARGS){
-  printf("dilate curve\n");
+void geometry_elementary_add_scale_curve_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(4);
+  printf("scale curve\n");
 }
-void geometry_elementary_add_dilate_surface_cb(CALLBACK_ARGS){
-  printf("dilate surface\n");
+void geometry_elementary_add_scale_surface_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(4);
+  printf("scale surface\n");
+}
+void geometry_elementary_add_symmetry_cb(CALLBACK_ARGS){
+  WID->set_context(menu_geometry_elementary_add_symmetry, 0);
 }
 void geometry_elementary_add_symmetry_point_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(5);
   printf("symm point\n");
 }
 void geometry_elementary_add_symmetry_curve_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(5);
   printf("symm curve\n");
 }
 void geometry_elementary_add_symmetry_surface_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(5);
   printf("symm surf\n");
 }
+void geometry_elementary_translate_cb(CALLBACK_ARGS){
+  WID->set_context(menu_geometry_elementary_translate, 0);
+}
 void geometry_elementary_translate_point_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(2);
   printf("translate point\n");
 }
 void geometry_elementary_translate_curve_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(2);
   printf("translate curve\n");
 }
 void geometry_elementary_translate_surface_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(2);
   printf("translate surf\n");
 }
+void geometry_elementary_rotate_cb(CALLBACK_ARGS){
+  WID->set_context(menu_geometry_elementary_rotate, 0);
+}
 void geometry_elementary_rotate_point_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(3);
   printf("rot point\n");
 }
 void geometry_elementary_rotate_curve_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(3);
   printf("rot curve\n");
 }
 void geometry_elementary_rotate_surface_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(3);
   printf("rot surf\n");
 }
-void geometry_elementary_dilate_point_cb(CALLBACK_ARGS){
-  printf("dilate point\n");
+void geometry_elementary_scale_cb(CALLBACK_ARGS){
+  WID->set_context(menu_geometry_elementary_scale, 0);
+}
+void geometry_elementary_scale_point_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(4);
+  printf("scale point\n");
 }
-void geometry_elementary_dilate_curve_cb(CALLBACK_ARGS){
-  printf("dilate curve\n");
+void geometry_elementary_scale_curve_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(4);
+  printf("scale curve\n");
 }
-void geometry_elementary_dilate_surface_cb(CALLBACK_ARGS){
-  printf("dilate surf\n");
+void geometry_elementary_scale_surface_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(4);
+  printf("scale surf\n");
+}
+void geometry_elementary_symmetry_cb(CALLBACK_ARGS){
+  WID->set_context(menu_geometry_elementary_symmetry, 0);
 }
 void geometry_elementary_symmetry_point_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(5);
   printf("symm point\n");
 }
 void geometry_elementary_symmetry_curve_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(5);
   printf("symm curve\n");
 }
 void geometry_elementary_symmetry_surface_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(5);
   printf("symm surf\n");
 }
-void geometry_elementary_extrude_point_cb(CALLBACK_ARGS){
+void geometry_elementary_extrude_cb(CALLBACK_ARGS){
+  WID->set_context(menu_geometry_elementary_extrude, 0);
+}
+void geometry_elementary_extrude_translate_cb(CALLBACK_ARGS){
+  WID->set_context(menu_geometry_elementary_extrude_translate, 0);
+}
+void geometry_elementary_extrude_translate_point_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(2);
+  printf("extr point\n");
+}
+void geometry_elementary_extrude_translate_curve_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(2);
+  printf("extr curve\n");
+}
+void geometry_elementary_extrude_translate_surface_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(2);
+  printf("extr surf\n");
+}
+void geometry_elementary_extrude_rotate_cb(CALLBACK_ARGS){
+  WID->set_context(menu_geometry_elementary_extrude_rotate, 0);
+}
+void geometry_elementary_extrude_rotate_point_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(3);
   printf("extr point\n");
 }
-void geometry_elementary_extrude_curve_cb(CALLBACK_ARGS){
+void geometry_elementary_extrude_rotate_curve_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(3);
   printf("extr curve\n");
 }
-void geometry_elementary_extrude_surface_cb(CALLBACK_ARGS){
+void geometry_elementary_extrude_rotate_surface_cb(CALLBACK_ARGS){
+  WID->create_geometry_context_window(3);
   printf("extr surf\n");
 }
+void geometry_elementary_delete_cb(CALLBACK_ARGS){
+  WID->set_context(menu_geometry_elementary_delete, 0);
+}
 void geometry_elementary_delete_point_cb(CALLBACK_ARGS){
   printf("del point\n");
 }
@@ -626,9 +679,6 @@ void geometry_elementary_delete_surface_cb(CALLBACK_ARGS){
 void geometry_physical_add_cb(CALLBACK_ARGS){
   WID->set_context(menu_geometry_physical_add, 0);
 }
-void geometry_physical_delete_cb(CALLBACK_ARGS){
-  WID->set_context(menu_geometry_physical_delete, 0);
-}
 void geometry_physical_add_point_cb (CALLBACK_ARGS){
   printf("phys add point\n");
 }
@@ -641,6 +691,9 @@ void geometry_physical_add_surface_cb (CALLBACK_ARGS){
 void geometry_physical_add_volume_cb (CALLBACK_ARGS){
   printf("phys add vol\n");
 }
+void geometry_physical_delete_cb(CALLBACK_ARGS){
+  WID->set_context(menu_geometry_physical_delete, 0);
+}
 void geometry_physical_delete_point_cb(CALLBACK_ARGS){
   printf("phys delpoint\n");
 }
@@ -817,5 +870,152 @@ void view_applybgmesh_cb(CALLBACK_ARGS){
   BGMWithView(v); 
 }
 void view_options_cb(CALLBACK_ARGS){
-  WID->create_view_window();
+  WID->create_view_window((int)data);
+}
+
+void view_options_show_scale_cb(CALLBACK_ARGS){
+  /*
+  if(CTX.post.link==2){
+    for(int i=0 ; i<List_Nbr(Post_ViewList) ; i++){
+      
+    }
+  }
+  */
+}
+void view_options_show_time_cb(CALLBACK_ARGS){
+}
+void view_options_transparent_scale_cb(CALLBACK_ARGS){
+}
+void view_options_name_cb(CALLBACK_ARGS){
+}
+void view_options_format_cb(CALLBACK_ARGS){
+}
+void view_options_custom_range_cb(CALLBACK_ARGS){
+  /*
+  if((int)((Fl_Value_Input*)w)->value()){
+    WID->activate_custom(0);
+    v->ScaleType==DRAW_POST_DEFAULT;
+  }
+  else{
+    WID->activate_custom(1);
+    v->ScaleType==DRAW_POST_CUSTOM;
+  }
+  */
+}
+void view_options_custom_min_cb(CALLBACK_ARGS){
+}
+void view_options_custom_max_cb(CALLBACK_ARGS){
+}
+void view_options_linear_range_cb(CALLBACK_ARGS){
+}
+void view_options_logarithmic_range_cb(CALLBACK_ARGS){
+}
+void view_options_nbiso_cb(CALLBACK_ARGS){
+}
+void view_options_iso_cb(CALLBACK_ARGS){
+}
+void view_options_fillediso_cb(CALLBACK_ARGS){
+}
+void view_options_continuousiso_cb(CALLBACK_ARGS){
+}
+void view_options_numericiso_cb(CALLBACK_ARGS){
+}
+void view_options_xoffset_cb(CALLBACK_ARGS){
+}
+void view_options_yoffset_cb(CALLBACK_ARGS){
+}
+void view_options_zoffset_cb(CALLBACK_ARGS){
+}
+void view_options_xraise_cb(CALLBACK_ARGS){
+}
+void view_options_yraise_cb(CALLBACK_ARGS){
+}
+void view_options_zraise_cb(CALLBACK_ARGS){
+}
+void view_options_timestep_cb(CALLBACK_ARGS){
+}
+void view_options_vector_line_cb(CALLBACK_ARGS){
+}
+void view_options_vector_arrow_cb(CALLBACK_ARGS){
+}
+void view_options_vector_cone_cb(CALLBACK_ARGS){
+}
+void view_options_vector_displacement_cb(CALLBACK_ARGS){
+}
+void view_options_vector_scale_cb(CALLBACK_ARGS){
+}
+void view_options_vector_cog_cb(CALLBACK_ARGS){
+}
+void view_options_vector_vertex_cb(CALLBACK_ARGS){
+}
+
+
+// Context geometry
+
+void con_geometry_define_parameter_cb(CALLBACK_ARGS){
+  add_param(WID->get_geometry_parameter(0),
+	    WID->get_geometry_parameter(1),
+	    CTX.filename);
+}
+
+void con_geometry_define_point_cb(CALLBACK_ARGS){
+ strcpy(x_text, WID->get_geometry_point(0));
+ strcpy(y_text, WID->get_geometry_point(1));
+ strcpy(z_text, WID->get_geometry_point(2));
+ strcpy(l_text, WID->get_geometry_point(3));
+ add_point(CTX.filename);
+ ZeroHighlight(&M);
+ Replot();
+}
+
+void con_geometry_define_translation_cb(CALLBACK_ARGS){
+  strcpy(tx_text, WID->get_geometry_translation(0));
+  strcpy(ty_text, WID->get_geometry_translation(1));
+  strcpy(tz_text, WID->get_geometry_translation(2));
+}
+
+void con_geometry_define_rotation_cb(CALLBACK_ARGS){
+  strcpy(px_text, WID->get_geometry_rotation(0));
+  strcpy(py_text, WID->get_geometry_rotation(1));
+  strcpy(pz_text, WID->get_geometry_rotation(2));
+  strcpy(ax_text, WID->get_geometry_rotation(3));
+  strcpy(ay_text, WID->get_geometry_rotation(4));
+  strcpy(az_text, WID->get_geometry_rotation(5));
+  strcpy(angle_text, WID->get_geometry_rotation(6));
+}
+
+void con_geometry_define_scale_cb(CALLBACK_ARGS){
+  strcpy(dx_text, WID->get_geometry_scale(0));
+  strcpy(dy_text, WID->get_geometry_scale(1));
+  strcpy(dz_text, WID->get_geometry_scale(2));
+  strcpy(df_text, WID->get_geometry_scale(3));
+}
+
+void con_geometry_define_symmetry_cb(CALLBACK_ARGS){
+  strcpy(sa_text, WID->get_geometry_symmetry(0));
+  strcpy(sb_text, WID->get_geometry_symmetry(1));
+  strcpy(sc_text, WID->get_geometry_symmetry(2));
+  strcpy(sd_text, WID->get_geometry_symmetry(3));
+}
+
+
+// Context mesh
+
+void con_mesh_define_transfinite_line_cb(CALLBACK_ARGS){
+  strcpy(trsf_pts_text, WID->get_mesh_transfinite(0));
+  strcpy(trsf_type_text, WID->get_mesh_transfinite(1));
+}
+
+void con_mesh_define_transfinite_volume_cb(CALLBACK_ARGS){
+  strcpy(trsf_vol_text, WID->get_mesh_transfinite(2));
+}
+
+void con_mesh_define_length_cb(CALLBACK_ARGS){
+  strcpy(char_length_text, WID->get_mesh_length(0));
+}
+
+void con_mesh_define_attractor_cb(CALLBACK_ARGS){
+  strcpy(attrx_text, WID->get_mesh_attractor(0));
+  strcpy(attry_text, WID->get_mesh_attractor(1));
+  strcpy(attrz_text, WID->get_mesh_attractor(2));
 }

Fltk/Callbacks.h

@@ -22,6 +22,7 @@ void file_merge_cb(CALLBACK_ARGS) ;
 void file_save_cb(CALLBACK_ARGS) ;
 void file_save_as_auto_cb(CALLBACK_ARGS) ;
 void file_save_as_geo_cb(CALLBACK_ARGS) ;
+void file_save_as_geo_options_cb(CALLBACK_ARGS) ;
 void file_save_as_msh_cb(CALLBACK_ARGS) ;
 void file_save_as_unv_cb(CALLBACK_ARGS) ;
 void file_save_as_gref_cb(CALLBACK_ARGS) ;
@@ -99,23 +100,11 @@ void mod_post_cb(CALLBACK_ARGS) ;
 void mod_back_cb(CALLBACK_ARGS) ;
 void mod_forward_cb(CALLBACK_ARGS) ;
 
-// Dynamic Menus
+// Dynamic Geometry Menus
 
 void geometry_elementary_cb(CALLBACK_ARGS) ;
-void geometry_physical_cb(CALLBACK_ARGS) ;
-void geometry_reload_cb(CALLBACK_ARGS) ; 
 void   geometry_elementary_add_cb(CALLBACK_ARGS) ;
-void geometry_elementary_translate_cb(CALLBACK_ARGS) ;
-void geometry_elementary_rotate_cb(CALLBACK_ARGS) ;
-void geometry_elementary_dilate_cb(CALLBACK_ARGS) ;
-void geometry_elementary_symmetry_cb(CALLBACK_ARGS) ;
-void geometry_elementary_extrude_cb(CALLBACK_ARGS) ;
-void geometry_elementary_delete_cb(CALLBACK_ARGS) ;
 void     geometry_elementary_add_new_cb(CALLBACK_ARGS) ;
-void geometry_elementary_add_translate_cb(CALLBACK_ARGS) ;
-void geometry_elementary_add_rotate_cb(CALLBACK_ARGS) ;
-void geometry_elementary_add_dilate_cb(CALLBACK_ARGS) ;
-void geometry_elementary_add_symmetry_cb(CALLBACK_ARGS) ;
 void       geometry_elementary_add_new_parameter_cb(CALLBACK_ARGS) ;
 void       geometry_elementary_add_new_point_cb(CALLBACK_ARGS) ;
 void       geometry_elementary_add_new_line_cb(CALLBACK_ARGS) ;
@@ -125,46 +114,73 @@ void geometry_elementary_add_new_ellipsis_cb(CALLBACK_ARGS) ;
 void       geometry_elementary_add_new_planesurface_cb(CALLBACK_ARGS) ;
 void       geometry_elementary_add_new_ruledsurface_cb(CALLBACK_ARGS) ;
 void       geometry_elementary_add_new_volume_cb(CALLBACK_ARGS) ;
+void     geometry_elementary_add_translate_cb(CALLBACK_ARGS) ;
 void       geometry_elementary_add_translate_point_cb(CALLBACK_ARGS) ;
 void       geometry_elementary_add_translate_curve_cb(CALLBACK_ARGS) ;
 void       geometry_elementary_add_translate_surface_cb(CALLBACK_ARGS) ;
+void     geometry_elementary_add_rotate_cb(CALLBACK_ARGS) ;
 void       geometry_elementary_add_rotate_point_cb(CALLBACK_ARGS) ;
 void       geometry_elementary_add_rotate_curve_cb(CALLBACK_ARGS) ;
 void       geometry_elementary_add_rotate_surface_cb(CALLBACK_ARGS) ;
-void geometry_elementary_add_dilate_point_cb(CALLBACK_ARGS) ;
-void geometry_elementary_add_dilate_curve_cb(CALLBACK_ARGS) ;
-void geometry_elementary_add_dilate_surface_cb(CALLBACK_ARGS) ;
+void     geometry_elementary_add_scale_cb(CALLBACK_ARGS) ;
+void       geometry_elementary_add_scale_point_cb(CALLBACK_ARGS) ;
+void       geometry_elementary_add_scale_curve_cb(CALLBACK_ARGS) ;
+void       geometry_elementary_add_scale_surface_cb(CALLBACK_ARGS) ;
+void     geometry_elementary_add_symmetry_cb(CALLBACK_ARGS) ;
 void       geometry_elementary_add_symmetry_point_cb(CALLBACK_ARGS) ;
 void       geometry_elementary_add_symmetry_curve_cb(CALLBACK_ARGS) ;
 void       geometry_elementary_add_symmetry_surface_cb(CALLBACK_ARGS) ;
+void   geometry_elementary_translate_cb(CALLBACK_ARGS) ;
 void     geometry_elementary_translate_point_cb(CALLBACK_ARGS) ;
 void     geometry_elementary_translate_curve_cb(CALLBACK_ARGS) ;
 void     geometry_elementary_translate_surface_cb(CALLBACK_ARGS) ;
+void   geometry_elementary_rotate_cb(CALLBACK_ARGS) ;
 void     geometry_elementary_rotate_point_cb(CALLBACK_ARGS) ;
 void     geometry_elementary_rotate_curve_cb(CALLBACK_ARGS) ;
 void     geometry_elementary_rotate_surface_cb(CALLBACK_ARGS) ;
-void geometry_elementary_dilate_point_cb(CALLBACK_ARGS) ;
-void geometry_elementary_dilate_curve_cb(CALLBACK_ARGS) ;
-void geometry_elementary_dilate_surface_cb(CALLBACK_ARGS) ;
+void   geometry_elementary_scale_cb(CALLBACK_ARGS) ;
+void     geometry_elementary_scale_point_cb(CALLBACK_ARGS) ;
+void     geometry_elementary_scale_curve_cb(CALLBACK_ARGS) ;
+void     geometry_elementary_scale_surface_cb(CALLBACK_ARGS) ;
+void   geometry_elementary_symmetry_cb(CALLBACK_ARGS) ;
 void     geometry_elementary_symmetry_point_cb(CALLBACK_ARGS) ;
 void     geometry_elementary_symmetry_curve_cb(CALLBACK_ARGS) ;
 void     geometry_elementary_symmetry_surface_cb(CALLBACK_ARGS) ;
-void geometry_elementary_extrude_point_cb(CALLBACK_ARGS) ;
-void geometry_elementary_extrude_curve_cb(CALLBACK_ARGS) ;
-void geometry_elementary_extrude_surface_cb(CALLBACK_ARGS) ;
+void   geometry_elementary_extrude_cb(CALLBACK_ARGS) ;
+void     geometry_elementary_extrude_translate_cb(CALLBACK_ARGS) ;
+void        geometry_elementary_extrude_translate_point_cb(CALLBACK_ARGS) ;
+void        geometry_elementary_extrude_translate_curve_cb(CALLBACK_ARGS) ;
+void        geometry_elementary_extrude_translate_surface_cb(CALLBACK_ARGS) ;
+void     geometry_elementary_extrude_rotate_cb(CALLBACK_ARGS) ;
+void        geometry_elementary_extrude_rotate_point_cb(CALLBACK_ARGS) ;
+void        geometry_elementary_extrude_rotate_curve_cb(CALLBACK_ARGS) ;
+void        geometry_elementary_extrude_rotate_surface_cb(CALLBACK_ARGS) ;
+void   geometry_elementary_delete_cb(CALLBACK_ARGS) ;
 void     geometry_elementary_delete_point_cb(CALLBACK_ARGS) ;
 void     geometry_elementary_delete_curve_cb(CALLBACK_ARGS) ;
 void     geometry_elementary_delete_surface_cb(CALLBACK_ARGS) ;
+void geometry_physical_cb(CALLBACK_ARGS) ;
 void   geometry_physical_add_cb(CALLBACK_ARGS) ;
-void geometry_physical_delete_cb(CALLBACK_ARGS) ;
 void     geometry_physical_add_point_cb (CALLBACK_ARGS) ;
 void     geometry_physical_add_curve_cb (CALLBACK_ARGS) ;
 void     geometry_physical_add_surface_cb (CALLBACK_ARGS) ;
 void     geometry_physical_add_volume_cb (CALLBACK_ARGS) ;
+void   geometry_physical_delete_cb(CALLBACK_ARGS) ;
 void     geometry_physical_delete_point_cb(CALLBACK_ARGS) ;
 void     geometry_physical_delete_curve_cb(CALLBACK_ARGS) ;
 void     geometry_physical_delete_surface_cb(CALLBACK_ARGS) ;
 void     geometry_physical_delete_volume_cb(CALLBACK_ARGS) ;
+void geometry_reload_cb(CALLBACK_ARGS) ; 
+
+void con_geometry_define_parameter_cb(CALLBACK_ARGS) ;
+void con_geometry_define_point_cb(CALLBACK_ARGS) ;
+void con_geometry_define_translation_cb(CALLBACK_ARGS) ;
+void con_geometry_define_rotation_cb(CALLBACK_ARGS) ;
+void con_geometry_define_scale_cb(CALLBACK_ARGS) ;
+void con_geometry_define_symmetry_cb(CALLBACK_ARGS) ;
+
+// Dynamic Mesh Menus
+
 void mesh_define_cb(CALLBACK_ARGS) ;
 void mesh_1d_cb(CALLBACK_ARGS) ;
 void mesh_2d_cb(CALLBACK_ARGS) ; 
@@ -175,6 +191,14 @@ void mesh_define_transfinite_cb (CALLBACK_ARGS) ;
 void mesh_define_transfinite_line_cb(CALLBACK_ARGS) ;
 void mesh_define_transfinite_surface_cb(CALLBACK_ARGS) ;
 void mesh_define_transfinite_volume_cb(CALLBACK_ARGS) ; 
+
+void con_mesh_define_transfinite_line_cb(CALLBACK_ARGS) ;
+void con_mesh_define_transfinite_volume_cb(CALLBACK_ARGS) ;
+void con_mesh_define_length_cb(CALLBACK_ARGS) ;
+void con_mesh_define_attractor_cb(CALLBACK_ARGS) ;
+
+// Dynamic post menus
+
 void view_reload_cb(CALLBACK_ARGS) ;
 void view_toggle_cb(CALLBACK_ARGS) ;
 void view_remove_cb(CALLBACK_ARGS) ;
@@ -183,7 +207,35 @@ void view_lighting_cb(CALLBACK_ARGS) ;
 void view_elements_cb(CALLBACK_ARGS) ;
 void view_applybgmesh_cb(CALLBACK_ARGS) ;
 void view_options_cb(CALLBACK_ARGS) ;
-
-
+void view_options_show_scale_cb(CALLBACK_ARGS) ;
+void view_options_show_time_cb(CALLBACK_ARGS) ;
+void view_options_transparent_scale_cb(CALLBACK_ARGS) ;
+void view_options_name_cb(CALLBACK_ARGS) ;
+void view_options_format_cb(CALLBACK_ARGS) ;
+void view_options_custom_range_cb(CALLBACK_ARGS) ;
+void view_options_custom_min_cb(CALLBACK_ARGS) ;
+void view_options_custom_max_cb(CALLBACK_ARGS) ;
+void view_options_linear_range_cb(CALLBACK_ARGS) ;
+void view_options_logarithmic_range_cb(CALLBACK_ARGS) ;
+void view_options_nbiso_cb(CALLBACK_ARGS) ;
+void view_options_iso_cb(CALLBACK_ARGS) ;
+void view_options_fillediso_cb(CALLBACK_ARGS) ;
+void view_options_continuousiso_cb(CALLBACK_ARGS) ;
+void view_options_numericiso_cb(CALLBACK_ARGS) ;
+void view_options_xoffset_cb(CALLBACK_ARGS) ;
+void view_options_yoffset_cb(CALLBACK_ARGS) ;
+void view_options_zoffset_cb(CALLBACK_ARGS) ;
+void view_options_xraise_cb(CALLBACK_ARGS) ;
+void view_options_yraise_cb(CALLBACK_ARGS) ;
+void view_options_zraise_cb(CALLBACK_ARGS) ;
+void view_options_timestep_cb(CALLBACK_ARGS) ;
+void view_options_vector_line_cb(CALLBACK_ARGS) ;
+void view_options_vector_arrow_cb(CALLBACK_ARGS) ;
+void view_options_vector_cone_cb(CALLBACK_ARGS) ;
+void view_options_vector_displacement_cb(CALLBACK_ARGS) ;
+void view_options_vector_scale_cb(CALLBACK_ARGS) ;
+void view_options_vector_cog_cb(CALLBACK_ARGS) ;
+void view_options_vector_vertex_cb(CALLBACK_ARGS) ;
 
 #endif
+

Fltk/GUI.h

@@ -39,13 +39,15 @@ extern        Context_Item menu_geometry_elementary_add[];
 extern            Context_Item menu_geometry_elementary_add_new[]; 
 extern            Context_Item menu_geometry_elementary_add_translate[]; 
 extern            Context_Item menu_geometry_elementary_add_rotate[]; 
-extern            Context_Item menu_geometry_elementary_add_dilate[]; 
+extern            Context_Item menu_geometry_elementary_add_scale[]; 
 extern            Context_Item menu_geometry_elementary_add_symmetry[]; 
 extern        Context_Item menu_geometry_elementary_translate[]; 
 extern        Context_Item menu_geometry_elementary_rotate[]; 
-extern        Context_Item menu_geometry_elementary_dilate[]; 
+extern        Context_Item menu_geometry_elementary_scale[]; 
 extern        Context_Item menu_geometry_elementary_symmetry[]; 
 extern        Context_Item menu_geometry_elementary_extrude[]; 
+extern            Context_Item menu_geometry_elementary_extrude_translate[]; 
+extern            Context_Item menu_geometry_elementary_extrude_rotate[]; 
 extern        Context_Item menu_geometry_elementary_delete[]; 
 extern    Context_Item menu_geometry_physical[]; 
 extern        Context_Item menu_geometry_physical_add[]; 
@@ -73,21 +75,19 @@ public:
     : Fl_Gl_Window(x, y, w, h, l) {}
 };
 
-// The GUI class contains only the important widgets
+// The GUI class contains only the important widgets. All these
+// widgets should stay private, and be accessed only by the public
+// member functions.
 
 class GUI{
 
-  int BH; // generic button height
-  int WB; // generic window border
-  int IW; // generic input field width
+  int BH; // check_button height
+  int BW; // check_button width
+  int WB; // borders
+  int IW; // input field width
   int MH; // height of the unchangeable part of the menu window
-  // All other diemnsions are automatic, or governed by CTX
 
-  // Windows
-  Fl_Window  *m_window, *g_window, *gen_window, *geo_window ;
-  Fl_Window  *mesh_window, *post_window, *stat_window ;
-  Fl_Window  *help_window, *about_window, *view_window ;
-  Opengl_Window *g_opengl_window ;
+  // All other diemnsions are automatic, or governed by CTX
   
   // Bitmaps
   Fl_Bitmap  *icon1_bmp, *icon2_bmp, *icon3_bmp;
@@ -96,6 +96,7 @@ class GUI{
   // We keep the following widgets for easy further reference
 
   // menu window
+  Fl_Window        *m_window ;
   Fl_Choice        *m_module_butt ;
   Fl_Button        *m_navig_butt  [2] ;
   Fl_Button        *m_push_butt   [NB_BUTT_MAX] ;
@@ -103,38 +104,65 @@ class GUI{
   Fl_Menu_Button   *m_popup_butt  [NB_BUTT_MAX] ;
 
   // graphic window
+  Fl_Window        *g_window ;
+  Opengl_Window    *g_opengl_window ;
   Fl_Button        *g_status_butt[7] ;
   Fl_Box           *g_status_label[3] ;
 
   // general options window
+  Fl_Window        *gen_window ;
   Fl_Check_Button  *gen_butt[10] ;
   Fl_Value_Input   *gen_value[10] ;
 
   // geometry options window
+  Fl_Window        *geo_window ;
   Fl_Check_Button  *geo_butt[10] ;
   Fl_Input         *geo_input ;
   Fl_Value_Input   *geo_value[10] ;
   
   // mesh options window
+  Fl_Window        *mesh_window ;
   Fl_Check_Button  *mesh_butt[20] ;
   Fl_Input         *mesh_input ;
   Fl_Value_Input   *mesh_value[20] ;
 
   // post-processing options window
+  Fl_Window        *post_window ;
   Fl_Check_Button  *post_butt[20] ;
   Fl_Value_Input   *post_value[20] ;
 
   // statistics window
+  Fl_Window        *stat_window ;
   Fl_Output        *stat_value[50] ;
 
+  // help window
+  Fl_Window        *help_window ;
+    
+  // about window
+  Fl_Window        *about_window ;
+
   // view options window
+  Fl_Window        *view_window ;
+  Fl_Group         *view_colorbar, *view_range, *view_intervals ;
+  Fl_Group         *view_offsetraise, *view_timestep, *view_vector ;
   Fl_Check_Button  *view_butt[20] ;
   Fl_Value_Input   *view_value[20] ;
   Fl_Input         *view_input[20] ;
   
+  // geometry context window
+  Fl_Window        *context_geometry_window ;
+  Fl_Input         *context_geometry_input[30] ;
+
+  // mesh context window
+  Fl_Window        *context_mesh_window ;
+  Fl_Input         *context_mesh_input[20] ;
+
 public:
 
+  // the constructor
   GUI();
+
+  // general purpose interaction
   void run();
   void check();
   void make_gl_current();
@@ -147,6 +175,21 @@ public:
   void set_anim(int mode);
   void set_status(char *msg, int num);
   void set_statistics();
+  void set_title(char *str);
+  void activate_custom(int val);
+
+  // geometry contexts queries
+  char *get_geometry_parameter(int num);
+  char *get_geometry_point(int num);
+  char *get_geometry_translation(int num);
+  char *get_geometry_rotation(int num);
+  char *get_geometry_scale(int num);
+  char *get_geometry_symmetry(int num);
+
+  // mesh contexts queries
+  char *get_mesh_transfinite(int num);
+  char *get_mesh_length(int num);
+  char *get_mesh_attractor(int num);
 
   // create additional windows
   void create_general_options_window();
@@ -154,10 +197,11 @@ public:
   void create_mesh_options_window();
   void create_post_options_window();
   void create_statistics_window();
-  void create_view_window();
+  void create_view_window(int numview);
   void create_help_window();
   void create_about_window();
-
+  void create_geometry_context_window(int num);
+  void create_mesh_context_window(int num);
 };
 
 

Geo/Geo.cpp

-// $Id: Geo.cpp,v 1.13 2001-01-09 19:40:56 remacle Exp $
+// $Id: Geo.cpp,v 1.14 2001-01-10 08:41:06 geuzaine Exp $
 
 #include "Gmsh.h"
 #include "Const.h"
@@ -9,6 +9,9 @@
 
 #define BUFFSIZE 32000
 
+// Ceci, c'est horrible. Des que Motif est completement zingle, je
+// vire et je refais une routine generique.
+
 char x_text[100]  = "0.0", y_text[100]  = "0.0", z_text[100]  = "0.0";
 char l_text[100] = "1.0" ;
 char tx_text[100] = "0.0", ty_text[100] = "0.0", tz_text[100] = "0.0";
@@ -322,11 +325,6 @@ void add_multline(int N, int *p, char *fich){
   add_infile(text,fich);
 }
 
-
-int recognize_zone(int ityp,List_T *list){
-  return 0 ;
-}
-
 void add_loop(List_T *list, char *fich, int *numloop){
   char text[BUFFSIZE];
   char text2[BUFFSIZE];
@@ -353,10 +351,6 @@ void add_surf(List_T *list, char *fich, int support, int typ){
   char text2[BUFFSIZE];
   int i,seg;
 
-  if((i = recognize_zone(MSH_SURF_PLAN,list)) != 0)return;
-  if((i = recognize_zone(MSH_SURF_REGL,list)) != 0)return;
-  if((i = recognize_zone(MSH_SURF_TRIMMED,list)) != 0)return;
-
   if(typ ==1){
     sprintf(text,"Ruled Surface(%d) = {",NEWREG());
   }
@@ -403,8 +397,6 @@ void add_multvol(List_T *list, char *fich){
   char text2[BUFFSIZE];
   int i,seg;
 
-  if((i= recognize_zone(MSH_VOLUME,list)))return;
-  
   sprintf(text,"Volume(%d) = {",NEWREG());
   for(i=0;i<List_Nbr(list);i++){
     List_Read(list,i,&seg);
@@ -437,10 +429,6 @@ void add_physical_entity(List_T *list, char *fich, int type, int *num){
   char text[BUFFSIZE], text2[BUFFSIZE];
   int  i, elementary_entity;
 
-  if(((*num) = recognize_zone(MSH_PHYSICAL_LINE,list))) return;
-  if(((*num) = recognize_zone(MSH_PHYSICAL_SURFACE,list))) return;
-  if(((*num) = recognize_zone(MSH_PHYSICAL_VOLUME,list))) return;
-
   *num = NEWREG();
   switch(type){
   case ENT_POINT : sprintf(text, "Physical Point(%d) = {", *num); break;

Geo/Geo.h

@@ -68,6 +68,21 @@ typedef struct {
   } obj;
 } Shape;
 
+// static strings for parser interaction
+extern char x_text[100], y_text[100], z_text[100];
+extern char l_text[100];
+extern char tx_text[100], ty_text[100], tz_text[100];
+extern char attrx_text[100], attry_text[100], attrz_text[100];
+extern char attrdec_text[100];
+extern char px_text[100], py_text[100], pz_text[100];
+extern char angle_text[100] ;
+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_vol_text[100];
+extern char char_length_text[100];
 
 double evaluate_scalarfunction (char *var, double val, char *funct);
 
@@ -93,8 +108,6 @@ void add_bezier(int N, int *p, char *fich);
 void add_bspline(int N, int *p, char *fich);
 void add_multline(int N, int *p, char *fich);
 
-int recognize_zone(int ityp,List_T *list);
-
 void add_loop(List_T *list, char *fich, int *numloop);
 void add_surf(List_T *list, char *fich, int support, int typ);
 void add_vol(List_T *list, char *fich, int *numvol);

Motif/CbGeom.cpp

-// $Id: CbGeom.cpp,v 1.1 2001-01-08 08:20:10 geuzaine Exp $
+// $Id: CbGeom.cpp,v 1.2 2001-01-10 08:41:07 geuzaine Exp $
 
 #include "Gmsh.h"
 #include "GmshUI.h"
@@ -14,16 +14,8 @@
 
 extern Context_T  CTX;
 extern Widgets_T  WID;
-
 extern Mesh       M;
 	     
-extern char  x_text[100], y_text[100], z_text[100], l_text[100];
-extern char  tx_text[100], ty_text[100], tz_text[100];
-extern char  px_text[100], py_text[100], pz_text[100], angle_text[100];
-extern char  ax_text[100], ay_text[100], az_text[100], angle_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];
-	     
 static char  name_text[100], value_text[100];
 
 int SelectContour (int type, int num, List_T *Liste1){

Parser/OpenFile.cpp

-// $Id: OpenFile.cpp,v 1.3 2001-01-09 14:24:13 geuzaine Exp $
+// $Id: OpenFile.cpp,v 1.4 2001-01-10 08:41:08 geuzaine Exp $
 #include "Gmsh.h"
 #include "Const.h"
 #include "Context.h"
@@ -15,9 +15,12 @@
 #include "Draw.h"
 #endif
 
-#ifdef _XMOTIF
+#if _XMOTIF
 #include "Widgets.h"
 extern Widgets_T WID;
+#elif _FLTK
+#include "GUI.h"
+extern GUI *WID;
 #endif
 
 extern Mesh      *THEM, M;
@@ -92,14 +95,16 @@ void OpenProblem(char *name){
 
   strncpy(THEM->name, CTX.basefilename,NAME_STR_L);
 
-#ifdef _XMOTIF
   if(!CTX.interactive){
+#if _XMOTIF
     XtVaSetValues(WID.G.shell,
                   XmNtitle, CTX.filename,
                   XmNiconName, CTX.basefilename,
                   NULL);
-  }
+#elif _FLTK
+    WID->set_title(CTX.filename);
 #endif
+  }
 
   Msg(INFOS, "Opening '%s'", CTX.filename);