Skip to content
Snippets Groups Projects
Commit 27633c09 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

mark more options as experimental

parent 4f93634e
No related branches found
No related tags found
No related merge requests found
...@@ -1690,26 +1690,36 @@ optionWindow::optionWindow(int deltaFontSize) ...@@ -1690,26 +1690,36 @@ optionWindow::optionWindow(int deltaFontSize)
geo.butt[8]->type(FL_TOGGLE_BUTTON); geo.butt[8]->type(FL_TOGGLE_BUTTON);
geo.butt[8]->callback(geometry_options_ok_cb); geo.butt[8]->callback(geometry_options_ok_cb);
Fl_Box* b = new Fl_Box(L + 2 * WB, 2 * WB + 3 * BH, BW, 2);
b->box(FL_ENGRAVED_FRAME);
b->labeltype(FL_NO_LABEL);
Fl_Box *b2 = new Fl_Box
(FL_NO_BOX, L + 2 * WB, 2 * WB + 3 * BH + 1, IW, BH, "Open CASCADE model healing options:");
b2->align(FL_ALIGN_INSIDE|FL_ALIGN_LEFT);
geo.butt[11] = new Fl_Check_Button geo.butt[11] = new Fl_Check_Button
(L + 2 * WB, 2 * WB + 3 * BH, BW, BH, "Remove small edges in OpenCascade models"); (L + 2 * WB, 2 * WB + 4 * BH, BW, BH, "Remove small edges");
geo.butt[11]->type(FL_TOGGLE_BUTTON); geo.butt[11]->type(FL_TOGGLE_BUTTON);
geo.butt[11]->callback(geometry_options_ok_cb); geo.butt[11]->callback(geometry_options_ok_cb);
geo.butt[12] = new Fl_Check_Button geo.butt[12] = new Fl_Check_Button
(L + 2 * WB, 2 * WB + 4 * BH, BW, BH, "Remove small faces in OpenCascade models"); (L + 2 * WB, 2 * WB + 5 * BH, BW, BH, "Remove small faces (experimental)");
geo.butt[12]->type(FL_TOGGLE_BUTTON); geo.butt[12]->type(FL_TOGGLE_BUTTON);
geo.butt[12]->callback(geometry_options_ok_cb); geo.butt[12]->callback(geometry_options_ok_cb);
geo.butt[13] = new Fl_Check_Button geo.butt[13] = new Fl_Check_Button
(L + 2 * WB, 2 * WB + 5 * BH, BW, BH, "Sew faces in OpenCascade models"); (L + 2 * WB, 2 * WB + 6 * BH, BW, BH, "Sew faces (experimental)");
geo.butt[13]->type(FL_TOGGLE_BUTTON); geo.butt[13]->type(FL_TOGGLE_BUTTON);
geo.butt[13]->callback(geometry_options_ok_cb); geo.butt[13]->callback(geometry_options_ok_cb);
geo.butt[15] = new Fl_Check_Button geo.butt[15] = new Fl_Check_Button
(L + 2 * WB, 2 * WB + 6 * BH, BW, BH, "Cut and merge faces in OpenCascade models"); (L + 2 * WB, 2 * WB + 7 * BH, BW, BH, "Cut and merge faces (experimental)");
geo.butt[15]->type(FL_TOGGLE_BUTTON); geo.butt[15]->type(FL_TOGGLE_BUTTON);
geo.butt[15]->callback(geometry_options_ok_cb); geo.butt[15]->callback(geometry_options_ok_cb);
#if !defined(HAVE_OCC) #if !defined(HAVE_OCC)
b2->deactivate();
geo.butt[11]->deactivate(); geo.butt[11]->deactivate();
geo.butt[12]->deactivate(); geo.butt[12]->deactivate();
geo.butt[13]->deactivate(); geo.butt[13]->deactivate();
......
...@@ -986,42 +986,42 @@ void GModel::_deleteOCCInternals() ...@@ -986,42 +986,42 @@ void GModel::_deleteOCCInternals()
int GModel::readOCCBREP(const std::string &fn) int GModel::readOCCBREP(const std::string &fn)
{ {
Msg::Error("Gmsh must be compiled with OpenCascade support to load '%s'", Msg::Error("Gmsh must be compiled with Open CASCADE support to load '%s'",
fn.c_str()); fn.c_str());
return 0; return 0;
} }
int GModel::readOCCSTEP(const std::string &fn) int GModel::readOCCSTEP(const std::string &fn)
{ {
Msg::Error("Gmsh must be compiled with OpenCascade support to load '%s'", Msg::Error("Gmsh must be compiled with Open CASCADE support to load '%s'",
fn.c_str()); fn.c_str());
return 0; return 0;
} }
int GModel::readOCCIGES(const std::string &fn) int GModel::readOCCIGES(const std::string &fn)
{ {
Msg::Error("Gmsh must be compiled with OpenCascade support to load '%s'", Msg::Error("Gmsh must be compiled with Open CASCADE support to load '%s'",
fn.c_str()); fn.c_str());
return 0; return 0;
} }
int GModel::writeOCCBREP(const std::string &fn) int GModel::writeOCCBREP(const std::string &fn)
{ {
Msg::Error("Gmsh must be compiled with OpenCascade support to write '%s'", Msg::Error("Gmsh must be compiled with Open CASCADE support to write '%s'",
fn.c_str()); fn.c_str());
return 0; return 0;
} }
int GModel::writeOCCSTEP(const std::string &fn) int GModel::writeOCCSTEP(const std::string &fn)
{ {
Msg::Error("Gmsh must be compiled with OpenCascade support to write '%s'", Msg::Error("Gmsh must be compiled with Open CASCADE support to write '%s'",
fn.c_str()); fn.c_str());
return 0; return 0;
} }
int GModel::importOCCShape(const void *shape) int GModel::importOCCShape(const void *shape)
{ {
Msg::Error("Gmsh must be compiled with OpenCascade support to import " Msg::Error("Gmsh must be compiled with Open CASCADE support to import "
"a TopoDS_Shape"); "a TopoDS_Shape");
return 0; return 0;
} }
...@@ -1029,7 +1029,7 @@ int GModel::importOCCShape(const void *shape) ...@@ -1029,7 +1029,7 @@ int GModel::importOCCShape(const void *shape)
void GModel::addShape(std::string name, std::vector<double> &p, void GModel::addShape(std::string name, std::vector<double> &p,
std::string op) std::string op)
{ {
Msg::Error("Gmsh must be compiled with OpenCascade support to apply " Msg::Error("Gmsh must be compiled with Open CASCADE support to apply "
"Boolean Operators On Solids"); "Boolean Operators On Solids");
} }
......
...@@ -14,13 +14,14 @@ Gaetan Bricteux (Gauss integration and levelsets), Jacques Lechelle ...@@ -14,13 +14,14 @@ Gaetan Bricteux (Gauss integration and levelsets), Jacques Lechelle
(DIFFPACK mesh format), Jonathan Lambrechts (fields), Jozef Vesely (DIFFPACK mesh format), Jonathan Lambrechts (fields), Jozef Vesely
(Tetgen), Koen Hillewaert (high order elements), Laurent Stainier (Tetgen), Koen Hillewaert (high order elements), Laurent Stainier
(eigenvalue solvers, tensor display and MacOS bits), Marc Ume (eigenvalue solvers, tensor display and MacOS bits), Marc Ume
(original list code), Mark van Doesburg (OpenCascade face connection), (original list code), Mark van Doesburg (Open CASCADE face
Matt Gundry (Plot3d mesh format), Matti Pellikka (Homology), Nicolas connection), Matt Gundry (Plot3d mesh format), Matti Pellikka
Tardieu (Netgen), Pascale Noyret (MED mesh format), Pierre Badel (root (Homology), Nicolas Tardieu (Netgen), Pascale Noyret (MED mesh
finding and minimization), Ruth Sabariego (pyramids), Stephen Guzik format), Pierre Badel (root finding and minimization), Ruth Sabariego
(CGNS and partitioners), Bastien Gorissen (parallel remote). See (pyramids), Stephen Guzik (CGNS and partitioners), Bastien Gorissen
comments in the sources for more information. If we forgot to list (parallel remote). See comments in the sources for more
your contributions please send us an email! information. If we forgot to list your contributions please send us an
email!
The AVL tree code (Common/avl.*) and the YUV image code The AVL tree code (Common/avl.*) and the YUV image code
(Graphics/gl2yuv.*) are copyright (C) 1988-1993, 1995 The Regents of (Graphics/gl2yuv.*) are copyright (C) 1988-1993, 1995 The Regents of
...@@ -103,7 +104,7 @@ Ercolano and others for the Fast Light Tool Kit on which Gmsh's GUI is ...@@ -103,7 +104,7 @@ Ercolano and others for the Fast Light Tool Kit on which Gmsh's GUI is
based. See http://www.fltk.org for more info on this excellent based. See http://www.fltk.org for more info on this excellent
object-oriented, cross-platform toolkit. object-oriented, cross-platform toolkit.
Special thanks also to EDF for funding the OpenCascade and MED Special thanks also to EDF for funding the Open CASCADE and MED
integration. integration.
Thanks to the following folks who have contributed by providing fresh Thanks to the following folks who have contributed by providing fresh
......
...@@ -96,18 +96,18 @@ at the end of the list returned by extrusion commands; fixed various ...@@ -96,18 +96,18 @@ at the end of the list returned by extrusion commands; fixed various
bugs. bugs.
2.0 (Feb 5, 2007): new geometry and mesh databases, with support for 2.0 (Feb 5, 2007): new geometry and mesh databases, with support for
STEP and IGES import via OpenCascade; complete rewrite of geometry and STEP and IGES import via Open CASCADE; complete rewrite of geometry
mesh drawing code; complete rewrite of mesh I/O layer (with new native and mesh drawing code; complete rewrite of mesh I/O layer (with new
binary MSH format and support for import/export of I-deas UNV, Nastran native binary MSH format and support for import/export of I-deas UNV,
BDF, STL, Medit MESH and VRML 1.0 files); added support for incomplete Nastran BDF, STL, Medit MESH and VRML 1.0 files); added support for
second order elements; new 2D and 3D meshing algorithms; improved incomplete second order elements; new 2D and 3D meshing algorithms;
integration of Netgen and TetGen algorithms; removed anisotropic improved integration of Netgen and TetGen algorithms; removed
meshing algorithm (as well as attractors); removed explicit region anisotropic meshing algorithm (as well as attractors); removed
number specification in extrusions; option changes in the graphical explicit region number specification in extrusions; option changes in
interface are now applied instantaneously; added support for offscreen the graphical interface are now applied instantaneously; added support
rendering using OSMesa; added support for SVG output; added string for offscreen rendering using OSMesa; added support for SVG output;
labels for Physical entities; lots of other improvements all over the added string labels for Physical entities; lots of other improvements
place. all over the place.
1.65 (May 15, 2006): new Plugin(ExtractEdges); fixed compilation 1.65 (May 15, 2006): new Plugin(ExtractEdges); fixed compilation
errors with gcc4.1; replaced Plugin(DisplacementRaise) and errors with gcc4.1; replaced Plugin(DisplacementRaise) and
......
// This demonstrates how to import an OpenCascade model WITHOUT using // This demonstrates how to import an OpenCASCADE model WITHOUT using
// Gmsh's own I/O layer (useful if you create OCC objects in your own // Gmsh's own I/O layer (useful if you create OCC objects in your own
// code, that you want to import dynamically in Gmsh). // code, that you want to import dynamically in Gmsh).
// //
// If you just want to load OpenCascade files (.brep, .step, etc.) you // If you just want to load OpenCASCADE files (.brep, .step, etc.) you
// SHOULD NOT use this interface: simply use the standard I/O API. // SHOULD NOT use this interface: simply use the standard I/O API.
// g++ -I/usr/local/opencascade/inc driverOCC.cpp -lGmsh // g++ -I/usr/local/opencascade/inc driverOCC.cpp -lGmsh
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment