diff --git a/Common/GmshMessage.cpp b/Common/GmshMessage.cpp index 7b51e85ac3a34b1189737b771c4ddfd0ca2c1e04..f8a0b6d6dca777d6fd0f0df1a5d43d14dc46acf4 100644 --- a/Common/GmshMessage.cpp +++ b/Common/GmshMessage.cpp @@ -1272,7 +1272,7 @@ void Msg::ImportPhysicalsAsOnelabRegions() name = std::string("Physical") + ((dim == 3) ? "Volume" : (dim == 2) ? "Surface" : (dim == 1) ? "Line" : "Point") + num.str(); - name.insert(0, "Gmsh parameters/Physical groups/"); + name.insert(0, "Gmsh/Physical groups/"); onelab::region p(name, num.str()); p.setDimension(dim); p.setReadOnly(true); diff --git a/Fltk/visibilityWindow.cpp b/Fltk/visibilityWindow.cpp index 3b1903fca344c1b5d5dc42d4d24892c07297cac8..334dad2a64d05bfd3cb96d0732433827f481711b 100644 --- a/Fltk/visibilityWindow.cpp +++ b/Fltk/visibilityWindow.cpp @@ -325,14 +325,6 @@ static void _rebuild_list_browser() if(VisibilityList::instance()->getVisibility(i)) FlGui::instance()->visibility->browser->select(i + 1); } - -#if 0 - // activate/deactivate delete button - if(type == VisibilityList::PhysicalEntities) - FlGui::instance()->visibility->push[0]->activate(); - else - FlGui::instance()->visibility->push[0]->deactivate(); -#endif } static void visibility_browser_apply_cb(Fl_Widget *w, void *data) @@ -362,31 +354,6 @@ static void visibility_browser_apply_cb(Fl_Widget *w, void *data) } } -#if 0 -static void visibility_delete_cb(Fl_Widget *w, void *data) -{ - bool all = true; - for(int i = 0; i < VisibilityList::instance()->getNumEntities(); i++){ - if(!FlGui::instance()->visibility->browser->selected(i + 1)){ - all = false; - break; - } - } - if(all){ - GModel::current()->deletePhysicalGroups(); - } - else{ - for(int i = 0; i < VisibilityList::instance()->getNumEntities(); i++){ - if(FlGui::instance()->visibility->browser->selected(i + 1)){ - Vis *v = VisibilityList::instance()->getEntity(i); - GModel::current()->deletePhysicalGroup(v->getDim(), v->getTag()); - } - } - } - visibility_cb(NULL, (void*)"redraw_only"); -} -#endif - static void visibility_sort_cb(Fl_Widget *w, void *data) { const char *str = (const char*)data; @@ -1238,13 +1205,6 @@ visibilityWindow::visibilityWindow(int deltaFontSize) browser_type->menu(browser_type_table); browser_type->value(2); // physicals - // "Delete" is out of place in a Visibility window - it's a destructive operation! -#if 0 - push[0] = new Fl_Button - (width - 2 * CC - 3 * WB, height - 2 * BH - 3 * WB, CC, BH, "Delete"); - push[0]->callback(visibility_delete_cb); -#endif - Fl_Return_Button *b1 = new Fl_Return_Button (width - 1 * CC - 2 * WB, height - 2 * BH - 3 * WB, CC, BH, "Apply"); b1->callback(visibility_browser_apply_cb); diff --git a/tutorial/t1.geo b/tutorial/t1.geo index ce12fd846b9370ebac3b4eb90d3ab510468e43eb..bbebfbfc9a505712daa94d28b316eabd679fdeec 100644 --- a/tutorial/t1.geo +++ b/tutorial/t1.geo @@ -69,18 +69,18 @@ Physical Point(1) = {1,2} ; MY_LINE = 2; Physical Line(MY_LINE) = {1,2} ; -Physical Line("My second line (auto physical id)") = {3} ; +Physical Line("My second line (automatic physical id)") = {3} ; Physical Line("My third line (physical id 5)", 5) = {4} ; Physical Surface("My surface") = {6} ; // All the line elements created during the meshing of lines 1 and 2 will be // saved in the output mesh file with the physical id 2. The elements from line // 3 will be saved in the output mesh file with an automatic physical id, -// associated with the label "My second line (auto physical id)". The elements -// from line 4 will be saved with physical id 5, associated with the label "My -// third line (physical id 5)". And finally, all the triangular elements -// resulting from the discretization of surface 6 will be given an automatic -// physical id associated with the label "My surface"). +// associated with the label "My second line (automatic physical id)". The +// elements from line 4 will be saved with physical id 5, associated with the +// label "My third line (physical id 5)". And finally, all the triangular +// elements resulting from the discretization of surface 6 will be given an +// automatic physical id associated with the label "My surface"). // Note that if no physical entities are defined, then all the elements in the // mesh will be saved "as is", with their default orientation. diff --git a/tutorial/t2.geo b/tutorial/t2.geo index eff5b22feebec7fe2d632801d494b1325c61842c..eea1180c795cb1cae15c65b44e43db485cb2e824 100644 --- a/tutorial/t2.geo +++ b/tutorial/t2.geo @@ -104,4 +104,4 @@ Characteristic Length {103, 105, 109, 102, 28, 24, 6, 5} = lc * 3; // To save all the tetrahedra discretizing the volumes 129 and 130 with a common // region number, we finally define a physical volume: -Physical Volume (1) = {129,130}; +Physical Volume ("The volume", 1) = {129,130};