diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 66883f0b02f6e8bc7aa85b4482a4baea5aad455e..d2b93c38df2722099db4b0774efb5e4b40a59f73 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -62,6 +62,8 @@ StringXString GeneralOptions_String[] = {
{ F, "FileName" , opt_general_filename , "" ,
"Current project file name (read-only)" },
+ { F|O, "FltkTheme" , opt_general_gui_theme , "" ,
+ "FLTK user interface theme (try e.g. plastic or gtk+)" },
{ F|O, "GraphicsFont" , opt_general_graphics_font , "Helvetica" ,
"Font used in the graphic window" },
@@ -71,8 +73,6 @@ StringXString GeneralOptions_String[] = {
{ 0, "SessionFileName" , opt_general_session_filename , ".gmshrc" ,
"Option file into which session specific information is saved; automatically read on startup" },
- { F|O, "FltkTheme" , opt_general_gui_theme , "" ,
- "FLTK user interface theme (try e.g. plastic or gtk+)" },
{ F|O, "TextEditor" , opt_general_editor ,
#if defined(WIN32)
@@ -470,8 +470,10 @@ StringXNumber GeneralOptions_Number[] = {
"Number of tics on the Y-axis" },
{ F|O, "AxesTicsZ" , opt_general_axes_tics2 , 5. ,
"Number of tics on the Z-axis" },
+
{ F|O, "BackgroundGradient" , opt_general_background_gradient , 1. ,
"Draw background gradient (0=none, 1=vertical, 2=horizontal, 3=radial)" },
+
{ F, "Clip0" , opt_general_clip0 , 0. ,
"Enable clipping plane 0 (Geometry=2^0, Mesh=2^1, View[i]=2^(2+i))" },
{ F, "Clip0A" , opt_general_clip0a , 1.0 ,
@@ -898,6 +900,8 @@ StringXNumber MeshOptions_Number[] = {
{ F|O, "Hexahedra" , opt_mesh_hexahedra , 1. ,
"Display mesh hexahedra?" },
+ { F|O, "LabelsFrequency" , opt_mesh_label_frequency , 100. ,
+ "Labels display frequency?" },
{ F|O, "LabelType" , opt_mesh_label_type , 0. ,
"Type of element label (0=element number, 1=elementary entity number, 2=physical entity number, 3=partition number, 4=coordinates)" },
{ F|O, "Light" , opt_mesh_light , 1. ,
@@ -1008,9 +1012,6 @@ StringXNumber MeshOptions_Number[] = {
{ F|O, "VolumeNumbers" , opt_mesh_volumes_num , 0. ,
"Display volume mesh element numbers?" },
- { F|O, "LabelsFrequency" , opt_mesh_label_frequency , 100. ,
- "Labels display frequency?" },
-
{ 0, NULL , NULL , 0. , NULL }
} ;
@@ -1018,16 +1019,32 @@ StringXNumber SolverOptions_Number[] = {
{ F|O, "AlwaysListen" , opt_solver_listen , 0. ,
"Always listen to incoming connection requests?" },
+ { F|O, "ClientServer0" , opt_solver_client_server0 , 1. ,
+ "Connect solver 0 to the Gmsh server" },
+ { F|O, "ClientServer1" , opt_solver_client_server1 , 0. ,
+ "Connect solver 1 to the Gmsh server" },
+ { F|O, "ClientServer2" , opt_solver_client_server2 , 0. ,
+ "Connect solver 2 to the Gmsh server" },
+ { F|O, "ClientServer3" , opt_solver_client_server3 , 0. ,
+ "Connect solver 3 to the Gmsh server" },
+ { F|O, "ClientServer4" , opt_solver_client_server4 , 0. ,
+ "Connect solver 4 to the Gmsh server" },
+
{ F|O, "MaximumDelay" , opt_solver_max_delay , 4.0 ,
"Maximum delay (in seconds) allowed for solver response" },
+ { F|O, "MergeViews0" , opt_solver_merge_views0 , 1. ,
+ "Automatically merge any post-processing view created by solver 0" },
+ { F|O, "MergeViews1" , opt_solver_merge_views1 , 1. ,
+ "Automatically merge any post-processing view created by solver 1" },
+ { F|O, "MergeViews2" , opt_solver_merge_views2 , 1. ,
+ "Automatically merge any post-processing view created by solver 2" },
+ { F|O, "MergeViews3" , opt_solver_merge_views3 , 1. ,
+ "Automatically merge any post-processing view created by solver 3" },
+ { F|O, "MergeViews4" , opt_solver_merge_views4 , 1. ,
+ "Automatically merge any post-processing view created by solver 4" },
{ F|O, "Plugins" , opt_solver_plugins , 0. ,
"Enable default solver plugins?" },
-
- { F|O, "ClientServer0" , opt_solver_client_server0 , 1. ,
- "Connect solver 0 to the Gmsh server" },
- { F|O, "MergeViews0" , opt_solver_merge_views0 , 1. ,
- "Automatically merge any post-processing view created by solver 0" },
{ F|O, "PopupMessages0" , opt_solver_popup_messages0 ,
#if defined(WIN32)
0. , // we already have the transient DOS window
@@ -1035,32 +1052,12 @@ StringXNumber SolverOptions_Number[] = {
1. ,
#endif
"Automatically display messages produced by solver 0" },
-
- { F|O, "ClientServer1" , opt_solver_client_server1 , 0. ,
- "Connect solver 1 to the Gmsh server" },
- { F|O, "MergeViews1" , opt_solver_merge_views1 , 1. ,
- "Automatically merge any post-processing view created by solver 1" },
{ F|O, "PopupMessages1" , opt_solver_popup_messages1 , 1. ,
"Automatically display messages produced by solver 1" },
-
- { F|O, "ClientServer2" , opt_solver_client_server2 , 0. ,
- "Connect solver 2 to the Gmsh server" },
- { F|O, "MergeViews2" , opt_solver_merge_views2 , 1. ,
- "Automatically merge any post-processing view created by solver 2" },
{ F|O, "PopupMessages2" , opt_solver_popup_messages2 , 1. ,
"Automatically display messages produced by solver 2" },
-
- { F|O, "ClientServer3" , opt_solver_client_server3 , 0. ,
- "Connect solver 3 to the Gmsh server" },
- { F|O, "MergeViews3" , opt_solver_merge_views3 , 1. ,
- "Automatically merge any post-processing view created by solver 3" },
{ F|O, "PopupMessages3" , opt_solver_popup_messages3 , 1. ,
"Automatically display messages produced by solver 3" },
-
- { F|O, "ClientServer4" , opt_solver_client_server4 , 0. ,
- "Connect solver 4 to the Gmsh server" },
- { F|O, "MergeViews4" , opt_solver_merge_views4 , 1. ,
- "Automatically merge any post-processing view created by solver 4" },
{ F|O, "PopupMessages4" , opt_solver_popup_messages4 , 1. ,
"Automatically display messages produced by solver 4" },
@@ -1159,7 +1156,6 @@ StringXNumber ViewOptions_Number[] = {
"Incremental colormap rotation" },
{ F|O, "ColormapSwap" , opt_view_colormap_swap , 0. ,
"Swap the min/max values in the colormap?" },
-
{ F, "CustomMax" , opt_view_custom_max , 0. ,
"User-defined maximum value to be displayed" },
{ F, "CustomMin" , opt_view_custom_min , 0. ,
@@ -1312,7 +1308,7 @@ StringXNumber ViewOptions_Number[] = {
"Element (3,2) of the 3x3 coordinate transformation matrix" },
{ F, "Transform33" , opt_view_transform22 , 1. ,
"Element (3,3) of the 3x3 coordinate transformation matrix" },
- { F, "Type" , opt_view_type , DRAW_POST_3D ,
+ { F, "Type" , opt_view_type , DRAW_POST_3D ,
"Type of plot (1=3D, 2=2D space, 3=2D time)" },
{ F|O, "UseGeneralizedRaise" , opt_view_use_gen_raise , 0 ,
diff --git a/Fltk/Main.cpp b/Fltk/Main.cpp
index daaed384ef39db2d1f7c2b0b364c4544088e0713..106199bf4a574ec8ad04b0ec0ca0574de2b19776 100644
--- a/Fltk/Main.cpp
+++ b/Fltk/Main.cpp
@@ -1,4 +1,4 @@
-// $Id: Main.cpp,v 1.103 2007-01-22 16:31:42 geuzaine Exp $
+// $Id: Main.cpp,v 1.104 2007-02-04 11:24:55 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -31,7 +31,6 @@
#include "Draw.h"
#include "Context.h"
#include "Options.h"
-#include "ColorTable.h"
#include "Parser.h"
#include "OpenFile.h"
#include "CommandLine.h"
diff --git a/Geo/GeoStringInterface.cpp b/Geo/GeoStringInterface.cpp
index feb136c497c994c2d1855a7c3708bbf66427f524..432e6b028b79976a15cce05925fdc2bc8d779cc0 100644
--- a/Geo/GeoStringInterface.cpp
+++ b/Geo/GeoStringInterface.cpp
@@ -1,4 +1,4 @@
-// $Id: GeoStringInterface.cpp,v 1.6 2007-02-03 11:21:40 geuzaine Exp $
+// $Id: GeoStringInterface.cpp,v 1.7 2007-02-04 11:24:55 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -115,9 +115,9 @@ void add_infile(char *text, char *fich, bool deleted_something)
char question[1024];
sprintf(question,
"Are you sure you want to append a scripting command to a\n"
- "non-geometry file?\n\n"
- "If not, you should use a `.geo' file containing the command\n"
- "Merge \"%s\".\n\n"
+ "non-`.geo' file? If not, create a `.geo' file containing\n\n"
+ "Merge \"%s\";\n\n"
+ "and use that file instead.\n\n"
"(To disable this warning in the future, select `Enable expert\n"
"mode' in the option dialog.)", fich);
if(!GetBinaryAnswer(question, "Append", "Cancel", false)){
diff --git a/Parser/Makefile b/Parser/Makefile
index 901a15fbb276ccf4d7e79dfac01773cdf356f6bf..c2fcdc385f7dc38dd74a168a625086d349850f0a 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.113 2007-02-02 23:50:38 geuzaine Exp $
+# $Id: Makefile,v 1.114 2007-02-04 11:24:55 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -128,14 +128,14 @@ OpenFile.o: OpenFile.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h \
../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
- ../Geo/SBoundingBox3d.h ../Common/SmoothNormals.h Parser.h \
- ../Mesh/Generator.h OpenFile.h ../Common/CommandLine.h \
- ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/AdaptiveViews.h \
- ../Common/GmshMatrix.h ../Graphics/ReadImg.h ../Common/OS.h \
- ../Common/GmshUI.h ../Graphics/Draw.h ../Graphics/SelectBuffer.h \
- ../Fltk/GUI.h ../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h \
- ../Fltk/Popup_Button.h ../Fltk/SpherePosition_Widget.h
+ ../Geo/SBoundingBox3d.h ../Common/SmoothNormals.h Parser.h OpenFile.h \
+ ../Common/CommandLine.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/VertexArray.h ../Common/SmoothNormals.h \
+ ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Graphics/ReadImg.h \
+ ../Common/OS.h ../Common/GmshUI.h ../Graphics/Draw.h \
+ ../Graphics/SelectBuffer.h ../Fltk/GUI.h ../Fltk/Opengl_Window.h \
+ ../Fltk/Colorbar_Window.h ../Fltk/Popup_Button.h \
+ ../Fltk/SpherePosition_Widget.h
CreateFile.o: CreateFile.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
diff --git a/Parser/OpenFile.cpp b/Parser/OpenFile.cpp
index bddc29afdf1c77285f256c1cafb8e00f1035af84..dde132503cd2402ef9f4c9d22212cf9994b90857 100644
--- a/Parser/OpenFile.cpp
+++ b/Parser/OpenFile.cpp
@@ -1,4 +1,4 @@
-// $Id: OpenFile.cpp,v 1.141 2007-01-29 08:22:34 geuzaine Exp $
+// $Id: OpenFile.cpp,v 1.142 2007-02-04 11:24:55 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -29,7 +29,6 @@
#include "Numeric.h"
#include "Context.h"
#include "Parser.h"
-#include "Generator.h"
#include "OpenFile.h"
#include "CommandLine.h"
#include "Views.h"
diff --git a/doc/texinfo/opt_general.texi b/doc/texinfo/opt_general.texi
index d2b4ac9e7ce700c1eb6fcb51f34b5c5d26d8a326..fcf9ce9e9cebfb5ebef8bb09a6752b94823de2c8 100644
--- a/doc/texinfo/opt_general.texi
+++ b/doc/texinfo/opt_general.texi
@@ -54,6 +54,11 @@ Current project file name (read-only)@*
Default value: @code{""}@*
Saved in: @code{-}
+@item General.FltkTheme
+FLTK user interface theme (try e.g. plastic or gtk+)@*
+Default value: @code{""}@*
+Saved in: @code{General.OptionsFileName}
+
@item General.GraphicsFont
Font used in the graphic window@*
Default value: @code{"Helvetica"}@*
@@ -69,11 +74,6 @@ Option file into which session specific information is saved; automatically read
Default value: @code{".gmshrc"}@*
Saved in: @code{-}
-@item General.FltkTheme
-FLTK user interface theme (try e.g. plastic or gtk+)@*
-Default value: @code{""}@*
-Saved in: @code{General.OptionsFileName}
-
@item General.TextEditor
System command to launch a text editor@*
Default value: @code{"open -e %s"}@*
diff --git a/doc/texinfo/opt_mesh.texi b/doc/texinfo/opt_mesh.texi
index 3edb4963a7dec4a22c73a4ce3906859f5c67edd5..b0e2b2101b651a8b8b64fcfa090470dfc5e7acee 100644
--- a/doc/texinfo/opt_mesh.texi
+++ b/doc/texinfo/opt_mesh.texi
@@ -114,6 +114,11 @@ Display mesh hexahedra?@*
Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
+@item Mesh.LabelsFrequency
+Labels display frequency?@*
+Default value: @code{100}@*
+Saved in: @code{General.OptionsFileName}
+
@item Mesh.LabelType
Type of element label (0=element number, 1=elementary entity number, 2=physical entity number, 3=partition number, 4=coordinates)@*
Default value: @code{0}@*
@@ -364,11 +369,6 @@ Display volume mesh element numbers?@*
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
-@item Mesh.LabelsFrequency
-Labels display frequency?@*
-Default value: @code{100}@*
-Saved in: @code{General.OptionsFileName}
-
@item Mesh.Color.Points
Mesh node color@*
Default value: @code{@{0,0,255@}}@*
diff --git a/doc/texinfo/opt_solver.texi b/doc/texinfo/opt_solver.texi
index 63cb1f34a1dd38622d53c0653efb33cdc7ac1d24..257e219bd36a9c08f4b003f2deeec51a48ffc9a0 100644
--- a/doc/texinfo/opt_solver.texi
+++ b/doc/texinfo/opt_solver.texi
@@ -618,49 +618,44 @@ Always listen to incoming connection requests?@*
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
-@item Solver.MaximumDelay
-Maximum delay (in seconds) allowed for solver response@*
-Default value: @code{4}@*
-Saved in: @code{General.OptionsFileName}
-
-@item Solver.Plugins
-Enable default solver plugins?@*
-Default value: @code{0}@*
-Saved in: @code{General.OptionsFileName}
-
@item Solver.ClientServer0
Connect solver 0 to the Gmsh server@*
Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
-@item Solver.MergeViews0
-Automatically merge any post-processing view created by solver 0@*
-Default value: @code{1}@*
+@item Solver.ClientServer1
+Connect solver 1 to the Gmsh server@*
+Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
-@item Solver.PopupMessages0
-Automatically display messages produced by solver 0@*
-Default value: @code{1}@*
+@item Solver.ClientServer2
+Connect solver 2 to the Gmsh server@*
+Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
-@item Solver.ClientServer1
-Connect solver 1 to the Gmsh server@*
+@item Solver.ClientServer3
+Connect solver 3 to the Gmsh server@*
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
-@item Solver.MergeViews1
-Automatically merge any post-processing view created by solver 1@*
-Default value: @code{1}@*
+@item Solver.ClientServer4
+Connect solver 4 to the Gmsh server@*
+Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
-@item Solver.PopupMessages1
-Automatically display messages produced by solver 1@*
+@item Solver.MaximumDelay
+Maximum delay (in seconds) allowed for solver response@*
+Default value: @code{4}@*
+Saved in: @code{General.OptionsFileName}
+
+@item Solver.MergeViews0
+Automatically merge any post-processing view created by solver 0@*
Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
-@item Solver.ClientServer2
-Connect solver 2 to the Gmsh server@*
-Default value: @code{0}@*
+@item Solver.MergeViews1
+Automatically merge any post-processing view created by solver 1@*
+Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
@item Solver.MergeViews2
@@ -668,33 +663,38 @@ Automatically merge any post-processing view created by solver 2@*
Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
-@item Solver.PopupMessages2
-Automatically display messages produced by solver 2@*
+@item Solver.MergeViews3
+Automatically merge any post-processing view created by solver 3@*
Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
-@item Solver.ClientServer3
-Connect solver 3 to the Gmsh server@*
+@item Solver.MergeViews4
+Automatically merge any post-processing view created by solver 4@*
+Default value: @code{1}@*
+Saved in: @code{General.OptionsFileName}
+
+@item Solver.Plugins
+Enable default solver plugins?@*
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
-@item Solver.MergeViews3
-Automatically merge any post-processing view created by solver 3@*
+@item Solver.PopupMessages0
+Automatically display messages produced by solver 0@*
Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
-@item Solver.PopupMessages3
-Automatically display messages produced by solver 3@*
+@item Solver.PopupMessages1
+Automatically display messages produced by solver 1@*
Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
-@item Solver.ClientServer4
-Connect solver 4 to the Gmsh server@*
-Default value: @code{0}@*
+@item Solver.PopupMessages2
+Automatically display messages produced by solver 2@*
+Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
-@item Solver.MergeViews4
-Automatically merge any post-processing view created by solver 4@*
+@item Solver.PopupMessages3
+Automatically display messages produced by solver 3@*
Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
diff --git a/doc/texinfo/opt_view.texi b/doc/texinfo/opt_view.texi
index 1ab71ff8f2694dc4925690de336fa113aee3ae15..24ab0a3388988119210fb44df1f30726da7f57f8 100644
--- a/doc/texinfo/opt_view.texi
+++ b/doc/texinfo/opt_view.texi
@@ -396,42 +396,42 @@ Saved in: @code{General.OptionsFileName}
@item View.Max
Maximum value in the view (read-only)@*
-Default value: @code{-2.22195e-146}@*
+Default value: @code{0}@*
Saved in: @code{-}
@item View.MaxX
Maximum view coordinate along the X-axis (read-only)@*
-Default value: @code{-2.22195e-146}@*
+Default value: @code{0}@*
Saved in: @code{-}
@item View.MaxY
Maximum view coordinate along the Y-axis (read-only)@*
-Default value: @code{-2.22195e-146}@*
+Default value: @code{0}@*
Saved in: @code{-}
@item View.MaxZ
Maximum view coordinate along the Z-axis (read-only)@*
-Default value: @code{-2.22195e-146}@*
+Default value: @code{0}@*
Saved in: @code{-}
@item View.Min
Minimum value in the view (read-only)@*
-Default value: @code{-2.22195e-146}@*
+Default value: @code{0}@*
Saved in: @code{-}
@item View.MinX
Minimum view coordinate along the X-axis (read-only)@*
-Default value: @code{-2.22195e-146}@*
+Default value: @code{0}@*
Saved in: @code{-}
@item View.MinY
Minimum view coordinate along the Y-axis (read-only)@*
-Default value: @code{-2.22195e-146}@*
+Default value: @code{0}@*
Saved in: @code{-}
@item View.MinZ
Minimum view coordinate along the Z-axis (read-only)@*
-Default value: @code{-2.22195e-146}@*
+Default value: @code{0}@*
Saved in: @code{-}
@item View.NbIso