diff --git a/Fltk/graphicWindow.cpp b/Fltk/graphicWindow.cpp index 8196390d06facd5c482704ee6b8bda96c16705e1..5bd4b8bc3da5d01b2855864462a50cfe1a985037 100644 --- a/Fltk/graphicWindow.cpp +++ b/Fltk/graphicWindow.cpp @@ -2881,11 +2881,6 @@ graphicWindow::graphicWindow(bool main, int numTiles, bool detachTree) browser->type(FL_MULTI_BROWSER); browser->callback(message_browser_cb, this); browser->scrollbar_size(std::max(10, FL_NORMAL_SIZE - 2)); // thinner scrollbars -#if 1 - // scrollbars are buggy when tiles are resized; hiding the horizontal one - // somewhat alleviates the problem - browser->has_scrollbar(Fl_Browser_::VERTICAL); -#endif } else{ browser = 0; diff --git a/demos/indheat.geo b/demos/indheat.geo index e5e5775c643cfce4d6dd58561ed81359e312382f..93a95179af996e4f7d92e0f2b59299f2a487e59c 100644 --- a/demos/indheat.geo +++ b/demos/indheat.geo @@ -13,7 +13,7 @@ DefineConstant lb = {1, Label "Infinite box width", Path "Parameters"}, left = {1, Choices{0,1}, Label "Terminals on the left?", Path "Parameters"} macro = {"title.script", Label "Add title", Path "Macros", - Macro "Gmsh", AutoCheck "0", Highlight "Turquoise"}, + Macro "Gmsh", AutoCheck "0" /*, Highlight "Turquoise"*/ }, showLines = {Geometry.Lines, Choices {0,1}, Label "Show lines?", Path "Options", GmshOption "Geometry.Lines", AutoCheck "0"} ]; diff --git a/tutorial/t3.geo b/tutorial/t3.geo index 8df6514cfd439e3b8d7d910fe34391e3dcc4f7e3..ae41dc31f5717c4ac8fa065909befe583bb3ab42 100644 --- a/tutorial/t3.geo +++ b/tutorial/t3.geo @@ -1,8 +1,8 @@ /********************************************************************* * * Gmsh tutorial 3 - * - * Extruded meshes, options + * + * Extruded meshes, parameters, options * *********************************************************************/ @@ -19,8 +19,8 @@ Include "t1.geo"; h = 0.1; -Extrude {0,0,h} { - Surface{6}; Layers{ {8,2}, {0.5,1} }; +Extrude {0,0,h} { + Surface{6}; Layers{ {8,2}, {0.5,1} }; } // The extrusion can also be performed with a rotation instead of a @@ -29,15 +29,21 @@ Extrude {0,0,h} { // are specified by an axis direction ({0,1,0}), an axis point // ({-0.1,0,0.1}) and a rotation angle (-Pi/2): -Extrude { {0,1,0} , {-0.1,0,0.1} , -Pi/2 } { - Surface{122}; Layers{7}; Recombine; +Extrude { {0,1,0} , {-0.1,0,0.1} , -Pi/2 } { + Surface{122}; Layers{7}; Recombine; } // Note that a translation ({-2*h,0,0}) and a rotation ({1,0,0}, -// {0,0.15,0.25}, Pi/2) can also be combined: +// {0,0.15,0.25}, Pi/2) can also be combined. Here the angle is +// specified as a 'parameter', using the 'DefineConstant' syntax. +// This parameter can be modified insteractively in the GUI, and +// can be exchanged with other codes using the ONELAB framework: + +DefineConstant[ angle = {90, Min 0, Max 120, Step 1, + Label "Extrusion angle", Path "Parameters"} ]; -out[] = Extrude { {-2*h,0,0}, {1,0,0} , {0,0.15,0.25} , Pi/2 } { - Surface{144}; Layers{10}; Recombine; +out[] = Extrude { {-2*h,0,0}, {1,0,0} , {0,0.15,0.25} , angle * Pi / 180 } { + Surface{144}; Layers{10}; Recombine; }; // In this last extrusion command we retrieved the volume number