From 2f6cb765eed71ed5a00de684df8d1a83c2b25ab1 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 30 Dec 2004 22:43:23 +0000
Subject: [PATCH] - reworked the keyboard shortcuts with Laurent (our very own
Macintosh Usability Guidelines Expert)
- new smoothing option for jpeg output
- new small GUI dialogs for ps/pdf/jpeg/gif/msh output (makes the
'format' menu in the file dialog much shorter)
---
Common/Context.h | 2 +-
Common/DefaultOptions.h | 4 +-
Common/GmshUI.h | 5 +
Common/Makefile | 4 +-
Common/Options.cpp | 9 +-
Common/Options.h | 1 +
Fltk/Callbacks.cpp | 534 ++++++++-----------------------------
Fltk/GUI.cpp | 371 ++++++++++++--------------
Fltk/GUI.h | 4 -
Fltk/GUI_Extras.cpp | 502 ++++++++++++++++++++++++++++++++++
Fltk/GUI_Extras.h | 38 +++
Fltk/Makefile | 33 ++-
Fltk/Message.cpp | 9 +-
Graphics/CreateFile.cpp | 29 +-
Graphics/gl2jpeg.cpp | 6 +-
Graphics/gl2jpeg.h | 2 +-
Mesh/Mesh.h | 5 -
Parser/Makefile | 4 +-
Plugin/Makefile | 5 +-
doc/texinfo/shortcuts.texi | 223 +++++++---------
20 files changed, 987 insertions(+), 803 deletions(-)
create mode 100644 Fltk/GUI_Extras.cpp
create mode 100644 Fltk/GUI_Extras.h
diff --git a/Common/Context.h b/Common/Context.h
index f0517572e1..f5182934e4 100644
--- a/Common/Context.h
+++ b/Common/Context.h
@@ -215,7 +215,7 @@ public :
int eps_quality, eps_background, eps_compress, eps_ps3shading;
int eps_occlusion_culling, eps_best_root;
double eps_line_width_factor, eps_point_size_factor;
- int jpeg_quality;
+ int jpeg_quality, jpeg_smoothing;
int gif_dither, gif_sort, gif_interlace, gif_transparent;
int gl_fonts;
} print;
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 75fda08c5f..46ec58a726 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -1188,7 +1188,7 @@ StringXNumber PrintOptions_Number[] = {
{ F|O, "EpsPS3Shading" , opt_print_eps_ps3shading , 0. ,
"Enable PostScript Level 3 shading" },
{ F|O, "EpsQuality" , opt_print_eps_quality , 1. ,
- "PostScript/PDF quality (1=simple sort, 2=BSP tree sort)" },
+ "PostScript/PDF quality (0=bitmap, 1=vector (simple sort), 2=vector (accurate sort)" },
{ F|O, "Format" , opt_print_format , FORMAT_AUTO ,
"File format (10=automatic)" },
@@ -1204,6 +1204,8 @@ StringXNumber PrintOptions_Number[] = {
{ F|O, "JpegQuality" , opt_print_jpeg_quality , 100. ,
"JPEG quality (between 1 and 100)" },
+ { F|O, "JpegSmoothing" , opt_print_jpeg_smoothing , 0. ,
+ "JPEG smoothing (between 0 and 100)" },
{ 0, NULL , NULL , 0. }
} ;
diff --git a/Common/GmshUI.h b/Common/GmshUI.h
index fffe86509e..62e6ae5a18 100644
--- a/Common/GmshUI.h
+++ b/Common/GmshUI.h
@@ -38,6 +38,11 @@
# else
# include <GL/glu.h>
# endif
+# define GMSH_WINDOW_BOX FL_FLAT_BOX
+# define GMSH_TOGGLE_BOX FL_DOWN_BOX
+# define GMSH_TOGGLE_COLOR FL_BLACK
+# define GMSH_RADIO_BOX FL_ROUND_DOWN_BOX
+# define GMSH_RADIO_COLOR FL_BLACK
#endif
#endif
diff --git a/Common/Makefile b/Common/Makefile
index 3c125233f8..4932215574 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.69 2004-12-24 18:12:22 geuzaine Exp $
+# $Id: Makefile,v 1.70 2004-12-30 22:43:21 geuzaine Exp $
#
# Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
#
@@ -89,7 +89,7 @@ Options.o: Options.cpp ../Plugin/PluginManager.h ../Plugin/Plugin.h \
../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/STL.h \
../Mesh/Metric.h ../Mesh/Matrix.h ../Graphics/Draw.h Context.h \
../Fltk/Solvers.h ../Fltk/GUI.h ../Fltk/Opengl_Window.h \
- ../Fltk/Colorbar_Window.h ../Fltk/File_Picker.h
+ ../Fltk/Colorbar_Window.h
CommandLine.o: CommandLine.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
GmshUI.h GmshVersion.h CommandLine.h ../Numeric/Numeric.h Context.h \
diff --git a/Common/Options.cpp b/Common/Options.cpp
index 6deb7e3a8f..9ef0d66883 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.219 2004-12-28 20:37:18 geuzaine Exp $
+// $Id: Options.cpp,v 1.220 2004-12-30 22:43:21 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -5705,6 +5705,13 @@ double opt_print_jpeg_quality(OPT_ARGS_NUM)
return CTX.print.jpeg_quality;
}
+double opt_print_jpeg_smoothing(OPT_ARGS_NUM)
+{
+ if(action & GMSH_SET)
+ CTX.print.jpeg_smoothing = (int)val;
+ return CTX.print.jpeg_smoothing;
+}
+
double opt_print_gif_dither(OPT_ARGS_NUM)
{
if(action & GMSH_SET)
diff --git a/Common/Options.h b/Common/Options.h
index 7a7cb900fa..17f2c3b507 100644
--- a/Common/Options.h
+++ b/Common/Options.h
@@ -551,6 +551,7 @@ double opt_print_eps_background(OPT_ARGS_NUM);
double opt_print_eps_line_width_factor(OPT_ARGS_NUM);
double opt_print_eps_point_size_factor(OPT_ARGS_NUM);
double opt_print_jpeg_quality(OPT_ARGS_NUM);
+double opt_print_jpeg_smoothing(OPT_ARGS_NUM);
double opt_print_gif_dither(OPT_ARGS_NUM);
double opt_print_gif_sort(OPT_ARGS_NUM);
double opt_print_gif_interlace(OPT_ARGS_NUM);
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index f1c613f21f..2664ca4326 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.314 2004-12-29 01:25:08 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.315 2004-12-30 22:43:21 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -40,6 +40,7 @@
#include "Context.h"
#include "Options.h"
#include "GUI.h"
+#include "GUI_Extras.h"
#include "Callbacks.h"
#include "Plugin.h"
#include "PluginManager.h"
@@ -49,130 +50,11 @@
using namespace std;
-#include <errno.h>
-
extern GUI *WID;
extern Mesh *THEM;
extern Context_T CTX;
-// File chooser (re)definitions
-
-int file_chooser(int multi, int create, const char *message,
- const char *pat, int patindex, char *fname=NULL)
-{
- static char oldfilter[1024];
-
- Fl_File_Chooser::show_label = "Format:";
- Fl_File_Chooser::all_files_label = "All files (*)";
-
- if(!WID->fc) {
- WID->fc = new File_Picker(getenv("PWD") ? "." : CTX.home_dir, pat,
- Fl_File_Chooser::SINGLE, message);
- WID->fc->position(CTX.file_chooser_position[0], CTX.file_chooser_position[1]);
- strncpy(oldfilter, pat, 1024);
- }
-
- WID->fc->label(message);
-
- if(fname)
- WID->fc->value(fname);
-
- if(strncmp(oldfilter, pat, 1024)) {
- strncpy(oldfilter, pat, 1024);
- WID->fc->filter(pat);
- WID->fc->filter_value(patindex);
- }
-
- if(multi)
- WID->fc->type(Fl_File_Chooser::MULTI);
- else if(create)
- WID->fc->type(Fl_File_Chooser::CREATE);
- else
- WID->fc->type(Fl_File_Chooser::SINGLE);
-
- WID->fc->show();
-
- while(WID->fc->shown())
- Fl::wait();
-
- if(WID->fc->value())
- return WID->fc->count();
- else
- return 0;
-}
-
-char *file_chooser_get_name(int num)
-{
- if(!WID->fc)
- return "";
- return (char *)WID->fc->value(num);
-}
-
-int file_chooser_get_filter()
-{
- if(!WID->fc)
- return 0;
- return WID->fc->filter_value();
-}
-
-// arrow editor
-
-#include <FL/Fl_Value_Slider.H>
-
-int arrow_editor(char *title, double &a, double &b, double &c)
-{
- struct _editor{
- Fl_Window *window;
- Fl_Value_Slider *sa, *sb, *sc;
- Fl_Button *apply, *cancel;
- };
- static _editor *editor = NULL;
-
- if(!editor){
- editor = new _editor;
- editor->window = new Fl_Window(200, 140);
- editor->sa = new Fl_Value_Slider(10, 10, 100, 25, "Head radius");
- editor->sa->type(FL_HOR_SLIDER);
- editor->sa->align(FL_ALIGN_RIGHT);
- editor->sb = new Fl_Value_Slider(10, 40, 100, 25, "Stem length");
- editor->sb->type(FL_HOR_SLIDER);
- editor->sb->align(FL_ALIGN_RIGHT);
- editor->sc = new Fl_Value_Slider(10, 70, 100, 25, "Stem radius");
- editor->sc->type(FL_HOR_SLIDER);
- editor->sc->align(FL_ALIGN_RIGHT);
- editor->apply = new Fl_Return_Button(10, 105, 85, 25, "Apply");
- editor->cancel = new Fl_Button(105, 105, 85, 25, "Cancel");
- editor->window->end();
- editor->window->hotspot(editor->window);
- }
-
- editor->window->label(title);
- editor->sa->value(a);
- editor->sb->value(b);
- editor->sc->value(c);
- editor->window->show();
-
- while(editor->window->shown()){
- Fl::wait();
- for (;;) {
- Fl_Widget* o = Fl::readqueue();
- if (!o) break;
- if (o == editor->apply) {
- a = editor->sa->value();
- b = editor->sb->value();
- c = editor->sc->value();
- return 1;
- }
- if (o == editor->window || o == editor->cancel){
- editor->window->hide();
- return 0;
- }
- }
- }
- return 0;
-}
-
-// Compatibility/local routines
+// Helper routines
void UpdateViewsInGUI()
{
@@ -383,7 +265,7 @@ void status_cancel_cb(CALLBACK_ARGS)
void file_new_cb(CALLBACK_ARGS)
{
test:
- if(file_chooser(0, 1, "New file", "*", 0)) {
+ if(file_chooser(0, 1, "New project file", "*", 0)) {
char *name = file_chooser_get_name(1);
struct stat buf;
if(!stat(name, &buf)){
@@ -409,7 +291,7 @@ void file_new_cb(CALLBACK_ARGS)
void file_open_cb(CALLBACK_ARGS)
{
int n = List_Nbr(CTX.post.list);
- if(file_chooser(0, 0, "Open file", "*", 0)) {
+ if(file_chooser(0, 0, "Open project file", "*", 0)) {
OpenProblem(file_chooser_get_name(1));
Draw();
}
@@ -430,265 +312,131 @@ void file_merge_cb(CALLBACK_ARGS)
WID->set_context(menu_post, 0);
}
-void _save_auto(char *name)
+int _save_auto(char *name)
{
CreateOutputFile(name, FORMAT_AUTO);
+ return 1;
}
-void _save_geo_options(char *name)
+int _save_options(char *name)
{
- CreateOutputFile(name, FORMAT_OPT);
+ return options_dialog(name);
}
-void _save_geo_options_diff(char *name)
-{
- Print_Options(0, GMSH_FULLRC, true, name);
-}
-
-void _save_geo(char *name)
+int _save_geo(char *name)
{
CreateOutputFile(name, FORMAT_GEO);
+ return 1;
}
-void _save_msh(char *name)
-{
- double ver = CTX.mesh.msh_file_version;
- CTX.mesh.msh_file_version = 1.0;
- CreateOutputFile(name, CTX.mesh.format = FORMAT_MSH);
- CTX.mesh.msh_file_version = ver;
-}
-
-void _save_msh_all(char *name)
+int _save_msh(char *name)
{
- int all = CTX.mesh.save_all;
- double ver = CTX.mesh.msh_file_version;
- CTX.mesh.msh_file_version = 1.0;
- CTX.mesh.save_all = 1;
- CreateOutputFile(name, CTX.mesh.format = FORMAT_MSH);
- CTX.mesh.save_all = all;
- CTX.mesh.msh_file_version = ver;
+ return msh_dialog(name);
}
-void _save_msh_v2(char *name)
-{
- double ver = CTX.mesh.msh_file_version;
- CTX.mesh.msh_file_version = 2.0;
- CreateOutputFile(name, CTX.mesh.format = FORMAT_MSH);
- CTX.mesh.msh_file_version = ver;
-}
-
-void _save_msh_all_v2(char *name)
-{
- int all = CTX.mesh.save_all;
- double ver = CTX.mesh.msh_file_version;
- CTX.mesh.msh_file_version = 2.0;
- CTX.mesh.save_all = 1;
- CreateOutputFile(name, CTX.mesh.format = FORMAT_MSH);
- CTX.mesh.save_all = all;
- CTX.mesh.msh_file_version = ver;
-}
-
-void _save_lc_sur(char *name)
+int _save_lc_sur(char *name)
{
CreateOutputFile(name, FORMAT_LC_SUR);
+ return 1;
}
-void _save_lc_vol(char *name)
+int _save_lc_vol(char *name)
{
CreateOutputFile(name, FORMAT_LC_VOL);
+ return 1;
}
-void _save_gref(char *name)
+int _save_gref(char *name)
{
CreateOutputFile(name, CTX.mesh.format = FORMAT_GREF);
+ return 1;
}
-void _save_unv(char *name)
+int _save_unv(char *name)
{
CreateOutputFile(name, CTX.mesh.format = FORMAT_UNV);
+ return 1;
}
-void _save_vrml(char *name)
+int _save_vrml(char *name)
{
CreateOutputFile(name, CTX.mesh.format = FORMAT_VRML);
+ return 1;
}
-void _save_ps_raster(char *name)
-{
- CreateOutputFile(name, FORMAT_PS_RASTER);
-}
-
-void _save_ps_simple(char *name)
+int _save_ps(char *name)
{
- int old = CTX.print.eps_quality;
- CTX.print.eps_quality = 1;
- CreateOutputFile(name, FORMAT_PS);
- CTX.print.eps_quality = old;
+ return gl2ps_dialog(name, "PS options", 0, 0);
}
-void _save_ps_accurate(char *name)
+int _save_eps(char *name)
{
- int old = CTX.print.eps_quality;
- CTX.print.eps_quality = 2;
- CreateOutputFile(name, FORMAT_PS);
- CTX.print.eps_quality = old;
+ return gl2ps_dialog(name, "EPS options", 1, 0);
}
-void _save_eps_raster(char *name)
+int _save_epstex(char *name)
{
- CreateOutputFile(name, FORMAT_EPS_RASTER);
+ return gl2ps_dialog(name, "EPS options", 1, 1);
}
-void _save_eps_simple(char *name)
+int _save_pdf(char *name)
{
- int old = CTX.print.eps_quality;
- CTX.print.eps_quality = 1;
- CreateOutputFile(name, FORMAT_EPS);
- CTX.print.eps_quality = old;
+ return gl2ps_dialog(name, "PDF options", 2, 0);
}
-void _save_eps_accurate(char *name)
+int _save_pdftex(char *name)
{
- int old = CTX.print.eps_quality;
- CTX.print.eps_quality = 2;
- CreateOutputFile(name, FORMAT_EPS);
- CTX.print.eps_quality = old;
+ return gl2ps_dialog(name, "PDF options", 2, 1);
}
-void _save_epstex_raster(char *name)
+int _save_jpegtex(char *name)
{
- CreateOutputFile(name, FORMAT_EPSTEX_RASTER);
+ return jpeg_dialog(name, 1);
}
-void _save_epstex_simple(char *name)
-{
- int old = CTX.print.eps_quality;
- CTX.print.eps_quality = 1;
- CreateOutputFile(name, FORMAT_EPSTEX);
- CTX.print.eps_quality = old;
-}
-
-void _save_epstex_accurate(char *name)
-{
- int old = CTX.print.eps_quality;
- CTX.print.eps_quality = 2;
- CreateOutputFile(name, FORMAT_EPSTEX);
- CTX.print.eps_quality = old;
-}
-
-void _save_pdf_raster(char *name)
-{
- CreateOutputFile(name, FORMAT_PDF_RASTER);
-}
-
-void _save_pdf_simple(char *name)
-{
- int old = CTX.print.eps_quality;
- CTX.print.eps_quality = 1;
- CreateOutputFile(name, FORMAT_PDF);
- CTX.print.eps_quality = old;
-}
-
-void _save_pdf_accurate(char *name)
-{
- int old = CTX.print.eps_quality;
- CTX.print.eps_quality = 2;
- CreateOutputFile(name, FORMAT_PDF);
- CTX.print.eps_quality = old;
-}
-
-void _save_pdftex_raster(char *name)
-{
- CreateOutputFile(name, FORMAT_PDFTEX_RASTER);
-}
-
-void _save_pdftex_simple(char *name)
-{
- int old = CTX.print.eps_quality;
- CTX.print.eps_quality = 1;
- CreateOutputFile(name, FORMAT_PDFTEX);
- CTX.print.eps_quality = old;
-}
-
-void _save_pdftex_accurate(char *name)
-{
- int old = CTX.print.eps_quality;
- CTX.print.eps_quality = 2;
- CreateOutputFile(name, FORMAT_PDFTEX);
- CTX.print.eps_quality = old;
-}
-
-void _save_jpegtex(char *name)
-{
- CreateOutputFile(name, FORMAT_JPEGTEX);
-}
-
-void _save_pngtex(char *name)
+int _save_pngtex(char *name)
{
CreateOutputFile(name, FORMAT_PNGTEX);
+ return 1;
}
-void _save_tex(char *name)
+int _save_tex(char *name)
{
CreateOutputFile(name, FORMAT_TEX);
+ return 1;
}
-void _save_jpeg(char *name)
+int _save_jpeg(char *name)
{
- CreateOutputFile(name, FORMAT_JPEG);
+ return jpeg_dialog(name, 0);
}
-void _save_png(char *name)
+int _save_png(char *name)
{
CreateOutputFile(name, FORMAT_PNG);
+ return 1;
}
-void _save_gif(char *name)
-{
- int dither = CTX.print.gif_dither;
- int transp = CTX.print.gif_transparent;
- CTX.print.gif_dither = 0;
- CTX.print.gif_transparent = 0;
- CreateOutputFile(name, FORMAT_GIF);
- CTX.print.gif_dither = dither;
- CTX.print.gif_transparent = transp;
-}
-
-void _save_gif_dithered(char *name)
+int _save_gif(char *name)
{
- int dither = CTX.print.gif_dither;
- int transp = CTX.print.gif_transparent;
- CTX.print.gif_dither = 1;
- CTX.print.gif_transparent = 0;
- CreateOutputFile(name, FORMAT_GIF);
- CTX.print.gif_dither = dither;
- CTX.print.gif_transparent = transp;
+ return gif_dialog(name);
}
-void _save_gif_transparent(char *name)
-{
- int dither = CTX.print.gif_dither;
- int transp = CTX.print.gif_transparent;
- CTX.print.gif_dither = 0;
- CTX.print.gif_transparent = 1;
- CreateOutputFile(name, FORMAT_GIF);
- CTX.print.gif_dither = dither;
- CTX.print.gif_transparent = transp;
-}
-
-void _save_ppm(char *name)
+int _save_ppm(char *name)
{
CreateOutputFile(name, FORMAT_PPM);
+ return 1;
}
-void _save_yuv(char *name)
+int _save_yuv(char *name)
{
CreateOutputFile(name, FORMAT_YUV);
+ return 1;
}
typedef struct{
char *pat;
- void (*func) (char *name);
+ int (*func) (char *name);
} patXfunc;
void file_save_as_cb(CALLBACK_ARGS)
@@ -698,36 +446,24 @@ void file_save_as_cb(CALLBACK_ARGS)
static char *pat = NULL;
static patXfunc formats[] = {
{"By extension (*)", _save_auto},
- {"Gmsh options (*.opt)", _save_geo_options},
- {"Gmsh modified options (*.opt)", _save_geo_options_diff},
+ {"Gmsh options (*.opt)", _save_options},
{"Gmsh unrolled geometry (*.geo)", _save_geo},
- {"Gmsh mesh v1.0 (*.msh)", _save_msh},
- {"Gmsh mesh v1.0 without physicals (*.msh)", _save_msh_all},
- {"Gmsh mesh v2.0 (*.msh)", _save_msh_v2},
- {"Gmsh mesh v2.0 without physicals (*.msh)", _save_msh_all_v2},
+ {"Gmsh mesh (*.msh)", _save_msh},
{"Gmsh surface LC field (*.pos)", _save_lc_sur},
{"Gmsh volume LC field (*.pos)", _save_lc_vol},
{"GREF mesh (*.gref)", _save_gref},
{"I-DEAS universal mesh format (*.unv)", _save_unv},
{"VRML surface mesh (*.wrl)", _save_vrml},
{"GIF (*.gif)", _save_gif},
- {"GIF dithered (*.gif)", _save_gif_dithered},
- {"GIF transparent (*.gif)", _save_gif_transparent},
#if defined(HAVE_LIBJPEG)
{"JPEG (*.jpg)", _save_jpeg},
#endif
#if defined(HAVE_LIBPNG)
{"PNG (*.png)", _save_png},
#endif
- {"Raster PS (*.ps)", _save_ps_raster},
- {"Raster EPS (*.eps)", _save_eps_raster},
- {"Raster PDF (*.pdf)", _save_pdf_raster},
- {"Vector PS fast (*.ps)", _save_ps_simple},
- {"Vector PS accurate (*.ps)", _save_ps_accurate},
- {"Vector EPS fast (*.eps)", _save_eps_simple},
- {"Vector EPS accurate (*.eps)", _save_eps_accurate},
- {"Vector PDF fast (*.pdf)", _save_pdf_simple},
- {"Vector PDF accurate (*.pdf)", _save_pdf_accurate},
+ {"PS (*.ps)", _save_ps},
+ {"EPS (*.eps)", _save_eps},
+ {"PDF (*.pdf)", _save_pdf},
{"PPM (*.ppm)", _save_ppm},
#if defined(HAVE_LIBJPEG)
{"LaTeX JPEG part (*.jpg)", _save_jpegtex},
@@ -735,14 +471,10 @@ void file_save_as_cb(CALLBACK_ARGS)
#if defined(HAVE_LIBPNG)
{"LaTeX PNG part (*.png)", _save_pngtex},
#endif
- {"LaTeX Raster EPS part (*.eps)", _save_epstex_raster},
- {"LaTeX Raster PDF part (*.pdf)", _save_pdftex_raster},
- {"LaTeX Vector EPS part fast (*.eps)", _save_epstex_simple},
- {"LaTeX Vector EPS part accurate (*.eps)", _save_epstex_accurate},
- {"LaTeX Vector PDF part fast (*.pdf)", _save_pdftex_simple},
- {"LaTeX Vector PDF part accurate (*.pdf)", _save_pdftex_accurate},
+ {"LaTeX EPS part (*.eps)", _save_epstex},
+ {"LaTeX PDF part (*.pdf)", _save_pdftex},
{"LaTeX TeX part (*.tex)", _save_tex},
- {"UCB YUV (*.yuv)", _save_yuv}
+ {"YUV (*.yuv)", _save_yuv}
};
nbformats = sizeof(formats) / sizeof(formats[0]);
@@ -756,28 +488,22 @@ void file_save_as_cb(CALLBACK_ARGS)
}
}
-test:
-
+ test:
if(file_chooser(0, 1, "Save file as", pat, patindex)) {
-
char *name = file_chooser_get_name(1);
-
if(CTX.confirm_overwrite) {
struct stat buf;
if(!stat(name, &buf))
- if(fl_ask("%s already exists.\nDo you want to replace it?", name))
- goto save;
- else
+ if(!fl_ask("%s already exists.\nDo you want to replace it?", name))
goto test;
}
-
- save:
i = file_chooser_get_filter();
- if(i >= 0 && i < nbformats)
- formats[i].func(name);
+ if(i >= 0 && i < nbformats){
+ if(!formats[i].func(name))
+ goto test;
+ }
else // handle any additional automatic fltk filter
_save_auto(name);
-
}
patindex = file_chooser_get_filter();
@@ -785,18 +511,15 @@ test:
void file_rename_cb(CALLBACK_ARGS)
{
-test:
- if(file_chooser(0, 1, "Rename current project file", "*", 0, CTX.filename)) {
+ test:
+ if(file_chooser(0, 1, "Rename project file", "*", 0, CTX.filename)) {
char *name = file_chooser_get_name(1);
if(CTX.confirm_overwrite) {
struct stat buf;
if(!stat(name, &buf))
- if(fl_ask("%s already exists.\nDo you want to replace it?", name))
- goto save;
- else
+ if(!fl_ask("%s already exists.\nDo you want to replace it?", name))
goto test;
}
- save:
rename(CTX.filename, name);
OpenProblem(name);
Draw();
@@ -1211,18 +934,15 @@ void message_clear_cb(CALLBACK_ARGS)
void message_save_cb(CALLBACK_ARGS)
{
-test:
+ test:
if(file_chooser(0, 1, "Save messages", "*", 0)) {
char *name = file_chooser_get_name(1);
if(CTX.confirm_overwrite) {
struct stat buf;
if(!stat(name, &buf))
- if(fl_ask("%s already exists.\nDo you want to replace it?", name))
- goto save;
- else
+ if(!fl_ask("%s already exists.\nDo you want to replace it?", name))
goto test;
}
- save:
WID->save_message(name);
}
}
@@ -1467,79 +1187,68 @@ void help_short_cb(CALLBACK_ARGS)
Msg(DIRECT, " Right arrow go to next time step");
Msg(DIRECT, " Up arrow make previous view visible");
Msg(DIRECT, " Down arrow make next view visible");
+ Msg(DIRECT, " ");
Msg(DIRECT, " < go back to previous context");
Msg(DIRECT, " > go forward to next context");
- Msg(DIRECT, " 0 or Esc reload geometry input file");
+ Msg(DIRECT, " 0 or Esc reload project file");
Msg(DIRECT, " 1 or F1 mesh lines");
Msg(DIRECT, " 2 or F2 mesh surfaces");
Msg(DIRECT, " 3 or F3 mesh volumes");
-
- Msg(DIRECT, " Alt+a hide/show small axes");
- Msg(DIRECT, " Alt+Shift+a hide/show big moving axes");
- Msg(DIRECT, " Ctrl+a raise (show) all open windows");
-
- Msg(DIRECT, " Alt+b hide/show all bounding boxes");
-
- Msg(DIRECT, " Alt+c loop through predefined color schemes");
- Msg(DIRECT, " Ctrl+Shift+c show clipping plane window");
-
- Msg(DIRECT, " Alt+d change mesh display mode (solid/wireframe)");
- Msg(DIRECT, " Shift+d decrease animation delay");
- Msg(DIRECT, " Ctrl+Shift+d increase animation delay");
-
- Msg(DIRECT, " Alt+f change redraw mode (fast/full)");
-
+ Msg(DIRECT, " ");
Msg(DIRECT, " g go to geometry module");
+ Msg(DIRECT, " m go to mesh module");
+ Msg(DIRECT, " p go to post-processing module");
+ Msg(DIRECT, " s go to solver module");
+ Msg(DIRECT, " ");
Msg(DIRECT, " Shift+g show geometry options");
-
- Msg(DIRECT, " Alt+h hide/show all post-processing views");
-
- Msg(DIRECT, " Alt+i hide/show all post-processing scales");
+ Msg(DIRECT, " Shift+m show mesh options");
+ Msg(DIRECT, " Shift+o show general options");
+ Msg(DIRECT, " Shift+p show post-processing options");
+ Msg(DIRECT, " Shift+s show solver options");
+ Msg(DIRECT, " Shift+w show post-processing view options");
+ Msg(DIRECT, " ");
+ Msg(DIRECT, " Ctrl+a bring all windows to front");
Msg(DIRECT, " Ctrl+i show statistics window");
-
- Msg(DIRECT, " Alt+l hide/show geometry lines");
- Msg(DIRECT, " Alt+Shift+l hide/show surface mesh edges");
Msg(DIRECT, " Ctrl+l show message console");
-
- Msg(DIRECT, " m go to mesh module");
- Msg(DIRECT, " Alt+m change visibility of all mesh entities");
- Msg(DIRECT, " Shift+m show mesh options");
Msg(DIRECT, " Ctrl+m merge file");
-
- Msg(DIRECT, " Shift+n show general options");
- Msg(DIRECT, " Ctrl+n new file");
-
- Msg(DIRECT, " Alt+o change projection mode (ortho/perspective)");
- Msg(DIRECT, " Ctrl+o open file");
- Msg(DIRECT, " Ctrl+Shift+o show option window");
-
- Msg(DIRECT, " p go to post-processor module");
- Msg(DIRECT, " Alt+p hide/show geometry points");
- Msg(DIRECT, " Shift+p show general post-processing options");
- Msg(DIRECT, " Alt+Shift+p hide/show mesh points");
-
+ Msg(DIRECT, " Ctrl+n new project file");
+ Msg(DIRECT, " Ctrl+o open project file");
Msg(DIRECT, " Ctrl+q quit");
-
- Msg(DIRECT, " Ctrl+r rename current project file");
-
- Msg(DIRECT, " Alt+s hide/show geometry surfaces");
- Msg(DIRECT, " Alt+Shift+s hide/show mesh surfaces");
+ Msg(DIRECT, " Ctrl+r rename project file");
Msg(DIRECT, " Ctrl+s save file as");
+ Msg(DIRECT, " ");
Msg(DIRECT, " Ctrl+Shift+s save mesh in default format");
-
+ Msg(DIRECT, " ");
+ Msg(DIRECT, " Ctrl+Alt+c show clipping plane window");
+ Msg(DIRECT, " Ctrl+Alt+o show option window");
+ Msg(DIRECT, " Ctrl+Alt+v show visibility window");
+ Msg(DIRECT, " ");
+ Msg(DIRECT, " Alt+a hide/show small axes");
+ Msg(DIRECT, " Alt+b hide/show bounding boxes");
+ Msg(DIRECT, " Alt+c loop through predefined color schemes");
+ Msg(DIRECT, " Alt+d change surface mesh display mode (solid/wireframe)");
+ Msg(DIRECT, " Alt+f change redraw mode (fast/full)");
+ Msg(DIRECT, " Alt+h hide/show all post-processing views");
+ Msg(DIRECT, " Alt+i hide/show all post-processing view scales");
+ Msg(DIRECT, " Alt+l hide/show geometry lines");
+ Msg(DIRECT, " Alt+m toggle visibility of all mesh entities");
+ Msg(DIRECT, " Alt+n hide/show all post-processing view annotations");
+ Msg(DIRECT, " Alt+o change projection mode (orthographic/perspective)");
+ Msg(DIRECT, " Alt+p hide/show geometry points");
+ Msg(DIRECT, " Alt+s hide/show geometry surfaces");
Msg(DIRECT, " Alt+t loop through interval modes for all post-processing views");
-
Msg(DIRECT, " Alt+v hide/show geometry volumes");
- Msg(DIRECT, " Alt+Shift+v hide/show mesh volumes");
- Msg(DIRECT, " Ctrl+Shift+v show visibility window");
-
Msg(DIRECT, " Alt+w enable/disable all lighting");
- Msg(DIRECT, " Shift+w show current post-processing view options");
-
Msg(DIRECT, " Alt+x set X view");
Msg(DIRECT, " Alt+y set Y view");
Msg(DIRECT, " Alt+z set Z view");
Msg(DIRECT, " ");
+ Msg(DIRECT, " Alt+Shift+a hide/show moving axes");
+ Msg(DIRECT, " Alt+Shift+l hide/show surface mesh edges");
+ Msg(DIRECT, " Alt+Shift+p hide/show mesh points");
+ Msg(DIRECT, " Alt+Shift+s hide/show mesh surfaces");
+ Msg(DIRECT, " Alt+Shift+v hide/show mesh volumes");
+ Msg(DIRECT, " ");
WID->create_message_window();
}
@@ -3195,18 +2904,15 @@ void view_save_ascii_cb(CALLBACK_ARGS)
{
Post_View *v = *(Post_View **) List_Pointer(CTX.post.list, (long)data);
-test:
+ test:
if(file_chooser(0, 1, "Save view in ASCII format", "*", 0, v->FileName)) {
char *name = file_chooser_get_name(1);
if(CTX.confirm_overwrite) {
struct stat buf;
if(!stat(name, &buf))
- if(fl_ask("%s already exists.\nDo you want to replace it?", name))
- goto save;
- else
+ if(!fl_ask("%s already exists.\nDo you want to replace it?", name))
goto test;
}
- save:
WriteView(v, name, 0, 0);
}
}
@@ -3215,18 +2921,15 @@ void view_save_binary_cb(CALLBACK_ARGS)
{
Post_View *v = *(Post_View **) List_Pointer(CTX.post.list, (long)data);
-test:
+ test:
if(file_chooser(0, 1, "Save view in binary format", "*", 0, v->FileName)) {
char *name = file_chooser_get_name(1);
if(CTX.confirm_overwrite) {
struct stat buf;
if(!stat(name, &buf))
- if(fl_ask("%s already exists.\nDo you want to replace it?", name))
- goto save;
- else
+ if(!fl_ask("%s already exists.\nDo you want to replace it?", name))
goto test;
}
- save:
WriteView(v, name, 1, 0);
}
}
@@ -3235,18 +2938,15 @@ void view_save_parsed_cb(CALLBACK_ARGS)
{
Post_View *v = *(Post_View **) List_Pointer(CTX.post.list, (long)data);
-test:
+ test:
if(file_chooser(0, 1, "Save view in parsed format", "*", 0, v->FileName)) {
char *name = file_chooser_get_name(1);
if(CTX.confirm_overwrite) {
struct stat buf;
if(!stat(name, &buf))
- if(fl_ask("%s already exists.\nDo you want to replace it?", name))
- goto save;
- else
+ if(!fl_ask("%s already exists.\nDo you want to replace it?", name))
goto test;
}
- save:
WriteView(v, name, 2, 0);
}
}
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index e69d5b4418..04426c5885 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.397 2004-12-29 20:01:30 geuzaine Exp $
+// $Id: GUI.cpp,v 1.398 2004-12-30 22:43:21 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -58,12 +58,6 @@
#define NB_BUTT_SCROLL 25
#define NB_HISTORY_MAX 1000
-#define WINDOW_BOX FL_FLAT_BOX
-#define TOGGLE_BOX FL_DOWN_BOX
-#define TOGGLE_COLOR FL_BLACK
-#define RADIO_BOX FL_ROUND_DOWN_BOX
-#define RADIO_COLOR FL_BLACK
-
#define IW (10*fontsize) // input field width
#define BB (7*fontsize) // width of a button with internal label
#define BH (2*fontsize+1) // button height
@@ -103,18 +97,18 @@ Fl_Menu_Item m_menubar_table[] = {
{"&Quit", FL_CTRL+'q', (Fl_Callback *)file_quit_cb, 0},
{0},
{"&Tools", 0, 0, 0, FL_SUBMENU},
- {"&Options...", FL_CTRL+FL_SHIFT+'o', (Fl_Callback *)options_cb, 0},
- {"&Visibility", FL_CTRL+FL_SHIFT+'v', (Fl_Callback *)visibility_cb, 0},
- {"&Clipping planes", FL_CTRL+FL_SHIFT+'c', (Fl_Callback *)clip_cb, 0, FL_MENU_DIVIDER},
- {"S&tatistics", FL_CTRL+'i', (Fl_Callback *)statistics_cb, 0, FL_MENU_DIVIDER},
+ {"&Options...", FL_CTRL+FL_ALT+'o', (Fl_Callback *)options_cb, 0},
+ {"&Visibility", FL_CTRL+FL_ALT+'v', (Fl_Callback *)visibility_cb, 0},
+ {"&Clipping planes", FL_CTRL+FL_ALT+'c', (Fl_Callback *)clip_cb, 0, FL_MENU_DIVIDER},
+ {"S&tatistics", FL_CTRL+'i', (Fl_Callback *)statistics_cb, 0},
{"M&essage console", FL_CTRL+'l', (Fl_Callback *)message_cb, 0},
{0},
{"&Help", 0, 0, 0, FL_SUBMENU},
- {"&Current options", 0, (Fl_Callback *)status_xyz1p_cb, (void*)5, FL_MENU_DIVIDER},
+ {"On&line documentation", 0, (Fl_Callback *)help_online_cb, 0, FL_MENU_DIVIDER},
{"M&ouse actions", 0, (Fl_Callback *)help_mouse_cb, 0},
{"&Keyboard shortcuts", 0, (Fl_Callback *)help_short_cb, 0},
- {"C&ommand line options", 0, (Fl_Callback *)help_command_line_cb, 0, FL_MENU_DIVIDER},
- {"On&line documentation", 0, (Fl_Callback *)help_online_cb, 0, FL_MENU_DIVIDER},
+ {"C&ommand line options", 0, (Fl_Callback *)help_command_line_cb, 0},
+ {"&Current options", 0, (Fl_Callback *)status_xyz1p_cb, (void*)5, FL_MENU_DIVIDER},
{"&About...", 0, (Fl_Callback *)help_about_cb, 0},
{0},
{0}
@@ -136,18 +130,18 @@ Fl_Menu_Item m_sys_menubar_table[] = {
{"Save Mesh", FL_CTRL+FL_SHIFT+'s', (Fl_Callback *)mesh_save_cb, 0},
{0},
{"Tools",0,0,0,FL_SUBMENU},
- {"Options...", FL_CTRL+FL_SHIFT+'o', (Fl_Callback *)options_cb, 0},
- {"Visibility", FL_CTRL+FL_SHIFT+'v', (Fl_Callback *)visibility_cb, 0},
- {"Clipping Planes", FL_CTRL+FL_SHIFT+'c', (Fl_Callback *)clip_cb, 0, FL_MENU_DIVIDER},
- {"Statistics", FL_CTRL+'i', (Fl_Callback *)statistics_cb, 0, FL_MENU_DIVIDER},
+ {"Options...", FL_CTRL+FL_ALT+'o', (Fl_Callback *)options_cb, 0},
+ {"Visibility", FL_CTRL+FL_ALT+'v', (Fl_Callback *)visibility_cb, 0},
+ {"Clipping Planes", FL_CTRL+FL_ALT+'c', (Fl_Callback *)clip_cb, 0, FL_MENU_DIVIDER},
+ {"Statistics", FL_CTRL+'i', (Fl_Callback *)statistics_cb, 0},
{"Message Console", FL_CTRL+'l', (Fl_Callback *)message_cb, 0},
{0},
{"Help",0,0,0,FL_SUBMENU},
- {"Current Options", 0, (Fl_Callback *)status_xyz1p_cb, (void*)5, FL_MENU_DIVIDER},
+ {"Online Documentation", 0, (Fl_Callback *)help_online_cb, 0, FL_MENU_DIVIDER},
{"Mouse Actions", 0, (Fl_Callback *)help_mouse_cb, 0},
{"Keyboard Shortcuts", 0, (Fl_Callback *)help_short_cb, 0},
- {"Command Line Options", 0, (Fl_Callback *)help_command_line_cb, 0, FL_MENU_DIVIDER},
- {"Online Documentation", 0, (Fl_Callback *)help_online_cb, 0, FL_MENU_DIVIDER},
+ {"Command Line Options", 0, (Fl_Callback *)help_command_line_cb, 0},
+ {"Current Options", 0, (Fl_Callback *)status_xyz1p_cb, (void*)5, FL_MENU_DIVIDER},
{"About Gmsh...", 0, (Fl_Callback *)help_about_cb, 0},
{0},
{0}
@@ -531,7 +525,7 @@ int GUI::global_shortcuts(int event)
if(m_window && m_window->shown()) m_window->show();
return 1;
}
- else if(Fl::test_shortcut(FL_SHIFT + 'n')) {
+ else if(Fl::test_shortcut(FL_SHIFT + 'o')) {
general_options_cb(0, 0);
return 1;
}
@@ -559,20 +553,6 @@ int GUI::global_shortcuts(int event)
create_view_options_window(0);
return 1;
}
- else if(Fl::test_shortcut(FL_CTRL + FL_SHIFT + 'd')) {
- opt_post_anim_delay(0, GMSH_SET | GMSH_GUI,
- opt_post_anim_delay(0, GMSH_GET, 0) + 0.01);
- return 1;
- }
- else if(Fl::test_shortcut(FL_SHIFT + 'd')) {
- opt_post_anim_delay(0, GMSH_SET | GMSH_GUI,
- opt_post_anim_delay(0, GMSH_GET, 0) - 0.01);
- return 1;
- }
- else if(Fl::test_shortcut(FL_CTRL + 'z')) {
- g_window->iconize();
- return 1;
- }
else if(Fl::test_shortcut(FL_ALT + 'f')) {
opt_general_fast_redraw(0, GMSH_SET | GMSH_GUI,
!opt_general_fast_redraw(0, GMSH_GET, 0));
@@ -776,7 +756,6 @@ GUI::GUI(int argc, char **argv)
int i;
// initialize static windows
- fc = NULL;
m_window = NULL;
g_window = NULL;
opt_window = NULL;
@@ -926,7 +905,7 @@ void GUI::create_menu_window(int argc, char **argv)
#endif
m_window = new Fl_Window(width, MH + NB_BUTT_SCROLL * BH, "Gmsh");
- m_window->box(WINDOW_BOX);
+ m_window->box(GMSH_WINDOW_BOX);
m_window->callback(file_quit_cb);
#if defined(__APPLE__) && defined(HAVE_FLTK_1_1_5_OR_ABOVE)
@@ -1588,7 +1567,7 @@ void GUI::create_option_window()
}
opt_window = new Fl_Window(width, height);
- opt_window->box(WINDOW_BOX);
+ opt_window->box(GMSH_WINDOW_BOX);
// Buttons
@@ -1632,47 +1611,47 @@ void GUI::create_option_window()
gen_butt[13] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 1 * BH, BW, BH, "Show tooltips");
gen_butt[13]->type(FL_TOGGLE_BUTTON);
- gen_butt[13]->down_box(TOGGLE_BOX);
- gen_butt[13]->selection_color(TOGGLE_COLOR);
+ gen_butt[13]->down_box(GMSH_TOGGLE_BOX);
+ gen_butt[13]->selection_color(GMSH_TOGGLE_COLOR);
gen_butt[0] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 2 * BH, BW, BH, "Show moving axes");
gen_butt[0]->tooltip("(Alt+Shift+a)");
gen_butt[0]->type(FL_TOGGLE_BUTTON);
- gen_butt[0]->down_box(TOGGLE_BOX);
- gen_butt[0]->selection_color(TOGGLE_COLOR);
+ gen_butt[0]->down_box(GMSH_TOGGLE_BOX);
+ gen_butt[0]->selection_color(GMSH_TOGGLE_COLOR);
gen_butt[1] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 3 * BH, BW, BH, "Show small axes");
gen_butt[1]->tooltip("(Alt+a)");
gen_butt[1]->type(FL_TOGGLE_BUTTON);
- gen_butt[1]->down_box(TOGGLE_BOX);
- gen_butt[1]->selection_color(TOGGLE_COLOR);
+ gen_butt[1]->down_box(GMSH_TOGGLE_BOX);
+ gen_butt[1]->selection_color(GMSH_TOGGLE_COLOR);
gen_butt[6] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 4 * BH, BW, BH, "Show bounding boxes");
gen_butt[6]->tooltip("(Alt+b)");
gen_butt[6]->type(FL_TOGGLE_BUTTON);
- gen_butt[6]->down_box(TOGGLE_BOX);
- gen_butt[6]->selection_color(TOGGLE_COLOR);
+ gen_butt[6]->down_box(GMSH_TOGGLE_BOX);
+ gen_butt[6]->selection_color(GMSH_TOGGLE_COLOR);
gen_butt[2] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 5 * BH, BW, BH, "Draw simplified model while rotating, panning and zooming");
gen_butt[2]->tooltip("(Alt+f)");
gen_butt[2]->type(FL_TOGGLE_BUTTON);
- gen_butt[2]->down_box(TOGGLE_BOX);
- gen_butt[2]->selection_color(TOGGLE_COLOR);
+ gen_butt[2]->down_box(GMSH_TOGGLE_BOX);
+ gen_butt[2]->selection_color(GMSH_TOGGLE_COLOR);
gen_butt[3] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 6 * BH, BW, BH, "Enable double buffering");
gen_butt[3]->type(FL_TOGGLE_BUTTON);
- gen_butt[3]->down_box(TOGGLE_BOX);
- gen_butt[3]->selection_color(TOGGLE_COLOR);
+ gen_butt[3]->down_box(GMSH_TOGGLE_BOX);
+ gen_butt[3]->selection_color(GMSH_TOGGLE_COLOR);
gen_butt[5] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 7 * BH, BW, BH, "Use trackball rotation mode instead of Euler angles");
gen_butt[5]->type(FL_TOGGLE_BUTTON);
- gen_butt[5]->down_box(TOGGLE_BOX);
- gen_butt[5]->selection_color(TOGGLE_COLOR);
+ gen_butt[5]->down_box(GMSH_TOGGLE_BOX);
+ gen_butt[5]->selection_color(GMSH_TOGGLE_COLOR);
gen_butt[15] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 8 * BH, BW, BH, "Rotate around pseudo center of mass");
gen_butt[15]->type(FL_TOGGLE_BUTTON);
- gen_butt[15]->down_box(TOGGLE_BOX);
- gen_butt[15]->selection_color(TOGGLE_COLOR);
+ gen_butt[15]->down_box(GMSH_TOGGLE_BOX);
+ gen_butt[15]->selection_color(GMSH_TOGGLE_COLOR);
gen_butt[15]->callback(general_options_rotation_center_cb);
gen_push_butt[0] = new Fl_Button(L + 2 * IW - 2 * WB, 2 * WB + 9 * BH, BB, BH, "Select");
@@ -1689,26 +1668,26 @@ void GUI::create_option_window()
Fl_Group *o = new Fl_Group(L + WB, WB + BH, width - 2 * WB, height - 2 * WB - BH, "Output");
gen_butt[7] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 1 * BH, BW, BH, "Print messages on terminal");
gen_butt[7]->type(FL_TOGGLE_BUTTON);
- gen_butt[7]->down_box(TOGGLE_BOX);
- gen_butt[7]->selection_color(TOGGLE_COLOR);
+ gen_butt[7]->down_box(GMSH_TOGGLE_BOX);
+ gen_butt[7]->selection_color(GMSH_TOGGLE_COLOR);
gen_butt[8] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 2 * BH, BW, BH, "Save session information on exit");
gen_butt[8]->type(FL_TOGGLE_BUTTON);
- gen_butt[8]->down_box(TOGGLE_BOX);
- gen_butt[8]->selection_color(TOGGLE_COLOR);
+ gen_butt[8]->down_box(GMSH_TOGGLE_BOX);
+ gen_butt[8]->selection_color(GMSH_TOGGLE_COLOR);
gen_butt[9] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 3 * BH, BW/2-WB, BH, "Save options on exit");
gen_butt[9]->type(FL_TOGGLE_BUTTON);
- gen_butt[9]->down_box(TOGGLE_BOX);
- gen_butt[9]->selection_color(TOGGLE_COLOR);
+ gen_butt[9]->down_box(GMSH_TOGGLE_BOX);
+ gen_butt[9]->selection_color(GMSH_TOGGLE_COLOR);
Fl_Button *b0 = new Fl_Button(L + width / 2, 2 * WB + 3 * BH, 2 * BB, BH, "Restore default options");
b0->callback(options_restore_defaults_cb);
gen_butt[14] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 4 * BH, BW, BH, "Ask confirmation before overwriting files");
gen_butt[14]->type(FL_TOGGLE_BUTTON);
- gen_butt[14]->down_box(TOGGLE_BOX);
- gen_butt[14]->selection_color(TOGGLE_COLOR);
+ gen_butt[14]->down_box(GMSH_TOGGLE_BOX);
+ gen_butt[14]->selection_color(GMSH_TOGGLE_COLOR);
gen_value[5] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 5 * BH, IW, BH, "Message verbosity");
gen_value[5]->minimum(0);
@@ -1879,8 +1858,8 @@ void GUI::create_option_window()
o->hide();
geo_butt[8] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 1 * BH, BW, BH, "Remove duplicate entities automatically");
geo_butt[8]->type(FL_TOGGLE_BUTTON);
- geo_butt[8]->down_box(TOGGLE_BOX);
- geo_butt[8]->selection_color(TOGGLE_COLOR);
+ geo_butt[8]->down_box(GMSH_TOGGLE_BOX);
+ geo_butt[8]->selection_color(GMSH_TOGGLE_COLOR);
o->end();
}
@@ -1890,46 +1869,46 @@ void GUI::create_option_window()
geo_butt[0] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 1 * BH, BW / 2 - WB, BH, "Points");
geo_butt[0]->tooltip("(Alt+p)");
geo_butt[0]->type(FL_TOGGLE_BUTTON);
- geo_butt[0]->down_box(TOGGLE_BOX);
- geo_butt[0]->selection_color(TOGGLE_COLOR);
+ geo_butt[0]->down_box(GMSH_TOGGLE_BOX);
+ geo_butt[0]->selection_color(GMSH_TOGGLE_COLOR);
geo_butt[1] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 2 * BH, BW / 2 - WB, BH, "Lines");
geo_butt[1]->tooltip("(Alt+l)");
geo_butt[1]->type(FL_TOGGLE_BUTTON);
- geo_butt[1]->down_box(TOGGLE_BOX);
- geo_butt[1]->selection_color(TOGGLE_COLOR);
+ geo_butt[1]->down_box(GMSH_TOGGLE_BOX);
+ geo_butt[1]->selection_color(GMSH_TOGGLE_COLOR);
geo_butt[2] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 3 * BH, BW / 2 - WB, BH, "Surfaces");
geo_butt[2]->tooltip("(Alt+s)");
geo_butt[2]->type(FL_TOGGLE_BUTTON);
- geo_butt[2]->down_box(TOGGLE_BOX);
- geo_butt[2]->selection_color(TOGGLE_COLOR);
+ geo_butt[2]->down_box(GMSH_TOGGLE_BOX);
+ geo_butt[2]->selection_color(GMSH_TOGGLE_COLOR);
geo_butt[3] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 4 * BH, BW / 2 - WB, BH, "Volumes");
geo_butt[3]->tooltip("(Alt+v)");
geo_butt[3]->type(FL_TOGGLE_BUTTON);
- geo_butt[3]->down_box(TOGGLE_BOX);
- geo_butt[3]->selection_color(TOGGLE_COLOR);
+ geo_butt[3]->down_box(GMSH_TOGGLE_BOX);
+ geo_butt[3]->selection_color(GMSH_TOGGLE_COLOR);
geo_butt[4] = new Fl_Check_Button(L + width / 2, 2 * WB + 1 * BH, BW / 2 - WB, BH, "Point numbers");
geo_butt[4]->type(FL_TOGGLE_BUTTON);
- geo_butt[4]->down_box(TOGGLE_BOX);
- geo_butt[4]->selection_color(TOGGLE_COLOR);
+ geo_butt[4]->down_box(GMSH_TOGGLE_BOX);
+ geo_butt[4]->selection_color(GMSH_TOGGLE_COLOR);
geo_butt[5] = new Fl_Check_Button(L + width / 2, 2 * WB + 2 * BH, BW / 2 - WB, BH, "Line numbers");
geo_butt[5]->type(FL_TOGGLE_BUTTON);
- geo_butt[5]->down_box(TOGGLE_BOX);
- geo_butt[5]->selection_color(TOGGLE_COLOR);
+ geo_butt[5]->down_box(GMSH_TOGGLE_BOX);
+ geo_butt[5]->selection_color(GMSH_TOGGLE_COLOR);
geo_butt[6] = new Fl_Check_Button(L + width / 2, 2 * WB + 3 * BH, BW / 2 - WB, BH, "Surface numbers");
geo_butt[6]->type(FL_TOGGLE_BUTTON);
- geo_butt[6]->down_box(TOGGLE_BOX);
- geo_butt[6]->selection_color(TOGGLE_COLOR);
+ geo_butt[6]->down_box(GMSH_TOGGLE_BOX);
+ geo_butt[6]->selection_color(GMSH_TOGGLE_COLOR);
geo_butt[7] = new Fl_Check_Button(L + width / 2, 2 * WB + 4 * BH, BW / 2 - WB, BH, "Volume numbers");
geo_butt[7]->type(FL_TOGGLE_BUTTON);
- geo_butt[7]->down_box(TOGGLE_BOX);
- geo_butt[7]->selection_color(TOGGLE_COLOR);
+ geo_butt[7]->down_box(GMSH_TOGGLE_BOX);
+ geo_butt[7]->selection_color(GMSH_TOGGLE_COLOR);
geo_value[0] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 5 * BH, IW, BH, "Normals");
geo_value[0]->minimum(0);
@@ -1996,8 +1975,8 @@ void GUI::create_option_window()
geo_butt[9] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 1 * BH, BW, BH, "Enable lighting");
geo_butt[9]->type(FL_TOGGLE_BUTTON);
- geo_butt[9]->down_box(TOGGLE_BOX);
- geo_butt[9]->selection_color(TOGGLE_COLOR);
+ geo_butt[9]->down_box(GMSH_TOGGLE_BOX);
+ geo_butt[9]->selection_color(GMSH_TOGGLE_COLOR);
geo_butt[9]->tooltip("(Alt+w)");
o->end();
@@ -2053,8 +2032,8 @@ void GUI::create_option_window()
mesh_butt[4] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 3 * BH, BW, BH, "Show interactive anisotropic mesh construction");
mesh_butt[4]->type(FL_TOGGLE_BUTTON);
- mesh_butt[4]->down_box(TOGGLE_BOX);
- mesh_butt[4]->selection_color(TOGGLE_COLOR);
+ mesh_butt[4]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[4]->selection_color(GMSH_TOGGLE_COLOR);
mesh_value[0] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 4 * BH, IW, BH, "Number of smoothing steps");
mesh_value[0]->minimum(0);
@@ -2082,21 +2061,21 @@ void GUI::create_option_window()
mesh_butt[2] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 8 * BH, BW, BH, "Optimize quality of tetrahedral elements");
mesh_butt[2]->type(FL_TOGGLE_BUTTON);
- mesh_butt[2]->down_box(TOGGLE_BOX);
- mesh_butt[2]->selection_color(TOGGLE_COLOR);
+ mesh_butt[2]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[2]->selection_color(GMSH_TOGGLE_COLOR);
#if !defined(HAVE_NETGEN)
mesh_butt[2]->deactivate();
#endif
mesh_butt[3] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 9 * BH, BW, BH, "Generate second order elements");
mesh_butt[3]->type(FL_TOGGLE_BUTTON);
- mesh_butt[3]->down_box(TOGGLE_BOX);
- mesh_butt[3]->selection_color(TOGGLE_COLOR);
+ mesh_butt[3]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[3]->selection_color(GMSH_TOGGLE_COLOR);
mesh_butt[5] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 10 * BH, BW, BH, "Constrain background mesh with characteristic length field");
mesh_butt[5]->type(FL_TOGGLE_BUTTON);
- mesh_butt[5]->down_box(TOGGLE_BOX);
- mesh_butt[5]->selection_color(TOGGLE_COLOR);
+ mesh_butt[5]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[5]->selection_color(GMSH_TOGGLE_COLOR);
o->end();
}
@@ -2106,58 +2085,58 @@ void GUI::create_option_window()
mesh_butt[6] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 1 * BH, BW / 2 - WB, BH, "Nodes");
mesh_butt[6]->tooltip("(Alt+Shift+p)");
mesh_butt[6]->type(FL_TOGGLE_BUTTON);
- mesh_butt[6]->down_box(TOGGLE_BOX);
- mesh_butt[6]->selection_color(TOGGLE_COLOR);
+ mesh_butt[6]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[6]->selection_color(GMSH_TOGGLE_COLOR);
mesh_butt[7] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 2 * BH, BW / 2 - WB, BH, "Line elements");
mesh_butt[7]->tooltip("(Alt+Shift+l)");
mesh_butt[7]->type(FL_TOGGLE_BUTTON);
- mesh_butt[7]->down_box(TOGGLE_BOX);
- mesh_butt[7]->selection_color(TOGGLE_COLOR);
+ mesh_butt[7]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[7]->selection_color(GMSH_TOGGLE_COLOR);
mesh_butt[8] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 3 * BH, BW / 2 - WB, BH, "Surface element edges");
mesh_butt[8]->tooltip("(Alt+Shift+s)");
mesh_butt[8]->type(FL_TOGGLE_BUTTON);
- mesh_butt[8]->down_box(TOGGLE_BOX);
- mesh_butt[8]->selection_color(TOGGLE_COLOR);
+ mesh_butt[8]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[8]->selection_color(GMSH_TOGGLE_COLOR);
mesh_butt[9] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 4 * BH, BW / 2 - WB, BH, "Surface element faces");
mesh_butt[9]->tooltip("(Alt+Shift+s, Alt+Shift+d)");
mesh_butt[9]->type(FL_TOGGLE_BUTTON);
- mesh_butt[9]->down_box(TOGGLE_BOX);
- mesh_butt[9]->selection_color(TOGGLE_COLOR);
+ mesh_butt[9]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[9]->selection_color(GMSH_TOGGLE_COLOR);
mesh_butt[10] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 5 * BH, BW / 2 - WB, BH, "Volume element edges");
mesh_butt[10]->tooltip("(Alt+Shift+v)");
mesh_butt[10]->type(FL_TOGGLE_BUTTON);
- mesh_butt[10]->down_box(TOGGLE_BOX);
- mesh_butt[10]->selection_color(TOGGLE_COLOR);
+ mesh_butt[10]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[10]->selection_color(GMSH_TOGGLE_COLOR);
mesh_butt[11] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 6 * BH, BW / 2 - WB, BH, "Volume element faces");
mesh_butt[11]->tooltip("(Alt+Shift+v)");
mesh_butt[11]->type(FL_TOGGLE_BUTTON);
- mesh_butt[11]->down_box(TOGGLE_BOX);
- mesh_butt[11]->selection_color(TOGGLE_COLOR);
+ mesh_butt[11]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[11]->selection_color(GMSH_TOGGLE_COLOR);
mesh_butt[12] = new Fl_Check_Button(L + width / 2, 2 * WB + 1 * BH, BW / 2 - WB, BH, "Node numbers");
mesh_butt[12]->type(FL_TOGGLE_BUTTON);
- mesh_butt[12]->down_box(TOGGLE_BOX);
- mesh_butt[12]->selection_color(TOGGLE_COLOR);
+ mesh_butt[12]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[12]->selection_color(GMSH_TOGGLE_COLOR);
mesh_butt[13] = new Fl_Check_Button(L + width / 2, 2 * WB + 2 * BH, BW / 2 - WB, BH, "Line element numbers");
mesh_butt[13]->type(FL_TOGGLE_BUTTON);
- mesh_butt[13]->down_box(TOGGLE_BOX);
- mesh_butt[13]->selection_color(TOGGLE_COLOR);
+ mesh_butt[13]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[13]->selection_color(GMSH_TOGGLE_COLOR);
mesh_butt[14] = new Fl_Check_Button(L + width / 2, 2 * WB + 3 * BH, BW / 2 - WB, BH, "Surface element numbers");
mesh_butt[14]->type(FL_TOGGLE_BUTTON);
- mesh_butt[14]->down_box(TOGGLE_BOX);
- mesh_butt[14]->selection_color(TOGGLE_COLOR);
+ mesh_butt[14]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[14]->selection_color(GMSH_TOGGLE_COLOR);
mesh_butt[15] = new Fl_Check_Button(L + width / 2, 2 * WB + 4 * BH, BW / 2 - WB, BH, "Volume element numbers");
mesh_butt[15]->type(FL_TOGGLE_BUTTON);
- mesh_butt[15]->down_box(TOGGLE_BOX);
- mesh_butt[15]->selection_color(TOGGLE_COLOR);
+ mesh_butt[15]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[15]->selection_color(GMSH_TOGGLE_COLOR);
mesh_value[4] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 7 * BH, IW / 2, BH);
mesh_value[4]->minimum(0);
@@ -2197,8 +2176,8 @@ void GUI::create_option_window()
mesh_butt[16] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 1 * BH, BW, BH, "Enable");
mesh_butt[16]->type(FL_TOGGLE_BUTTON);
- mesh_butt[16]->down_box(TOGGLE_BOX);
- mesh_butt[16]->selection_color(TOGGLE_COLOR);
+ mesh_butt[16]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[16]->selection_color(GMSH_TOGGLE_COLOR);
mesh_value[14] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 2 * BH, IW, BH, "A");
mesh_value[14]->align(FL_ALIGN_RIGHT);
@@ -2230,13 +2209,13 @@ void GUI::create_option_window()
mesh_butt[22] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 6 * BH, BW, BH, "Draw intersecting volume layer as surface");
mesh_butt[22]->type(FL_TOGGLE_BUTTON);
- mesh_butt[22]->down_box(TOGGLE_BOX);
- mesh_butt[22]->selection_color(TOGGLE_COLOR);
+ mesh_butt[22]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[22]->selection_color(GMSH_TOGGLE_COLOR);
mesh_butt[23] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 7 * BH, BW, BH, "Cut only volume elements");
mesh_butt[23]->type(FL_TOGGLE_BUTTON);
- mesh_butt[23]->down_box(TOGGLE_BOX);
- mesh_butt[23]->selection_color(TOGGLE_COLOR);
+ mesh_butt[23]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[23]->selection_color(GMSH_TOGGLE_COLOR);
o->end();
}
@@ -2252,8 +2231,8 @@ void GUI::create_option_window()
mesh_butt[0] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 2 * BH, BW, BH, "Draw nodes per element");
mesh_butt[0]->type(FL_TOGGLE_BUTTON);
- mesh_butt[0]->down_box(TOGGLE_BOX);
- mesh_butt[0]->selection_color(TOGGLE_COLOR);
+ mesh_butt[0]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[0]->selection_color(GMSH_TOGGLE_COLOR);
mesh_choice[0] = new Fl_Choice(L + 2 * WB, 2 * WB + 3 * BH, IW, BH, "Point display");
mesh_choice[0]->menu(menu_point_display);
@@ -2285,18 +2264,18 @@ void GUI::create_option_window()
mesh_butt[17] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 1 * BH, BW, BH, "Enable lighting");
mesh_butt[17]->tooltip("(Alt+w)");
mesh_butt[17]->type(FL_TOGGLE_BUTTON);
- mesh_butt[17]->down_box(TOGGLE_BOX);
- mesh_butt[17]->selection_color(TOGGLE_COLOR);
+ mesh_butt[17]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[17]->selection_color(GMSH_TOGGLE_COLOR);
mesh_butt[18] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 2 * BH, BW, BH, "Use two-side lighting");
mesh_butt[18]->type(FL_TOGGLE_BUTTON);
- mesh_butt[18]->down_box(TOGGLE_BOX);
- mesh_butt[18]->selection_color(TOGGLE_COLOR);
+ mesh_butt[18]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[18]->selection_color(GMSH_TOGGLE_COLOR);
mesh_butt[19] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 3 * BH, BW, BH, "Smooth normals");
mesh_butt[19]->type(FL_TOGGLE_BUTTON);
- mesh_butt[19]->down_box(TOGGLE_BOX);
- mesh_butt[19]->selection_color(TOGGLE_COLOR);
+ mesh_butt[19]->down_box(GMSH_TOGGLE_BOX);
+ mesh_butt[19]->selection_color(GMSH_TOGGLE_COLOR);
mesh_value[18] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 4 * BH, IW, BH, "Smoothing threshold angle");
mesh_value[18]->minimum(0.);
@@ -2392,18 +2371,18 @@ void GUI::create_option_window()
post_butt[0] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 3 * BH, BW, BH, "Cycle through views instead of time steps");
post_butt[0]->type(FL_TOGGLE_BUTTON);
- post_butt[0]->down_box(TOGGLE_BOX);
- post_butt[0]->selection_color(TOGGLE_COLOR);
+ post_butt[0]->down_box(GMSH_TOGGLE_BOX);
+ post_butt[0]->selection_color(GMSH_TOGGLE_COLOR);
post_butt[1] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 4 * BH, BW, BH, "Remove original views after combination");
post_butt[1]->type(FL_TOGGLE_BUTTON);
- post_butt[1]->down_box(TOGGLE_BOX);
- post_butt[1]->selection_color(TOGGLE_COLOR);
+ post_butt[1]->down_box(GMSH_TOGGLE_BOX);
+ post_butt[1]->selection_color(GMSH_TOGGLE_COLOR);
post_butt[2] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 5 * BH, BW, BH, "Draw value scales horizontally");
post_butt[2]->type(FL_TOGGLE_BUTTON);
- post_butt[2]->down_box(TOGGLE_BOX);
- post_butt[2]->selection_color(TOGGLE_COLOR);
+ post_butt[2]->down_box(GMSH_TOGGLE_BOX);
+ post_butt[2]->selection_color(GMSH_TOGGLE_COLOR);
o->end();
}
@@ -2423,18 +2402,18 @@ void GUI::create_option_window()
view_butt[1] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 1 * BH, BW / 2 - WB, BH, "3D view");
view_butt[1]->type(FL_RADIO_BUTTON);
- view_butt[1]->down_box(RADIO_BOX);
- view_butt[1]->selection_color(RADIO_COLOR);
+ view_butt[1]->down_box(GMSH_RADIO_BOX);
+ view_butt[1]->selection_color(GMSH_RADIO_COLOR);
view_butt[2] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 2 * BH, BW / 2 - WB, BH, "2D space table");
view_butt[2]->type(FL_RADIO_BUTTON);
- view_butt[2]->down_box(RADIO_BOX);
- view_butt[2]->selection_color(RADIO_COLOR);
+ view_butt[2]->down_box(GMSH_RADIO_BOX);
+ view_butt[2]->selection_color(GMSH_RADIO_COLOR);
view_butt[3] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 3 * BH, BW / 2 - WB, BH, "2D time table");
view_butt[3]->type(FL_RADIO_BUTTON);
- view_butt[3]->down_box(RADIO_BOX);
- view_butt[3]->selection_color(RADIO_COLOR);
+ view_butt[3]->down_box(GMSH_RADIO_BOX);
+ view_butt[3]->selection_color(GMSH_RADIO_COLOR);
int sw = (int)(1.5 * fontsize);
view_butt_rep[0] = new Fl_Repeat_Button(L + 2 * WB, 2 * WB + 4 * BH, sw, BH, "-");
@@ -2488,8 +2467,8 @@ void GUI::create_option_window()
view_butt[7] = new Fl_Check_Button(L + width / 2, 2 * WB + 1 * BH, BW / 2 - WB, BH, "Set position automatically");
view_butt[7]->type(FL_TOGGLE_BUTTON);
- view_butt[7]->down_box(TOGGLE_BOX);
- view_butt[7]->selection_color(TOGGLE_COLOR);
+ view_butt[7]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[7]->selection_color(GMSH_TOGGLE_COLOR);
view_value[20] = new Fl_Value_Input(L + width /2, 2 * WB + 2 * BH, IW / 2, BH);
view_value[20]->align(FL_ALIGN_RIGHT);
@@ -2521,43 +2500,43 @@ void GUI::create_option_window()
view_butt[13] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 1 * BH, BW / 2 - WB, BH, "Points");
view_butt[13]->type(FL_TOGGLE_BUTTON);
- view_butt[13]->down_box(TOGGLE_BOX);
- view_butt[13]->selection_color(TOGGLE_COLOR);
+ view_butt[13]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[13]->selection_color(GMSH_TOGGLE_COLOR);
view_butt[14] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 2 * BH, BW / 2 - WB, BH, "Lines");
view_butt[14]->type(FL_TOGGLE_BUTTON);
- view_butt[14]->down_box(TOGGLE_BOX);
- view_butt[14]->selection_color(TOGGLE_COLOR);
+ view_butt[14]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[14]->selection_color(GMSH_TOGGLE_COLOR);
view_butt[15] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 3 * BH, BW / 2 - WB, BH, "Triangles");
view_butt[15]->type(FL_TOGGLE_BUTTON);
- view_butt[15]->down_box(TOGGLE_BOX);
- view_butt[15]->selection_color(TOGGLE_COLOR);
+ view_butt[15]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[15]->selection_color(GMSH_TOGGLE_COLOR);
view_butt[16] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 4 * BH, BW / 2 - WB, BH, "Quadrangles");
view_butt[16]->type(FL_TOGGLE_BUTTON);
- view_butt[16]->down_box(TOGGLE_BOX);
- view_butt[16]->selection_color(TOGGLE_COLOR);
+ view_butt[16]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[16]->selection_color(GMSH_TOGGLE_COLOR);
view_butt[17] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 5 * BH, BW / 2 - WB, BH, "Tetrahedra");
view_butt[17]->type(FL_TOGGLE_BUTTON);
- view_butt[17]->down_box(TOGGLE_BOX);
- view_butt[17]->selection_color(TOGGLE_COLOR);
+ view_butt[17]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[17]->selection_color(GMSH_TOGGLE_COLOR);
view_butt[18] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 6 * BH, BW / 2 - WB, BH, "Hexahedra");
view_butt[18]->type(FL_TOGGLE_BUTTON);
- view_butt[18]->down_box(TOGGLE_BOX);
- view_butt[18]->selection_color(TOGGLE_COLOR);
+ view_butt[18]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[18]->selection_color(GMSH_TOGGLE_COLOR);
view_butt[19] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 7 * BH, BW / 2 - WB, BH, "Prisms");
view_butt[19]->type(FL_TOGGLE_BUTTON);
- view_butt[19]->down_box(TOGGLE_BOX);
- view_butt[19]->selection_color(TOGGLE_COLOR);
+ view_butt[19]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[19]->selection_color(GMSH_TOGGLE_COLOR);
view_butt[20] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 8 * BH, BW / 2 - WB, BH, "Pyramids");
view_butt[20]->type(FL_TOGGLE_BUTTON);
- view_butt[20]->down_box(TOGGLE_BOX);
- view_butt[20]->selection_color(TOGGLE_COLOR);
+ view_butt[20]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[20]->selection_color(GMSH_TOGGLE_COLOR);
view_value[0] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 9 * BH, IW, BH, "Normals");
view_value[0]->minimum(0);
@@ -2574,24 +2553,24 @@ void GUI::create_option_window()
view_butt[4] = new Fl_Check_Button(L + width / 2, 2 * WB + 1 * BH, BW / 2 - WB, BH, "Scale");
view_butt[4]->tooltip("(Alt+i)");
view_butt[4]->type(FL_TOGGLE_BUTTON);
- view_butt[4]->down_box(TOGGLE_BOX);
- view_butt[4]->selection_color(TOGGLE_COLOR);
+ view_butt[4]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[4]->selection_color(GMSH_TOGGLE_COLOR);
view_butt[8] = new Fl_Check_Button(L + width / 2, 2 * WB + 2 * BH, BW / 2 - WB, BH, "Step value");
view_butt[8]->type(FL_TOGGLE_BUTTON);
- view_butt[8]->down_box(TOGGLE_BOX);
- view_butt[8]->selection_color(TOGGLE_COLOR);
+ view_butt[8]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[8]->selection_color(GMSH_TOGGLE_COLOR);
view_butt[5] = new Fl_Check_Button(L + width / 2, 2 * WB + 3 * BH, BW / 2 - WB, BH, "Annotations");
view_butt[5]->tooltip("(Alt+n)");
view_butt[5]->type(FL_TOGGLE_BUTTON);
- view_butt[5]->down_box(TOGGLE_BOX);
- view_butt[5]->selection_color(TOGGLE_COLOR);
+ view_butt[5]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[5]->selection_color(GMSH_TOGGLE_COLOR);
view_butt[10] = new Fl_Check_Button(L + width / 2, 2 * WB + 4 * BH, BW / 2 - WB, BH, "Element edges");
view_butt[10]->type(FL_TOGGLE_BUTTON);
- view_butt[10]->down_box(TOGGLE_BOX);
- view_butt[10]->selection_color(TOGGLE_COLOR);
+ view_butt[10]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[10]->selection_color(GMSH_TOGGLE_COLOR);
static Fl_Menu_Item menu_boundary[] = {
{"None", 0, 0, 0},
@@ -2606,18 +2585,18 @@ void GUI::create_option_window()
view_butt[21] = new Fl_Check_Button(L + width / 2, 2 * WB + 6 * BH, BW / 2 - WB, BH, "Scalar values");
view_butt[21]->type(FL_TOGGLE_BUTTON);
- view_butt[21]->down_box(TOGGLE_BOX);
- view_butt[21]->selection_color(TOGGLE_COLOR);
+ view_butt[21]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[21]->selection_color(GMSH_TOGGLE_COLOR);
view_butt[22] = new Fl_Check_Button(L + width / 2, 2 * WB + 7 * BH, BW / 2 - WB, BH, "Vector values");
view_butt[22]->type(FL_TOGGLE_BUTTON);
- view_butt[22]->down_box(TOGGLE_BOX);
- view_butt[22]->selection_color(TOGGLE_COLOR);
+ view_butt[22]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[22]->selection_color(GMSH_TOGGLE_COLOR);
view_butt[23] = new Fl_Check_Button(L + width / 2, 2 * WB + 8 * BH, BW / 2 - WB, BH, "Tensor values");
view_butt[23]->type(FL_TOGGLE_BUTTON);
- view_butt[23]->down_box(TOGGLE_BOX);
- view_butt[23]->selection_color(TOGGLE_COLOR);
+ view_butt[23]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[23]->selection_color(GMSH_TOGGLE_COLOR);
o->end();
}
@@ -2671,8 +2650,8 @@ void GUI::create_option_window()
view_butt[38] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 7 * BH, BW, BH, "Saturate values");
view_butt[38]->type(FL_TOGGLE_BUTTON);
- view_butt[38]->down_box(TOGGLE_BOX);
- view_butt[38]->selection_color(TOGGLE_COLOR);
+ view_butt[38]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[38]->selection_color(GMSH_TOGGLE_COLOR);
view_value[33] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 8 * BH, IW, BH, "Maximal recursion level");
view_value[33]->align(FL_ALIGN_RIGHT);
@@ -2713,8 +2692,8 @@ void GUI::create_option_window()
view_butt[6] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 4 * BH, BW, BH, "Use general raise expressions");
view_butt[6]->type(FL_TOGGLE_BUTTON);
- view_butt[6]->down_box(TOGGLE_BOX);
- view_butt[6]->selection_color(TOGGLE_COLOR);
+ view_butt[6]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[6]->selection_color(GMSH_TOGGLE_COLOR);
view_choice[11] = new Fl_Choice(L + 2 * WB, 2 * WB + 5 * BH, IW, BH, "Raise data source");
view_choice[11]->align(FL_ALIGN_RIGHT);
@@ -2790,8 +2769,8 @@ void GUI::create_option_window()
view_butt[0] = new Fl_Check_Button(L + 2 * IW - 2 * WB, 2 * WB + 7 * BH, (int)(1.5*BB), BH, "Proportional");
view_butt[0]->type(FL_TOGGLE_BUTTON);
- view_butt[0]->down_box(TOGGLE_BOX);
- view_butt[0]->selection_color(TOGGLE_COLOR);
+ view_butt[0]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[0]->selection_color(GMSH_TOGGLE_COLOR);
view_value[63] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 8 * BH, IW, BH, "Displacement factor");
view_value[63]->minimum(0.);
@@ -2833,18 +2812,18 @@ void GUI::create_option_window()
view_butt[11] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 1 * BH, BW, BH, "Enable lighting");
view_butt[11]->tooltip("(Alt+w)");
view_butt[11]->type(FL_TOGGLE_BUTTON);
- view_butt[11]->down_box(TOGGLE_BOX);
- view_butt[11]->selection_color(TOGGLE_COLOR);
+ view_butt[11]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[11]->selection_color(GMSH_TOGGLE_COLOR);
view_butt[9] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 2 * BH, BW, BH, "Use two-side lighting");
view_butt[9]->type(FL_TOGGLE_BUTTON);
- view_butt[9]->down_box(TOGGLE_BOX);
- view_butt[9]->selection_color(TOGGLE_COLOR);
+ view_butt[9]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[9]->selection_color(GMSH_TOGGLE_COLOR);
view_butt[12] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 3 * BH, BW, BH, "Smooth normals");
view_butt[12]->type(FL_TOGGLE_BUTTON);
- view_butt[12]->down_box(TOGGLE_BOX);
- view_butt[12]->selection_color(TOGGLE_COLOR);
+ view_butt[12]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[12]->selection_color(GMSH_TOGGLE_COLOR);
view_value[10] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 4 * BH, IW, BH, "Smoothing threshold angle");
view_value[10]->minimum(0.);
@@ -2860,8 +2839,8 @@ void GUI::create_option_window()
view_butt[24] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 1 * BH, BW, BH, "Use fake transparency mode");
view_butt[24]->type(FL_TOGGLE_BUTTON);
- view_butt[24]->down_box(TOGGLE_BOX);
- view_butt[24]->selection_color(TOGGLE_COLOR);
+ view_butt[24]->down_box(GMSH_TOGGLE_BOX);
+ view_butt[24]->selection_color(GMSH_TOGGLE_COLOR);
Fl_Scroll *s = new Fl_Scroll(L + 2 * WB, 3 * WB + 2 * BH, IW + 20, height - 5 * WB - 2 * BH);
int i = 0;
@@ -3088,7 +3067,7 @@ void GUI::create_statistics_window()
int height = 5 * WB + 18 * BH;
stat_window = new Fl_Window(width, height, "Statistics");
- stat_window->box(WINDOW_BOX);
+ stat_window->box(GMSH_WINDOW_BOX);
{
Fl_Tabs *o = new Fl_Tabs(WB, WB, width - 2 * WB, height - 3 * WB - BH);
{
@@ -3264,7 +3243,7 @@ PluginDialogBox *GUI::create_plugin_window(GMSH_Plugin * p)
PluginDialogBox *pdb = new PluginDialogBox;
pdb->current_view_index = 0;
pdb->main_window = new Fl_Window(width, height);
- pdb->main_window->box(WINDOW_BOX);
+ pdb->main_window->box(GMSH_WINDOW_BOX);
sprintf(buffer, "%s Plugin", namep);
char *nbuffer = new char[strlen(buffer) + 1];
strcpy(nbuffer, buffer);
@@ -3346,7 +3325,7 @@ void GUI::create_message_window()
int height = CTX.msg_size[1];
msg_window = new Fl_Window(width, height, "Messages");
- msg_window->box(WINDOW_BOX);
+ msg_window->box(GMSH_WINDOW_BOX);
msg_browser = new Fl_Browser(WB, WB, width - 2 * WB, height - 3 * WB - BH);
msg_browser->textfont(FL_COURIER);
@@ -3458,7 +3437,7 @@ void GUI::create_visibility_window()
int height = 15 * BH;
vis_window = new Fl_Window(width, height, "Visibility");
- vis_window->box(WINDOW_BOX);
+ vis_window->box(GMSH_WINDOW_BOX);
int brw = width - 2 * WB;
@@ -3470,8 +3449,8 @@ void GUI::create_visibility_window()
vis_butt[0] = new Fl_Check_Button(3 * WB + 2 * (brw - 2 * WB) / 3, 1 * WB + 0 * BH, (brw - 2 * WB) / 3, BH, "Recursive");
vis_butt[0]->type(FL_TOGGLE_BUTTON);
- vis_butt[0]->down_box(TOGGLE_BOX);
- vis_butt[0]->selection_color(TOGGLE_COLOR);
+ vis_butt[0]->down_box(GMSH_TOGGLE_BOX);
+ vis_butt[0]->selection_color(GMSH_TOGGLE_COLOR);
vis_butt[0]->value(1);
Fl_Button *o0 = new Fl_Button(1 * WB, 2 * WB + 1 * BH, cols[0], BH, "*");
@@ -3583,7 +3562,7 @@ void GUI::create_clip_window()
int BW = width - brw - 3 * WB - 2 * fontsize;
clip_window = new Fl_Window(width, height, "Clipping Planes");
- clip_window->box(WINDOW_BOX);
+ clip_window->box(GMSH_WINDOW_BOX);
clip_browser = new Fl_Multi_Browser(1 * WB, 1 * WB, brw, 5 * BH);
clip_browser->callback(clip_update_cb);
@@ -3635,7 +3614,7 @@ void GUI::create_about_window()
int height = 15 * BH;
about_window = new Fl_Window(width, height, "About Gmsh");
- about_window->box(WINDOW_BOX);
+ about_window->box(GMSH_WINDOW_BOX);
{
Fl_Browser *o = new Fl_Browser(WB, WB, width - 2 * WB, height - 3 * WB - BH);
@@ -3718,7 +3697,7 @@ void GUI::create_geometry_context_window(int num)
int height = 5 * WB + 9 * BH;
context_geometry_window = new Fl_Window(width, height, "Contextual geometry definitions");
- context_geometry_window->box(WINDOW_BOX);
+ context_geometry_window->box(GMSH_WINDOW_BOX);
{
Fl_Tabs *o = new Fl_Tabs(WB, WB, width - 2 * WB, height - 3 * WB - BH);
// 0: Parameter
@@ -3866,7 +3845,7 @@ void GUI::create_mesh_context_window(int num)
int height = 5 * WB + 5 * BH;
context_mesh_window = new Fl_Window(width, height, "Contextual mesh definitions");
- context_mesh_window->box(WINDOW_BOX);
+ context_mesh_window->box(GMSH_WINDOW_BOX);
{
Fl_Tabs *o = new Fl_Tabs(WB, WB, width - 2 * WB, height - 3 * WB - BH);
// 0: Characteristic length
@@ -3949,7 +3928,7 @@ void GUI::create_solver_window(int num)
height = 8 * WB + 8 * BH; //minimum height required by Options tab
solver[num].window = new Fl_Window(width, height);
- solver[num].window->box(WINDOW_BOX);
+ solver[num].window->box(GMSH_WINDOW_BOX);
{
Fl_Tabs *o = new Fl_Tabs(WB, WB, width - 2 * WB, height - (3 + newrow) * WB - (1 + newrow) * BH);
{
@@ -3989,8 +3968,8 @@ void GUI::create_solver_window(int num)
solver[num].butt[1] = new Fl_Check_Button(2 * WB, 4 * WB + 5 * BH, LL, BH, "Merge views automatically");
for(i = 0; i < 3; i++) {
solver[num].butt[i]->type(FL_TOGGLE_BUTTON);
- solver[num].butt[i]->down_box(TOGGLE_BOX);
- solver[num].butt[i]->selection_color(TOGGLE_COLOR);
+ solver[num].butt[i]->down_box(GMSH_TOGGLE_BOX);
+ solver[num].butt[i]->selection_color(GMSH_TOGGLE_COLOR);
}
{
diff --git a/Fltk/GUI.h b/Fltk/GUI.h
index 07491413e2..c6f450f7e3 100644
--- a/Fltk/GUI.h
+++ b/Fltk/GUI.h
@@ -54,7 +54,6 @@
#include "Opengl_Window.h"
#include "Colorbar_Window.h"
-#include "File_Picker.h"
// The dynamic contexts
@@ -132,9 +131,6 @@ public:
Fl_Bitmap *ortho_bmp, *persp_bmp;
- // file chooser
- File_Picker *fc;
-
// menu window
Fl_Window *m_window ;
#if defined(__APPLE__) && defined(HAVE_FLTK_1_1_5_OR_ABOVE)
diff --git a/Fltk/GUI_Extras.cpp b/Fltk/GUI_Extras.cpp
new file mode 100644
index 0000000000..fd90bc8325
--- /dev/null
+++ b/Fltk/GUI_Extras.cpp
@@ -0,0 +1,502 @@
+// $Id: GUI_Extras.cpp,v 1.1 2004-12-30 22:43:22 geuzaine Exp $
+//
+// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems to <gmsh@geuz.org>.
+
+#include <FL/Fl_Window.H>
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Return_Button.H>
+#include <FL/Fl_Value_Slider.H>
+#include <errno.h>
+
+#include "Gmsh.h"
+#include "GmshUI.h"
+#include "Mesh.h"
+#include "File_Picker.h"
+#include "CreateFile.h"
+#include "Options.h"
+#include "Context.h"
+
+extern Context_T CTX;
+
+// File chooser
+
+static File_Picker *fc = NULL;
+
+int file_chooser(int multi, int create, const char *message,
+ const char *pat, int patindex, char *fname)
+{
+ static char oldfilter[1024];
+
+ Fl_File_Chooser::show_label = "Format:";
+ Fl_File_Chooser::all_files_label = "All files (*)";
+
+ if(!fc) {
+ fc = new File_Picker(getenv("PWD") ? "." : CTX.home_dir, pat,
+ Fl_File_Chooser::SINGLE, message);
+ fc->position(CTX.file_chooser_position[0], CTX.file_chooser_position[1]);
+ strncpy(oldfilter, pat, 1024);
+ }
+
+ fc->label(message);
+
+ if(fname)
+ fc->value(fname);
+
+ if(strncmp(oldfilter, pat, 1024)) {
+ strncpy(oldfilter, pat, 1024);
+ fc->filter(pat);
+ fc->filter_value(patindex);
+ }
+
+ if(multi)
+ fc->type(Fl_File_Chooser::MULTI);
+ else if(create)
+ fc->type(Fl_File_Chooser::CREATE);
+ else
+ fc->type(Fl_File_Chooser::SINGLE);
+
+ fc->show();
+
+ while(fc->shown())
+ Fl::wait();
+
+ if(fc->value())
+ return fc->count();
+ else
+ return 0;
+}
+
+char *file_chooser_get_name(int num)
+{
+ if(!fc)
+ return "";
+ return (char *)fc->value(num);
+}
+
+int file_chooser_get_filter()
+{
+ if(!fc)
+ return 0;
+ return fc->filter_value();
+}
+
+void file_chooser_get_position(int *x, int *y)
+{
+ if(!fc)
+ return;
+ *x = fc->x();
+ *y = fc->y();
+}
+
+// Arrow editor
+
+int arrow_editor(char *title, double &a, double &b, double &c)
+{
+ struct _editor{
+ Fl_Window *window;
+ Fl_Value_Slider *sa, *sb, *sc;
+ Fl_Button *apply, *cancel;
+ };
+ static _editor *editor = NULL;
+
+ if(!editor){
+ editor = new _editor;
+ editor->window = new Fl_Window(200, 140);
+ editor->sa = new Fl_Value_Slider(10, 10, 100, 25, "Head radius");
+ editor->sa->type(FL_HOR_SLIDER);
+ editor->sa->align(FL_ALIGN_RIGHT);
+ editor->sb = new Fl_Value_Slider(10, 40, 100, 25, "Stem length");
+ editor->sb->type(FL_HOR_SLIDER);
+ editor->sb->align(FL_ALIGN_RIGHT);
+ editor->sc = new Fl_Value_Slider(10, 70, 100, 25, "Stem radius");
+ editor->sc->type(FL_HOR_SLIDER);
+ editor->sc->align(FL_ALIGN_RIGHT);
+ editor->apply = new Fl_Return_Button(10, 105, 85, 25, "Apply");
+ editor->cancel = new Fl_Button(105, 105, 85, 25, "Cancel");
+ editor->window->end();
+ editor->window->hotspot(editor->window);
+ }
+
+ editor->window->label(title);
+ editor->sa->value(a);
+ editor->sb->value(b);
+ editor->sc->value(c);
+ editor->window->show();
+
+ while(editor->window->shown()){
+ Fl::wait();
+ for (;;) {
+ Fl_Widget* o = Fl::readqueue();
+ if (!o) break;
+ if (o == editor->apply) {
+ a = editor->sa->value();
+ b = editor->sb->value();
+ c = editor->sc->value();
+ return 1;
+ }
+ if (o == editor->window || o == editor->cancel){
+ editor->window->hide();
+ return 0;
+ }
+ }
+ }
+ return 0;
+}
+
+// jpeg dialog
+
+int jpeg_dialog(char *name, int TeX)
+{
+ struct _jpeg_dialog{
+ Fl_Window *window;
+ Fl_Value_Slider *s[2];
+ Fl_Button *ok, *cancel;
+ };
+ static _jpeg_dialog *dialog = NULL;
+
+ if(!dialog){
+ dialog = new _jpeg_dialog;
+ int h = 3*10 + 25 + 2*25, y = 0;
+ dialog->window = new Fl_Window(200, h, "JPEG options"); y = 10;
+ dialog->window->box(GMSH_WINDOW_BOX);
+ dialog->s[0] = new Fl_Value_Slider(10, y, 100, 25, "Quality"); y += 25;
+ dialog->s[0]->type(FL_HOR_SLIDER);
+ dialog->s[0]->align(FL_ALIGN_RIGHT);
+ dialog->s[0]->minimum(1);
+ dialog->s[0]->maximum(100);
+ dialog->s[0]->step(1);
+ dialog->s[1] = new Fl_Value_Slider(10, y, 100, 25, "Smoothing"); y += 25;
+ dialog->s[1]->type(FL_HOR_SLIDER);
+ dialog->s[1]->align(FL_ALIGN_RIGHT);
+ dialog->s[1]->minimum(0);
+ dialog->s[1]->maximum(100);
+ dialog->s[1]->step(1);
+ dialog->ok = new Fl_Return_Button(10, y+10, 85, 25, "OK");
+ dialog->cancel = new Fl_Button(105, y+10, 85, 25, "Cancel");
+ dialog->window->set_modal();
+ dialog->window->end();
+ dialog->window->hotspot(dialog->window);
+ }
+
+ dialog->s[0]->value(CTX.print.jpeg_quality);
+ dialog->s[1]->value(CTX.print.jpeg_smoothing);
+ dialog->window->show();
+
+ while(dialog->window->shown()){
+ Fl::wait();
+ for (;;) {
+ Fl_Widget* o = Fl::readqueue();
+ if (!o) break;
+ if (o == dialog->ok) {
+ CTX.print.jpeg_quality = (int)dialog->s[0]->value();
+ CTX.print.jpeg_smoothing = (int)dialog->s[1]->value();
+ CreateOutputFile(name, TeX ? FORMAT_JPEGTEX : FORMAT_JPEG);
+ dialog->window->hide();
+ return 1;
+ }
+ if (o == dialog->window || o == dialog->cancel){
+ dialog->window->hide();
+ return 0;
+ }
+ }
+ }
+ return 0;
+}
+
+// gif dialog
+
+int gif_dialog(char *name)
+{
+ struct _gif_dialog{
+ Fl_Window *window;
+ Fl_Check_Button *b[4];
+ Fl_Button *ok, *cancel;
+ };
+ static _gif_dialog *dialog = NULL;
+
+ if(!dialog){
+ dialog = new _gif_dialog;
+ int h = 3*10 + 25 + 4*25, y = 0;
+ dialog->window = new Fl_Window(200, h, "GIF options"); y = 10;
+ dialog->window->box(GMSH_WINDOW_BOX);
+ dialog->b[0] = new Fl_Check_Button(10, y, 180, 25, "Dither"); y += 25;
+ dialog->b[1] = new Fl_Check_Button(10, y, 180, 25, "Interlace"); y += 25;
+ dialog->b[2] = new Fl_Check_Button(10, y, 180, 25, "Sort colormap"); y += 25;
+ dialog->b[3] = new Fl_Check_Button(10, y, 180, 25, "Transparent background"); y += 25;
+ for(int i = 0; i < 4; i++){
+ dialog->b[i]->type(FL_TOGGLE_BUTTON);
+ dialog->b[i]->down_box(GMSH_TOGGLE_BOX);
+ dialog->b[i]->selection_color(GMSH_TOGGLE_COLOR);
+ }
+ dialog->ok = new Fl_Return_Button(10, y+10, 85, 25, "OK");
+ dialog->cancel = new Fl_Button(105, y+10, 85, 25, "Cancel");
+ dialog->window->set_modal();
+ dialog->window->end();
+ dialog->window->hotspot(dialog->window);
+ }
+
+ dialog->b[0]->value(CTX.print.gif_dither);
+ dialog->b[1]->value(CTX.print.gif_interlace);
+ dialog->b[2]->value(CTX.print.gif_sort);
+ dialog->b[3]->value(CTX.print.gif_transparent);
+ dialog->window->show();
+
+ while(dialog->window->shown()){
+ Fl::wait();
+ for (;;) {
+ Fl_Widget* o = Fl::readqueue();
+ if (!o) break;
+ if (o == dialog->ok) {
+ CTX.print.gif_dither = dialog->b[0]->value();
+ CTX.print.gif_interlace = dialog->b[1]->value();
+ CTX.print.gif_sort = dialog->b[2]->value();
+ CTX.print.gif_transparent = dialog->b[3]->value();
+ CreateOutputFile(name, FORMAT_GIF);
+ dialog->window->hide();
+ return 1;
+ }
+ if (o == dialog->window || o == dialog->cancel){
+ dialog->window->hide();
+ return 0;
+ }
+ }
+ }
+ return 0;
+}
+
+// ps/eps/pdf dialog
+
+static void activate_gl2ps_choices(int format, Fl_Check_Button *b[5])
+{
+#if defined(HAVE_LIBZ)
+ b[0]->activate();
+#else
+ b[0]->deactivate();
+#endif
+ switch(format){
+ case 0:
+ b[1]->deactivate(); b[2]->deactivate();
+ b[3]->deactivate(); b[4]->deactivate();
+ break;
+ case 1:
+ b[1]->activate(); b[2]->activate();
+ b[3]->deactivate(); b[4]->activate();
+ break;
+ case 2:
+ b[1]->activate(); b[2]->activate();
+ b[3]->activate(); b[4]->activate();
+ break;
+ }
+}
+
+int gl2ps_dialog(char *name, char *title, int format, int TeX)
+{
+ struct _gl2ps_dialog{
+ Fl_Window *window;
+ Fl_Check_Button *b[5];
+ Fl_Choice *c;
+ Fl_Button *ok, *cancel;
+ };
+ static _gl2ps_dialog *dialog = NULL;
+
+ static Fl_Menu_Item sortmenu[] = {
+ {"Raster image", 0, 0, 0},
+ {"Vector simple sort", 0, 0, 0},
+ {"Vector accurate sort", 0, 0, 0},
+ {0}
+ };
+
+ if(!dialog){
+ dialog = new _gl2ps_dialog;
+ int h = 3*10 + 25 + 6*25, y = 0;
+ dialog->window = new Fl_Window(200, h); y = 10;
+ dialog->window->box(GMSH_WINDOW_BOX);
+ dialog->c = new Fl_Choice(10, y, 145, 25, "Type"); y+= 25;
+ dialog->c->menu(sortmenu);
+ dialog->c->align(FL_ALIGN_RIGHT);
+ dialog->b[0] = new Fl_Check_Button(10, y, 180, 25, "Compress"); y += 25;
+ dialog->b[1] = new Fl_Check_Button(10, y, 180, 25, "Print background"); y += 25;
+ dialog->b[2] = new Fl_Check_Button(10, y, 180, 25, "Remove hidden primitives"); y += 25;
+ dialog->b[3] = new Fl_Check_Button(10, y, 180, 25, "Optimize BSP tree"); y += 25;
+ dialog->b[4] = new Fl_Check_Button(10, y, 180, 25, "Use level 3 shading"); y += 25;
+ for(int i = 0; i < 5; i++){
+ dialog->b[i]->type(FL_TOGGLE_BUTTON);
+ dialog->b[i]->down_box(GMSH_TOGGLE_BOX);
+ dialog->b[i]->selection_color(GMSH_TOGGLE_COLOR);
+ }
+ dialog->ok = new Fl_Return_Button(10, y+10, 85, 25, "OK");
+ dialog->cancel = new Fl_Button(105, y+10, 85, 25, "Cancel");
+ dialog->window->set_modal();
+ dialog->window->end();
+ dialog->window->hotspot(dialog->window);
+ }
+
+ dialog->window->label(title);
+ dialog->c->value(CTX.print.eps_quality);
+ dialog->b[0]->value(CTX.print.eps_compress);
+ dialog->b[1]->value(CTX.print.eps_background);
+ dialog->b[2]->value(CTX.print.eps_occlusion_culling);
+ dialog->b[3]->value(CTX.print.eps_best_root);
+ dialog->b[4]->value(CTX.print.eps_ps3shading);
+ activate_gl2ps_choices(CTX.print.eps_quality, dialog->b);
+ dialog->window->show();
+
+ while(dialog->window->shown()){
+ Fl::wait();
+ for (;;) {
+ Fl_Widget* o = Fl::readqueue();
+ if (!o) break;
+
+ if (o == dialog->c){
+ activate_gl2ps_choices(dialog->c->value(), dialog->b);
+ }
+ if (o == dialog->ok) {
+ CTX.print.eps_quality = dialog->c->value();
+ CTX.print.eps_compress = dialog->b[0]->value();
+ CTX.print.eps_background = dialog->b[1]->value();
+ CTX.print.eps_occlusion_culling = dialog->b[2]->value();
+ CTX.print.eps_best_root = dialog->b[3]->value();
+ CTX.print.eps_ps3shading = dialog->b[4]->value();
+ CreateOutputFile(name,
+ (format == 2) ? (TeX ? FORMAT_PDFTEX : FORMAT_PDF) :
+ (format == 1) ? (TeX ? FORMAT_EPSTEX : FORMAT_EPS) :
+ FORMAT_PS);
+ dialog->window->hide();
+ return 1;
+ }
+ if (o == dialog->window || o == dialog->cancel){
+ dialog->window->hide();
+ return 0;
+ }
+ }
+ }
+ return 0;
+}
+
+// gmsh options dialog
+
+int options_dialog(char *name)
+{
+ struct _options_dialog{
+ Fl_Window *window;
+ Fl_Check_Button *b;
+ Fl_Button *ok, *cancel;
+ };
+ static _options_dialog *dialog = NULL;
+
+ if(!dialog){
+ dialog = new _options_dialog;
+ int h = 3*10 + 25 + 1*25, y = 0;
+ dialog->window = new Fl_Window(200, h, "Gmsh Options"); y = 10;
+ dialog->window->box(GMSH_WINDOW_BOX);
+ dialog->b = new Fl_Check_Button(10, y, 180, 25, "Save only modified options"); y += 25;
+ dialog->b->value(1);
+ dialog->b->type(FL_TOGGLE_BUTTON);
+ dialog->b->down_box(GMSH_TOGGLE_BOX);
+ dialog->b->selection_color(GMSH_TOGGLE_COLOR);
+ dialog->ok = new Fl_Return_Button(10, y+10, 85, 25, "OK");
+ dialog->cancel = new Fl_Button(105, y+10, 85, 25, "Cancel");
+ dialog->window->set_modal();
+ dialog->window->end();
+ dialog->window->hotspot(dialog->window);
+ }
+
+ dialog->window->show();
+
+ while(dialog->window->shown()){
+ Fl::wait();
+ for (;;) {
+ Fl_Widget* o = Fl::readqueue();
+ if (!o) break;
+ if (o == dialog->ok) {
+ Print_Options(0, GMSH_FULLRC, dialog->b->value(), name);
+ dialog->window->hide();
+ return 1;
+ }
+ if (o == dialog->window || o == dialog->cancel){
+ dialog->window->hide();
+ return 0;
+ }
+ }
+ }
+ return 0;
+}
+
+// save msh dialog
+
+int msh_dialog(char *name)
+{
+ struct _msh_dialog{
+ Fl_Window *window;
+ Fl_Check_Button *b;
+ Fl_Choice *c;
+ Fl_Button *ok, *cancel;
+ };
+ static _msh_dialog *dialog = NULL;
+
+ static Fl_Menu_Item versionmenu[] = {
+ {"Version 1.0", 0, 0, 0},
+ {"Version 2.0", 0, 0, 0},
+ {0}
+ };
+
+ if(!dialog){
+ dialog = new _msh_dialog;
+ int h = 3*10 + 25 + 2*25, y = 0;
+ dialog->window = new Fl_Window(200, h, "MSH options"); y = 10;
+ dialog->window->box(GMSH_WINDOW_BOX);
+ dialog->c = new Fl_Choice(10, y, 130, 25, "Format"); y+= 25;
+ dialog->c->menu(versionmenu);
+ dialog->c->align(FL_ALIGN_RIGHT);
+ dialog->b = new Fl_Check_Button(10, y, 180, 25, "Save all elements"); y += 25;
+ dialog->b->type(FL_TOGGLE_BUTTON);
+ dialog->b->down_box(GMSH_TOGGLE_BOX);
+ dialog->b->selection_color(GMSH_TOGGLE_COLOR);
+ dialog->ok = new Fl_Return_Button(10, y+10, 85, 25, "OK");
+ dialog->cancel = new Fl_Button(105, y+10, 85, 25, "Cancel");
+ dialog->window->set_modal();
+ dialog->window->end();
+ dialog->window->hotspot(dialog->window);
+ }
+
+ dialog->c->value((CTX.mesh.msh_file_version==1.0) ? 0 : 1);
+ dialog->b->value(CTX.mesh.save_all);
+ dialog->window->show();
+
+ while(dialog->window->shown()){
+ Fl::wait();
+ for (;;) {
+ Fl_Widget* o = Fl::readqueue();
+ if (!o) break;
+ if (o == dialog->ok) {
+ CTX.mesh.msh_file_version = dialog->c->value() + 1;
+ CTX.mesh.save_all = dialog->b->value();
+ CreateOutputFile(name, FORMAT_MSH);
+ dialog->window->hide();
+ return 1;
+ }
+ if (o == dialog->window || o == dialog->cancel){
+ dialog->window->hide();
+ return 0;
+ }
+ }
+ }
+ return 0;
+}
diff --git a/Fltk/GUI_Extras.h b/Fltk/GUI_Extras.h
new file mode 100644
index 0000000000..4696a9c726
--- /dev/null
+++ b/Fltk/GUI_Extras.h
@@ -0,0 +1,38 @@
+#ifndef _GUI_EXTRAS_H_
+#define _GUI_EXTRAS_H_
+
+// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems to <gmsh@geuz.org>.
+
+int file_chooser(int multi, int create, const char *message,
+ const char *pat, int patindex, char *fname=NULL);
+char *file_chooser_get_name(int num);
+int file_chooser_get_filter();
+void file_chooser_get_position(int *x, int *y);
+
+int arrow_editor(char *title, double &a, double &b, double &c);
+
+int jpeg_dialog(char *filename, int TeX);
+int gif_dialog(char *filename);
+int gl2ps_dialog(char *filename, char *title, int format, int TeX);
+int options_dialog(char *filename);
+int msh_dialog(char *filename);
+
+#endif
+
diff --git a/Fltk/Makefile b/Fltk/Makefile
index 3c645f7b20..6925b99fcd 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.62 2004-12-24 18:12:22 geuzaine Exp $
+# $Id: Makefile,v 1.63 2004-12-30 22:43:22 geuzaine Exp $
#
# Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
#
@@ -28,7 +28,7 @@ CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE}
SRC = Main.cpp \
Message.cpp \
- GUI.cpp\
+ GUI.cpp GUI_Extras.cpp\
Callbacks.cpp\
Opengl.cpp\
Opengl_Window.cpp\
@@ -74,8 +74,7 @@ Main.o: Main.cpp ../Plugin/PluginManager.h ../Plugin/Plugin.h \
../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/STL.h ../Mesh/Metric.h \
../Mesh/Matrix.h ../Graphics/Draw.h ../Common/Context.h \
../Parser/Parser.h GUI.h Opengl_Window.h Colorbar_Window.h \
- File_Picker.h ../Parser/OpenFile.h ../Common/CommandLine.h \
- ../Numeric/Numeric.h
+ ../Parser/OpenFile.h ../Common/CommandLine.h ../Numeric/Numeric.h
Message.o: Message.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
@@ -84,7 +83,7 @@ Message.o: Message.cpp ../Common/Gmsh.h ../Common/Message.h \
../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
../Mesh/STL.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
../Mesh/Metric.h ../Mesh/Matrix.h Colorbar_Window.h \
- ../Common/ColorTable.h File_Picker.h
+ ../Common/ColorTable.h GUI_Extras.h
GUI.o: GUI.cpp ../Plugin/PluginManager.h ../Plugin/Plugin.h \
../Common/Options.h ../Common/Message.h ../Common/Views.h \
../Common/ColorTable.h ../DataStr/List.h ../Common/VertexArray.h \
@@ -96,8 +95,16 @@ GUI.o: GUI.cpp ../Plugin/PluginManager.h ../Plugin/Plugin.h \
../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/STL.h ../Mesh/Metric.h \
../Mesh/Matrix.h ../Graphics/Draw.h GUI.h Opengl_Window.h \
- Colorbar_Window.h File_Picker.h Callbacks.h Bitmaps.h Win32Icon.h \
+ Colorbar_Window.h Callbacks.h Bitmaps.h Win32Icon.h \
../Parser/OpenFile.h ../Common/CommandLine.h Solvers.h
+GUI_Extras.o: GUI_Extras.cpp ../Common/Gmsh.h ../Common/Message.h \
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
+ ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
+ ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/STL.h \
+ ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
+ ../Mesh/Matrix.h File_Picker.h ../Graphics/CreateFile.h \
+ ../Common/Options.h ../Common/Context.h
Callbacks.o: Callbacks.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
@@ -109,7 +116,7 @@ Callbacks.o: Callbacks.cpp ../Common/Gmsh.h ../Common/Message.h \
../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/Timer.h \
../Graphics/CreateFile.h ../Parser/OpenFile.h ../Common/CommandLine.h \
../Common/Context.h ../Common/Options.h GUI.h Opengl_Window.h \
- Colorbar_Window.h File_Picker.h Callbacks.h ../Plugin/Plugin.h \
+ Colorbar_Window.h GUI_Extras.h Callbacks.h ../Plugin/Plugin.h \
../Plugin/PluginManager.h ../Common/Visibility.h ../Geo/MinMax.h \
../Numeric/Numeric.h Solvers.h
Opengl.o: Opengl.cpp ../Common/Gmsh.h ../Common/Message.h \
@@ -121,8 +128,7 @@ Opengl.o: Opengl.cpp ../Common/Gmsh.h ../Common/Message.h \
../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
../Mesh/Matrix.h ../Graphics/Draw.h ../Common/Views.h \
../Common/ColorTable.h ../Common/GmshMatrix.h ../Common/AdaptiveViews.h \
- GUI.h Opengl_Window.h Colorbar_Window.h File_Picker.h \
- ../Graphics/gl2ps.h
+ GUI.h Opengl_Window.h Colorbar_Window.h ../Graphics/gl2ps.h
Opengl_Window.o: Opengl_Window.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h \
@@ -132,7 +138,7 @@ Opengl_Window.o: Opengl_Window.cpp ../Common/Gmsh.h ../Common/Message.h \
../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
../Mesh/Matrix.h ../Graphics/Draw.h ../Common/Views.h \
../Common/ColorTable.h ../Common/GmshMatrix.h ../Common/AdaptiveViews.h \
- GUI.h Opengl_Window.h Colorbar_Window.h File_Picker.h
+ GUI.h Opengl_Window.h Colorbar_Window.h
Colorbar_Window.o: Colorbar_Window.cpp ../Common/Gmsh.h \
../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
@@ -140,7 +146,7 @@ Colorbar_Window.o: Colorbar_Window.cpp ../Common/Gmsh.h \
../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/STL.h \
../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
- ../Mesh/Matrix.h Colorbar_Window.h ../Common/ColorTable.h File_Picker.h \
+ ../Mesh/Matrix.h Colorbar_Window.h ../Common/ColorTable.h \
../Common/Context.h
GmshServer.o: GmshServer.cpp ../Common/Context.h ../DataStr/List.h
Solvers.o: Solvers.cpp ../Common/Gmsh.h ../Common/Message.h \
@@ -151,6 +157,5 @@ Solvers.o: Solvers.cpp ../Common/Gmsh.h ../Common/Message.h \
../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
../Mesh/STL.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
../Mesh/Metric.h ../Mesh/Matrix.h Colorbar_Window.h \
- ../Common/ColorTable.h File_Picker.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/GmshMatrix.h ../Common/AdaptiveViews.h \
- ../Common/Context.h
+ ../Common/ColorTable.h ../Graphics/Draw.h ../Common/Views.h \
+ ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/Context.h
diff --git a/Fltk/Message.cpp b/Fltk/Message.cpp
index 78c501d6b1..f8f3982e6e 100644
--- a/Fltk/Message.cpp
+++ b/Fltk/Message.cpp
@@ -1,4 +1,4 @@
-// $Id: Message.cpp,v 1.59 2004-12-27 00:46:59 geuzaine Exp $
+// $Id: Message.cpp,v 1.60 2004-12-30 22:43:22 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -35,6 +35,7 @@
#include "Context.h"
#include "Options.h"
#include "GUI.h"
+#include "GUI_Extras.h"
extern GUI *WID;
extern Context_T CTX;
@@ -244,10 +245,8 @@ void Exit(int level)
CTX.ctx_position[1] = WID->context_geometry_window->y();
CTX.solver_position[0] = WID->solver[0].window->x();
CTX.solver_position[1] = WID->solver[0].window->y();
- if(WID->fc){
- CTX.file_chooser_position[0] = WID->fc->x();
- CTX.file_chooser_position[1] = WID->fc->y();
- }
+ file_chooser_get_position(&CTX.file_chooser_position[0],
+ &CTX.file_chooser_position[1]);
Print_Options(0, GMSH_SESSIONRC, false, CTX.session_filename_fullpath);
}
if(CTX.options_save)
diff --git a/Graphics/CreateFile.cpp b/Graphics/CreateFile.cpp
index 37c27d7e78..358536e0f2 100644
--- a/Graphics/CreateFile.cpp
+++ b/Graphics/CreateFile.cpp
@@ -1,4 +1,4 @@
-// $Id: CreateFile.cpp,v 1.61 2004-05-25 04:10:03 geuzaine Exp $
+// $Id: CreateFile.cpp,v 1.62 2004-12-30 22:43:22 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -141,7 +141,8 @@ void CreateOutputFile(char *name, int format)
CTX.print.gl_fonts = 1;
if(format == FORMAT_JPEG || format == FORMAT_JPEGTEX){
Msg(INFO, "Writing JPEG file '%s'", name);
- create_jpeg(fp, width, height, CTX.print.jpeg_quality);
+ create_jpeg(fp, width, height,
+ CTX.print.jpeg_quality, CTX.print.jpeg_smoothing);
Msg(INFO, "Wrote JPEG file '%s'", name);
}
else{
@@ -187,15 +188,10 @@ void CreateOutputFile(char *name, int format)
break;
case FORMAT_PS:
- case FORMAT_PS_RASTER:
case FORMAT_EPS:
- case FORMAT_EPS_RASTER:
case FORMAT_EPSTEX:
- case FORMAT_EPSTEX_RASTER:
case FORMAT_PDF:
- case FORMAT_PDF_RASTER:
case FORMAT_PDFTEX:
- case FORMAT_PDFTEX_RASTER:
if(!(fp = fopen(name, "wb"))) {
Msg(GERROR, "Unable to open file '%s'", name);
return;
@@ -203,13 +199,10 @@ void CreateOutputFile(char *name, int format)
switch(format){
case FORMAT_PDF:
- case FORMAT_PDF_RASTER:
case FORMAT_PDFTEX:
- case FORMAT_PDFTEX_RASTER:
psformat = GL2PS_PDF;
break;
case FORMAT_PS:
- case FORMAT_PS_RASTER:
psformat = GL2PS_PS;
break;
default:
@@ -218,21 +211,17 @@ void CreateOutputFile(char *name, int format)
}
{
- int raster = 0;
float *pixels = NULL;
- if(format == FORMAT_PS_RASTER ||
- format == FORMAT_EPS_RASTER || format == FORMAT_EPSTEX_RASTER ||
- format == FORMAT_PDF_RASTER || format == FORMAT_PDFTEX_RASTER){
- if(format == FORMAT_EPSTEX_RASTER || format == FORMAT_PDFTEX_RASTER)
+ if(CTX.print.eps_quality == 0){
+ if(format == FORMAT_EPSTEX || format == FORMAT_PDFTEX)
CTX.print.gl_fonts = 0;
FillBuffer();
CTX.print.gl_fonts = 1;
pixels = new float[width * height * 3];
glReadPixels(0, 0, width, height, GL_RGB, GL_FLOAT, pixels);
- raster = 1;
}
- pssort = (CTX.print.eps_quality == 1) ? GL2PS_SIMPLE_SORT : GL2PS_BSP_SORT;
+ pssort = (CTX.print.eps_quality == 2) ? GL2PS_BSP_SORT : GL2PS_SIMPLE_SORT;
psoptions =
GL2PS_SIMPLE_LINE_OFFSET | GL2PS_SILENT | GL2PS_NO_BLENDING |
(CTX.print.eps_occlusion_culling ? GL2PS_OCCLUSION_CULL : 0) |
@@ -241,9 +230,7 @@ void CreateOutputFile(char *name, int format)
(CTX.print.eps_compress ? GL2PS_COMPRESS : 0) |
(CTX.print.eps_ps3shading ? 0 : GL2PS_NO_PS3_SHADING) |
(format == FORMAT_EPSTEX ? GL2PS_NO_TEXT : 0) |
- (format == FORMAT_PDFTEX ? GL2PS_NO_TEXT : 0) |
- (format == FORMAT_EPSTEX_RASTER ? GL2PS_NO_TEXT : 0) |
- (format == FORMAT_PDFTEX_RASTER ? GL2PS_NO_TEXT : 0);
+ (format == FORMAT_PDFTEX ? GL2PS_NO_TEXT : 0);
Msg(INFO, "Writing %s file '%s'", (psformat == GL2PS_PDF) ? "PDF" : "PS/EPS", name);
@@ -254,7 +241,7 @@ void CreateOutputFile(char *name, int format)
gl2psBeginPage(CTX.base_filename, "Gmsh", viewport,
psformat, pssort, psoptions, GL_RGBA, 0, NULL,
15, 20, 10, size3d, fp, name);
- if(raster){
+ if(CTX.print.eps_quality == 0){
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glPushMatrix();
diff --git a/Graphics/gl2jpeg.cpp b/Graphics/gl2jpeg.cpp
index 8e9e3ad6ee..e2329fadbf 100644
--- a/Graphics/gl2jpeg.cpp
+++ b/Graphics/gl2jpeg.cpp
@@ -1,4 +1,4 @@
-/* $Id: gl2jpeg.cpp,v 1.21 2004-12-29 06:47:40 geuzaine Exp $ */
+/* $Id: gl2jpeg.cpp,v 1.22 2004-12-30 22:43:22 geuzaine Exp $ */
/*
* GL2JPEG, an OpenGL to JPEG Printing Library
* Copyright (C) 1999-2003 Christophe Geuzaine <geuz@geuz.org>
@@ -64,7 +64,8 @@ void my_output_message(j_common_ptr cinfo)
Msg(DEBUG, "%s", buffer);
}
-void create_jpeg(FILE * outfile, int width, int height, int quality)
+void create_jpeg(FILE * outfile, int width, int height,
+ int quality, int smoothing)
{
int i;
unsigned char *pixels;
@@ -85,6 +86,7 @@ void create_jpeg(FILE * outfile, int width, int height, int quality)
jpeg_set_defaults(&cinfo);
jpeg_set_quality(&cinfo, quality, TRUE);
cinfo.optimize_coding = TRUE;
+ cinfo.smoothing_factor = smoothing;
jpeg_start_compress(&cinfo, TRUE);
glPixelStorei(GL_PACK_ALIGNMENT, 1);
diff --git a/Graphics/gl2jpeg.h b/Graphics/gl2jpeg.h
index 31df62e4fb..95dae72651 100644
--- a/Graphics/gl2jpeg.h
+++ b/Graphics/gl2jpeg.h
@@ -34,6 +34,6 @@
#include <stdio.h>
void create_jpeg(FILE *outfile, int width, int height,
- int quality);
+ int quality, int smoothing);
#endif
diff --git a/Mesh/Mesh.h b/Mesh/Mesh.h
index c05895ea34..c28a666f06 100644
--- a/Mesh/Mesh.h
+++ b/Mesh/Mesh.h
@@ -56,11 +56,6 @@
#define FORMAT_PNGTEX 23
#define FORMAT_PDF 24
#define FORMAT_PDFTEX 25
-#define FORMAT_PS_RASTER 26
-#define FORMAT_EPS_RASTER 27
-#define FORMAT_PDF_RASTER 28
-#define FORMAT_EPSTEX_RASTER 29
-#define FORMAT_PDFTEX_RASTER 30
#define FORMAT_LC_SUR 31
#define FORMAT_LC_VOL 32
diff --git a/Parser/Makefile b/Parser/Makefile
index d185de6c81..9b3a64ec64 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.65 2004-12-30 04:08:46 geuzaine Exp $
+# $Id: Makefile,v 1.66 2004-12-30 22:43:22 geuzaine Exp $
#
# Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
#
@@ -97,5 +97,5 @@ OpenFile.o: OpenFile.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/ExtrudeParams.h ../Mesh/STL.h ../Mesh/Metric.h ../Mesh/Matrix.h \
../Geo/MinMax.h ../Common/Visibility.h ../Graphics/ReadImg.h \
../Common/GmshUI.h ../Graphics/Draw.h ../Fltk/GUI.h \
- ../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h ../Fltk/File_Picker.h
+ ../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h
FunctionManager.o: FunctionManager.cpp FunctionManager.h
diff --git a/Plugin/Makefile b/Plugin/Makefile
index db691b1386..ccda2d1e0d 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.72 2004-12-28 20:46:30 geuzaine Exp $
+# $Id: Makefile,v 1.73 2004-12-30 22:43:22 geuzaine Exp $
#
# Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
#
@@ -229,8 +229,7 @@ Annotate.o: Annotate.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
../Fltk/GUI.h ../Fltk/Opengl_Window.h ../Mesh/Mesh.h ../DataStr/Tree.h \
../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h \
../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/STL.h \
- ../Mesh/Metric.h ../Mesh/Matrix.h ../Fltk/Colorbar_Window.h \
- ../Fltk/File_Picker.h
+ ../Mesh/Metric.h ../Mesh/Matrix.h ../Fltk/Colorbar_Window.h
Remove.o: Remove.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
../Common/VertexArray.h ../Common/SmoothNormals.h \
diff --git a/doc/texinfo/shortcuts.texi b/doc/texinfo/shortcuts.texi
index a03acb1bdb..d8dc82b263 100644
--- a/doc/texinfo/shortcuts.texi
+++ b/doc/texinfo/shortcuts.texi
@@ -2,175 +2,142 @@ Keyboard shortcuts:
@table @kbd
@item Left arrow
-go to previous time step
-
+go to previous time step
@item Right arrow
-go to next time step
-
+go to next time step
@item Up arrow
-make previous view visible
-
+make previous view visible
@item Down arrow
-make next view visible
+make next view visible
+
+@sp 1 @c ----------------------------------------------
@item <
go back to previous context
-
@item >
go forward to next context
-
-@item 0
-@item Esc
-reload geometry input file
-
-@item 1
-@item F1
-mesh curves
-
-@item 2
-@item F2
+@item 0 or Esc
+reload project file
+@item 1 or F1
+mesh lines
+@item 2 or F2
mesh surfaces
-
-@item 3
-@item F3
+@item 3 or F3
mesh volumes
-@item Alt+a
-hide/show small axes
-
-@item Alt+Shift+a
-hide/show big moving axes
-
-@item Ctrl+a
-raise (show) all open windows
-
-@item Alt+b
-hide/show all bounding boxes
-
-@item Alt+c
-loop through predefined color schemes
-
-@item Ctrl+Shift+c
-show clipping plane window
-
-@item Alt+d
-change mesh display mode (solid/wireframe)
-
-@item Shift+d
-decrease animation delay
-
-@item Ctrl+Shift+d
-increase animation delay
-
-@item Alt+f
-change redraw mode (fast/full)
+@sp 1 @c ----------------------------------------------
@item g
go to geometry module
+@item m
+go to mesh module
+@item p
+go to post-processing module
+@item s
+go to solver module
+
+@sp 1 @c ----------------------------------------------
@item Shift+g
show geometry options
+@item Shift+m
+show mesh options
+@item Shift+o
+show general options
+@item Shift+p
+show post-processing options
+@item Shift+s
+show solver options
+@item Shift+w
+show post-processing view options
-@item Alt+h
-hide/show all post-processing views
-
-@item Alt+i
-hide/show all post-processing scales
+@sp 1 @c ----------------------------------------------
+@item Ctrl+a
+bring all windows to front
@item Ctrl+i
-show statistics window
-
-@item Alt+l
-hide/show geometry lines
-
-@item Alt+Shift+l
-hide/show surface mesh edges
-
+show statistics window
@item Ctrl+l
show message console
-
-@item m
-go to mesh module
-
-@item Alt+m
-change visibility of all mesh entities
-
-@item Shift+m
-show mesh options
-
@item Ctrl+m
-merge file
-
-@item Shift+n
-show general options
-
+merge file(s)
@item Ctrl+n
-new file
-
-@item Alt+o
-change projection mode (ortho/perspective)
-
+new project file
@item Ctrl+o
-open file
-
-@item Ctrl+Shift+o
-show option window
-
-@item p
-go to post-processor module
-
-@item Alt+p
-hide/show geometry points
-
-@item Shift+p
-show general post-processing options
-
-@item Alt+Shift+p
-hide/show mesh points
-
+open project file
@item Ctrl+q
quit
-
@item Ctrl+r
-rename current project file
-
-@item Alt+s
-hide/show geometry surfaces
-
-@item Alt+Shift+s
-hide/show mesh surfaces
-
+rename project file
@item Ctrl+s
save file as
+@sp 1 @c ----------------------------------------------
+
@item Ctrl+Shift+s
save mesh in default format
-@item Alt+t
-loop through interval modes for all post-processing views
-
-@item Alt+v
-hide/show geometry volumes
+@sp 1 @c ----------------------------------------------
-@item Alt+Shift+v
-hide/show mesh volumes
-
-@item Ctrl+Shift+v
+@item Ctrl+Alt+c
+show clipping plane window
+@item Ctrl+Alt+o
+show option window
+@item Ctrl+Alt+v
show visibility window
+@sp 1 @c ----------------------------------------------
+
+@item Alt+a
+hide/show small axes
+@item Alt+b
+hide/show bounding boxes
+@item Alt+c
+loop through predefined color schemes
+@item Alt+d
+change surface mesh display mode (solid/wireframe)
+@item Alt+f
+change redraw mode (fast/full)
+@item Alt+h
+hide/show all post-processing views
+@item Alt+i
+hide/show all post-processing view scales
+@item Alt+l
+hide/show geometry lines
+@item Alt+m
+toggle visibility of all mesh entities
+@item Alt+n
+hide/show all post-processing view annotations
+@item Alt+o
+change projection mode (orthographic/perspective)
+@item Alt+p
+hide/show geometry points
+@item Alt+s
+hide/show geometry surfaces
+@item Alt+t
+loop through interval modes for all post-processing views
+@item Alt+v
+hide/show geometry volumes
@item Alt+w
enable/disable all lighting
-
-@item Shift+w
-show current post-processing view options
-
@item Alt+x
-set X view
-
+set X view
@item Alt+y
-set Y view
-
+set Y view
@item Alt+z
-set Z view
+set Z view
+
+@sp 1 @c ----------------------------------------------
+
+@item Alt+Shift+a
+hide/show moving axes
+@item Alt+Shift+l
+hide/show surface mesh edges
+@item Alt+Shift+p
+hide/show mesh points
+@item Alt+Shift+s
+hide/show mesh surfaces
+@item Alt+Shift+v
+hide/show mesh volumes
@end table
--
GitLab