From 38206ac40866a8ef7c21ecb240e5340d314145b4 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 9 Feb 2013 12:43:14 +0000
Subject: [PATCH]
---
Common/CommandLine.cpp | 1 +
doc/texinfo/commandline.texi | 2 +
doc/texinfo/opt_fields.texi | 8 ++++
doc/texinfo/opt_general.texi | 15 +++-----
doc/texinfo/opt_geometry.texi | 7 +++-
doc/texinfo/opt_plugin.texi | 69 -----------------------------------
doc/texinfo/opt_print.texi | 2 +-
doc/texinfo/shortcuts.texi | 2 +
8 files changed, 25 insertions(+), 81 deletions(-)
diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp
index 3fd1d273d0..36bc1ce13c 100644
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@ -167,6 +167,7 @@ std::vector<std::pair<std::string, std::string> > GetShortcutsUsage(const std::s
s.push_back(mp("Shift+Escape", "Enable full mouse selection"));
s.push_back(mp(cc + "i", "Show statistics window"));
s.push_back(mp(cc + "d", "Attach/detach menu"));
+ s.push_back(mp(cc + "f", "Enter full screen"));
s.push_back(mp(cc + "l", "Show message console"));
#if defined(__APPLE__)
s.push_back(mp(cc + "m", "Minimize window"));
diff --git a/doc/texinfo/commandline.texi b/doc/texinfo/commandline.texi
index 13a55aae4e..4ff7de1c19 100644
--- a/doc/texinfo/commandline.texi
+++ b/doc/texinfo/commandline.texi
@@ -58,6 +58,8 @@ Poisson ration for elasticity analogy (nu in [-1.0,0.5])
Optimize quality of tetrahedral elements
@item -optimize_lloyd
Optimize 2D meshes using Lloyd algorithm
+@item -microstructure
+Generate polycrystal Voronoi geometry
@item -clscale float
Set global mesh element size scaling factor
@item -clmin float
diff --git a/doc/texinfo/opt_fields.texi b/doc/texinfo/opt_fields.texi
index 218246fd06..9dc5e000d1 100644
--- a/doc/texinfo/opt_fields.texi
+++ b/doc/texinfo/opt_fields.texi
@@ -197,10 +197,18 @@ default value: @code{0}
Thickness (% of radius) of the extruded layer@*
type: float@*
default value: @code{0.3}
+@item hSecondLayer
+Thickness (% of radius) of the second extruded layer@*
+type: float@*
+default value: @code{0.3}
@item nbElemLayer
Number of mesh elements the extruded layer@*
type: integer@*
default value: @code{3}
+@item nbElemSecondLayer
+Number of mesh elements the second extruded layer@*
+type: integer@*
+default value: @code{0}
@item nbPoints
Number of mesh elements in a circle@*
type: integer@*
diff --git a/doc/texinfo/opt_general.texi b/doc/texinfo/opt_general.texi
index ced9830cba..eb7814d7db 100644
--- a/doc/texinfo/opt_general.texi
+++ b/doc/texinfo/opt_general.texi
@@ -119,11 +119,6 @@ Temporary file used by the geometry module@*
Default value: @code{".gmsh-tmp"}@*
Saved in: @code{General.SessionFileName}
-@item General.WebBrowser
-System command to launch a web browser@*
-Default value: @code{"open %s"}@*
-Saved in: @code{General.OptionsFileName}
-
@item General.WatchFilePattern
Pattern of files to merge as they become available@*
Default value: @code{""}@*
@@ -516,12 +511,12 @@ Saved in: @code{General.SessionFileName}
@item General.FieldHeight
Height (in pixels) of the field window@*
-Default value: @code{300}@*
+Default value: @code{320}@*
Saved in: @code{General.SessionFileName}
@item General.FieldWidth
Width (in pixels) of the field window@*
-Default value: @code{300}@*
+Default value: @code{420}@*
Saved in: @code{General.SessionFileName}
@item General.FileChooserPositionX
@@ -775,7 +770,7 @@ Default value: @code{400}@*
Saved in: @code{General.SessionFileName}
@item General.MessageHeight
-Height (in pixels) of the message console@*
+Height (in pixels) of the message console when it is visible (should be > 0)@*
Default value: @code{300}@*
Saved in: @code{General.SessionFileName}
@@ -841,12 +836,12 @@ Saved in: @code{General.SessionFileName}
@item General.PluginHeight
Height (in pixels) of the plugin window@*
-Default value: @code{300}@*
+Default value: @code{320}@*
Saved in: @code{General.SessionFileName}
@item General.PluginWidth
Width (in pixels) of the plugin window@*
-Default value: @code{300}@*
+Default value: @code{420}@*
Saved in: @code{General.SessionFileName}
@item General.PointSize
diff --git a/doc/texinfo/opt_geometry.texi b/doc/texinfo/opt_geometry.texi
index d534c6f1a0..5cb2df48d7 100644
--- a/doc/texinfo/opt_geometry.texi
+++ b/doc/texinfo/opt_geometry.texi
@@ -15,7 +15,7 @@ Default value: @code{0}@*
Saved in: @code{-}
@item Geometry.CopyMeshingMethod
-Copy meshing method when duplicating geometrical entities?@*
+Copy meshing method (unstructured or transfinite) when duplicating geometrical entities?@*
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
@@ -144,6 +144,11 @@ Use old circle description (compatibility option for old Gmsh geometries)@*
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
+@item Geometry.OldRuledSurface
+Use old 3-sided ruled surface interpolation (compatibility option for old Gmsh geometries)@*
+Default value: @code{0}@*
+Saved in: @code{General.OptionsFileName}
+
@item Geometry.OldNewReg
Use old newreg definition for geometrical transformations (compatibility option for old Gmsh geometries)@*
Default value: @code{1}@*
diff --git a/doc/texinfo/opt_plugin.texi b/doc/texinfo/opt_plugin.texi
index de4cccdcb1..61ec1dec27 100644
--- a/doc/texinfo/opt_plugin.texi
+++ b/doc/texinfo/opt_plugin.texi
@@ -426,75 +426,6 @@ Default value: @code{0}
Default value: @code{1}
@end table
-@item Plugin(GSHHS)
-Plugin(GSHHS) read different kind of contour lines data and write a .geo file on the surface of a sphere (the Earth).
-
-The principal application is to load GSHHS data
- (see http://www.soest.hawaii.edu/wessel/gshhs/gshhs.html).
-
-Valid values for "Format" are:
-
-- "gshhs": open GSHHS file
-
-- "loops2": import 2D contour lines in simple text format:
-
-NB_POINTS_IN_FIRST_LOOP FIRST_LOOP_IS_CLOSED
-COORD1 COORD2
-COORD1 COORD2
-... ...
-NB_POINTS_IN_SECOND_LOOP SECOND_LOOP_IS_CLOSED
-...
-
-(LOOP_IS_CLOSED specifies if this coast line describes a closed curve (0=no, 1=yes)).
-
-In the case of "loops2" format, you can specify the coordinate system used in the input file with the "Coordinate" option. Valid values are
-
-- "lonlat" for longitude-latidute radian,
-
-- "lonlat_degrees" for longitude-latitude degrees,
-
-- "UTM" for universal transverse mercartor ("UTMZone" option should be specified)
-
-- "cartesian" for full 3D coordinates
-
-- "radius" specify the earth radius.
-
-If the "iField" option is set, consecutive points closer than the value of the field iField (in meters) will not be added.
-
-If "MinStraitsFactor" > 0 and if a field iField is provided, coastlines closer than MinStraitsFactor * field(IField) are merged and inner corners which form an angle < pi/3 are removed.
-
-The output is always in stereographic coordinates, if the "WritePolarSphere" option is greater than 0, a sphere is added to the geo file.
-
-WARNING: this plugin is still experimental and needs polishing and error-handling. In particular, it will probably crash if an inexistant field id is given or if the input/output cannot be open.
-String options:
-@table @code
-@item InFileName
-Default value: @code{"gshhs_c.b"}
-@item OutFileName
-Default value: @code{"earth.geo"}
-@item Format
-Default value: @code{"gshhs"}
-@item Coordinate
-Default value: @code{"cartesian"}
-@end table
-Numeric options:
-@table @code
-@item iField
-Default value: @code{-1}
-@item UTMZone
-Default value: @code{0}
-@item UTMEquatorialRadius
-Default value: @code{6.37814e+06}
-@item UTMPolarRadius
-Default value: @code{6.35675e+06}
-@item radius
-Default value: @code{6.37101e+06}
-@item WritePolarSphere
-Default value: @code{1}
-@item MinStraitsFactor
-Default value: @code{1}
-@end table
-
@item Plugin(Gradient)
Plugin(Gradient) computes the gradient of the field in the view `View'.
diff --git a/doc/texinfo/opt_print.texi b/doc/texinfo/opt_print.texi
index 7ae4d40427..4813778274 100644
--- a/doc/texinfo/opt_print.texi
+++ b/doc/texinfo/opt_print.texi
@@ -66,7 +66,7 @@ Saved in: @code{General.OptionsFileName}
@item Print.GeoOnlyPhysicals
Only save entities that belong to physical groups@*
-Default value: @code{1}@*
+Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
@item Print.GifDither
diff --git a/doc/texinfo/shortcuts.texi b/doc/texinfo/shortcuts.texi
index 5f9f4944e4..83fc4ea703 100644
--- a/doc/texinfo/shortcuts.texi
+++ b/doc/texinfo/shortcuts.texi
@@ -52,6 +52,8 @@ Enable full mouse selection
Show statistics window
@item Ctrl+d
Attach/detach menu
+@item Ctrl+f
+Enter full screen
@item Ctrl+l
Show message console
@item Ctrl+m
--
GitLab