From 45a81f58e4928958f7757762d30405c4ec6b6e9f Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 11 Feb 2013 08:11:47 +0000
Subject: [PATCH]
---
Fltk/FlGui.cpp | 16 ++++++++--------
Plugin/SimplePartition.cpp | 2 ++
doc/texinfo/gmsh.texi | 16 ++++++++++------
3 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/Fltk/FlGui.cpp b/Fltk/FlGui.cpp
index 347502151b..b138d2abf8 100644
--- a/Fltk/FlGui.cpp
+++ b/Fltk/FlGui.cpp
@@ -215,7 +215,7 @@ FlGui::FlGui(int argc, char **argv)
//Fl::set_color(FL_SELECTION_COLOR, 50, 50, 0);
#endif
- // add new box types used in graphic window (dx dy dw dh)
+ // add new box types (dx dy dw dh)
Fl::set_boxtype(GMSH_SIMPLE_RIGHT_BOX, simple_right_box_draw, 0, 0, 1, 0);
Fl::set_boxtype(GMSH_SIMPLE_TOP_BOX, simple_top_box_draw, 0, 1, 0, 1);
@@ -260,15 +260,11 @@ FlGui::FlGui(int argc, char **argv)
fl_mac_set_about(help_about_cb, 0);
#endif
- // all the windows are contructed (even if some are not displayed) since the
- // shortcuts should be valid even for hidden windows, and we don't want to
- // test for widget existence every time
+ // create main graphic window (note that we create all the windows even if
+ // some are not displayed, since the shortcuts should be valid even for hidden
+ // windows, and we don't want to test for widget existence every time)
graph.push_back(new graphicWindow(true, CTX::instance()->numTiles,
CTX::instance()->detachedMenu ? true : false));
-
- // FIXME: make this cleaner ;-)
- onelab = graph.back()->getMenu();
-
#if defined(WIN32)
graph[0]->getWindow()->icon
((const void*)LoadIcon(fl_display, MAKEINTRESOURCE(IDI_ICON)));
@@ -301,6 +297,9 @@ FlGui::FlGui(int argc, char **argv)
//graph[0]->gl[0]->take_focus();
Fl::focus(graph[0]->gl[0]);
+ // get onelab tree group (FIXME: should clean this up)
+ onelab = graph.back()->getMenu();
+
// create additional graphic windows
for(int i = 1; i < CTX::instance()->numWindows; i++){
graphicWindow *g = new graphicWindow(false, CTX::instance()->numTiles);
@@ -318,6 +317,7 @@ FlGui::FlGui(int argc, char **argv)
fullscreen->end();
fullscreen->fullscreen();
+ // create all other windows
options = new optionWindow(CTX::instance()->deltaFontSize);
fields = new fieldWindow(CTX::instance()->deltaFontSize);
plugins = new pluginWindow(CTX::instance()->deltaFontSize);
diff --git a/Plugin/SimplePartition.cpp b/Plugin/SimplePartition.cpp
index 850dd1c8b7..5ba882e0e2 100644
--- a/Plugin/SimplePartition.cpp
+++ b/Plugin/SimplePartition.cpp
@@ -9,6 +9,8 @@
#include "partitionEdge.h"
#include "MElement.h"
#include "MLine.h"
+#include "MTriangle.h"
+#include "MQuadrangle.h"
#include "MFace.h"
#include "MEdge.h"
#if defined(HAVE_MESH)
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index 81082670c3..539da5d4ed 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -552,7 +552,12 @@ versions available on @uref{http://geuz.org/gmsh/} are linked with the
free CAD kernel OpenCASCADE, which enables native BREP import as well as
STEP and IGES import.)
@item
-Gmsh is not a multi-bloc generator: all meshes produced by Gmsh are
+Gmsh's internal CAD engine is fairly limited: it only handles simple
+primitives and does not perform any complex geometrical operations
+(e.g. no calculation of intersections). For such features you should
+link Gmsh with an external CAD kernel (see above).
+@item
+Gmsh is not a multi-bloc mesh generator: all meshes produced by Gmsh are
conforming in the sense of finite element meshes;
@item
Gmsh's user interface is only exposing a limited number of the available
@@ -585,7 +590,7 @@ developers}) to remedy the aforementioned (and all other) shortcomings!
@cindex E-mail, authors
If you think you have found a bug in Gmsh, you can report it by email to
-the Gmsh mailing list at @email{gmsh@@geuz.org}, or file it directly
+the public Gmsh mailing list at @email{gmsh@@geuz.org}, or file it directly
into our bug tracking database at @url{https://geuz.org/trac/gmsh/report}
(login: gmsh, password: gmsh). Please send as precise a description of
the problem as you can, including sample input files that produce the
@@ -727,14 +732,13 @@ or type
@end example
@noindent at your shell prompt in a terminal. This will open
-the main Gmsh windows, with a tree-like menu on the left, a graphic area
+the main Gmsh window, with a tree-like menu on the left, a graphic area
on the right, and a status bar at the bottom. (You can detach the tree
menu using `Window->Attach/Detach Menu'.)
To open the first tutorial file (@pxref{Tutorial}), select the
-`File->Open' menu, and choose @file{t1.geo} in the input field. When
-using a terminal, you can specify the file name directly on the command
-line, i.e.:
+`File->Open' menu, and choose @file{t1.geo}. When using a terminal, you
+can specify the file name directly on the command line, i.e.:
@example
> gmsh t1.geo
--
GitLab