From 4cf07a14111e98e8889620ee7e6371574c31a50c Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 11 Apr 2022 16:28:01 +0300 Subject: [PATCH] bos #29171 Refactor testing procedure --- CMakeLists.txt | 15 +- ...Lists.txt => CTestTestfileInstall.cmake.in | 10 +- doc/CMakeLists.txt | 6 +- doc/examples/0README | 7 + doc/{salome => }/examples/CMakeLists.txt | 43 ++-- .../CTestTestfileInstall.cmake} | 11 +- .../examples/MGAdaptTests_without_session.py | 14 +- .../examples/a3DmeshOnModified2Dmesh.py | 0 doc/{salome => }/examples/cartesian_algo.py | 29 +-- .../examples/creating_meshes_ex01.py | 15 +- .../examples/creating_meshes_ex02.py | 26 +- .../examples/creating_meshes_ex03.py | 15 +- .../examples/creating_meshes_ex04.py | 21 +- .../examples/creating_meshes_ex05.py | 28 +- doc/examples/creating_meshes_ex06.py | 120 +++++++++ doc/examples/creating_meshes_ex07.py | 86 +++++++ doc/examples/creating_meshes_ex08.py | 59 +++++ .../data}/test_01.med | Bin .../data}/test_02.med | Bin .../data}/test_02_bg.med | Bin .../data}/test_04.med | Bin .../data}/test_06.med | Bin .../data}/test_07.med | Bin .../data}/test_08.med | Bin .../data}/test_08_bg.med | Bin .../data}/test_10.med | Bin .../data}/test_11.med | Bin .../data}/test_13.med | Bin .../data}/test_homard_adapt.med | Bin .../data}/tutorial_4.00.med | Bin .../examples => examples/data}/tutorial_4.xao | 0 .../data}/tutorial_5.00.med | Bin .../data}/tutorial_5.fr.med | Bin .../defining_hypotheses_adaptive1d.py | 34 +++ .../examples/defining_hypotheses_ex01.py | 15 +- .../examples/defining_hypotheses_ex02.py | 31 ++- .../examples/defining_hypotheses_ex03.py | 21 +- .../examples/defining_hypotheses_ex04.py | 21 +- doc/examples/defining_hypotheses_ex05.py | 43 ++++ .../examples/defining_hypotheses_ex06.py | 15 +- .../examples/defining_hypotheses_ex07.py | 19 +- .../examples/defining_hypotheses_ex08.py | 26 +- .../examples/defining_hypotheses_ex09.py | 17 +- .../examples/defining_hypotheses_ex10.py | 49 ++-- .../examples/defining_hypotheses_ex11.py | 25 +- .../examples/defining_hypotheses_ex12.py | 22 +- .../examples/defining_hypotheses_ex13.py | 24 +- .../examples/defining_hypotheses_ex14.py | 21 +- .../examples/defining_hypotheses_ex15.py | 24 +- doc/examples/defining_hypotheses_ex16.py | 50 ++++ .../examples/defining_hypotheses_ex17.py | 32 +-- .../defining_hypotheses_len_near_vertex.py | 10 +- .../examples/filters_belong2group.py | 7 +- doc/{salome => }/examples/filters_ex01.py | 12 +- doc/{salome => }/examples/filters_ex02.py | 7 +- doc/{salome => }/examples/filters_ex03.py | 5 +- doc/{salome => }/examples/filters_ex04.py | 5 +- doc/{salome => }/examples/filters_ex05.py | 5 +- doc/{salome => }/examples/filters_ex06.py | 5 +- doc/examples/filters_ex07.py | 11 + doc/{salome => }/examples/filters_ex08.py | 7 +- doc/{salome => }/examples/filters_ex09.py | 16 +- doc/{salome => }/examples/filters_ex10.py | 18 +- doc/{salome => }/examples/filters_ex11.py | 6 +- doc/{salome => }/examples/filters_ex12.py | 5 +- doc/{salome => }/examples/filters_ex13.py | 6 +- doc/{salome => }/examples/filters_ex14.py | 5 +- doc/{salome => }/examples/filters_ex15.py | 6 +- doc/{salome => }/examples/filters_ex16.py | 24 +- doc/{salome => }/examples/filters_ex17.py | 14 +- doc/{salome => }/examples/filters_ex18.py | 14 +- doc/{salome => }/examples/filters_ex19.py | 5 +- doc/{salome => }/examples/filters_ex20.py | 5 +- doc/{salome => }/examples/filters_ex21.py | 5 +- doc/{salome => }/examples/filters_ex22.py | 5 +- doc/{salome => }/examples/filters_ex23.py | 7 +- doc/{salome => }/examples/filters_ex24.py | 7 +- doc/{salome => }/examples/filters_ex25.py | 7 +- doc/{salome => }/examples/filters_ex26.py | 5 +- doc/{salome => }/examples/filters_ex27.py | 5 +- doc/{salome => }/examples/filters_ex28.py | 10 +- doc/{salome => }/examples/filters_ex29.py | 5 +- doc/examples/filters_ex30.py | 14 + doc/examples/filters_ex31.py | 13 + doc/{salome => }/examples/filters_ex32.py | 7 +- doc/{salome => }/examples/filters_ex33.py | 6 +- doc/{salome => }/examples/filters_ex34.py | 5 +- doc/{salome => }/examples/filters_ex35.py | 13 +- doc/{salome => }/examples/filters_ex36.py | 8 +- doc/{salome => }/examples/filters_ex37.py | 6 +- doc/{salome => }/examples/filters_ex38.py | 4 +- doc/{salome => }/examples/filters_ex39.py | 34 +-- .../examples/filters_node_nb_conn.py | 4 +- doc/examples/generate_flat_elements.py | 64 +++++ .../examples/grouping_elements_ex01.py | 14 +- doc/examples/grouping_elements_ex02.py | 42 +++ .../examples/grouping_elements_ex03.py | 27 +- .../examples/grouping_elements_ex04.py | 13 +- .../examples/grouping_elements_ex05.py | 16 +- .../examples/grouping_elements_ex06.py | 12 +- .../examples/grouping_elements_ex07.py | 13 +- .../examples/grouping_elements_ex08.py | 14 +- .../examples/grouping_elements_ex09.py | 10 +- doc/examples/measurements_ex01.py | 70 +++++ doc/examples/measurements_ex02.py | 45 ++++ .../examples/measurements_ex03.py | 36 ++- .../examples/measurements_ex04.py | 10 +- doc/examples/mechanic.py | 86 +++++++ .../3dmesh.py => examples/mesh_3d.py} | 36 +-- .../modifying_meshes_cut_triangles.py | 6 +- .../examples/modifying_meshes_ex01.py | 5 +- .../examples/modifying_meshes_ex02.py | 5 +- .../examples/modifying_meshes_ex03.py | 20 +- .../examples/modifying_meshes_ex04.py | 5 +- .../examples/modifying_meshes_ex05.py | 5 +- .../examples/modifying_meshes_ex06.py | 5 +- .../examples/modifying_meshes_ex07.py | 5 +- .../examples/modifying_meshes_ex08.py | 5 +- .../examples/modifying_meshes_ex09.py | 8 +- .../examples/modifying_meshes_ex10.py | 9 +- doc/examples/modifying_meshes_ex11.py | 30 +++ .../examples/modifying_meshes_ex12.py | 4 +- .../examples/modifying_meshes_ex13.py | 4 +- .../examples/modifying_meshes_ex15.py | 13 +- .../examples/modifying_meshes_ex16.py | 13 +- .../examples/modifying_meshes_ex17.py | 12 +- .../examples/modifying_meshes_ex18.py | 13 +- .../examples/modifying_meshes_ex19.py | 12 +- .../examples/modifying_meshes_ex20.py | 6 +- doc/examples/modifying_meshes_ex21.py | 17 ++ .../examples/modifying_meshes_ex22.py | 19 +- .../examples/modifying_meshes_ex23.py | 78 +++--- .../examples/modifying_meshes_ex24.py | 6 +- .../examples/modifying_meshes_ex25.py | 35 ++- .../examples/modifying_meshes_ex26.py | 16 +- .../examples/modifying_meshes_split_vol.py | 11 +- doc/{salome => }/examples/notebook_smesh.py | 20 +- doc/{salome => }/examples/prism_3d_algo.py | 47 ++-- .../examples/quad_medial_axis_algo.py | 18 +- .../examples/quality_controls_defl.py | 20 +- .../examples/quality_controls_ex01.py | 25 +- .../examples/quality_controls_ex02.py | 25 +- .../examples/quality_controls_ex03.py | 25 +- .../examples/quality_controls_ex04.py | 13 +- .../examples/quality_controls_ex05.py | 23 +- doc/examples/quality_controls_ex06.py | 75 ++++++ .../examples/quality_controls_ex07.py | 17 +- .../examples/quality_controls_ex08.py | 21 +- .../examples/quality_controls_ex09.py | 15 +- doc/examples/quality_controls_ex10.py | 20 ++ .../examples/quality_controls_ex11.py | 25 +- .../examples/quality_controls_ex12.py | 27 +- .../examples/quality_controls_ex13.py | 11 +- .../examples/quality_controls_ex14.py | 11 +- .../examples/quality_controls_ex15.py | 11 +- .../examples/quality_controls_ex16.py | 11 +- .../examples/quality_controls_ex17.py | 11 +- .../examples/quality_controls_ex18.py | 11 +- .../examples/quality_controls_ex19.py | 11 +- .../examples/quality_controls_ex20.py | 11 +- .../examples/quality_controls_ex21.py | 11 +- .../examples/quality_controls_ex22.py | 11 +- .../examples/radial_prism_3d_algo.py | 18 +- doc/{salome => }/examples/split_biquad.py | 22 +- .../examples/test_homard_adapt.py | 39 ++- .../examples/test_uniform_refinement.py | 43 ++-- doc/{salome => }/examples/tests.set | 37 +-- .../examples/transforming_meshes_ex01.py | 4 +- .../examples/transforming_meshes_ex02.py | 6 +- .../examples/transforming_meshes_ex03.py | 16 +- doc/examples/transforming_meshes_ex04.py | 8 + .../examples/transforming_meshes_ex05.py | 7 +- .../examples/transforming_meshes_ex06.py | 40 ++- .../examples/transforming_meshes_ex07.py | 26 +- .../examples/transforming_meshes_ex08.py | 26 +- .../examples/transforming_meshes_ex09.py | 27 +- .../examples/transforming_meshes_ex10.py | 32 +-- .../examples/transforming_meshes_ex11.py | 18 +- .../examples/transforming_meshes_ex12.py | 38 ++- .../examples/transforming_meshes_ex13.py | 36 ++- .../examples/use_existing_faces.py | 57 ++--- .../examples/viewing_meshes_ex01.py | 25 +- .../examples/viewing_meshes_ex02.py | 15 +- doc/{salome/gui/SMESH => gui}/CMakeLists.txt | 0 .../gui/SMESH => gui}/collect_mesh_methods.py | 0 doc/{salome/gui/SMESH => gui}/conf.py.in | 0 .../SMESH => gui}/images/2d_from_3d_dlg.png | Bin .../images/2d_from_3d_example.png | Bin .../SMESH => gui}/images/2d_from_3d_ico.png | Bin .../SMESH => gui}/images/2d_from_3d_menu.png | Bin .../images/Clipping_Absolute.png | Bin .../images/Clipping_Relative.png | Bin .../SMESH => gui}/images/Nut_sharp_edges.png | Bin .../SMESH => gui}/images/a-arithmetic1d.png | Bin .../SMESH => gui}/images/a-averagelength.png | Bin .../gui/SMESH => gui}/images/a-clipping2.png | Bin .../SMESH => gui}/images/a-creategroup.png | Bin .../images/a-createpolyhedralvolume.png | Bin .../images/a-cuttingofquadrangles.png | Bin .../SMESH => gui}/images/a-deflection1d.png | Bin .../SMESH => gui}/images/a-filteronfaces.png | Bin .../SMESH => gui}/images/a-geometric1d.png | Bin .../gui/SMESH => gui}/images/a-maxelarea.png | Bin .../SMESH => gui}/images/a-maxelvolume.png | Bin .../gui/SMESH => gui}/images/a-maxsize1d.png | Bin .../SMESH => gui}/images/a-nbsegments1.png | Bin .../SMESH => gui}/images/a-nbsegments2.png | Bin .../SMESH => gui}/images/a-patterntype.png | Bin .../SMESH => gui}/images/a-patterntype1.png | Bin .../SMESH => gui}/images/a-standmeshinfo.png | Bin .../SMESH => gui}/images/a-startendlength.png | Bin .../SMESH => gui}/images/a-transparency.png | Bin .../images/a-unionoftriangles.png | Bin .../SMESH => gui}/images/a-viewgeneral.png | Bin .../SMESH => gui}/images/adaptation_01.png | Bin .../SMESH => gui}/images/adaptation_02.png | Bin .../adaptation_with_homard_advanced.png | Bin .../adaptation_with_homard_arguments.png | Bin ...tation_with_homard_boundary_analytical.png | Bin .../adaptation_with_homard_boundary_cao.png | Bin ...aptation_with_homard_boundary_discrete.png | Bin ...adaptation_with_homard_boundary_groups.png | Bin .../gui/SMESH => gui}/images/adaptive1d.png | Bin .../images/adaptive1d_sample_mesh.png | Bin doc/{salome/gui/SMESH => gui}/images/add.gif | Bin doc/{salome/gui/SMESH => gui}/images/add.png | Bin .../gui/SMESH => gui}/images/add0delement.png | Bin .../SMESH => gui}/images/add_0delement.png | Bin .../gui/SMESH => gui}/images/add_ball.png | Bin .../gui/SMESH => gui}/images/add_edge.png | Bin .../gui/SMESH => gui}/images/add_node.png | Bin .../images/add_node_on_face-dlg.png | Bin .../SMESH => gui}/images/add_node_on_face.png | Bin .../images/add_node_on_segment-dlg.png | Bin .../images/add_node_on_segment.png | Bin .../gui/SMESH => gui}/images/add_polygone.png | Bin .../SMESH => gui}/images/add_polyhedron.png | Bin .../SMESH => gui}/images/add_quadrangle.png | Bin .../gui/SMESH => gui}/images/add_triangle.png | Bin .../gui/SMESH => gui}/images/addball.png | Bin .../gui/SMESH => gui}/images/addedge.png | Bin .../SMESH => gui}/images/addhexahedron.png | Bin .../SMESH => gui}/images/addinfo_group.png | Bin .../gui/SMESH => gui}/images/addinfo_mesh.png | Bin .../SMESH => gui}/images/addinfo_submesh.png | Bin .../gui/SMESH => gui}/images/addnode.png | Bin .../SMESH => gui}/images/addnode_notebook.png | Bin .../gui/SMESH => gui}/images/addpolygon.png | Bin .../SMESH => gui}/images/addquadrangle.png | Bin .../SMESH => gui}/images/addtetrahedron.png | Bin .../gui/SMESH => gui}/images/addtriangle.png | Bin .../images/advanced_mesh_infos.png | Bin .../SMESH => gui}/images/analyticdensity.png | Bin .../SMESH => gui}/images/angle_measure.png | Bin doc/{salome/gui/SMESH => gui}/images/aqt.png | Bin .../SMESH => gui}/images/automaticlength.png | Bin .../SMESH => gui}/images/b-art_end_length.png | Bin .../SMESH => gui}/images/b-erage_length.png | Bin .../gui/SMESH => gui}/images/b-flection1d.png | Bin .../gui/SMESH => gui}/images/b-ithmetic1d.png | Bin .../SMESH => gui}/images/b-mberofsegments.png | Bin .../gui/SMESH => gui}/images/b-mesh_infos.png | Bin .../images/bare_border_faces_smpl.png | Bin .../images/bare_border_volumes_smpl.png | Bin .../gui/SMESH => gui}/images/basic_props.png | Bin .../SMESH => gui}/images/before_clipping.png | Bin .../images/before_clipping_preview.png | Bin .../images/block_renumber_hyp.png | Bin .../gui/SMESH => gui}/images/bnd_box.png | Bin .../SMESH => gui}/images/bnd_box_preview.png | Bin .../SMESH => gui}/images/buildcompound.png | Bin .../images/buildcompound_groups.png | Bin .../SMESH => gui}/images/cartesian3D_hyp.png | Bin .../images/cartesian3D_sphere.png | Bin .../images/cartesian_implement_edge.png | Bin .../images/choose_geom_selection_way.png | Bin .../images/circle_angles_after.png | Bin .../images/circle_simple_after.png | Bin .../images/circle_simple_before.png | Bin .../gui/SMESH => gui}/images/colors_size.png | Bin .../images/connectivity_edge.png | Bin .../images/connectivity_hex_prism.png | Bin .../images/connectivity_hexa.png | Bin .../images/connectivity_penta.png | Bin .../images/connectivity_polygon.png | Bin .../images/connectivity_polyhedron.png | Bin .../images/connectivity_pyramid.png | Bin .../images/connectivity_quad.png | Bin .../images/connectivity_tetra.png | Bin .../images/connectivity_tria.png | Bin .../SMESH => gui}/images/controls_popup.png | Bin .../gui/SMESH => gui}/images/convert.png | Bin .../SMESH => gui}/images/copy_mesh_dlg.png | Bin .../SMESH => gui}/images/copy_mesh_icon.png | Bin .../images/crack_emulation_double_nodes.png | Bin ...rack_emulation_double_nodes_with_elems.png | Bin .../images/create_boundary_1.png | Bin .../images/create_boundary_an_1.png | Bin .../images/create_boundary_an_2.png | Bin .../images/create_boundary_an_3.png | Bin .../images/create_boundary_an_4.png | Bin .../images/create_boundary_an_co_1.png | Bin .../images/create_boundary_an_co_2.png | Bin .../images/create_boundary_an_cy.png | Bin .../images/create_boundary_an_sp.png | Bin .../images/create_boundary_an_to.png | Bin .../images/create_boundary_cao_1.png | Bin .../images/create_boundary_cao_2.png | Bin .../images/create_boundary_di_1.png | Bin .../images/create_boundary_di_2.png | Bin .../images/create_boundary_di_3.png | Bin .../gui/SMESH => gui}/images/create_group.png | Bin .../images/create_groups_from_geometry.png | Bin .../gui/SMESH => gui}/images/creategroup.png | Bin .../images/creategroup_on_filter.png | Bin .../SMESH => gui}/images/createmesh-inv.png | Bin .../SMESH => gui}/images/createmesh-inv2.png | Bin .../SMESH => gui}/images/createmesh-inv3.png | Bin .../gui/SMESH => gui}/images/ctrlinfo.png | Bin .../images/curvi_angles_after.png | Bin .../images/curvi_simple_after.png | Bin .../images/curvi_simple_before.png | Bin .../images/custom_point_marker.png | Bin .../gui/SMESH => gui}/images/cut_groups1.png | Bin .../gui/SMESH => gui}/images/cutgroups.png | Bin .../SMESH => gui}/images/dataset_clipping.png | Bin .../SMESH => gui}/images/deflection_2d.png | Bin .../gui/SMESH => gui}/images/deletegroups.png | Bin .../images/diagonalinversion.png | Bin .../gui/SMESH => gui}/images/dialog.png | Bin .../gui/SMESH => gui}/images/dimgroup_0d.png | Bin .../gui/SMESH => gui}/images/dimgroup_1d.png | Bin .../gui/SMESH => gui}/images/dimgroup_2d.png | Bin .../gui/SMESH => gui}/images/dimgroup_dlg.png | Bin .../gui/SMESH => gui}/images/dimgroup_src.png | Bin .../SMESH => gui}/images/dimgroup_tui1.png | Bin .../images/display_entity_choose_item.png | Bin .../images/display_entity_dlg.png | Bin .../images/distribution_of_layers.png | Bin .../distributionwithanalyticdensity.png | Bin .../images/distributionwithtabledensity.png | Bin .../images/dlg_0D_on_all_nodes.png | Bin .../gui/SMESH => gui}/images/double_faces.png | Bin .../gui/SMESH => gui}/images/double_nodes.png | Bin .../gui/SMESH => gui}/images/duplicate01.png | Bin .../gui/SMESH => gui}/images/duplicate02.png | Bin .../gui/SMESH => gui}/images/duplicate03.png | Bin .../gui/SMESH => gui}/images/duplicate04.png | Bin .../SMESH => gui}/images/duplicate_nodes.png | Bin .../images/edge_wire_3d_after.png | Bin .../images/edge_wire_3d_before.png | Bin .../SMESH => gui}/images/edge_wire_after.png | Bin .../SMESH => gui}/images/edge_wire_before.png | Bin .../gui/SMESH => gui}/images/edit_mesh1.png | Bin .../images/edit_mesh_change_value_hyp.png | Bin .../images/edit_mesh_remove_hyp.png | Bin .../gui/SMESH => gui}/images/editgroup.png | Bin .../SMESH => gui}/images/editing_groups1.png | Bin .../gui/SMESH => gui}/images/elem_info.png | Bin .../gui/SMESH => gui}/images/eleminfo1.png | Bin .../gui/SMESH => gui}/images/eleminfo2.png | Bin .../images/extr_along_wire_after.png | Bin .../images/extr_along_wire_before.png | Bin .../SMESH => gui}/images/extru_rib_segs.png | Bin .../images/extrusion_along_path_dlg.png | Bin .../SMESH => gui}/images/extrusion_box.png | Bin .../SMESH => gui}/images/extrusion_groups.png | Bin .../images/extrusion_groups_res.png | Bin .../images/extrusionalongaline1.png | Bin .../images/extrusionalongaline2.png | Bin .../images/extrusionalongaline3.png | Bin .../images/extrusionbynormal_alongavgnorm.png | Bin .../images/extrusionbynormal_useonly.png | Bin .../images/failed_computation.png | Bin .../images/find_geom_by_mesh_elem.png | Bin .../gui/SMESH => gui}/images/findelement1.png | Bin .../gui/SMESH => gui}/images/findelement2.png | Bin .../gui/SMESH => gui}/images/findelement3.png | Bin .../gui/SMESH => gui}/images/formula1.png | Bin .../gui/SMESH => gui}/images/formula2.png | Bin .../gui/SMESH => gui}/images/formula4.png | Bin .../gui/SMESH => gui}/images/formula5.png | Bin .../SMESH => gui}/images/free_borders1.png | Bin .../gui/SMESH => gui}/images/free_edges.png | Bin .../gui/SMESH => gui}/images/free_faces.png | Bin .../gui/SMESH => gui}/images/free_nodes.png | Bin .../images/ghs3dprl_parameters_basic.png | Bin .../images/groups_by_sharp_edges_dlg.png | Bin .../gui/SMESH => gui}/images/groups_in_OB.png | Bin .../SMESH => gui}/images/hexa_ijk_mesh.png | Bin .../SMESH => gui}/images/hyp_source_edges.png | Bin .../SMESH => gui}/images/hyp_source_faces.png | Bin .../images/hypo_fixedpnt_dlg.png | Bin .../images/hypo_quad_params_1.png | Bin .../images/hypo_quad_params_2.png | Bin .../images/hypo_quad_params_dialog.png | Bin .../hypo_quad_params_dialog_corners.png | Bin .../images/hypo_quad_params_dialog_enf.png | Bin .../images/hypo_quad_params_dialog_vert.png | Bin .../hypo_quad_params_enfnodes_algo1.png | Bin .../hypo_quad_params_enfnodes_algo2.png | Bin .../hypo_quad_params_enfnodes_algo3.png | Bin .../images/hypo_quad_params_res.png | Bin .../images/hypo_quad_params_res_2.png | Bin .../SMESH => gui}/images/hypo_radquad_dlg.png | Bin .../gui/SMESH => gui}/images/hypo_sets.png | Bin .../gui/SMESH => gui}/images/image10.jpg | Bin .../gui/SMESH => gui}/images/image101.png | Bin .../gui/SMESH => gui}/images/image105.gif | Bin .../gui/SMESH => gui}/images/image106.gif | Bin .../gui/SMESH => gui}/images/image120.png | Bin .../gui/SMESH => gui}/images/image121.png | Bin .../gui/SMESH => gui}/images/image122.png | Bin .../gui/SMESH => gui}/images/image123.gif | Bin .../gui/SMESH => gui}/images/image124.gif | Bin .../gui/SMESH => gui}/images/image125.gif | Bin .../gui/SMESH => gui}/images/image126.gif | Bin .../gui/SMESH => gui}/images/image127.gif | Bin .../gui/SMESH => gui}/images/image130.gif | Bin .../gui/SMESH => gui}/images/image131.gif | Bin .../gui/SMESH => gui}/images/image132.gif | Bin .../gui/SMESH => gui}/images/image133.gif | Bin .../gui/SMESH => gui}/images/image134.gif | Bin .../gui/SMESH => gui}/images/image135.gif | Bin .../gui/SMESH => gui}/images/image136.gif | Bin .../gui/SMESH => gui}/images/image137.gif | Bin .../gui/SMESH => gui}/images/image138.gif | Bin .../gui/SMESH => gui}/images/image143.gif | Bin .../gui/SMESH => gui}/images/image144.png | Bin .../gui/SMESH => gui}/images/image145.png | Bin .../gui/SMESH => gui}/images/image146.png | Bin .../gui/SMESH => gui}/images/image147.gif | Bin .../gui/SMESH => gui}/images/image148.gif | Bin .../gui/SMESH => gui}/images/image15.jpg | Bin .../gui/SMESH => gui}/images/image151.gif | Bin .../gui/SMESH => gui}/images/image152.png | Bin .../gui/SMESH => gui}/images/image154.png | Bin .../gui/SMESH => gui}/images/image155.gif | Bin .../gui/SMESH => gui}/images/image156.gif | Bin .../gui/SMESH => gui}/images/image157.gif | Bin .../gui/SMESH => gui}/images/image160.gif | Bin .../gui/SMESH => gui}/images/image161.png | Bin .../gui/SMESH => gui}/images/image22.jpg | Bin .../gui/SMESH => gui}/images/image23.jpg | Bin .../gui/SMESH => gui}/images/image24.gif | Bin .../gui/SMESH => gui}/images/image25.jpg | Bin .../gui/SMESH => gui}/images/image25.png | Bin .../gui/SMESH => gui}/images/image27.jpg | Bin .../gui/SMESH => gui}/images/image28.png | Bin .../gui/SMESH => gui}/images/image30.jpg | Bin .../gui/SMESH => gui}/images/image31.jpg | Bin .../gui/SMESH => gui}/images/image32.jpg | Bin .../gui/SMESH => gui}/images/image32.png | Bin .../gui/SMESH => gui}/images/image33.gif | Bin .../gui/SMESH => gui}/images/image34.png | Bin .../gui/SMESH => gui}/images/image35.png | Bin .../gui/SMESH => gui}/images/image36.jpg | Bin .../gui/SMESH => gui}/images/image36.png | Bin .../gui/SMESH => gui}/images/image37.jpg | Bin .../gui/SMESH => gui}/images/image37.png | Bin .../gui/SMESH => gui}/images/image38.jpg | Bin .../gui/SMESH => gui}/images/image38.png | Bin .../gui/SMESH => gui}/images/image39.png | Bin .../gui/SMESH => gui}/images/image40.png | Bin .../gui/SMESH => gui}/images/image41.gif | Bin .../gui/SMESH => gui}/images/image42.png | Bin .../gui/SMESH => gui}/images/image43.png | Bin .../gui/SMESH => gui}/images/image46.gif | Bin .../gui/SMESH => gui}/images/image49.png | Bin .../gui/SMESH => gui}/images/image5.jpg | Bin .../gui/SMESH => gui}/images/image50.gif | Bin .../gui/SMESH => gui}/images/image51.jpg | Bin .../gui/SMESH => gui}/images/image52.jpg | Bin .../gui/SMESH => gui}/images/image53.gif | Bin .../gui/SMESH => gui}/images/image55.gif | Bin .../gui/SMESH => gui}/images/image56.gif | Bin .../gui/SMESH => gui}/images/image56.jpg | Bin .../gui/SMESH => gui}/images/image58.png | Bin .../gui/SMESH => gui}/images/image59.png | Bin .../gui/SMESH => gui}/images/image63.png | Bin .../gui/SMESH => gui}/images/image64.png | Bin .../gui/SMESH => gui}/images/image67.png | Bin .../gui/SMESH => gui}/images/image7.jpg | Bin .../gui/SMESH => gui}/images/image70.jpg | Bin .../gui/SMESH => gui}/images/image70.png | Bin .../gui/SMESH => gui}/images/image71.jpg | Bin .../gui/SMESH => gui}/images/image71.png | Bin .../gui/SMESH => gui}/images/image74.gif | Bin .../gui/SMESH => gui}/images/image75.jpg | Bin .../gui/SMESH => gui}/images/image76.jpg | Bin .../gui/SMESH => gui}/images/image77.jpg | Bin .../gui/SMESH => gui}/images/image78.jpg | Bin .../gui/SMESH => gui}/images/image79.jpg | Bin .../gui/SMESH => gui}/images/image79.png | Bin .../gui/SMESH => gui}/images/image80.png | Bin .../gui/SMESH => gui}/images/image82.png | Bin .../gui/SMESH => gui}/images/image83.gif | Bin .../gui/SMESH => gui}/images/image84.png | Bin .../gui/SMESH => gui}/images/image86.jpg | Bin .../gui/SMESH => gui}/images/image88.gif | Bin .../gui/SMESH => gui}/images/image88.jpg | Bin .../gui/SMESH => gui}/images/image90.jpg | Bin .../gui/SMESH => gui}/images/image91.png | Bin .../gui/SMESH => gui}/images/image92.jpg | Bin .../gui/SMESH => gui}/images/image92.png | Bin .../gui/SMESH => gui}/images/image93.jpg | Bin .../gui/SMESH => gui}/images/image94.gif | Bin .../gui/SMESH => gui}/images/image94.jpg | Bin .../gui/SMESH => gui}/images/image95.gif | Bin .../gui/SMESH => gui}/images/image95.jpg | Bin .../gui/SMESH => gui}/images/image96.gif | Bin .../gui/SMESH => gui}/images/image96.jpg | Bin .../gui/SMESH => gui}/images/image97.gif | Bin .../gui/SMESH => gui}/images/image97.jpg | Bin .../gui/SMESH => gui}/images/image98.png | Bin .../gui/SMESH => gui}/images/image99.gif | Bin .../gui/SMESH => gui}/images/image_octa12.png | Bin .../images/intersect_groups1.png | Bin .../SMESH => gui}/images/intersectgroups.png | Bin .../gui/SMESH => gui}/images/length-crit.png | Bin .../gui/SMESH => gui}/images/length2d.png | Bin .../SMESH => gui}/images/lengthnearvertex.png | Bin .../gui/SMESH => gui}/images/max_el_area.png | Bin .../images/max_element_length_2d.png | Bin .../images/max_element_length_3d.png | Bin .../gui/SMESH => gui}/images/mergeelems.png | Bin .../SMESH => gui}/images/mergeelems_auto.png | Bin .../SMESH => gui}/images/mergeelems_ico.png | Bin .../gui/SMESH => gui}/images/mergenodes.png | Bin .../SMESH => gui}/images/mergenodes_auto.png | Bin .../SMESH => gui}/images/mergenodes_ico.png | Bin .../SMESH => gui}/images/merging_nodes1.png | Bin .../SMESH => gui}/images/merging_nodes2.png | Bin .../gui/SMESH => gui}/images/mesh_clear.png | Bin .../images/mesh_cylinder_hexa.png | Bin doc/gui/images/mesh_deflection.png | Bin 0 -> 827 bytes .../images/mesh_evaluation_succeed.png | Bin .../SMESH => gui}/images/mesh_fixedpnt.png | Bin .../images/mesh_for_extr_along_path.png | Bin .../images/mesh_node_to_point.png | Bin .../SMESH => gui}/images/mesh_order_123.png | Bin .../images/mesh_order_123_res.png | Bin .../SMESH => gui}/images/mesh_order_213.png | Bin .../images/mesh_order_213_res.png | Bin .../SMESH => gui}/images/mesh_order_321.png | Bin .../images/mesh_order_321_res.png | Bin .../images/mesh_order_no_concurrent.png | Bin .../images/mesh_order_preview.png | Bin .../SMESH => gui}/images/mesh_precompute.png | Bin .../SMESH => gui}/images/mesh_radquad_01.png | Bin .../SMESH => gui}/images/mesh_radquad_02.png | Bin .../images/mesh_split_diag_interactive.png | Bin .../images/mesh_split_face_interactive.png | Bin .../images/meshcomputationfail.png | Bin .../images/meshcomputationsucceed.png | Bin .../SMESH => gui}/images/meshcut_plugin.png | Bin .../images/meshexportgroupwarning.png | Bin .../SMESH => gui}/images/meshexportmesh.png | Bin .../SMESH => gui}/images/meshimportmesh.png | Bin .../gui/SMESH => gui}/images/meshtopass1.png | Bin .../gui/SMESH => gui}/images/meshtopass2.png | Bin .../gui/SMESH => gui}/images/meshtopass3.png | Bin .../images/meshtrianglemergeelem1.png | Bin .../gui/SMESH => gui}/images/min_distance.png | Bin .../images/min_distance_preview.png | Bin .../gui/SMESH => gui}/images/movenodes.png | Bin .../SMESH => gui}/images/moving_nodes1.png | Bin .../SMESH => gui}/images/moving_nodes2.png | Bin .../SMESH => gui}/images/number_of_layers.png | Bin .../SMESH => gui}/images/opengl_clipping.png | Bin .../SMESH => gui}/images/orientaation1.png | Bin .../images/over_constrained_faces.png | Bin .../images/over_constrained_volumes.png | Bin .../gui/SMESH => gui}/images/pattern2d.png | Bin .../SMESH => gui}/images/patternmapping1.png | Bin .../SMESH => gui}/images/patternmapping2.png | Bin .../images/point_marker_widget1.png | Bin .../images/point_marker_widget2.png | Bin .../gui/SMESH => gui}/images/pref21.png | Bin .../gui/SMESH => gui}/images/pref22.png | Bin .../gui/SMESH => gui}/images/pref23.png | Bin .../gui/SMESH => gui}/images/pref24.png | Bin .../SMESH => gui}/images/preview_mesh_1D.png | Bin .../SMESH => gui}/images/preview_mesh_2D.png | Bin .../SMESH => gui}/images/preview_tmp_data.png | Bin .../gui/SMESH => gui}/images/prism_mesh.png | Bin .../SMESH => gui}/images/prism_needs_hyps.png | Bin .../gui/SMESH => gui}/images/prism_ok_ko.png | Bin .../gui/SMESH => gui}/images/prism_stack.png | Bin .../SMESH => gui}/images/prism_tui_sample.png | Bin .../SMESH => gui}/images/projection_1d.png | Bin .../SMESH => gui}/images/projection_2d.png | Bin .../SMESH => gui}/images/projection_3d.png | Bin .../images/propagation_chain.png | Bin .../images/quad_from_ma_medial_axis.png | Bin .../images/quad_from_ma_mesh.png | Bin .../images/quad_from_ma_ring_mesh.png | Bin .../images/quad_mesh_invalid.png | Bin .../gui/SMESH => gui}/images/quad_meshes.png | Bin .../images/radial_prism_mesh.png | Bin .../images/reduce_three_to_one.png | Bin .../gui/SMESH => gui}/images/remove.gif | Bin .../gui/SMESH => gui}/images/remove.png | Bin .../SMESH => gui}/images/remove_elements1.png | Bin .../SMESH => gui}/images/remove_elements2.png | Bin .../images/remove_elements_icon.png | Bin .../images/remove_node_reconnection.png | Bin .../images/remove_node_reconnection_dlg.png | Bin .../images/remove_node_reconnection_icon.png | Bin .../SMESH => gui}/images/remove_nodes1.png | Bin .../SMESH => gui}/images/remove_nodes2.png | Bin .../images/remove_nodes_icon.png | Bin .../images/remove_orphan_nodes_icon.png | Bin .../SMESH => gui}/images/removeelements.png | Bin .../gui/SMESH => gui}/images/removenodes.png | Bin .../images/removeorphannodes.png | Bin .../SMESH => gui}/images/renumberelements.png | Bin .../SMESH => gui}/images/renumbernodes.png | Bin .../SMESH => gui}/images/reorient_2d_face.png | Bin .../images/reorient_2d_point.png | Bin .../images/reorient_2d_refgroup.png | Bin .../images/reorient_2d_volume.png | Bin .../images/reorient_faces_face.png | Bin .../images/reorient_faces_point.png | Bin .../images/reorient_faces_ref_groups.png | Bin .../images/reorient_faces_volume.png | Bin .../images/rev_edges_helper_dlg.png | Bin .../gui/SMESH => gui}/images/revolution1.png | Bin .../SMESH => gui}/images/revolutionsn1.png | Bin .../SMESH => gui}/images/revolutionsn2.png | Bin .../gui/SMESH => gui}/images/rotation.png | Bin .../gui/SMESH => gui}/images/rotation1.png | Bin .../gui/SMESH => gui}/images/rotation2.png | Bin .../gui/SMESH => gui}/images/rotation_ico.png | Bin .../SMESH => gui}/images/scalar_bar_dlg.png | Bin .../gui/SMESH => gui}/images/scale01.png | Bin .../gui/SMESH => gui}/images/scale02.png | Bin .../gui/SMESH => gui}/images/scale03.png | Bin .../gui/SMESH => gui}/images/scale04.png | Bin .../gui/SMESH => gui}/images/scale06.png | Bin .../gui/SMESH => gui}/images/scale07.png | Bin .../gui/SMESH => gui}/images/scale09.png | Bin .../gui/SMESH => gui}/images/scaleinit01.png | Bin .../gui/SMESH => gui}/images/scaleinit02.png | Bin .../gui/SMESH => gui}/images/scaleres03.png | Bin .../gui/SMESH => gui}/images/scaleres04.png | Bin .../gui/SMESH => gui}/images/scaleres06.png | Bin .../gui/SMESH => gui}/images/scaleres07.png | Bin .../gui/SMESH => gui}/images/scaleres09.png | Bin .../images/selectionfilterlibrary.png | Bin .../SMESH => gui}/images/sew_after_merge.png | Bin .../SMESH => gui}/images/sew_using_merge.png | Bin .../gui/SMESH => gui}/images/sewing.png | Bin .../gui/SMESH => gui}/images/sewing1.png | Bin .../gui/SMESH => gui}/images/sewing2.png | Bin .../gui/SMESH => gui}/images/sewing3.png | Bin .../gui/SMESH => gui}/images/sewing4.png | Bin .../gui/SMESH => gui}/images/sewing_auto.png | Bin .../SMESH => gui}/images/sewing_manual.png | Bin .../SMESH => gui}/images/show_bad_mesh.png | Bin .../gui/SMESH => gui}/images/smesh_sort.png | Bin .../images/smesh_sort_groups.png | Bin .../gui/SMESH => gui}/images/smoothing.png | Bin .../gui/SMESH => gui}/images/smoothing1.png | Bin .../gui/SMESH => gui}/images/smoothing2.png | Bin doc/{salome/gui/SMESH => gui}/images/sort.gif | Bin doc/{salome/gui/SMESH => gui}/images/sort.png | Bin .../images/split_biquad_to_linear_dlg.png | Bin .../images/split_biquad_to_linear_icon.png | Bin .../images/split_biquad_to_linear_mesh.png | Bin .../images/split_into_prisms.png | Bin .../SMESH => gui}/images/split_into_tetra.png | Bin .../images/split_into_tetra_icon.png | Bin .../SMESH => gui}/images/std_point_marker.png | Bin .../SMESH => gui}/images/straight_after.png | Bin .../SMESH => gui}/images/straight_before.png | Bin doc/{salome/gui/SMESH => gui}/images/swap.png | Bin .../gui/SMESH => gui}/images/symmetry.png | Bin .../gui/SMESH => gui}/images/symmetry1.png | Bin .../gui/SMESH => gui}/images/symmetry2.png | Bin .../gui/SMESH => gui}/images/symmetry3.png | Bin .../SMESH => gui}/images/topo_equality.png | Bin .../gui/SMESH => gui}/images/translation.png | Bin .../gui/SMESH => gui}/images/translation1.png | Bin .../gui/SMESH => gui}/images/translation2.png | Bin .../SMESH => gui}/images/union_groups1.png | Bin .../gui/SMESH => gui}/images/uniongroups.png | Bin .../images/unionoftwotriangles.png | Bin .../images/uniting_a_set_of_triangles1.png | Bin .../images/uniting_a_set_of_triangles2.png | Bin .../images/uniting_two_triangles1.png | Bin .../images/uniting_two_triangles2.png | Bin .../images/use_existing_face_sample_mesh.png | Bin .../images/using_notebook_smesh.png | Bin .../images/viscous_layers_2d_hyp.png | Bin .../viscous_layers_extrusion_method.png | Bin .../images/viscous_layers_hyp.png | Bin .../images/viscous_layers_mesh.png | Bin .../images/viscous_layers_on_submesh.png | Bin .../SMESH => gui}/input/1d_meshing_hypo.rst | 0 .../SMESH => gui}/input/2d_meshing_hypo.rst | 0 .../SMESH => gui}/input/3d_meshing_hypo.rst | 0 .../SMESH => gui}/input/StdMeshersBuilder.rst | 0 .../gui/SMESH => gui}/input/about_filters.rst | 0 .../gui/SMESH => gui}/input/about_hypo.rst | 0 .../gui/SMESH => gui}/input/about_meshes.rst | 0 .../input/about_quality_controls.rst | 2 + .../gui/SMESH => gui}/input/adaptation.rst | 0 .../SMESH => gui}/input/add_node_on_face.rst | 0 .../input/add_node_on_segment.rst | 0 .../input/adding_nodes_and_elements.rst | 0 .../input/adding_quadratic_elements.rst | 0 .../SMESH => gui}/input/additional_hypo.rst | 0 doc/{salome/gui/SMESH => gui}/input/area.rst | 0 .../gui/SMESH => gui}/input/aspect_ratio.rst | 0 .../SMESH => gui}/input/aspect_ratio_3d.rst | 0 .../SMESH => gui}/input/bare_border_face.rst | 0 .../input/bare_border_volumes.rst | 0 .../input/basic_meshing_algos.rst | 0 .../input/borders_at_multi_connection.rst | 0 .../input/borders_at_multi_connection_2d.rst | 0 .../input/building_compounds.rst | 0 .../SMESH => gui}/input/cartesian_algo.rst | 0 .../changing_orientation_of_elements.rst | 0 .../gui/SMESH => gui}/input/clipping.rst | 0 .../gui/SMESH => gui}/input/colors_size.rst | 0 .../gui/SMESH => gui}/input/connectivity.rst | 0 .../input/constructing_meshes.rst | 0 .../input/constructing_submeshes.rst | 0 .../input/convert_to_from_quadratic_mesh.rst | 0 .../gui/SMESH => gui}/input/copy_mesh.rst | 0 .../input/create_groups_from_geometry.rst | 0 .../SMESH => gui}/input/creating_groups.rst | 0 .../SMESH => gui}/input/cut_mesh_by_plane.rst | 0 .../input/cutting_quadrangles.rst | 0 .../input/define_mesh_by_script.rst | 0 doc/gui/input/deflection_2d.rst | 24 ++ .../SMESH => gui}/input/deleting_groups.rst | 0 .../input/diagonal_inversion_of_elements.rst | 0 .../SMESH => gui}/input/display_entity.rst | 0 .../gui/SMESH => gui}/input/display_mode.rst | 0 .../input/double_elements_control.rst | 0 .../input/double_nodes_control.rst | 0 .../SMESH => gui}/input/double_nodes_page.rst | 0 .../SMESH => gui}/input/editing_groups.rst | 0 .../SMESH => gui}/input/editing_meshes.rst | 0 .../gui/SMESH => gui}/input/extrusion.rst | 0 .../input/extrusion_along_path.rst | 0 .../input/face_groups_by_sharp_edges.rst | 0 .../input/find_element_by_point.rst | 0 .../gui/SMESH => gui}/input/free_borders.rst | 0 .../gui/SMESH => gui}/input/free_edges.rst | 0 .../gui/SMESH => gui}/input/free_faces.rst | 0 .../gui/SMESH => gui}/input/free_nodes.rst | 0 .../input/generate_flat_elements.rst | 0 .../input/group_of_underlying_elements.rst | 0 .../SMESH => gui}/input/grouping_elements.rst | 0 .../input/homard_create_boundary.rst | 0 .../input/importing_exporting_meshes.rst | 0 doc/{salome/gui/SMESH => gui}/input/index.rst | 0 .../gui/SMESH => gui}/input/length.rst | 0 .../gui/SMESH => gui}/input/length_2d.rst | 0 .../input/make_2dmesh_from_3d.rst | 0 .../input/max_element_length_2d.rst | 0 .../input/max_element_length_3d.rst | 0 .../gui/SMESH => gui}/input/measurements.rst | 0 .../SMESH => gui}/input/merging_elements.rst | 0 .../gui/SMESH => gui}/input/merging_nodes.rst | 0 .../gui/SMESH => gui}/input/mesh_infos.rst | 0 .../SMESH => gui}/input/mesh_preferences.rst | 0 .../input/mesh_through_point.rst | 0 .../gui/SMESH => gui}/input/minimum_angle.rst | 0 .../SMESH => gui}/input/modifying_meshes.rst | 0 .../gui/SMESH => gui}/input/modules.rst | 0 .../gui/SMESH => gui}/input/numbering.rst | 0 .../input/over_constrained_faces.rst | 0 .../input/over_constrained_volumes.rst | 0 .../SMESH => gui}/input/pattern_mapping.rst | 0 .../gui/SMESH => gui}/input/point_marker.rst | 0 .../gui/SMESH => gui}/input/prism_3d_algo.rst | 0 .../SMESH => gui}/input/projection_algos.rst | 0 .../SMESH => gui}/input/quad_from_ma_algo.rst | 0 .../gui/SMESH => gui}/input/quad_ijk_algo.rst | 0 .../SMESH => gui}/input/radial_prism_algo.rst | 0 .../input/radial_quadrangle_1D2D_algo.rst | 0 .../input/removing_nodes_and_elements.rst | 0 .../SMESH => gui}/input/reorient_faces.rst | 0 .../gui/SMESH => gui}/input/revolution.rst | 0 .../gui/SMESH => gui}/input/rotation.rst | 0 .../gui/SMESH => gui}/input/scalar_bar.rst | 0 doc/{salome/gui/SMESH => gui}/input/scale.rst | 0 .../input/segments_around_vertex_algo.rst | 0 .../input/selection_filter_library.rst | 0 .../gui/SMESH => gui}/input/sewing_meshes.rst | 0 doc/{salome/gui/SMESH => gui}/input/skew.rst | 0 .../gui/SMESH => gui}/input/smeshBuilder.rst | 0 .../SMESH => gui}/input/smesh_migration.rst | 0 .../gui/SMESH => gui}/input/smesh_module.rst | 0 .../SMESH => gui}/input/smeshpy_interface.rst | 4 +- .../SMESH => gui}/input/smeshstudytools.rst | 0 .../gui/SMESH => gui}/input/smoothing.rst | 0 .../input/split_biquad_to_linear.rst | 0 .../SMESH => gui}/input/split_to_tetra.rst | 0 .../gui/SMESH => gui}/input/symmetry.rst | 0 doc/{salome/gui/SMESH => gui}/input/taper.rst | 0 doc/{salome/gui/SMESH => gui}/input/tools.rst | 0 .../gui/SMESH => gui}/input/translation.rst | 0 .../gui/SMESH => gui}/input/transparency.rst | 0 doc/gui/input/tui_adaptation.rst | 33 +++ .../input/tui_creating_meshes.rst | 36 +-- .../input/tui_defining_hypotheses.rst | 100 ++++---- .../gui/SMESH => gui}/input/tui_filters.rst | 164 ++++++------ .../input/tui_grouping_elements.rst | 36 +-- doc/gui/input/tui_measurements.rst | 43 ++++ .../input/tui_modifying_meshes.rst | 116 ++++----- .../input/tui_notebook_smesh.rst | 4 +- doc/gui/input/tui_quality_controls.rst | 242 ++++++++++++++++++ doc/gui/input/tui_transforming_meshes.rst | 138 ++++++++++ doc/gui/input/tui_viewing_meshes.rst | 27 ++ .../input/tui_work_on_objects_from_gui.rst | 0 .../input/uniting_set_of_triangles.rst | 0 .../input/uniting_two_triangles.rst | 0 .../input/use_existing_algos.rst | 0 .../input/using_notebook_smesh_page.rst | 0 .../input/using_operations_on_groups.rst | 0 .../input/viewing_meshes_overview.rst | 0 .../gui/SMESH => gui}/input/volume.rst | 0 .../gui/SMESH => gui}/input/warping.rst | 0 .../locale/fr/LC_MESSAGES/1d_meshing_hypo.po | 0 .../locale/fr/LC_MESSAGES/2d_meshing_hypo.po | 0 .../locale/fr/LC_MESSAGES/about_filters.po | 0 .../locale/fr/LC_MESSAGES/about_hypo.po | 0 .../locale/fr/LC_MESSAGES/about_meshes.po | 0 .../fr/LC_MESSAGES/about_quality_controls.po | 0 .../LC_MESSAGES/adding_nodes_and_elements.po | 0 .../LC_MESSAGES/adding_quadratic_elements.po | 0 .../locale/fr/LC_MESSAGES/additional_hypo.po | 0 .../locale/fr/LC_MESSAGES/area.po | 0 .../locale/fr/LC_MESSAGES/aspect_ratio.po | 0 .../locale/fr/LC_MESSAGES/aspect_ratio_3d.po | 0 .../locale/fr/LC_MESSAGES/bare_border_face.po | 0 .../fr/LC_MESSAGES/bare_border_volumes.po | 0 .../fr/LC_MESSAGES/basic_meshing_algos.po | 0 .../borders_at_multi_connection.po | 0 .../borders_at_multi_connection_2d.po | 0 .../fr/LC_MESSAGES/building_compounds.po | 0 .../locale/fr/LC_MESSAGES/cartesian_algo.po | 0 .../changing_orientation_of_elements.po | 0 .../locale/fr/LC_MESSAGES/clipping.po | 0 .../locale/fr/LC_MESSAGES/colors_size.po | 0 .../locale/fr/LC_MESSAGES/connectivity.po | 0 .../fr/LC_MESSAGES/constructing_meshes.po | 0 .../fr/LC_MESSAGES/constructing_submeshes.po | 0 .../convert_to_from_quadratic_mesh.po | 0 .../locale/fr/LC_MESSAGES/copy_mesh.po | 0 .../create_groups_from_geometry.po | 0 .../locale/fr/LC_MESSAGES/creating_groups.po | 0 .../fr/LC_MESSAGES/cut_mesh_by_plane.po | 0 .../fr/LC_MESSAGES/cutting_quadrangles.po | 0 .../fr/LC_MESSAGES/define_mesh_by_script.po | 0 .../locale/fr/LC_MESSAGES/deleting_groups.po | 0 .../diagonal_inversion_of_elements.po | 0 .../locale/fr/LC_MESSAGES/display_entity.po | 0 .../locale/fr/LC_MESSAGES/display_mode.po | 0 .../fr/LC_MESSAGES/double_elements_control.po | 0 .../fr/LC_MESSAGES/double_nodes_control.po | 0 .../fr/LC_MESSAGES/double_nodes_page.po | 0 .../locale/fr/LC_MESSAGES/editing_groups.po | 0 .../locale/fr/LC_MESSAGES/editing_meshes.po | 0 .../locale/fr/LC_MESSAGES/extrusion.po | 0 .../fr/LC_MESSAGES/extrusion_along_path.po | 0 .../fr/LC_MESSAGES/find_element_by_point.po | 0 .../locale/fr/LC_MESSAGES/free_borders.po | 0 .../locale/fr/LC_MESSAGES/free_edges.po | 0 .../locale/fr/LC_MESSAGES/free_faces.po | 0 .../locale/fr/LC_MESSAGES/free_nodes.po | 0 .../fr/LC_MESSAGES/generate_flat_elements.po | 0 .../group_of_underlying_elements.po | 0 .../fr/LC_MESSAGES/grouping_elements.po | 0 .../LC_MESSAGES/importing_exporting_meshes.po | 0 .../locale/fr/LC_MESSAGES/index.po | 0 .../locale/fr/LC_MESSAGES/introduction.po | 0 .../locale/fr/LC_MESSAGES/length.po | 0 .../locale/fr/LC_MESSAGES/length_2d.po | 0 .../fr/LC_MESSAGES/make_2dmesh_from_3d.po | 0 .../fr/LC_MESSAGES/max_element_length_2d.po | 0 .../fr/LC_MESSAGES/max_element_length_3d.po | 0 .../fr/LC_MESSAGES/max_element_volume_hypo.po | 0 .../locale/fr/LC_MESSAGES/measurements.po | 0 .../locale/fr/LC_MESSAGES/merging_elements.po | 0 .../locale/fr/LC_MESSAGES/merging_nodes.po | 0 .../locale/fr/LC_MESSAGES/mesh_infos.po | 0 .../locale/fr/LC_MESSAGES/mesh_preferences.po | 0 .../fr/LC_MESSAGES/mesh_through_point.po | 0 .../locale/fr/LC_MESSAGES/minimum_angle.po | 0 .../locale/fr/LC_MESSAGES/modifying_meshes.po | 0 .../locale/fr/LC_MESSAGES/modules.po | 0 .../locale/fr/LC_MESSAGES/numbering.po | 0 .../fr/LC_MESSAGES/over_constrained_faces.po | 0 .../LC_MESSAGES/over_constrained_volumes.po | 0 .../locale/fr/LC_MESSAGES/pattern_mapping.po | 0 .../locale/fr/LC_MESSAGES/point_marker.po | 0 .../locale/fr/LC_MESSAGES/prism_3d_algo.po | 0 .../locale/fr/LC_MESSAGES/projection_algos.po | 0 .../locale/fr/LC_MESSAGES/python_api.po | 0 .../fr/LC_MESSAGES/quad_from_ma_algo.po | 0 .../locale/fr/LC_MESSAGES/quad_ijk_algo.po | 0 .../fr/LC_MESSAGES/radial_prism_algo.po | 0 .../radial_quadrangle_1D2D_algo.po | 0 .../removing_nodes_and_elements.po | 0 .../locale/fr/LC_MESSAGES/reorient_faces.po | 0 .../locale/fr/LC_MESSAGES/revolution.po | 0 .../locale/fr/LC_MESSAGES/rotation.po | 0 .../locale/fr/LC_MESSAGES/scalar_bar.po | 0 .../locale/fr/LC_MESSAGES/scale.po | 0 .../segments_around_vertex_algo.po | 0 .../LC_MESSAGES/selection_filter_library.po | 0 .../locale/fr/LC_MESSAGES/sewing_meshes.po | 0 .../locale/fr/LC_MESSAGES/skew.po | 0 .../locale/fr/LC_MESSAGES/smesh_migration.po | 0 .../fr/LC_MESSAGES/smeshpy_interface.po | 0 .../locale/fr/LC_MESSAGES/smoothing.po | 0 .../fr/LC_MESSAGES/split_biquad_to_linear.po | 0 .../locale/fr/LC_MESSAGES/split_to_tetra.po | 0 .../locale/fr/LC_MESSAGES/symmetry.po | 0 .../locale/fr/LC_MESSAGES/taper.po | 0 .../locale/fr/LC_MESSAGES/tools.po | 0 .../locale/fr/LC_MESSAGES/translation.po | 0 .../locale/fr/LC_MESSAGES/transparency.po | 0 .../fr/LC_MESSAGES/tui_cartesian_algo.po | 0 .../fr/LC_MESSAGES/tui_creating_meshes.po | 0 .../fr/LC_MESSAGES/tui_defining_hypotheses.po | 0 .../locale/fr/LC_MESSAGES/tui_filters.po | 0 .../LC_MESSAGES/tui_generate_flat_elements.po | 0 .../fr/LC_MESSAGES/tui_grouping_elements.po | 0 .../locale/fr/LC_MESSAGES/tui_measurements.po | 0 .../fr/LC_MESSAGES/tui_modifying_meshes.po | 0 .../fr/LC_MESSAGES/tui_notebook_smesh.po | 0 .../fr/LC_MESSAGES/tui_prism_3d_algo.po | 0 .../fr/LC_MESSAGES/tui_quality_controls.po | 0 .../fr/LC_MESSAGES/tui_transforming_meshes.po | 0 .../fr/LC_MESSAGES/tui_use_existing_faces.po | 0 .../fr/LC_MESSAGES/tui_viewing_meshes.po | 0 .../tui_work_on_objects_from_gui.po | 0 .../LC_MESSAGES/uniting_set_of_triangles.po | 0 .../fr/LC_MESSAGES/uniting_two_triangles.po | 0 .../fr/LC_MESSAGES/use_existing_algos.po | 0 .../LC_MESSAGES/using_notebook_smesh_page.po | 0 .../LC_MESSAGES/using_operations_on_groups.po | 0 .../fr/LC_MESSAGES/viewing_meshes_overview.po | 0 .../locale/fr/LC_MESSAGES/volume.po | 0 .../locale/fr/LC_MESSAGES/warping.po | 0 .../gui/SMESH => gui}/merge_mesh_class.py | 0 .../gui/SMESH => gui}/static/switchers.js.in | 0 .../gui/SMESH => gui}/templates/layout.html | 0 doc/salome/examples/creating_meshes_ex06.py | 120 --------- doc/salome/examples/creating_meshes_ex07.py | 85 ------ doc/salome/examples/creating_meshes_ex08.py | 59 ----- .../defining_hypotheses_adaptive1d.py | 30 --- .../examples/defining_hypotheses_ex05.py | 44 ---- .../examples/defining_hypotheses_ex16.py | 50 ---- doc/salome/examples/filters_ex07.py | 10 - doc/salome/examples/filters_ex30.py | 12 - doc/salome/examples/filters_ex31.py | 12 - doc/salome/examples/generate_flat_elements.py | 65 ----- doc/salome/examples/grouping_elements_ex02.py | 46 ---- doc/salome/examples/measurements_ex01.py | 58 ----- doc/salome/examples/measurements_ex02.py | 33 --- doc/salome/examples/modifying_meshes_ex11.py | 18 -- doc/salome/examples/modifying_meshes_ex14.py | 9 - doc/salome/examples/modifying_meshes_ex21.py | 35 --- doc/salome/examples/quality_controls_ex06.py | 78 ------ doc/salome/examples/quality_controls_ex10.py | 25 -- doc/salome/examples/tests.py.in | 54 ---- .../examples/transforming_meshes_ex04.py | 14 - doc/salome/gui/SMESH/input/tui_adaptation.rst | 33 --- .../gui/SMESH/input/tui_measurements.rst | 43 ---- .../gui/SMESH/input/tui_quality_controls.rst | 231 ----------------- .../SMESH/input/tui_transforming_meshes.rst | 138 ---------- .../gui/SMESH/input/tui_viewing_meshes.rst | 27 -- doc/{salome => }/tui/CMakeLists.txt | 0 doc/{salome => }/tui/doxyfile.in | 0 doc/{salome => }/tui/images/application.gif | Bin doc/{salome => }/tui/images/head.png | Bin doc/{salome => }/tui/images/logocorp.gif | Bin doc/{salome => }/tui/images/smeshscreen.png | Bin doc/{salome => }/tui/input/index.doc | 0 doc/{salome => }/tui/static/footer.html | 0 doc/{salome => }/tui/static/header.html.in | 0 doc/{salome => }/tui/static/salome_extra.css | 0 resources/SalomeApp.xml.in | 3 + src/SMESH_SWIG/CMakeLists.txt | 72 +----- src/SMESH_SWIG/SMESH_shared_modules.py | 44 ---- src/SMESH_SWIG/YACS_geomesh0.py | 192 -------------- src/Tools/MacMesh/CMakeLists.txt | 14 +- src/Tools/TopIIVolMeshPlug/CMakeLists.txt | 1 - test/0README | 7 + test/CMakeLists.txt | 38 ++- .../CTestTestfileInstall.cmake | 17 +- {src/SMESH_SWIG => test}/PAL_MESH_041_mesh.py | 0 {src/SMESH_SWIG => test}/PAL_MESH_043_2D.py | 0 {src/SMESH_SWIG => test}/PAL_MESH_043_3D.py | 0 .../SMESH_AdvancedEditor.py | 0 .../SMESH_SWIG => test}/SMESH_BelongToGeom.py | 0 .../SMESH_BuildCompound.py | 0 .../SMESH_GroupFromGeom.py | 0 .../SMESH_GroupFromGeom2.py | 0 .../SMESH_GroupLyingOnGeom.py | 0 {src/SMESH_SWIG => test}/SMESH_Nut.py | 0 .../SMESH_Partition1_tetra.py | 0 {src/SMESH_SWIG => test}/SMESH_Sphere.py | 0 {src/SMESH_SWIG => test}/SMESH_blocks.py | 0 {src/SMESH_SWIG => test}/SMESH_box.py | 0 {src/SMESH_SWIG => test}/SMESH_box2_tetra.py | 0 {src/SMESH_SWIG => test}/SMESH_box3_tetra.py | 0 {src/SMESH_SWIG => test}/SMESH_box_tetra.py | 0 {src/SMESH_SWIG => test}/SMESH_controls.py | 0 .../SMESH_demo_hexa2_upd.py | 0 {src/SMESH_SWIG => test}/SMESH_fixation.py | 0 .../SMESH_fixation_hexa.py | 0 .../SMESH_fixation_netgen.py | 0 .../SMESH_fixation_tetra.py | 0 {src/SMESH_SWIG => test}/SMESH_flight_skin.py | 2 +- {src/SMESH_SWIG => test}/SMESH_freebord.py | 0 {src/SMESH_SWIG => test}/SMESH_hexaedre.py | 0 {src/SMESH_SWIG => test}/SMESH_mechanic.py | 0 .../SMESH_mechanic_editor.py | 0 .../SMESH_mechanic_netgen.py | 0 .../SMESH_mechanic_tetra.py | 0 {src/SMESH_SWIG => test}/SMESH_reg.py | 0 {src/SMESH_SWIG => test}/SMESH_test.py | 0 {src/SMESH_SWIG => test}/SMESH_test0.py | 0 {src/SMESH_SWIG => test}/SMESH_test1.py | 0 .../SMESH_test1_AndDisplay.py | 0 {src/SMESH_SWIG => test}/SMESH_test2.py | 0 {src/SMESH_SWIG => test}/SMESH_test3.py | 0 {src/SMESH_SWIG => test}/SMESH_test4.py | 0 {src/SMESH_SWIG => test}/SMESH_test5.py | 47 ++-- .../basic_geom_smesh_without_session.py | 0 .../basic_shaper_smesh_without_session.py | 0 .../basic_smesh_output_with_mc_field.py | 0 .../blocFissure_01_without_session.py | 0 .../blocFissure_02_without_session.py | 0 .../blocFissure_03_without_session.py | 0 .../blocFissure_04_without_session.py | 0 .../blocFissure_05_without_session.py | 0 .../blocFissure_06_without_session.py | 0 .../blocFissure_07_without_session.py | 0 .../examples => test}/create_penta_biquad.py | 0 .../examples => test/data}/Mesh_tri.med | Bin .../doublenodes_polyhedra.py | 0 {src/SMESH_SWIG => test}/ex00_all.py | 0 {src/SMESH_SWIG => test}/ex01_cube2build.py | 0 .../ex02_cube2primitive.py | 0 .../ex03_cube2partition.py | 0 .../ex04_cube5tetraHexa.py | 0 {src/SMESH_SWIG => test}/ex05_hole1build.py | 0 {src/SMESH_SWIG => test}/ex06_hole1boolean.py | 0 .../ex07_hole1partition.py | 0 {src/SMESH_SWIG => test}/ex08_hole2build.py | 0 {src/SMESH_SWIG => test}/ex09_grid4build.py | 0 .../SMESH_SWIG => test}/ex10_grid4geometry.py | 0 .../ex11_grid3partition.py | 0 .../ex12_grid17partition.py | 0 {src/SMESH_SWIG => test}/ex13_hole1partial.py | 0 {src/SMESH_SWIG => test}/ex14_cyl1holed.py | 0 {src/SMESH_SWIG => test}/ex15_cyl2geometry.py | 0 .../ex16_cyl2complementary.py | 0 {src/SMESH_SWIG => test}/ex17_dome1.py | 0 {src/SMESH_SWIG => test}/ex18_dome2.py | 0 {src/SMESH_SWIG => test}/ex19_sphereINcube.py | 0 {src/SMESH_SWIG => test}/ex21_lamp.py | 0 {src/SMESH_SWIG => test}/ex24_cylinder.py | 0 {src/SMESH_SWIG => test}/ex29_refine.py | 17 +- {src/SMESH_SWIG => test}/ex30_groupsOp.py | 0 {src/SMESH_SWIG => test}/ex30_tepal.py | 0 {src/SMESH_SWIG => test}/ex31_dimGroup.py | 0 .../examples => test}/ex_MakePolyLine.py | 6 +- .../extrusion_penta_biquad.py | 0 .../shaper_smesh_groups_without_session.py | 0 .../ssl_hdf5_symbols_conflicts.py | 5 +- .../examples/testme.py => test/test_helper.py | 0 .../test_polyhedron_per_solid.py | 0 .../test_smeshplugin_mg_tetra_parallele.py | 0 .../examples => test}/test_smeshplugins.py | 0 test/tests.set | 133 ++++++++++ 1086 files changed, 2941 insertions(+), 3258 deletions(-) rename doc/salome/CMakeLists.txt => CTestTestfileInstall.cmake.in (81%) create mode 100644 doc/examples/0README rename doc/{salome => }/examples/CMakeLists.txt (50%) rename doc/{salome/gui/CMakeLists.txt => examples/CTestTestfileInstall.cmake} (70%) rename doc/{salome => }/examples/MGAdaptTests_without_session.py (97%) rename doc/{salome => }/examples/a3DmeshOnModified2Dmesh.py (100%) rename doc/{salome => }/examples/cartesian_algo.py (79%) rename doc/{salome => }/examples/creating_meshes_ex01.py (69%) rename doc/{salome => }/examples/creating_meshes_ex02.py (75%) rename doc/{salome => }/examples/creating_meshes_ex03.py (87%) rename doc/{salome => }/examples/creating_meshes_ex04.py (75%) rename doc/{salome => }/examples/creating_meshes_ex05.py (75%) create mode 100644 doc/examples/creating_meshes_ex06.py create mode 100644 doc/examples/creating_meshes_ex07.py create mode 100644 doc/examples/creating_meshes_ex08.py rename doc/{salome/examples/MGAdapt_med_files => examples/data}/test_01.med (100%) rename doc/{salome/examples/MGAdapt_med_files => examples/data}/test_02.med (100%) rename doc/{salome/examples/MGAdapt_med_files => examples/data}/test_02_bg.med (100%) rename doc/{salome/examples/MGAdapt_med_files => examples/data}/test_04.med (100%) rename doc/{salome/examples/MGAdapt_med_files => examples/data}/test_06.med (100%) rename doc/{salome/examples/MGAdapt_med_files => examples/data}/test_07.med (100%) rename doc/{salome/examples/MGAdapt_med_files => examples/data}/test_08.med (100%) rename doc/{salome/examples/MGAdapt_med_files => examples/data}/test_08_bg.med (100%) rename doc/{salome/examples/MGAdapt_med_files => examples/data}/test_10.med (100%) rename doc/{salome/examples/MGAdapt_med_files => examples/data}/test_11.med (100%) rename doc/{salome/examples/MGAdapt_med_files => examples/data}/test_13.med (100%) rename doc/{salome/examples => examples/data}/test_homard_adapt.med (100%) rename doc/{salome/examples => examples/data}/tutorial_4.00.med (100%) rename doc/{salome/examples => examples/data}/tutorial_4.xao (100%) rename doc/{salome/examples => examples/data}/tutorial_5.00.med (100%) rename doc/{salome/examples => examples/data}/tutorial_5.fr.med (100%) create mode 100644 doc/examples/defining_hypotheses_adaptive1d.py rename doc/{salome => }/examples/defining_hypotheses_ex01.py (78%) rename doc/{salome => }/examples/defining_hypotheses_ex02.py (52%) rename doc/{salome => }/examples/defining_hypotheses_ex03.py (69%) rename doc/{salome => }/examples/defining_hypotheses_ex04.py (68%) create mode 100644 doc/examples/defining_hypotheses_ex05.py rename doc/{salome => }/examples/defining_hypotheses_ex06.py (73%) rename doc/{salome => }/examples/defining_hypotheses_ex07.py (59%) rename doc/{salome => }/examples/defining_hypotheses_ex08.py (72%) rename doc/{salome => }/examples/defining_hypotheses_ex09.py (76%) rename doc/{salome => }/examples/defining_hypotheses_ex10.py (59%) rename doc/{salome => }/examples/defining_hypotheses_ex11.py (59%) rename doc/{salome => }/examples/defining_hypotheses_ex12.py (73%) rename doc/{salome => }/examples/defining_hypotheses_ex13.py (68%) rename doc/{salome => }/examples/defining_hypotheses_ex14.py (53%) rename doc/{salome => }/examples/defining_hypotheses_ex15.py (60%) create mode 100644 doc/examples/defining_hypotheses_ex16.py rename doc/{salome => }/examples/defining_hypotheses_ex17.py (72%) rename doc/{salome => }/examples/defining_hypotheses_len_near_vertex.py (77%) rename doc/{salome => }/examples/filters_belong2group.py (75%) rename doc/{salome => }/examples/filters_ex01.py (78%) rename doc/{salome => }/examples/filters_ex02.py (54%) rename doc/{salome => }/examples/filters_ex03.py (64%) rename doc/{salome => }/examples/filters_ex04.py (61%) rename doc/{salome => }/examples/filters_ex05.py (56%) rename doc/{salome => }/examples/filters_ex06.py (55%) create mode 100644 doc/examples/filters_ex07.py rename doc/{salome => }/examples/filters_ex08.py (53%) rename doc/{salome => }/examples/filters_ex09.py (56%) rename doc/{salome => }/examples/filters_ex10.py (54%) rename doc/{salome => }/examples/filters_ex11.py (63%) rename doc/{salome => }/examples/filters_ex12.py (58%) rename doc/{salome => }/examples/filters_ex13.py (73%) rename doc/{salome => }/examples/filters_ex14.py (68%) rename doc/{salome => }/examples/filters_ex15.py (59%) rename doc/{salome => }/examples/filters_ex16.py (59%) rename doc/{salome => }/examples/filters_ex17.py (67%) rename doc/{salome => }/examples/filters_ex18.py (72%) rename doc/{salome => }/examples/filters_ex19.py (69%) rename doc/{salome => }/examples/filters_ex20.py (56%) rename doc/{salome => }/examples/filters_ex21.py (59%) rename doc/{salome => }/examples/filters_ex22.py (61%) rename doc/{salome => }/examples/filters_ex23.py (57%) rename doc/{salome => }/examples/filters_ex24.py (67%) rename doc/{salome => }/examples/filters_ex25.py (53%) rename doc/{salome => }/examples/filters_ex26.py (64%) rename doc/{salome => }/examples/filters_ex27.py (67%) rename doc/{salome => }/examples/filters_ex28.py (50%) rename doc/{salome => }/examples/filters_ex29.py (67%) create mode 100644 doc/examples/filters_ex30.py create mode 100644 doc/examples/filters_ex31.py rename doc/{salome => }/examples/filters_ex32.py (57%) rename doc/{salome => }/examples/filters_ex33.py (74%) rename doc/{salome => }/examples/filters_ex34.py (79%) rename doc/{salome => }/examples/filters_ex35.py (53%) rename doc/{salome => }/examples/filters_ex36.py (50%) rename doc/{salome => }/examples/filters_ex37.py (64%) rename doc/{salome => }/examples/filters_ex38.py (74%) rename doc/{salome => }/examples/filters_ex39.py (52%) rename doc/{salome => }/examples/filters_node_nb_conn.py (65%) create mode 100644 doc/examples/generate_flat_elements.py rename doc/{salome => }/examples/grouping_elements_ex01.py (88%) create mode 100644 doc/examples/grouping_elements_ex02.py rename doc/{salome => }/examples/grouping_elements_ex03.py (64%) rename doc/{salome => }/examples/grouping_elements_ex04.py (72%) rename doc/{salome => }/examples/grouping_elements_ex05.py (76%) rename doc/{salome => }/examples/grouping_elements_ex06.py (72%) rename doc/{salome => }/examples/grouping_elements_ex07.py (71%) rename doc/{salome => }/examples/grouping_elements_ex08.py (71%) rename doc/{salome => }/examples/grouping_elements_ex09.py (66%) create mode 100644 doc/examples/measurements_ex01.py create mode 100644 doc/examples/measurements_ex02.py rename doc/{salome => }/examples/measurements_ex03.py (66%) rename doc/{salome => }/examples/measurements_ex04.py (80%) create mode 100644 doc/examples/mechanic.py rename doc/{salome/examples/3dmesh.py => examples/mesh_3d.py} (68%) rename doc/{salome => }/examples/modifying_meshes_cut_triangles.py (95%) rename doc/{salome => }/examples/modifying_meshes_ex01.py (80%) rename doc/{salome => }/examples/modifying_meshes_ex02.py (84%) rename doc/{salome => }/examples/modifying_meshes_ex03.py (70%) rename doc/{salome => }/examples/modifying_meshes_ex04.py (79%) rename doc/{salome => }/examples/modifying_meshes_ex05.py (80%) rename doc/{salome => }/examples/modifying_meshes_ex06.py (84%) rename doc/{salome => }/examples/modifying_meshes_ex07.py (81%) rename doc/{salome => }/examples/modifying_meshes_ex08.py (87%) rename doc/{salome => }/examples/modifying_meshes_ex09.py (90%) rename doc/{salome => }/examples/modifying_meshes_ex10.py (94%) create mode 100644 doc/examples/modifying_meshes_ex11.py rename doc/{salome => }/examples/modifying_meshes_ex12.py (80%) rename doc/{salome => }/examples/modifying_meshes_ex13.py (82%) rename doc/{salome => }/examples/modifying_meshes_ex15.py (83%) rename doc/{salome => }/examples/modifying_meshes_ex16.py (87%) rename doc/{salome => }/examples/modifying_meshes_ex17.py (84%) rename doc/{salome => }/examples/modifying_meshes_ex18.py (84%) rename doc/{salome => }/examples/modifying_meshes_ex19.py (81%) rename doc/{salome => }/examples/modifying_meshes_ex20.py (53%) create mode 100644 doc/examples/modifying_meshes_ex21.py rename doc/{salome => }/examples/modifying_meshes_ex22.py (84%) rename doc/{salome => }/examples/modifying_meshes_ex23.py (70%) rename doc/{salome => }/examples/modifying_meshes_ex24.py (83%) rename doc/{salome => }/examples/modifying_meshes_ex25.py (85%) rename doc/{salome => }/examples/modifying_meshes_ex26.py (85%) rename doc/{salome => }/examples/modifying_meshes_split_vol.py (64%) rename doc/{salome => }/examples/notebook_smesh.py (73%) rename doc/{salome => }/examples/prism_3d_algo.py (50%) rename doc/{salome => }/examples/quad_medial_axis_algo.py (56%) rename doc/{salome => }/examples/quality_controls_defl.py (73%) rename doc/{salome => }/examples/quality_controls_ex01.py (63%) rename doc/{salome => }/examples/quality_controls_ex02.py (62%) rename doc/{salome => }/examples/quality_controls_ex03.py (63%) rename doc/{salome => }/examples/quality_controls_ex04.py (73%) rename doc/{salome => }/examples/quality_controls_ex05.py (67%) create mode 100644 doc/examples/quality_controls_ex06.py rename doc/{salome => }/examples/quality_controls_ex07.py (66%) rename doc/{salome => }/examples/quality_controls_ex08.py (63%) rename doc/{salome => }/examples/quality_controls_ex09.py (52%) create mode 100644 doc/examples/quality_controls_ex10.py rename doc/{salome => }/examples/quality_controls_ex11.py (63%) rename doc/{salome => }/examples/quality_controls_ex12.py (61%) rename doc/{salome => }/examples/quality_controls_ex13.py (62%) rename doc/{salome => }/examples/quality_controls_ex14.py (63%) rename doc/{salome => }/examples/quality_controls_ex15.py (63%) rename doc/{salome => }/examples/quality_controls_ex16.py (63%) rename doc/{salome => }/examples/quality_controls_ex17.py (63%) rename doc/{salome => }/examples/quality_controls_ex18.py (62%) rename doc/{salome => }/examples/quality_controls_ex19.py (64%) rename doc/{salome => }/examples/quality_controls_ex20.py (61%) rename doc/{salome => }/examples/quality_controls_ex21.py (61%) rename doc/{salome => }/examples/quality_controls_ex22.py (62%) rename doc/{salome => }/examples/radial_prism_3d_algo.py (63%) rename doc/{salome => }/examples/split_biquad.py (57%) rename doc/{salome => }/examples/test_homard_adapt.py (73%) rename doc/{salome => }/examples/test_uniform_refinement.py (70%) rename doc/{salome => }/examples/tests.set (85%) rename doc/{salome => }/examples/transforming_meshes_ex01.py (77%) rename doc/{salome => }/examples/transforming_meshes_ex02.py (67%) rename doc/{salome => }/examples/transforming_meshes_ex03.py (78%) create mode 100644 doc/examples/transforming_meshes_ex04.py rename doc/{salome => }/examples/transforming_meshes_ex05.py (77%) rename doc/{salome => }/examples/transforming_meshes_ex06.py (69%) rename doc/{salome => }/examples/transforming_meshes_ex07.py (54%) rename doc/{salome => }/examples/transforming_meshes_ex08.py (51%) rename doc/{salome => }/examples/transforming_meshes_ex09.py (67%) rename doc/{salome => }/examples/transforming_meshes_ex10.py (63%) rename doc/{salome => }/examples/transforming_meshes_ex11.py (91%) rename doc/{salome => }/examples/transforming_meshes_ex12.py (79%) rename doc/{salome => }/examples/transforming_meshes_ex13.py (70%) rename doc/{salome => }/examples/use_existing_faces.py (67%) rename doc/{salome => }/examples/viewing_meshes_ex01.py (82%) rename doc/{salome => }/examples/viewing_meshes_ex02.py (87%) rename doc/{salome/gui/SMESH => gui}/CMakeLists.txt (100%) rename doc/{salome/gui/SMESH => gui}/collect_mesh_methods.py (100%) rename doc/{salome/gui/SMESH => gui}/conf.py.in (100%) rename doc/{salome/gui/SMESH => gui}/images/2d_from_3d_dlg.png (100%) rename doc/{salome/gui/SMESH => gui}/images/2d_from_3d_example.png (100%) rename doc/{salome/gui/SMESH => gui}/images/2d_from_3d_ico.png (100%) rename doc/{salome/gui/SMESH => gui}/images/2d_from_3d_menu.png (100%) rename doc/{salome/gui/SMESH => gui}/images/Clipping_Absolute.png (100%) rename doc/{salome/gui/SMESH => gui}/images/Clipping_Relative.png (100%) rename doc/{salome/gui/SMESH => gui}/images/Nut_sharp_edges.png (100%) rename doc/{salome/gui/SMESH => gui}/images/a-arithmetic1d.png (100%) rename doc/{salome/gui/SMESH => gui}/images/a-averagelength.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/a-clipping2.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/a-creategroup.png (100%) rename doc/{salome/gui/SMESH => gui}/images/a-createpolyhedralvolume.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/a-cuttingofquadrangles.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/a-deflection1d.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/a-filteronfaces.png (100%) rename doc/{salome/gui/SMESH => gui}/images/a-geometric1d.png (100%) rename doc/{salome/gui/SMESH => gui}/images/a-maxelarea.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/a-maxelvolume.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/a-maxsize1d.png (100%) rename doc/{salome/gui/SMESH => gui}/images/a-nbsegments1.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/a-nbsegments2.png (100%) rename doc/{salome/gui/SMESH => gui}/images/a-patterntype.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/a-patterntype1.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/a-standmeshinfo.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/a-startendlength.png (100%) rename doc/{salome/gui/SMESH => gui}/images/a-transparency.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/a-unionoftriangles.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/a-viewgeneral.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/adaptation_01.png (100%) rename doc/{salome/gui/SMESH => gui}/images/adaptation_02.png (100%) rename doc/{salome/gui/SMESH => gui}/images/adaptation_with_homard_advanced.png (100%) rename doc/{salome/gui/SMESH => gui}/images/adaptation_with_homard_arguments.png (100%) rename doc/{salome/gui/SMESH => gui}/images/adaptation_with_homard_boundary_analytical.png (100%) rename doc/{salome/gui/SMESH => gui}/images/adaptation_with_homard_boundary_cao.png (100%) rename doc/{salome/gui/SMESH => gui}/images/adaptation_with_homard_boundary_discrete.png (100%) rename doc/{salome/gui/SMESH => gui}/images/adaptation_with_homard_boundary_groups.png (100%) rename doc/{salome/gui/SMESH => gui}/images/adaptive1d.png (100%) rename doc/{salome/gui/SMESH => gui}/images/adaptive1d_sample_mesh.png (100%) rename doc/{salome/gui/SMESH => gui}/images/add.gif (100%) rename doc/{salome/gui/SMESH => gui}/images/add.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/add0delement.png (100%) rename doc/{salome/gui/SMESH => gui}/images/add_0delement.png (100%) rename doc/{salome/gui/SMESH => gui}/images/add_ball.png (100%) rename doc/{salome/gui/SMESH => gui}/images/add_edge.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/add_node.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/add_node_on_face-dlg.png (100%) rename doc/{salome/gui/SMESH => gui}/images/add_node_on_face.png (100%) rename doc/{salome/gui/SMESH => gui}/images/add_node_on_segment-dlg.png (100%) rename doc/{salome/gui/SMESH => gui}/images/add_node_on_segment.png (100%) rename doc/{salome/gui/SMESH => gui}/images/add_polygone.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/add_polyhedron.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/add_quadrangle.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/add_triangle.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/addball.png (100%) rename doc/{salome/gui/SMESH => gui}/images/addedge.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/addhexahedron.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/addinfo_group.png (100%) rename doc/{salome/gui/SMESH => gui}/images/addinfo_mesh.png (100%) rename doc/{salome/gui/SMESH => gui}/images/addinfo_submesh.png (100%) rename doc/{salome/gui/SMESH => gui}/images/addnode.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/addnode_notebook.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/addpolygon.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/addquadrangle.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/addtetrahedron.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/addtriangle.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/advanced_mesh_infos.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/analyticdensity.png (100%) rename doc/{salome/gui/SMESH => gui}/images/angle_measure.png (100%) rename doc/{salome/gui/SMESH => gui}/images/aqt.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/automaticlength.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/b-art_end_length.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/b-erage_length.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/b-flection1d.png (100%) rename doc/{salome/gui/SMESH => gui}/images/b-ithmetic1d.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/b-mberofsegments.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/b-mesh_infos.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/bare_border_faces_smpl.png (100%) rename doc/{salome/gui/SMESH => gui}/images/bare_border_volumes_smpl.png (100%) rename doc/{salome/gui/SMESH => gui}/images/basic_props.png (100%) rename doc/{salome/gui/SMESH => gui}/images/before_clipping.png (100%) rename doc/{salome/gui/SMESH => gui}/images/before_clipping_preview.png (100%) rename doc/{salome/gui/SMESH => gui}/images/block_renumber_hyp.png (100%) rename doc/{salome/gui/SMESH => gui}/images/bnd_box.png (100%) rename doc/{salome/gui/SMESH => gui}/images/bnd_box_preview.png (100%) rename doc/{salome/gui/SMESH => gui}/images/buildcompound.png (100%) rename doc/{salome/gui/SMESH => gui}/images/buildcompound_groups.png (100%) rename doc/{salome/gui/SMESH => gui}/images/cartesian3D_hyp.png (100%) rename doc/{salome/gui/SMESH => gui}/images/cartesian3D_sphere.png (100%) rename doc/{salome/gui/SMESH => gui}/images/cartesian_implement_edge.png (100%) rename doc/{salome/gui/SMESH => gui}/images/choose_geom_selection_way.png (100%) rename doc/{salome/gui/SMESH => gui}/images/circle_angles_after.png (100%) rename doc/{salome/gui/SMESH => gui}/images/circle_simple_after.png (100%) rename doc/{salome/gui/SMESH => gui}/images/circle_simple_before.png (100%) rename doc/{salome/gui/SMESH => gui}/images/colors_size.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/connectivity_edge.png (100%) rename doc/{salome/gui/SMESH => gui}/images/connectivity_hex_prism.png (100%) rename doc/{salome/gui/SMESH => gui}/images/connectivity_hexa.png (100%) rename doc/{salome/gui/SMESH => gui}/images/connectivity_penta.png (100%) rename doc/{salome/gui/SMESH => gui}/images/connectivity_polygon.png (100%) rename doc/{salome/gui/SMESH => gui}/images/connectivity_polyhedron.png (100%) rename doc/{salome/gui/SMESH => gui}/images/connectivity_pyramid.png (100%) rename doc/{salome/gui/SMESH => gui}/images/connectivity_quad.png (100%) rename doc/{salome/gui/SMESH => gui}/images/connectivity_tetra.png (100%) rename doc/{salome/gui/SMESH => gui}/images/connectivity_tria.png (100%) rename doc/{salome/gui/SMESH => gui}/images/controls_popup.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/convert.png (100%) rename doc/{salome/gui/SMESH => gui}/images/copy_mesh_dlg.png (100%) rename doc/{salome/gui/SMESH => gui}/images/copy_mesh_icon.png (100%) rename doc/{salome/gui/SMESH => gui}/images/crack_emulation_double_nodes.png (100%) rename doc/{salome/gui/SMESH => gui}/images/crack_emulation_double_nodes_with_elems.png (100%) rename doc/{salome/gui/SMESH => gui}/images/create_boundary_1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/create_boundary_an_1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/create_boundary_an_2.png (100%) rename doc/{salome/gui/SMESH => gui}/images/create_boundary_an_3.png (100%) rename doc/{salome/gui/SMESH => gui}/images/create_boundary_an_4.png (100%) rename doc/{salome/gui/SMESH => gui}/images/create_boundary_an_co_1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/create_boundary_an_co_2.png (100%) rename doc/{salome/gui/SMESH => gui}/images/create_boundary_an_cy.png (100%) rename doc/{salome/gui/SMESH => gui}/images/create_boundary_an_sp.png (100%) rename doc/{salome/gui/SMESH => gui}/images/create_boundary_an_to.png (100%) rename doc/{salome/gui/SMESH => gui}/images/create_boundary_cao_1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/create_boundary_cao_2.png (100%) rename doc/{salome/gui/SMESH => gui}/images/create_boundary_di_1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/create_boundary_di_2.png (100%) rename doc/{salome/gui/SMESH => gui}/images/create_boundary_di_3.png (100%) rename doc/{salome/gui/SMESH => gui}/images/create_group.png (100%) rename doc/{salome/gui/SMESH => gui}/images/create_groups_from_geometry.png (100%) rename doc/{salome/gui/SMESH => gui}/images/creategroup.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/creategroup_on_filter.png (100%) rename doc/{salome/gui/SMESH => gui}/images/createmesh-inv.png (100%) rename doc/{salome/gui/SMESH => gui}/images/createmesh-inv2.png (100%) rename doc/{salome/gui/SMESH => gui}/images/createmesh-inv3.png (100%) rename doc/{salome/gui/SMESH => gui}/images/ctrlinfo.png (100%) rename doc/{salome/gui/SMESH => gui}/images/curvi_angles_after.png (100%) rename doc/{salome/gui/SMESH => gui}/images/curvi_simple_after.png (100%) rename doc/{salome/gui/SMESH => gui}/images/curvi_simple_before.png (100%) rename doc/{salome/gui/SMESH => gui}/images/custom_point_marker.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/cut_groups1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/cutgroups.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/dataset_clipping.png (100%) rename doc/{salome/gui/SMESH => gui}/images/deflection_2d.png (100%) rename doc/{salome/gui/SMESH => gui}/images/deletegroups.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/diagonalinversion.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/dialog.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/dimgroup_0d.png (100%) rename doc/{salome/gui/SMESH => gui}/images/dimgroup_1d.png (100%) rename doc/{salome/gui/SMESH => gui}/images/dimgroup_2d.png (100%) rename doc/{salome/gui/SMESH => gui}/images/dimgroup_dlg.png (100%) rename doc/{salome/gui/SMESH => gui}/images/dimgroup_src.png (100%) rename doc/{salome/gui/SMESH => gui}/images/dimgroup_tui1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/display_entity_choose_item.png (100%) rename doc/{salome/gui/SMESH => gui}/images/display_entity_dlg.png (100%) rename doc/{salome/gui/SMESH => gui}/images/distribution_of_layers.png (100%) rename doc/{salome/gui/SMESH => gui}/images/distributionwithanalyticdensity.png (100%) rename doc/{salome/gui/SMESH => gui}/images/distributionwithtabledensity.png (100%) rename doc/{salome/gui/SMESH => gui}/images/dlg_0D_on_all_nodes.png (100%) rename doc/{salome/gui/SMESH => gui}/images/double_faces.png (100%) rename doc/{salome/gui/SMESH => gui}/images/double_nodes.png (100%) rename doc/{salome/gui/SMESH => gui}/images/duplicate01.png (100%) rename doc/{salome/gui/SMESH => gui}/images/duplicate02.png (100%) rename doc/{salome/gui/SMESH => gui}/images/duplicate03.png (100%) rename doc/{salome/gui/SMESH => gui}/images/duplicate04.png (100%) rename doc/{salome/gui/SMESH => gui}/images/duplicate_nodes.png (100%) rename doc/{salome/gui/SMESH => gui}/images/edge_wire_3d_after.png (100%) rename doc/{salome/gui/SMESH => gui}/images/edge_wire_3d_before.png (100%) rename doc/{salome/gui/SMESH => gui}/images/edge_wire_after.png (100%) rename doc/{salome/gui/SMESH => gui}/images/edge_wire_before.png (100%) rename doc/{salome/gui/SMESH => gui}/images/edit_mesh1.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/edit_mesh_change_value_hyp.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/edit_mesh_remove_hyp.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/editgroup.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/editing_groups1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/elem_info.png (100%) rename doc/{salome/gui/SMESH => gui}/images/eleminfo1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/eleminfo2.png (100%) rename doc/{salome/gui/SMESH => gui}/images/extr_along_wire_after.png (100%) rename doc/{salome/gui/SMESH => gui}/images/extr_along_wire_before.png (100%) rename doc/{salome/gui/SMESH => gui}/images/extru_rib_segs.png (100%) rename doc/{salome/gui/SMESH => gui}/images/extrusion_along_path_dlg.png (100%) rename doc/{salome/gui/SMESH => gui}/images/extrusion_box.png (100%) rename doc/{salome/gui/SMESH => gui}/images/extrusion_groups.png (100%) rename doc/{salome/gui/SMESH => gui}/images/extrusion_groups_res.png (100%) rename doc/{salome/gui/SMESH => gui}/images/extrusionalongaline1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/extrusionalongaline2.png (100%) rename doc/{salome/gui/SMESH => gui}/images/extrusionalongaline3.png (100%) rename doc/{salome/gui/SMESH => gui}/images/extrusionbynormal_alongavgnorm.png (100%) rename doc/{salome/gui/SMESH => gui}/images/extrusionbynormal_useonly.png (100%) rename doc/{salome/gui/SMESH => gui}/images/failed_computation.png (100%) rename doc/{salome/gui/SMESH => gui}/images/find_geom_by_mesh_elem.png (100%) rename doc/{salome/gui/SMESH => gui}/images/findelement1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/findelement2.png (100%) rename doc/{salome/gui/SMESH => gui}/images/findelement3.png (100%) rename doc/{salome/gui/SMESH => gui}/images/formula1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/formula2.png (100%) rename doc/{salome/gui/SMESH => gui}/images/formula4.png (100%) rename doc/{salome/gui/SMESH => gui}/images/formula5.png (100%) rename doc/{salome/gui/SMESH => gui}/images/free_borders1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/free_edges.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/free_faces.png (100%) rename doc/{salome/gui/SMESH => gui}/images/free_nodes.png (100%) rename doc/{salome/gui/SMESH => gui}/images/ghs3dprl_parameters_basic.png (100%) rename doc/{salome/gui/SMESH => gui}/images/groups_by_sharp_edges_dlg.png (100%) rename doc/{salome/gui/SMESH => gui}/images/groups_in_OB.png (100%) rename doc/{salome/gui/SMESH => gui}/images/hexa_ijk_mesh.png (100%) rename doc/{salome/gui/SMESH => gui}/images/hyp_source_edges.png (100%) rename doc/{salome/gui/SMESH => gui}/images/hyp_source_faces.png (100%) rename doc/{salome/gui/SMESH => gui}/images/hypo_fixedpnt_dlg.png (100%) rename doc/{salome/gui/SMESH => gui}/images/hypo_quad_params_1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/hypo_quad_params_2.png (100%) rename doc/{salome/gui/SMESH => gui}/images/hypo_quad_params_dialog.png (100%) rename doc/{salome/gui/SMESH => gui}/images/hypo_quad_params_dialog_corners.png (100%) rename doc/{salome/gui/SMESH => gui}/images/hypo_quad_params_dialog_enf.png (100%) rename doc/{salome/gui/SMESH => gui}/images/hypo_quad_params_dialog_vert.png (100%) rename doc/{salome/gui/SMESH => gui}/images/hypo_quad_params_enfnodes_algo1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/hypo_quad_params_enfnodes_algo2.png (100%) rename doc/{salome/gui/SMESH => gui}/images/hypo_quad_params_enfnodes_algo3.png (100%) rename doc/{salome/gui/SMESH => gui}/images/hypo_quad_params_res.png (100%) rename doc/{salome/gui/SMESH => gui}/images/hypo_quad_params_res_2.png (100%) rename doc/{salome/gui/SMESH => gui}/images/hypo_radquad_dlg.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/hypo_sets.png (100%) rename doc/{salome/gui/SMESH => gui}/images/image10.jpg (100%) rename doc/{salome/gui/SMESH => gui}/images/image101.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image105.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image106.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image120.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image121.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image122.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image123.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image124.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image125.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image126.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image127.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image130.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image131.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image132.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image133.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image134.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image135.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image136.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image137.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image138.gif (100%) rename doc/{salome/gui/SMESH => gui}/images/image143.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image144.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image145.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image146.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image147.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image148.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image15.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image151.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image152.png (100%) rename doc/{salome/gui/SMESH => gui}/images/image154.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image155.gif (100%) rename doc/{salome/gui/SMESH => gui}/images/image156.gif (100%) rename doc/{salome/gui/SMESH => gui}/images/image157.gif (100%) rename doc/{salome/gui/SMESH => gui}/images/image160.gif (100%) rename doc/{salome/gui/SMESH => gui}/images/image161.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image22.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image23.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image24.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image25.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image25.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image27.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image28.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image30.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image31.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image32.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image32.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image33.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image34.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image35.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image36.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image36.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image37.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image37.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image38.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image38.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image39.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image40.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image41.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image42.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image43.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image46.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image49.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image5.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image50.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image51.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image52.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image53.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image55.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image56.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image56.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image58.png (100%) rename doc/{salome/gui/SMESH => gui}/images/image59.png (100%) rename doc/{salome/gui/SMESH => gui}/images/image63.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image64.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image67.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image7.jpg (100%) rename doc/{salome/gui/SMESH => gui}/images/image70.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image70.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image71.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image71.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image74.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image75.jpg (100%) rename doc/{salome/gui/SMESH => gui}/images/image76.jpg (100%) rename doc/{salome/gui/SMESH => gui}/images/image77.jpg (100%) rename doc/{salome/gui/SMESH => gui}/images/image78.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image79.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image79.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image80.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image82.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image83.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image84.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image86.jpg (100%) rename doc/{salome/gui/SMESH => gui}/images/image88.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image88.jpg (100%) rename doc/{salome/gui/SMESH => gui}/images/image90.jpg (100%) rename doc/{salome/gui/SMESH => gui}/images/image91.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image92.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image92.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image93.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image94.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image94.jpg (100%) rename doc/{salome/gui/SMESH => gui}/images/image95.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image95.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image96.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image96.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image97.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image97.jpg (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image98.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image99.gif (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/image_octa12.png (100%) rename doc/{salome/gui/SMESH => gui}/images/intersect_groups1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/intersectgroups.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/length-crit.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/length2d.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/lengthnearvertex.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/max_el_area.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/max_element_length_2d.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/max_element_length_3d.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/mergeelems.png (100%) rename doc/{salome/gui/SMESH => gui}/images/mergeelems_auto.png (100%) rename doc/{salome/gui/SMESH => gui}/images/mergeelems_ico.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/mergenodes.png (100%) rename doc/{salome/gui/SMESH => gui}/images/mergenodes_auto.png (100%) rename doc/{salome/gui/SMESH => gui}/images/mergenodes_ico.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/merging_nodes1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/merging_nodes2.png (100%) rename doc/{salome/gui/SMESH => gui}/images/mesh_clear.png (100%) rename doc/{salome/gui/SMESH => gui}/images/mesh_cylinder_hexa.png (100%) create mode 100644 doc/gui/images/mesh_deflection.png rename doc/{salome/gui/SMESH => gui}/images/mesh_evaluation_succeed.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/mesh_fixedpnt.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/mesh_for_extr_along_path.png (100%) rename doc/{salome/gui/SMESH => gui}/images/mesh_node_to_point.png (100%) rename doc/{salome/gui/SMESH => gui}/images/mesh_order_123.png (100%) rename doc/{salome/gui/SMESH => gui}/images/mesh_order_123_res.png (100%) rename doc/{salome/gui/SMESH => gui}/images/mesh_order_213.png (100%) rename doc/{salome/gui/SMESH => gui}/images/mesh_order_213_res.png (100%) rename doc/{salome/gui/SMESH => gui}/images/mesh_order_321.png (100%) rename doc/{salome/gui/SMESH => gui}/images/mesh_order_321_res.png (100%) rename doc/{salome/gui/SMESH => gui}/images/mesh_order_no_concurrent.png (100%) rename doc/{salome/gui/SMESH => gui}/images/mesh_order_preview.png (100%) rename doc/{salome/gui/SMESH => gui}/images/mesh_precompute.png (100%) rename doc/{salome/gui/SMESH => gui}/images/mesh_radquad_01.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/mesh_radquad_02.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/mesh_split_diag_interactive.png (100%) rename doc/{salome/gui/SMESH => gui}/images/mesh_split_face_interactive.png (100%) rename doc/{salome/gui/SMESH => gui}/images/meshcomputationfail.png (100%) rename doc/{salome/gui/SMESH => gui}/images/meshcomputationsucceed.png (100%) rename doc/{salome/gui/SMESH => gui}/images/meshcut_plugin.png (100%) rename doc/{salome/gui/SMESH => gui}/images/meshexportgroupwarning.png (100%) rename doc/{salome/gui/SMESH => gui}/images/meshexportmesh.png (100%) rename doc/{salome/gui/SMESH => gui}/images/meshimportmesh.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/meshtopass1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/meshtopass2.png (100%) rename doc/{salome/gui/SMESH => gui}/images/meshtopass3.png (100%) rename doc/{salome/gui/SMESH => gui}/images/meshtrianglemergeelem1.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/min_distance.png (100%) rename doc/{salome/gui/SMESH => gui}/images/min_distance_preview.png (100%) rename doc/{salome/gui/SMESH => gui}/images/movenodes.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/moving_nodes1.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/moving_nodes2.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/number_of_layers.png (100%) rename doc/{salome/gui/SMESH => gui}/images/opengl_clipping.png (100%) rename doc/{salome/gui/SMESH => gui}/images/orientaation1.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/over_constrained_faces.png (100%) rename doc/{salome/gui/SMESH => gui}/images/over_constrained_volumes.png (100%) rename doc/{salome/gui/SMESH => gui}/images/pattern2d.png (100%) rename doc/{salome/gui/SMESH => gui}/images/patternmapping1.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/patternmapping2.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/point_marker_widget1.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/point_marker_widget2.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/pref21.png (100%) rename doc/{salome/gui/SMESH => gui}/images/pref22.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/pref23.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/pref24.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/preview_mesh_1D.png (100%) rename doc/{salome/gui/SMESH => gui}/images/preview_mesh_2D.png (100%) rename doc/{salome/gui/SMESH => gui}/images/preview_tmp_data.png (100%) rename doc/{salome/gui/SMESH => gui}/images/prism_mesh.png (100%) rename doc/{salome/gui/SMESH => gui}/images/prism_needs_hyps.png (100%) rename doc/{salome/gui/SMESH => gui}/images/prism_ok_ko.png (100%) rename doc/{salome/gui/SMESH => gui}/images/prism_stack.png (100%) rename doc/{salome/gui/SMESH => gui}/images/prism_tui_sample.png (100%) rename doc/{salome/gui/SMESH => gui}/images/projection_1d.png (100%) rename doc/{salome/gui/SMESH => gui}/images/projection_2d.png (100%) rename doc/{salome/gui/SMESH => gui}/images/projection_3d.png (100%) rename doc/{salome/gui/SMESH => gui}/images/propagation_chain.png (100%) rename doc/{salome/gui/SMESH => gui}/images/quad_from_ma_medial_axis.png (100%) rename doc/{salome/gui/SMESH => gui}/images/quad_from_ma_mesh.png (100%) rename doc/{salome/gui/SMESH => gui}/images/quad_from_ma_ring_mesh.png (100%) rename doc/{salome/gui/SMESH => gui}/images/quad_mesh_invalid.png (100%) rename doc/{salome/gui/SMESH => gui}/images/quad_meshes.png (100%) rename doc/{salome/gui/SMESH => gui}/images/radial_prism_mesh.png (100%) rename doc/{salome/gui/SMESH => gui}/images/reduce_three_to_one.png (100%) rename doc/{salome/gui/SMESH => gui}/images/remove.gif (100%) rename doc/{salome/gui/SMESH => gui}/images/remove.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/remove_elements1.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/remove_elements2.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/remove_elements_icon.png (100%) rename doc/{salome/gui/SMESH => gui}/images/remove_node_reconnection.png (100%) rename doc/{salome/gui/SMESH => gui}/images/remove_node_reconnection_dlg.png (100%) rename doc/{salome/gui/SMESH => gui}/images/remove_node_reconnection_icon.png (100%) rename doc/{salome/gui/SMESH => gui}/images/remove_nodes1.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/remove_nodes2.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/remove_nodes_icon.png (100%) rename doc/{salome/gui/SMESH => gui}/images/remove_orphan_nodes_icon.png (100%) rename doc/{salome/gui/SMESH => gui}/images/removeelements.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/removenodes.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/removeorphannodes.png (100%) rename doc/{salome/gui/SMESH => gui}/images/renumberelements.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/renumbernodes.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/reorient_2d_face.png (100%) rename doc/{salome/gui/SMESH => gui}/images/reorient_2d_point.png (100%) rename doc/{salome/gui/SMESH => gui}/images/reorient_2d_refgroup.png (100%) rename doc/{salome/gui/SMESH => gui}/images/reorient_2d_volume.png (100%) rename doc/{salome/gui/SMESH => gui}/images/reorient_faces_face.png (100%) rename doc/{salome/gui/SMESH => gui}/images/reorient_faces_point.png (100%) rename doc/{salome/gui/SMESH => gui}/images/reorient_faces_ref_groups.png (100%) rename doc/{salome/gui/SMESH => gui}/images/reorient_faces_volume.png (100%) rename doc/{salome/gui/SMESH => gui}/images/rev_edges_helper_dlg.png (100%) rename doc/{salome/gui/SMESH => gui}/images/revolution1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/revolutionsn1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/revolutionsn2.png (100%) rename doc/{salome/gui/SMESH => gui}/images/rotation.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/rotation1.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/rotation2.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/rotation_ico.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/scalar_bar_dlg.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/scale01.png (100%) rename doc/{salome/gui/SMESH => gui}/images/scale02.png (100%) rename doc/{salome/gui/SMESH => gui}/images/scale03.png (100%) rename doc/{salome/gui/SMESH => gui}/images/scale04.png (100%) rename doc/{salome/gui/SMESH => gui}/images/scale06.png (100%) rename doc/{salome/gui/SMESH => gui}/images/scale07.png (100%) rename doc/{salome/gui/SMESH => gui}/images/scale09.png (100%) rename doc/{salome/gui/SMESH => gui}/images/scaleinit01.png (100%) rename doc/{salome/gui/SMESH => gui}/images/scaleinit02.png (100%) rename doc/{salome/gui/SMESH => gui}/images/scaleres03.png (100%) rename doc/{salome/gui/SMESH => gui}/images/scaleres04.png (100%) rename doc/{salome/gui/SMESH => gui}/images/scaleres06.png (100%) rename doc/{salome/gui/SMESH => gui}/images/scaleres07.png (100%) rename doc/{salome/gui/SMESH => gui}/images/scaleres09.png (100%) rename doc/{salome/gui/SMESH => gui}/images/selectionfilterlibrary.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/sew_after_merge.png (100%) rename doc/{salome/gui/SMESH => gui}/images/sew_using_merge.png (100%) rename doc/{salome/gui/SMESH => gui}/images/sewing.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/sewing1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/sewing2.png (100%) rename doc/{salome/gui/SMESH => gui}/images/sewing3.png (100%) rename doc/{salome/gui/SMESH => gui}/images/sewing4.png (100%) rename doc/{salome/gui/SMESH => gui}/images/sewing_auto.png (100%) rename doc/{salome/gui/SMESH => gui}/images/sewing_manual.png (100%) rename doc/{salome/gui/SMESH => gui}/images/show_bad_mesh.png (100%) rename doc/{salome/gui/SMESH => gui}/images/smesh_sort.png (100%) rename doc/{salome/gui/SMESH => gui}/images/smesh_sort_groups.png (100%) rename doc/{salome/gui/SMESH => gui}/images/smoothing.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/smoothing1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/smoothing2.png (100%) rename doc/{salome/gui/SMESH => gui}/images/sort.gif (100%) rename doc/{salome/gui/SMESH => gui}/images/sort.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/split_biquad_to_linear_dlg.png (100%) rename doc/{salome/gui/SMESH => gui}/images/split_biquad_to_linear_icon.png (100%) rename doc/{salome/gui/SMESH => gui}/images/split_biquad_to_linear_mesh.png (100%) rename doc/{salome/gui/SMESH => gui}/images/split_into_prisms.png (100%) rename doc/{salome/gui/SMESH => gui}/images/split_into_tetra.png (100%) rename doc/{salome/gui/SMESH => gui}/images/split_into_tetra_icon.png (100%) rename doc/{salome/gui/SMESH => gui}/images/std_point_marker.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/straight_after.png (100%) rename doc/{salome/gui/SMESH => gui}/images/straight_before.png (100%) rename doc/{salome/gui/SMESH => gui}/images/swap.png (100%) rename doc/{salome/gui/SMESH => gui}/images/symmetry.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/symmetry1.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/symmetry2.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/symmetry3.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/topo_equality.png (100%) rename doc/{salome/gui/SMESH => gui}/images/translation.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/translation1.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/translation2.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/union_groups1.png (100%) rename doc/{salome/gui/SMESH => gui}/images/uniongroups.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/unionoftwotriangles.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/uniting_a_set_of_triangles1.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/uniting_a_set_of_triangles2.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/uniting_two_triangles1.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/uniting_two_triangles2.png (100%) mode change 100755 => 100644 rename doc/{salome/gui/SMESH => gui}/images/use_existing_face_sample_mesh.png (100%) rename doc/{salome/gui/SMESH => gui}/images/using_notebook_smesh.png (100%) rename doc/{salome/gui/SMESH => gui}/images/viscous_layers_2d_hyp.png (100%) rename doc/{salome/gui/SMESH => gui}/images/viscous_layers_extrusion_method.png (100%) rename doc/{salome/gui/SMESH => gui}/images/viscous_layers_hyp.png (100%) rename doc/{salome/gui/SMESH => gui}/images/viscous_layers_mesh.png (100%) rename doc/{salome/gui/SMESH => gui}/images/viscous_layers_on_submesh.png (100%) rename doc/{salome/gui/SMESH => gui}/input/1d_meshing_hypo.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/2d_meshing_hypo.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/3d_meshing_hypo.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/StdMeshersBuilder.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/about_filters.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/about_hypo.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/about_meshes.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/about_quality_controls.rst (98%) rename doc/{salome/gui/SMESH => gui}/input/adaptation.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/add_node_on_face.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/add_node_on_segment.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/adding_nodes_and_elements.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/adding_quadratic_elements.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/additional_hypo.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/area.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/aspect_ratio.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/aspect_ratio_3d.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/bare_border_face.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/bare_border_volumes.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/basic_meshing_algos.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/borders_at_multi_connection.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/borders_at_multi_connection_2d.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/building_compounds.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/cartesian_algo.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/changing_orientation_of_elements.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/clipping.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/colors_size.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/connectivity.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/constructing_meshes.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/constructing_submeshes.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/convert_to_from_quadratic_mesh.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/copy_mesh.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/create_groups_from_geometry.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/creating_groups.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/cut_mesh_by_plane.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/cutting_quadrangles.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/define_mesh_by_script.rst (100%) create mode 100644 doc/gui/input/deflection_2d.rst rename doc/{salome/gui/SMESH => gui}/input/deleting_groups.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/diagonal_inversion_of_elements.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/display_entity.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/display_mode.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/double_elements_control.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/double_nodes_control.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/double_nodes_page.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/editing_groups.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/editing_meshes.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/extrusion.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/extrusion_along_path.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/face_groups_by_sharp_edges.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/find_element_by_point.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/free_borders.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/free_edges.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/free_faces.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/free_nodes.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/generate_flat_elements.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/group_of_underlying_elements.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/grouping_elements.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/homard_create_boundary.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/importing_exporting_meshes.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/index.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/length.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/length_2d.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/make_2dmesh_from_3d.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/max_element_length_2d.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/max_element_length_3d.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/measurements.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/merging_elements.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/merging_nodes.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/mesh_infos.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/mesh_preferences.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/mesh_through_point.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/minimum_angle.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/modifying_meshes.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/modules.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/numbering.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/over_constrained_faces.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/over_constrained_volumes.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/pattern_mapping.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/point_marker.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/prism_3d_algo.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/projection_algos.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/quad_from_ma_algo.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/quad_ijk_algo.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/radial_prism_algo.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/radial_quadrangle_1D2D_algo.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/removing_nodes_and_elements.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/reorient_faces.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/revolution.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/rotation.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/scalar_bar.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/scale.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/segments_around_vertex_algo.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/selection_filter_library.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/sewing_meshes.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/skew.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/smeshBuilder.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/smesh_migration.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/smesh_module.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/smeshpy_interface.rst (97%) rename doc/{salome/gui/SMESH => gui}/input/smeshstudytools.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/smoothing.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/split_biquad_to_linear.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/split_to_tetra.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/symmetry.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/taper.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/tools.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/translation.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/transparency.rst (100%) create mode 100644 doc/gui/input/tui_adaptation.rst rename doc/{salome/gui/SMESH => gui}/input/tui_creating_meshes.rst (54%) rename doc/{salome/gui/SMESH => gui}/input/tui_defining_hypotheses.rst (58%) rename doc/{salome/gui/SMESH => gui}/input/tui_filters.rst (74%) rename doc/{salome/gui/SMESH => gui}/input/tui_grouping_elements.rst (52%) create mode 100644 doc/gui/input/tui_measurements.rst rename doc/{salome/gui/SMESH => gui}/input/tui_modifying_meshes.rst (52%) rename doc/{salome/gui/SMESH => gui}/input/tui_notebook_smesh.rst (58%) create mode 100644 doc/gui/input/tui_quality_controls.rst create mode 100644 doc/gui/input/tui_transforming_meshes.rst create mode 100644 doc/gui/input/tui_viewing_meshes.rst rename doc/{salome/gui/SMESH => gui}/input/tui_work_on_objects_from_gui.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/uniting_set_of_triangles.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/uniting_two_triangles.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/use_existing_algos.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/using_notebook_smesh_page.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/using_operations_on_groups.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/viewing_meshes_overview.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/volume.rst (100%) rename doc/{salome/gui/SMESH => gui}/input/warping.rst (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/1d_meshing_hypo.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/2d_meshing_hypo.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/about_filters.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/about_hypo.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/about_meshes.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/about_quality_controls.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/adding_nodes_and_elements.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/adding_quadratic_elements.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/additional_hypo.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/area.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/aspect_ratio.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/aspect_ratio_3d.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/bare_border_face.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/bare_border_volumes.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/basic_meshing_algos.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/borders_at_multi_connection.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/borders_at_multi_connection_2d.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/building_compounds.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/cartesian_algo.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/changing_orientation_of_elements.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/clipping.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/colors_size.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/connectivity.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/constructing_meshes.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/constructing_submeshes.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/convert_to_from_quadratic_mesh.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/copy_mesh.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/create_groups_from_geometry.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/creating_groups.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/cut_mesh_by_plane.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/cutting_quadrangles.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/define_mesh_by_script.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/deleting_groups.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/diagonal_inversion_of_elements.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/display_entity.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/display_mode.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/double_elements_control.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/double_nodes_control.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/double_nodes_page.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/editing_groups.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/editing_meshes.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/extrusion.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/extrusion_along_path.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/find_element_by_point.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/free_borders.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/free_edges.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/free_faces.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/free_nodes.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/generate_flat_elements.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/group_of_underlying_elements.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/grouping_elements.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/importing_exporting_meshes.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/index.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/introduction.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/length.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/length_2d.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/make_2dmesh_from_3d.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/max_element_length_2d.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/max_element_length_3d.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/max_element_volume_hypo.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/measurements.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/merging_elements.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/merging_nodes.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/mesh_infos.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/mesh_preferences.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/mesh_through_point.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/minimum_angle.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/modifying_meshes.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/modules.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/numbering.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/over_constrained_faces.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/over_constrained_volumes.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/pattern_mapping.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/point_marker.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/prism_3d_algo.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/projection_algos.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/python_api.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/quad_from_ma_algo.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/quad_ijk_algo.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/radial_prism_algo.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/radial_quadrangle_1D2D_algo.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/removing_nodes_and_elements.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/reorient_faces.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/revolution.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/rotation.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/scalar_bar.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/scale.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/segments_around_vertex_algo.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/selection_filter_library.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/sewing_meshes.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/skew.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/smesh_migration.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/smeshpy_interface.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/smoothing.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/split_biquad_to_linear.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/split_to_tetra.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/symmetry.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/taper.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/tools.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/translation.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/transparency.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/tui_cartesian_algo.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/tui_creating_meshes.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/tui_defining_hypotheses.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/tui_filters.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/tui_generate_flat_elements.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/tui_grouping_elements.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/tui_measurements.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/tui_modifying_meshes.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/tui_notebook_smesh.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/tui_prism_3d_algo.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/tui_quality_controls.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/tui_transforming_meshes.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/tui_use_existing_faces.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/tui_viewing_meshes.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/tui_work_on_objects_from_gui.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/uniting_set_of_triangles.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/uniting_two_triangles.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/use_existing_algos.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/using_notebook_smesh_page.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/using_operations_on_groups.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/viewing_meshes_overview.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/volume.po (100%) rename doc/{salome/gui/SMESH => gui}/locale/fr/LC_MESSAGES/warping.po (100%) rename doc/{salome/gui/SMESH => gui}/merge_mesh_class.py (100%) rename doc/{salome/gui/SMESH => gui}/static/switchers.js.in (100%) rename doc/{salome/gui/SMESH => gui}/templates/layout.html (100%) delete mode 100644 doc/salome/examples/creating_meshes_ex06.py delete mode 100644 doc/salome/examples/creating_meshes_ex07.py delete mode 100644 doc/salome/examples/creating_meshes_ex08.py delete mode 100644 doc/salome/examples/defining_hypotheses_adaptive1d.py delete mode 100644 doc/salome/examples/defining_hypotheses_ex05.py delete mode 100644 doc/salome/examples/defining_hypotheses_ex16.py delete mode 100644 doc/salome/examples/filters_ex07.py delete mode 100644 doc/salome/examples/filters_ex30.py delete mode 100644 doc/salome/examples/filters_ex31.py delete mode 100644 doc/salome/examples/generate_flat_elements.py delete mode 100644 doc/salome/examples/grouping_elements_ex02.py delete mode 100644 doc/salome/examples/measurements_ex01.py delete mode 100644 doc/salome/examples/measurements_ex02.py delete mode 100644 doc/salome/examples/modifying_meshes_ex11.py delete mode 100644 doc/salome/examples/modifying_meshes_ex14.py delete mode 100644 doc/salome/examples/modifying_meshes_ex21.py delete mode 100644 doc/salome/examples/quality_controls_ex06.py delete mode 100644 doc/salome/examples/quality_controls_ex10.py delete mode 100644 doc/salome/examples/tests.py.in delete mode 100644 doc/salome/examples/transforming_meshes_ex04.py delete mode 100644 doc/salome/gui/SMESH/input/tui_adaptation.rst delete mode 100644 doc/salome/gui/SMESH/input/tui_measurements.rst delete mode 100644 doc/salome/gui/SMESH/input/tui_quality_controls.rst delete mode 100644 doc/salome/gui/SMESH/input/tui_transforming_meshes.rst delete mode 100644 doc/salome/gui/SMESH/input/tui_viewing_meshes.rst rename doc/{salome => }/tui/CMakeLists.txt (100%) rename doc/{salome => }/tui/doxyfile.in (100%) rename doc/{salome => }/tui/images/application.gif (100%) rename doc/{salome => }/tui/images/head.png (100%) rename doc/{salome => }/tui/images/logocorp.gif (100%) rename doc/{salome => }/tui/images/smeshscreen.png (100%) rename doc/{salome => }/tui/input/index.doc (100%) rename doc/{salome => }/tui/static/footer.html (100%) rename doc/{salome => }/tui/static/header.html.in (100%) rename doc/{salome => }/tui/static/salome_extra.css (100%) delete mode 100644 src/SMESH_SWIG/SMESH_shared_modules.py delete mode 100644 src/SMESH_SWIG/YACS_geomesh0.py create mode 100644 test/0README rename {doc/salome/examples => test}/CTestTestfileInstall.cmake (73%) rename {src/SMESH_SWIG => test}/PAL_MESH_041_mesh.py (100%) rename {src/SMESH_SWIG => test}/PAL_MESH_043_2D.py (100%) rename {src/SMESH_SWIG => test}/PAL_MESH_043_3D.py (100%) rename {src/SMESH_SWIG => test}/SMESH_AdvancedEditor.py (100%) rename {src/SMESH_SWIG => test}/SMESH_BelongToGeom.py (100%) rename {src/SMESH_SWIG => test}/SMESH_BuildCompound.py (100%) rename {src/SMESH_SWIG => test}/SMESH_GroupFromGeom.py (100%) rename {src/SMESH_SWIG => test}/SMESH_GroupFromGeom2.py (100%) rename {src/SMESH_SWIG => test}/SMESH_GroupLyingOnGeom.py (100%) rename {src/SMESH_SWIG => test}/SMESH_Nut.py (100%) rename {src/SMESH_SWIG => test}/SMESH_Partition1_tetra.py (100%) rename {src/SMESH_SWIG => test}/SMESH_Sphere.py (100%) rename {src/SMESH_SWIG => test}/SMESH_blocks.py (100%) rename {src/SMESH_SWIG => test}/SMESH_box.py (100%) rename {src/SMESH_SWIG => test}/SMESH_box2_tetra.py (100%) rename {src/SMESH_SWIG => test}/SMESH_box3_tetra.py (100%) rename {src/SMESH_SWIG => test}/SMESH_box_tetra.py (100%) rename {src/SMESH_SWIG => test}/SMESH_controls.py (100%) rename {src/SMESH_SWIG => test}/SMESH_demo_hexa2_upd.py (100%) rename {src/SMESH_SWIG => test}/SMESH_fixation.py (100%) rename {src/SMESH_SWIG => test}/SMESH_fixation_hexa.py (100%) rename {src/SMESH_SWIG => test}/SMESH_fixation_netgen.py (100%) rename {src/SMESH_SWIG => test}/SMESH_fixation_tetra.py (100%) rename {src/SMESH_SWIG => test}/SMESH_flight_skin.py (98%) rename {src/SMESH_SWIG => test}/SMESH_freebord.py (100%) rename {src/SMESH_SWIG => test}/SMESH_hexaedre.py (100%) rename {src/SMESH_SWIG => test}/SMESH_mechanic.py (100%) rename {src/SMESH_SWIG => test}/SMESH_mechanic_editor.py (100%) rename {src/SMESH_SWIG => test}/SMESH_mechanic_netgen.py (100%) rename {src/SMESH_SWIG => test}/SMESH_mechanic_tetra.py (100%) rename {src/SMESH_SWIG => test}/SMESH_reg.py (100%) rename {src/SMESH_SWIG => test}/SMESH_test.py (100%) rename {src/SMESH_SWIG => test}/SMESH_test0.py (100%) rename {src/SMESH_SWIG => test}/SMESH_test1.py (100%) rename {src/SMESH_SWIG => test}/SMESH_test1_AndDisplay.py (100%) rename {src/SMESH_SWIG => test}/SMESH_test2.py (100%) rename {src/SMESH_SWIG => test}/SMESH_test3.py (100%) rename {src/SMESH_SWIG => test}/SMESH_test4.py (100%) rename {src/SMESH_SWIG => test}/SMESH_test5.py (65%) rename {doc/salome/examples => test}/basic_geom_smesh_without_session.py (100%) rename {doc/salome/examples => test}/basic_shaper_smesh_without_session.py (100%) rename {doc/salome/examples => test}/basic_smesh_output_with_mc_field.py (100%) rename {doc/salome/examples => test}/blocFissure_01_without_session.py (100%) rename {doc/salome/examples => test}/blocFissure_02_without_session.py (100%) rename {doc/salome/examples => test}/blocFissure_03_without_session.py (100%) rename {doc/salome/examples => test}/blocFissure_04_without_session.py (100%) rename {doc/salome/examples => test}/blocFissure_05_without_session.py (100%) rename {doc/salome/examples => test}/blocFissure_06_without_session.py (100%) rename {doc/salome/examples => test}/blocFissure_07_without_session.py (100%) rename {doc/salome/examples => test}/create_penta_biquad.py (100%) rename {doc/salome/examples => test/data}/Mesh_tri.med (100%) rename {doc/salome/examples => test}/doublenodes_polyhedra.py (100%) rename {src/SMESH_SWIG => test}/ex00_all.py (100%) rename {src/SMESH_SWIG => test}/ex01_cube2build.py (100%) rename {src/SMESH_SWIG => test}/ex02_cube2primitive.py (100%) rename {src/SMESH_SWIG => test}/ex03_cube2partition.py (100%) rename {src/SMESH_SWIG => test}/ex04_cube5tetraHexa.py (100%) rename {src/SMESH_SWIG => test}/ex05_hole1build.py (100%) rename {src/SMESH_SWIG => test}/ex06_hole1boolean.py (100%) rename {src/SMESH_SWIG => test}/ex07_hole1partition.py (100%) rename {src/SMESH_SWIG => test}/ex08_hole2build.py (100%) rename {src/SMESH_SWIG => test}/ex09_grid4build.py (100%) rename {src/SMESH_SWIG => test}/ex10_grid4geometry.py (100%) rename {src/SMESH_SWIG => test}/ex11_grid3partition.py (100%) rename {src/SMESH_SWIG => test}/ex12_grid17partition.py (100%) rename {src/SMESH_SWIG => test}/ex13_hole1partial.py (100%) rename {src/SMESH_SWIG => test}/ex14_cyl1holed.py (100%) rename {src/SMESH_SWIG => test}/ex15_cyl2geometry.py (100%) rename {src/SMESH_SWIG => test}/ex16_cyl2complementary.py (100%) rename {src/SMESH_SWIG => test}/ex17_dome1.py (100%) rename {src/SMESH_SWIG => test}/ex18_dome2.py (100%) rename {src/SMESH_SWIG => test}/ex19_sphereINcube.py (100%) rename {src/SMESH_SWIG => test}/ex21_lamp.py (100%) rename {src/SMESH_SWIG => test}/ex24_cylinder.py (100%) rename {src/SMESH_SWIG => test}/ex29_refine.py (96%) rename {src/SMESH_SWIG => test}/ex30_groupsOp.py (100%) rename {src/SMESH_SWIG => test}/ex30_tepal.py (100%) rename {src/SMESH_SWIG => test}/ex31_dimGroup.py (100%) rename {doc/salome/examples => test}/ex_MakePolyLine.py (62%) rename {doc/salome/examples => test}/extrusion_penta_biquad.py (100%) rename {doc/salome/examples => test}/shaper_smesh_groups_without_session.py (100%) rename {doc/salome/examples => test}/ssl_hdf5_symbols_conflicts.py (76%) rename doc/salome/examples/testme.py => test/test_helper.py (100%) rename {doc/salome/examples => test}/test_polyhedron_per_solid.py (100%) rename {doc/salome/examples => test}/test_smeshplugin_mg_tetra_parallele.py (100%) rename {doc/salome/examples => test}/test_smeshplugins.py (100%) create mode 100644 test/tests.set diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e72044a2..6e350981c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -316,6 +316,17 @@ SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOM ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON_SHARED}) SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) +# For salome test +# =============== + +SET(SMESH_TEST_DIR ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test) +IF(SALOME_BUILD_TESTS) + CONFIGURE_FILE(CTestTestfileInstall.cmake.in CTestTestfileInstall.cmake @ONLY) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfileInstall.cmake + DESTINATION ${SMESH_TEST_DIR} + RENAME CTestTestfile.cmake) +ENDIF() + # Sources # ======== @@ -324,9 +335,7 @@ ADD_SUBDIRECTORY(adm_local) ADD_SUBDIRECTORY(resources) ADD_SUBDIRECTORY(bin) ADD_SUBDIRECTORY(src) -IF(SALOME_BUILD_DOC) - ADD_SUBDIRECTORY(doc) -ENDIF() +ADD_SUBDIRECTORY(doc) IF(SALOME_BUILD_TESTS) ADD_SUBDIRECTORY(test) ENDIF() diff --git a/doc/salome/CMakeLists.txt b/CTestTestfileInstall.cmake.in similarity index 81% rename from doc/salome/CMakeLists.txt rename to CTestTestfileInstall.cmake.in index 9427e0dfe..124ebc0e8 100644 --- a/doc/salome/CMakeLists.txt +++ b/CTestTestfileInstall.cmake.in @@ -20,6 +20,10 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -ADD_SUBDIRECTORY(tui) -ADD_SUBDIRECTORY(gui) -ADD_SUBDIRECTORY(examples) \ No newline at end of file +SET(MED_INT_IS_LONG @MED_INT_IS_LONG@) +SET(PYTHON_TEST_DRIVER "$ENV{KERNEL_ROOT_DIR}/bin/salome/appliskel/python_test_driver.py") +SET(COMPONENT_NAME SMESH) +SET(TIMEOUT 300) + +# Add all test subdirs +SUBDIRS(examples other) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index f7d90a4e3..1e02c7903 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -20,4 +20,8 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -ADD_SUBDIRECTORY(salome) +ADD_SUBDIRECTORY(examples) +IF(SALOME_BUILD_DOC) + ADD_SUBDIRECTORY(tui) + ADD_SUBDIRECTORY(gui) +ENDIF() diff --git a/doc/examples/0README b/doc/examples/0README new file mode 100644 index 000000000..39e339f5b --- /dev/null +++ b/doc/examples/0README @@ -0,0 +1,7 @@ +This folder contains example Python scripts which are used in the documentation of Mesh module, +i.e. those mentioned in *.rst files in {root_src}/doc/gui folder. + +These tests are exported into the ${SMESH_ROOT_DIR}/share/doc/salome/examples folder and can be +executed with the `salome test` command, as a part of whole testing procedure. + +Other Python scripts aimed for testing purposes must be put into the ${root_src}/test folder! diff --git a/doc/salome/examples/CMakeLists.txt b/doc/examples/CMakeLists.txt similarity index 50% rename from doc/salome/examples/CMakeLists.txt rename to doc/examples/CMakeLists.txt index 85f69be68..82b56bf96 100644 --- a/doc/salome/examples/CMakeLists.txt +++ b/doc/examples/CMakeLists.txt @@ -19,31 +19,38 @@ INCLUDE(tests.set) -SET(TEST_REINIT_SALOME "False") -SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test) +SET(TEST_INSTALL_DIRECTORY ${SMESH_TEST_DIR}/examples) +SET(EXAMPLES_INSTALL_DIRECTORY ${SALOME_INSTALL_DOC}/examples/SMESH) -SALOME_CONFIGURE_FILE(tests.py.in tests.py) -SALOME_CONFIGURE_FILE(CTestTestfileInstall.cmake ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CTestTestfile.cmake INSTALL ${TEST_INSTALL_DIRECTORY}) +IF(SALOME_BUILD_TESTS) -SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env) + # Install 'salome test' staff + # --------------------------- + + SALOME_CONFIGURE_FILE(CTestTestfileInstall.cmake + ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CTestTestfile.cmake + INSTALL ${TEST_INSTALL_DIRECTORY}) + INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) + + # Add tests for 'make test' + # ------------------------- + + SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env) -IF(SMESH_JOIN_TESTS) - ADD_TEST(NAME SMESH_examples COMMAND ${PYTHON_EXECUTABLE} -B ${CMAKE_SOURCE_DIR}/doc/salome/examples/testme.py tests.py) -ELSE(SMESH_JOIN_TESTS) FOREACH(test ${GOOD_TESTS}) GET_FILENAME_COMPONENT(testname ${test} NAME_WE) ADD_TEST(NAME ${testname} - COMMAND ${PYTHON_EXECUTABLE} -B ${CMAKE_SOURCE_DIR}/doc/salome/examples/testme.py ${CMAKE_CURRENT_SOURCE_DIR}/${test}) - SET_TESTS_PROPERTIES(${testname} PROPERTIES ENVIRONMENT "${tests_env}") + COMMAND ${PYTHON_EXECUTABLE} -B ${CMAKE_SOURCE_DIR}/test/test_helper.py ${CMAKE_CURRENT_SOURCE_DIR}/${test}) + SET_TESTS_PROPERTIES(${testname} PROPERTIES ENVIRONMENT "${tests_env}" LABELS "examples") ENDFOREACH() -ENDIF(SMESH_JOIN_TESTS) -# install Python scripts -SALOME_INSTALL_SCRIPTS("${EXAMPLES_TESTS}" ${SALOME_INSTALL_DOC}/examples/SMESH) +ENDIF() -# Application tests +# Install example scripts and data +# -------------------------------- -INSTALL(FILES ${GOOD_TESTS} ${BAD_TESTS} ${SESSION_FREE_TESTS} DESTINATION ${TEST_INSTALL_DIRECTORY}) -INSTALL(FILES Mesh_tri.med test_homard_adapt.med tutorial_4.00.med tutorial_4.xao tutorial_5.00.med tutorial_5.fr.med DESTINATION ${TEST_INSTALL_DIRECTORY}) -INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) -INSTALL(DIRECTORY MGAdapt_med_files DESTINATION ${TEST_INSTALL_DIRECTORY}) +IF(SALOME_BUILD_TESTS OR SALOME_BUILD_DOC) + INSTALL(FILES ${GOOD_TESTS} ${BAD_TESTS} DESTINATION ${EXAMPLES_INSTALL_DIRECTORY}) + INSTALL(FILES mechanic.py DESTINATION ${SALOME_INSTALL_BINS}) + INSTALL(DIRECTORY data DESTINATION ${EXAMPLES_INSTALL_DIRECTORY}) +ENDIF() diff --git a/doc/salome/gui/CMakeLists.txt b/doc/examples/CTestTestfileInstall.cmake similarity index 70% rename from doc/salome/gui/CMakeLists.txt rename to doc/examples/CTestTestfileInstall.cmake index df2fcbaf5..93708f8e0 100644 --- a/doc/salome/gui/CMakeLists.txt +++ b/doc/examples/CTestTestfileInstall.cmake @@ -20,4 +20,13 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -ADD_SUBDIRECTORY(SMESH) +SET(SCRIPTS_DIR "../../../../share/doc/salome/examples/SMESH") + +INCLUDE(tests.set) + +FOREACH(tfile ${GOOD_TESTS} ${BAD_TESTS}) + GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE) + SET(TEST_NAME SMESH_${BASE_NAME}) + ADD_TEST(${TEST_NAME} python ${PYTHON_TEST_DRIVER} ${TIMEOUT} ${SCRIPTS_DIR}/${tfile}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME};${COMPONENT_NAME}_examples") +ENDFOREACH() diff --git a/doc/salome/examples/MGAdaptTests_without_session.py b/doc/examples/MGAdaptTests_without_session.py similarity index 97% rename from doc/salome/examples/MGAdaptTests_without_session.py rename to doc/examples/MGAdaptTests_without_session.py index 2f0621d70..dac79eae1 100644 --- a/doc/salome/examples/MGAdaptTests_without_session.py +++ b/doc/examples/MGAdaptTests_without_session.py @@ -11,8 +11,11 @@ __revision__ = "V04.04" #========================= Les imports - Début =================================== +import inspect import sys import os +import tempfile +import shutil import salome salome.standalone() @@ -26,7 +29,7 @@ smesh = smeshBuilder.New() #========================= Paramétrage - Début =================================== # 1. REPDATA = répertoire du cas -REPDATA = "MGAdapt_med_files" +REPDATA = os.path.abspath(os.path.join(os.path.dirname(inspect.getfile(lambda: None)), 'data')) # # 2. Repérage des données D_DATA = dict() @@ -73,6 +76,7 @@ Le(s) nom du/des tests à passer. Si aucun n'est donné, tous les cas sont pass """Le constructeur de la classe MGAdaptTest""" self.l_cas = list() + self.repout = None for option in liste_option : @@ -145,7 +149,10 @@ Entrées/Sorties : if self._verbose_max: print ("_add_file_out pour {}".format(self.nro_cas)) - ficmed = os.path.join (REPDATA, "test_{}.adapt.tui.med".format(self.nro_cas)) + if not self.repout: + self.repout = tempfile.mkdtemp() + + ficmed = os.path.join (self.repout, "test_{}.adapt.tui.med".format(self.nro_cas)) if os.path.isfile(ficmed): os.remove(ficmed) @@ -422,6 +429,9 @@ Sorties : if ( erreur and self._verbose_max ): print (blabla, message) + if self.repout: + shutil.rmtree(self.repout) + return erreur, message #=========================== Fin de la méthode ================================== diff --git a/doc/salome/examples/a3DmeshOnModified2Dmesh.py b/doc/examples/a3DmeshOnModified2Dmesh.py similarity index 100% rename from doc/salome/examples/a3DmeshOnModified2Dmesh.py rename to doc/examples/a3DmeshOnModified2Dmesh.py diff --git a/doc/salome/examples/cartesian_algo.py b/doc/examples/cartesian_algo.py similarity index 79% rename from doc/salome/examples/cartesian_algo.py rename to doc/examples/cartesian_algo.py index da86cf423..584d66715 100644 --- a/doc/salome/examples/cartesian_algo.py +++ b/doc/examples/cartesian_algo.py @@ -1,26 +1,23 @@ # Usage of Body Fitting algorithm - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create a sphere -sphere = geompy.MakeSphereR( 50 ) +sphere = geom_builder.MakeSphereR( 50 ) # cut the sphere by a box -box = geompy.MakeBoxDXDYDZ( 100, 100, 100 ) -partition = geompy.MakePartition([ sphere ], [ box ], theName="partition") +box = geom_builder.MakeBoxDXDYDZ( 100, 100, 100 ) +partition = geom_builder.MakePartition([ sphere ], [ box ], theName="partition") # create a mesh and assign a "Body Fitting" algo -mesh = smesh.Mesh( partition ) +mesh = smesh_builder.Mesh( partition ) cartAlgo = mesh.BodyFitted() # define a cartesian grid using Coordinates @@ -76,16 +73,16 @@ print() # Example of customization of dirtections of the grid axes # make a box with non-orthogonal edges -xDir = geompy.MakeVectorDXDYDZ( 1.0, 0.1, 0.0, "xDir" ) -yDir = geompy.MakeVectorDXDYDZ(-0.1, 1.0, 0.0, "yDir" ) -zDir = geompy.MakeVectorDXDYDZ( 0.2, 0.3, 1.0, "zDir" ) -face = geompy.MakePrismVecH( xDir, yDir, 1.0 ) -box = geompy.MakePrismVecH( face, zDir, 1.0, theName="box" ) +xDir = geom_builder.MakeVectorDXDYDZ( 1.0, 0.1, 0.0, "xDir" ) +yDir = geom_builder.MakeVectorDXDYDZ(-0.1, 1.0, 0.0, "yDir" ) +zDir = geom_builder.MakeVectorDXDYDZ( 0.2, 0.3, 1.0, "zDir" ) +face = geom_builder.MakePrismVecH( xDir, yDir, 1.0 ) +box = geom_builder.MakePrismVecH( face, zDir, 1.0, theName="box" ) spc = "0.1" # spacing # default axes -mesh = smesh.Mesh( box, "custom axes") +mesh = smesh_builder.Mesh( box, "custom axes") algo = mesh.BodyFitted() algo.SetGrid( spc, spc, spc, 10000 ) mesh.Compute() diff --git a/doc/salome/examples/creating_meshes_ex01.py b/doc/examples/creating_meshes_ex01.py similarity index 69% rename from doc/salome/examples/creating_meshes_ex01.py rename to doc/examples/creating_meshes_ex01.py index ba8563d6d..e5cb0e934 100644 --- a/doc/salome/examples/creating_meshes_ex01.py +++ b/doc/examples/creating_meshes_ex01.py @@ -2,20 +2,19 @@ import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create a box -box = geompy.MakeBox(0., 0., 0., 100., 200., 300.) -idbox = geompy.addToStudy(box, "box") +box = geom_builder.MakeBox(0., 0., 0., 100., 200., 300.) +idbox = geom_builder.addToStudy(box, "box") # create a mesh -tetra = smesh.Mesh(box, "MeshBox") +tetra = smesh_builder.Mesh(box, "MeshBox") algo1D = tetra.Segment() algo1D.NumberOfSegments(7) diff --git a/doc/salome/examples/creating_meshes_ex02.py b/doc/examples/creating_meshes_ex02.py similarity index 75% rename from doc/salome/examples/creating_meshes_ex02.py rename to doc/examples/creating_meshes_ex02.py index 8a8966a3f..676708c68 100644 --- a/doc/salome/examples/creating_meshes_ex02.py +++ b/doc/examples/creating_meshes_ex02.py @@ -2,25 +2,24 @@ import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create a box -box = geompy.MakeBoxDXDYDZ(10., 10., 10.) -geompy.addToStudy(box, "Box") +box = geom_builder.MakeBoxDXDYDZ(10., 10., 10.) +geom_builder.addToStudy(box, "Box") # select one edge of the box for definition of a local hypothesis -p5 = geompy.MakeVertex(5., 0., 0.) -EdgeX = geompy.GetEdgeNearPoint(box, p5) -geompy.addToStudyInFather(box, EdgeX, "Edge [0,0,0 - 10,0,0]") +p5 = geom_builder.MakeVertex(5., 0., 0.) +EdgeX = geom_builder.GetEdgeNearPoint(box, p5) +geom_builder.addToStudyInFather(box, EdgeX, "Edge [0,0,0 - 10,0,0]") # create a hexahedral mesh on the box -mesh = smesh.Mesh(box, "Box : hexahedral 3D mesh") +mesh = smesh_builder.Mesh(box, "Box : hexahedral 3D mesh") # create a Regular_1D algorithm for discretization of edges algo1D = mesh.Segment() @@ -46,12 +45,11 @@ algo_local.Propagation() # assign a hexahedral algorithm mesh.Hexahedron() - # any sub-shape can be meshed individually -- # compute mesh on two surfaces using different methods # get surfaces -surfaces = geompy.SubShapeAll(box, geompy.ShapeType["FACE"]) +surfaces = geom_builder.SubShapeAll(box, geom_builder.ShapeType["FACE"]) # method 1: no sub-mesh is created mesh.Compute( surfaces[0] ) @@ -60,7 +58,5 @@ mesh.Compute( surfaces[0] ) submesh = mesh.GetSubMesh( surfaces[2], "submesh 2" ) submesh.Compute() - - # compute the whole mesh mesh.Compute() diff --git a/doc/salome/examples/creating_meshes_ex03.py b/doc/examples/creating_meshes_ex03.py similarity index 87% rename from doc/salome/examples/creating_meshes_ex03.py rename to doc/examples/creating_meshes_ex03.py index fc20d3660..5ad4e10a0 100644 --- a/doc/salome/examples/creating_meshes_ex03.py +++ b/doc/examples/creating_meshes_ex03.py @@ -2,19 +2,18 @@ import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -Box_1 = geompy.MakeBoxDXDYDZ(200, 200, 200) -[Face_1,Face_2,Face_3,Face_4,Face_5,Face_6] = geompy.SubShapeAllSorted(Box_1, geompy.ShapeType["FACE"]) +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() + +Box_1 = geom_builder.MakeBoxDXDYDZ(200, 200, 200) +[Face_1,Face_2,Face_3,Face_4,Face_5,Face_6] = geom_builder.SubShapeAllSorted(Box_1, geom_builder.ShapeType["FACE"]) # create Mesh object on Box shape -Mesh_1 = smesh.Mesh(Box_1) +Mesh_1 = smesh_builder.Mesh(Box_1) # assign mesh algorithms and hypotheses Regular_1D = Mesh_1.Segment() diff --git a/doc/salome/examples/creating_meshes_ex04.py b/doc/examples/creating_meshes_ex04.py similarity index 75% rename from doc/salome/examples/creating_meshes_ex04.py rename to doc/examples/creating_meshes_ex04.py index 7101a0226..3298e971c 100644 --- a/doc/salome/examples/creating_meshes_ex04.py +++ b/doc/examples/creating_meshes_ex04.py @@ -2,13 +2,12 @@ import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() def PrintMeshInfo(theMesh): aMesh = theMesh.GetMesh() @@ -20,17 +19,17 @@ def PrintMeshInfo(theMesh): pass # create a box -box = geompy.MakeBox(0., 0., 0., 20., 20., 20.) -geompy.addToStudy(box, "box") +box = geom_builder.MakeBox(0., 0., 0., 20., 20., 20.) +geom_builder.addToStudy(box, "box") # select one edge of the box for definition of a local hypothesis -subShapeList = geompy.SubShapeAll(box, geompy.ShapeType["EDGE"]) +subShapeList = geom_builder.SubShapeAll(box, geom_builder.ShapeType["EDGE"]) edge = subShapeList[0] -name = geompy.SubShapeName(edge, box) -geompy.addToStudyInFather(box, edge, name) +name = geom_builder.SubShapeName(edge, box) +geom_builder.addToStudyInFather(box, edge, name) # create a mesh -tria = smesh.Mesh(box, "Mesh 2D") +tria = smesh_builder.Mesh(box, "Mesh 2D") algo1D = tria.Segment() hyp1 = algo1D.NumberOfSegments(3) algo2D = tria.Triangle() diff --git a/doc/salome/examples/creating_meshes_ex05.py b/doc/examples/creating_meshes_ex05.py similarity index 75% rename from doc/salome/examples/creating_meshes_ex05.py rename to doc/examples/creating_meshes_ex05.py index 725c7e953..5c2ab863b 100644 --- a/doc/salome/examples/creating_meshes_ex05.py +++ b/doc/examples/creating_meshes_ex05.py @@ -1,21 +1,24 @@ # Export of a Mesh +import os +import tempfile +import MEDLoader + import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create a box -box = geompy.MakeBox(0., 0., 0., 100., 200., 300.) -idbox = geompy.addToStudy(box, "box") +box = geom_builder.MakeBox(0., 0., 0., 100., 200., 300.) +idbox = geom_builder.addToStudy(box, "box") # create a mesh -tetra = smesh.Mesh(box, "MeshBox") +tetra = smesh_builder.Mesh(box, "MeshBox") tetra.Segment().NumberOfSegments(7) tetra.Triangle() tetra.Tetrahedron() @@ -24,12 +27,11 @@ tetra.Tetrahedron() tetra.Compute() # export the mesh in a MED file -import tempfile medFile = tempfile.NamedTemporaryFile(suffix=".med").name tetra.ExportMED( medFile, 0 ) # export a group in a MED file -face = geompy.SubShapeAll( box, geompy.ShapeType["FACE"])[0] # a box side +face = geom_builder.SubShapeAll( box, geom_builder.ShapeType["FACE"])[0] # a box side group = tetra.GroupOnGeom( face, "face group" ) # group of 2D elements on the tetra.ExportMED( medFile, meshPart=group ) @@ -37,12 +39,10 @@ tetra.ExportMED( medFile, meshPart=group ) # autoDimension parameter # ======================== -face = geompy.MakeFaceHW( 10, 10, 1, "rectangle" ) -mesh2D = smesh.Mesh( face, "mesh2D" ) +face = geom_builder.MakeFaceHW( 10, 10, 1, "rectangle" ) +mesh2D = smesh_builder.Mesh( face, "mesh2D" ) mesh2D.AutomaticHexahedralization(0) -import MEDLoader, os - # exported mesh is in 2D space because it is a planar mesh lying # on XOY plane, and autoDimension=True by default mesh2D.ExportMED( medFile ) diff --git a/doc/examples/creating_meshes_ex06.py b/doc/examples/creating_meshes_ex06.py new file mode 100644 index 000000000..a460eeb8b --- /dev/null +++ b/doc/examples/creating_meshes_ex06.py @@ -0,0 +1,120 @@ +# Creating a hexahedral mesh on a cylinder. +# +# This example uses Partition to divide the cylinder into blocks, which is +# a general approach. But for the case of cylinder there is a dedicated +# command creating a blocked cylinder: geom_builder.MakeDividedCylinder() + +import math + +import salome +salome.salome_init_without_session() + +import GEOM +from salome.geom import geomBuilder +from salome.smesh import smeshBuilder + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() + +# Parameters +# ---------- + +radius = 50 +height = 200 + +# Build a cylinder +# ---------------- + +base = geom_builder.MakeVertex(0, 0, 0) +direction = geom_builder.MakeVectorDXDYDZ(0, 0, 1) + +cylinder = geom_builder.MakeCylinder(base, direction, radius, height) + +geom_builder.addToStudy(cylinder, "cylinder") + +# Build blocks +# ------------ + +size = radius/2.0 + +box_rot = geom_builder.MakeBox(-size, -size, 0, +size, +size, height) +box_axis = geom_builder.MakeLine(base, direction) +box = geom_builder.MakeRotation(box_rot, box_axis, math.pi/4) + +hole = geom_builder.MakeCut(cylinder, box) + +plane_trim = 2000 + +plane_a = geom_builder.MakePlane(base, geom_builder.MakeVectorDXDYDZ(1, 0, 0), plane_trim) +plane_b = geom_builder.MakePlane(base, geom_builder.MakeVectorDXDYDZ(0, 1, 0), plane_trim) + +blocks_part = geom_builder.MakePartition([hole], [plane_a, plane_b], [], [], geom_builder.ShapeType["SOLID"]) +blocks_list = [box] + geom_builder.SubShapeAll(blocks_part, geom_builder.ShapeType["SOLID"]) +blocks_all = geom_builder.MakeCompound(blocks_list) +blocks = geom_builder.MakeGlueFaces(blocks_all, 0.0001) + +geom_builder.addToStudy(blocks, "cylinder:blocks") + +# Build geometric groups +# ---------------------- + +group_a = geom_builder.CreateGroup(blocks, geom_builder.ShapeType["FACE"]) +geom_builder.addToStudyInFather(blocks, group_a, "baseA") +items = geom_builder.GetShapesOnPlaneWithLocationIDs(blocks, geom_builder.ShapeType["FACE"], direction, base, GEOM.ST_ON) +geom_builder.UnionIDs(group_a, items) + +base_b = geom_builder.MakeVertex(0, 0, height) +group_b = geom_builder.CreateGroup(blocks, geom_builder.ShapeType["FACE"]) +geom_builder.addToStudyInFather(blocks, group_b, "baseB") +items = geom_builder.GetShapesOnPlaneWithLocationIDs(blocks, geom_builder.ShapeType["FACE"], direction, base_b, GEOM.ST_ON) +geom_builder.UnionIDs(group_b, items) + +group_1 = geom_builder.CreateGroup(blocks, geom_builder.ShapeType["SOLID"]) +geom_builder.addToStudyInFather(blocks, group_1, "limit") +group_1_all = geom_builder.SubShapeAllIDs(blocks, geom_builder.ShapeType["SOLID"]) +geom_builder.UnionIDs(group_1, group_1_all) +group_1_box = geom_builder.GetBlockNearPoint(blocks, base) +geom_builder.DifferenceList(group_1, [group_1_box]) + +# Mesh the blocks with hexahedral +# ------------------------------- + +smesh_builder.UpdateStudy() + +hexa = smesh_builder.Mesh(blocks) + +hexa_1d = hexa.Segment() +hexa_1d.NumberOfSegments(1) + +vertex = geom_builder.MakeVertex(+radius, +radius, 0) +edge = geom_builder.GetEdgeNearPoint(blocks, vertex) +algo = hexa.Segment(edge) +algo.NumberOfSegments(5) +algo.Propagation() + +vertex = geom_builder.MakeVertex(-radius, +radius, 0) +edge = geom_builder.GetEdgeNearPoint(blocks, vertex) +algo = hexa.Segment(edge) +algo.NumberOfSegments(8) +algo.Propagation() + +vertex = geom_builder.MakeVertex((radius+size)/2, 0, 0) +edge = geom_builder.GetEdgeNearPoint(blocks, vertex) +algo = hexa.Segment(edge) +algo.NumberOfSegments(10) +algo.Propagation() + +vertex = geom_builder.MakeVertex(+radius, 0, height/2) +edge = geom_builder.GetEdgeNearPoint(blocks, vertex) +algo = hexa.Segment(edge) +algo.NumberOfSegments(20) +algo.Propagation() + +hexa.Quadrangle() +hexa.Hexahedron() + +hexa.Compute() + +hexa.Group(group_a) +hexa.Group(group_b) +hexa.Group(group_1) diff --git a/doc/examples/creating_meshes_ex07.py b/doc/examples/creating_meshes_ex07.py new file mode 100644 index 000000000..4a181c237 --- /dev/null +++ b/doc/examples/creating_meshes_ex07.py @@ -0,0 +1,86 @@ +# Building a compound of meshes + +import salome +salome.salome_init_without_session() + +from salome.geom import geomBuilder +from salome.smesh import smeshBuilder + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() + +## create a bottom box +Box_inf = geom_builder.MakeBox(0., 0., 0., 200., 200., 50.) + +# get a top face +Psup1=geom_builder.MakeVertex(100., 100., 50.) +Fsup1=geom_builder.GetFaceNearPoint(Box_inf, Psup1) +# get a bottom face +Pinf1=geom_builder.MakeVertex(100., 100., 0.) +Finf1=geom_builder.GetFaceNearPoint(Box_inf, Pinf1) + +## create a top box +Box_sup = geom_builder.MakeBox(100., 100., 50., 200., 200., 100.) + +# get a top face +Psup2=geom_builder.MakeVertex(150., 150., 100.) +Fsup2=geom_builder.GetFaceNearPoint(Box_sup, Psup2) +# get a bottom face +Pinf2=geom_builder.MakeVertex(150., 150., 50.) +Finf2=geom_builder.GetFaceNearPoint(Box_sup, Pinf2) + +## Publish in the study +geom_builder.addToStudy(Box_inf, "Box_inf") +geom_builder.addToStudyInFather(Box_inf, Fsup1, "Fsup") +geom_builder.addToStudyInFather(Box_inf, Finf1, "Finf") + +geom_builder.addToStudy(Box_sup, "Box_sup") +geom_builder.addToStudyInFather(Box_sup, Fsup2, "Fsup") +geom_builder.addToStudyInFather(Box_sup, Finf2, "Finf") + +smesh_builder.UpdateStudy() + +## create a bottom mesh +Mesh_inf = smesh_builder.Mesh(Box_inf, "Mesh_inf") +algo1D_1=Mesh_inf.Segment() +algo1D_1.NumberOfSegments(10) +algo2D_1=Mesh_inf.Quadrangle() +algo3D_1=Mesh_inf.Hexahedron() +Mesh_inf.Compute() + +# create a group on the top face +Gsup1=Mesh_inf.Group(Fsup1, "Sup") +# create a group on the bottom face +Ginf1=Mesh_inf.Group(Finf1, "Inf") + +## create a top mesh +Mesh_sup = smesh_builder.Mesh(Box_sup, "Mesh_sup") +algo1D_2=Mesh_sup.Segment() +algo1D_2.NumberOfSegments(5) +algo2D_2=Mesh_sup.Quadrangle() +algo3D_2=Mesh_sup.Hexahedron() +Mesh_sup.Compute() + +# create a group on the top face +Gsup2=Mesh_sup.Group(Fsup2, "Sup") +# create a group on the bottom face +Ginf2=Mesh_sup.Group(Finf2, "Inf") + +## create compounds +# create a compound of two meshes with renaming namesake groups and +# merging elements with the given tolerance +Compound1 = smesh_builder.Concatenate([Mesh_inf, Mesh_sup], 0, 1, 1e-05, + name='Compound with RenamedGrps and MergeElems') +# create a compound of two meshes with uniting namesake groups and +# creating groups of all elements +Compound2 = smesh_builder.Concatenate([Mesh_inf, Mesh_sup], 1, 0, 1e-05, True, + name='Compound with UniteGrps and GrpsOfAllElems') + +# copy Gsup1 into a separate mesh and translate it +groupMesh = Mesh_inf.TranslateObjectMakeMesh( Gsup1, [300,0,0] ) + +# add Ginf2 to groupMesh +smesh_builder.Concatenate([Ginf2], False, meshToAppendTo = groupMesh ) + +if salome.sg.hasDesktop(): + salome.sg.updateObjBrowser() diff --git a/doc/examples/creating_meshes_ex08.py b/doc/examples/creating_meshes_ex08.py new file mode 100644 index 000000000..71fdff73b --- /dev/null +++ b/doc/examples/creating_meshes_ex08.py @@ -0,0 +1,59 @@ +# Mesh Copying + +import salome +salome.salome_init_without_session() + +import SMESH +from salome.geom import geomBuilder +from salome.smesh import smeshBuilder + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() + +# make geometry of a box +box = geom_builder.MakeBoxDXDYDZ(100,100,100) +face = geom_builder.SubShapeAllSorted(box, geom_builder.ShapeType["FACE"])[0] + +# generate a prismatic 3D mesh +mesh = smesh_builder.Mesh(box, "box") +localAlgo = mesh.Triangle(face) +mesh.Segment().NumberOfSegments( 3 ) +mesh.Quadrangle() +mesh.Prism() +mesh.Compute() + +# objects to copy +fGroup = mesh.GroupOnGeom( face, "2D on face") +nGroup = mesh.GroupOnGeom( face, "nodes on face", SMESH.NODE) +subMesh = localAlgo.GetSubMesh() + +# make a new mesh by copying different parts of the mesh + +# 1. copy the whole mesh +newMesh = smesh_builder.CopyMesh( mesh, "whole mesh copy") + +# 2. copy a group of 2D elements along with groups +newMesh = smesh_builder.CopyMesh( fGroup, "face group copy with groups",toCopyGroups=True) + +# 3. copy a group of nodes +newMesh = smesh_builder.CopyMesh( nGroup, "node group copy") + +# 4. copy some faces +faceIds = fGroup.GetIDs()[-10:] +newMesh = smesh_builder.CopyMesh( mesh.GetIDSource( faceIds, SMESH.FACE ), "some faces copy") + +# 5. copy some nodes +nodeIds = nGroup.GetIDs()[-10:] +newMesh = smesh_builder.CopyMesh( mesh.GetIDSource( nodeIds, SMESH.NODE), "some nodes copy") + +# 6. copy a sub-mesh +newMesh = smesh_builder.CopyMesh( subMesh, "sub-mesh copy" ) + + +# make a new mesh with same hypotheses on a modified geometry + +smallBox = geom_builder.MakeScaleAlongAxes( box, None, 1, 0.5, 0.5 ) +cutBox = geom_builder.MakeCut( box, smallBox, theName="box - smallBox" ) + +ok, newMesh, groups, submehses, hyps, invIDs = smesh_builder.CopyMeshWithGeom( mesh, cutBox, "cutBox" ) +newMesh.Compute() diff --git a/doc/salome/examples/MGAdapt_med_files/test_01.med b/doc/examples/data/test_01.med similarity index 100% rename from doc/salome/examples/MGAdapt_med_files/test_01.med rename to doc/examples/data/test_01.med diff --git a/doc/salome/examples/MGAdapt_med_files/test_02.med b/doc/examples/data/test_02.med similarity index 100% rename from doc/salome/examples/MGAdapt_med_files/test_02.med rename to doc/examples/data/test_02.med diff --git a/doc/salome/examples/MGAdapt_med_files/test_02_bg.med b/doc/examples/data/test_02_bg.med similarity index 100% rename from doc/salome/examples/MGAdapt_med_files/test_02_bg.med rename to doc/examples/data/test_02_bg.med diff --git a/doc/salome/examples/MGAdapt_med_files/test_04.med b/doc/examples/data/test_04.med similarity index 100% rename from doc/salome/examples/MGAdapt_med_files/test_04.med rename to doc/examples/data/test_04.med diff --git a/doc/salome/examples/MGAdapt_med_files/test_06.med b/doc/examples/data/test_06.med similarity index 100% rename from doc/salome/examples/MGAdapt_med_files/test_06.med rename to doc/examples/data/test_06.med diff --git a/doc/salome/examples/MGAdapt_med_files/test_07.med b/doc/examples/data/test_07.med similarity index 100% rename from doc/salome/examples/MGAdapt_med_files/test_07.med rename to doc/examples/data/test_07.med diff --git a/doc/salome/examples/MGAdapt_med_files/test_08.med b/doc/examples/data/test_08.med similarity index 100% rename from doc/salome/examples/MGAdapt_med_files/test_08.med rename to doc/examples/data/test_08.med diff --git a/doc/salome/examples/MGAdapt_med_files/test_08_bg.med b/doc/examples/data/test_08_bg.med similarity index 100% rename from doc/salome/examples/MGAdapt_med_files/test_08_bg.med rename to doc/examples/data/test_08_bg.med diff --git a/doc/salome/examples/MGAdapt_med_files/test_10.med b/doc/examples/data/test_10.med similarity index 100% rename from doc/salome/examples/MGAdapt_med_files/test_10.med rename to doc/examples/data/test_10.med diff --git a/doc/salome/examples/MGAdapt_med_files/test_11.med b/doc/examples/data/test_11.med similarity index 100% rename from doc/salome/examples/MGAdapt_med_files/test_11.med rename to doc/examples/data/test_11.med diff --git a/doc/salome/examples/MGAdapt_med_files/test_13.med b/doc/examples/data/test_13.med similarity index 100% rename from doc/salome/examples/MGAdapt_med_files/test_13.med rename to doc/examples/data/test_13.med diff --git a/doc/salome/examples/test_homard_adapt.med b/doc/examples/data/test_homard_adapt.med similarity index 100% rename from doc/salome/examples/test_homard_adapt.med rename to doc/examples/data/test_homard_adapt.med diff --git a/doc/salome/examples/tutorial_4.00.med b/doc/examples/data/tutorial_4.00.med similarity index 100% rename from doc/salome/examples/tutorial_4.00.med rename to doc/examples/data/tutorial_4.00.med diff --git a/doc/salome/examples/tutorial_4.xao b/doc/examples/data/tutorial_4.xao similarity index 100% rename from doc/salome/examples/tutorial_4.xao rename to doc/examples/data/tutorial_4.xao diff --git a/doc/salome/examples/tutorial_5.00.med b/doc/examples/data/tutorial_5.00.med similarity index 100% rename from doc/salome/examples/tutorial_5.00.med rename to doc/examples/data/tutorial_5.00.med diff --git a/doc/salome/examples/tutorial_5.fr.med b/doc/examples/data/tutorial_5.fr.med similarity index 100% rename from doc/salome/examples/tutorial_5.fr.med rename to doc/examples/data/tutorial_5.fr.med diff --git a/doc/examples/defining_hypotheses_adaptive1d.py b/doc/examples/defining_hypotheses_adaptive1d.py new file mode 100644 index 000000000..d28342a19 --- /dev/null +++ b/doc/examples/defining_hypotheses_adaptive1d.py @@ -0,0 +1,34 @@ +# Usage of Adaptive 1D hypothesis + +import math + +import salome +salome.salome_init_without_session() + +from salome.geom import geomBuilder +from salome.smesh import smeshBuilder + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() + +box = geom_builder.MakeBoxDXDYDZ( 100, 100, 100 ) +tool = geom_builder.MakeTranslation( box, 50, 0, 10 ) +axis = geom_builder.MakeVector( geom_builder.MakeVertex( 100, 0, 100 ),geom_builder.MakeVertex( 100, 10, 100 ),) +tool = geom_builder.Rotate( tool, axis, math.pi * 25 / 180. ) +shape = geom_builder.MakeCut( box, tool ) +cyl = geom_builder.MakeCylinder( geom_builder.MakeVertex( -10,5, 95 ), geom_builder.MakeVectorDXDYDZ(1,0,0), 2, 90) +shape = geom_builder.MakeCut( shape, cyl ) +tool = geom_builder.MakeBoxTwoPnt( geom_builder.MakeVertex( -10, 2, 15 ), geom_builder.MakeVertex( 90, 5, 16 )) +shape = geom_builder.MakeCut( shape, tool, theName="shape" ) + +# Parameters of Adaptive hypothesis. minSize and maxSize are such that they do not limit +# size of segments because size of geometrical features lies within [2.-100.] range, hence +# size of segments is defined by deflection parameter and size of geometrical features only. +minSize = 0.1 +maxSize = 200 +deflection = 0.05 + +mesh = smesh_builder.Mesh( shape ) +mesh.Segment().Adaptive( minSize, maxSize, deflection ) +mesh.Triangle().MaxElementArea( 300 ) +mesh.Compute() diff --git a/doc/salome/examples/defining_hypotheses_ex01.py b/doc/examples/defining_hypotheses_ex01.py similarity index 78% rename from doc/salome/examples/defining_hypotheses_ex01.py rename to doc/examples/defining_hypotheses_ex01.py index 0a2401d52..734c7ea02 100644 --- a/doc/salome/examples/defining_hypotheses_ex01.py +++ b/doc/examples/defining_hypotheses_ex01.py @@ -4,23 +4,23 @@ import salome salome.salome_init_without_session() from salome.geom import geomBuilder -geompy = geomBuilder.New() - from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create a box -box = geompy.MakeBoxDXDYDZ(10., 10., 10.) -geompy.addToStudy(box, "Box") +box = geom_builder.MakeBoxDXDYDZ(10., 10., 10.) +geom_builder.addToStudy(box, "Box") # create a hexahedral mesh on the box -hexa = smesh.Mesh(box, "Box : hexahedrical mesh") +hexa = smesh_builder.Mesh(box, "Box : hexahedrical mesh") # create a Regular 1D algorithm for edges algo1D = hexa.Segment() # optionally reverse node distribution on certain edges -allEdges = geompy.SubShapeAllSorted( box, geompy.ShapeType["EDGE"]) +allEdges = geom_builder.SubShapeAllSorted( box, geom_builder.ShapeType["EDGE"]) reversedEdges = [ allEdges[0], allEdges[4] ] # define "Arithmetic1D" hypothesis to cut all edges in several segments with increasing arithmetic length @@ -33,7 +33,6 @@ gpAlgo.GeometricProgression( 1, 1.2 ) # propagate distribution of nodes computed using "Geometric Progression" to parallel edges gpAlgo.PropagationOfDistribution() - # create a quadrangle 2D algorithm for faces hexa.Quadrangle() diff --git a/doc/salome/examples/defining_hypotheses_ex02.py b/doc/examples/defining_hypotheses_ex02.py similarity index 52% rename from doc/salome/examples/defining_hypotheses_ex02.py rename to doc/examples/defining_hypotheses_ex02.py index c5a5ce205..29e15745d 100644 --- a/doc/salome/examples/defining_hypotheses_ex02.py +++ b/doc/examples/defining_hypotheses_ex02.py @@ -2,34 +2,33 @@ import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create a face from arc and straight segment -px = geompy.MakeVertex(100., 0. , 0. ) -py = geompy.MakeVertex(0. , 100., 0. ) -pz = geompy.MakeVertex(0. , 0. , 100.) +px = geom_builder.MakeVertex(100., 0. , 0. ) +py = geom_builder.MakeVertex(0. , 100., 0. ) +pz = geom_builder.MakeVertex(0. , 0. , 100.) -exy = geompy.MakeEdge(px, py) -arc = geompy.MakeArc(py, pz, px) +exy = geom_builder.MakeEdge(px, py) +arc = geom_builder.MakeArc(py, pz, px) -wire = geompy.MakeWire([exy, arc]) +wire = geom_builder.MakeWire([exy, arc]) isPlanarFace = 1 -face1 = geompy.MakeFace(wire, isPlanarFace) -geompy.addToStudy(face1,"Face1") +face1 = geom_builder.MakeFace(wire, isPlanarFace) +geom_builder.addToStudy(face1,"Face1") # get edges from the face -e_straight,e_arc = geompy.SubShapeAll(face1, geompy.ShapeType["EDGE"]) -geompy.addToStudyInFather(face1, e_arc, "Arc Edge") +e_straight,e_arc = geom_builder.SubShapeAll(face1, geom_builder.ShapeType["EDGE"]) +geom_builder.addToStudyInFather(face1, e_arc, "Arc Edge") # create hexahedral mesh -hexa = smesh.Mesh(face1, "Face : triangle mesh") +hexa = smesh_builder.Mesh(face1, "Face : triangle mesh") # define "NumberOfSegments" hypothesis to cut a straight edge in a fixed number of segments algo1D = hexa.Segment() diff --git a/doc/salome/examples/defining_hypotheses_ex03.py b/doc/examples/defining_hypotheses_ex03.py similarity index 69% rename from doc/salome/examples/defining_hypotheses_ex03.py rename to doc/examples/defining_hypotheses_ex03.py index 14af89e19..21be409db 100644 --- a/doc/salome/examples/defining_hypotheses_ex03.py +++ b/doc/examples/defining_hypotheses_ex03.py @@ -2,25 +2,24 @@ import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create a box -box = geompy.MakeBoxDXDYDZ(10., 10., 10.) -geompy.addToStudy(box, "Box") +box = geom_builder.MakeBoxDXDYDZ(10., 10., 10.) +geom_builder.addToStudy(box, "Box") # get one edge of the box to put local hypothesis on -p5 = geompy.MakeVertex(5., 0., 0.) -EdgeX = geompy.GetEdgeNearPoint(box, p5) -geompy.addToStudyInFather(box, EdgeX, "Edge [0,0,0 - 10,0,0]") +p5 = geom_builder.MakeVertex(5., 0., 0.) +EdgeX = geom_builder.GetEdgeNearPoint(box, p5) +geom_builder.addToStudyInFather(box, EdgeX, "Edge [0,0,0 - 10,0,0]") # create a hexahedral mesh on the box -hexa = smesh.Mesh(box, "Box : hexahedrical mesh") +hexa = smesh_builder.Mesh(box, "Box : hexahedrical mesh") # set algorithms algo1D = hexa.Segment() diff --git a/doc/salome/examples/defining_hypotheses_ex04.py b/doc/examples/defining_hypotheses_ex04.py similarity index 68% rename from doc/salome/examples/defining_hypotheses_ex04.py rename to doc/examples/defining_hypotheses_ex04.py index bb38eeb9d..043ff1e44 100644 --- a/doc/salome/examples/defining_hypotheses_ex04.py +++ b/doc/examples/defining_hypotheses_ex04.py @@ -2,25 +2,24 @@ import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create a box -box = geompy.MakeBoxDXDYDZ(10., 10., 10.) -geompy.addToStudy(box, "Box") +box = geom_builder.MakeBoxDXDYDZ(10., 10., 10.) +geom_builder.addToStudy(box, "Box") # get one edge of the box to put local hypothesis on -p5 = geompy.MakeVertex(5., 0., 0.) -EdgeX = geompy.GetEdgeNearPoint(box, p5) -geompy.addToStudyInFather(box, EdgeX, "Edge [0,0,0 - 10,0,0]") +p5 = geom_builder.MakeVertex(5., 0., 0.) +EdgeX = geom_builder.GetEdgeNearPoint(box, p5) +geom_builder.addToStudyInFather(box, EdgeX, "Edge [0,0,0 - 10,0,0]") # create a hexahedral mesh on the box -hexa = smesh.Mesh(box, "Box : hexahedrical mesh") +hexa = smesh_builder.Mesh(box, "Box : hexahedrical mesh") # set algorithms algo1D = hexa.Segment() diff --git a/doc/examples/defining_hypotheses_ex05.py b/doc/examples/defining_hypotheses_ex05.py new file mode 100644 index 000000000..4b2d1a75b --- /dev/null +++ b/doc/examples/defining_hypotheses_ex05.py @@ -0,0 +1,43 @@ +# Maximum Element Area + +import salome +salome.salome_init_without_session() + +from salome.geom import geomBuilder +from salome.smesh import smeshBuilder + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() + +# create a face +px = geom_builder.MakeVertex(100., 0. , 0. ) +py = geom_builder.MakeVertex(0. , 100., 0. ) +pz = geom_builder.MakeVertex(0. , 0. , 100.) + +vxy = geom_builder.MakeVector(px, py) +arc = geom_builder.MakeArc(py, pz, px) +wire = geom_builder.MakeWire([vxy, arc]) + +isPlanarFace = 1 +face = geom_builder.MakeFace(wire, isPlanarFace) + +# add the face in the study +id_face = geom_builder.addToStudy(face, "Face to be meshed") + +# create a mesh +tria_mesh = smesh_builder.Mesh(face, "Face : triangulation") + +# define 1D meshing: +algo = tria_mesh.Segment() +algo.NumberOfSegments(20) + +# define 2D meshing: + +# assign triangulation algorithm +algo = tria_mesh.Triangle() + +# assign "Max Element Area" hypothesis +algo.MaxElementArea(100) + +# compute the mesh +tria_mesh.Compute() diff --git a/doc/salome/examples/defining_hypotheses_ex06.py b/doc/examples/defining_hypotheses_ex06.py similarity index 73% rename from doc/salome/examples/defining_hypotheses_ex06.py rename to doc/examples/defining_hypotheses_ex06.py index 687de13f7..aa0cb45bf 100644 --- a/doc/salome/examples/defining_hypotheses_ex06.py +++ b/doc/examples/defining_hypotheses_ex06.py @@ -2,20 +2,19 @@ import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() +from salome.geom import geomBuilder + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create a cylinder -cyl = geompy.MakeCylinderRH(30., 50.) -geompy.addToStudy(cyl, "cyl") +cyl = geom_builder.MakeCylinderRH(30., 50.) +geom_builder.addToStudy(cyl, "cyl") # create a mesh on the cylinder -tetra = smesh.Mesh(cyl, "Cylinder : tetrahedrical mesh") +tetra = smesh_builder.Mesh(cyl, "Cylinder : tetrahedrical mesh") # assign algorithms algo1D = tetra.Segment() diff --git a/doc/salome/examples/defining_hypotheses_ex07.py b/doc/examples/defining_hypotheses_ex07.py similarity index 59% rename from doc/salome/examples/defining_hypotheses_ex07.py rename to doc/examples/defining_hypotheses_ex07.py index 2beb838d2..7295778f0 100644 --- a/doc/salome/examples/defining_hypotheses_ex07.py +++ b/doc/examples/defining_hypotheses_ex07.py @@ -2,25 +2,24 @@ import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create sketchers -sketcher1 = geompy.MakeSketcher("Sketcher:F 0 0:TT 70 0:TT 70 70:TT 0 70:WW") -sketcher2 = geompy.MakeSketcher("Sketcher:F 20 20:TT 50 20:TT 50 50:TT 20 50:WW") +sketcher1 = geom_builder.MakeSketcher("Sketcher:F 0 0:TT 70 0:TT 70 70:TT 0 70:WW") +sketcher2 = geom_builder.MakeSketcher("Sketcher:F 20 20:TT 50 20:TT 50 50:TT 20 50:WW") # create a face from two wires isPlanarFace = 1 -face1 = geompy.MakeFaces([sketcher1, sketcher2], isPlanarFace) -geompy.addToStudy(face1, "Face1") +face1 = geom_builder.MakeFaces([sketcher1, sketcher2], isPlanarFace) +geom_builder.addToStudy(face1, "Face1") # create a mesh -tria = smesh.Mesh(face1, "Face : triangle 2D mesh") +tria = smesh_builder.Mesh(face1, "Face : triangle 2D mesh") # Define 1D meshing algo1D = tria.Segment() diff --git a/doc/salome/examples/defining_hypotheses_ex08.py b/doc/examples/defining_hypotheses_ex08.py similarity index 72% rename from doc/salome/examples/defining_hypotheses_ex08.py rename to doc/examples/defining_hypotheses_ex08.py index ee0af3912..43d77f1c2 100644 --- a/doc/salome/examples/defining_hypotheses_ex08.py +++ b/doc/examples/defining_hypotheses_ex08.py @@ -2,26 +2,25 @@ import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create a box -base = geompy.MakeSketcher("Sketcher:F 0 0:TT 10 0:TT 20 10:TT 0 10:WF", theName="F") -box = geompy.MakePrismDXDYDZ( base, 0,0,10 ) -geompy.addToStudy(box, "Box") +base = geom_builder.MakeSketcher("Sketcher:F 0 0:TT 10 0:TT 20 10:TT 0 10:WF", theName="F") +box = geom_builder.MakePrismDXDYDZ( base, 0,0,10 ) +geom_builder.addToStudy(box, "Box") # get one edge of the box to put local hypothesis on -p5 = geompy.MakeVertex(5., 0., 0.) -EdgeX = geompy.GetEdgeNearPoint(box, p5) -geompy.addToStudyInFather(box, EdgeX, "Edge [0,0,0 - 10,0,0]") +p5 = geom_builder.MakeVertex(5., 0., 0.) +EdgeX = geom_builder.GetEdgeNearPoint(box, p5) +geom_builder.addToStudyInFather(box, EdgeX, "Edge [0,0,0 - 10,0,0]") # create a hexahedral mesh on the box -hexa = smesh.Mesh(box, "Propagation of hypothesis") +hexa = smesh_builder.Mesh(box, "Propagation of hypothesis") # set global algorithms and hypotheses algo1D = hexa.Segment() @@ -42,9 +41,8 @@ algo_local.Propagation() # compute the mesh which contains prisms hexa.Compute() - # create another mesh on the box -mesh = smesh.Mesh(box, "Propagation of distribution of nodes") +mesh = smesh_builder.Mesh(box, "Propagation of distribution of nodes") # set global algorithms and hypotheses algo1D = mesh.Segment() diff --git a/doc/salome/examples/defining_hypotheses_ex09.py b/doc/examples/defining_hypotheses_ex09.py similarity index 76% rename from doc/salome/examples/defining_hypotheses_ex09.py rename to doc/examples/defining_hypotheses_ex09.py index 7ac2a0fb4..c9cc52f61 100644 --- a/doc/salome/examples/defining_hypotheses_ex09.py +++ b/doc/examples/defining_hypotheses_ex09.py @@ -2,20 +2,19 @@ import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create a box -box = geompy.MakeBoxDXDYDZ(10., 10., 10.) -geompy.addToStudy(box, "Box") +box = geom_builder.MakeBoxDXDYDZ(10., 10., 10.) +geom_builder.addToStudy(box, "Box") # Create a hexahedral mesh on the box -hexa = smesh.Mesh(box, "Box : hexahedrical mesh") +hexa = smesh_builder.Mesh(box, "Box : hexahedrical mesh") # create a Regular 1D algorithm for edges algo1D = hexa.Segment() @@ -33,7 +32,7 @@ algo1D.Arithmetic1D(1, 4) hexa.Compute() # 2. Create a tetrahedral mesh on the box -tetra = smesh.Mesh(box, "Box : tetrahedrical mesh") +tetra = smesh_builder.Mesh(box, "Box : tetrahedrical mesh") # create a Regular 1D algorithm for edges algo1D = tetra.Segment() diff --git a/doc/salome/examples/defining_hypotheses_ex10.py b/doc/examples/defining_hypotheses_ex10.py similarity index 59% rename from doc/salome/examples/defining_hypotheses_ex10.py rename to doc/examples/defining_hypotheses_ex10.py index 0801c2cfc..0a1b3d85c 100644 --- a/doc/salome/examples/defining_hypotheses_ex10.py +++ b/doc/examples/defining_hypotheses_ex10.py @@ -4,58 +4,55 @@ import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # Prepare geometry # Create a parallelepiped -box = geompy.MakeBoxDXDYDZ(200, 100, 70) -geompy.addToStudy( box, "box" ) +box = geom_builder.MakeBoxDXDYDZ(200, 100, 70) +geom_builder.addToStudy( box, "box" ) # Get geom faces to mesh with triangles in the 1ts and 2nd meshes -faces = geompy.SubShapeAll(box, geompy.ShapeType["FACE"]) +faces = geom_builder.SubShapeAll(box, geom_builder.ShapeType["FACE"]) # 2 adjacent faces of the box f1 = faces[2] f2 = faces[0] # face opposite to f2 -f2opp = geompy.GetOppositeFace( box, f2 ) +f2opp = geom_builder.GetOppositeFace( box, f2 ) # Get vertices used to specify how to associate sides of faces at projection -[v1F1, v2F1] = geompy.SubShapeAll(f1, geompy.ShapeType["VERTEX"])[:2] -[v1F2, v2F2] = geompy.SubShapeAll(f2, geompy.ShapeType["VERTEX"])[:2] -geompy.addToStudyInFather( box, v1F1, "v1F1" ) -geompy.addToStudyInFather( box, v2F1, "v2F1" ) -geompy.addToStudyInFather( box, v1F2, "v1F2" ) -geompy.addToStudyInFather( box, v2F2, "v2F2" ) +[v1F1, v2F1] = geom_builder.SubShapeAll(f1, geom_builder.ShapeType["VERTEX"])[:2] +[v1F2, v2F2] = geom_builder.SubShapeAll(f2, geom_builder.ShapeType["VERTEX"])[:2] +geom_builder.addToStudyInFather( box, v1F1, "v1F1" ) +geom_builder.addToStudyInFather( box, v2F1, "v2F1" ) +geom_builder.addToStudyInFather( box, v1F2, "v1F2" ) +geom_builder.addToStudyInFather( box, v2F2, "v2F2" ) # Make group of 3 edges of f1 and f2 -edgesF1 = geompy.CreateGroup(f1, geompy.ShapeType["EDGE"]) -geompy.UnionList( edgesF1, geompy.SubShapeAll(f1, geompy.ShapeType["EDGE"])[:3]) -edgesF2 = geompy.CreateGroup(f2, geompy.ShapeType["EDGE"]) -geompy.UnionList( edgesF2, geompy.SubShapeAll(f2, geompy.ShapeType["EDGE"])[:3]) -geompy.addToStudyInFather( box, edgesF1, "edgesF1" ) -geompy.addToStudyInFather( box, edgesF2, "edgesF2" ) - +edgesF1 = geom_builder.CreateGroup(f1, geom_builder.ShapeType["EDGE"]) +geom_builder.UnionList( edgesF1, geom_builder.SubShapeAll(f1, geom_builder.ShapeType["EDGE"])[:3]) +edgesF2 = geom_builder.CreateGroup(f2, geom_builder.ShapeType["EDGE"]) +geom_builder.UnionList( edgesF2, geom_builder.SubShapeAll(f2, geom_builder.ShapeType["EDGE"])[:3]) +geom_builder.addToStudyInFather( box, edgesF1, "edgesF1" ) +geom_builder.addToStudyInFather( box, edgesF2, "edgesF2" ) # Make the source mesh with prisms -src_mesh = smesh.Mesh(box, "Source mesh") +src_mesh = smesh_builder.Mesh(box, "Source mesh") src_mesh.Segment().NumberOfSegments(9,10) src_mesh.Quadrangle() src_mesh.Hexahedron() src_mesh.Triangle(f1) # triangular sub-mesh src_mesh.Compute() - # Mesh the box using projection algorithms # Define the same global 1D and 2D hypotheses -tgt_mesh = smesh.Mesh(box, "Target mesh") +tgt_mesh = smesh_builder.Mesh(box, "Target mesh") tgt_mesh.Segment().NumberOfSegments(9,10,UseExisting=True) tgt_mesh.Quadrangle() @@ -81,4 +78,4 @@ proj3D.SourceShape3D( box, src_mesh, v1F1, v1F2, v2F1, v2F2 ) tgt_mesh.Compute() # Move the source mesh to visually compare the two meshes -src_mesh.TranslateObject( src_mesh, smesh.MakeDirStruct( 210, 0, 0 ), Copy=False) +src_mesh.TranslateObject( src_mesh, smesh_builder.MakeDirStruct( 210, 0, 0 ), Copy=False) diff --git a/doc/salome/examples/defining_hypotheses_ex11.py b/doc/examples/defining_hypotheses_ex11.py similarity index 59% rename from doc/salome/examples/defining_hypotheses_ex11.py rename to doc/examples/defining_hypotheses_ex11.py index 5e85222ad..d2ffdcc6d 100644 --- a/doc/salome/examples/defining_hypotheses_ex11.py +++ b/doc/examples/defining_hypotheses_ex11.py @@ -1,40 +1,37 @@ # Projection 1D2D - # Project triangles from one meshed face to another mesh on the same box import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # Prepare geometry # Create a box -box = geompy.MakeBoxDXDYDZ(100, 100, 100) +box = geom_builder.MakeBoxDXDYDZ(100, 100, 100) # Get geom faces to mesh with triangles in the 1ts and 2nd meshes -faces = geompy.SubShapeAll(box, geompy.ShapeType["FACE"]) +faces = geom_builder.SubShapeAll(box, geom_builder.ShapeType["FACE"]) # 2 adjacent faces of the box Face_1 = faces[2] Face_2 = faces[0] -geompy.addToStudy( box, 'box' ) -geompy.addToStudyInFather( box, Face_1, 'Face_1' ) -geompy.addToStudyInFather( box, Face_2, 'Face_2' ) - +geom_builder.addToStudy( box, 'box' ) +geom_builder.addToStudyInFather( box, Face_1, 'Face_1' ) +geom_builder.addToStudyInFather( box, Face_2, 'Face_2' ) # Make the source mesh triangulated by MEFISTO -src_mesh = smesh.Mesh(Face_1, "Source mesh") +src_mesh = smesh_builder.Mesh(Face_1, "Source mesh") src_mesh.Segment().NumberOfSegments(15) src_mesh.Triangle() src_mesh.Compute() # Mesh the target mesh using the algorithm Projection1D2D -tgt_mesh = smesh.Mesh(Face_2, "Target mesh") +tgt_mesh = smesh_builder.Mesh(Face_2, "Target mesh") tgt_mesh.Projection1D2D().SourceFace(Face_1,src_mesh) tgt_mesh.Compute() diff --git a/doc/salome/examples/defining_hypotheses_ex12.py b/doc/examples/defining_hypotheses_ex12.py similarity index 73% rename from doc/salome/examples/defining_hypotheses_ex12.py rename to doc/examples/defining_hypotheses_ex12.py index 9db644836..d7f9ff5b6 100644 --- a/doc/salome/examples/defining_hypotheses_ex12.py +++ b/doc/examples/defining_hypotheses_ex12.py @@ -2,25 +2,23 @@ import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -from salome.StdMeshers import StdMeshersBuilder + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # Create face and explode it on edges -face = geompy.MakeFaceHW(100, 100, 1) -edges = geompy.SubShapeAllSorted(face, geompy.ShapeType["EDGE"]) -geompy.addToStudy( face, "Face" ) +face = geom_builder.MakeFaceHW(100, 100, 1) +edges = geom_builder.SubShapeAllSorted(face, geom_builder.ShapeType["EDGE"]) +geom_builder.addToStudy( face, "Face" ) # get the first edge from exploded result -edge1 = geompy.GetSubShapeID(face, edges[0]) +edge1 = geom_builder.GetSubShapeID(face, edges[0]) # Define Mesh on previously created face -Mesh_1 = smesh.Mesh(face) +Mesh_1 = smesh_builder.Mesh(face) # Create Fixed Point 1D hypothesis and define parameters. # Note: values greater than 1.0 and less than 0.0 are not taken into account; @@ -29,7 +27,7 @@ Mesh_1 = smesh.Mesh(face) # The number of segments should correspond to the number of points (NbSeg = NbPnt-1); # extra values of segments splitting parameter are not taken into account, # while missing values are considered to be equal to 1. -Fixed_points_1D_1 = smesh.CreateHypothesis('FixedPoints1D') +Fixed_points_1D_1 = smesh_builder.CreateHypothesis('FixedPoints1D') Fixed_points_1D_1.SetPoints( [ 1.1, 0.9, 0.5, 0.0, 0.5, -0.3 ] ) Fixed_points_1D_1.SetNbSegments( [ 3, 1, 2 ] ) Fixed_points_1D_1.SetReversedEdges( [edge1] ) diff --git a/doc/salome/examples/defining_hypotheses_ex13.py b/doc/examples/defining_hypotheses_ex13.py similarity index 68% rename from doc/salome/examples/defining_hypotheses_ex13.py rename to doc/examples/defining_hypotheses_ex13.py index c7c736cff..f1b359e50 100644 --- a/doc/salome/examples/defining_hypotheses_ex13.py +++ b/doc/examples/defining_hypotheses_ex13.py @@ -2,25 +2,23 @@ import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -# Create face from the wire and add to study -Face = geompy.MakeSketcher("Sketcher:F 0 0:TT 20 0:R 90:C 20 90:WF", [0, 0, 0, 1, 0, 0, 0, 0, 1]) -geompy.addToStudy(Face,"Face") -circle, radius1, radius2 = geompy.SubShapeAllSorted(Face, geompy.ShapeType["EDGE"]) -geompy.addToStudyInFather(Face, radius1,"radius1") -geompy.addToStudyInFather(Face, radius2,"radius2") -geompy.addToStudyInFather(Face, circle,"circle") +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() +# Create face from the wire and add to study +Face = geom_builder.MakeSketcher("Sketcher:F 0 0:TT 20 0:R 90:C 20 90:WF", [0, 0, 0, 1, 0, 0, 0, 0, 1]) +geom_builder.addToStudy(Face,"Face") +circle, radius1, radius2 = geom_builder.SubShapeAllSorted(Face, geom_builder.ShapeType["EDGE"]) +geom_builder.addToStudyInFather(Face, radius1,"radius1") +geom_builder.addToStudyInFather(Face, radius2,"radius2") +geom_builder.addToStudyInFather(Face, circle,"circle") # Define geometry for mesh, and Radial Quadrange algorithm -mesh = smesh.Mesh(Face) +mesh = smesh_builder.Mesh(Face) radial_Quad_algo = mesh.Quadrangle(algo=smeshBuilder.RADIAL_QUAD) # The Radial Quadrange algorithm can work without any hypothesis diff --git a/doc/salome/examples/defining_hypotheses_ex14.py b/doc/examples/defining_hypotheses_ex14.py similarity index 53% rename from doc/salome/examples/defining_hypotheses_ex14.py rename to doc/examples/defining_hypotheses_ex14.py index f1e7e39f3..accc5879b 100644 --- a/doc/salome/examples/defining_hypotheses_ex14.py +++ b/doc/examples/defining_hypotheses_ex14.py @@ -4,22 +4,21 @@ import salome salome.salome_init_without_session() from salome.geom import geomBuilder -geompy = geomBuilder.New() - from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -# Get 1/4 part from the disk face. -Box_1 = geompy.MakeBoxDXDYDZ(100, 100, 100) -Disk_1 = geompy.MakeDiskR(100, 1) -Common_1 = geompy.MakeCommon(Disk_1, Box_1) -triaVertex = geompy.GetVertexNearPoint( Common_1, geompy.MakeVertex(0,0,0) ) -geompy.addToStudy( Common_1, "Common_1" ) -geompy.addToStudyInFather( Common_1, triaVertex, "triaVertex" ) +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() +# Get 1/4 part from the disk face. +Box_1 = geom_builder.MakeBoxDXDYDZ(100, 100, 100) +Disk_1 = geom_builder.MakeDiskR(100, 1) +Common_1 = geom_builder.MakeCommon(Disk_1, Box_1) +triaVertex = geom_builder.GetVertexNearPoint( Common_1, geom_builder.MakeVertex(0,0,0) ) +geom_builder.addToStudy( Common_1, "Common_1" ) +geom_builder.addToStudyInFather( Common_1, triaVertex, "triaVertex" ) # Set the Geometry for meshing -Mesh_1 = smesh.Mesh(Common_1) +Mesh_1 = smesh_builder.Mesh(Common_1) # Define 1D hypothesis Regular_1D = Mesh_1.Segment() diff --git a/doc/salome/examples/defining_hypotheses_ex15.py b/doc/examples/defining_hypotheses_ex15.py similarity index 60% rename from doc/salome/examples/defining_hypotheses_ex15.py rename to doc/examples/defining_hypotheses_ex15.py index 7b0cfbaa4..d1c711844 100644 --- a/doc/salome/examples/defining_hypotheses_ex15.py +++ b/doc/examples/defining_hypotheses_ex15.py @@ -2,23 +2,25 @@ import salome salome.salome_init_without_session() + from salome.geom import geomBuilder -geompy = geomBuilder.New() from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # Make quadrangle face and explode it on edges. -Vertex_1 = geompy.MakeVertex(0, 0, 0) -Vertex_2 = geompy.MakeVertex(40, 0, 0) -Vertex_3 = geompy.MakeVertex(40, 30, 0) -Vertex_4 = geompy.MakeVertex(0, 30, 0) -Quadrangle_Face_1 = geompy.MakeQuad4Vertices(Vertex_1, Vertex_4, Vertex_3, Vertex_2) -[Edge_1,Edge_2,Edge_3,Edge_4] = geompy.SubShapeAllSorted(Quadrangle_Face_1, geompy.ShapeType["EDGE"]) -geompy.addToStudy( Quadrangle_Face_1, "Quadrangle Face_1" ) -geompy.addToStudyInFather( Quadrangle_Face_1, Edge_2, "Edge_2" ) +Vertex_1 = geom_builder.MakeVertex(0, 0, 0) +Vertex_2 = geom_builder.MakeVertex(40, 0, 0) +Vertex_3 = geom_builder.MakeVertex(40, 30, 0) +Vertex_4 = geom_builder.MakeVertex(0, 30, 0) +Quadrangle_Face_1 = geom_builder.MakeQuad4Vertices(Vertex_1, Vertex_4, Vertex_3, Vertex_2) +[Edge_1,Edge_2,Edge_3,Edge_4] = geom_builder.SubShapeAllSorted(Quadrangle_Face_1, geom_builder.ShapeType["EDGE"]) +geom_builder.addToStudy( Quadrangle_Face_1, "Quadrangle Face_1" ) +geom_builder.addToStudyInFather( Quadrangle_Face_1, Edge_2, "Edge_2" ) # Set the Geometry for meshing -Mesh_1 = smesh.Mesh(Quadrangle_Face_1) +Mesh_1 = smesh_builder.Mesh(Quadrangle_Face_1) # Create Quadrangle parameters and # define the Type as Quadrangle Preference diff --git a/doc/examples/defining_hypotheses_ex16.py b/doc/examples/defining_hypotheses_ex16.py new file mode 100644 index 000000000..850bc4865 --- /dev/null +++ b/doc/examples/defining_hypotheses_ex16.py @@ -0,0 +1,50 @@ +# "Import 2D Elements from Another Mesh" example + +import salome +salome.salome_init_without_session() + +import SMESH +from salome.geom import geomBuilder +from salome.smesh import smeshBuilder + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() + +# Make a patritioned box + +box = geom_builder.MakeBoxDXDYDZ(100,100,100) + +N = geom_builder.MakeVectorDXDYDZ( 1,0,0 ) +O = geom_builder.MakeVertex( 50,0,0 ) +plane = geom_builder.MakePlane( O, N, 200 ) # plane YOZ + +shape2boxes = geom_builder.MakeHalfPartition( box, plane ) +boxes = geom_builder.SubShapeAllSorted(shape2boxes, geom_builder.ShapeType["SOLID"]) + +geom_builder.addToStudy( boxes[0], "boxes[0]") +geom_builder.addToStudy( boxes[1], "boxes[1]") +midFace0 = geom_builder.SubShapeAllSorted(boxes[0], geom_builder.ShapeType["FACE"])[5] +geom_builder.addToStudyInFather( boxes[0], midFace0, "middle Face") +midFace1 = geom_builder.SubShapeAllSorted(boxes[1], geom_builder.ShapeType["FACE"])[0] +geom_builder.addToStudyInFather( boxes[1], midFace1, "middle Face") + +# Mesh one of boxes with quadrangles. It is a source mesh + +srcMesh = smesh_builder.Mesh(boxes[0], "source mesh") # box coloser to CS origin +nSeg1 = srcMesh.Segment().NumberOfSegments(4) +srcMesh.Quadrangle() +srcMesh.Compute() +srcFaceGroup = srcMesh.GroupOnGeom( midFace0, "src faces", SMESH.FACE ) + +# Import faces from midFace0 to the target mesh + +tgtMesh = smesh_builder.Mesh(boxes[1], "target mesh") +importAlgo = tgtMesh.UseExisting2DElements(midFace1) +import2hyp = importAlgo.SourceFaces( [srcFaceGroup] ) +tgtMesh.Segment().NumberOfSegments(3) +tgtMesh.Quadrangle() +tgtMesh.Compute() + +# Import the whole source mesh with groups +import2hyp.SetCopySourceMesh(True,True) +tgtMesh.Compute() diff --git a/doc/salome/examples/defining_hypotheses_ex17.py b/doc/examples/defining_hypotheses_ex17.py similarity index 72% rename from doc/salome/examples/defining_hypotheses_ex17.py rename to doc/examples/defining_hypotheses_ex17.py index da76f2210..917ddd487 100644 --- a/doc/salome/examples/defining_hypotheses_ex17.py +++ b/doc/examples/defining_hypotheses_ex17.py @@ -2,32 +2,32 @@ import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -X = geompy.MakeVectorDXDYDZ( 1,0,0 ) -O = geompy.MakeVertex( 100,50,50 ) -plane = geompy.MakePlane( O, X, 200 ) # plane YZ +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() + +X = geom_builder.MakeVectorDXDYDZ( 1,0,0 ) +O = geom_builder.MakeVertex( 100,50,50 ) +plane = geom_builder.MakePlane( O, X, 200 ) # plane YZ -box = geompy.MakeBoxDXDYDZ(200,100,100) +box = geom_builder.MakeBoxDXDYDZ(200,100,100) -shape = geompy.MakeHalfPartition( box, plane ) +shape = geom_builder.MakeHalfPartition( box, plane ) -faces = geompy.SubShapeAllSorted(shape, geompy.ShapeType["FACE"]) +faces = geom_builder.SubShapeAllSorted(shape, geom_builder.ShapeType["FACE"]) face1 = faces[1] ignoreFaces = [ faces[0], faces[-1]] -geompy.addToStudy( shape, "shape" ) -geompy.addToStudyInFather( shape, face1, "face1") +geom_builder.addToStudy( shape, "shape" ) +geom_builder.addToStudyInFather( shape, face1, "face1") # 3D Viscous layers -mesh = smesh.Mesh(shape, "CFD") +mesh = smesh_builder.Mesh(shape, "CFD") mesh.Segment().NumberOfSegments( 4 ) @@ -56,9 +56,9 @@ mesh.MakeGroup("Prims",SMESH.VOLUME,SMESH.FT_ElemGeomType,"=",SMESH.Geom_PENTA) # 2D Viscous layers # 3 edges of the 4 edges of face1 -edgeIds = geompy.SubShapeAllIDs( face1, geompy.ShapeType["EDGE"])[:-1] +edgeIds = geom_builder.SubShapeAllIDs( face1, geom_builder.ShapeType["EDGE"])[:-1] -mesh = smesh.Mesh(face1,"VicsousLayers2D") +mesh = smesh_builder.Mesh(face1,"VicsousLayers2D") mesh.Segment().NumberOfSegments( 5 ) # viscous layers will be created on 1 edge, as we set 3 edges to ignore diff --git a/doc/salome/examples/defining_hypotheses_len_near_vertex.py b/doc/examples/defining_hypotheses_len_near_vertex.py similarity index 77% rename from doc/salome/examples/defining_hypotheses_len_near_vertex.py rename to doc/examples/defining_hypotheses_len_near_vertex.py index 62379eb8e..f2f024ffd 100644 --- a/doc/salome/examples/defining_hypotheses_len_near_vertex.py +++ b/doc/examples/defining_hypotheses_len_near_vertex.py @@ -4,16 +4,18 @@ import salome salome.salome_init_without_session() + from salome.geom import geomBuilder -geompy = geomBuilder.New() from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create a box -box = geompy.MakeBoxDXDYDZ( 10, 10, 10 ) +box = geom_builder.MakeBoxDXDYDZ( 10, 10, 10 ) # make a mesh -mesh = smesh.Mesh( box ) +mesh = smesh_builder.Mesh( box ) # define quadrangle meshing algo1d = mesh.Segment() diff --git a/doc/salome/examples/filters_belong2group.py b/doc/examples/filters_belong2group.py similarity index 75% rename from doc/salome/examples/filters_belong2group.py rename to doc/examples/filters_belong2group.py index b3b5b61b7..e8d039558 100644 --- a/doc/salome/examples/filters_belong2group.py +++ b/doc/examples/filters_belong2group.py @@ -1,8 +1,7 @@ # Belong to Mesh Group criterion # create mesh -from SMESH_mechanic import * -print() +from mechanic import * # create a group of all faces (quadrangles) generated on sub_face3 quads_on_face3 = mesh.MakeGroup("quads_on_face3", SMESH.FACE, SMESH.FT_BelongToGeom,'=',sub_face3) @@ -11,8 +10,8 @@ print("There are %s quadrangles generated on '%s' and included in the group '%s' # create a group of all the rest quadrangles, generated on other faces by combining 2 criteria: # - negated FT_BelongToMeshGroup to select elements not included in quads_on_face3 # - FT_ElemGeomType to select quadrangles -not_on_face3 = smesh.GetCriterion( SMESH.FACE, SMESH.FT_BelongToMeshGroup,'=',quads_on_face3, SMESH.FT_LogicalNOT ) -quadrangles = smesh.GetCriterion( SMESH.FACE, SMESH.FT_ElemGeomType,'=',SMESH.Geom_QUADRANGLE ) +not_on_face3 = smesh_builder.GetCriterion( SMESH.FACE, SMESH.FT_BelongToMeshGroup,'=',quads_on_face3, SMESH.FT_LogicalNOT ) +quadrangles = smesh_builder.GetCriterion( SMESH.FACE, SMESH.FT_ElemGeomType,'=',SMESH.Geom_QUADRANGLE ) rest_quads = mesh.MakeGroupByCriteria("rest_quads", [ not_on_face3, quadrangles ]) print("'%s' group includes all the rest %s quadrangles" % ( rest_quads.GetName(), rest_quads.Size() )) diff --git a/doc/salome/examples/filters_ex01.py b/doc/examples/filters_ex01.py similarity index 78% rename from doc/salome/examples/filters_ex01.py rename to doc/examples/filters_ex01.py index f323ecb76..5f1604f8e 100644 --- a/doc/salome/examples/filters_ex01.py +++ b/doc/examples/filters_ex01.py @@ -2,22 +2,22 @@ # This script demonstrates various usages of filters # create mesh -from SMESH_mechanic import * +from mechanic import * # get faces with aspect ratio > 2.5 -filter = smesh.GetFilter(SMESH.FACE, SMESH.FT_AspectRatio, SMESH.FT_MoreThan, 2.5) +filter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_AspectRatio, SMESH.FT_MoreThan, 2.5) ids = mesh.GetIdsFromFilter(filter) print("Number of faces with aspect ratio > 2.5:", len(ids)) # get faces with aspect ratio > 1.5 -filter = smesh.GetFilter(SMESH.FACE, SMESH.FT_AspectRatio, '>', 1.5, mesh=mesh) +filter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_AspectRatio, '>', 1.5, mesh=mesh) ids = filter.GetIDs() print("Number of faces with aspect ratio > 1.5:", len(ids)) # copy the faces with aspect ratio > 1.5 to another mesh; # this demonstrates that a filter can be used where usually a group or sub-mesh is acceptable filter.SetMesh( mesh.GetMesh() ) # - actually non necessary as mesh is set at filter creation -mesh2 = smesh.CopyMesh( filter, "AR > 1.5" ) +mesh2 = smesh_builder.CopyMesh( filter, "AR > 1.5" ) print("Number of copied faces with aspect ratio > 1.5:", mesh2.NbFaces()) # create a group (Group on Filter) of faces with Aspect Ratio < 1.5 @@ -26,8 +26,8 @@ print("Number of faces with aspect ratio < 1.5:", group.Size()) # combine several criteria to Create a Group of only Triangular faces with Aspect Ratio < 1.5; # note that contents of a GroupOnFilter is dynamically updated as the mesh changes -crit = [ smesh.GetCriterion( SMESH.FACE, SMESH.FT_AspectRatio, '<', 1.5, BinaryOp=SMESH.FT_LogicalAND ), - smesh.GetCriterion( SMESH.FACE, SMESH.FT_ElemGeomType,'=', SMESH.Geom_TRIANGLE ) ] +crit = [ smesh_builder.GetCriterion( SMESH.FACE, SMESH.FT_AspectRatio, '<', 1.5, BinaryOp=SMESH.FT_LogicalAND ), + smesh_builder.GetCriterion( SMESH.FACE, SMESH.FT_ElemGeomType,'=', SMESH.Geom_TRIANGLE ) ] triaGroup = mesh.MakeGroupByCriteria( "Tria AR < 1.5", crit ) print("Number of triangles with aspect ratio < 1.5:", triaGroup.Size()) diff --git a/doc/salome/examples/filters_ex02.py b/doc/examples/filters_ex02.py similarity index 54% rename from doc/salome/examples/filters_ex02.py rename to doc/examples/filters_ex02.py index 6a392ce41..1e00b70f5 100644 --- a/doc/salome/examples/filters_ex02.py +++ b/doc/examples/filters_ex02.py @@ -1,10 +1,9 @@ # Aspect ratio 3D # create mesh with volumes -from SMESH_mechanic import * -mesh.Tetrahedron() -mesh.Compute() +from mechanic import * + # get volumes with aspect ratio < 2.0 -filter = smesh.GetFilter(SMESH.VOLUME, SMESH.FT_AspectRatio3D, SMESH.FT_LessThan, 2.0) +filter = smesh_builder.GetFilter(SMESH.VOLUME, SMESH.FT_AspectRatio3D, SMESH.FT_LessThan, 2.0) ids = mesh.GetIdsFromFilter(filter) print("Number of volumes with aspect ratio < 2.0:", len(ids)) diff --git a/doc/salome/examples/filters_ex03.py b/doc/examples/filters_ex03.py similarity index 64% rename from doc/salome/examples/filters_ex03.py rename to doc/examples/filters_ex03.py index e01b60df5..c10c1eb8f 100644 --- a/doc/salome/examples/filters_ex03.py +++ b/doc/examples/filters_ex03.py @@ -1,8 +1,9 @@ # Warping angle # create mesh -from SMESH_mechanic import * +from mechanic import * + # get faces with warping angle = 2.0e-13 with tolerance 5.0e-14 -filter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Warping, "=", 2.0e-13, Tolerance=5.0e-14) +filter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Warping, "=", 2.0e-13, Tolerance=5.0e-14) ids = mesh.GetIdsFromFilter(filter) print("Number of faces with warping angle = 2.0e-13 (tolerance 5.0e-14):", len(ids)) diff --git a/doc/salome/examples/filters_ex04.py b/doc/examples/filters_ex04.py similarity index 61% rename from doc/salome/examples/filters_ex04.py rename to doc/examples/filters_ex04.py index 2b274837a..96d9e2e5e 100644 --- a/doc/salome/examples/filters_ex04.py +++ b/doc/examples/filters_ex04.py @@ -1,8 +1,9 @@ # Minimum angle # create mesh -from SMESH_mechanic import * +from mechanic import * + # get faces with minimum angle > 75 -filter = smesh.GetFilter(SMESH.FACE, SMESH.FT_MinimumAngle,">", 75) +filter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_MinimumAngle,">", 75) ids = mesh.GetIdsFromFilter(filter) print("Number of faces with minimum angle > 75:", len(ids)) diff --git a/doc/salome/examples/filters_ex05.py b/doc/examples/filters_ex05.py similarity index 56% rename from doc/salome/examples/filters_ex05.py rename to doc/examples/filters_ex05.py index c470db6bc..f3ddf6a3b 100644 --- a/doc/salome/examples/filters_ex05.py +++ b/doc/examples/filters_ex05.py @@ -1,8 +1,9 @@ # Taper # create mesh -from SMESH_mechanic import * +from mechanic import * + # get faces with taper < 1.e-15 -filter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Taper, SMESH.FT_LessThan, 1.e-15) +filter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Taper, SMESH.FT_LessThan, 1.e-15) ids = mesh.GetIdsFromFilter(filter) print("Number of faces with taper < 1.e-15:", len(ids)) diff --git a/doc/salome/examples/filters_ex06.py b/doc/examples/filters_ex06.py similarity index 55% rename from doc/salome/examples/filters_ex06.py rename to doc/examples/filters_ex06.py index 94666f70c..a62dbf600 100644 --- a/doc/salome/examples/filters_ex06.py +++ b/doc/examples/filters_ex06.py @@ -1,8 +1,9 @@ # Skew # create mesh -from SMESH_mechanic import * +from mechanic import * + # get faces with skew > 50 -filter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Skew, SMESH.FT_MoreThan, 50) +filter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Skew, SMESH.FT_MoreThan, 50) ids = mesh.GetIdsFromFilter(filter) print("Number of faces with skew > 50:", len(ids)) diff --git a/doc/examples/filters_ex07.py b/doc/examples/filters_ex07.py new file mode 100644 index 000000000..1684de1b6 --- /dev/null +++ b/doc/examples/filters_ex07.py @@ -0,0 +1,11 @@ +# Area + +# create mesh +from mechanic import * + +# get faces with area > 60 and < 90 +criterion1 = smesh_builder.GetCriterion(SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, 60) +criterion2 = smesh_builder.GetCriterion(SMESH.FACE, SMESH.FT_Area, SMESH.FT_LessThan, 90) +filter = smesh_builder.GetFilterFromCriteria([criterion1,criterion2], SMESH.FT_LogicalAND) +ids = mesh.GetIdsFromFilter(filter) +print("Number of faces with area in range (60,90):", len(ids)) diff --git a/doc/salome/examples/filters_ex08.py b/doc/examples/filters_ex08.py similarity index 53% rename from doc/salome/examples/filters_ex08.py rename to doc/examples/filters_ex08.py index 479de961e..a56e45bbe 100644 --- a/doc/salome/examples/filters_ex08.py +++ b/doc/examples/filters_ex08.py @@ -1,10 +1,9 @@ # Volume # create mesh with volumes -from SMESH_mechanic import * -mesh.Tetrahedron() -mesh.Compute() +from mechanic import * + # get volumes faces with volume > 100 -filter = smesh.GetFilter(SMESH.VOLUME, SMESH.FT_Volume3D, SMESH.FT_MoreThan, 100) +filter = smesh_builder.GetFilter(SMESH.VOLUME, SMESH.FT_Volume3D, SMESH.FT_MoreThan, 100) ids = mesh.GetIdsFromFilter(filter) print("Number of volumes with volume > 100:", len(ids)) diff --git a/doc/salome/examples/filters_ex09.py b/doc/examples/filters_ex09.py similarity index 56% rename from doc/salome/examples/filters_ex09.py rename to doc/examples/filters_ex09.py index 8e2ebfd3d..d78f685ba 100644 --- a/doc/salome/examples/filters_ex09.py +++ b/doc/examples/filters_ex09.py @@ -1,21 +1,23 @@ # Free borders -# initialize SALOME and modules -import salome, SMESH +import salome salome.salome_init_without_session() + +import SMESH from salome.geom import geomBuilder -geompy = geomBuilder.New() from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create mesh -face = geompy.MakeFaceHW(100, 100, 1, theName="quadrangle") -mesh = smesh.Mesh(face) +face = geom_builder.MakeFaceHW(100, 100, 1, theName="quadrangle") +mesh = smesh_builder.Mesh(face) mesh.Segment().NumberOfSegments(10) mesh.Triangle().MaxElementArea(25) mesh.Compute() # get all free borders -filter = smesh.GetFilter(SMESH.EDGE, SMESH.FT_FreeBorders) +filter = smesh_builder.GetFilter(SMESH.EDGE, SMESH.FT_FreeBorders) ids = mesh.GetIdsFromFilter(filter) print("Number of edges on free borders:", len(ids)) diff --git a/doc/salome/examples/filters_ex10.py b/doc/examples/filters_ex10.py similarity index 54% rename from doc/salome/examples/filters_ex10.py rename to doc/examples/filters_ex10.py index b90e5188f..8f27a7c18 100644 --- a/doc/salome/examples/filters_ex10.py +++ b/doc/examples/filters_ex10.py @@ -1,22 +1,24 @@ # Free edges -# initialize SALOME and modules -import salome, SMESH +import salome salome.salome_init_without_session() + +import SMESH from salome.geom import geomBuilder -geompy = geomBuilder.New() from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create mesh -face = geompy.MakeFaceHW(100, 100, 1) -geompy.addToStudy( face, "quadrangle" ) -mesh = smesh.Mesh(face) +face = geom_builder.MakeFaceHW(100, 100, 1) +geom_builder.addToStudy( face, "quadrangle" ) +mesh = smesh_builder.Mesh(face) mesh.Segment().NumberOfSegments(10) mesh.Triangle().MaxElementArea(25) mesh.Compute() # get all faces with free edges -filter = smesh.GetFilter(SMESH.FACE, SMESH.FT_FreeEdges) +filter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_FreeEdges) ids = mesh.GetIdsFromFilter(filter) print("Number of faces with free edges:", len(ids)) diff --git a/doc/salome/examples/filters_ex11.py b/doc/examples/filters_ex11.py similarity index 63% rename from doc/salome/examples/filters_ex11.py rename to doc/examples/filters_ex11.py index 47b62e282..3c4751bd3 100644 --- a/doc/salome/examples/filters_ex11.py +++ b/doc/examples/filters_ex11.py @@ -1,10 +1,12 @@ # Free nodes # create mesh -from SMESH_mechanic import * +from mechanic import * + # add node mesh.AddNode(0,0,0) + # get all free nodes -filter = smesh.GetFilter(SMESH.NODE, SMESH.FT_FreeNodes) +filter = smesh_builder.GetFilter(SMESH.NODE, SMESH.FT_FreeNodes) ids = mesh.GetIdsFromFilter(filter) print("Number of free nodes:", len(ids)) diff --git a/doc/salome/examples/filters_ex12.py b/doc/examples/filters_ex12.py similarity index 58% rename from doc/salome/examples/filters_ex12.py rename to doc/examples/filters_ex12.py index 5dfd81ad4..9dc021307 100644 --- a/doc/salome/examples/filters_ex12.py +++ b/doc/examples/filters_ex12.py @@ -1,8 +1,9 @@ # Free faces # create mesh -from SMESH_mechanic import * +from mechanic import * + # get all free faces -filter = smesh.GetFilter(SMESH.FACE, SMESH.FT_FreeFaces) +filter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_FreeFaces) ids = mesh.GetIdsFromFilter(filter) print("Number of free faces:", len(ids)) diff --git a/doc/salome/examples/filters_ex13.py b/doc/examples/filters_ex13.py similarity index 73% rename from doc/salome/examples/filters_ex13.py rename to doc/examples/filters_ex13.py index ae64b565a..89e7acdca 100644 --- a/doc/salome/examples/filters_ex13.py +++ b/doc/examples/filters_ex13.py @@ -1,10 +1,12 @@ # Bare border faces # create mesh -from SMESH_mechanic import * +from mechanic import * + # remove some faces to have faces with bare borders mesh.RemoveElements( mesh.GetElementsByType(SMESH.FACE)[0:5] ) + # get all faces with bare borders -filter = smesh.GetFilter(SMESH.FACE, SMESH.FT_BareBorderFace) +filter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_BareBorderFace) ids = mesh.GetIdsFromFilter(filter) print("Faces with bare borders:", ids) diff --git a/doc/salome/examples/filters_ex14.py b/doc/examples/filters_ex14.py similarity index 68% rename from doc/salome/examples/filters_ex14.py rename to doc/examples/filters_ex14.py index 2e68ae8f2..a5e02736b 100644 --- a/doc/salome/examples/filters_ex14.py +++ b/doc/examples/filters_ex14.py @@ -1,9 +1,10 @@ # Coplanar faces # create mesh -from SMESH_mechanic import * +from mechanic import * + faceID = mesh.GetElementsByType(SMESH.FACE)[0] # get all faces co-planar to the first face with tolerance 5 degrees -filter = smesh.GetFilter(SMESH.FACE, SMESH.FT_CoplanarFaces,faceID,Tolerance=5.0) +filter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_CoplanarFaces,faceID,Tolerance=5.0) ids = mesh.GetIdsFromFilter(filter) print("Number of faces coplanar with the first one:", len(ids)) diff --git a/doc/salome/examples/filters_ex15.py b/doc/examples/filters_ex15.py similarity index 59% rename from doc/salome/examples/filters_ex15.py rename to doc/examples/filters_ex15.py index 70c8cae5c..ff022e690 100644 --- a/doc/salome/examples/filters_ex15.py +++ b/doc/examples/filters_ex15.py @@ -1,7 +1,9 @@ # Over-constrained faces + # create mesh -from SMESH_mechanic import * +from mechanic import * + # get all over-constrained faces -filter = smesh.GetFilter(SMESH.FACE, SMESH.FT_OverConstrainedFace) +filter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_OverConstrainedFace) ids = mesh.GetIdsFromFilter(filter) print("Over-constrained faces:", ids) diff --git a/doc/salome/examples/filters_ex16.py b/doc/examples/filters_ex16.py similarity index 59% rename from doc/salome/examples/filters_ex16.py rename to doc/examples/filters_ex16.py index 4e3d27be4..9b9f5523e 100644 --- a/doc/salome/examples/filters_ex16.py +++ b/doc/examples/filters_ex16.py @@ -1,31 +1,29 @@ # Double edges, Double faces, Double volumes - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -import salome_notebook + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # make a mesh on a box -box = geompy.MakeBoxDXDYDZ(100,100,100) -mesh = smesh.Mesh( box, "Box" ) +box = geom_builder.MakeBoxDXDYDZ(100,100,100) +mesh = smesh_builder.Mesh( box, "Box" ) mesh.Segment().NumberOfSegments(10) mesh.Quadrangle() mesh.Hexahedron() mesh.Compute() # copy all elements with translation and Merge nodes -mesh.TranslateObject( mesh, smesh.MakeDirStruct( 10,0,0), Copy=True ) +mesh.TranslateObject( mesh, smesh_builder.MakeDirStruct( 10,0,0), Copy=True ) mesh.MergeNodes( mesh.FindCoincidentNodes(1e-7) ) # create filters to find equal elements -equalEdgesFilter = smesh.GetFilter(SMESH.EDGE, SMESH.FT_EqualEdges) -equalFacesFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_EqualFaces) -equalVolumesFilter = smesh.GetFilter(SMESH.VOLUME, SMESH.FT_EqualVolumes) +equalEdgesFilter = smesh_builder.GetFilter(SMESH.EDGE, SMESH.FT_EqualEdges) +equalFacesFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_EqualFaces) +equalVolumesFilter = smesh_builder.GetFilter(SMESH.VOLUME, SMESH.FT_EqualVolumes) # get equal elements print("Number of equal edges:", len( mesh.GetIdsFromFilter( equalEdgesFilter ))) print("Number of equal faces:", len( mesh.GetIdsFromFilter( equalFacesFilter ))) diff --git a/doc/salome/examples/filters_ex17.py b/doc/examples/filters_ex17.py similarity index 67% rename from doc/salome/examples/filters_ex17.py rename to doc/examples/filters_ex17.py index 83eda322c..43a5af866 100644 --- a/doc/salome/examples/filters_ex17.py +++ b/doc/examples/filters_ex17.py @@ -2,15 +2,17 @@ import salome salome.salome_init_without_session() -from salome.geom import geomBuilder -geompy = geomBuilder.New() + import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # make a mesh on a box -box = geompy.MakeBoxDXDYDZ(100,100,100) -mesh = smesh.Mesh( box, "Box" ) +box = geom_builder.MakeBoxDXDYDZ(100,100,100) +mesh = smesh_builder.Mesh( box, "Box" ) mesh.Segment().NumberOfSegments(10) mesh.Quadrangle() mesh.Hexahedron() @@ -18,6 +20,6 @@ mesh.Compute() # copy all elements with translation mesh.TranslateObject( mesh, [10,0,0], Copy=True ) # create a filter to find nodes equal within tolerance of 1e-5 -filter = smesh.GetFilter(SMESH.NODE, SMESH.FT_EqualNodes, Tolerance=1e-5) +filter = smesh_builder.GetFilter(SMESH.NODE, SMESH.FT_EqualNodes, Tolerance=1e-5) # get equal nodes print("Number of equal nodes:", len( mesh.GetIdsFromFilter( filter ))) diff --git a/doc/salome/examples/filters_ex18.py b/doc/examples/filters_ex18.py similarity index 72% rename from doc/salome/examples/filters_ex18.py rename to doc/examples/filters_ex18.py index c4ec48107..f5c0e7d3b 100644 --- a/doc/salome/examples/filters_ex18.py +++ b/doc/examples/filters_ex18.py @@ -2,15 +2,17 @@ import salome salome.salome_init_without_session() -from salome.geom import geomBuilder -geompy = geomBuilder.New() + import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # make a mesh on a box -box = geompy.MakeBoxDXDYDZ(100,100,100) -mesh = smesh.Mesh( box, "Box" ) +box = geom_builder.MakeBoxDXDYDZ(100,100,100) +mesh = smesh_builder.Mesh( box, "Box" ) mesh.Segment().NumberOfSegments(10) mesh.Quadrangle() mesh.Hexahedron() @@ -20,6 +22,6 @@ mesh.TranslateObject( mesh, [10,0,0], Copy=True ) mesh.MergeNodes( mesh.FindCoincidentNodes( 1e-5 )) # get mesh edges with number of connected elements (faces and volumes) == 3 -filter = smesh.GetFilter(SMESH.EDGE, SMESH.FT_MultiConnection, 3) +filter = smesh_builder.GetFilter(SMESH.EDGE, SMESH.FT_MultiConnection, 3) ids = mesh.GetIdsFromFilter(filter) print("Number of border edges with 3 faces connected:", len(ids)) diff --git a/doc/salome/examples/filters_ex19.py b/doc/examples/filters_ex19.py similarity index 69% rename from doc/salome/examples/filters_ex19.py rename to doc/examples/filters_ex19.py index cb1c545a3..b55a08a89 100644 --- a/doc/salome/examples/filters_ex19.py +++ b/doc/examples/filters_ex19.py @@ -1,8 +1,9 @@ # Borders at multi-connection 2D # create mesh -from SMESH_mechanic import * +from mechanic import * + # get faces which consist of edges belonging to 2 mesh elements -filter = smesh.GetFilter(SMESH.FACE, SMESH.FT_MultiConnection2D, 2) +filter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_MultiConnection2D, 2) ids = mesh.GetIdsFromFilter(filter) print("Number of faces consisting of edges belonging to 2 faces:", len(ids)) diff --git a/doc/salome/examples/filters_ex20.py b/doc/examples/filters_ex20.py similarity index 56% rename from doc/salome/examples/filters_ex20.py rename to doc/examples/filters_ex20.py index c55b56b23..d0a22f6a8 100644 --- a/doc/salome/examples/filters_ex20.py +++ b/doc/examples/filters_ex20.py @@ -1,8 +1,9 @@ # Length # create mesh -from SMESH_mechanic import * +from mechanic import * + # get edges with length > 14 -filter = smesh.GetFilter(SMESH.EDGE, SMESH.FT_Length, SMESH.FT_MoreThan, 14) +filter = smesh_builder.GetFilter(SMESH.EDGE, SMESH.FT_Length, SMESH.FT_MoreThan, 14) ids = mesh.GetIdsFromFilter(filter) print("Number of edges with length > 14:", len(ids)) diff --git a/doc/salome/examples/filters_ex21.py b/doc/examples/filters_ex21.py similarity index 59% rename from doc/salome/examples/filters_ex21.py rename to doc/examples/filters_ex21.py index 81d408701..229a0ca44 100644 --- a/doc/salome/examples/filters_ex21.py +++ b/doc/examples/filters_ex21.py @@ -1,8 +1,9 @@ # Length 2D # create mesh -from SMESH_mechanic import * +from mechanic import * + # get all faces that have edges with length > 14 -filter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Length2D, SMESH.FT_MoreThan, 14) +filter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_MaxElementLength2D, SMESH.FT_MoreThan, 14) ids = mesh.GetIdsFromFilter(filter) print("Number of faces with maximum edge length > 14:", len(ids)) diff --git a/doc/salome/examples/filters_ex22.py b/doc/examples/filters_ex22.py similarity index 61% rename from doc/salome/examples/filters_ex22.py rename to doc/examples/filters_ex22.py index cb7971bd6..96f8bda65 100644 --- a/doc/salome/examples/filters_ex22.py +++ b/doc/examples/filters_ex22.py @@ -1,8 +1,9 @@ # Element Diameter 2D # create mesh -from SMESH_mechanic import * +from mechanic import * + # get all faces that have elements with length > 10 -filter = smesh.GetFilter(SMESH.FACE, SMESH.FT_MaxElementLength2D, SMESH.FT_MoreThan, 10) +filter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_MaxElementLength2D, SMESH.FT_MoreThan, 10) ids = mesh.GetIdsFromFilter(filter) print("Number of faces with maximum element length > 10:", len(ids)) diff --git a/doc/salome/examples/filters_ex23.py b/doc/examples/filters_ex23.py similarity index 57% rename from doc/salome/examples/filters_ex23.py rename to doc/examples/filters_ex23.py index 8c995090b..8a34c163c 100644 --- a/doc/salome/examples/filters_ex23.py +++ b/doc/examples/filters_ex23.py @@ -1,10 +1,9 @@ # Element Diameter 3D # create mesh with volumes -from SMESH_mechanic import * -mesh.Tetrahedron() -mesh.Compute() +from mechanic import * + # get all volumes that have elements with length > 10 -filter = smesh.GetFilter(SMESH.VOLUME, SMESH.FT_MaxElementLength3D, SMESH.FT_MoreThan, 10) +filter = smesh_builder.GetFilter(SMESH.VOLUME, SMESH.FT_MaxElementLength3D, SMESH.FT_MoreThan, 10) ids = mesh.GetIdsFromFilter(filter) print("Number of volumes with maximum element length > 10:", len(ids)) diff --git a/doc/salome/examples/filters_ex24.py b/doc/examples/filters_ex24.py similarity index 67% rename from doc/salome/examples/filters_ex24.py rename to doc/examples/filters_ex24.py index ffe922691..2d8075cec 100644 --- a/doc/salome/examples/filters_ex24.py +++ b/doc/examples/filters_ex24.py @@ -1,12 +1,11 @@ # Bare border volumes # create mesh -from SMESH_mechanic import * -mesh.Tetrahedron() -mesh.Compute() +from mechanic import * + # remove some volumes to have volumes with bare borders mesh.RemoveElements(mesh.GetElementsByType(SMESH.VOLUME)[0:5]) # get all volumes with bare borders -filter = smesh.GetFilter(SMESH.VOLUME, SMESH.FT_BareBorderVolume) +filter = smesh_builder.GetFilter(SMESH.VOLUME, SMESH.FT_BareBorderVolume) ids = mesh.GetIdsFromFilter(filter) print("Volumes with bare borders:", ids) diff --git a/doc/salome/examples/filters_ex25.py b/doc/examples/filters_ex25.py similarity index 53% rename from doc/salome/examples/filters_ex25.py rename to doc/examples/filters_ex25.py index f3083f7fb..2cae3e14f 100644 --- a/doc/salome/examples/filters_ex25.py +++ b/doc/examples/filters_ex25.py @@ -1,10 +1,9 @@ # Over-constrained volumes # create mesh -from SMESH_mechanic import * -mesh.Tetrahedron() -mesh.Compute() +from mechanic import * + # get all over-constrained volumes -filter = smesh.GetFilter(SMESH.VOLUME, SMESH.FT_OverConstrainedVolume) +filter = smesh_builder.GetFilter(SMESH.VOLUME, SMESH.FT_OverConstrainedVolume) ids = mesh.GetIdsFromFilter(filter) print("Over-constrained volumes:", ids) diff --git a/doc/salome/examples/filters_ex26.py b/doc/examples/filters_ex26.py similarity index 64% rename from doc/salome/examples/filters_ex26.py rename to doc/examples/filters_ex26.py index ea7cff8ac..71bfc4b15 100644 --- a/doc/salome/examples/filters_ex26.py +++ b/doc/examples/filters_ex26.py @@ -1,8 +1,9 @@ # Belong to Geom # create mesh -from SMESH_mechanic import * +from mechanic import * + # get all faces which nodes lie on the face sub_face3 -filter = smesh.GetFilter(SMESH.FACE, SMESH.FT_BelongToGeom, sub_face3) +filter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_BelongToGeom, sub_face3) ids = mesh.GetIdsFromFilter(filter) print("Number of faces which nodes lie on sub_face3:", len(ids)) diff --git a/doc/salome/examples/filters_ex27.py b/doc/examples/filters_ex27.py similarity index 67% rename from doc/salome/examples/filters_ex27.py rename to doc/examples/filters_ex27.py index e05ecbeff..8ac06e38d 100644 --- a/doc/salome/examples/filters_ex27.py +++ b/doc/examples/filters_ex27.py @@ -1,8 +1,9 @@ # Lying on Geom # create mesh -from SMESH_mechanic import * +from mechanic import * + # get all faces at least one node of each lies on the face sub_face3 -filter = smesh.GetFilter(SMESH.FACE, SMESH.FT_LyingOnGeom, sub_face3) +filter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_LyingOnGeom, sub_face3) ids = mesh.GetIdsFromFilter(filter) print("Number of faces at least one node of each lies on sub_face3:", len(ids)) diff --git a/doc/salome/examples/filters_ex28.py b/doc/examples/filters_ex28.py similarity index 50% rename from doc/salome/examples/filters_ex28.py rename to doc/examples/filters_ex28.py index f0382ac65..19e698391 100644 --- a/doc/salome/examples/filters_ex28.py +++ b/doc/examples/filters_ex28.py @@ -1,11 +1,13 @@ # Belong to Plane # create mesh -from SMESH_mechanic import * +from mechanic import * + # create plane -plane_1 = geompy.MakePlane(p3,seg1,2000) -geompy.addToStudy(plane_1, "plane_1") +plane_1 = geom_builder.MakePlane(p3,seg1,2000) +geom_builder.addToStudy(plane_1, "plane_1") + # get all nodes which lie on the plane \a plane_1 -filter = smesh.GetFilter(SMESH.NODE, SMESH.FT_BelongToPlane, plane_1) +filter = smesh_builder.GetFilter(SMESH.NODE, SMESH.FT_BelongToPlane, plane_1) ids = mesh.GetIdsFromFilter(filter) print("Number of nodes which lie on the plane plane_1:", len(ids)) diff --git a/doc/salome/examples/filters_ex29.py b/doc/examples/filters_ex29.py similarity index 67% rename from doc/salome/examples/filters_ex29.py rename to doc/examples/filters_ex29.py index e6b817a4c..5b2b9db2d 100644 --- a/doc/salome/examples/filters_ex29.py +++ b/doc/examples/filters_ex29.py @@ -1,8 +1,9 @@ # Belong to Cylinder # create mesh -from SMESH_mechanic import * +from mechanic import * + # get all faces which lie on the cylindrical face \a sub_face1 -filter = smesh.GetFilter(SMESH.FACE, SMESH.FT_BelongToCylinder, sub_face1) +filter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_BelongToCylinder, sub_face1) ids = mesh.GetIdsFromFilter(filter) print("Number of faces which lie on the cylindrical surface sub_face1:", len(ids)) diff --git a/doc/examples/filters_ex30.py b/doc/examples/filters_ex30.py new file mode 100644 index 000000000..b34bdadb0 --- /dev/null +++ b/doc/examples/filters_ex30.py @@ -0,0 +1,14 @@ +# Belong to Surface + +# create mesh +from mechanic import * + +# create b-spline +spline_1 = geom_builder.MakeInterpol([p4,p6,p3,p1]) +surface_1 = geom_builder.MakePrismVecH( spline_1, vz, 70.0 ) +geom_builder.addToStudy(surface_1, "surface_1") + +# get all nodes which lie on the surface \a surface_1 +filter = smesh_builder.GetFilter(SMESH.NODE, SMESH.FT_BelongToGenSurface, surface_1) +ids = mesh.GetIdsFromFilter(filter) +print("Number of nodes which lie on the surface surface_1:", len(ids)) diff --git a/doc/examples/filters_ex31.py b/doc/examples/filters_ex31.py new file mode 100644 index 000000000..5bbad4ec8 --- /dev/null +++ b/doc/examples/filters_ex31.py @@ -0,0 +1,13 @@ +# Range of IDs + +# create mesh +from mechanic import * + +# get nodes with identifiers [5-10] and [15-30] +criterion1 = smesh_builder.GetCriterion(SMESH.NODE, SMESH.FT_RangeOfIds, Threshold="5-10",\ + BinaryOp=SMESH.FT_LogicalOR) +criterion2 = smesh_builder.GetCriterion(SMESH.NODE, SMESH.FT_RangeOfIds, Threshold="15-30") +filter = smesh_builder.CreateFilterManager().CreateFilter() +filter.SetCriteria([criterion1,criterion2]) +ids = mesh.GetIdsFromFilter(filter) +print("Number of nodes in ranges [5-10] and [15-30]:", len(ids)) diff --git a/doc/salome/examples/filters_ex32.py b/doc/examples/filters_ex32.py similarity index 57% rename from doc/salome/examples/filters_ex32.py rename to doc/examples/filters_ex32.py index 5630f7812..f0e07815c 100644 --- a/doc/salome/examples/filters_ex32.py +++ b/doc/examples/filters_ex32.py @@ -1,10 +1,9 @@ # Badly oriented volume # create mesh with volumes -from SMESH_mechanic import * -mesh.Tetrahedron() -mesh.Compute() +from mechanic import * + # get all badly oriented volumes -filter = smesh.GetFilter(SMESH.VOLUME, SMESH.FT_BadOrientedVolume) +filter = smesh_builder.GetFilter(SMESH.VOLUME, SMESH.FT_BadOrientedVolume) ids = mesh.GetIdsFromFilter(filter) print("Number of badly oriented volumes:", len(ids)) diff --git a/doc/salome/examples/filters_ex33.py b/doc/examples/filters_ex33.py similarity index 74% rename from doc/salome/examples/filters_ex33.py rename to doc/examples/filters_ex33.py index 4e54e55a7..8d90a6533 100644 --- a/doc/salome/examples/filters_ex33.py +++ b/doc/examples/filters_ex33.py @@ -1,11 +1,11 @@ # Linear / quadratic # create mesh -from SMESH_mechanic import * +from mechanic import * # get linear and quadratic edges -filter_linear = smesh.GetFilter(SMESH.EDGE, SMESH.FT_LinearOrQuadratic) -filter_quadratic = smesh.GetFilter(SMESH.EDGE, SMESH.FT_LinearOrQuadratic, SMESH.FT_LogicalNOT) +filter_linear = smesh_builder.GetFilter(SMESH.EDGE, SMESH.FT_LinearOrQuadratic) +filter_quadratic = smesh_builder.GetFilter(SMESH.EDGE, SMESH.FT_LinearOrQuadratic, SMESH.FT_LogicalNOT) ids_linear = mesh.GetIdsFromFilter(filter_linear) ids_quadratic = mesh.GetIdsFromFilter(filter_quadratic) print("Number of linear edges:", len(ids_linear), "; number of quadratic edges:", len(ids_quadratic)) diff --git a/doc/salome/examples/filters_ex34.py b/doc/examples/filters_ex34.py similarity index 79% rename from doc/salome/examples/filters_ex34.py rename to doc/examples/filters_ex34.py index 9e29e97d3..5fcb89ae8 100644 --- a/doc/salome/examples/filters_ex34.py +++ b/doc/examples/filters_ex34.py @@ -1,7 +1,8 @@ # Group color # create mesh -from SMESH_mechanic import * +from mechanic import * + # create group of edges all_edges = mesh.GetElementsByType(SMESH.EDGE) grp = mesh.MakeGroupByIds("edges group", SMESH.EDGE, all_edges[:len(all_edges) // 4]) @@ -9,6 +10,6 @@ import SALOMEDS c = SALOMEDS.Color(0.1, 0.5, 1.0) grp.SetColor(c) # get number of the edges not belonging to the group with the given color -filter = smesh.GetFilter(SMESH.EDGE, SMESH.FT_GroupColor, c, SMESH.FT_LogicalNOT) +filter = smesh_builder.GetFilter(SMESH.EDGE, SMESH.FT_GroupColor, c, SMESH.FT_LogicalNOT) ids = mesh.GetIdsFromFilter(filter) print ("Number of edges not belonging to the group with color (0.1, 0.5, 1.0):", len(ids)) diff --git a/doc/salome/examples/filters_ex35.py b/doc/examples/filters_ex35.py similarity index 53% rename from doc/salome/examples/filters_ex35.py rename to doc/examples/filters_ex35.py index fea0902b9..a44fce582 100644 --- a/doc/salome/examples/filters_ex35.py +++ b/doc/examples/filters_ex35.py @@ -1,14 +1,13 @@ # Geometry type # create mesh with volumes -from SMESH_mechanic import * -mesh.Tetrahedron() -mesh.Compute() +from mechanic import * + # get all triangles, quadrangles, tetrahedrons, pyramids -filter_tri = smesh.GetFilter(SMESH.FACE, SMESH.FT_ElemGeomType, SMESH.Geom_TRIANGLE) -filter_qua = smesh.GetFilter(SMESH.FACE, SMESH.FT_ElemGeomType, SMESH.Geom_QUADRANGLE) -filter_tet = smesh.GetFilter(SMESH.VOLUME, SMESH.FT_ElemGeomType, SMESH.Geom_TETRA) -filter_pyr = smesh.GetFilter(SMESH.VOLUME, SMESH.FT_ElemGeomType, SMESH.Geom_PYRAMID) +filter_tri = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_ElemGeomType, SMESH.Geom_TRIANGLE) +filter_qua = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_ElemGeomType, SMESH.Geom_QUADRANGLE) +filter_tet = smesh_builder.GetFilter(SMESH.VOLUME, SMESH.FT_ElemGeomType, SMESH.Geom_TETRA) +filter_pyr = smesh_builder.GetFilter(SMESH.VOLUME, SMESH.FT_ElemGeomType, SMESH.Geom_PYRAMID) ids_tri = mesh.GetIdsFromFilter(filter_tri) ids_qua = mesh.GetIdsFromFilter(filter_qua) ids_tet = mesh.GetIdsFromFilter(filter_tet) diff --git a/doc/salome/examples/filters_ex36.py b/doc/examples/filters_ex36.py similarity index 50% rename from doc/salome/examples/filters_ex36.py rename to doc/examples/filters_ex36.py index ec1e2b4fb..ebf39f325 100644 --- a/doc/salome/examples/filters_ex36.py +++ b/doc/examples/filters_ex36.py @@ -1,14 +1,14 @@ # Combine several criteria into a filter # create mesh -from SMESH_mechanic import * +from mechanic import * # get all the quadrangle faces ... -criterion1 = smesh.GetCriterion(SMESH.FACE, SMESH.FT_ElemGeomType, SMESH.Geom_QUADRANGLE, SMESH.FT_LogicalAND) +criterion1 = smesh_builder.GetCriterion(SMESH.FACE, SMESH.FT_ElemGeomType, SMESH.Geom_QUADRANGLE, SMESH.FT_LogicalAND) # ... but those from sub_face3 -criterion2 = smesh.GetCriterion(SMESH.FACE, SMESH.FT_BelongToGeom, sub_face3, SMESH.FT_LogicalNOT) +criterion2 = smesh_builder.GetCriterion(SMESH.FACE, SMESH.FT_BelongToGeom, sub_face3, SMESH.FT_LogicalNOT) -quadFilter = smesh.GetFilterFromCriteria([criterion1,criterion2]) +quadFilter = smesh_builder.GetFilterFromCriteria([criterion1,criterion2]) # get faces satisfying the criteria ids = mesh.GetIdsFromFilter(quadFilter) diff --git a/doc/salome/examples/filters_ex37.py b/doc/examples/filters_ex37.py similarity index 64% rename from doc/salome/examples/filters_ex37.py rename to doc/examples/filters_ex37.py index 0f1a0a8ff..821e2418b 100644 --- a/doc/salome/examples/filters_ex37.py +++ b/doc/examples/filters_ex37.py @@ -1,15 +1,15 @@ # Entity type # create a mesh -from SMESH_mechanic import * +from mechanic import * # make the mesh quadratic mesh.ConvertToQuadratic() # make some elements bi-quadratic -for face in SubFaceL[: len(SubFaceL) // 2]: +for face in shape_faces[: len(shape_faces) // 2]: mesh.ConvertToQuadratic( theSubMesh=mesh.Group( face ), theToBiQuad=True ) # get triangles with 7 nodes -filter_tri = smesh.GetFilter(SMESH.FACE, SMESH.FT_EntityType,'=', SMESH.Entity_BiQuad_Triangle ) +filter_tri = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_EntityType,'=', SMESH.Entity_BiQuad_Triangle ) ids_tri = mesh.GetIdsFromFilter(filter_tri) print("Number of bi-quadratic triangles:", len(ids_tri)) diff --git a/doc/salome/examples/filters_ex38.py b/doc/examples/filters_ex38.py similarity index 74% rename from doc/salome/examples/filters_ex38.py rename to doc/examples/filters_ex38.py index 2193c6615..1aee7325e 100644 --- a/doc/salome/examples/filters_ex38.py +++ b/doc/examples/filters_ex38.py @@ -1,7 +1,7 @@ # Ball diameter # create a mesh -from SMESH_mechanic import * +from mechanic import * # create several balls with increasing diameter for i in range(1,10): @@ -10,6 +10,6 @@ for i in range(1,10): pass # get balls with diameter > 5. -diam_filter = smesh.GetFilter(SMESH.BALL, SMESH.FT_BallDiameter,'>', 5. ) +diam_filter = smesh_builder.GetFilter(SMESH.BALL, SMESH.FT_BallDiameter,'>', 5. ) ids = mesh.GetIdsFromFilter( diam_filter ) print("Number of balls with diameter > 5:", len(ids)) diff --git a/doc/salome/examples/filters_ex39.py b/doc/examples/filters_ex39.py similarity index 52% rename from doc/salome/examples/filters_ex39.py rename to doc/examples/filters_ex39.py index 52de1c3d7..b66a8d0b7 100644 --- a/doc/salome/examples/filters_ex39.py +++ b/doc/examples/filters_ex39.py @@ -1,24 +1,27 @@ # "Elements of a domain" filter and "Renumber" hypothesis -import salome, SMESH +import salome salome.salome_init_without_session() + +import SMESH from salome.geom import geomBuilder -geompy = geomBuilder.New() from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create two boxes to have two domains in the mesh -box1 = geompy.MakeBoxDXDYDZ( 100,100,100 ) -box2 = geompy.MakeTranslation( box1, 200, 0, 0 ) -boxes = geompy.MakeCompound( [box1, box2] ) -box1, box2 = geompy.SubShapeAll( boxes, geompy.ShapeType["SHAPE"], "box") +box1 = geom_builder.MakeBoxDXDYDZ( 100,100,100 ) +box2 = geom_builder.MakeTranslation( box1, 200, 0, 0 ) +boxes = geom_builder.MakeCompound( [box1, box2] ) +box1, box2 = geom_builder.SubShapeAll( boxes, geom_builder.ShapeType["SHAPE"], "box") -vertex = geompy.SubShape( box1, geompy.ShapeType["VERTEX"], [1] ) +vertex = geom_builder.SubShape( box1, geom_builder.ShapeType["VERTEX"], [1] ) # create a mesh -mesh = smesh.Mesh( boxes ) +mesh = smesh_builder.Mesh( boxes ) mesh.Segment(box1).NumberOfSegments( 5 ) # to have different nb of elements on the boxes mesh.Segment(box2).NumberOfSegments( 10 ) mesh.Quadrangle() @@ -27,8 +30,8 @@ ijkAlgo = mesh.Hexahedron() # Use Renumber hypothesis to get hexahedra and nodes numbered like in a structured mesh. # k axis of box1 will be ( 100,100,0 ) - ( 100,100,100 ) # k axis of box2 will be ( 0,0,0 ) - (0,0,100), by default -v000 = geompy.MakeVertex( 100,100,0, theName='v000' ) # can use box sub-vertex or standalone one -v001 = geompy.GetVertexNearPoint( box1, geompy.MakeVertex(100,100,100), theName='v001') +v000 = geom_builder.MakeVertex( 100,100,0, theName='v000' ) # can use box sub-vertex or standalone one +v001 = geom_builder.GetVertexNearPoint( box1, geom_builder.MakeVertex(100,100,100), theName='v001') ijkAlgo.Renumber([ smeshBuilder.BlockCS( box1, v000, v001 ) ]) mesh.Compute() @@ -36,18 +39,17 @@ mesh.Compute() # Create filters with FT_ConnectedElements criterion by pointing a domain in different ways: # using point coordinates in box_1 -nodeFilter = smesh.GetFilter( SMESH.NODE, SMESH.FT_ConnectedElements, "=", "1.,2,10", mesh=mesh ) +nodeFilter = smesh_builder.GetFilter( SMESH.NODE, SMESH.FT_ConnectedElements, "=", "1.,2,10", mesh=mesh ) print("Nb. nodes in box_1:", len( nodeFilter.GetIDs())) # using point coordinates in box_2 -edgeFilter = smesh.GetFilter( SMESH.EDGE, SMESH.FT_ConnectedElements, "=", [202,1,1 ], mesh=mesh ) +edgeFilter = smesh_builder.GetFilter( SMESH.EDGE, SMESH.FT_ConnectedElements, "=", [202,1,1 ], mesh=mesh ) print("Nb. segments in box_2:", len( edgeFilter.GetIDs())) # using a geom vertex of box_1 -faceFilter = smesh.GetFilter( SMESH.FACE, SMESH.FT_ConnectedElements, "=", vertex, mesh=mesh ) +faceFilter = smesh_builder.GetFilter( SMESH.FACE, SMESH.FT_ConnectedElements, "=", vertex, mesh=mesh ) print("Nb. faces in box_1:", len( edgeFilter.GetIDs())) # using node ID in box_2 -voluFilter = smesh.GetFilter( SMESH.VOLUME, SMESH.FT_ConnectedElements, "=", 10, mesh=mesh ) +voluFilter = smesh_builder.GetFilter( SMESH.VOLUME, SMESH.FT_ConnectedElements, "=", 10, mesh=mesh ) print("Nb. volumes in box_2:", len( voluFilter.GetIDs())) - diff --git a/doc/salome/examples/filters_node_nb_conn.py b/doc/examples/filters_node_nb_conn.py similarity index 65% rename from doc/salome/examples/filters_node_nb_conn.py rename to doc/examples/filters_node_nb_conn.py index dc7ce0ea1..052ff9dc8 100644 --- a/doc/salome/examples/filters_node_nb_conn.py +++ b/doc/examples/filters_node_nb_conn.py @@ -1,9 +1,9 @@ # Number of connectivities of a node # create a mesh -from SMESH_mechanic import * +from mechanic import * # get nodes connected to more than 6 tetrahedra -conn_nb_filter = smesh.GetFilter(SMESH.NODE, SMESH.FT_NodeConnectivityNumber,'>', 6 ) +conn_nb_filter = smesh_builder.GetFilter(SMESH.NODE, SMESH.FT_NodeConnectivityNumber,'>', 6 ) ids = mesh.GetIdsFromFilter( conn_nb_filter ) print("Number of nodes connected to more than 6 tetrahedra:", len(ids)) diff --git a/doc/examples/generate_flat_elements.py b/doc/examples/generate_flat_elements.py new file mode 100644 index 000000000..b17c55f91 --- /dev/null +++ b/doc/examples/generate_flat_elements.py @@ -0,0 +1,64 @@ +# Double nodes on groups boundaries + +# This example represents an iron cable (a thin cylinder) in a concrete block (a big cylinder). +# The big cylinder is defined by two geometric volumes. + +import salome +salome.salome_init_without_session() + +import GEOM +import SMESH +from salome.geom import geomBuilder +from salome.smesh import smeshBuilder + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() + +# geometry + +O = geom_builder.MakeVertex(0, 0, 0) +OX = geom_builder.MakeVectorDXDYDZ(1, 0, 0) +OY = geom_builder.MakeVectorDXDYDZ(0, 1, 0) +OZ = geom_builder.MakeVectorDXDYDZ(0, 0, 1) +Vertex_1 = geom_builder.MakeVertex(50, 0, 0) +Cylinder_1 = geom_builder.MakeCylinder(O, OX, 10, 500) +Cylinder_2 = geom_builder.MakeCylinder(Vertex_1, OX, 100, 400) +Vertex_2 = geom_builder.MakeVertex(-200, -200, -200) +Vertex_3 = geom_builder.MakeVertex(250, 200, 200) +Box_1 = geom_builder.MakeBoxTwoPnt(Vertex_2, Vertex_3) +Fuse_1 = geom_builder.MakeFuse(Cylinder_1, Cylinder_2) +Partition_1 = geom_builder.MakePartition([Fuse_1], [Cylinder_1, Box_1], [], [], geom_builder.ShapeType["SOLID"], 0, [], 0) +[Solid_1,Solid_2] = geom_builder.GetShapesOnShape(Cylinder_1, Partition_1, geom_builder.ShapeType["SOLID"], GEOM.ST_IN) +[Solid_3,Solid_4] = geom_builder.GetShapesOnShape(Cylinder_2, Partition_1, geom_builder.ShapeType["SOLID"], GEOM.ST_IN) +Vertex_4 = geom_builder.MakeVertex(450, 0, 0) +Vertex_5 = geom_builder.MakeVertex(500, 0, 0) +Vertex_6 = geom_builder.MakeVertex(550, 0, 0) +vec1 = geom_builder.MakeVector(Vertex_4, Vertex_5) +vec2 = geom_builder.MakeVector(Vertex_5, Vertex_6) +[Face_1] = geom_builder.GetShapesOnPlane(Partition_1, geom_builder.ShapeType["FACE"], vec1, GEOM.ST_ON) +[Face_2] = geom_builder.GetShapesOnPlane(Partition_1, geom_builder.ShapeType["FACE"], vec2, GEOM.ST_ON) + +# meshing (we have linear tetrahedrons here, but other elements are OK) + +Mesh_1 = smesh_builder.Mesh(Partition_1) +Regular_1D = Mesh_1.Segment() +Nb_Segments_1 = Regular_1D.NumberOfSegments(15) +MEFISTO_2D = Mesh_1.Triangle(algo=smeshBuilder.MEFISTO) +Length_From_Edges_2D = MEFISTO_2D.LengthFromEdges() +ALGO3D = Mesh_1.Tetrahedron() +isDone = Mesh_1.Compute() + +# relevant groups of volumes and faces + +Solid_1_1 = Mesh_1.GroupOnGeom(Solid_1,'Solid_1',SMESH.VOLUME) +Solid_2_1 = Mesh_1.GroupOnGeom(Solid_2,'Solid_2',SMESH.VOLUME) +Solid_3_1 = Mesh_1.GroupOnGeom(Solid_3,'Solid_3',SMESH.VOLUME) +Solid_4_1 = Mesh_1.GroupOnGeom(Solid_4,'Solid_4',SMESH.VOLUME) +Face_1_1 = Mesh_1.GroupOnGeom(Face_1,'Face_1',SMESH.FACE) +Face_2_1 = Mesh_1.GroupOnGeom(Face_2,'Face_2',SMESH.FACE) + +# Building of flat elements + +Mesh_1.DoubleNodesOnGroupBoundaries([Solid_1_1, Solid_2_1, Solid_3_1, Solid_4_1], 1) + +Mesh_1.CreateFlatElementsOnFacesGroups([Face_1_1, Face_2_1]) diff --git a/doc/salome/examples/grouping_elements_ex01.py b/doc/examples/grouping_elements_ex01.py similarity index 88% rename from doc/salome/examples/grouping_elements_ex01.py rename to doc/examples/grouping_elements_ex01.py index c35de336b..e76dbdedf 100644 --- a/doc/salome/examples/grouping_elements_ex01.py +++ b/doc/examples/grouping_elements_ex01.py @@ -1,14 +1,9 @@ # Create a Standalone Group -import SMESH_mechanic -import SMESH - -smesh = SMESH_mechanic.smesh -mesh = SMESH_mechanic.mesh -salome = SMESH_mechanic.salome +from mechanic import * # Get ids of all faces with area > 100 -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, 100.) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, 100.) anIds = mesh.GetIdsFromFilter(aFilter) @@ -73,8 +68,3 @@ aGroup.AddFrom( aGroup2 ) # removes entities aGroup.Remove( [2,3,4] ) - - - - -salome.sg.updateObjBrowser() diff --git a/doc/examples/grouping_elements_ex02.py b/doc/examples/grouping_elements_ex02.py new file mode 100644 index 000000000..e3ddd4e22 --- /dev/null +++ b/doc/examples/grouping_elements_ex02.py @@ -0,0 +1,42 @@ +# Create a Group on Geometry + +import salome +salome.salome_init_without_session() + +from salome.geom import geomBuilder +from salome.smesh import smeshBuilder + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() + +# create a box +box = geom_builder.MakeBox(0., 0., 0., 100., 100., 100.) +geom_builder.addToStudy(box, "box") + +# add the first face of the box to the study +subShapeList = geom_builder.SubShapeAll(box, geom_builder.ShapeType["FACE"]) +face = subShapeList[0] +geom_builder.addToStudyInFather(box, face, "face 1") + +# create group of edges on the face +aGeomGroupE = geom_builder.CreateGroup(face, geom_builder.ShapeType["EDGE"]) +geom_builder.AddObject(aGeomGroupE, 3) +geom_builder.AddObject(aGeomGroupE, 6) +geom_builder.AddObject(aGeomGroupE, 8) +geom_builder.AddObject(aGeomGroupE, 10) +geom_builder.addToStudyInFather(face, aGeomGroupE, "Group of Edges") + +# create quadrangle 2D mesh on the box +quadra = smesh_builder.Mesh(box, "Box : quadrangle 2D mesh") +algo1D = quadra.Segment() +quadra.Quadrangle() +algo1D.NumberOfSegments(7) + +# compute the mesh +quadra.Compute() + +# create SMESH group on the face with name "SMESHGroup1" +aSmeshGroup1 = quadra.GroupOnGeom(face, "SMESHGroup1") + +# create SMESH group on with default name +aSmeshGroup2 = quadra.GroupOnGeom(aGeomGroupE) diff --git a/doc/salome/examples/grouping_elements_ex03.py b/doc/examples/grouping_elements_ex03.py similarity index 64% rename from doc/salome/examples/grouping_elements_ex03.py rename to doc/examples/grouping_elements_ex03.py index d6d6e83d9..2de59d734 100644 --- a/doc/salome/examples/grouping_elements_ex03.py +++ b/doc/examples/grouping_elements_ex03.py @@ -1,32 +1,29 @@ # Create a Group on Filter - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -import salome_notebook +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() -box = geompy.MakeBoxDXDYDZ(10,10,10) +box = geom_builder.MakeBoxDXDYDZ(10,10,10) # make a mesh with quadrangles of different area in range [1,16] -mesh = smesh.Mesh(box,"Quad mesh") +mesh = smesh_builder.Mesh(box,"Quad mesh") hyp1D = mesh.Segment().StartEndLength( 1, 4 ) mesh.Quadrangle() mesh.Compute() # create a group on filter selecting faces of medium size critaria = [ \ - smesh.GetCriterion(SMESH.FACE, SMESH.FT_Area, ">", 1.1, BinaryOp=SMESH.FT_LogicalAND ), - smesh.GetCriterion(SMESH.FACE, SMESH.FT_Area, "<", 15.0 ) + smesh_builder.GetCriterion(SMESH.FACE, SMESH.FT_Area, ">", 1.1, BinaryOp=SMESH.FT_LogicalAND ), + smesh_builder.GetCriterion(SMESH.FACE, SMESH.FT_Area, "<", 15.0 ) ] -filt = smesh.GetFilterFromCriteria( critaria ) +filt = smesh_builder.GetFilterFromCriteria( critaria ) filtGroup = mesh.GroupOnFilter( SMESH.FACE, "group on filter", filt ) print("Group on filter contains %s elements" % filtGroup.Size()) @@ -37,13 +34,11 @@ mesh.Compute() print("After mesh change, group on filter contains %s elements" % filtGroup.Size()) # set a new filter defining the group -filt2 = smesh.GetFilter( SMESH.FACE, SMESH.FT_RangeOfIds, "1-50" ) +filt2 = smesh_builder.GetFilter( SMESH.FACE, SMESH.FT_RangeOfIds, "1-50" ) filtGroup.SetFilter( filt2 ) print("With a new filter, group on filter contains %s elements" % filtGroup.Size()) # group is updated at modification of the filter -filt2.SetCriteria( [ smesh.GetCriterion( SMESH.FACE, SMESH.FT_RangeOfIds, "1-70" )]) +filt2.SetCriteria( [ smesh_builder.GetCriterion( SMESH.FACE, SMESH.FT_RangeOfIds, "1-70" )]) filtIDs3 = filtGroup.GetIDs() print("After filter modification, group on filter contains %s elements" % filtGroup.Size()) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/grouping_elements_ex04.py b/doc/examples/grouping_elements_ex04.py similarity index 72% rename from doc/salome/examples/grouping_elements_ex04.py rename to doc/examples/grouping_elements_ex04.py index e0e58acc9..d3b88c13b 100644 --- a/doc/salome/examples/grouping_elements_ex04.py +++ b/doc/examples/grouping_elements_ex04.py @@ -1,14 +1,9 @@ # Edit a Group -import SMESH_mechanic -import SMESH - -smesh = SMESH_mechanic.smesh -mesh = SMESH_mechanic.mesh -salome = SMESH_mechanic.salome +from mechanic import * # Get ids of all faces with area > 35 -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, 35.) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, 35.) anIds = mesh.GetIdsFromFilter(aFilter) @@ -19,7 +14,7 @@ aGroup = mesh.CreateEmptyGroup(SMESH.FACE, "Area > 35") aGroup.Add(anIds) # Get ids of all faces with area > 40 -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, 40.) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, 40.) anIds = mesh.GetIdsFromFilter(aFilter) @@ -41,5 +36,3 @@ for i in range(len(aGroupElemIDs)): j = j + 1 pass print("") - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/grouping_elements_ex05.py b/doc/examples/grouping_elements_ex05.py similarity index 76% rename from doc/salome/examples/grouping_elements_ex05.py rename to doc/examples/grouping_elements_ex05.py index 96aa7fa56..a1ef0a55d 100644 --- a/doc/salome/examples/grouping_elements_ex05.py +++ b/doc/examples/grouping_elements_ex05.py @@ -1,14 +1,10 @@ # Union of groups -import SMESH_mechanic -import SMESH, SALOMEDS - -smesh = SMESH_mechanic.smesh -mesh = SMESH_mechanic.mesh -salome = SMESH_mechanic.salome +from mechanic import * +import SALOMEDS # Criterion : AREA > 20 -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, 20.) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, 20.) anIds = mesh.GetIdsFromFilter(aFilter) @@ -19,7 +15,7 @@ aGroup1 = mesh.CreateEmptyGroup(SMESH.FACE, "Area > 20") aGroup1.Add(anIds) # Criterion : AREA = 20 -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_EqualTo, 20.) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_EqualTo, 20.) anIds = mesh.GetIdsFromFilter(aFilter) @@ -37,7 +33,7 @@ print("Criterion: Area >= 20, Nb = ", len(aGroup3.GetListOfID())) # Please note that also there is UnionGroups() method which works with two groups only # Criterion : AREA < 20 -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_LessThan, 20.) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_LessThan, 20.) anIds = mesh.GetIdsFromFilter(aFilter) @@ -51,5 +47,3 @@ aGroup4.SetColor( SALOMEDS.Color(1.,0.,0.)); # create union group : area >= 20 and area < 20 aGroup5 = mesh.UnionListOfGroups([aGroup3, aGroup4], "Any Area") print("Criterion: Any Area, Nb = ", len(aGroup5.GetListOfID())) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/grouping_elements_ex06.py b/doc/examples/grouping_elements_ex06.py similarity index 72% rename from doc/salome/examples/grouping_elements_ex06.py rename to doc/examples/grouping_elements_ex06.py index 9423cf7d4..e6bbd495c 100644 --- a/doc/salome/examples/grouping_elements_ex06.py +++ b/doc/examples/grouping_elements_ex06.py @@ -1,14 +1,9 @@ # Intersection of groups -import SMESH_mechanic -import SMESH - -smesh = SMESH_mechanic.smesh -mesh = SMESH_mechanic.mesh -salome = SMESH_mechanic.salome +from mechanic import * # Criterion : AREA > 20 -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, 20.) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, 20.) anIds = mesh.GetIdsFromFilter(aFilter) @@ -19,7 +14,7 @@ aGroup1 = mesh.CreateEmptyGroup(SMESH.FACE, "Area > 20") aGroup1.Add(anIds) # Criterion : AREA < 60 -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_LessThan, 60.) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_LessThan, 60.) anIds = mesh.GetIdsFromFilter(aFilter) @@ -34,4 +29,3 @@ aGroup3 = mesh.IntersectListOfGroups([aGroup1, aGroup2], "20 < Area < 60") print("Criterion: 20 < Area < 60, Nb = ", len(aGroup3.GetListOfID())) # Please note that also there is IntersectGroups() method which works with two groups only -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/grouping_elements_ex07.py b/doc/examples/grouping_elements_ex07.py similarity index 71% rename from doc/salome/examples/grouping_elements_ex07.py rename to doc/examples/grouping_elements_ex07.py index 800e8e80a..98108fdc3 100644 --- a/doc/salome/examples/grouping_elements_ex07.py +++ b/doc/examples/grouping_elements_ex07.py @@ -1,14 +1,9 @@ # Cut of groups -import SMESH_mechanic -import SMESH - -smesh = SMESH_mechanic.smesh -mesh = SMESH_mechanic.mesh -salome = SMESH_mechanic.salome +from mechanic import * # Criterion : AREA > 20 -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, 20.) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, 20.) anIds = mesh.GetIdsFromFilter(aFilter) @@ -18,7 +13,7 @@ print("Criterion: Area > 20, Nb = ", len(anIds)) aGroupMain = mesh.MakeGroupByIds("Area > 20", SMESH.FACE, anIds) # Criterion : AREA < 60 -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_LessThan, 60.) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_LessThan, 60.) anIds = mesh.GetIdsFromFilter(aFilter) @@ -31,5 +26,3 @@ aGroupTool = mesh.MakeGroupByIds("Area < 60", SMESH.FACE, anIds) aGroupRes = mesh.CutGroups(aGroupMain, aGroupTool, "Area >= 60") print("Criterion: Area >= 60, Nb = ", len(aGroupRes.GetListOfID())) # Please note that also there is CutListOfGroups() method which works with lists of groups of any lengths - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/grouping_elements_ex08.py b/doc/examples/grouping_elements_ex08.py similarity index 71% rename from doc/salome/examples/grouping_elements_ex08.py rename to doc/examples/grouping_elements_ex08.py index 76dc93fcc..244e8c73c 100644 --- a/doc/salome/examples/grouping_elements_ex08.py +++ b/doc/examples/grouping_elements_ex08.py @@ -1,14 +1,10 @@ # Creating groups of entities basing on nodes of other groups -import SMESH_mechanic -import SMESH, SALOMEDS - -smesh = SMESH_mechanic.smesh -mesh = SMESH_mechanic.mesh -salome = SMESH_mechanic.salome +from mechanic import * +import SALOMEDS # Criterion : AREA > 100 -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, 100.) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, 100.) # create a group by adding elements with area > 100 aSrcGroup1 = mesh.GroupOnFilter(SMESH.FACE, "Area > 100", aFilter) @@ -16,7 +12,7 @@ aSrcGroup1.SetColor( SALOMEDS.Color(1.,1.,0.)) print("Criterion: Area > 100, Nb = ", aSrcGroup1.Size()) # Criterion : AREA < 30 -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_LessThan, 30.) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_LessThan, 30.) # create a group by adding elements with area < 30 aSrcGroup2 = mesh.GroupOnFilter(SMESH.FACE, "Area < 30", aFilter) @@ -29,5 +25,3 @@ aGrp = mesh.CreateDimGroup( [aSrcGroup1, aSrcGroup2], SMESH.EDGE, "Edges" ) # Create group of nodes using source groups of faces aGrp = mesh.CreateDimGroup( [aSrcGroup1, aSrcGroup2], SMESH.NODE, "Nodes" ) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/grouping_elements_ex09.py b/doc/examples/grouping_elements_ex09.py similarity index 66% rename from doc/salome/examples/grouping_elements_ex09.py rename to doc/examples/grouping_elements_ex09.py index 988dad3cf..e46dedabc 100644 --- a/doc/salome/examples/grouping_elements_ex09.py +++ b/doc/examples/grouping_elements_ex09.py @@ -2,14 +2,16 @@ import salome salome.salome_init_without_session() + from salome.geom import geomBuilder from salome.smesh import smeshBuilder -geompy = geomBuilder.New() -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create a mesh on a box -box = geompy.MakeBoxDXDYDZ( 10,10,10, theName="Box" ) -mesh = smesh.Mesh(box,"Mesh") +box = geom_builder.MakeBoxDXDYDZ( 10,10,10, theName="Box" ) +mesh = smesh_builder.Mesh(box,"Mesh") mesh.AutomaticHexahedralization() # create groups of faces of each side of the box diff --git a/doc/examples/measurements_ex01.py b/doc/examples/measurements_ex01.py new file mode 100644 index 000000000..a0c9991a8 --- /dev/null +++ b/doc/examples/measurements_ex01.py @@ -0,0 +1,70 @@ +# Minimum Distance + +import salome +salome.salome_init_without_session() + +from salome.geom import geomBuilder +from salome.smesh import smeshBuilder + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() + +# create and mesh two boxes + +p1 = geom_builder.MakeVertex(10.0, 10.0, 10.0) +p2 = geom_builder.MakeVertex(20.0, 20.0, 20.0) +p3 = geom_builder.MakeVertex(30.0, 40.0, 50.0) +p4 = geom_builder.MakeVertex(70.0, 100.0, 200.0) + +box1 = geom_builder.MakeBoxTwoPnt(p1, p2) +box2 = geom_builder.MakeBoxTwoPnt(p3, p4) + +mesh1 = smesh_builder.Mesh(box1, 'box1') +mesh1.Segment().NumberOfSegments(2) +mesh1.Triangle().MaxElementArea(10) + +mesh2 = smesh_builder.Mesh(box2, 'box2') +mesh2.Segment().NumberOfSegments(5) +mesh2.Triangle().MaxElementArea(20) + +mesh1.Compute() +mesh2.Compute() + +# compute min distance from grp1 to the origin (not available yet) +smesh_builder.MinDistance(mesh1) + +# compute min distance from node 10 of mesh1 to the origin +smesh_builder.MinDistance(mesh1, id1=10) +# ... or +mesh1.MinDistance(10) + +# compute min distance between nodes 10 and 20 of mesh1 +smesh_builder.MinDistance(mesh1, id1=10, id2=20) +# ... or +mesh1.MinDistance(10, 20) + +# compute min distance from element 100 of mesh1 to the origin (not available yet) +smesh_builder.MinDistance(mesh1, id1=100, isElem1=True) +# ... or +mesh1.MinDistance(100, isElem1=True) + +# compute min distance between elements 100 and 200 of mesh1 (not available yet) +smesh_builder.MinDistance(mesh1, id1=100, id2=200, isElem1=True, isElem2=True) +# ... or +mesh1.MinDistance(100, 200, True, True) + +# compute min distance from element 100 to node 20 of mesh1 (not available yet) +smesh_builder.MinDistance(mesh1, id1=100, id2=20, isElem1=True) +# ... or +mesh1.MinDistance(100, 20, True) + +# compute min distance from mesh1 to mesh2 (not available yet) +smesh_builder.MinDistance(mesh1, mesh2) + +# compute min distance from node 10 of mesh1 to node 20 of mesh2 +smesh_builder.MinDistance(mesh1, mesh2, 10, 20) + +# compute min distance from node 10 of mesh1 to element 200 of mesh2 (not available yet) +smesh_builder.MinDistance(mesh1, mesh2, 10, 200, isElem2=True) + +# etc... diff --git a/doc/examples/measurements_ex02.py b/doc/examples/measurements_ex02.py new file mode 100644 index 000000000..33bffbaea --- /dev/null +++ b/doc/examples/measurements_ex02.py @@ -0,0 +1,45 @@ +# Bounding Box + +import salome +salome.salome_init_without_session() + +from salome.geom import geomBuilder +from salome.smesh import smeshBuilder + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() + +# create and mesh two boxes + +p1 = geom_builder.MakeVertex(10.0, 10.0, 10.0) +p2 = geom_builder.MakeVertex(20.0, 20.0, 20.0) +p3 = geom_builder.MakeVertex(30.0, 40.0, 50.0) +p4 = geom_builder.MakeVertex(70.0, 100.0, 200.0) + +box1 = geom_builder.MakeBoxTwoPnt(p1, p2) +box2 = geom_builder.MakeBoxTwoPnt(p3, p4) + +mesh1 = smesh_builder.Mesh(box1, 'box1') +mesh1.Segment().NumberOfSegments(2) +mesh1.Triangle().MaxElementArea(10) + +mesh2 = smesh_builder.Mesh(box2, 'box2') +mesh2.Segment().NumberOfSegments(5) +mesh2.Triangle().MaxElementArea(20) + +mesh1.Compute() +mesh2.Compute() + +# compute bounding box for mesh1 +mesh1.BoundingBox() + +# compute bounding box for list of nodes of mesh2 +mesh2.BoundingBox([363, 364, 370, 371, 372, 373, 379, 380, 381]) + +# compute bounding box for list of elements of mesh2 +mesh2.BoundingBox([363, 364, 370, 371, 372, 373, 379, 380, 381], isElem=True) + +# compute common bounding box of mesh1 and mesh2 +smesh_builder.BoundingBox([mesh1, mesh2]) + +# etc... diff --git a/doc/salome/examples/measurements_ex03.py b/doc/examples/measurements_ex03.py similarity index 66% rename from doc/salome/examples/measurements_ex03.py rename to doc/examples/measurements_ex03.py index 217d9cb23..44d2f6e71 100644 --- a/doc/salome/examples/measurements_ex03.py +++ b/doc/examples/measurements_ex03.py @@ -1,22 +1,20 @@ # Basic Properties - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create a box -box = geompy.MakeBoxDXDYDZ(100,100,100) -face = geompy.SubShapeAllSorted(box, geompy.ShapeType['FACE'])[0] +box = geom_builder.MakeBoxDXDYDZ(100,100,100) +face = geom_builder.SubShapeAllSorted(box, geom_builder.ShapeType['FACE'])[0] # mesh a box -mesh = smesh.Mesh(box) +mesh = smesh_builder.Mesh(box) submesh_1d = mesh.Segment().NumberOfSegments(5) submesh_2d = mesh.Quadrangle() submesh_3d = mesh.Hexahedron() @@ -31,7 +29,7 @@ group_2d = mesh.Group(face) print("Get basic properties: approach 1 (via measurements tool) ----") -measure = smesh.CreateMeasurements() +measure = smesh_builder.CreateMeasurements() print("* for mesh:") print(" length:", measure.Length(mesh.mesh)) @@ -53,19 +51,19 @@ measure.UnRegister() print("Get basic properties: approach 2 (via smeshBuilder) ----") print("* for mesh:") -print(" length:", smesh.GetLength(mesh)) -print(" area:", smesh.GetArea(mesh)) -print(" volume:", smesh.GetVolume(mesh)) +print(" length:", smesh_builder.GetLength(mesh)) +print(" area:", smesh_builder.GetArea(mesh)) +print(" volume:", smesh_builder.GetVolume(mesh)) print("* for group (2d):") -print(" length:", smesh.GetLength(group_2d)) -print(" area:", smesh.GetArea(group_2d)) -print(" volume:", smesh.GetVolume(group_2d)) +print(" length:", smesh_builder.GetLength(group_2d)) +print(" area:", smesh_builder.GetArea(group_2d)) +print(" volume:", smesh_builder.GetVolume(group_2d)) print("* for submesh (2d):") -print(" length:", smesh.GetLength(submesh_2d_face)) -print(" area:", smesh.GetArea(submesh_2d_face)) -print(" volume:", smesh.GetVolume(submesh_2d_face)) +print(" length:", smesh_builder.GetLength(submesh_2d_face)) +print(" area:", smesh_builder.GetArea(submesh_2d_face)) +print(" volume:", smesh_builder.GetVolume(submesh_2d_face)) print("Get basic properties: approach 3 (via smeshBuilder.Mesh) ----") diff --git a/doc/salome/examples/measurements_ex04.py b/doc/examples/measurements_ex04.py similarity index 80% rename from doc/salome/examples/measurements_ex04.py rename to doc/examples/measurements_ex04.py index b143267ba..ab66d2cc0 100644 --- a/doc/salome/examples/measurements_ex04.py +++ b/doc/examples/measurements_ex04.py @@ -1,10 +1,11 @@ # Angle measurement - import salome salome.salome_init_without_session() + from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +smesh_builder = smeshBuilder.New() # use smeshBuilder.GetAngle() to compute angle between 3 arbitrary points @@ -12,15 +13,14 @@ p0 = [1,0,0] p1 = [0,0,0] p2 = [0,1,0] -a1 = smesh.GetAngle(p0, p1, p2) +a1 = smesh_builder.GetAngle(p0, p1, p2) print("Right angle measure", a1 ) # use Mesh.GetAngle() to compute angle between 3 nodes of a mesh -mesh = smesh.Mesh() +mesh = smesh_builder.Mesh() n0 = mesh.AddNode( *p0 ) n1 = mesh.AddNode( *p1 ) n2 = mesh.AddNode( *p2 ) a2 = mesh.GetAngle( n0,n1,n2 ) - diff --git a/doc/examples/mechanic.py b/doc/examples/mechanic.py new file mode 100644 index 000000000..902ce7184 --- /dev/null +++ b/doc/examples/mechanic.py @@ -0,0 +1,86 @@ +# Inspired by SMESH_mechanic.py. +# Creates geometry and a mesh to be used in other examples +# -------------------------------------------------------- + +import salome +salome.salome_init_without_session() + +import SMESH +from salome.geom import geomBuilder +from salome.smesh import smeshBuilder + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() + +# Geometry +# -------- + +# create planar face on a wire combined from a segment and three arcs + +p1 = geom_builder.MakeVertex(100.0, 0.0, 0.0) +p2 = geom_builder.MakeVertex(50.0, 50.0, 0.0) +p3 = geom_builder.MakeVertex(100.0, 100.0, 0.0) +arc1 = geom_builder.MakeArc(p1, p2, p3) + +p4 = geom_builder.MakeVertex(170.0, 100.0, 0.0) +seg1 = geom_builder.MakeVector(p3, p4) + +p5 = geom_builder.MakeVertex(200.0, 70.0, 0.0) +p6 = geom_builder.MakeVertex(170.0, 40.0, 0.0) +arc2 = geom_builder.MakeArc(p4, p5, p6) + +p7 = geom_builder.MakeVertex(120.0, 30.0, 0.0) +arc3 = geom_builder.MakeArc(p6, p7, p1) + +wire1 = geom_builder.MakeWire([arc1, seg1, arc2, arc3]) +face1 = geom_builder.MakeFace(wire1, True) + +# create main shape by extruding just created planar face + +pO = geom_builder.MakeVertex(0.0, 0.0, 0.0) +pz = geom_builder.MakeVertex(0.0, 0.0, 100.0) +vz = geom_builder.MakeVector(pO, pz) +prism1 = geom_builder.MakePrismVecH(face1, vz, 100.0) + +# create two cylinders + +pc1 = geom_builder.MakeVertex(90.0, 50.0, -40.0) +pc2 = geom_builder.MakeVertex(170.0, 70.0, -40.0) + +cyl1 = geom_builder.MakeCylinder(pc1, vz, 20.0, 180.0) +cyl2 = geom_builder.MakeCylinder(pc2, vz, 20.0, 180.0) + +# create final shape by cutting one cylinder and fusing with another + +shape = geom_builder.MakeBoolean(prism1, cyl1, 2) +mechanic = geom_builder.MakeBoolean(shape, cyl2, 3) + +# get all faces from shape and keep sub of them into variables for future processing + +shape_faces = geom_builder.SubShapeAllSorted(mechanic, geom_builder.ShapeType["FACE"]) + +sub_face1 = shape_faces[0] +sub_face2 = shape_faces[4] +sub_face3 = shape_faces[5] +sub_face4 = shape_faces[10] + +# Mesh +# ---- + +# create tria+tetra mesh from mechanic shape + +mesh = smesh_builder.Mesh(mechanic, "mechanic") +mesh.Segment().NumberOfSegments(10) +mesh.Triangle().MaxElementArea(25) +mesh.Tetrahedron() + +# create quad sub-meshes on faces sub_face1 - sub_face4 + +mesh.Quadrangle(sub_face1) +mesh.Quadrangle(sub_face2) +mesh.Quadrangle(sub_face3) +mesh.Quadrangle(sub_face4) + +# finally compute whole mesh + +mesh.Compute() diff --git a/doc/salome/examples/3dmesh.py b/doc/examples/mesh_3d.py similarity index 68% rename from doc/salome/examples/3dmesh.py rename to doc/examples/mesh_3d.py index 0fdfcb68d..69bd3f0e1 100644 --- a/doc/salome/examples/3dmesh.py +++ b/doc/examples/mesh_3d.py @@ -2,12 +2,13 @@ import salome salome.salome_init_without_session() -from salome.geom import geomBuilder -geompy = geomBuilder.New() import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() ### # Geometry: an assembly of a box, a cylinder and a truncated cone @@ -24,40 +25,40 @@ radius_2 = 40 height = 100 # Build a box -box = geompy.MakeBox(-cote, -cote, -cote, +cote, +cote, +cote) +box = geom_builder.MakeBox(-cote, -cote, -cote, +cote, +cote, +cote) # Build a cylinder -pt1 = geompy.MakeVertex(0, 0, cote/3) -di1 = geompy.MakeVectorDXDYDZ(0, 0, 1) -cyl = geompy.MakeCylinder(pt1, di1, section, size) +pt1 = geom_builder.MakeVertex(0, 0, cote/3) +di1 = geom_builder.MakeVectorDXDYDZ(0, 0, 1) +cyl = geom_builder.MakeCylinder(pt1, di1, section, size) # Build a truncated cone -pt2 = geompy.MakeVertex(0, 0, size) -cone = geompy.MakeCone(pt2, di1, radius_1, radius_2, height) +pt2 = geom_builder.MakeVertex(0, 0, size) +cone = geom_builder.MakeCone(pt2, di1, radius_1, radius_2, height) # Fuse -box_cyl = geompy.MakeFuse(box, cyl) -piece = geompy.MakeFuse(box_cyl, cone) +box_cyl = geom_builder.MakeFuse(box, cyl) +piece = geom_builder.MakeFuse(box_cyl, cone) # Add to the study -geompy.addToStudy(piece, name) +geom_builder.addToStudy(piece, name) # Create a group of faces -faces_group = geompy.CreateGroup(piece, geompy.ShapeType["FACE"]) +faces_group = geom_builder.CreateGroup(piece, geom_builder.ShapeType["FACE"]) group_name = name + "_grp" -geompy.addToStudy(faces_group, group_name) +geom_builder.addToStudy(faces_group, group_name) faces_group.SetName(group_name) # Add faces to the group -faces = geompy.SubShapeAllIDs(piece, geompy.ShapeType["FACE"]) -geompy.UnionIDs(faces_group, faces) +faces = geom_builder.SubShapeAllIDs(piece, geom_builder.ShapeType["FACE"]) +geom_builder.UnionIDs(faces_group, faces) ### # Create a mesh ### # Define a mesh on a geometry -tetra = smesh.Mesh(piece, name) +tetra = smesh_builder.Mesh(piece, name) # Define 1D algorithm and hypothesis algo1d = tetra.Segment() @@ -101,4 +102,3 @@ for group in tetra.GetGroups(): name = group.GetName() eType = group.GetType() groupStr += "'%s' %s: %s \n" % ( name, eType, ids ) - diff --git a/doc/salome/examples/modifying_meshes_cut_triangles.py b/doc/examples/modifying_meshes_cut_triangles.py similarity index 95% rename from doc/salome/examples/modifying_meshes_cut_triangles.py rename to doc/examples/modifying_meshes_cut_triangles.py index 250b55952..f45cc190c 100644 --- a/doc/salome/examples/modifying_meshes_cut_triangles.py +++ b/doc/examples/modifying_meshes_cut_triangles.py @@ -2,11 +2,13 @@ import salome salome.salome_init_without_session() + from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +smesh_builder = smeshBuilder.New() # create 3 triangles and 1 segment all sharing edge 1-2 -mesh = smesh.Mesh() +mesh = smesh_builder.Mesh() n1 = mesh.AddNode( 0, 0, 0) n2 = mesh.AddNode( 0, 0, -10) n3 = mesh.AddNode( 10, 0, 0) diff --git a/doc/salome/examples/modifying_meshes_ex01.py b/doc/examples/modifying_meshes_ex01.py similarity index 80% rename from doc/salome/examples/modifying_meshes_ex01.py rename to doc/examples/modifying_meshes_ex01.py index 2214610cb..ceeb3c02d 100644 --- a/doc/salome/examples/modifying_meshes_ex01.py +++ b/doc/examples/modifying_meshes_ex01.py @@ -4,10 +4,9 @@ import salome salome.salome_init_without_session() from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() +smesh_builder = smeshBuilder.New() - -mesh = smesh.Mesh() +mesh = smesh_builder.Mesh() # add node new_id = mesh.AddNode(50, 10, 0) diff --git a/doc/salome/examples/modifying_meshes_ex02.py b/doc/examples/modifying_meshes_ex02.py similarity index 84% rename from doc/salome/examples/modifying_meshes_ex02.py rename to doc/examples/modifying_meshes_ex02.py index 7b0b9f348..1f1aeca3d 100644 --- a/doc/salome/examples/modifying_meshes_ex02.py +++ b/doc/examples/modifying_meshes_ex02.py @@ -4,10 +4,9 @@ import salome salome.salome_init_without_session() from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() +smesh_builder = smeshBuilder.New() - -mesh = smesh.Mesh() +mesh = smesh_builder.Mesh() # add node node_id = mesh.AddNode(50, 10, 0) diff --git a/doc/salome/examples/modifying_meshes_ex03.py b/doc/examples/modifying_meshes_ex03.py similarity index 70% rename from doc/salome/examples/modifying_meshes_ex03.py rename to doc/examples/modifying_meshes_ex03.py index 59198ccd6..d5a524904 100644 --- a/doc/salome/examples/modifying_meshes_ex03.py +++ b/doc/examples/modifying_meshes_ex03.py @@ -1,23 +1,21 @@ # Add 0D Element on Element Nodes - import salome salome.salome_init_without_session() +import SMESH from salome.geom import geomBuilder -geompy = geomBuilder.New() - -import SMESH, SALOMEDS from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create a geometry -box = geompy.MakeBoxDXDYDZ( 10, 10, 10 ) -face = geompy.SubShapeAll( box, geompy.ShapeType["FACE"])[0] +box = geom_builder.MakeBoxDXDYDZ( 10, 10, 10 ) +face = geom_builder.SubShapeAll( box, geom_builder.ShapeType["FACE"])[0] # make 3D mesh -mesh = smesh.Mesh( box ) +mesh = smesh_builder.Mesh( box ) mesh.AutomaticHexahedralization(0) # create 0D elements on all nodes of the mesh @@ -38,9 +36,9 @@ group = mesh.Group( face, "faceGroup" ) res = mesh.Add0DElementsToAllNodes( group ) # remove all 0D elements -mesh.RemoveElements( mesh.GetIdsFromFilter( smesh.GetFilter( SMESH.ELEM0D, - SMESH.FT_ElemGeomType, - "=",SMESH.Geom_POINT ))) +mesh.RemoveElements( mesh.GetIdsFromFilter( smesh_builder.GetFilter( SMESH.ELEM0D, + SMESH.FT_ElemGeomType, + "=",SMESH.Geom_POINT ))) # create 0D elements on all nodes of some elements res = mesh.Add0DElementsToAllNodes( mesh.GetElementsId() ) diff --git a/doc/salome/examples/modifying_meshes_ex04.py b/doc/examples/modifying_meshes_ex04.py similarity index 79% rename from doc/salome/examples/modifying_meshes_ex04.py rename to doc/examples/modifying_meshes_ex04.py index ad8d151b0..ffd16eb7f 100644 --- a/doc/salome/examples/modifying_meshes_ex04.py +++ b/doc/examples/modifying_meshes_ex04.py @@ -1,9 +1,6 @@ # Add Edge -import SMESH_mechanic - -mesh = SMESH_mechanic.mesh -print("") +from mechanic import * # add node n1 = mesh.AddNode(50, 10, 0) diff --git a/doc/salome/examples/modifying_meshes_ex05.py b/doc/examples/modifying_meshes_ex05.py similarity index 80% rename from doc/salome/examples/modifying_meshes_ex05.py rename to doc/examples/modifying_meshes_ex05.py index c48042a6f..ba62dfc56 100644 --- a/doc/salome/examples/modifying_meshes_ex05.py +++ b/doc/examples/modifying_meshes_ex05.py @@ -1,9 +1,6 @@ # Add Triangle -import SMESH_mechanic - -mesh = SMESH_mechanic.mesh -print("") +from mechanic import * # add node n1 = mesh.AddNode(50, 10, 0) diff --git a/doc/salome/examples/modifying_meshes_ex06.py b/doc/examples/modifying_meshes_ex06.py similarity index 84% rename from doc/salome/examples/modifying_meshes_ex06.py rename to doc/examples/modifying_meshes_ex06.py index ff568e0f1..449f75338 100644 --- a/doc/salome/examples/modifying_meshes_ex06.py +++ b/doc/examples/modifying_meshes_ex06.py @@ -1,9 +1,6 @@ # Add Quadrangle -import SMESH_mechanic - -mesh = SMESH_mechanic.mesh -print("") +from mechanic import * # add node n1 = mesh.AddNode(50, 10, 0) diff --git a/doc/salome/examples/modifying_meshes_ex07.py b/doc/examples/modifying_meshes_ex07.py similarity index 81% rename from doc/salome/examples/modifying_meshes_ex07.py rename to doc/examples/modifying_meshes_ex07.py index 93fa2d1cc..898c3a2f9 100644 --- a/doc/salome/examples/modifying_meshes_ex07.py +++ b/doc/examples/modifying_meshes_ex07.py @@ -1,9 +1,6 @@ # Add Tetrahedron -import SMESH_mechanic - -mesh = SMESH_mechanic.mesh -print("") +from mechanic import * # add node n1 = mesh.AddNode(50, 10, 0) diff --git a/doc/salome/examples/modifying_meshes_ex08.py b/doc/examples/modifying_meshes_ex08.py similarity index 87% rename from doc/salome/examples/modifying_meshes_ex08.py rename to doc/examples/modifying_meshes_ex08.py index 1cf27c5df..5face16ec 100644 --- a/doc/salome/examples/modifying_meshes_ex08.py +++ b/doc/examples/modifying_meshes_ex08.py @@ -1,9 +1,6 @@ # Add Hexahedron -import SMESH_mechanic - -mesh = SMESH_mechanic.mesh -print("") +from mechanic import * # add nodes nId1 = mesh.AddNode(50, 10, 0) diff --git a/doc/salome/examples/modifying_meshes_ex09.py b/doc/examples/modifying_meshes_ex09.py similarity index 90% rename from doc/salome/examples/modifying_meshes_ex09.py rename to doc/examples/modifying_meshes_ex09.py index 914e91b5b..b015f1046 100644 --- a/doc/salome/examples/modifying_meshes_ex09.py +++ b/doc/examples/modifying_meshes_ex09.py @@ -3,12 +3,12 @@ import salome salome.salome_init_without_session() -import SMESH, SALOMEDS from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +smesh_builder = smeshBuilder.New() # create an empty mesh structure -mesh = smesh.Mesh() +mesh = smesh_builder.Mesh() # a method to build a polygonal mesh element with angles: def MakePolygon (a_mesh, x0, y0, z0, radius, nb_vert, smesh_builder): @@ -32,5 +32,3 @@ def MakePolygon (a_mesh, x0, y0, z0, radius, nb_vert, smesh_builder): f1 = MakePolygon(mesh, 0, 0, 0, 30, 13, smesh_builder=mesh) f2 = MakePolygon(mesh, 0, 0, 10, 21, 9, smesh_builder=mesh) f3 = MakePolygon(mesh, 0, 0, 20, 13, 6, smesh_builder=mesh) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/modifying_meshes_ex10.py b/doc/examples/modifying_meshes_ex10.py similarity index 94% rename from doc/salome/examples/modifying_meshes_ex10.py rename to doc/examples/modifying_meshes_ex10.py index ed49c4fa6..d880897fb 100644 --- a/doc/salome/examples/modifying_meshes_ex10.py +++ b/doc/examples/modifying_meshes_ex10.py @@ -1,16 +1,16 @@ # Add Polyhedron +import math import salome salome.salome_init_without_session() from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -import math +smesh_builder = smeshBuilder.New() # create an empty mesh structure -mesh = smesh.Mesh() +mesh = smesh_builder.Mesh() # Create nodes for 12-hedron with pentagonal faces al = 2 * math.pi / 5.0 @@ -58,6 +58,3 @@ mesh.AddPolyhedralVolume([dd[0], dd[1], dd[2], dd[3], dd[4], # top aa[0], bb[0], cc[0], bb[1], aa[1], # . aa[0], aa[1], aa[2], aa[3], aa[4]], # bottom [5,5,5,5,5,5,5,5,5,5,5,5]) - -if salome.sg.hasDesktop(): - salome.sg.updateObjBrowser() diff --git a/doc/examples/modifying_meshes_ex11.py b/doc/examples/modifying_meshes_ex11.py new file mode 100644 index 000000000..268ec1235 --- /dev/null +++ b/doc/examples/modifying_meshes_ex11.py @@ -0,0 +1,30 @@ +# Removing Nodes + +import salome +salome.salome_init_without_session() + +from salome.geom import geomBuilder +from salome.smesh import smeshBuilder + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() + +# create and mesh two boxes + +box = geom_builder.MakeBoxDXDYDZ(10.0, 10.0, 10.0) +mesh = smesh_builder.Mesh(box, 'box') +mesh.Segment().NumberOfSegments(10) +mesh.Triangle().MaxElementArea(5) + +mesh.Compute() +print("After Compute(): %s nodes, %s faces" % ( mesh.NbNodes(), mesh.NbFaces())) + +# remove nodes #246 and #255 + +res = mesh.RemoveNodes([246, 255]) +print("After RemoveNodes(): %s nodes, %s faces" % ( mesh.NbNodes(), mesh.NbFaces())) + +# removing node #100 with reconnection + +mesh.RemoveNodeWithReconnection( 100 ) +print("After RemoveNodeWithReconnection(): %s nodes, %s faces" % ( mesh.NbNodes(), mesh.NbFaces())) diff --git a/doc/salome/examples/modifying_meshes_ex12.py b/doc/examples/modifying_meshes_ex12.py similarity index 80% rename from doc/salome/examples/modifying_meshes_ex12.py rename to doc/examples/modifying_meshes_ex12.py index 8ef8356f0..74c9797e8 100644 --- a/doc/salome/examples/modifying_meshes_ex12.py +++ b/doc/examples/modifying_meshes_ex12.py @@ -1,8 +1,6 @@ # Removing Elements -import SMESH_mechanic - -mesh = SMESH_mechanic.mesh +from mechanic import * # remove three elements: #850, #859 and #814 res = mesh.RemoveElements([850, 859, 814]) diff --git a/doc/salome/examples/modifying_meshes_ex13.py b/doc/examples/modifying_meshes_ex13.py similarity index 82% rename from doc/salome/examples/modifying_meshes_ex13.py rename to doc/examples/modifying_meshes_ex13.py index 3c2e4e0bf..0ef3c30b2 100644 --- a/doc/salome/examples/modifying_meshes_ex13.py +++ b/doc/examples/modifying_meshes_ex13.py @@ -1,8 +1,6 @@ # Removing Orphan Nodes -import SMESH_mechanic - -mesh = SMESH_mechanic.mesh +from mechanic import * # add orphan nodes mesh.AddNode(0,0,0) diff --git a/doc/salome/examples/modifying_meshes_ex15.py b/doc/examples/modifying_meshes_ex15.py similarity index 83% rename from doc/salome/examples/modifying_meshes_ex15.py rename to doc/examples/modifying_meshes_ex15.py index 7d62245e8..cd058178a 100644 --- a/doc/salome/examples/modifying_meshes_ex15.py +++ b/doc/examples/modifying_meshes_ex15.py @@ -1,27 +1,24 @@ # Moving Nodes - import salome salome.salome_init_without_session() from salome.geom import geomBuilder -geompy = geomBuilder.New() - -import SMESH, SALOMEDS from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() -box = geompy.MakeBoxDXDYDZ(200, 200, 200) +box = geom_builder.MakeBoxDXDYDZ(200, 200, 200) -mesh = smesh.Mesh( box ) +mesh = smesh_builder.Mesh( box ) mesh.Segment().AutomaticLength(0.1) mesh.Quadrangle() mesh.Compute() # find node at (0,0,0) which is located on a geom vertex node000 = None -for vId in geompy.SubShapeAllIDs( box, geompy.ShapeType["VERTEX"]): +for vId in geom_builder.SubShapeAllIDs( box, geom_builder.ShapeType["VERTEX"]): if node000: break nodeIds = mesh.GetSubMeshNodesId( vId, True ) for node in nodeIds: diff --git a/doc/salome/examples/modifying_meshes_ex16.py b/doc/examples/modifying_meshes_ex16.py similarity index 87% rename from doc/salome/examples/modifying_meshes_ex16.py rename to doc/examples/modifying_meshes_ex16.py index 82bd0e0cf..49c009ea9 100644 --- a/doc/salome/examples/modifying_meshes_ex16.py +++ b/doc/examples/modifying_meshes_ex16.py @@ -1,20 +1,15 @@ # Diagonal Inversion - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -import salome_notebook +smesh_builder = smeshBuilder.New() # create an empty mesh structure -mesh = smesh.Mesh() +mesh = smesh_builder.Mesh() # create the following mesh: # .----.----.----. @@ -50,5 +45,3 @@ print("\nDiagonal inversion ... ", end=' ') res = mesh.InverseDiag(bb[1], tt[2]) if not res: print("failed!") else: print("done.") - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/modifying_meshes_ex17.py b/doc/examples/modifying_meshes_ex17.py similarity index 84% rename from doc/salome/examples/modifying_meshes_ex17.py rename to doc/examples/modifying_meshes_ex17.py index 833c5027f..cc827462b 100644 --- a/doc/salome/examples/modifying_meshes_ex17.py +++ b/doc/examples/modifying_meshes_ex17.py @@ -1,20 +1,14 @@ # Uniting two Triangles - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -import salome_notebook +smesh_builder = smeshBuilder.New() # create an empty mesh structure -mesh = smesh.Mesh() +mesh = smesh_builder.Mesh() # create the following mesh: # .----.----.----. @@ -50,5 +44,3 @@ print("\nUnite two triangles ... ", end=' ') res = mesh.DeleteDiag(bb[1], tt[2]) if not res: print("failed!") else: print("done.") - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/modifying_meshes_ex18.py b/doc/examples/modifying_meshes_ex18.py similarity index 84% rename from doc/salome/examples/modifying_meshes_ex18.py rename to doc/examples/modifying_meshes_ex18.py index 738e8d213..40a890bb4 100644 --- a/doc/salome/examples/modifying_meshes_ex18.py +++ b/doc/examples/modifying_meshes_ex18.py @@ -1,20 +1,15 @@ # Uniting a Set of Triangles - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -import salome_notebook +smesh_builder = smeshBuilder.New() # create an empty mesh structure -mesh = smesh.Mesh() +mesh = smesh_builder.Mesh() # create the following mesh: # .----.----.----. @@ -50,5 +45,3 @@ print("\nUnite a set of triangles ... ", end=' ') res = mesh.TriToQuad([ff[2], ff[3], ff[4], ff[5]], SMESH.FT_MinimumAngle, 60.) if not res: print("failed!") else: print("done.") - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/modifying_meshes_ex19.py b/doc/examples/modifying_meshes_ex19.py similarity index 81% rename from doc/salome/examples/modifying_meshes_ex19.py rename to doc/examples/modifying_meshes_ex19.py index 386a3cb56..79f4cc9c8 100644 --- a/doc/salome/examples/modifying_meshes_ex19.py +++ b/doc/examples/modifying_meshes_ex19.py @@ -1,20 +1,14 @@ # Orientation - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -import salome_notebook +smesh_builder = smeshBuilder.New() # create an empty mesh structure -mesh = smesh.Mesh() +mesh = smesh_builder.Mesh() # build five quadrangles: dx = 10 @@ -41,5 +35,3 @@ f5 = mesh.AddFace([n5, n6, n12, n11]) # Change the orientation of the second and the fourth faces. mesh.Reorient([2, 4]) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/modifying_meshes_ex20.py b/doc/examples/modifying_meshes_ex20.py similarity index 53% rename from doc/salome/examples/modifying_meshes_ex20.py rename to doc/examples/modifying_meshes_ex20.py index ffbff360a..87f387730 100644 --- a/doc/salome/examples/modifying_meshes_ex20.py +++ b/doc/examples/modifying_meshes_ex20.py @@ -1,10 +1,6 @@ # Cutting Quadrangles -import SMESH_mechanic -import SMESH - -smesh = SMESH_mechanic.smesh -mesh = SMESH_mechanic.mesh +from mechanic import * # cut two quadrangles: 405 and 406 mesh.QuadToTri([405, 406], SMESH.FT_MinimumAngle) diff --git a/doc/examples/modifying_meshes_ex21.py b/doc/examples/modifying_meshes_ex21.py new file mode 100644 index 000000000..4b9edc3a2 --- /dev/null +++ b/doc/examples/modifying_meshes_ex21.py @@ -0,0 +1,17 @@ +# Smoothing + +from mechanic import * + +# select the top face +faces = geom_builder.SubShapeAllSorted(mechanic, geom_builder.ShapeType["FACE"]) + +# create a group of faces to be smoothed +group_smooth = mesh.GroupOnGeom(faces[3], "Group of faces (smooth)", SMESH.FACE) + +# perform smoothing + +# boolean SmoothObject(Object, IDsOfFixedNodes, MaxNbOfIterations, MaxAspectRatio, Method) +res = mesh.SmoothObject(group_smooth, [], 20, 2., smesh_builder.CENTROIDAL_SMOOTH) +print("\nSmoothing ... ", end=' ') +if not res: print("failed!") +else: print("done.") diff --git a/doc/salome/examples/modifying_meshes_ex22.py b/doc/examples/modifying_meshes_ex22.py similarity index 84% rename from doc/salome/examples/modifying_meshes_ex22.py rename to doc/examples/modifying_meshes_ex22.py index 94ce7561d..ca1e30e9f 100644 --- a/doc/salome/examples/modifying_meshes_ex22.py +++ b/doc/examples/modifying_meshes_ex22.py @@ -3,17 +3,18 @@ # There is a series of Extrusion Along Line methods added at different times; # a fully functional method is ExtrusionSweepObjects() -import salome, math +import math + +import salome salome.salome_init_without_session() -from salome.geom import geomBuilder -geompy = geomBuilder.New() import SMESH from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +smesh_builder = smeshBuilder.New() # create an empty mesh -mesh = smesh.Mesh() +mesh = smesh_builder.Mesh() # add a node mesh.AddNode( 0.,0.,0. ) @@ -57,9 +58,9 @@ mesh.ExtrusionSweepObject( obj, stepVector, nbSteps ) # extrude all nodes and triangle faces of the disk quarter, applying a scale factor diskGroup = mesh.GetGroupByName( "line_rotated", SMESH.FACE )[0] -crit = [ smesh.GetCriterion( SMESH.FACE, SMESH.FT_ElemGeomType,'=',SMESH.Geom_TRIANGLE ), - smesh.GetCriterion( SMESH.FACE, SMESH.FT_BelongToMeshGroup,'=', diskGroup )] -trianglesFilter = smesh.GetFilterFromCriteria( crit ) +crit = [ smesh_builder.GetCriterion( SMESH.FACE, SMESH.FT_ElemGeomType,'=',SMESH.Geom_TRIANGLE ), + smesh_builder.GetCriterion( SMESH.FACE, SMESH.FT_BelongToMeshGroup,'=', diskGroup )] +trianglesFilter = smesh_builder.GetFilterFromCriteria( crit ) nodes = [ diskGroup ] edges = [] @@ -79,5 +80,3 @@ elements = cylGroup stepSize = 5. nbSteps = 2 mesh.ExtrusionByNormal( elements, stepSize, nbSteps ) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/modifying_meshes_ex23.py b/doc/examples/modifying_meshes_ex23.py similarity index 70% rename from doc/salome/examples/modifying_meshes_ex23.py rename to doc/examples/modifying_meshes_ex23.py index d2f52b229..673569516 100644 --- a/doc/salome/examples/modifying_meshes_ex23.py +++ b/doc/examples/modifying_meshes_ex23.py @@ -4,13 +4,13 @@ import math import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # 1. Create points points = [[0, 0], [50, 30], [50, 110], [0, 150], [-80, 150], [-130, 70], [-130, -20]] @@ -18,33 +18,30 @@ points = [[0, 0], [50, 30], [50, 110], [0, 150], [-80, 150], [-130, 70], [-130, iv = 1 vertices = [] for point in points: - vert = geompy.MakeVertex(point[0], point[1], 0) - #geompy.addToStudy(vert, "Vertex_" + repr(iv)) + vert = geom_builder.MakeVertex(point[0], point[1], 0) vertices.append(vert) iv += 1 - pass # 2. Create edges and wires -Edge_straight = geompy.MakeEdge(vertices[0], vertices[4]) -Edge_bezierrr = geompy.MakeBezier(vertices) -Wire_polyline = geompy.MakePolyline(vertices) -Edge_Circle = geompy.MakeCircleThreePnt(vertices[0], vertices[1], vertices[2]) +Edge_straight = geom_builder.MakeEdge(vertices[0], vertices[4]) +Edge_bezierrr = geom_builder.MakeBezier(vertices) +Wire_polyline = geom_builder.MakePolyline(vertices) +Edge_Circle = geom_builder.MakeCircleThreePnt(vertices[0], vertices[1], vertices[2]) -geompy.addToStudy(Edge_straight, "Edge_straight") -geompy.addToStudy(Edge_bezierrr, "Edge_bezierrr") -geompy.addToStudy(Wire_polyline, "Wire_polyline") -geompy.addToStudy(Edge_Circle , "Edge_Circle") +geom_builder.addToStudy(Edge_straight, "Edge_straight") +geom_builder.addToStudy(Edge_bezierrr, "Edge_bezierrr") +geom_builder.addToStudy(Wire_polyline, "Wire_polyline") +geom_builder.addToStudy(Edge_Circle , "Edge_Circle") # 3. Explode wire on edges, as they will be used for mesh extrusion -Wire_polyline_edges = geompy.SubShapeAll(Wire_polyline, geompy.ShapeType["EDGE"]) +Wire_polyline_edges = geom_builder.SubShapeAll(Wire_polyline, geom_builder.ShapeType["EDGE"]) for ii in range(len(Wire_polyline_edges)): - geompy.addToStudyInFather(Wire_polyline, Wire_polyline_edges[ii], "Edge_" + repr(ii + 1)) - pass + geom_builder.addToStudyInFather(Wire_polyline, Wire_polyline_edges[ii], "Edge_" + repr(ii + 1)) # Mesh # Mesh the given shape with the given 1d hypothesis -def Mesh1D(shape1d, nbSeg, name, smesh_builder): +def Mesh1D(shape1d, nbSeg, name): mesh1d_tool = smesh_builder.Mesh(shape1d, name) algo = mesh1d_tool.Segment() hyp = algo.NumberOfSegments(nbSeg) @@ -53,7 +50,7 @@ def Mesh1D(shape1d, nbSeg, name, smesh_builder): return mesh1d_tool # Create a mesh with six nodes, seven edges and two quadrangle faces -def MakeQuadMesh2(mesh_name, smesh_builder): +def MakeQuadMesh2(mesh_name): quad_1 = smesh_builder.Mesh(name = mesh_name) # six nodes @@ -79,19 +76,19 @@ def MakeQuadMesh2(mesh_name, smesh_builder): return [quad_1, [1,2,3,4,5,6,7], [8,9]] # Path meshes -Edge_straight_mesh = Mesh1D(Edge_straight, 7, "Edge_straight", smesh_builder=smesh) -Edge_bezierrr_mesh = Mesh1D(Edge_bezierrr, 7, "Edge_bezierrr", smesh_builder=smesh) -Wire_polyline_mesh = Mesh1D(Wire_polyline, 3, "Wire_polyline", smesh_builder=smesh) -Edge_Circle_mesh = Mesh1D(Edge_Circle , 8, "Edge_Circle" , smesh_builder=smesh) +Edge_straight_mesh = Mesh1D(Edge_straight, 7, "Edge_straight") +Edge_bezierrr_mesh = Mesh1D(Edge_bezierrr, 7, "Edge_bezierrr") +Wire_polyline_mesh = Mesh1D(Wire_polyline, 3, "Wire_polyline") +Edge_Circle_mesh = Mesh1D(Edge_Circle , 8, "Edge_Circle") # Initial meshes (to be extruded) -[quad_1, ee_1, ff_1] = MakeQuadMesh2("quad_1", smesh_builder=smesh) -[quad_2, ee_2, ff_2] = MakeQuadMesh2("quad_2", smesh_builder=smesh) -[quad_3, ee_3, ff_3] = MakeQuadMesh2("quad_3", smesh_builder=smesh) -[quad_4, ee_4, ff_4] = MakeQuadMesh2("quad_4", smesh_builder=smesh) -[quad_5, ee_5, ff_5] = MakeQuadMesh2("quad_5", smesh_builder=smesh) -[quad_6, ee_6, ff_6] = MakeQuadMesh2("quad_6", smesh_builder=smesh) -[quad_7, ee_7, ff_7] = MakeQuadMesh2("quad_7", smesh_builder=smesh) +[quad_1, ee_1, ff_1] = MakeQuadMesh2("quad_1") +[quad_2, ee_2, ff_2] = MakeQuadMesh2("quad_2") +[quad_3, ee_3, ff_3] = MakeQuadMesh2("quad_3") +[quad_4, ee_4, ff_4] = MakeQuadMesh2("quad_4") +[quad_5, ee_5, ff_5] = MakeQuadMesh2("quad_5") +[quad_6, ee_6, ff_6] = MakeQuadMesh2("quad_6") +[quad_7, ee_7, ff_7] = MakeQuadMesh2("quad_7") # ExtrusionAlongPath # IDsOfElements, PathMesh, PathShape, NodeStart, @@ -137,13 +134,13 @@ error = quad_7.ExtrusionAlongPath(ff_7, Edge_Circle_mesh, Edge_Circle, 1, # HasRefPoint=False, RefPoint=[0,0,0], MakeGroups=False, # ScaleFactors=[], ScalesVariation=False -quad_1 = MakeQuadMesh2("quad_1", smesh_builder=smesh)[0] -quad_2 = MakeQuadMesh2("quad_2", smesh_builder=smesh)[0] -quad_3 = MakeQuadMesh2("quad_3", smesh_builder=smesh)[0] -quad_4 = MakeQuadMesh2("quad_4", smesh_builder=smesh)[0] -quad_5 = MakeQuadMesh2("quad_5", smesh_builder=smesh)[0] -quad_6 = MakeQuadMesh2("quad_6", smesh_builder=smesh)[0] -quad_7 = MakeQuadMesh2("quad_7", smesh_builder=smesh)[0] +quad_1 = MakeQuadMesh2("quad_1")[0] +quad_2 = MakeQuadMesh2("quad_2")[0] +quad_3 = MakeQuadMesh2("quad_3")[0] +quad_4 = MakeQuadMesh2("quad_4")[0] +quad_5 = MakeQuadMesh2("quad_5")[0] +quad_6 = MakeQuadMesh2("quad_6")[0] +quad_7 = MakeQuadMesh2("quad_7")[0] # 1. Extrusion of two mesh edges along a straight path nn, ee, ff = [], [1,2], [] @@ -175,6 +172,3 @@ error = quad_6.ExtrusionAlongPathObjects( nn, ee, ff, Edge_Circle_mesh ) nn, ee, ff = [], [], quad_7 error = quad_7.ExtrusionAlongPathObjects( nn, ee, ff, Edge_Circle_mesh, Edge_Circle, Angles=[a45, -a45, a45, -a45, a45, -a45, a45, -a45]) - - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/modifying_meshes_ex24.py b/doc/examples/modifying_meshes_ex24.py similarity index 83% rename from doc/salome/examples/modifying_meshes_ex24.py rename to doc/examples/modifying_meshes_ex24.py index d07a7ca5b..07f698093 100644 --- a/doc/salome/examples/modifying_meshes_ex24.py +++ b/doc/examples/modifying_meshes_ex24.py @@ -1,12 +1,8 @@ # Revolution import math -import SMESH -import SMESH_mechanic - -mesh = SMESH_mechanic.mesh -smesh = SMESH_mechanic.smesh +from mechanic import * # create a group of faces to be revolved FacesRotate = [492, 493, 502, 503] diff --git a/doc/salome/examples/modifying_meshes_ex25.py b/doc/examples/modifying_meshes_ex25.py similarity index 85% rename from doc/salome/examples/modifying_meshes_ex25.py rename to doc/examples/modifying_meshes_ex25.py index 7a6804b06..39250d3a3 100644 --- a/doc/salome/examples/modifying_meshes_ex25.py +++ b/doc/examples/modifying_meshes_ex25.py @@ -1,29 +1,28 @@ # Pattern Mapping - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # define the geometry -Box_1 = geompy.MakeBoxDXDYDZ(200., 200., 200.) -geompy.addToStudy(Box_1, "Box_1") +Box_1 = geom_builder.MakeBoxDXDYDZ(200., 200., 200.) +geom_builder.addToStudy(Box_1, "Box_1") -faces = geompy.SubShapeAll(Box_1, geompy.ShapeType["FACE"]) +faces = geom_builder.SubShapeAll(Box_1, geom_builder.ShapeType["FACE"]) Face_1 = faces[0] Face_2 = faces[1] -geompy.addToStudyInFather(Box_1, Face_1, "Face_1") -geompy.addToStudyInFather(Box_1, Face_2, "Face_2") +geom_builder.addToStudyInFather(Box_1, Face_1, "Face_1") +geom_builder.addToStudyInFather(Box_1, Face_2, "Face_2") # build a quadrangle mesh 3x3 on Face_1 -Mesh_1 = smesh.Mesh(Face_1) +Mesh_1 = smesh_builder.Mesh(Face_1) algo1D = Mesh_1.Segment() algo1D.NumberOfSegments(3) Mesh_1.Quadrangle() @@ -32,7 +31,7 @@ isDone = Mesh_1.Compute() if not isDone: print('Mesh Mesh_1 : computation failed') # build a triangle mesh on Face_2 -Mesh_2 = smesh.Mesh(Face_2) +Mesh_2 = smesh_builder.Mesh(Face_2) algo1D = Mesh_2.Segment() algo1D.NumberOfSegments(1) @@ -43,7 +42,7 @@ isDone = Mesh_2.Compute() if not isDone: print('Mesh Mesh_2 : computation failed') # create a 2d pattern -pattern = smesh.GetPattern() +pattern = smesh_builder.GetPattern() isDone = pattern.LoadFromFace(Mesh_2.GetMesh(), Face_2, 0) if (isDone != 1): print('LoadFromFace :', pattern.GetErrorCode()) @@ -56,7 +55,7 @@ isDone = pattern.MakeMesh(Mesh_1.GetMesh(), 0, 0) if (isDone != 1): print('MakeMesh :', pattern.GetErrorCode()) # create quadrangle mesh -Mesh_3 = smesh.Mesh(Box_1) +Mesh_3 = smesh_builder.Mesh(Box_1) Mesh_3.Segment().NumberOfSegments(1) Mesh_3.Quadrangle() Mesh_3.Hexahedron() @@ -64,7 +63,7 @@ isDone = Mesh_3.Compute() if not isDone: print('Mesh Mesh_3 : computation failed') # create a 3d pattern (hexahedrons) -pattern_hexa = smesh.GetPattern() +pattern_hexa = smesh_builder.GetPattern() smp_hexa = """!!! Nb of points: 15 @@ -99,7 +98,7 @@ isDone = pattern_hexa.MakeMesh(Mesh_3.GetMesh(), True, True) if (isDone != 1): print('MakeMesh :', pattern_hexa.GetErrorCode()) # create one more quadrangle mesh -Mesh_4 = smesh.Mesh(Box_1) +Mesh_4 = smesh_builder.Mesh(Box_1) Mesh_4.Segment().NumberOfSegments(1) Mesh_4.Quadrangle() Mesh_4.Hexahedron() @@ -107,7 +106,7 @@ isDone = Mesh_4.Compute() if not isDone: print('Mesh Mesh_4 : computation failed') # create another 3d pattern (pyramids) -pattern_pyra = smesh.GetPattern() +pattern_pyra = smesh_builder.GetPattern() smp_pyra = """!!! Nb of points: 9 diff --git a/doc/salome/examples/modifying_meshes_ex26.py b/doc/examples/modifying_meshes_ex26.py similarity index 85% rename from doc/salome/examples/modifying_meshes_ex26.py rename to doc/examples/modifying_meshes_ex26.py index defd6ba1d..664291f99 100644 --- a/doc/salome/examples/modifying_meshes_ex26.py +++ b/doc/examples/modifying_meshes_ex26.py @@ -1,24 +1,22 @@ # Convert mesh to/from quadratic - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create sphere of radius 100 -Sphere = geompy.MakeSphereR( 100 ) -geompy.addToStudy( Sphere, "Sphere" ) +Sphere = geom_builder.MakeSphereR( 100 ) +geom_builder.addToStudy( Sphere, "Sphere" ) # create simple trihedral mesh -Mesh = smesh.Mesh(Sphere) +Mesh = smesh_builder.Mesh(Sphere) Regular_1D = Mesh.Segment() Nb_Segments = Regular_1D.NumberOfSegments(5) MEFISTO_2D = Mesh.Triangle() diff --git a/doc/salome/examples/modifying_meshes_split_vol.py b/doc/examples/modifying_meshes_split_vol.py similarity index 64% rename from doc/salome/examples/modifying_meshes_split_vol.py rename to doc/examples/modifying_meshes_split_vol.py index 35eea6aab..f41fafe05 100644 --- a/doc/salome/examples/modifying_meshes_split_vol.py +++ b/doc/examples/modifying_meshes_split_vol.py @@ -4,16 +4,17 @@ import salome salome.salome_init_without_session() from salome.geom import geomBuilder -geompy = geomBuilder.New() from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # mesh a hexahedral mesh -box = geompy.MakeBoxDXDYDZ (1, 1, 1 ) -mesh = smesh.Mesh( box ) +box = geom_builder.MakeBoxDXDYDZ (1, 1, 1 ) +mesh = smesh_builder.Mesh( box ) mesh.AutomaticHexahedralization(0) print("Nb volumes mesh: %s" % mesh.NbHexas()) # split each hexahedron into 6 tetrahedra -mesh.SplitVolumesIntoTetra( mesh, smesh.Hex_6Tet ) +mesh.SplitVolumesIntoTetra( mesh, smesh_builder.Hex_6Tet ) print("Nb volumes mesh: %s" % mesh.NbTetras()) diff --git a/doc/salome/examples/notebook_smesh.py b/doc/examples/notebook_smesh.py similarity index 73% rename from doc/salome/examples/notebook_smesh.py rename to doc/examples/notebook_smesh.py index 959cc20bd..8d90ad382 100644 --- a/doc/salome/examples/notebook_smesh.py +++ b/doc/examples/notebook_smesh.py @@ -1,19 +1,17 @@ # Using SALOME NoteBook - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() +from salome_notebook import notebook -import SMESH, SALOMEDS +import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -import salome_notebook + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # set variables -notebook = salome_notebook.notebook notebook.set("Length", 100) notebook.set("Width", 200) notebook.set("Offset", 50) @@ -23,11 +21,11 @@ notebook.set("MaxElementArea", 800) notebook.set("MaxElementVolume", 900) # create a box -box = geompy.MakeBoxDXDYDZ("Length", "Width", 300) -idbox = geompy.addToStudy(box, "Box") +box = geom_builder.MakeBoxDXDYDZ("Length", "Width", 300) +idbox = geom_builder.addToStudy(box, "Box") # create a mesh -tetra = smesh.Mesh(box, "MeshBox") +tetra = smesh_builder.Mesh(box, "MeshBox") algo1D = tetra.Segment() algo1D.NumberOfSegments("NbSegments") diff --git a/doc/salome/examples/prism_3d_algo.py b/doc/examples/prism_3d_algo.py similarity index 50% rename from doc/salome/examples/prism_3d_algo.py rename to doc/examples/prism_3d_algo.py index 06a2c5cc2..20ab781e8 100644 --- a/doc/salome/examples/prism_3d_algo.py +++ b/doc/examples/prism_3d_algo.py @@ -4,15 +4,14 @@ import salome salome.salome_init_without_session() from salome.geom import geomBuilder -geompy = geomBuilder.New() - -import SMESH from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -OX = geompy.MakeVectorDXDYDZ(1,0,0) -OY = geompy.MakeVectorDXDYDZ(0,1,0) -OZ = geompy.MakeVectorDXDYDZ(0,0,1) +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() + +OX = geom_builder.MakeVectorDXDYDZ(1,0,0) +OY = geom_builder.MakeVectorDXDYDZ(0,1,0) +OZ = geom_builder.MakeVectorDXDYDZ(0,0,1) # Y ^ Make geometry of a "pipe" with the following base (cross section). # | Big central quadrangles will be meshed with triangles, walls @@ -31,30 +30,28 @@ OZ = geompy.MakeVectorDXDYDZ(0,0,1) # | | | | | | | --> # +--+--+--+--+--+--+ X -quadBig = geompy.MakeFaceHW( 20,20, 1 ) -quadBig = geompy.MakeTranslation( quadBig, 15,15,0 ) -quadSmall = geompy.MakeFaceHW( 10,10, 1 ) -smallQuads1 = geompy.MakeMultiTranslation1D( quadSmall, OX, 10, 3 ) -smallQuads2 = geompy.MakeMultiTranslation1D( quadSmall, OY, 10, 3 ) -smallQuads2 = geompy.SubShapeAllSortedCentres( smallQuads2, geompy.ShapeType["FACE"])[1:] +quadBig = geom_builder.MakeFaceHW( 20,20, 1 ) +quadBig = geom_builder.MakeTranslation( quadBig, 15,15,0 ) +quadSmall = geom_builder.MakeFaceHW( 10,10, 1 ) +smallQuads1 = geom_builder.MakeMultiTranslation1D( quadSmall, OX, 10, 3 ) +smallQuads2 = geom_builder.MakeMultiTranslation1D( quadSmall, OY, 10, 3 ) +smallQuads2 = geom_builder.SubShapeAllSortedCentres( smallQuads2, geom_builder.ShapeType["FACE"])[1:] -base = geompy.MakeCompound( smallQuads2 + [smallQuads1, quadBig]) -axis = geompy.MakeLine( geompy.MakeVertex( 25,25,0), OZ ) -base = geompy.MultiRotate1DNbTimes( base, axis, 4) -base = geompy.MakePartition( [base], theName="base") -path = geompy.MakeSketcher("Sketcher:F 0 0:TT 0 100:R 0:C -90 180:T 0 -150",[0,0,0, 0,-1,0, 1,0,0]) +base = geom_builder.MakeCompound( smallQuads2 + [smallQuads1, quadBig]) +axis = geom_builder.MakeLine( geom_builder.MakeVertex( 25,25,0), OZ ) +base = geom_builder.MultiRotate1DNbTimes( base, axis, 4) +base = geom_builder.MakePartition( [base], theName="base") +path = geom_builder.MakeSketcher("Sketcher:F 0 0:TT 0 100:R 0:C -90 180:T 0 -150",[0,0,0, 0,-1,0, 1,0,0]) # Make the pipe, each quadrangle of the base turns into a prism with composite wall faces -pipe = geompy.MakePipe( base, path ) -prisms = geompy.MakePartition( [pipe], theName="prisms") - +pipe = geom_builder.MakePipe( base, path ) +prisms = geom_builder.MakePartition( [pipe], theName="prisms") # get base faces of the prism to define sub-mesh on them -smallQuad = geompy.GetFaceNearPoint( prisms, geompy.MakeVertex( 0,0,0 ), "smallQuad") -bigQuad = geompy.GetFaceNearPoint( prisms, geompy.MakeVertex( 15,15,0 ), "bigQuad") - +smallQuad = geom_builder.GetFaceNearPoint( prisms, geom_builder.MakeVertex( 0,0,0 ), "smallQuad") +bigQuad = geom_builder.GetFaceNearPoint( prisms, geom_builder.MakeVertex( 15,15,0 ), "bigQuad") -mesh = smesh.Mesh( prisms ) +mesh = smesh_builder.Mesh( prisms ) # assign Global hypotheses diff --git a/doc/salome/examples/quad_medial_axis_algo.py b/doc/examples/quad_medial_axis_algo.py similarity index 56% rename from doc/salome/examples/quad_medial_axis_algo.py rename to doc/examples/quad_medial_axis_algo.py index 5937d03ac..450827bd4 100644 --- a/doc/salome/examples/quad_medial_axis_algo.py +++ b/doc/examples/quad_medial_axis_algo.py @@ -4,21 +4,23 @@ import salome salome.salome_init_without_session() + from salome.geom import geomBuilder -geompy = geomBuilder.New() from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create a ring face -circleEdge1 = geompy.MakeCircleR( 3 ) -circleEdge2 = geompy.MakeCircleR( 7 ) -ring = geompy.MakeFaceWires( [ circleEdge1, circleEdge2 ], True, theName='Ring' ) -circleLen1 = geompy.BasicProperties( circleEdge1 )[0] -circleLen2 = geompy.BasicProperties( circleEdge2 )[0] +circleEdge1 = geom_builder.MakeCircleR( 3 ) +circleEdge2 = geom_builder.MakeCircleR( 7 ) +ring = geom_builder.MakeFaceWires( [ circleEdge1, circleEdge2 ], True, theName='Ring' ) +circleLen1 = geom_builder.BasicProperties( circleEdge1 )[0] +circleLen2 = geom_builder.BasicProperties( circleEdge2 )[0] # make a mesh -mesh = smesh.Mesh( ring ) +mesh = smesh_builder.Mesh( ring ) circNbSeg = 60 algo1d = mesh.Segment() diff --git a/doc/salome/examples/quality_controls_defl.py b/doc/examples/quality_controls_defl.py similarity index 73% rename from doc/salome/examples/quality_controls_defl.py rename to doc/examples/quality_controls_defl.py index 97553e02f..42c04a315 100644 --- a/doc/salome/examples/quality_controls_defl.py +++ b/doc/examples/quality_controls_defl.py @@ -1,22 +1,22 @@ # Deflection 2D - import salome salome.salome_init_without_session() -from salome.geom import geomBuilder -geompy = geomBuilder.New() import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # fuse a box and a sphere -Sphere_1 = geompy.MakeSphereR(100) -Box_1 = geompy.MakeBoxDXDYDZ(200, 200, 200) -Fuse = geompy.MakeFuse( Sphere_1, Box_1, theName="box + sphere" ) +Sphere_1 = geom_builder.MakeSphereR(100) +Box_1 = geom_builder.MakeBoxDXDYDZ(200, 200, 200) +Fuse = geom_builder.MakeFuse( Sphere_1, Box_1, theName="box + sphere" ) # create a mesh -mesh = smesh.Mesh( Fuse, "Deflection_2D") +mesh = smesh_builder.Mesh( Fuse, "Deflection_2D") algo = mesh.Segment() algo.LocalLength(35) algo = mesh.Triangle() @@ -34,12 +34,10 @@ print("deflection of face %s = %s" % ( faceID, defl )) margin = minMax[1] / 2 # get all faces with deflection LESS than the margin -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Deflection2D, '<', margin, mesh=mesh) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Deflection2D, '<', margin, mesh=mesh) anIds = aFilter.GetIDs() print("%s faces have deflection less than %s" %( len(anIds), margin )) # create a group of faces with deflection MORE than the margin aGroup = mesh.MakeGroup("Deflection > " + repr(margin), SMESH.FACE, SMESH.FT_Deflection2D,'>',margin) print("%s faces have deflection more than %s: %s ..." %( aGroup.Size(), margin, aGroup.GetIDs()[:10] )) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/quality_controls_ex01.py b/doc/examples/quality_controls_ex01.py similarity index 63% rename from doc/salome/examples/quality_controls_ex01.py rename to doc/examples/quality_controls_ex01.py index 2cb3c97fc..dda1aca12 100644 --- a/doc/salome/examples/quality_controls_ex01.py +++ b/doc/examples/quality_controls_ex01.py @@ -1,25 +1,24 @@ # Free Borders - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create open shell: a box without one plane -box = geompy.MakeBox(0., 0., 0., 20., 20., 15.) -FaceList = geompy.SubShapeAll(box, geompy.ShapeType["FACE"]) +box = geom_builder.MakeBox(0., 0., 0., 20., 20., 15.) +FaceList = geom_builder.SubShapeAll(box, geom_builder.ShapeType["FACE"]) FaceList.remove(FaceList[5]) -box = geompy.MakeShell(FaceList) -idbox = geompy.addToStudy(box, "box") +box = geom_builder.MakeShell(FaceList) +idbox = geom_builder.addToStudy(box, "box") # create a mesh -mesh = smesh.Mesh(box, "Mesh_free_borders") +mesh = smesh_builder.Mesh(box, "Mesh_free_borders") algo = mesh.Segment() algo.NumberOfSegments(5) algo = mesh.Triangle() @@ -27,7 +26,7 @@ algo.MaxElementArea(20.) mesh.Compute() # criterion : free borders -aFilter = smesh.GetFilter(SMESH.EDGE, SMESH.FT_FreeBorders) +aFilter = smesh_builder.GetFilter(SMESH.EDGE, SMESH.FT_FreeBorders) anIds = mesh.GetIdsFromFilter(aFilter) # print the result @@ -43,5 +42,3 @@ print("") # create a group aGroup = mesh.GetMesh().CreateGroup(SMESH.EDGE, "Free borders") aGroup.Add(anIds) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/quality_controls_ex02.py b/doc/examples/quality_controls_ex02.py similarity index 62% rename from doc/salome/examples/quality_controls_ex02.py rename to doc/examples/quality_controls_ex02.py index c03942010..3b48bf305 100644 --- a/doc/salome/examples/quality_controls_ex02.py +++ b/doc/examples/quality_controls_ex02.py @@ -1,25 +1,24 @@ # Borders at Multiconnection - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create open shell: a box without one plane -box = geompy.MakeBox(0., 0., 0., 20., 20., 15.) -FaceList = geompy.SubShapeAll(box, geompy.ShapeType["FACE"]) +box = geom_builder.MakeBox(0., 0., 0., 20., 20., 15.) +FaceList = geom_builder.SubShapeAll(box, geom_builder.ShapeType["FACE"]) FaceList.remove(FaceList[5]) -box = geompy.MakeShell(FaceList) -idbox = geompy.addToStudy(box, "box") +box = geom_builder.MakeShell(FaceList) +idbox = geom_builder.addToStudy(box, "box") # create a mesh -mesh = smesh.Mesh(box, "Mesh_borders_at_multi-connections") +mesh = smesh_builder.Mesh(box, "Mesh_borders_at_multi-connections") algo = mesh.Segment() algo.NumberOfSegments(5) algo = mesh.Triangle() @@ -29,7 +28,7 @@ mesh.Compute() # Criterion : Borders at multi-connection nb_conn = 2 -aFilter = smesh.GetFilter(SMESH.EDGE, SMESH.FT_MultiConnection, SMESH.FT_EqualTo, nb_conn) +aFilter = smesh_builder.GetFilter(SMESH.EDGE, SMESH.FT_MultiConnection, SMESH.FT_EqualTo, nb_conn) anIds = mesh.GetIdsFromFilter(aFilter) # print the result @@ -45,5 +44,3 @@ print("") # create a group aGroup = mesh.GetMesh().CreateGroup(SMESH.EDGE, "Borders at multi-connections") aGroup.Add(anIds) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/quality_controls_ex03.py b/doc/examples/quality_controls_ex03.py similarity index 63% rename from doc/salome/examples/quality_controls_ex03.py rename to doc/examples/quality_controls_ex03.py index 65db46bbf..9958d7115 100644 --- a/doc/salome/examples/quality_controls_ex03.py +++ b/doc/examples/quality_controls_ex03.py @@ -1,25 +1,24 @@ # Length 1D - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create open shell: a box without one plane -box = geompy.MakeBox(0., 0., 0., 20., 20., 15.) -FaceList = geompy.SubShapeAll(box, geompy.ShapeType["FACE"]) +box = geom_builder.MakeBox(0., 0., 0., 20., 20., 15.) +FaceList = geom_builder.SubShapeAll(box, geom_builder.ShapeType["FACE"]) FaceList.remove(FaceList[5]) -box = geompy.MakeShell(FaceList) -idbox = geompy.addToStudy(box, "box") +box = geom_builder.MakeShell(FaceList) +idbox = geom_builder.addToStudy(box, "box") # create a mesh -mesh = smesh.Mesh(box, "Mesh_Length_1D") +mesh = smesh_builder.Mesh(box, "Mesh_Length_1D") algo = mesh.Segment() algo.NumberOfSegments(5) algo = mesh.Triangle() @@ -29,7 +28,7 @@ mesh.Compute() # Criterion : Length > 3. length_margin = 3. -aFilter = smesh.GetFilter(SMESH.EDGE, SMESH.FT_Length, SMESH.FT_MoreThan, length_margin) +aFilter = smesh_builder.GetFilter(SMESH.EDGE, SMESH.FT_Length, SMESH.FT_MoreThan, length_margin) anIds = mesh.GetIdsFromFilter(aFilter) # print the result @@ -45,5 +44,3 @@ print("") # create a group aGroup = mesh.GetMesh().CreateGroup(SMESH.EDGE, "Edges with length > " + repr(length_margin)) aGroup.Add(anIds) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/quality_controls_ex04.py b/doc/examples/quality_controls_ex04.py similarity index 73% rename from doc/salome/examples/quality_controls_ex04.py rename to doc/examples/quality_controls_ex04.py index 07867cc2f..b4c1dd252 100644 --- a/doc/salome/examples/quality_controls_ex04.py +++ b/doc/examples/quality_controls_ex04.py @@ -1,19 +1,14 @@ # Free Edges -import SMESH_mechanic -import SMESH +from mechanic import * -smesh = SMESH_mechanic.smesh -mesh = SMESH_mechanic.mesh -salome = SMESH_mechanic.salome - -aFilterMgr = smesh.CreateFilterManager() +aFilterMgr = smesh_builder.CreateFilterManager() # Remove some elements to obtain free edges # Criterion : AREA > 95. area_margin = 95. -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, area_margin) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, area_margin) anIds = mesh.GetIdsFromFilter(aFilter) @@ -36,5 +31,3 @@ for i in range(len(aBorders)): aGroupF.Add([aBorder.myElemId]) aGroupN.Add([aBorder.myPnt1, aBorder.myPnt2]) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/quality_controls_ex05.py b/doc/examples/quality_controls_ex05.py similarity index 67% rename from doc/salome/examples/quality_controls_ex05.py rename to doc/examples/quality_controls_ex05.py index b01e35cae..d9a415deb 100644 --- a/doc/salome/examples/quality_controls_ex05.py +++ b/doc/examples/quality_controls_ex05.py @@ -1,22 +1,21 @@ # Free Nodes - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create box -box = geompy.MakeBox(0., 0., 0., 100., 200., 300.) -idbox = geompy.addToStudy(box, "box") +box = geom_builder.MakeBox(0., 0., 0., 100., 200., 300.) +idbox = geom_builder.addToStudy(box, "box") # create a mesh -mesh = smesh.Mesh(box, "Mesh_free_nodes") +mesh = smesh_builder.Mesh(box, "Mesh_free_nodes") algo = mesh.Segment() algo.NumberOfSegments(10) algo = mesh.Triangle(smeshBuilder.MEFISTO) @@ -27,14 +26,14 @@ mesh.Compute() # Criterion : AREA < 80. area_margin = 80. -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_LessThan, area_margin) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_LessThan, area_margin) anIds = mesh.GetIdsFromFilter(aFilter) mesh.RemoveElements(anIds) # criterion : free nodes -aFilter = smesh.GetFilter(SMESH.NODE, SMESH.FT_FreeNodes) +aFilter = smesh_builder.GetFilter(SMESH.NODE, SMESH.FT_FreeNodes) anNodeIds = mesh.GetIdsFromFilter(aFilter) # create a group @@ -50,5 +49,3 @@ for i in range(len(anNodeIds)): j = j + 1 pass print("") - -salome.sg.updateObjBrowser() diff --git a/doc/examples/quality_controls_ex06.py b/doc/examples/quality_controls_ex06.py new file mode 100644 index 000000000..f487e6b5f --- /dev/null +++ b/doc/examples/quality_controls_ex06.py @@ -0,0 +1,75 @@ +# Free Faces + +import salome +salome.salome_init_without_session() + +import SMESH +from salome.geom import geomBuilder +from salome.smesh import smeshBuilder + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() + +####### GEOM part ######## + +Box_1 = geom_builder.MakeBoxDXDYDZ(200, 200, 200) +Box_1_vertex_6 = geom_builder.GetSubShape(Box_1, [6]) +Box_1 = geom_builder.GetMainShape(Box_1_vertex_6) +Box_1_vertex_16 = geom_builder.GetSubShape(Box_1, [16]) +Box_1 = geom_builder.GetMainShape(Box_1_vertex_16) +Box_1_vertex_11 = geom_builder.GetSubShape(Box_1, [11]) +Box_1 = geom_builder.GetMainShape(Box_1_vertex_11) +Plane_1 = geom_builder.MakePlaneThreePnt(Box_1_vertex_6, Box_1_vertex_16, Box_1_vertex_11, 2000) +Partition_1 = geom_builder.MakePartition([Box_1], [Plane_1], [], [], geom_builder.ShapeType["SOLID"], 0, [], 0) + +Box_1_vertex_19 = geom_builder.GetSubShape(Box_1, [19]) +Box_1_vertex_21 = geom_builder.GetSubShape(Box_1, [21]) +Plane_2 = geom_builder.MakePlaneThreePnt(Box_1_vertex_16, Box_1_vertex_19, Box_1_vertex_21, 2000) + +geom_builder.addToStudy( Box_1, "Box_1" ) +geom_builder.addToStudyInFather( Box_1, Box_1_vertex_6, "Box_1:vertex_6" ) +geom_builder.addToStudyInFather( Box_1, Box_1_vertex_16, "Box_1:vertex_16" ) +geom_builder.addToStudyInFather( Box_1, Box_1_vertex_11, "Box_1:vertex_11" ) +geom_builder.addToStudy( Plane_1, "Plane_1" ) +geom_builder.addToStudy( Partition_1, "Partition_1" ) +geom_builder.addToStudyInFather( Box_1, Box_1_vertex_19, "Box_1:vertex_19" ) +geom_builder.addToStudyInFather( Box_1, Box_1_vertex_21, "Box_1:vertex_21" ) +geom_builder.addToStudy( Plane_2, "Plane_2" ) + +###### SMESH part ###### + +Mesh_1 = smesh_builder.Mesh(Partition_1) +Regular_1D = Mesh_1.Segment() +Max_Size_1 = Regular_1D.MaxSize(34.641) +MEFISTO_2D = Mesh_1.Triangle() +Tetrahedronn = Mesh_1.Tetrahedron() +isDone = Mesh_1.Compute() + +# create a group of free faces +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_FreeFaces ) +aFaceIds = Mesh_1.GetIdsFromFilter(aFilter) + +aGroup = Mesh_1.CreateEmptyGroup(SMESH.FACE, "Free_faces") +aGroup.Add(aFaceIds) + +# print the result +print("Criterion: Free faces Nb = ", len(aFaceIds)) +j = 1 +for i in range(len(aFaceIds)): + if j > 20: j = 1; print("") + print(aFaceIds[i], end=' ') + j = j + 1 + pass +print("") + +#filter faces from plane 2 +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_BelongToPlane, Plane_2) +aFaceIds = Mesh_1.GetIdsFromFilter(aFilter) +aGroup.Remove(aFaceIds) + +# create a group of shared faces (located on partition boundary inside box) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_BelongToPlane, Plane_1) +aFaceIds = Mesh_1.GetIdsFromFilter(aFilter) + +aGroup = Mesh_1.CreateEmptyGroup(SMESH.FACE, "Shared_faces") +aGroup.Add(aFaceIds) diff --git a/doc/salome/examples/quality_controls_ex07.py b/doc/examples/quality_controls_ex07.py similarity index 66% rename from doc/salome/examples/quality_controls_ex07.py rename to doc/examples/quality_controls_ex07.py index d7f296546..ce88f3773 100644 --- a/doc/salome/examples/quality_controls_ex07.py +++ b/doc/examples/quality_controls_ex07.py @@ -1,22 +1,19 @@ # Bare border faces - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -import salome_notebook +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() -box = geompy.MakeBoxDXDYDZ(100, 100, 100) -geompy.addToStudy( box, "box" ) +box = geom_builder.MakeBoxDXDYDZ(100, 100, 100) +geom_builder.addToStudy( box, "box" ) -mesh = smesh.Mesh(box) +mesh = smesh_builder.Mesh(box) mesh.Segment().NumberOfSegments(3) mesh.Quadrangle() mesh.Compute() diff --git a/doc/salome/examples/quality_controls_ex08.py b/doc/examples/quality_controls_ex08.py similarity index 63% rename from doc/salome/examples/quality_controls_ex08.py rename to doc/examples/quality_controls_ex08.py index 8fc367ea0..61c7a2553 100644 --- a/doc/salome/examples/quality_controls_ex08.py +++ b/doc/examples/quality_controls_ex08.py @@ -1,26 +1,23 @@ # Bare border volumes - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -import salome_notebook +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() -box = geompy.MakeBoxDXDYDZ(100, 30, 10) +box = geom_builder.MakeBoxDXDYDZ(100, 30, 10) # the smallest face of the box -face = geompy.SubShapeAllSorted( box, geompy.ShapeType["FACE"])[0] +face = geom_builder.SubShapeAllSorted( box, geom_builder.ShapeType["FACE"])[0] -geompy.addToStudy( box, "box" ) -geompy.addToStudyInFather( box, face, "face" ) +geom_builder.addToStudy( box, "box" ) +geom_builder.addToStudyInFather( box, face, "face" ) -mesh = smesh.Mesh(box) +mesh = smesh_builder.Mesh(box) mesh.AutomaticHexahedralization(); # remove half of mesh faces from the smallest face diff --git a/doc/salome/examples/quality_controls_ex09.py b/doc/examples/quality_controls_ex09.py similarity index 52% rename from doc/salome/examples/quality_controls_ex09.py rename to doc/examples/quality_controls_ex09.py index 92a8f052f..c05ba61ca 100644 --- a/doc/salome/examples/quality_controls_ex09.py +++ b/doc/examples/quality_controls_ex09.py @@ -1,20 +1,15 @@ # Over-constrained faces - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -import salome_notebook +smesh_builder = smeshBuilder.New() -mesh = smesh.Mesh() -faceFilter = smesh.GetFilter(SMESH.FACE,SMESH.FT_OverConstrainedFace) +mesh = smesh_builder.Mesh() +faceFilter = smesh_builder.GetFilter(SMESH.FACE,SMESH.FT_OverConstrainedFace) #make an edge n1 = mesh.AddNode(0,0,0) @@ -23,5 +18,5 @@ edge = mesh.AddEdge([n1,n2]) assert( not mesh.GetIdsFromFilter( faceFilter )) # make faces -mesh.ExtrusionSweep([edge], smesh.MakeDirStruct(0,7,0), 5) +mesh.ExtrusionSweep([edge], smesh_builder.MakeDirStruct(0,7,0), 5) assert( 5 == len( mesh.GetIdsFromFilter( faceFilter ))) diff --git a/doc/examples/quality_controls_ex10.py b/doc/examples/quality_controls_ex10.py new file mode 100644 index 000000000..b36923442 --- /dev/null +++ b/doc/examples/quality_controls_ex10.py @@ -0,0 +1,20 @@ +# Over-constrained volumes + +import salome +salome.salome_init_without_session() + +import SMESH +from salome.smesh import smeshBuilder + +smesh_builder = smeshBuilder.New() + +mesh = smesh_builder.Mesh() +volumeFilter = smesh_builder.GetFilter(SMESH.VOLUME,SMESH.FT_OverConstrainedVolume) + +# make volumes by extrusion of one face +n1 = mesh.AddNode(0,0,0) +n2 = mesh.AddNode(10,0,0) +edge = mesh.AddEdge([n1,n2]) +mesh.ExtrusionSweep([edge], smesh_builder.MakeDirStruct(0,7,0), 1) +mesh.ExtrusionSweep( mesh.GetElementsByType(SMESH.FACE), smesh_builder.MakeDirStruct(0,0,5), 7) +assert( 7 == len( mesh.GetIdsFromFilter( volumeFilter ))) diff --git a/doc/salome/examples/quality_controls_ex11.py b/doc/examples/quality_controls_ex11.py similarity index 63% rename from doc/salome/examples/quality_controls_ex11.py rename to doc/examples/quality_controls_ex11.py index fbc2b7c5f..1b08179f1 100644 --- a/doc/salome/examples/quality_controls_ex11.py +++ b/doc/examples/quality_controls_ex11.py @@ -1,25 +1,24 @@ # Length 2D - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create open shell: a box without one plane -box = geompy.MakeBox(0., 0., 0., 20., 20., 15.) -FaceList = geompy.SubShapeAll(box, geompy.ShapeType["FACE"]) +box = geom_builder.MakeBox(0., 0., 0., 20., 20., 15.) +FaceList = geom_builder.SubShapeAll(box, geom_builder.ShapeType["FACE"]) FaceList.remove(FaceList[5]) -box = geompy.MakeShell(FaceList) -idbox = geompy.addToStudy(box, "box") +box = geom_builder.MakeShell(FaceList) +idbox = geom_builder.addToStudy(box, "box") # create a mesh -mesh = smesh.Mesh(box, "Mesh_Length_2D") +mesh = smesh_builder.Mesh(box, "Mesh_Length_2D") algo = mesh.Segment() algo.NumberOfSegments(5) algo = mesh.Triangle() @@ -29,7 +28,7 @@ mesh.Compute() # Criterion : Length 2D > 5.7 length_margin = 5.7 -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Length2D, SMESH.FT_MoreThan, length_margin) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Length2D, SMESH.FT_MoreThan, length_margin) anIds = mesh.GetIdsFromFilter(aFilter) @@ -46,5 +45,3 @@ print("") # create a group aGroup = mesh.CreateEmptyGroup(SMESH.FACE, "Faces with length 2D > " + repr(length_margin)) aGroup.Add(anIds) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/quality_controls_ex12.py b/doc/examples/quality_controls_ex12.py similarity index 61% rename from doc/salome/examples/quality_controls_ex12.py rename to doc/examples/quality_controls_ex12.py index f6227793c..a76fa3543 100644 --- a/doc/salome/examples/quality_controls_ex12.py +++ b/doc/examples/quality_controls_ex12.py @@ -1,25 +1,24 @@ # Borders at Multiconnection 2D - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create a compound of two glued boxes -box1 = geompy.MakeBox(0., 0., 0., 20., 20., 15.) -box2 = geompy.MakeTranslation(box1, 0., 20., 0) -comp = geompy.MakeCompound([box1, box2]) -box = geompy.MakeGlueFaces(comp, 0.000001) -idbox = geompy.addToStudy(box, "box") +box1 = geom_builder.MakeBox(0., 0., 0., 20., 20., 15.) +box2 = geom_builder.MakeTranslation(box1, 0., 20., 0) +comp = geom_builder.MakeCompound([box1, box2]) +box = geom_builder.MakeGlueFaces(comp, 0.000001) +idbox = geom_builder.addToStudy(box, "box") # create a mesh -mesh = smesh.Mesh(box, "Box compound : 2D triangle mesh") +mesh = smesh_builder.Mesh(box, "Box compound : 2D triangle mesh") algo = mesh.Segment() algo.NumberOfSegments(5) algo = mesh.Triangle() @@ -29,7 +28,7 @@ mesh.Compute() # Criterion : MULTI-CONNECTION 2D = 3 nb_conn = 3 -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_MultiConnection2D, SMESH.FT_EqualTo, nb_conn) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_MultiConnection2D, SMESH.FT_EqualTo, nb_conn) anIds = mesh.GetIdsFromFilter(aFilter) @@ -46,5 +45,3 @@ print("") # create a group aGroup = mesh.CreateEmptyGroup(SMESH.FACE, "Borders at multi-connection 2D = " + repr(nb_conn)) aGroup.Add(anIds) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/quality_controls_ex13.py b/doc/examples/quality_controls_ex13.py similarity index 62% rename from doc/salome/examples/quality_controls_ex13.py rename to doc/examples/quality_controls_ex13.py index 5cee2a8dd..994025f1d 100644 --- a/doc/salome/examples/quality_controls_ex13.py +++ b/doc/examples/quality_controls_ex13.py @@ -1,16 +1,11 @@ # Area -import SMESH_mechanic -import SMESH - -smesh = SMESH_mechanic.smesh -mesh = SMESH_mechanic.mesh -salome = SMESH_mechanic.salome +from mechanic import * # Criterion : AREA > 100. area_margin = 100. -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, area_margin) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, area_margin) anIds = mesh.GetIdsFromFilter(aFilter) @@ -27,5 +22,3 @@ print("") # create a group aGroup = mesh.CreateEmptyGroup(SMESH.FACE, "Area > " + repr(area_margin)) aGroup.Add(anIds) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/quality_controls_ex14.py b/doc/examples/quality_controls_ex14.py similarity index 63% rename from doc/salome/examples/quality_controls_ex14.py rename to doc/examples/quality_controls_ex14.py index ab939bae8..23f9f5e78 100644 --- a/doc/salome/examples/quality_controls_ex14.py +++ b/doc/examples/quality_controls_ex14.py @@ -1,16 +1,11 @@ # Taper -import SMESH_mechanic -import SMESH - -smesh = SMESH_mechanic.smesh -mesh = SMESH_mechanic.mesh -salome = SMESH_mechanic.salome +from mechanic import * # Criterion : Taper > 3e-20 taper_margin = 3e-20 -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Taper, SMESH.FT_MoreThan, taper_margin) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Taper, SMESH.FT_MoreThan, taper_margin) anIds = mesh.GetIdsFromFilter(aFilter) @@ -27,5 +22,3 @@ print("") # create a group aGroup = mesh.CreateEmptyGroup(SMESH.FACE, "Taper > " + repr(taper_margin)) aGroup.Add(anIds) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/quality_controls_ex15.py b/doc/examples/quality_controls_ex15.py similarity index 63% rename from doc/salome/examples/quality_controls_ex15.py rename to doc/examples/quality_controls_ex15.py index d7cb29071..2775b2073 100644 --- a/doc/salome/examples/quality_controls_ex15.py +++ b/doc/examples/quality_controls_ex15.py @@ -1,16 +1,11 @@ # Aspect Ratio -import SMESH_mechanic -import SMESH - -smesh = SMESH_mechanic.smesh -mesh = SMESH_mechanic.mesh -salome = SMESH_mechanic.salome +from mechanic import * # Criterion : ASPECT RATIO > 1.8 ar_margin = 1.8 -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_AspectRatio, SMESH.FT_MoreThan, ar_margin) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_AspectRatio, SMESH.FT_MoreThan, ar_margin) anIds = mesh.GetIdsFromFilter(aFilter) @@ -27,5 +22,3 @@ print("") # create a group aGroup = mesh.CreateEmptyGroup(SMESH.FACE, "Aspect Ratio > " + repr(ar_margin)) aGroup.Add(anIds) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/quality_controls_ex16.py b/doc/examples/quality_controls_ex16.py similarity index 63% rename from doc/salome/examples/quality_controls_ex16.py rename to doc/examples/quality_controls_ex16.py index 645b2cd23..df4ba5eae 100644 --- a/doc/salome/examples/quality_controls_ex16.py +++ b/doc/examples/quality_controls_ex16.py @@ -1,16 +1,11 @@ # Minimum Angle -import SMESH_mechanic -import SMESH - -smesh = SMESH_mechanic.smesh -mesh = SMESH_mechanic.mesh -salome = SMESH_mechanic.salome +from mechanic import * # Criterion : MINIMUM ANGLE < 35. min_angle = 35. -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_MinimumAngle, SMESH.FT_LessThan, min_angle) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_MinimumAngle, SMESH.FT_LessThan, min_angle) anIds = mesh.GetIdsFromFilter(aFilter) @@ -28,5 +23,3 @@ print("") aGroup = mesh.CreateEmptyGroup(SMESH.FACE, "Minimum Angle < " + repr(min_angle)) aGroup.Add(anIds) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/quality_controls_ex17.py b/doc/examples/quality_controls_ex17.py similarity index 63% rename from doc/salome/examples/quality_controls_ex17.py rename to doc/examples/quality_controls_ex17.py index a22f5e5ff..b8ebd9ae7 100644 --- a/doc/salome/examples/quality_controls_ex17.py +++ b/doc/examples/quality_controls_ex17.py @@ -1,16 +1,11 @@ # Warping -import SMESH_mechanic -import SMESH - -smesh = SMESH_mechanic.smesh -mesh = SMESH_mechanic.mesh -salome = SMESH_mechanic.salome +from mechanic import * # Criterion : WARP ANGLE > 1e-15 wa_margin = 1e-15 -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Warping, SMESH.FT_MoreThan, wa_margin) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Warping, SMESH.FT_MoreThan, wa_margin) anIds = mesh.GetIdsFromFilter(aFilter) @@ -28,5 +23,3 @@ print("") aGroup = mesh.CreateEmptyGroup(SMESH.FACE, "Warp > " + repr(wa_margin)) aGroup.Add(anIds) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/quality_controls_ex18.py b/doc/examples/quality_controls_ex18.py similarity index 62% rename from doc/salome/examples/quality_controls_ex18.py rename to doc/examples/quality_controls_ex18.py index 9f6f7a3f3..1ca2cb4b4 100644 --- a/doc/salome/examples/quality_controls_ex18.py +++ b/doc/examples/quality_controls_ex18.py @@ -1,16 +1,11 @@ # Skew -import SMESH_mechanic -import SMESH - -smesh = SMESH_mechanic.smesh -mesh = SMESH_mechanic.mesh -salome = SMESH_mechanic.salome +from mechanic import * # Criterion : Skew > 38. skew_margin = 38. -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_Skew, SMESH.FT_MoreThan, skew_margin) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_Skew, SMESH.FT_MoreThan, skew_margin) anIds = mesh.GetIdsFromFilter(aFilter) @@ -27,5 +22,3 @@ print("") # create a group aGroup = mesh.CreateEmptyGroup(SMESH.FACE, "Skew > " + repr(skew_margin)) aGroup.Add(anIds) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/quality_controls_ex19.py b/doc/examples/quality_controls_ex19.py similarity index 64% rename from doc/salome/examples/quality_controls_ex19.py rename to doc/examples/quality_controls_ex19.py index 62ef71030..daf2f8345 100644 --- a/doc/salome/examples/quality_controls_ex19.py +++ b/doc/examples/quality_controls_ex19.py @@ -1,16 +1,11 @@ # Element Diameter 2D -import SMESH_mechanic -import SMESH - -smesh = SMESH_mechanic.smesh -mesh = SMESH_mechanic.mesh -salome = SMESH_mechanic.salome +from mechanic import * # Criterion : ELEMENT DIAMETER 2D > 10 mel_2d_margin = 10 -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_MaxElementLength2D, SMESH.FT_MoreThan, mel_2d_margin) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_MaxElementLength2D, SMESH.FT_MoreThan, mel_2d_margin) anIds = mesh.GetIdsFromFilter(aFilter) @@ -27,5 +22,3 @@ print("") # create a group aGroup = mesh.CreateEmptyGroup(SMESH.FACE, "Element Diameter 2D > " + repr(mel_2d_margin)) aGroup.Add(anIds) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/quality_controls_ex20.py b/doc/examples/quality_controls_ex20.py similarity index 61% rename from doc/salome/examples/quality_controls_ex20.py rename to doc/examples/quality_controls_ex20.py index dd594c193..27679198c 100644 --- a/doc/salome/examples/quality_controls_ex20.py +++ b/doc/examples/quality_controls_ex20.py @@ -1,16 +1,11 @@ # Aspect Ratio 3D -import SMESH_mechanic_tetra -import SMESH - -smesh = SMESH_mechanic_tetra.smesh -mesh = SMESH_mechanic_tetra.mesh -salome = SMESH_mechanic_tetra.salome +from mechanic import * # Criterion : ASPECT RATIO 3D > 4.5 ar_margin = 4.5 -aFilter = smesh.GetFilter(SMESH.VOLUME, SMESH.FT_AspectRatio3D, SMESH.FT_MoreThan, ar_margin) +aFilter = smesh_builder.GetFilter(SMESH.VOLUME, SMESH.FT_AspectRatio3D, SMESH.FT_MoreThan, ar_margin) anIds = mesh.GetIdsFromFilter(aFilter) @@ -28,5 +23,3 @@ print("") aGroup = mesh.CreateEmptyGroup(SMESH.VOLUME, "Aspect Ratio 3D > " + repr(ar_margin)) aGroup.Add(anIds) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/quality_controls_ex21.py b/doc/examples/quality_controls_ex21.py similarity index 61% rename from doc/salome/examples/quality_controls_ex21.py rename to doc/examples/quality_controls_ex21.py index 683e314b7..1fb8bb4dd 100644 --- a/doc/salome/examples/quality_controls_ex21.py +++ b/doc/examples/quality_controls_ex21.py @@ -1,16 +1,11 @@ # Volume -import SMESH_mechanic_tetra -import SMESH - -smesh = SMESH_mechanic_tetra.smesh -mesh = SMESH_mechanic_tetra.mesh -salome = SMESH_mechanic_tetra.salome +from mechanic import * # Criterion : VOLUME < 7. volume_margin = 7. -aFilter = smesh.GetFilter(SMESH.VOLUME, SMESH.FT_Volume3D, SMESH.FT_LessThan, volume_margin) +aFilter = smesh_builder.GetFilter(SMESH.VOLUME, SMESH.FT_Volume3D, SMESH.FT_LessThan, volume_margin) anIds = mesh.GetIdsFromFilter(aFilter) @@ -29,5 +24,3 @@ print("") aGroup = mesh.CreateEmptyGroup(SMESH.VOLUME, "Volume < " + repr(volume_margin)) aGroup.Add(anIds) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/quality_controls_ex22.py b/doc/examples/quality_controls_ex22.py similarity index 62% rename from doc/salome/examples/quality_controls_ex22.py rename to doc/examples/quality_controls_ex22.py index 131091f8c..c33c3ecf1 100644 --- a/doc/salome/examples/quality_controls_ex22.py +++ b/doc/examples/quality_controls_ex22.py @@ -1,16 +1,11 @@ # Element Diameter 3D -import SMESH_mechanic_tetra -import SMESH - -smesh = SMESH_mechanic_tetra.smesh -mesh = SMESH_mechanic_tetra.mesh -salome = SMESH_mechanic_tetra.salome +from mechanic import * # Criterion : ELEMENT DIAMETER 3D > 10 mel_3d_margin = 10 -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_MaxElementLength3D, SMESH.FT_MoreThan, mel_3d_margin) +aFilter = smesh_builder.GetFilter(SMESH.FACE, SMESH.FT_MaxElementLength3D, SMESH.FT_MoreThan, mel_3d_margin) anIds = mesh.GetIdsFromFilter(aFilter) @@ -27,5 +22,3 @@ print("") # create a group aGroup = mesh.CreateEmptyGroup(SMESH.FACE, "Element Diameter 3D > " + repr(mel_3d_margin)) aGroup.Add(anIds) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/radial_prism_3d_algo.py b/doc/examples/radial_prism_3d_algo.py similarity index 63% rename from doc/salome/examples/radial_prism_3d_algo.py rename to doc/examples/radial_prism_3d_algo.py index fe29e52dc..a2623d846 100644 --- a/doc/salome/examples/radial_prism_3d_algo.py +++ b/doc/examples/radial_prism_3d_algo.py @@ -2,25 +2,25 @@ import salome salome.salome_init_without_session() + from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -# Create geometry: hollow sphere +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() -sphere_1 = geompy.MakeSphereR( 100 ) -sphere_2 = geompy.MakeSphereR( 50 ) +# Create geometry: hollow sphere -hollow_sphere = geompy.MakeCut( sphere_1, sphere_2, theName="hollow sphere") +sphere_1 = geom_builder.MakeSphereR( 100 ) +sphere_2 = geom_builder.MakeSphereR( 50 ) -faces = geompy.ExtractShapes( hollow_sphere, geompy.ShapeType["FACE"] ) +hollow_sphere = geom_builder.MakeCut( sphere_1, sphere_2, theName="hollow sphere") +faces = geom_builder.ExtractShapes( hollow_sphere, geom_builder.ShapeType["FACE"] ) # Create mesh -mesh = smesh.Mesh( hollow_sphere, "Mesh of hollow sphere" ) +mesh = smesh_builder.Mesh( hollow_sphere, "Mesh of hollow sphere" ) # assign Global Radial Prism algorithm prism_algo = mesh.Prism() diff --git a/doc/salome/examples/split_biquad.py b/doc/examples/split_biquad.py similarity index 57% rename from doc/salome/examples/split_biquad.py rename to doc/examples/split_biquad.py index f9d97b31a..90d544e36 100644 --- a/doc/salome/examples/split_biquad.py +++ b/doc/examples/split_biquad.py @@ -4,23 +4,23 @@ import salome salome.salome_init_without_session() from salome.geom import geomBuilder -geompy = geomBuilder.New() - from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # make a shape consisting of two quadranges -OY = geompy.MakeVectorDXDYDZ(0, 1, 0) -OY1 = geompy.MakeTranslation( OY, 1, 0, 0 ) -OY2 = geompy.MakeTranslation( OY, 2, 0, 0 ) -q1 = geompy.MakeQuad2Edges( OY, OY1 ) -q2 = geompy.MakeQuad2Edges( OY1, OY2 ) +OY = geom_builder.MakeVectorDXDYDZ(0, 1, 0) +OY1 = geom_builder.MakeTranslation( OY, 1, 0, 0 ) +OY2 = geom_builder.MakeTranslation( OY, 2, 0, 0 ) +q1 = geom_builder.MakeQuad2Edges( OY, OY1 ) +q2 = geom_builder.MakeQuad2Edges( OY1, OY2 ) -shape = geompy.Partition( [q1,q2], theName='shape' ) -ff = geompy.SubShapeAll( shape, geompy.ShapeType["FACE"], theName="quad" ) +shape = geom_builder.Partition( [q1,q2], theName='shape' ) +ff = geom_builder.SubShapeAll( shape, geom_builder.ShapeType["FACE"], theName="quad" ) # mesh one quadrange with quadrangless and the other with triangles -mesh = smesh.Mesh( shape ) +mesh = smesh_builder.Mesh( shape ) mesh.Segment().NumberOfSegments(1) mesh.Quadrangle() mesh.Triangle( ff[1] ) diff --git a/doc/salome/examples/test_homard_adapt.py b/doc/examples/test_homard_adapt.py similarity index 73% rename from doc/salome/examples/test_homard_adapt.py rename to doc/examples/test_homard_adapt.py index 030bb6f62..0e250eee0 100644 --- a/doc/salome/examples/test_homard_adapt.py +++ b/doc/examples/test_homard_adapt.py @@ -1,32 +1,31 @@ -#!/usr/bin/env python3 - - +import inspect +import os +import os.path as osp +import shutil +import tempfile import salome salome.salome_init_without_session() -import SMESH, SALOMEDS from salome.smesh import smeshBuilder import SMESHHOMARD smesh = smeshBuilder.New() -import os, inspect, tempfile, shutil - -data_dir = os.path.abspath(os.path.dirname(inspect.getfile(lambda: None))) +data_dir = osp.abspath(osp.join(osp.dirname(inspect.getfile(lambda: None)), 'data')) working_dir = tempfile.mkdtemp() -input_med = os.path.join (data_dir, "test_homard_adapt.med") -output_med_1 = os.path.join (working_dir, "test_1.00_Uniform_R_01.med") -output_med_2 = os.path.join (working_dir, "test_1.00_Uniform_R_02.med") -log_file_1 = os.path.join (working_dir, "test_1.00_Uniform_R_01.med.log") -log_file_2 = os.path.join (working_dir, "test_1.00_Uniform_R_02.med.log") +input_med = osp.join (data_dir, "test_homard_adapt.med") +output_med_1 = osp.join (working_dir, "test_1.00_Uniform_R_01.med") +output_med_2 = osp.join (working_dir, "test_1.00_Uniform_R_02.med") +log_file_1 = osp.join (working_dir, "test_1.00_Uniform_R_01.med.log") +log_file_2 = osp.join (working_dir, "test_1.00_Uniform_R_02.med.log") # Case 1: input: med file # output: med file, log file, published mesh -if os.path.isfile(output_med_1): +if osp.isfile(output_med_1): os.remove(output_med_1) -if os.path.isfile(log_file_1): +if osp.isfile(log_file_1): os.remove(log_file_1) smeshhomard = smesh.Adaptation("Uniform") @@ -43,13 +42,13 @@ smeshhomard.SetRemoveLogOnSuccess(False) smeshhomard.SetVerboseLevel(3) smeshhomard.Compute() -if os.path.isfile(output_med_1): +if osp.isfile(output_med_1): os.remove(output_med_1) else: print("Test Uniform refinement Case 1: Error: no output med file") assert(False) -if os.path.isfile(log_file_1): +if osp.isfile(log_file_1): os.remove(log_file_1) else: print("Test Uniform refinement Case 1: Error: no log file") @@ -57,9 +56,9 @@ else: # Case 2: input: mesh, boundaries # output: published mesh -if os.path.isfile(output_med_2): +if osp.isfile(output_med_2): os.remove(output_med_2) -if os.path.isfile(log_file_2): +if osp.isfile(log_file_2): os.remove(log_file_2) # prepare input mesh @@ -82,11 +81,11 @@ smeshhomard.SetRemoveLogOnSuccess(True) smeshhomard.SetVerboseLevel(0) smeshhomard.Compute() -if os.path.isfile(output_med_2): +if osp.isfile(output_med_2): print("Test Uniform refinement Case 2: Error: output med file has not been removed") assert(False) -if os.path.isfile(log_file_2): +if osp.isfile(log_file_2): print("Test Uniform refinement Case 2: Error: log file has not been removed") assert(False) diff --git a/doc/salome/examples/test_uniform_refinement.py b/doc/examples/test_uniform_refinement.py similarity index 70% rename from doc/salome/examples/test_uniform_refinement.py rename to doc/examples/test_uniform_refinement.py index 9ce353477..96139e01b 100644 --- a/doc/salome/examples/test_uniform_refinement.py +++ b/doc/examples/test_uniform_refinement.py @@ -1,29 +1,30 @@ -#!/usr/bin/env python3 +import inspect +import os +import os.path as osp +import shutil +import tempfile import salome salome.salome_init_without_session() -import SMESH, SALOMEDS from salome.smesh import smeshBuilder import SMESHHOMARD smesh = smeshBuilder.New() -import os, inspect, tempfile, shutil - -data_dir = os.path.abspath(os.path.dirname(inspect.getfile(lambda: None))) +data_dir = osp.abspath(osp.join(osp.dirname(inspect.getfile(lambda: None)), 'data')) working_dir = tempfile.mkdtemp() -input_med_1 = os.path.join (data_dir, "tutorial_4.00.med") -input_xao_1 = os.path.join (data_dir, "tutorial_4.xao") -output_med_1 = os.path.join (working_dir, "tutorial_4.00_Uniform_R.med") -log_file_1 = os.path.join (working_dir, "tutorial_4.00_Uniform_R.log") +input_med_1 = osp.join(data_dir, "tutorial_4.00.med") +input_xao_1 = osp.join(data_dir, "tutorial_4.xao") +output_med_1 = osp.join(working_dir, "tutorial_4.00_Uniform_R.med") +log_file_1 = osp.join(working_dir, "tutorial_4.00_Uniform_R.log") # Case 1: input: med file # output: med file, log file, published mesh -if os.path.isfile(output_med_1): +if osp.isfile(output_med_1): os.remove(output_med_1) -if os.path.isfile(log_file_1): +if osp.isfile(log_file_1): os.remove(log_file_1) cao_name = "CAO_PIQUAGE" @@ -43,13 +44,13 @@ smeshhomard.SetRemoveLogOnSuccess(False) smeshhomard.SetVerboseLevel(3) smeshhomard.Compute() -if os.path.isfile(output_med_1): +if osp.isfile(output_med_1): os.remove(output_med_1) else: print("Test Uniform refinement Case 1: Error: no output med file") assert(False) -if os.path.isfile(log_file_1): +if osp.isfile(log_file_1): os.remove(log_file_1) else: print("Test Uniform refinement Case 1: Error: no log file") @@ -57,14 +58,14 @@ else: # Case 2: input: mesh, boundaries # output: published mesh -input_med_2 = os.path.join (data_dir, "tutorial_5.00.med") -input_fr = os.path.join (data_dir, "tutorial_5.fr.med") -output_med_2 = os.path.join (working_dir, "tutorial_5.00_Uniform_R.med") -log_file_2 = os.path.join (working_dir, "tutorial_5.00_Uniform_R.log") +input_med_2 = osp.join(data_dir, "tutorial_5.00.med") +input_fr = osp.join(data_dir, "tutorial_5.fr.med") +output_med_2 = osp.join(working_dir, "tutorial_5.00_Uniform_R.med") +log_file_2 = osp.join(working_dir, "tutorial_5.00_Uniform_R.log") -if os.path.isfile(output_med_2): +if osp.isfile(output_med_2): os.remove(output_med_2) -if os.path.isfile(log_file_2): +if osp.isfile(log_file_2): os.remove(log_file_2) # prepare input mesh @@ -86,11 +87,11 @@ smeshhomard.SetRemoveLogOnSuccess(True) smeshhomard.SetVerboseLevel(0) smeshhomard.Compute() -if os.path.isfile(output_med_2): +if osp.isfile(output_med_2): print("Test Uniform refinement Case 2: Error: output med file has not been removed") assert(False) -if os.path.isfile(log_file_2): +if osp.isfile(log_file_2): print("Test Uniform refinement Case 2: Error: log file has not been removed") assert(False) diff --git a/doc/salome/examples/tests.set b/doc/examples/tests.set similarity index 85% rename from doc/salome/examples/tests.set rename to doc/examples/tests.set index 449620fc2..fd85b4a8d 100644 --- a/doc/salome/examples/tests.set +++ b/doc/examples/tests.set @@ -17,9 +17,12 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# examples that can't be used for testing because they use external mesher plug-ins +# The following tests cannot be executed with 'make test' because they use +# external meshing plug-ins. +# On the other hand these tests can be executed with 'salome test'. +# --------------------------------------------------------------------------- + SET(BAD_TESTS - 3dmesh.py a3DmeshOnModified2Dmesh.py creating_meshes_ex01.py creating_meshes_ex03.py @@ -36,6 +39,7 @@ SET(BAD_TESTS filters_ex35.py generate_flat_elements.py modifying_meshes_ex26.py + mesh_3d.py notebook_smesh.py quality_controls_ex06.py quality_controls_ex20.py @@ -43,20 +47,10 @@ SET(BAD_TESTS quality_controls_ex22.py viewing_meshes_ex01.py radial_prism_3d_algo.py - test_smeshplugins.py - blocFissure_01_without_session.py - blocFissure_02_without_session.py - blocFissure_03_without_session.py - blocFissure_04_without_session.py - blocFissure_05_without_session.py - blocFissure_06_without_session.py - blocFissure_07_without_session.py ) - IF(NOT WIN32) LIST(APPEND BAD_TESTS MGAdaptTests_without_session.py - test_smeshplugin_mg_tetra_parallele.py ) IF(MED_INT_IS_LONG) LIST(APPEND BAD_TESTS @@ -66,9 +60,11 @@ IF(NOT WIN32) ENDIF(MED_INT_IS_LONG) ENDIF(NOT WIN32) +# The following tests can be executed with both 'make test' and 'salome test'. +# ---------------------------------------------------------------------------- + SET(GOOD_TESTS cartesian_algo.py - create_penta_biquad.py creating_meshes_ex02.py creating_meshes_ex04.py creating_meshes_ex06.py @@ -89,7 +85,6 @@ SET(GOOD_TESTS defining_hypotheses_ex15.py defining_hypotheses_ex16.py defining_hypotheses_adaptive1d.py - extrusion_penta_biquad.py filters_ex01.py filters_ex03.py filters_ex04.py @@ -150,7 +145,6 @@ SET(GOOD_TESTS modifying_meshes_ex11.py modifying_meshes_ex12.py modifying_meshes_ex13.py - modifying_meshes_ex14.py modifying_meshes_ex15.py modifying_meshes_ex16.py modifying_meshes_ex17.py @@ -162,6 +156,7 @@ SET(GOOD_TESTS modifying_meshes_ex23.py modifying_meshes_ex24.py modifying_meshes_ex25.py + modifying_meshes_cut_triangles.py modifying_meshes_split_vol.py prism_3d_algo.py quality_controls_ex01.py @@ -201,16 +196,4 @@ SET(GOOD_TESTS split_biquad.py quad_medial_axis_algo.py defining_hypotheses_len_near_vertex.py - test_polyhedron_per_solid.py ) - -set(SESSION_FREE_TESTS - basic_geom_smesh_without_session.py - basic_shaper_smesh_without_session.py - shaper_smesh_groups_without_session.py - basic_smesh_output_with_mc_field.py - ssl_hdf5_symbols_conflicts.py - doublenodes_polyhedra.py -) - -SET(EXAMPLES_TESTS ${BAD_TESTS} ${GOOD_TESTS} ${SESSION_FREE_TESTS} testme.py) diff --git a/doc/salome/examples/transforming_meshes_ex01.py b/doc/examples/transforming_meshes_ex01.py similarity index 77% rename from doc/salome/examples/transforming_meshes_ex01.py rename to doc/examples/transforming_meshes_ex01.py index 93f5196c0..27dd16124 100644 --- a/doc/salome/examples/transforming_meshes_ex01.py +++ b/doc/examples/transforming_meshes_ex01.py @@ -1,8 +1,6 @@ # Translation -import SMESH_mechanic - -mesh = SMESH_mechanic.mesh +from mechanic import * # define translation vector vector = [-150., -150., 0.] diff --git a/doc/salome/examples/transforming_meshes_ex02.py b/doc/examples/transforming_meshes_ex02.py similarity index 67% rename from doc/salome/examples/transforming_meshes_ex02.py rename to doc/examples/transforming_meshes_ex02.py index 5b3ff287e..d516a795f 100644 --- a/doc/salome/examples/transforming_meshes_ex02.py +++ b/doc/examples/transforming_meshes_ex02.py @@ -2,11 +2,7 @@ import math -import SMESH_mechanic -import SMESH - -smesh = SMESH_mechanic.smesh -mesh = SMESH_mechanic.mesh +from mechanic import * # define rotation axis and angle axisXYZ = SMESH.AxisStruct(0., 0., 0., 5., 5., 20.) diff --git a/doc/salome/examples/transforming_meshes_ex03.py b/doc/examples/transforming_meshes_ex03.py similarity index 78% rename from doc/salome/examples/transforming_meshes_ex03.py rename to doc/examples/transforming_meshes_ex03.py index edd4cb438..07c8bb86a 100644 --- a/doc/salome/examples/transforming_meshes_ex03.py +++ b/doc/examples/transforming_meshes_ex03.py @@ -2,18 +2,18 @@ import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -Box = geompy.MakeBoxDXDYDZ(200, 200, 200) -f = geompy.SubShapeAllSorted(Box, geompy.ShapeType["FACE"]) +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() + +Box = geom_builder.MakeBoxDXDYDZ(200, 200, 200) +f = geom_builder.SubShapeAllSorted(Box, geom_builder.ShapeType["FACE"]) -Mesh1 = smesh.Mesh(f[0]) +Mesh1 = smesh_builder.Mesh(f[0]) Regular_1D = Mesh1.Segment() Nb_Segments_1 = Regular_1D.NumberOfSegments(3) Nb_Segments_1.SetDistrType( 0 ) diff --git a/doc/examples/transforming_meshes_ex04.py b/doc/examples/transforming_meshes_ex04.py new file mode 100644 index 000000000..cd421fe7e --- /dev/null +++ b/doc/examples/transforming_meshes_ex04.py @@ -0,0 +1,8 @@ +# Symmetry + +from mechanic import * + +# create a symmetrical copy of the mesh mirrored through a point +axis = SMESH.AxisStruct(0, 0, 0, 0, 0, 0) + +mesh.Mirror([], axis, smesh_builder.POINT, 1) diff --git a/doc/salome/examples/transforming_meshes_ex05.py b/doc/examples/transforming_meshes_ex05.py similarity index 77% rename from doc/salome/examples/transforming_meshes_ex05.py rename to doc/examples/transforming_meshes_ex05.py index 0adf0247c..4d3b349e9 100644 --- a/doc/salome/examples/transforming_meshes_ex05.py +++ b/doc/examples/transforming_meshes_ex05.py @@ -1,14 +1,12 @@ # Merging Nodes -import SMESH_mechanic, SMESH -mesh = SMESH_mechanic.mesh -smesh = SMESH_mechanic.smesh +from mechanic import * # criterion of coincidence Tolerance = 4.0 # find close nodes of triangle elements only -triangleFilter = smesh.GetFilter( SMESH.FACE, SMESH.FT_ElemGeomType,'=', SMESH.Geom_TRIANGLE ) +triangleFilter = smesh_builder.GetFilter( SMESH.FACE, SMESH.FT_ElemGeomType,'=', SMESH.Geom_TRIANGLE ) GroupsOfNodesOfTriangles = mesh.FindCoincidentNodesOnPart([triangleFilter],Tolerance) # prevent nodes located on geom edges from removal during merge: @@ -17,7 +15,6 @@ allSegs = mesh.MakeGroup( "all segments", SMESH.EDGE, SMESH.FT_ElemGeomType,'=', mesh.MergeNodes(GroupsOfNodesOfTriangles, NodesToKeep=allSegs) - # find close nodes in the whole mesh GroupsOfNodes = mesh.FindCoincidentNodes(Tolerance) diff --git a/doc/salome/examples/transforming_meshes_ex06.py b/doc/examples/transforming_meshes_ex06.py similarity index 69% rename from doc/salome/examples/transforming_meshes_ex06.py rename to doc/examples/transforming_meshes_ex06.py index 964449fe3..2600cb734 100644 --- a/doc/salome/examples/transforming_meshes_ex06.py +++ b/doc/examples/transforming_meshes_ex06.py @@ -1,39 +1,39 @@ # Merging Elements - import salome salome.salome_init_without_session() -from salome.geom import geomBuilder -geompy = geomBuilder.New() import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create a face to be meshed -px = geompy.MakeVertex(100., 0. , 0. ) -py = geompy.MakeVertex(0. , 100., 0. ) -pz = geompy.MakeVertex(0. , 0. , 100.) +px = geom_builder.MakeVertex(100., 0. , 0. ) +py = geom_builder.MakeVertex(0. , 100., 0. ) +pz = geom_builder.MakeVertex(0. , 0. , 100.) -vxy = geompy.MakeVector(px, py) -arc = geompy.MakeArc(py, pz, px) +vxy = geom_builder.MakeVector(px, py) +arc = geom_builder.MakeArc(py, pz, px) -wire = geompy.MakeWire([vxy, arc]) +wire = geom_builder.MakeWire([vxy, arc]) isPlanarFace = 1 -face1 = geompy.MakeFace(wire, isPlanarFace) -id_face1 = geompy.addToStudy(face1, "Face1") +face1 = geom_builder.MakeFace(wire, isPlanarFace) +id_face1 = geom_builder.addToStudy(face1, "Face1") # create a circle to be an extrusion path -px1 = geompy.MakeVertex( 100., 100., 0.) -py1 = geompy.MakeVertex(-100., -100., 0.) -pz1 = geompy.MakeVertex( 0., 0., 50.) +px1 = geom_builder.MakeVertex( 100., 100., 0.) +py1 = geom_builder.MakeVertex(-100., -100., 0.) +pz1 = geom_builder.MakeVertex( 0., 0., 50.) -circle = geompy.MakeCircleThreePnt(py1, pz1, px1) -id_circle = geompy.addToStudy(circle, "Path") +circle = geom_builder.MakeCircleThreePnt(py1, pz1, px1) +id_circle = geom_builder.addToStudy(circle, "Path") # create a 2D mesh on the face -trias = smesh.Mesh(face1, "Face : 2D mesh") +trias = smesh_builder.Mesh(face1, "Face : 2D mesh") algo1D = trias.Segment() algo1D.NumberOfSegments(6) @@ -46,7 +46,7 @@ trias.Compute() faceTriGroup = trias.Group( face1, "face triangles" ) # create a path mesh -circlemesh = smesh.Mesh(circle, "Path mesh") +circlemesh = smesh_builder.Mesh(circle, "Path mesh") algo = circlemesh.Segment() algo.NumberOfSegments(10) circlemesh.Compute() @@ -82,5 +82,3 @@ print("Number of elements after MergeEqualElements:") print("Edges : ", trias.NbEdges()) print("Faces : ", trias.NbFaces()) print("Volumes : ", trias.NbVolumes()) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/transforming_meshes_ex07.py b/doc/examples/transforming_meshes_ex07.py similarity index 54% rename from doc/salome/examples/transforming_meshes_ex07.py rename to doc/examples/transforming_meshes_ex07.py index 65865aca5..db7a6cb7c 100644 --- a/doc/salome/examples/transforming_meshes_ex07.py +++ b/doc/examples/transforming_meshes_ex07.py @@ -1,33 +1,31 @@ # Sew Meshes Border to Side - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create two faces of a box -box1 = geompy.MakeBox(0., 0., -10., 30., 20., 25.) -facesList1 = geompy.SubShapeAll(box1, geompy.ShapeType["FACE"]) +box1 = geom_builder.MakeBox(0., 0., -10., 30., 20., 25.) +facesList1 = geom_builder.SubShapeAll(box1, geom_builder.ShapeType["FACE"]) face1 = facesList1[2] -box2 = geompy.MakeBox(0., 5., 0., 20., 20., 15.) -facesList2 = geompy.SubShapeAll(box2, geompy.ShapeType["FACE"]) +box2 = geom_builder.MakeBox(0., 5., 0., 20., 20., 15.) +facesList2 = geom_builder.SubShapeAll(box2, geom_builder.ShapeType["FACE"]) face2 = facesList2[1] -edgesList = geompy.SubShapeAll(face2, geompy.ShapeType["EDGE"]) +edgesList = geom_builder.SubShapeAll(face2, geom_builder.ShapeType["EDGE"]) edge1 = edgesList[2] -aComp = geompy.MakeCompound([face1, face2]) -geompy.addToStudy(aComp, "Two faces") +aComp = geom_builder.MakeCompound([face1, face2]) +geom_builder.addToStudy(aComp, "Two faces") # create a mesh on two faces -mesh = smesh.Mesh(aComp, "Two faces : quadrangle mesh") +mesh = smesh_builder.Mesh(aComp, "Two faces : quadrangle mesh") algo1D = mesh.Segment() algo1D.NumberOfSegments(9) diff --git a/doc/salome/examples/transforming_meshes_ex08.py b/doc/examples/transforming_meshes_ex08.py similarity index 51% rename from doc/salome/examples/transforming_meshes_ex08.py rename to doc/examples/transforming_meshes_ex08.py index 542bb5f54..3de67b9df 100644 --- a/doc/salome/examples/transforming_meshes_ex08.py +++ b/doc/examples/transforming_meshes_ex08.py @@ -1,35 +1,31 @@ # Sew Conform Free Borders - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -import salome_notebook +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create two faces of the box -box1 = geompy.MakeBox(0., 0., -10., 20., 20., 15.) -facesList1 = geompy.SubShapeAll(box1, geompy.ShapeType["FACE"]) +box1 = geom_builder.MakeBox(0., 0., -10., 20., 20., 15.) +facesList1 = geom_builder.SubShapeAll(box1, geom_builder.ShapeType["FACE"]) face1 = facesList1[2] -box2 = geompy.MakeBox(0., 5., 0., 20., 20., 15.) -facesList2 = geompy.SubShapeAll(box2, geompy.ShapeType["FACE"]) +box2 = geom_builder.MakeBox(0., 5., 0., 20., 20., 15.) +facesList2 = geom_builder.SubShapeAll(box2, geom_builder.ShapeType["FACE"]) face2 = facesList2[1] -edgesList = geompy.SubShapeAll(face2, geompy.ShapeType["EDGE"]) +edgesList = geom_builder.SubShapeAll(face2, geom_builder.ShapeType["EDGE"]) edge1 = edgesList[2] -aComp = geompy.MakeCompound([face1, face2]) -geompy.addToStudy(aComp, "Two faces") +aComp = geom_builder.MakeCompound([face1, face2]) +geom_builder.addToStudy(aComp, "Two faces") # create a mesh on two faces -mesh = smesh.Mesh(aComp, "Two faces : quadrangle mesh") +mesh = smesh_builder.Mesh(aComp, "Two faces : quadrangle mesh") algo1D = mesh.Segment() algo1D.NumberOfSegments(9) diff --git a/doc/salome/examples/transforming_meshes_ex09.py b/doc/examples/transforming_meshes_ex09.py similarity index 67% rename from doc/salome/examples/transforming_meshes_ex09.py rename to doc/examples/transforming_meshes_ex09.py index bbc76691c..19ab5ed95 100644 --- a/doc/salome/examples/transforming_meshes_ex09.py +++ b/doc/examples/transforming_meshes_ex09.py @@ -1,28 +1,26 @@ # Sew Free Borders - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # make two not sewed quadranges -OY0 = geompy.MakeVectorDXDYDZ(0, 1, 0) -OY1 = geompy.MakeTranslation( OY0, 1, 0, 0, theName="OY1" ) -OY2 = geompy.MakeTranslation( OY0, 1.01, 0, 0, theName="OY2" ) -OY3 = geompy.MakeTranslation( OY0, 2, 0, 0 ) -q1 = geompy.MakeQuad2Edges( OY0, OY1 ) -q2 = geompy.MakeQuad2Edges( OY2, OY3 ) +OY0 = geom_builder.MakeVectorDXDYDZ(0, 1, 0) +OY1 = geom_builder.MakeTranslation( OY0, 1, 0, 0, theName="OY1" ) +OY2 = geom_builder.MakeTranslation( OY0, 1.01, 0, 0, theName="OY2" ) +OY3 = geom_builder.MakeTranslation( OY0, 2, 0, 0 ) +q1 = geom_builder.MakeQuad2Edges( OY0, OY1 ) +q2 = geom_builder.MakeQuad2Edges( OY2, OY3 ) -shape = geompy.MakeCompound( [q1,q2], theName='shape' ) +shape = geom_builder.MakeCompound( [q1,q2], theName='shape' ) # make a non-uniform quadrangle mesh on two faces -mesh = smesh.Mesh(shape, "Two faces : quadrangle mesh") +mesh = smesh_builder.Mesh(shape, "Two faces : quadrangle mesh") mesh.Segment().Arithmetic1D( 0.1, 0.4 ) mesh.Segment(q1).NumberOfSegments( 5 ) mesh.Quadrangle() @@ -47,4 +45,3 @@ res = mesh.SewFreeBorders(FirstNodeID1, SecondNodeID1, LastNodeID1, CreatePolygons, CreatePolyedrs ) print(res) print("nb polygons:", mesh.NbPolygons()) - diff --git a/doc/salome/examples/transforming_meshes_ex10.py b/doc/examples/transforming_meshes_ex10.py similarity index 63% rename from doc/salome/examples/transforming_meshes_ex10.py rename to doc/examples/transforming_meshes_ex10.py index f3de43d21..36c2f5c22 100644 --- a/doc/salome/examples/transforming_meshes_ex10.py +++ b/doc/examples/transforming_meshes_ex10.py @@ -2,25 +2,25 @@ import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create two boxes -box1 = geompy.MakeBox(0., 0., 0., 10., 10., 10.) -box2 = geompy.MakeBox(0., 15., 0., 20., 25., 10.) +box1 = geom_builder.MakeBox(0., 0., 0., 10., 10., 10.) +box2 = geom_builder.MakeBox(0., 15., 0., 20., 25., 10.) -EdgesList = geompy.SubShapeAll(box2, geompy.ShapeType["EDGE"]) +EdgesList = geom_builder.SubShapeAll(box2, geom_builder.ShapeType["EDGE"]) -aComp = geompy.MakeCompound([box1, box2]) -geompy.addToStudy(aComp, "Two boxes") +aComp = geom_builder.MakeCompound([box1, box2]) +geom_builder.addToStudy(aComp, "Two boxes") # create a mesh on two boxes -mesh = smesh.Mesh(aComp, "Sew Side Elements") +mesh = smesh_builder.Mesh(aComp, "Sew Side Elements") algo1D = mesh.Segment() algo1D.NumberOfSegments(2) @@ -35,23 +35,23 @@ mesh.Compute() # sew side elements # find elements to sew -face1 = geompy.GetFaceNearPoint( aComp, geompy.MakeVertex( 5, 10, 5 )) +face1 = geom_builder.GetFaceNearPoint( aComp, geom_builder.MakeVertex( 5, 10, 5 )) IDsOfSide1Elements = mesh.GetSubMeshElementsId( face1 ) print("side faces 1:",IDsOfSide1Elements) -face1Translated = geompy.MakeTranslation( face1, 0,5,0 ) -faceFilter = smesh.GetFilter( SMESH.FACE, SMESH.FT_BelongToGeom,'=', face1Translated ) +face1Translated = geom_builder.MakeTranslation( face1, 0,5,0 ) +faceFilter = smesh_builder.GetFilter( SMESH.FACE, SMESH.FT_BelongToGeom,'=', face1Translated ) IDsOfSide2Elements = mesh.GetIdsFromFilter( faceFilter ) print("side faces 2:",IDsOfSide2Elements) # find corresponding nodes on sides -edge1 = geompy.GetEdgeNearPoint( aComp, geompy.MakeVertex( 0, 10, 5 )) +edge1 = geom_builder.GetEdgeNearPoint( aComp, geom_builder.MakeVertex( 0, 10, 5 )) segs1 = mesh.GetSubMeshElementsId( edge1 ) # mesh segments generated on edge1 NodeID1OfSide1ToMerge = mesh.GetElemNode( segs1[0], 0 ) NodeID2OfSide1ToMerge = mesh.GetElemNode( segs1[0], 1 ) print("nodes of side1:", [NodeID1OfSide1ToMerge,NodeID2OfSide1ToMerge]) -edge2 = geompy.GetEdgeNearPoint( aComp, geompy.MakeVertex( 0, 15, 5 )) +edge2 = geom_builder.GetEdgeNearPoint( aComp, geom_builder.MakeVertex( 0, 15, 5 )) segs2 = mesh.GetSubMeshElementsId( edge2 ) # mesh segments generated on edge2 NodeID1OfSide2ToMerge = mesh.GetElemNode( segs2[0], 0 ) NodeID2OfSide2ToMerge = mesh.GetElemNode( segs2[0], 1 ) diff --git a/doc/salome/examples/transforming_meshes_ex11.py b/doc/examples/transforming_meshes_ex11.py similarity index 91% rename from doc/salome/examples/transforming_meshes_ex11.py rename to doc/examples/transforming_meshes_ex11.py index d4137e41d..5fddd3015 100644 --- a/doc/salome/examples/transforming_meshes_ex11.py +++ b/doc/examples/transforming_meshes_ex11.py @@ -1,23 +1,21 @@ # Duplicate nodes or/and elements - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() - import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # Create a box -box = geompy.MakeBox(0., 0., 0., 100., 200., 300.) +box = geom_builder.MakeBox(0., 0., 0., 100., 200., 300.) # Define hexa mesh on a box -mesh = smesh.Mesh(box, "Mesh") +mesh = smesh_builder.Mesh(box, "Mesh") mesh.Segment().NumberOfSegments(7) mesh.Quadrangle() mesh.Hexahedron() @@ -89,7 +87,3 @@ mesh.DoubleElements( edges, edges.GetName() ) # Duplicate two first edges of the mesh mesh.DoubleElements([ 1, 2 ]) - -# Update object browser -if salome.sg.hasDesktop(): - salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/transforming_meshes_ex12.py b/doc/examples/transforming_meshes_ex12.py similarity index 79% rename from doc/salome/examples/transforming_meshes_ex12.py rename to doc/examples/transforming_meshes_ex12.py index 65b05d7d5..edf912024 100644 --- a/doc/salome/examples/transforming_meshes_ex12.py +++ b/doc/examples/transforming_meshes_ex12.py @@ -1,26 +1,23 @@ # Create boundary elements - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -import salome_notebook +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() -box = geompy.MakeBoxDXDYDZ(100, 100, 100) -gFaces = geompy.SubShapeAllSorted(box, geompy.ShapeType["FACE"]) +box = geom_builder.MakeBoxDXDYDZ(100, 100, 100) +gFaces = geom_builder.SubShapeAllSorted(box, geom_builder.ShapeType["FACE"]) f1,f2 = gFaces[0],gFaces[1] -geompy.addToStudy(box,"box") -geompy.addToStudyInFather(box,f1,"face1") -geompy.addToStudyInFather(box,f2,"face2") +geom_builder.addToStudy(box,"box") +geom_builder.addToStudyInFather(box,f1,"face1") +geom_builder.addToStudyInFather(box,f2,"face2") -twoFaces = geompy.MakeCompound([f1,f2]) +twoFaces = geom_builder.MakeCompound([f1,f2]) ## ----------- ## @@ -29,7 +26,7 @@ twoFaces = geompy.MakeCompound([f1,f2]) ## ----------- dim = SMESH.BND_2DFROM3D -init_mesh = smesh.Mesh(box, "box") +init_mesh = smesh_builder.Mesh(box, "box") init_mesh.AutomaticHexahedralization() # it makes 3 x 3 x 3 hexahedrons # remove some faces @@ -39,7 +36,7 @@ rm_face = faces[ : nb_faces // 2] init_mesh.RemoveElements( rm_face ) # restore boundary in this mesh -mesh = smesh.CopyMesh( init_mesh, "2D from 3D") +mesh = smesh_builder.CopyMesh( init_mesh, "2D from 3D") groupName = "bnd 2D" nb, new_mesh, new_group = mesh.MakeBoundaryElements(dim, groupName) @@ -51,7 +48,6 @@ nb, new_mesh, new_group = init_mesh.MakeBoundaryElements(dim, groupName, meshNam meshName = init_mesh.GetName() + " + boundary" nb, new_mesh, new_group = init_mesh.MakeBoundaryElements(dim, groupName, meshName, toCopyAll=True) - ## ----------- ## ## 1D from 2D @@ -59,7 +55,7 @@ nb, new_mesh, new_group = init_mesh.MakeBoundaryElements(dim, groupName, meshNam ## ----------- dim = SMESH.BND_1DFROM2D -init_mesh = smesh.Mesh(f1, "2D mesh") +init_mesh = smesh_builder.Mesh(f1, "2D mesh") init_mesh.AutomaticHexahedralization() # remove some edges @@ -70,7 +66,7 @@ init_mesh.RemoveElements( rm_edge ) # restore boundary edges in this mesh -mesh = smesh.CopyMesh( init_mesh, "1D from 2D") +mesh = smesh_builder.CopyMesh( init_mesh, "1D from 2D") groupName = "bnd 1D" nb, new_mesh, new_group = mesh.MakeBoundaryElements(dim, groupName) @@ -82,8 +78,6 @@ nb, new_mesh, new_group = init_mesh.MakeBoundaryElements(dim, groupName, meshNam meshName = init_mesh.GetName() + " + boundary" nb, new_mesh, new_group = init_mesh.MakeBoundaryElements(dim, groupName, meshName, toCopyAll=True) - - ## ------------------ ## ## 1D from 2D GROUPS @@ -91,7 +85,7 @@ nb, new_mesh, new_group = init_mesh.MakeBoundaryElements(dim, groupName, meshNam ## ------------------ dim = SMESH.BND_1DFROM3D -init_mesh = smesh.Mesh(box, "box") +init_mesh = smesh_builder.Mesh(box, "box") init_mesh.AutomaticHexahedralization() # it makes 3 x 3 x 3 hexahedrons # remove all edges rm_edges = init_mesh.GetElementsByType( SMESH.EDGE ) @@ -102,7 +96,7 @@ fGroup1 = init_mesh.Group( f1, "f1" ) fGroup2 = init_mesh.Group( f2, "f2" ) # make 1D boundary around groups in this mesh -mesh = smesh.CopyMesh( init_mesh, "1D from 2D groups", toCopyGroups=True) +mesh = smesh_builder.CopyMesh( init_mesh, "1D from 2D groups", toCopyGroups=True) groups = mesh.GetGroups() nb, new_mesh, new_group = mesh.MakeBoundaryElements(dim, groupName,groups=groups) diff --git a/doc/salome/examples/transforming_meshes_ex13.py b/doc/examples/transforming_meshes_ex13.py similarity index 70% rename from doc/salome/examples/transforming_meshes_ex13.py rename to doc/examples/transforming_meshes_ex13.py index d4b553963..d8fade895 100644 --- a/doc/salome/examples/transforming_meshes_ex13.py +++ b/doc/examples/transforming_meshes_ex13.py @@ -1,37 +1,34 @@ # Reorient faces - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -import salome_notebook +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create a geometry consisting of two faces -box = geompy.MakeBoxDXDYDZ( 10, 10, 10 ) -faces = geompy.SubShapeAllSorted( box, geompy.ShapeType["FACE"]) +box = geom_builder.MakeBoxDXDYDZ( 10, 10, 10 ) +faces = geom_builder.SubShapeAllSorted( box, geom_builder.ShapeType["FACE"]) -shape = geompy.MakeCompound( faces[:2] ) -faces = geompy.SubShapeAll( shape, geompy.ShapeType["FACE"] ) -geompy.addToStudy( shape, "shape") -geompy.addToStudyInFather( shape, faces[0], "faces[0]") -geompy.addToStudyInFather( shape, faces[1], "faces[1]") +shape = geom_builder.MakeCompound( faces[:2] ) +faces = geom_builder.SubShapeAll( shape, geom_builder.ShapeType["FACE"] ) +geom_builder.addToStudy( shape, "shape") +geom_builder.addToStudyInFather( shape, faces[0], "faces[0]") +geom_builder.addToStudyInFather( shape, faces[1], "faces[1]") # create a 2D mesh -mesh = smesh.Mesh( shape, "test_Reorient2D") +mesh = smesh_builder.Mesh( shape, "test_Reorient2D") mesh.AutomaticHexahedralization(0.5) localAlgo = mesh.Segment(faces[0]) localAlgo.NumberOfSegments( 11 ) mesh.Compute() group = mesh.Group( faces[1] ) -vec = geompy.MakeVectorDXDYDZ( 1, 1, 1 ) +vec = geom_builder.MakeVectorDXDYDZ( 1, 1, 1 ) # ============ # Reorient2D() @@ -47,12 +44,12 @@ mesh.Reorient2D( mesh, vec, mesh.NbElements() ) # 2DObject - a sub-mesh # Direction - components of a vector # FaceOrPoint - a GEOM object (vertex) -mesh.Reorient2D( localAlgo.GetSubMesh(), [ 1, -1, 1 ], geompy.GetFirstVertex( vec )) +mesh.Reorient2D( localAlgo.GetSubMesh(), [ 1, -1, 1 ], geom_builder.GetFirstVertex( vec )) # # 2DObject - a group of faces # Direction - a SMESH.DirStruct structure # FaceOrPoint - coordinates of a point -mesh.Reorient2D( group, smesh.MakeDirStruct( -10, 1, 10 ), [0,0,0]) +mesh.Reorient2D( group, smesh_builder.MakeDirStruct( -10, 1, 10 ), [0,0,0]) # # FaceOrPoint - a SMESH.PointStruct structure mesh.Reorient2D( localAlgo.GetSubMesh().GetIDs(), [10,1,0], SMESH.PointStruct(0,0,0)) @@ -73,7 +70,7 @@ mesh.Reorient2DByNeighbours([group]) # Use Reorient2DBy3D() to orient faces of 2 geom faces to have their normal pointing inside volumes -mesh3D = smesh.Mesh( box, '3D mesh') +mesh3D = smesh_builder.Mesh( box, '3D mesh') mesh3D.AutomaticHexahedralization(0.5) group0 = mesh3D.Group( faces[0] ) group1 = mesh3D.Group( faces[1] ) @@ -85,4 +82,3 @@ print("Nb reoriented faces:", nbRev) # orient the reversed faces back nbRev = mesh3D.Reorient2DBy3D( mesh3D, mesh3D, theOutsideNormal=True) print("Nb re-reoriented faces:", nbRev) - diff --git a/doc/salome/examples/use_existing_faces.py b/doc/examples/use_existing_faces.py similarity index 67% rename from doc/salome/examples/use_existing_faces.py rename to doc/examples/use_existing_faces.py index 0d4139255..4cdb9f26a 100644 --- a/doc/salome/examples/use_existing_faces.py +++ b/doc/examples/use_existing_faces.py @@ -1,19 +1,16 @@ # Usage of "Use Faces to be Created Manually" algorithm - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -import salome_notebook + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # define my 2D algorithm -def my2DMeshing(geomFace, geom_builder, smesh_builder): +def my2DMeshing(geomFace, mesh): import numpy as np # find gravity center of geomFace @@ -42,9 +39,9 @@ def my2DMeshing(geomFace, geom_builder, smesh_builder): nodes = [] for edge, isForward in sortedEdges: v1,v2 = geom_builder.SubShapeAll( edge, geom_builder.ShapeType["VERTEX"]) - edgeNodes = smesh_builder.GetSubMeshNodesId( v2, all=False ) + \ - smesh_builder.GetSubMeshNodesId( edge, all=False ) + \ - smesh_builder.GetSubMeshNodesId( v1, all=False ) + edgeNodes = mesh.GetSubMeshNodesId( v2, all=False ) + \ + mesh.GetSubMeshNodesId( edge, all=False ) + \ + mesh.GetSubMeshNodesId( v1, all=False ) if not isForward: edgeNodes.reverse() nodes.extend( edgeNodes[:-1] ) @@ -53,10 +50,10 @@ def my2DMeshing(geomFace, geom_builder, smesh_builder): r2 = 1 - r1 nodesInside = [] for n in nodes: - nXYZ = smesh_builder.GetNodeXYZ( n ) + nXYZ = mesh.GetNodeXYZ( n ) newXYZ = np.add( np.multiply( r1, gcXYZ ), np.multiply( r2, nXYZ )) - nodesInside.append( smesh_builder.AddNode( newXYZ[0], newXYZ[1], newXYZ[2] )) - smesh_builder.SetNodeOnFace( nodesInside[-1], geomFace, 0, 0 ) + nodesInside.append( mesh.AddNode( newXYZ[0], newXYZ[1], newXYZ[2] )) + mesh.SetNodeOnFace( nodesInside[-1], geomFace, 0, 0 ) # find out orientation of faces to create # geomFace normal @@ -68,8 +65,8 @@ def my2DMeshing(geomFace, geom_builder, smesh_builder): if np.dot( faceNormXYZ, outDirXYZ ) < 0: # reversed face faceNormXYZ = np.multiply( -1., faceNormXYZ ) # mesh face normal - e1 = np.subtract( smesh_builder.GetNodeXYZ( nodes[0] ), smesh_builder.GetNodeXYZ( nodes[1] )) - e2 = np.subtract( smesh_builder.GetNodeXYZ( nodes[0] ), smesh_builder.GetNodeXYZ( nodesInside[0] )) + e1 = np.subtract( mesh.GetNodeXYZ( nodes[0] ), mesh.GetNodeXYZ( nodes[1] )) + e2 = np.subtract( mesh.GetNodeXYZ( nodes[0] ), mesh.GetNodeXYZ( nodesInside[0] )) meshNorm = np.cross( e1, e2 ) # faces orientation reverse = ( np.dot( faceNormXYZ, meshNorm ) < 0 ) @@ -80,29 +77,29 @@ def my2DMeshing(geomFace, geom_builder, smesh_builder): n1, n2, n3, n4 = nodes[iN-1], nodes[iN-2], nodesInside[iN-2], nodesInside[iN-1] iN -= 1 if reverse: - f = smesh_builder.AddFace( [n1, n2, n3, n4] ) + f = mesh.AddFace( [n1, n2, n3, n4] ) else: - f = smesh_builder.AddFace( [n4, n3, n2, n1] ) + f = mesh.AddFace( [n4, n3, n2, n1] ) # new faces must be assigned to geometry to allow 3D algorithm finding them - smesh_builder.SetMeshElementOnShape( f, geomFace ) + mesh.SetMeshElementOnShape( f, geomFace ) if reverse: nodesInside.reverse() - polygon = smesh_builder.AddPolygonalFace( nodesInside ) - smesh_builder.SetMeshElementOnShape( polygon, geomFace ) + polygon = mesh.AddPolygonalFace( nodesInside ) + mesh.SetMeshElementOnShape( polygon, geomFace ) return # create geometry and get faces to mesh with my2DMeshing() -box = geompy.MakeBoxDXDYDZ( 100, 100, 100 ) -f1 = geompy.SubShapeAll( box, geompy.ShapeType["FACE"])[0] -f2 = geompy.GetOppositeFace( box, f1 ) -geompy.addToStudy( box, "box" ) -geompy.addToStudy( f1, "f1" ) -geompy.addToStudy( f2, "f2" ) +box = geom_builder.MakeBoxDXDYDZ( 100, 100, 100 ) +f1 = geom_builder.SubShapeAll( box, geom_builder.ShapeType["FACE"])[0] +f2 = geom_builder.GetOppositeFace( box, f1 ) +geom_builder.addToStudy( box, "box" ) +geom_builder.addToStudy( f1, "f1" ) +geom_builder.addToStudy( f2, "f2" ) # compute 1D mesh -mesh = smesh.Mesh( box ) +mesh = smesh_builder.Mesh( box ) mesh.Segment().NumberOfSegments( 5 ) mesh.Compute() @@ -110,8 +107,8 @@ mesh.Compute() mesh.Quadrangle() mesh.UseExistingFaces(f1) # UseExistingFaces() allows using my2DMeshing(); mesh.UseExistingFaces(f2) # assign UseExistingFaces() BEFORE calling my2DMeshing()! -my2DMeshing(f1, geom_builder=geompy, smesh_builder=mesh) -my2DMeshing(f2, geom_builder=geompy, smesh_builder=mesh) +my2DMeshing(f1, mesh) +my2DMeshing(f2, mesh) assert mesh.Compute() # compute 3D mesh diff --git a/doc/salome/examples/viewing_meshes_ex01.py b/doc/examples/viewing_meshes_ex01.py similarity index 82% rename from doc/salome/examples/viewing_meshes_ex01.py rename to doc/examples/viewing_meshes_ex01.py index 0e8899eeb..e75f036a3 100644 --- a/doc/salome/examples/viewing_meshes_ex01.py +++ b/doc/examples/viewing_meshes_ex01.py @@ -1,23 +1,22 @@ # Viewing Mesh Infos - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # create a box -box = geompy.MakeBox(0., 0., 0., 20., 20., 20.) -geompy.addToStudy(box, "box") -[Face_1,Face_2,Face_3,Face_4,Face_5,Face_5] = geompy.SubShapeAll(box, geompy.ShapeType["FACE"]) +box = geom_builder.MakeBox(0., 0., 0., 20., 20., 20.) +geom_builder.addToStudy(box, "box") +[Face_1,Face_2,Face_3,Face_4,Face_5,Face_5] = geom_builder.SubShapeAll(box, geom_builder.ShapeType["FACE"]) # create a mesh -tetra = smesh.Mesh(box, "MeshBox") +tetra = smesh_builder.Mesh(box, "MeshBox") algo1D = tetra.Segment() algo1D.NumberOfSegments(3) @@ -60,7 +59,7 @@ print(" polyhedrons : ", tetra.NbPolyhedrons()) # Get Information About Mesh by GetMeshInfo print("\nInformation about mesh by GetMeshInfo:") -info = smesh.GetMeshInfo(tetra) +info = smesh_builder.GetMeshInfo(tetra) keys = list(info.keys()); keys.sort() for i in keys: print(" %s : %d" % ( i, info[i] )) @@ -68,7 +67,7 @@ for i in keys: # Get Information About Group by GetMeshInfo print("\nInformation about group by GetMeshInfo:") -info = smesh.GetMeshInfo(group) +info = smesh_builder.GetMeshInfo(group) keys = list(info.keys()); keys.sort() for i in keys: print(" %s : %d" % ( i, info[i] )) @@ -76,7 +75,7 @@ for i in keys: # Get Information About SubMesh by GetMeshInfo print("\nInformation about Submesh by GetMeshInfo:") -info = smesh.GetMeshInfo(submesh) +info = smesh_builder.GetMeshInfo(submesh) keys = list(info.keys()); keys.sort() for i in keys: print(" %s : %d" % ( i, info[i] )) diff --git a/doc/salome/examples/viewing_meshes_ex02.py b/doc/examples/viewing_meshes_ex02.py similarity index 87% rename from doc/salome/examples/viewing_meshes_ex02.py rename to doc/examples/viewing_meshes_ex02.py index 402e89b97..a2f2ed17a 100644 --- a/doc/salome/examples/viewing_meshes_ex02.py +++ b/doc/examples/viewing_meshes_ex02.py @@ -1,21 +1,20 @@ # Find Element by Point - import salome salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() -import SMESH, SALOMEDS +import SMESH +from salome.geom import geomBuilder from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() + +geom_builder = geomBuilder.New() +smesh_builder = smeshBuilder.New() # Create a geometry to mesh -box = geompy.MakeBoxDXDYDZ(100,100,100) +box = geom_builder.MakeBoxDXDYDZ(100,100,100) # Create a mesh -mesh = smesh.Mesh(box,"Mesh") +mesh = smesh_builder.Mesh(box,"Mesh") mesh.AutomaticHexahedralization() mesh.Compute() diff --git a/doc/salome/gui/SMESH/CMakeLists.txt b/doc/gui/CMakeLists.txt similarity index 100% rename from doc/salome/gui/SMESH/CMakeLists.txt rename to doc/gui/CMakeLists.txt diff --git a/doc/salome/gui/SMESH/collect_mesh_methods.py b/doc/gui/collect_mesh_methods.py similarity index 100% rename from doc/salome/gui/SMESH/collect_mesh_methods.py rename to doc/gui/collect_mesh_methods.py diff --git a/doc/salome/gui/SMESH/conf.py.in b/doc/gui/conf.py.in similarity index 100% rename from doc/salome/gui/SMESH/conf.py.in rename to doc/gui/conf.py.in diff --git a/doc/salome/gui/SMESH/images/2d_from_3d_dlg.png b/doc/gui/images/2d_from_3d_dlg.png similarity index 100% rename from doc/salome/gui/SMESH/images/2d_from_3d_dlg.png rename to doc/gui/images/2d_from_3d_dlg.png diff --git a/doc/salome/gui/SMESH/images/2d_from_3d_example.png b/doc/gui/images/2d_from_3d_example.png similarity index 100% rename from doc/salome/gui/SMESH/images/2d_from_3d_example.png rename to doc/gui/images/2d_from_3d_example.png diff --git a/doc/salome/gui/SMESH/images/2d_from_3d_ico.png b/doc/gui/images/2d_from_3d_ico.png similarity index 100% rename from doc/salome/gui/SMESH/images/2d_from_3d_ico.png rename to doc/gui/images/2d_from_3d_ico.png diff --git a/doc/salome/gui/SMESH/images/2d_from_3d_menu.png b/doc/gui/images/2d_from_3d_menu.png similarity index 100% rename from doc/salome/gui/SMESH/images/2d_from_3d_menu.png rename to doc/gui/images/2d_from_3d_menu.png diff --git a/doc/salome/gui/SMESH/images/Clipping_Absolute.png b/doc/gui/images/Clipping_Absolute.png similarity index 100% rename from doc/salome/gui/SMESH/images/Clipping_Absolute.png rename to doc/gui/images/Clipping_Absolute.png diff --git a/doc/salome/gui/SMESH/images/Clipping_Relative.png b/doc/gui/images/Clipping_Relative.png similarity index 100% rename from doc/salome/gui/SMESH/images/Clipping_Relative.png rename to doc/gui/images/Clipping_Relative.png diff --git a/doc/salome/gui/SMESH/images/Nut_sharp_edges.png b/doc/gui/images/Nut_sharp_edges.png similarity index 100% rename from doc/salome/gui/SMESH/images/Nut_sharp_edges.png rename to doc/gui/images/Nut_sharp_edges.png diff --git a/doc/salome/gui/SMESH/images/a-arithmetic1d.png b/doc/gui/images/a-arithmetic1d.png similarity index 100% rename from doc/salome/gui/SMESH/images/a-arithmetic1d.png rename to doc/gui/images/a-arithmetic1d.png diff --git a/doc/salome/gui/SMESH/images/a-averagelength.png b/doc/gui/images/a-averagelength.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/a-averagelength.png rename to doc/gui/images/a-averagelength.png diff --git a/doc/salome/gui/SMESH/images/a-clipping2.png b/doc/gui/images/a-clipping2.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/a-clipping2.png rename to doc/gui/images/a-clipping2.png diff --git a/doc/salome/gui/SMESH/images/a-creategroup.png b/doc/gui/images/a-creategroup.png similarity index 100% rename from doc/salome/gui/SMESH/images/a-creategroup.png rename to doc/gui/images/a-creategroup.png diff --git a/doc/salome/gui/SMESH/images/a-createpolyhedralvolume.png b/doc/gui/images/a-createpolyhedralvolume.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/a-createpolyhedralvolume.png rename to doc/gui/images/a-createpolyhedralvolume.png diff --git a/doc/salome/gui/SMESH/images/a-cuttingofquadrangles.png b/doc/gui/images/a-cuttingofquadrangles.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/a-cuttingofquadrangles.png rename to doc/gui/images/a-cuttingofquadrangles.png diff --git a/doc/salome/gui/SMESH/images/a-deflection1d.png b/doc/gui/images/a-deflection1d.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/a-deflection1d.png rename to doc/gui/images/a-deflection1d.png diff --git a/doc/salome/gui/SMESH/images/a-filteronfaces.png b/doc/gui/images/a-filteronfaces.png similarity index 100% rename from doc/salome/gui/SMESH/images/a-filteronfaces.png rename to doc/gui/images/a-filteronfaces.png diff --git a/doc/salome/gui/SMESH/images/a-geometric1d.png b/doc/gui/images/a-geometric1d.png similarity index 100% rename from doc/salome/gui/SMESH/images/a-geometric1d.png rename to doc/gui/images/a-geometric1d.png diff --git a/doc/salome/gui/SMESH/images/a-maxelarea.png b/doc/gui/images/a-maxelarea.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/a-maxelarea.png rename to doc/gui/images/a-maxelarea.png diff --git a/doc/salome/gui/SMESH/images/a-maxelvolume.png b/doc/gui/images/a-maxelvolume.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/a-maxelvolume.png rename to doc/gui/images/a-maxelvolume.png diff --git a/doc/salome/gui/SMESH/images/a-maxsize1d.png b/doc/gui/images/a-maxsize1d.png similarity index 100% rename from doc/salome/gui/SMESH/images/a-maxsize1d.png rename to doc/gui/images/a-maxsize1d.png diff --git a/doc/salome/gui/SMESH/images/a-nbsegments1.png b/doc/gui/images/a-nbsegments1.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/a-nbsegments1.png rename to doc/gui/images/a-nbsegments1.png diff --git a/doc/salome/gui/SMESH/images/a-nbsegments2.png b/doc/gui/images/a-nbsegments2.png similarity index 100% rename from doc/salome/gui/SMESH/images/a-nbsegments2.png rename to doc/gui/images/a-nbsegments2.png diff --git a/doc/salome/gui/SMESH/images/a-patterntype.png b/doc/gui/images/a-patterntype.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/a-patterntype.png rename to doc/gui/images/a-patterntype.png diff --git a/doc/salome/gui/SMESH/images/a-patterntype1.png b/doc/gui/images/a-patterntype1.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/a-patterntype1.png rename to doc/gui/images/a-patterntype1.png diff --git a/doc/salome/gui/SMESH/images/a-standmeshinfo.png b/doc/gui/images/a-standmeshinfo.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/a-standmeshinfo.png rename to doc/gui/images/a-standmeshinfo.png diff --git a/doc/salome/gui/SMESH/images/a-startendlength.png b/doc/gui/images/a-startendlength.png similarity index 100% rename from doc/salome/gui/SMESH/images/a-startendlength.png rename to doc/gui/images/a-startendlength.png diff --git a/doc/salome/gui/SMESH/images/a-transparency.png b/doc/gui/images/a-transparency.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/a-transparency.png rename to doc/gui/images/a-transparency.png diff --git a/doc/salome/gui/SMESH/images/a-unionoftriangles.png b/doc/gui/images/a-unionoftriangles.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/a-unionoftriangles.png rename to doc/gui/images/a-unionoftriangles.png diff --git a/doc/salome/gui/SMESH/images/a-viewgeneral.png b/doc/gui/images/a-viewgeneral.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/a-viewgeneral.png rename to doc/gui/images/a-viewgeneral.png diff --git a/doc/salome/gui/SMESH/images/adaptation_01.png b/doc/gui/images/adaptation_01.png similarity index 100% rename from doc/salome/gui/SMESH/images/adaptation_01.png rename to doc/gui/images/adaptation_01.png diff --git a/doc/salome/gui/SMESH/images/adaptation_02.png b/doc/gui/images/adaptation_02.png similarity index 100% rename from doc/salome/gui/SMESH/images/adaptation_02.png rename to doc/gui/images/adaptation_02.png diff --git a/doc/salome/gui/SMESH/images/adaptation_with_homard_advanced.png b/doc/gui/images/adaptation_with_homard_advanced.png similarity index 100% rename from doc/salome/gui/SMESH/images/adaptation_with_homard_advanced.png rename to doc/gui/images/adaptation_with_homard_advanced.png diff --git a/doc/salome/gui/SMESH/images/adaptation_with_homard_arguments.png b/doc/gui/images/adaptation_with_homard_arguments.png similarity index 100% rename from doc/salome/gui/SMESH/images/adaptation_with_homard_arguments.png rename to doc/gui/images/adaptation_with_homard_arguments.png diff --git a/doc/salome/gui/SMESH/images/adaptation_with_homard_boundary_analytical.png b/doc/gui/images/adaptation_with_homard_boundary_analytical.png similarity index 100% rename from doc/salome/gui/SMESH/images/adaptation_with_homard_boundary_analytical.png rename to doc/gui/images/adaptation_with_homard_boundary_analytical.png diff --git a/doc/salome/gui/SMESH/images/adaptation_with_homard_boundary_cao.png b/doc/gui/images/adaptation_with_homard_boundary_cao.png similarity index 100% rename from doc/salome/gui/SMESH/images/adaptation_with_homard_boundary_cao.png rename to doc/gui/images/adaptation_with_homard_boundary_cao.png diff --git a/doc/salome/gui/SMESH/images/adaptation_with_homard_boundary_discrete.png b/doc/gui/images/adaptation_with_homard_boundary_discrete.png similarity index 100% rename from doc/salome/gui/SMESH/images/adaptation_with_homard_boundary_discrete.png rename to doc/gui/images/adaptation_with_homard_boundary_discrete.png diff --git a/doc/salome/gui/SMESH/images/adaptation_with_homard_boundary_groups.png b/doc/gui/images/adaptation_with_homard_boundary_groups.png similarity index 100% rename from doc/salome/gui/SMESH/images/adaptation_with_homard_boundary_groups.png rename to doc/gui/images/adaptation_with_homard_boundary_groups.png diff --git a/doc/salome/gui/SMESH/images/adaptive1d.png b/doc/gui/images/adaptive1d.png similarity index 100% rename from doc/salome/gui/SMESH/images/adaptive1d.png rename to doc/gui/images/adaptive1d.png diff --git a/doc/salome/gui/SMESH/images/adaptive1d_sample_mesh.png b/doc/gui/images/adaptive1d_sample_mesh.png similarity index 100% rename from doc/salome/gui/SMESH/images/adaptive1d_sample_mesh.png rename to doc/gui/images/adaptive1d_sample_mesh.png diff --git a/doc/salome/gui/SMESH/images/add.gif b/doc/gui/images/add.gif similarity index 100% rename from doc/salome/gui/SMESH/images/add.gif rename to doc/gui/images/add.gif diff --git a/doc/salome/gui/SMESH/images/add.png b/doc/gui/images/add.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/add.png rename to doc/gui/images/add.png diff --git a/doc/salome/gui/SMESH/images/add0delement.png b/doc/gui/images/add0delement.png similarity index 100% rename from doc/salome/gui/SMESH/images/add0delement.png rename to doc/gui/images/add0delement.png diff --git a/doc/salome/gui/SMESH/images/add_0delement.png b/doc/gui/images/add_0delement.png similarity index 100% rename from doc/salome/gui/SMESH/images/add_0delement.png rename to doc/gui/images/add_0delement.png diff --git a/doc/salome/gui/SMESH/images/add_ball.png b/doc/gui/images/add_ball.png similarity index 100% rename from doc/salome/gui/SMESH/images/add_ball.png rename to doc/gui/images/add_ball.png diff --git a/doc/salome/gui/SMESH/images/add_edge.png b/doc/gui/images/add_edge.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/add_edge.png rename to doc/gui/images/add_edge.png diff --git a/doc/salome/gui/SMESH/images/add_node.png b/doc/gui/images/add_node.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/add_node.png rename to doc/gui/images/add_node.png diff --git a/doc/salome/gui/SMESH/images/add_node_on_face-dlg.png b/doc/gui/images/add_node_on_face-dlg.png similarity index 100% rename from doc/salome/gui/SMESH/images/add_node_on_face-dlg.png rename to doc/gui/images/add_node_on_face-dlg.png diff --git a/doc/salome/gui/SMESH/images/add_node_on_face.png b/doc/gui/images/add_node_on_face.png similarity index 100% rename from doc/salome/gui/SMESH/images/add_node_on_face.png rename to doc/gui/images/add_node_on_face.png diff --git a/doc/salome/gui/SMESH/images/add_node_on_segment-dlg.png b/doc/gui/images/add_node_on_segment-dlg.png similarity index 100% rename from doc/salome/gui/SMESH/images/add_node_on_segment-dlg.png rename to doc/gui/images/add_node_on_segment-dlg.png diff --git a/doc/salome/gui/SMESH/images/add_node_on_segment.png b/doc/gui/images/add_node_on_segment.png similarity index 100% rename from doc/salome/gui/SMESH/images/add_node_on_segment.png rename to doc/gui/images/add_node_on_segment.png diff --git a/doc/salome/gui/SMESH/images/add_polygone.png b/doc/gui/images/add_polygone.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/add_polygone.png rename to doc/gui/images/add_polygone.png diff --git a/doc/salome/gui/SMESH/images/add_polyhedron.png b/doc/gui/images/add_polyhedron.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/add_polyhedron.png rename to doc/gui/images/add_polyhedron.png diff --git a/doc/salome/gui/SMESH/images/add_quadrangle.png b/doc/gui/images/add_quadrangle.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/add_quadrangle.png rename to doc/gui/images/add_quadrangle.png diff --git a/doc/salome/gui/SMESH/images/add_triangle.png b/doc/gui/images/add_triangle.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/add_triangle.png rename to doc/gui/images/add_triangle.png diff --git a/doc/salome/gui/SMESH/images/addball.png b/doc/gui/images/addball.png similarity index 100% rename from doc/salome/gui/SMESH/images/addball.png rename to doc/gui/images/addball.png diff --git a/doc/salome/gui/SMESH/images/addedge.png b/doc/gui/images/addedge.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/addedge.png rename to doc/gui/images/addedge.png diff --git a/doc/salome/gui/SMESH/images/addhexahedron.png b/doc/gui/images/addhexahedron.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/addhexahedron.png rename to doc/gui/images/addhexahedron.png diff --git a/doc/salome/gui/SMESH/images/addinfo_group.png b/doc/gui/images/addinfo_group.png similarity index 100% rename from doc/salome/gui/SMESH/images/addinfo_group.png rename to doc/gui/images/addinfo_group.png diff --git a/doc/salome/gui/SMESH/images/addinfo_mesh.png b/doc/gui/images/addinfo_mesh.png similarity index 100% rename from doc/salome/gui/SMESH/images/addinfo_mesh.png rename to doc/gui/images/addinfo_mesh.png diff --git a/doc/salome/gui/SMESH/images/addinfo_submesh.png b/doc/gui/images/addinfo_submesh.png similarity index 100% rename from doc/salome/gui/SMESH/images/addinfo_submesh.png rename to doc/gui/images/addinfo_submesh.png diff --git a/doc/salome/gui/SMESH/images/addnode.png b/doc/gui/images/addnode.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/addnode.png rename to doc/gui/images/addnode.png diff --git a/doc/salome/gui/SMESH/images/addnode_notebook.png b/doc/gui/images/addnode_notebook.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/addnode_notebook.png rename to doc/gui/images/addnode_notebook.png diff --git a/doc/salome/gui/SMESH/images/addpolygon.png b/doc/gui/images/addpolygon.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/addpolygon.png rename to doc/gui/images/addpolygon.png diff --git a/doc/salome/gui/SMESH/images/addquadrangle.png b/doc/gui/images/addquadrangle.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/addquadrangle.png rename to doc/gui/images/addquadrangle.png diff --git a/doc/salome/gui/SMESH/images/addtetrahedron.png b/doc/gui/images/addtetrahedron.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/addtetrahedron.png rename to doc/gui/images/addtetrahedron.png diff --git a/doc/salome/gui/SMESH/images/addtriangle.png b/doc/gui/images/addtriangle.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/addtriangle.png rename to doc/gui/images/addtriangle.png diff --git a/doc/salome/gui/SMESH/images/advanced_mesh_infos.png b/doc/gui/images/advanced_mesh_infos.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/advanced_mesh_infos.png rename to doc/gui/images/advanced_mesh_infos.png diff --git a/doc/salome/gui/SMESH/images/analyticdensity.png b/doc/gui/images/analyticdensity.png similarity index 100% rename from doc/salome/gui/SMESH/images/analyticdensity.png rename to doc/gui/images/analyticdensity.png diff --git a/doc/salome/gui/SMESH/images/angle_measure.png b/doc/gui/images/angle_measure.png similarity index 100% rename from doc/salome/gui/SMESH/images/angle_measure.png rename to doc/gui/images/angle_measure.png diff --git a/doc/salome/gui/SMESH/images/aqt.png b/doc/gui/images/aqt.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/aqt.png rename to doc/gui/images/aqt.png diff --git a/doc/salome/gui/SMESH/images/automaticlength.png b/doc/gui/images/automaticlength.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/automaticlength.png rename to doc/gui/images/automaticlength.png diff --git a/doc/salome/gui/SMESH/images/b-art_end_length.png b/doc/gui/images/b-art_end_length.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/b-art_end_length.png rename to doc/gui/images/b-art_end_length.png diff --git a/doc/salome/gui/SMESH/images/b-erage_length.png b/doc/gui/images/b-erage_length.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/b-erage_length.png rename to doc/gui/images/b-erage_length.png diff --git a/doc/salome/gui/SMESH/images/b-flection1d.png b/doc/gui/images/b-flection1d.png similarity index 100% rename from doc/salome/gui/SMESH/images/b-flection1d.png rename to doc/gui/images/b-flection1d.png diff --git a/doc/salome/gui/SMESH/images/b-ithmetic1d.png b/doc/gui/images/b-ithmetic1d.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/b-ithmetic1d.png rename to doc/gui/images/b-ithmetic1d.png diff --git a/doc/salome/gui/SMESH/images/b-mberofsegments.png b/doc/gui/images/b-mberofsegments.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/b-mberofsegments.png rename to doc/gui/images/b-mberofsegments.png diff --git a/doc/salome/gui/SMESH/images/b-mesh_infos.png b/doc/gui/images/b-mesh_infos.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/b-mesh_infos.png rename to doc/gui/images/b-mesh_infos.png diff --git a/doc/salome/gui/SMESH/images/bare_border_faces_smpl.png b/doc/gui/images/bare_border_faces_smpl.png similarity index 100% rename from doc/salome/gui/SMESH/images/bare_border_faces_smpl.png rename to doc/gui/images/bare_border_faces_smpl.png diff --git a/doc/salome/gui/SMESH/images/bare_border_volumes_smpl.png b/doc/gui/images/bare_border_volumes_smpl.png similarity index 100% rename from doc/salome/gui/SMESH/images/bare_border_volumes_smpl.png rename to doc/gui/images/bare_border_volumes_smpl.png diff --git a/doc/salome/gui/SMESH/images/basic_props.png b/doc/gui/images/basic_props.png similarity index 100% rename from doc/salome/gui/SMESH/images/basic_props.png rename to doc/gui/images/basic_props.png diff --git a/doc/salome/gui/SMESH/images/before_clipping.png b/doc/gui/images/before_clipping.png similarity index 100% rename from doc/salome/gui/SMESH/images/before_clipping.png rename to doc/gui/images/before_clipping.png diff --git a/doc/salome/gui/SMESH/images/before_clipping_preview.png b/doc/gui/images/before_clipping_preview.png similarity index 100% rename from doc/salome/gui/SMESH/images/before_clipping_preview.png rename to doc/gui/images/before_clipping_preview.png diff --git a/doc/salome/gui/SMESH/images/block_renumber_hyp.png b/doc/gui/images/block_renumber_hyp.png similarity index 100% rename from doc/salome/gui/SMESH/images/block_renumber_hyp.png rename to doc/gui/images/block_renumber_hyp.png diff --git a/doc/salome/gui/SMESH/images/bnd_box.png b/doc/gui/images/bnd_box.png similarity index 100% rename from doc/salome/gui/SMESH/images/bnd_box.png rename to doc/gui/images/bnd_box.png diff --git a/doc/salome/gui/SMESH/images/bnd_box_preview.png b/doc/gui/images/bnd_box_preview.png similarity index 100% rename from doc/salome/gui/SMESH/images/bnd_box_preview.png rename to doc/gui/images/bnd_box_preview.png diff --git a/doc/salome/gui/SMESH/images/buildcompound.png b/doc/gui/images/buildcompound.png similarity index 100% rename from doc/salome/gui/SMESH/images/buildcompound.png rename to doc/gui/images/buildcompound.png diff --git a/doc/salome/gui/SMESH/images/buildcompound_groups.png b/doc/gui/images/buildcompound_groups.png similarity index 100% rename from doc/salome/gui/SMESH/images/buildcompound_groups.png rename to doc/gui/images/buildcompound_groups.png diff --git a/doc/salome/gui/SMESH/images/cartesian3D_hyp.png b/doc/gui/images/cartesian3D_hyp.png similarity index 100% rename from doc/salome/gui/SMESH/images/cartesian3D_hyp.png rename to doc/gui/images/cartesian3D_hyp.png diff --git a/doc/salome/gui/SMESH/images/cartesian3D_sphere.png b/doc/gui/images/cartesian3D_sphere.png similarity index 100% rename from doc/salome/gui/SMESH/images/cartesian3D_sphere.png rename to doc/gui/images/cartesian3D_sphere.png diff --git a/doc/salome/gui/SMESH/images/cartesian_implement_edge.png b/doc/gui/images/cartesian_implement_edge.png similarity index 100% rename from doc/salome/gui/SMESH/images/cartesian_implement_edge.png rename to doc/gui/images/cartesian_implement_edge.png diff --git a/doc/salome/gui/SMESH/images/choose_geom_selection_way.png b/doc/gui/images/choose_geom_selection_way.png similarity index 100% rename from doc/salome/gui/SMESH/images/choose_geom_selection_way.png rename to doc/gui/images/choose_geom_selection_way.png diff --git a/doc/salome/gui/SMESH/images/circle_angles_after.png b/doc/gui/images/circle_angles_after.png similarity index 100% rename from doc/salome/gui/SMESH/images/circle_angles_after.png rename to doc/gui/images/circle_angles_after.png diff --git a/doc/salome/gui/SMESH/images/circle_simple_after.png b/doc/gui/images/circle_simple_after.png similarity index 100% rename from doc/salome/gui/SMESH/images/circle_simple_after.png rename to doc/gui/images/circle_simple_after.png diff --git a/doc/salome/gui/SMESH/images/circle_simple_before.png b/doc/gui/images/circle_simple_before.png similarity index 100% rename from doc/salome/gui/SMESH/images/circle_simple_before.png rename to doc/gui/images/circle_simple_before.png diff --git a/doc/salome/gui/SMESH/images/colors_size.png b/doc/gui/images/colors_size.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/colors_size.png rename to doc/gui/images/colors_size.png diff --git a/doc/salome/gui/SMESH/images/connectivity_edge.png b/doc/gui/images/connectivity_edge.png similarity index 100% rename from doc/salome/gui/SMESH/images/connectivity_edge.png rename to doc/gui/images/connectivity_edge.png diff --git a/doc/salome/gui/SMESH/images/connectivity_hex_prism.png b/doc/gui/images/connectivity_hex_prism.png similarity index 100% rename from doc/salome/gui/SMESH/images/connectivity_hex_prism.png rename to doc/gui/images/connectivity_hex_prism.png diff --git a/doc/salome/gui/SMESH/images/connectivity_hexa.png b/doc/gui/images/connectivity_hexa.png similarity index 100% rename from doc/salome/gui/SMESH/images/connectivity_hexa.png rename to doc/gui/images/connectivity_hexa.png diff --git a/doc/salome/gui/SMESH/images/connectivity_penta.png b/doc/gui/images/connectivity_penta.png similarity index 100% rename from doc/salome/gui/SMESH/images/connectivity_penta.png rename to doc/gui/images/connectivity_penta.png diff --git a/doc/salome/gui/SMESH/images/connectivity_polygon.png b/doc/gui/images/connectivity_polygon.png similarity index 100% rename from doc/salome/gui/SMESH/images/connectivity_polygon.png rename to doc/gui/images/connectivity_polygon.png diff --git a/doc/salome/gui/SMESH/images/connectivity_polyhedron.png b/doc/gui/images/connectivity_polyhedron.png similarity index 100% rename from doc/salome/gui/SMESH/images/connectivity_polyhedron.png rename to doc/gui/images/connectivity_polyhedron.png diff --git a/doc/salome/gui/SMESH/images/connectivity_pyramid.png b/doc/gui/images/connectivity_pyramid.png similarity index 100% rename from doc/salome/gui/SMESH/images/connectivity_pyramid.png rename to doc/gui/images/connectivity_pyramid.png diff --git a/doc/salome/gui/SMESH/images/connectivity_quad.png b/doc/gui/images/connectivity_quad.png similarity index 100% rename from doc/salome/gui/SMESH/images/connectivity_quad.png rename to doc/gui/images/connectivity_quad.png diff --git a/doc/salome/gui/SMESH/images/connectivity_tetra.png b/doc/gui/images/connectivity_tetra.png similarity index 100% rename from doc/salome/gui/SMESH/images/connectivity_tetra.png rename to doc/gui/images/connectivity_tetra.png diff --git a/doc/salome/gui/SMESH/images/connectivity_tria.png b/doc/gui/images/connectivity_tria.png similarity index 100% rename from doc/salome/gui/SMESH/images/connectivity_tria.png rename to doc/gui/images/connectivity_tria.png diff --git a/doc/salome/gui/SMESH/images/controls_popup.png b/doc/gui/images/controls_popup.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/controls_popup.png rename to doc/gui/images/controls_popup.png diff --git a/doc/salome/gui/SMESH/images/convert.png b/doc/gui/images/convert.png similarity index 100% rename from doc/salome/gui/SMESH/images/convert.png rename to doc/gui/images/convert.png diff --git a/doc/salome/gui/SMESH/images/copy_mesh_dlg.png b/doc/gui/images/copy_mesh_dlg.png similarity index 100% rename from doc/salome/gui/SMESH/images/copy_mesh_dlg.png rename to doc/gui/images/copy_mesh_dlg.png diff --git a/doc/salome/gui/SMESH/images/copy_mesh_icon.png b/doc/gui/images/copy_mesh_icon.png similarity index 100% rename from doc/salome/gui/SMESH/images/copy_mesh_icon.png rename to doc/gui/images/copy_mesh_icon.png diff --git a/doc/salome/gui/SMESH/images/crack_emulation_double_nodes.png b/doc/gui/images/crack_emulation_double_nodes.png similarity index 100% rename from doc/salome/gui/SMESH/images/crack_emulation_double_nodes.png rename to doc/gui/images/crack_emulation_double_nodes.png diff --git a/doc/salome/gui/SMESH/images/crack_emulation_double_nodes_with_elems.png b/doc/gui/images/crack_emulation_double_nodes_with_elems.png similarity index 100% rename from doc/salome/gui/SMESH/images/crack_emulation_double_nodes_with_elems.png rename to doc/gui/images/crack_emulation_double_nodes_with_elems.png diff --git a/doc/salome/gui/SMESH/images/create_boundary_1.png b/doc/gui/images/create_boundary_1.png similarity index 100% rename from doc/salome/gui/SMESH/images/create_boundary_1.png rename to doc/gui/images/create_boundary_1.png diff --git a/doc/salome/gui/SMESH/images/create_boundary_an_1.png b/doc/gui/images/create_boundary_an_1.png similarity index 100% rename from doc/salome/gui/SMESH/images/create_boundary_an_1.png rename to doc/gui/images/create_boundary_an_1.png diff --git a/doc/salome/gui/SMESH/images/create_boundary_an_2.png b/doc/gui/images/create_boundary_an_2.png similarity index 100% rename from doc/salome/gui/SMESH/images/create_boundary_an_2.png rename to doc/gui/images/create_boundary_an_2.png diff --git a/doc/salome/gui/SMESH/images/create_boundary_an_3.png b/doc/gui/images/create_boundary_an_3.png similarity index 100% rename from doc/salome/gui/SMESH/images/create_boundary_an_3.png rename to doc/gui/images/create_boundary_an_3.png diff --git a/doc/salome/gui/SMESH/images/create_boundary_an_4.png b/doc/gui/images/create_boundary_an_4.png similarity index 100% rename from doc/salome/gui/SMESH/images/create_boundary_an_4.png rename to doc/gui/images/create_boundary_an_4.png diff --git a/doc/salome/gui/SMESH/images/create_boundary_an_co_1.png b/doc/gui/images/create_boundary_an_co_1.png similarity index 100% rename from doc/salome/gui/SMESH/images/create_boundary_an_co_1.png rename to doc/gui/images/create_boundary_an_co_1.png diff --git a/doc/salome/gui/SMESH/images/create_boundary_an_co_2.png b/doc/gui/images/create_boundary_an_co_2.png similarity index 100% rename from doc/salome/gui/SMESH/images/create_boundary_an_co_2.png rename to doc/gui/images/create_boundary_an_co_2.png diff --git a/doc/salome/gui/SMESH/images/create_boundary_an_cy.png b/doc/gui/images/create_boundary_an_cy.png similarity index 100% rename from doc/salome/gui/SMESH/images/create_boundary_an_cy.png rename to doc/gui/images/create_boundary_an_cy.png diff --git a/doc/salome/gui/SMESH/images/create_boundary_an_sp.png b/doc/gui/images/create_boundary_an_sp.png similarity index 100% rename from doc/salome/gui/SMESH/images/create_boundary_an_sp.png rename to doc/gui/images/create_boundary_an_sp.png diff --git a/doc/salome/gui/SMESH/images/create_boundary_an_to.png b/doc/gui/images/create_boundary_an_to.png similarity index 100% rename from doc/salome/gui/SMESH/images/create_boundary_an_to.png rename to doc/gui/images/create_boundary_an_to.png diff --git a/doc/salome/gui/SMESH/images/create_boundary_cao_1.png b/doc/gui/images/create_boundary_cao_1.png similarity index 100% rename from doc/salome/gui/SMESH/images/create_boundary_cao_1.png rename to doc/gui/images/create_boundary_cao_1.png diff --git a/doc/salome/gui/SMESH/images/create_boundary_cao_2.png b/doc/gui/images/create_boundary_cao_2.png similarity index 100% rename from doc/salome/gui/SMESH/images/create_boundary_cao_2.png rename to doc/gui/images/create_boundary_cao_2.png diff --git a/doc/salome/gui/SMESH/images/create_boundary_di_1.png b/doc/gui/images/create_boundary_di_1.png similarity index 100% rename from doc/salome/gui/SMESH/images/create_boundary_di_1.png rename to doc/gui/images/create_boundary_di_1.png diff --git a/doc/salome/gui/SMESH/images/create_boundary_di_2.png b/doc/gui/images/create_boundary_di_2.png similarity index 100% rename from doc/salome/gui/SMESH/images/create_boundary_di_2.png rename to doc/gui/images/create_boundary_di_2.png diff --git a/doc/salome/gui/SMESH/images/create_boundary_di_3.png b/doc/gui/images/create_boundary_di_3.png similarity index 100% rename from doc/salome/gui/SMESH/images/create_boundary_di_3.png rename to doc/gui/images/create_boundary_di_3.png diff --git a/doc/salome/gui/SMESH/images/create_group.png b/doc/gui/images/create_group.png similarity index 100% rename from doc/salome/gui/SMESH/images/create_group.png rename to doc/gui/images/create_group.png diff --git a/doc/salome/gui/SMESH/images/create_groups_from_geometry.png b/doc/gui/images/create_groups_from_geometry.png similarity index 100% rename from doc/salome/gui/SMESH/images/create_groups_from_geometry.png rename to doc/gui/images/create_groups_from_geometry.png diff --git a/doc/salome/gui/SMESH/images/creategroup.png b/doc/gui/images/creategroup.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/creategroup.png rename to doc/gui/images/creategroup.png diff --git a/doc/salome/gui/SMESH/images/creategroup_on_filter.png b/doc/gui/images/creategroup_on_filter.png similarity index 100% rename from doc/salome/gui/SMESH/images/creategroup_on_filter.png rename to doc/gui/images/creategroup_on_filter.png diff --git a/doc/salome/gui/SMESH/images/createmesh-inv.png b/doc/gui/images/createmesh-inv.png similarity index 100% rename from doc/salome/gui/SMESH/images/createmesh-inv.png rename to doc/gui/images/createmesh-inv.png diff --git a/doc/salome/gui/SMESH/images/createmesh-inv2.png b/doc/gui/images/createmesh-inv2.png similarity index 100% rename from doc/salome/gui/SMESH/images/createmesh-inv2.png rename to doc/gui/images/createmesh-inv2.png diff --git a/doc/salome/gui/SMESH/images/createmesh-inv3.png b/doc/gui/images/createmesh-inv3.png similarity index 100% rename from doc/salome/gui/SMESH/images/createmesh-inv3.png rename to doc/gui/images/createmesh-inv3.png diff --git a/doc/salome/gui/SMESH/images/ctrlinfo.png b/doc/gui/images/ctrlinfo.png similarity index 100% rename from doc/salome/gui/SMESH/images/ctrlinfo.png rename to doc/gui/images/ctrlinfo.png diff --git a/doc/salome/gui/SMESH/images/curvi_angles_after.png b/doc/gui/images/curvi_angles_after.png similarity index 100% rename from doc/salome/gui/SMESH/images/curvi_angles_after.png rename to doc/gui/images/curvi_angles_after.png diff --git a/doc/salome/gui/SMESH/images/curvi_simple_after.png b/doc/gui/images/curvi_simple_after.png similarity index 100% rename from doc/salome/gui/SMESH/images/curvi_simple_after.png rename to doc/gui/images/curvi_simple_after.png diff --git a/doc/salome/gui/SMESH/images/curvi_simple_before.png b/doc/gui/images/curvi_simple_before.png similarity index 100% rename from doc/salome/gui/SMESH/images/curvi_simple_before.png rename to doc/gui/images/curvi_simple_before.png diff --git a/doc/salome/gui/SMESH/images/custom_point_marker.png b/doc/gui/images/custom_point_marker.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/custom_point_marker.png rename to doc/gui/images/custom_point_marker.png diff --git a/doc/salome/gui/SMESH/images/cut_groups1.png b/doc/gui/images/cut_groups1.png similarity index 100% rename from doc/salome/gui/SMESH/images/cut_groups1.png rename to doc/gui/images/cut_groups1.png diff --git a/doc/salome/gui/SMESH/images/cutgroups.png b/doc/gui/images/cutgroups.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/cutgroups.png rename to doc/gui/images/cutgroups.png diff --git a/doc/salome/gui/SMESH/images/dataset_clipping.png b/doc/gui/images/dataset_clipping.png similarity index 100% rename from doc/salome/gui/SMESH/images/dataset_clipping.png rename to doc/gui/images/dataset_clipping.png diff --git a/doc/salome/gui/SMESH/images/deflection_2d.png b/doc/gui/images/deflection_2d.png similarity index 100% rename from doc/salome/gui/SMESH/images/deflection_2d.png rename to doc/gui/images/deflection_2d.png diff --git a/doc/salome/gui/SMESH/images/deletegroups.png b/doc/gui/images/deletegroups.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/deletegroups.png rename to doc/gui/images/deletegroups.png diff --git a/doc/salome/gui/SMESH/images/diagonalinversion.png b/doc/gui/images/diagonalinversion.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/diagonalinversion.png rename to doc/gui/images/diagonalinversion.png diff --git a/doc/salome/gui/SMESH/images/dialog.png b/doc/gui/images/dialog.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/dialog.png rename to doc/gui/images/dialog.png diff --git a/doc/salome/gui/SMESH/images/dimgroup_0d.png b/doc/gui/images/dimgroup_0d.png similarity index 100% rename from doc/salome/gui/SMESH/images/dimgroup_0d.png rename to doc/gui/images/dimgroup_0d.png diff --git a/doc/salome/gui/SMESH/images/dimgroup_1d.png b/doc/gui/images/dimgroup_1d.png similarity index 100% rename from doc/salome/gui/SMESH/images/dimgroup_1d.png rename to doc/gui/images/dimgroup_1d.png diff --git a/doc/salome/gui/SMESH/images/dimgroup_2d.png b/doc/gui/images/dimgroup_2d.png similarity index 100% rename from doc/salome/gui/SMESH/images/dimgroup_2d.png rename to doc/gui/images/dimgroup_2d.png diff --git a/doc/salome/gui/SMESH/images/dimgroup_dlg.png b/doc/gui/images/dimgroup_dlg.png similarity index 100% rename from doc/salome/gui/SMESH/images/dimgroup_dlg.png rename to doc/gui/images/dimgroup_dlg.png diff --git a/doc/salome/gui/SMESH/images/dimgroup_src.png b/doc/gui/images/dimgroup_src.png similarity index 100% rename from doc/salome/gui/SMESH/images/dimgroup_src.png rename to doc/gui/images/dimgroup_src.png diff --git a/doc/salome/gui/SMESH/images/dimgroup_tui1.png b/doc/gui/images/dimgroup_tui1.png similarity index 100% rename from doc/salome/gui/SMESH/images/dimgroup_tui1.png rename to doc/gui/images/dimgroup_tui1.png diff --git a/doc/salome/gui/SMESH/images/display_entity_choose_item.png b/doc/gui/images/display_entity_choose_item.png similarity index 100% rename from doc/salome/gui/SMESH/images/display_entity_choose_item.png rename to doc/gui/images/display_entity_choose_item.png diff --git a/doc/salome/gui/SMESH/images/display_entity_dlg.png b/doc/gui/images/display_entity_dlg.png similarity index 100% rename from doc/salome/gui/SMESH/images/display_entity_dlg.png rename to doc/gui/images/display_entity_dlg.png diff --git a/doc/salome/gui/SMESH/images/distribution_of_layers.png b/doc/gui/images/distribution_of_layers.png similarity index 100% rename from doc/salome/gui/SMESH/images/distribution_of_layers.png rename to doc/gui/images/distribution_of_layers.png diff --git a/doc/salome/gui/SMESH/images/distributionwithanalyticdensity.png b/doc/gui/images/distributionwithanalyticdensity.png similarity index 100% rename from doc/salome/gui/SMESH/images/distributionwithanalyticdensity.png rename to doc/gui/images/distributionwithanalyticdensity.png diff --git a/doc/salome/gui/SMESH/images/distributionwithtabledensity.png b/doc/gui/images/distributionwithtabledensity.png similarity index 100% rename from doc/salome/gui/SMESH/images/distributionwithtabledensity.png rename to doc/gui/images/distributionwithtabledensity.png diff --git a/doc/salome/gui/SMESH/images/dlg_0D_on_all_nodes.png b/doc/gui/images/dlg_0D_on_all_nodes.png similarity index 100% rename from doc/salome/gui/SMESH/images/dlg_0D_on_all_nodes.png rename to doc/gui/images/dlg_0D_on_all_nodes.png diff --git a/doc/salome/gui/SMESH/images/double_faces.png b/doc/gui/images/double_faces.png similarity index 100% rename from doc/salome/gui/SMESH/images/double_faces.png rename to doc/gui/images/double_faces.png diff --git a/doc/salome/gui/SMESH/images/double_nodes.png b/doc/gui/images/double_nodes.png similarity index 100% rename from doc/salome/gui/SMESH/images/double_nodes.png rename to doc/gui/images/double_nodes.png diff --git a/doc/salome/gui/SMESH/images/duplicate01.png b/doc/gui/images/duplicate01.png similarity index 100% rename from doc/salome/gui/SMESH/images/duplicate01.png rename to doc/gui/images/duplicate01.png diff --git a/doc/salome/gui/SMESH/images/duplicate02.png b/doc/gui/images/duplicate02.png similarity index 100% rename from doc/salome/gui/SMESH/images/duplicate02.png rename to doc/gui/images/duplicate02.png diff --git a/doc/salome/gui/SMESH/images/duplicate03.png b/doc/gui/images/duplicate03.png similarity index 100% rename from doc/salome/gui/SMESH/images/duplicate03.png rename to doc/gui/images/duplicate03.png diff --git a/doc/salome/gui/SMESH/images/duplicate04.png b/doc/gui/images/duplicate04.png similarity index 100% rename from doc/salome/gui/SMESH/images/duplicate04.png rename to doc/gui/images/duplicate04.png diff --git a/doc/salome/gui/SMESH/images/duplicate_nodes.png b/doc/gui/images/duplicate_nodes.png similarity index 100% rename from doc/salome/gui/SMESH/images/duplicate_nodes.png rename to doc/gui/images/duplicate_nodes.png diff --git a/doc/salome/gui/SMESH/images/edge_wire_3d_after.png b/doc/gui/images/edge_wire_3d_after.png similarity index 100% rename from doc/salome/gui/SMESH/images/edge_wire_3d_after.png rename to doc/gui/images/edge_wire_3d_after.png diff --git a/doc/salome/gui/SMESH/images/edge_wire_3d_before.png b/doc/gui/images/edge_wire_3d_before.png similarity index 100% rename from doc/salome/gui/SMESH/images/edge_wire_3d_before.png rename to doc/gui/images/edge_wire_3d_before.png diff --git a/doc/salome/gui/SMESH/images/edge_wire_after.png b/doc/gui/images/edge_wire_after.png similarity index 100% rename from doc/salome/gui/SMESH/images/edge_wire_after.png rename to doc/gui/images/edge_wire_after.png diff --git a/doc/salome/gui/SMESH/images/edge_wire_before.png b/doc/gui/images/edge_wire_before.png similarity index 100% rename from doc/salome/gui/SMESH/images/edge_wire_before.png rename to doc/gui/images/edge_wire_before.png diff --git a/doc/salome/gui/SMESH/images/edit_mesh1.png b/doc/gui/images/edit_mesh1.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/edit_mesh1.png rename to doc/gui/images/edit_mesh1.png diff --git a/doc/salome/gui/SMESH/images/edit_mesh_change_value_hyp.png b/doc/gui/images/edit_mesh_change_value_hyp.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/edit_mesh_change_value_hyp.png rename to doc/gui/images/edit_mesh_change_value_hyp.png diff --git a/doc/salome/gui/SMESH/images/edit_mesh_remove_hyp.png b/doc/gui/images/edit_mesh_remove_hyp.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/edit_mesh_remove_hyp.png rename to doc/gui/images/edit_mesh_remove_hyp.png diff --git a/doc/salome/gui/SMESH/images/editgroup.png b/doc/gui/images/editgroup.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/editgroup.png rename to doc/gui/images/editgroup.png diff --git a/doc/salome/gui/SMESH/images/editing_groups1.png b/doc/gui/images/editing_groups1.png similarity index 100% rename from doc/salome/gui/SMESH/images/editing_groups1.png rename to doc/gui/images/editing_groups1.png diff --git a/doc/salome/gui/SMESH/images/elem_info.png b/doc/gui/images/elem_info.png similarity index 100% rename from doc/salome/gui/SMESH/images/elem_info.png rename to doc/gui/images/elem_info.png diff --git a/doc/salome/gui/SMESH/images/eleminfo1.png b/doc/gui/images/eleminfo1.png similarity index 100% rename from doc/salome/gui/SMESH/images/eleminfo1.png rename to doc/gui/images/eleminfo1.png diff --git a/doc/salome/gui/SMESH/images/eleminfo2.png b/doc/gui/images/eleminfo2.png similarity index 100% rename from doc/salome/gui/SMESH/images/eleminfo2.png rename to doc/gui/images/eleminfo2.png diff --git a/doc/salome/gui/SMESH/images/extr_along_wire_after.png b/doc/gui/images/extr_along_wire_after.png similarity index 100% rename from doc/salome/gui/SMESH/images/extr_along_wire_after.png rename to doc/gui/images/extr_along_wire_after.png diff --git a/doc/salome/gui/SMESH/images/extr_along_wire_before.png b/doc/gui/images/extr_along_wire_before.png similarity index 100% rename from doc/salome/gui/SMESH/images/extr_along_wire_before.png rename to doc/gui/images/extr_along_wire_before.png diff --git a/doc/salome/gui/SMESH/images/extru_rib_segs.png b/doc/gui/images/extru_rib_segs.png similarity index 100% rename from doc/salome/gui/SMESH/images/extru_rib_segs.png rename to doc/gui/images/extru_rib_segs.png diff --git a/doc/salome/gui/SMESH/images/extrusion_along_path_dlg.png b/doc/gui/images/extrusion_along_path_dlg.png similarity index 100% rename from doc/salome/gui/SMESH/images/extrusion_along_path_dlg.png rename to doc/gui/images/extrusion_along_path_dlg.png diff --git a/doc/salome/gui/SMESH/images/extrusion_box.png b/doc/gui/images/extrusion_box.png similarity index 100% rename from doc/salome/gui/SMESH/images/extrusion_box.png rename to doc/gui/images/extrusion_box.png diff --git a/doc/salome/gui/SMESH/images/extrusion_groups.png b/doc/gui/images/extrusion_groups.png similarity index 100% rename from doc/salome/gui/SMESH/images/extrusion_groups.png rename to doc/gui/images/extrusion_groups.png diff --git a/doc/salome/gui/SMESH/images/extrusion_groups_res.png b/doc/gui/images/extrusion_groups_res.png similarity index 100% rename from doc/salome/gui/SMESH/images/extrusion_groups_res.png rename to doc/gui/images/extrusion_groups_res.png diff --git a/doc/salome/gui/SMESH/images/extrusionalongaline1.png b/doc/gui/images/extrusionalongaline1.png similarity index 100% rename from doc/salome/gui/SMESH/images/extrusionalongaline1.png rename to doc/gui/images/extrusionalongaline1.png diff --git a/doc/salome/gui/SMESH/images/extrusionalongaline2.png b/doc/gui/images/extrusionalongaline2.png similarity index 100% rename from doc/salome/gui/SMESH/images/extrusionalongaline2.png rename to doc/gui/images/extrusionalongaline2.png diff --git a/doc/salome/gui/SMESH/images/extrusionalongaline3.png b/doc/gui/images/extrusionalongaline3.png similarity index 100% rename from doc/salome/gui/SMESH/images/extrusionalongaline3.png rename to doc/gui/images/extrusionalongaline3.png diff --git a/doc/salome/gui/SMESH/images/extrusionbynormal_alongavgnorm.png b/doc/gui/images/extrusionbynormal_alongavgnorm.png similarity index 100% rename from doc/salome/gui/SMESH/images/extrusionbynormal_alongavgnorm.png rename to doc/gui/images/extrusionbynormal_alongavgnorm.png diff --git a/doc/salome/gui/SMESH/images/extrusionbynormal_useonly.png b/doc/gui/images/extrusionbynormal_useonly.png similarity index 100% rename from doc/salome/gui/SMESH/images/extrusionbynormal_useonly.png rename to doc/gui/images/extrusionbynormal_useonly.png diff --git a/doc/salome/gui/SMESH/images/failed_computation.png b/doc/gui/images/failed_computation.png similarity index 100% rename from doc/salome/gui/SMESH/images/failed_computation.png rename to doc/gui/images/failed_computation.png diff --git a/doc/salome/gui/SMESH/images/find_geom_by_mesh_elem.png b/doc/gui/images/find_geom_by_mesh_elem.png similarity index 100% rename from doc/salome/gui/SMESH/images/find_geom_by_mesh_elem.png rename to doc/gui/images/find_geom_by_mesh_elem.png diff --git a/doc/salome/gui/SMESH/images/findelement1.png b/doc/gui/images/findelement1.png similarity index 100% rename from doc/salome/gui/SMESH/images/findelement1.png rename to doc/gui/images/findelement1.png diff --git a/doc/salome/gui/SMESH/images/findelement2.png b/doc/gui/images/findelement2.png similarity index 100% rename from doc/salome/gui/SMESH/images/findelement2.png rename to doc/gui/images/findelement2.png diff --git a/doc/salome/gui/SMESH/images/findelement3.png b/doc/gui/images/findelement3.png similarity index 100% rename from doc/salome/gui/SMESH/images/findelement3.png rename to doc/gui/images/findelement3.png diff --git a/doc/salome/gui/SMESH/images/formula1.png b/doc/gui/images/formula1.png similarity index 100% rename from doc/salome/gui/SMESH/images/formula1.png rename to doc/gui/images/formula1.png diff --git a/doc/salome/gui/SMESH/images/formula2.png b/doc/gui/images/formula2.png similarity index 100% rename from doc/salome/gui/SMESH/images/formula2.png rename to doc/gui/images/formula2.png diff --git a/doc/salome/gui/SMESH/images/formula4.png b/doc/gui/images/formula4.png similarity index 100% rename from doc/salome/gui/SMESH/images/formula4.png rename to doc/gui/images/formula4.png diff --git a/doc/salome/gui/SMESH/images/formula5.png b/doc/gui/images/formula5.png similarity index 100% rename from doc/salome/gui/SMESH/images/formula5.png rename to doc/gui/images/formula5.png diff --git a/doc/salome/gui/SMESH/images/free_borders1.png b/doc/gui/images/free_borders1.png similarity index 100% rename from doc/salome/gui/SMESH/images/free_borders1.png rename to doc/gui/images/free_borders1.png diff --git a/doc/salome/gui/SMESH/images/free_edges.png b/doc/gui/images/free_edges.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/free_edges.png rename to doc/gui/images/free_edges.png diff --git a/doc/salome/gui/SMESH/images/free_faces.png b/doc/gui/images/free_faces.png similarity index 100% rename from doc/salome/gui/SMESH/images/free_faces.png rename to doc/gui/images/free_faces.png diff --git a/doc/salome/gui/SMESH/images/free_nodes.png b/doc/gui/images/free_nodes.png similarity index 100% rename from doc/salome/gui/SMESH/images/free_nodes.png rename to doc/gui/images/free_nodes.png diff --git a/doc/salome/gui/SMESH/images/ghs3dprl_parameters_basic.png b/doc/gui/images/ghs3dprl_parameters_basic.png similarity index 100% rename from doc/salome/gui/SMESH/images/ghs3dprl_parameters_basic.png rename to doc/gui/images/ghs3dprl_parameters_basic.png diff --git a/doc/salome/gui/SMESH/images/groups_by_sharp_edges_dlg.png b/doc/gui/images/groups_by_sharp_edges_dlg.png similarity index 100% rename from doc/salome/gui/SMESH/images/groups_by_sharp_edges_dlg.png rename to doc/gui/images/groups_by_sharp_edges_dlg.png diff --git a/doc/salome/gui/SMESH/images/groups_in_OB.png b/doc/gui/images/groups_in_OB.png similarity index 100% rename from doc/salome/gui/SMESH/images/groups_in_OB.png rename to doc/gui/images/groups_in_OB.png diff --git a/doc/salome/gui/SMESH/images/hexa_ijk_mesh.png b/doc/gui/images/hexa_ijk_mesh.png similarity index 100% rename from doc/salome/gui/SMESH/images/hexa_ijk_mesh.png rename to doc/gui/images/hexa_ijk_mesh.png diff --git a/doc/salome/gui/SMESH/images/hyp_source_edges.png b/doc/gui/images/hyp_source_edges.png similarity index 100% rename from doc/salome/gui/SMESH/images/hyp_source_edges.png rename to doc/gui/images/hyp_source_edges.png diff --git a/doc/salome/gui/SMESH/images/hyp_source_faces.png b/doc/gui/images/hyp_source_faces.png similarity index 100% rename from doc/salome/gui/SMESH/images/hyp_source_faces.png rename to doc/gui/images/hyp_source_faces.png diff --git a/doc/salome/gui/SMESH/images/hypo_fixedpnt_dlg.png b/doc/gui/images/hypo_fixedpnt_dlg.png similarity index 100% rename from doc/salome/gui/SMESH/images/hypo_fixedpnt_dlg.png rename to doc/gui/images/hypo_fixedpnt_dlg.png diff --git a/doc/salome/gui/SMESH/images/hypo_quad_params_1.png b/doc/gui/images/hypo_quad_params_1.png similarity index 100% rename from doc/salome/gui/SMESH/images/hypo_quad_params_1.png rename to doc/gui/images/hypo_quad_params_1.png diff --git a/doc/salome/gui/SMESH/images/hypo_quad_params_2.png b/doc/gui/images/hypo_quad_params_2.png similarity index 100% rename from doc/salome/gui/SMESH/images/hypo_quad_params_2.png rename to doc/gui/images/hypo_quad_params_2.png diff --git a/doc/salome/gui/SMESH/images/hypo_quad_params_dialog.png b/doc/gui/images/hypo_quad_params_dialog.png similarity index 100% rename from doc/salome/gui/SMESH/images/hypo_quad_params_dialog.png rename to doc/gui/images/hypo_quad_params_dialog.png diff --git a/doc/salome/gui/SMESH/images/hypo_quad_params_dialog_corners.png b/doc/gui/images/hypo_quad_params_dialog_corners.png similarity index 100% rename from doc/salome/gui/SMESH/images/hypo_quad_params_dialog_corners.png rename to doc/gui/images/hypo_quad_params_dialog_corners.png diff --git a/doc/salome/gui/SMESH/images/hypo_quad_params_dialog_enf.png b/doc/gui/images/hypo_quad_params_dialog_enf.png similarity index 100% rename from doc/salome/gui/SMESH/images/hypo_quad_params_dialog_enf.png rename to doc/gui/images/hypo_quad_params_dialog_enf.png diff --git a/doc/salome/gui/SMESH/images/hypo_quad_params_dialog_vert.png b/doc/gui/images/hypo_quad_params_dialog_vert.png similarity index 100% rename from doc/salome/gui/SMESH/images/hypo_quad_params_dialog_vert.png rename to doc/gui/images/hypo_quad_params_dialog_vert.png diff --git a/doc/salome/gui/SMESH/images/hypo_quad_params_enfnodes_algo1.png b/doc/gui/images/hypo_quad_params_enfnodes_algo1.png similarity index 100% rename from doc/salome/gui/SMESH/images/hypo_quad_params_enfnodes_algo1.png rename to doc/gui/images/hypo_quad_params_enfnodes_algo1.png diff --git a/doc/salome/gui/SMESH/images/hypo_quad_params_enfnodes_algo2.png b/doc/gui/images/hypo_quad_params_enfnodes_algo2.png similarity index 100% rename from doc/salome/gui/SMESH/images/hypo_quad_params_enfnodes_algo2.png rename to doc/gui/images/hypo_quad_params_enfnodes_algo2.png diff --git a/doc/salome/gui/SMESH/images/hypo_quad_params_enfnodes_algo3.png b/doc/gui/images/hypo_quad_params_enfnodes_algo3.png similarity index 100% rename from doc/salome/gui/SMESH/images/hypo_quad_params_enfnodes_algo3.png rename to doc/gui/images/hypo_quad_params_enfnodes_algo3.png diff --git a/doc/salome/gui/SMESH/images/hypo_quad_params_res.png b/doc/gui/images/hypo_quad_params_res.png similarity index 100% rename from doc/salome/gui/SMESH/images/hypo_quad_params_res.png rename to doc/gui/images/hypo_quad_params_res.png diff --git a/doc/salome/gui/SMESH/images/hypo_quad_params_res_2.png b/doc/gui/images/hypo_quad_params_res_2.png similarity index 100% rename from doc/salome/gui/SMESH/images/hypo_quad_params_res_2.png rename to doc/gui/images/hypo_quad_params_res_2.png diff --git a/doc/salome/gui/SMESH/images/hypo_radquad_dlg.png b/doc/gui/images/hypo_radquad_dlg.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/hypo_radquad_dlg.png rename to doc/gui/images/hypo_radquad_dlg.png diff --git a/doc/salome/gui/SMESH/images/hypo_sets.png b/doc/gui/images/hypo_sets.png similarity index 100% rename from doc/salome/gui/SMESH/images/hypo_sets.png rename to doc/gui/images/hypo_sets.png diff --git a/doc/salome/gui/SMESH/images/image10.jpg b/doc/gui/images/image10.jpg similarity index 100% rename from doc/salome/gui/SMESH/images/image10.jpg rename to doc/gui/images/image10.jpg diff --git a/doc/salome/gui/SMESH/images/image101.png b/doc/gui/images/image101.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image101.png rename to doc/gui/images/image101.png diff --git a/doc/salome/gui/SMESH/images/image105.gif b/doc/gui/images/image105.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image105.gif rename to doc/gui/images/image105.gif diff --git a/doc/salome/gui/SMESH/images/image106.gif b/doc/gui/images/image106.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image106.gif rename to doc/gui/images/image106.gif diff --git a/doc/salome/gui/SMESH/images/image120.png b/doc/gui/images/image120.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image120.png rename to doc/gui/images/image120.png diff --git a/doc/salome/gui/SMESH/images/image121.png b/doc/gui/images/image121.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image121.png rename to doc/gui/images/image121.png diff --git a/doc/salome/gui/SMESH/images/image122.png b/doc/gui/images/image122.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image122.png rename to doc/gui/images/image122.png diff --git a/doc/salome/gui/SMESH/images/image123.gif b/doc/gui/images/image123.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image123.gif rename to doc/gui/images/image123.gif diff --git a/doc/salome/gui/SMESH/images/image124.gif b/doc/gui/images/image124.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image124.gif rename to doc/gui/images/image124.gif diff --git a/doc/salome/gui/SMESH/images/image125.gif b/doc/gui/images/image125.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image125.gif rename to doc/gui/images/image125.gif diff --git a/doc/salome/gui/SMESH/images/image126.gif b/doc/gui/images/image126.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image126.gif rename to doc/gui/images/image126.gif diff --git a/doc/salome/gui/SMESH/images/image127.gif b/doc/gui/images/image127.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image127.gif rename to doc/gui/images/image127.gif diff --git a/doc/salome/gui/SMESH/images/image130.gif b/doc/gui/images/image130.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image130.gif rename to doc/gui/images/image130.gif diff --git a/doc/salome/gui/SMESH/images/image131.gif b/doc/gui/images/image131.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image131.gif rename to doc/gui/images/image131.gif diff --git a/doc/salome/gui/SMESH/images/image132.gif b/doc/gui/images/image132.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image132.gif rename to doc/gui/images/image132.gif diff --git a/doc/salome/gui/SMESH/images/image133.gif b/doc/gui/images/image133.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image133.gif rename to doc/gui/images/image133.gif diff --git a/doc/salome/gui/SMESH/images/image134.gif b/doc/gui/images/image134.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image134.gif rename to doc/gui/images/image134.gif diff --git a/doc/salome/gui/SMESH/images/image135.gif b/doc/gui/images/image135.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image135.gif rename to doc/gui/images/image135.gif diff --git a/doc/salome/gui/SMESH/images/image136.gif b/doc/gui/images/image136.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image136.gif rename to doc/gui/images/image136.gif diff --git a/doc/salome/gui/SMESH/images/image137.gif b/doc/gui/images/image137.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image137.gif rename to doc/gui/images/image137.gif diff --git a/doc/salome/gui/SMESH/images/image138.gif b/doc/gui/images/image138.gif similarity index 100% rename from doc/salome/gui/SMESH/images/image138.gif rename to doc/gui/images/image138.gif diff --git a/doc/salome/gui/SMESH/images/image143.gif b/doc/gui/images/image143.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image143.gif rename to doc/gui/images/image143.gif diff --git a/doc/salome/gui/SMESH/images/image144.png b/doc/gui/images/image144.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image144.png rename to doc/gui/images/image144.png diff --git a/doc/salome/gui/SMESH/images/image145.png b/doc/gui/images/image145.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image145.png rename to doc/gui/images/image145.png diff --git a/doc/salome/gui/SMESH/images/image146.png b/doc/gui/images/image146.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image146.png rename to doc/gui/images/image146.png diff --git a/doc/salome/gui/SMESH/images/image147.gif b/doc/gui/images/image147.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image147.gif rename to doc/gui/images/image147.gif diff --git a/doc/salome/gui/SMESH/images/image148.gif b/doc/gui/images/image148.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image148.gif rename to doc/gui/images/image148.gif diff --git a/doc/salome/gui/SMESH/images/image15.jpg b/doc/gui/images/image15.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image15.jpg rename to doc/gui/images/image15.jpg diff --git a/doc/salome/gui/SMESH/images/image151.gif b/doc/gui/images/image151.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image151.gif rename to doc/gui/images/image151.gif diff --git a/doc/salome/gui/SMESH/images/image152.png b/doc/gui/images/image152.png similarity index 100% rename from doc/salome/gui/SMESH/images/image152.png rename to doc/gui/images/image152.png diff --git a/doc/salome/gui/SMESH/images/image154.png b/doc/gui/images/image154.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image154.png rename to doc/gui/images/image154.png diff --git a/doc/salome/gui/SMESH/images/image155.gif b/doc/gui/images/image155.gif similarity index 100% rename from doc/salome/gui/SMESH/images/image155.gif rename to doc/gui/images/image155.gif diff --git a/doc/salome/gui/SMESH/images/image156.gif b/doc/gui/images/image156.gif similarity index 100% rename from doc/salome/gui/SMESH/images/image156.gif rename to doc/gui/images/image156.gif diff --git a/doc/salome/gui/SMESH/images/image157.gif b/doc/gui/images/image157.gif similarity index 100% rename from doc/salome/gui/SMESH/images/image157.gif rename to doc/gui/images/image157.gif diff --git a/doc/salome/gui/SMESH/images/image160.gif b/doc/gui/images/image160.gif similarity index 100% rename from doc/salome/gui/SMESH/images/image160.gif rename to doc/gui/images/image160.gif diff --git a/doc/salome/gui/SMESH/images/image161.png b/doc/gui/images/image161.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image161.png rename to doc/gui/images/image161.png diff --git a/doc/salome/gui/SMESH/images/image22.jpg b/doc/gui/images/image22.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image22.jpg rename to doc/gui/images/image22.jpg diff --git a/doc/salome/gui/SMESH/images/image23.jpg b/doc/gui/images/image23.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image23.jpg rename to doc/gui/images/image23.jpg diff --git a/doc/salome/gui/SMESH/images/image24.gif b/doc/gui/images/image24.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image24.gif rename to doc/gui/images/image24.gif diff --git a/doc/salome/gui/SMESH/images/image25.jpg b/doc/gui/images/image25.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image25.jpg rename to doc/gui/images/image25.jpg diff --git a/doc/salome/gui/SMESH/images/image25.png b/doc/gui/images/image25.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image25.png rename to doc/gui/images/image25.png diff --git a/doc/salome/gui/SMESH/images/image27.jpg b/doc/gui/images/image27.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image27.jpg rename to doc/gui/images/image27.jpg diff --git a/doc/salome/gui/SMESH/images/image28.png b/doc/gui/images/image28.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image28.png rename to doc/gui/images/image28.png diff --git a/doc/salome/gui/SMESH/images/image30.jpg b/doc/gui/images/image30.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image30.jpg rename to doc/gui/images/image30.jpg diff --git a/doc/salome/gui/SMESH/images/image31.jpg b/doc/gui/images/image31.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image31.jpg rename to doc/gui/images/image31.jpg diff --git a/doc/salome/gui/SMESH/images/image32.jpg b/doc/gui/images/image32.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image32.jpg rename to doc/gui/images/image32.jpg diff --git a/doc/salome/gui/SMESH/images/image32.png b/doc/gui/images/image32.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image32.png rename to doc/gui/images/image32.png diff --git a/doc/salome/gui/SMESH/images/image33.gif b/doc/gui/images/image33.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image33.gif rename to doc/gui/images/image33.gif diff --git a/doc/salome/gui/SMESH/images/image34.png b/doc/gui/images/image34.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image34.png rename to doc/gui/images/image34.png diff --git a/doc/salome/gui/SMESH/images/image35.png b/doc/gui/images/image35.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image35.png rename to doc/gui/images/image35.png diff --git a/doc/salome/gui/SMESH/images/image36.jpg b/doc/gui/images/image36.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image36.jpg rename to doc/gui/images/image36.jpg diff --git a/doc/salome/gui/SMESH/images/image36.png b/doc/gui/images/image36.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image36.png rename to doc/gui/images/image36.png diff --git a/doc/salome/gui/SMESH/images/image37.jpg b/doc/gui/images/image37.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image37.jpg rename to doc/gui/images/image37.jpg diff --git a/doc/salome/gui/SMESH/images/image37.png b/doc/gui/images/image37.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image37.png rename to doc/gui/images/image37.png diff --git a/doc/salome/gui/SMESH/images/image38.jpg b/doc/gui/images/image38.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image38.jpg rename to doc/gui/images/image38.jpg diff --git a/doc/salome/gui/SMESH/images/image38.png b/doc/gui/images/image38.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image38.png rename to doc/gui/images/image38.png diff --git a/doc/salome/gui/SMESH/images/image39.png b/doc/gui/images/image39.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image39.png rename to doc/gui/images/image39.png diff --git a/doc/salome/gui/SMESH/images/image40.png b/doc/gui/images/image40.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image40.png rename to doc/gui/images/image40.png diff --git a/doc/salome/gui/SMESH/images/image41.gif b/doc/gui/images/image41.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image41.gif rename to doc/gui/images/image41.gif diff --git a/doc/salome/gui/SMESH/images/image42.png b/doc/gui/images/image42.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image42.png rename to doc/gui/images/image42.png diff --git a/doc/salome/gui/SMESH/images/image43.png b/doc/gui/images/image43.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image43.png rename to doc/gui/images/image43.png diff --git a/doc/salome/gui/SMESH/images/image46.gif b/doc/gui/images/image46.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image46.gif rename to doc/gui/images/image46.gif diff --git a/doc/salome/gui/SMESH/images/image49.png b/doc/gui/images/image49.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image49.png rename to doc/gui/images/image49.png diff --git a/doc/salome/gui/SMESH/images/image5.jpg b/doc/gui/images/image5.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image5.jpg rename to doc/gui/images/image5.jpg diff --git a/doc/salome/gui/SMESH/images/image50.gif b/doc/gui/images/image50.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image50.gif rename to doc/gui/images/image50.gif diff --git a/doc/salome/gui/SMESH/images/image51.jpg b/doc/gui/images/image51.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image51.jpg rename to doc/gui/images/image51.jpg diff --git a/doc/salome/gui/SMESH/images/image52.jpg b/doc/gui/images/image52.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image52.jpg rename to doc/gui/images/image52.jpg diff --git a/doc/salome/gui/SMESH/images/image53.gif b/doc/gui/images/image53.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image53.gif rename to doc/gui/images/image53.gif diff --git a/doc/salome/gui/SMESH/images/image55.gif b/doc/gui/images/image55.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image55.gif rename to doc/gui/images/image55.gif diff --git a/doc/salome/gui/SMESH/images/image56.gif b/doc/gui/images/image56.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image56.gif rename to doc/gui/images/image56.gif diff --git a/doc/salome/gui/SMESH/images/image56.jpg b/doc/gui/images/image56.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image56.jpg rename to doc/gui/images/image56.jpg diff --git a/doc/salome/gui/SMESH/images/image58.png b/doc/gui/images/image58.png similarity index 100% rename from doc/salome/gui/SMESH/images/image58.png rename to doc/gui/images/image58.png diff --git a/doc/salome/gui/SMESH/images/image59.png b/doc/gui/images/image59.png similarity index 100% rename from doc/salome/gui/SMESH/images/image59.png rename to doc/gui/images/image59.png diff --git a/doc/salome/gui/SMESH/images/image63.png b/doc/gui/images/image63.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image63.png rename to doc/gui/images/image63.png diff --git a/doc/salome/gui/SMESH/images/image64.png b/doc/gui/images/image64.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image64.png rename to doc/gui/images/image64.png diff --git a/doc/salome/gui/SMESH/images/image67.png b/doc/gui/images/image67.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image67.png rename to doc/gui/images/image67.png diff --git a/doc/salome/gui/SMESH/images/image7.jpg b/doc/gui/images/image7.jpg similarity index 100% rename from doc/salome/gui/SMESH/images/image7.jpg rename to doc/gui/images/image7.jpg diff --git a/doc/salome/gui/SMESH/images/image70.jpg b/doc/gui/images/image70.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image70.jpg rename to doc/gui/images/image70.jpg diff --git a/doc/salome/gui/SMESH/images/image70.png b/doc/gui/images/image70.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image70.png rename to doc/gui/images/image70.png diff --git a/doc/salome/gui/SMESH/images/image71.jpg b/doc/gui/images/image71.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image71.jpg rename to doc/gui/images/image71.jpg diff --git a/doc/salome/gui/SMESH/images/image71.png b/doc/gui/images/image71.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image71.png rename to doc/gui/images/image71.png diff --git a/doc/salome/gui/SMESH/images/image74.gif b/doc/gui/images/image74.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image74.gif rename to doc/gui/images/image74.gif diff --git a/doc/salome/gui/SMESH/images/image75.jpg b/doc/gui/images/image75.jpg similarity index 100% rename from doc/salome/gui/SMESH/images/image75.jpg rename to doc/gui/images/image75.jpg diff --git a/doc/salome/gui/SMESH/images/image76.jpg b/doc/gui/images/image76.jpg similarity index 100% rename from doc/salome/gui/SMESH/images/image76.jpg rename to doc/gui/images/image76.jpg diff --git a/doc/salome/gui/SMESH/images/image77.jpg b/doc/gui/images/image77.jpg similarity index 100% rename from doc/salome/gui/SMESH/images/image77.jpg rename to doc/gui/images/image77.jpg diff --git a/doc/salome/gui/SMESH/images/image78.jpg b/doc/gui/images/image78.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image78.jpg rename to doc/gui/images/image78.jpg diff --git a/doc/salome/gui/SMESH/images/image79.jpg b/doc/gui/images/image79.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image79.jpg rename to doc/gui/images/image79.jpg diff --git a/doc/salome/gui/SMESH/images/image79.png b/doc/gui/images/image79.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image79.png rename to doc/gui/images/image79.png diff --git a/doc/salome/gui/SMESH/images/image80.png b/doc/gui/images/image80.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image80.png rename to doc/gui/images/image80.png diff --git a/doc/salome/gui/SMESH/images/image82.png b/doc/gui/images/image82.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image82.png rename to doc/gui/images/image82.png diff --git a/doc/salome/gui/SMESH/images/image83.gif b/doc/gui/images/image83.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image83.gif rename to doc/gui/images/image83.gif diff --git a/doc/salome/gui/SMESH/images/image84.png b/doc/gui/images/image84.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image84.png rename to doc/gui/images/image84.png diff --git a/doc/salome/gui/SMESH/images/image86.jpg b/doc/gui/images/image86.jpg similarity index 100% rename from doc/salome/gui/SMESH/images/image86.jpg rename to doc/gui/images/image86.jpg diff --git a/doc/salome/gui/SMESH/images/image88.gif b/doc/gui/images/image88.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image88.gif rename to doc/gui/images/image88.gif diff --git a/doc/salome/gui/SMESH/images/image88.jpg b/doc/gui/images/image88.jpg similarity index 100% rename from doc/salome/gui/SMESH/images/image88.jpg rename to doc/gui/images/image88.jpg diff --git a/doc/salome/gui/SMESH/images/image90.jpg b/doc/gui/images/image90.jpg similarity index 100% rename from doc/salome/gui/SMESH/images/image90.jpg rename to doc/gui/images/image90.jpg diff --git a/doc/salome/gui/SMESH/images/image91.png b/doc/gui/images/image91.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image91.png rename to doc/gui/images/image91.png diff --git a/doc/salome/gui/SMESH/images/image92.jpg b/doc/gui/images/image92.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image92.jpg rename to doc/gui/images/image92.jpg diff --git a/doc/salome/gui/SMESH/images/image92.png b/doc/gui/images/image92.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image92.png rename to doc/gui/images/image92.png diff --git a/doc/salome/gui/SMESH/images/image93.jpg b/doc/gui/images/image93.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image93.jpg rename to doc/gui/images/image93.jpg diff --git a/doc/salome/gui/SMESH/images/image94.gif b/doc/gui/images/image94.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image94.gif rename to doc/gui/images/image94.gif diff --git a/doc/salome/gui/SMESH/images/image94.jpg b/doc/gui/images/image94.jpg similarity index 100% rename from doc/salome/gui/SMESH/images/image94.jpg rename to doc/gui/images/image94.jpg diff --git a/doc/salome/gui/SMESH/images/image95.gif b/doc/gui/images/image95.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image95.gif rename to doc/gui/images/image95.gif diff --git a/doc/salome/gui/SMESH/images/image95.jpg b/doc/gui/images/image95.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image95.jpg rename to doc/gui/images/image95.jpg diff --git a/doc/salome/gui/SMESH/images/image96.gif b/doc/gui/images/image96.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image96.gif rename to doc/gui/images/image96.gif diff --git a/doc/salome/gui/SMESH/images/image96.jpg b/doc/gui/images/image96.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image96.jpg rename to doc/gui/images/image96.jpg diff --git a/doc/salome/gui/SMESH/images/image97.gif b/doc/gui/images/image97.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image97.gif rename to doc/gui/images/image97.gif diff --git a/doc/salome/gui/SMESH/images/image97.jpg b/doc/gui/images/image97.jpg old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image97.jpg rename to doc/gui/images/image97.jpg diff --git a/doc/salome/gui/SMESH/images/image98.png b/doc/gui/images/image98.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image98.png rename to doc/gui/images/image98.png diff --git a/doc/salome/gui/SMESH/images/image99.gif b/doc/gui/images/image99.gif old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/image99.gif rename to doc/gui/images/image99.gif diff --git a/doc/salome/gui/SMESH/images/image_octa12.png b/doc/gui/images/image_octa12.png similarity index 100% rename from doc/salome/gui/SMESH/images/image_octa12.png rename to doc/gui/images/image_octa12.png diff --git a/doc/salome/gui/SMESH/images/intersect_groups1.png b/doc/gui/images/intersect_groups1.png similarity index 100% rename from doc/salome/gui/SMESH/images/intersect_groups1.png rename to doc/gui/images/intersect_groups1.png diff --git a/doc/salome/gui/SMESH/images/intersectgroups.png b/doc/gui/images/intersectgroups.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/intersectgroups.png rename to doc/gui/images/intersectgroups.png diff --git a/doc/salome/gui/SMESH/images/length-crit.png b/doc/gui/images/length-crit.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/length-crit.png rename to doc/gui/images/length-crit.png diff --git a/doc/salome/gui/SMESH/images/length2d.png b/doc/gui/images/length2d.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/length2d.png rename to doc/gui/images/length2d.png diff --git a/doc/salome/gui/SMESH/images/lengthnearvertex.png b/doc/gui/images/lengthnearvertex.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/lengthnearvertex.png rename to doc/gui/images/lengthnearvertex.png diff --git a/doc/salome/gui/SMESH/images/max_el_area.png b/doc/gui/images/max_el_area.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/max_el_area.png rename to doc/gui/images/max_el_area.png diff --git a/doc/salome/gui/SMESH/images/max_element_length_2d.png b/doc/gui/images/max_element_length_2d.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/max_element_length_2d.png rename to doc/gui/images/max_element_length_2d.png diff --git a/doc/salome/gui/SMESH/images/max_element_length_3d.png b/doc/gui/images/max_element_length_3d.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/max_element_length_3d.png rename to doc/gui/images/max_element_length_3d.png diff --git a/doc/salome/gui/SMESH/images/mergeelems.png b/doc/gui/images/mergeelems.png similarity index 100% rename from doc/salome/gui/SMESH/images/mergeelems.png rename to doc/gui/images/mergeelems.png diff --git a/doc/salome/gui/SMESH/images/mergeelems_auto.png b/doc/gui/images/mergeelems_auto.png similarity index 100% rename from doc/salome/gui/SMESH/images/mergeelems_auto.png rename to doc/gui/images/mergeelems_auto.png diff --git a/doc/salome/gui/SMESH/images/mergeelems_ico.png b/doc/gui/images/mergeelems_ico.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/mergeelems_ico.png rename to doc/gui/images/mergeelems_ico.png diff --git a/doc/salome/gui/SMESH/images/mergenodes.png b/doc/gui/images/mergenodes.png similarity index 100% rename from doc/salome/gui/SMESH/images/mergenodes.png rename to doc/gui/images/mergenodes.png diff --git a/doc/salome/gui/SMESH/images/mergenodes_auto.png b/doc/gui/images/mergenodes_auto.png similarity index 100% rename from doc/salome/gui/SMESH/images/mergenodes_auto.png rename to doc/gui/images/mergenodes_auto.png diff --git a/doc/salome/gui/SMESH/images/mergenodes_ico.png b/doc/gui/images/mergenodes_ico.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/mergenodes_ico.png rename to doc/gui/images/mergenodes_ico.png diff --git a/doc/salome/gui/SMESH/images/merging_nodes1.png b/doc/gui/images/merging_nodes1.png similarity index 100% rename from doc/salome/gui/SMESH/images/merging_nodes1.png rename to doc/gui/images/merging_nodes1.png diff --git a/doc/salome/gui/SMESH/images/merging_nodes2.png b/doc/gui/images/merging_nodes2.png similarity index 100% rename from doc/salome/gui/SMESH/images/merging_nodes2.png rename to doc/gui/images/merging_nodes2.png diff --git a/doc/salome/gui/SMESH/images/mesh_clear.png b/doc/gui/images/mesh_clear.png similarity index 100% rename from doc/salome/gui/SMESH/images/mesh_clear.png rename to doc/gui/images/mesh_clear.png diff --git a/doc/salome/gui/SMESH/images/mesh_cylinder_hexa.png b/doc/gui/images/mesh_cylinder_hexa.png similarity index 100% rename from doc/salome/gui/SMESH/images/mesh_cylinder_hexa.png rename to doc/gui/images/mesh_cylinder_hexa.png diff --git a/doc/gui/images/mesh_deflection.png b/doc/gui/images/mesh_deflection.png new file mode 100644 index 0000000000000000000000000000000000000000..f9d8542dc4c09468cfcfe064ad0f374d7f892684 GIT binary patch literal 827 zcmV-B1H}A^P)MFDX7fByTB$lB$P+1g_2q6?v_CXd=kwlx! zvKG<8MMZ_0%pxjiQDA{lSqMQNwh6K?6~}qwym_a^*z?Wwv_G81<=peX|9j8>TvV0J zXliPrq@)B9Ss)@25g80ONAzOktEyuXRP#5o$V4(5!!Q^a7+4MT0#AV@Ufy&dnVpIN zWM`6LI<&T0%Yi$<*22QVC;k2X=~bqawm+C~GHF?s1>6N1&Ub!(;=0Q9BkKaycxrv5 zSpg><0Q!oHi|?bL3cJod^a>2a2qq1@atif8^_J#NlCI*a;_6f~FE0)B^xh;#P`NxBN88gr_4 zA+CO+y>VHf(oEaT1Aab#)31j%glOp*8Kulk- z^F(Bl@CN|V;UUI`zj5R6TH^6I<>loh5()6nriiQ(k=}7dPu%{3Iws?a?rwR6f0j4x zyY`P=)~ufFx~h7lA~H)veu+q4Q^#i-+h3(}j_DBwd9Qwt5!_|lwiCc(pf(mAWqkA( zTTkAi`ruV&Lb%rFN$=~KQduk_UqvK$Tl2lCqG=R+sfPQWbt;5ZHy6%~|~mBoPd zzyjczh^+LU=r57!{QraP>FMz=M?|Cw*a2Mr=X0F~e*hmoa~eQU{gD6w002ovPDHLk FV1mBVc~1ZU literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/images/mesh_evaluation_succeed.png b/doc/gui/images/mesh_evaluation_succeed.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/mesh_evaluation_succeed.png rename to doc/gui/images/mesh_evaluation_succeed.png diff --git a/doc/salome/gui/SMESH/images/mesh_fixedpnt.png b/doc/gui/images/mesh_fixedpnt.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/mesh_fixedpnt.png rename to doc/gui/images/mesh_fixedpnt.png diff --git a/doc/salome/gui/SMESH/images/mesh_for_extr_along_path.png b/doc/gui/images/mesh_for_extr_along_path.png similarity index 100% rename from doc/salome/gui/SMESH/images/mesh_for_extr_along_path.png rename to doc/gui/images/mesh_for_extr_along_path.png diff --git a/doc/salome/gui/SMESH/images/mesh_node_to_point.png b/doc/gui/images/mesh_node_to_point.png similarity index 100% rename from doc/salome/gui/SMESH/images/mesh_node_to_point.png rename to doc/gui/images/mesh_node_to_point.png diff --git a/doc/salome/gui/SMESH/images/mesh_order_123.png b/doc/gui/images/mesh_order_123.png similarity index 100% rename from doc/salome/gui/SMESH/images/mesh_order_123.png rename to doc/gui/images/mesh_order_123.png diff --git a/doc/salome/gui/SMESH/images/mesh_order_123_res.png b/doc/gui/images/mesh_order_123_res.png similarity index 100% rename from doc/salome/gui/SMESH/images/mesh_order_123_res.png rename to doc/gui/images/mesh_order_123_res.png diff --git a/doc/salome/gui/SMESH/images/mesh_order_213.png b/doc/gui/images/mesh_order_213.png similarity index 100% rename from doc/salome/gui/SMESH/images/mesh_order_213.png rename to doc/gui/images/mesh_order_213.png diff --git a/doc/salome/gui/SMESH/images/mesh_order_213_res.png b/doc/gui/images/mesh_order_213_res.png similarity index 100% rename from doc/salome/gui/SMESH/images/mesh_order_213_res.png rename to doc/gui/images/mesh_order_213_res.png diff --git a/doc/salome/gui/SMESH/images/mesh_order_321.png b/doc/gui/images/mesh_order_321.png similarity index 100% rename from doc/salome/gui/SMESH/images/mesh_order_321.png rename to doc/gui/images/mesh_order_321.png diff --git a/doc/salome/gui/SMESH/images/mesh_order_321_res.png b/doc/gui/images/mesh_order_321_res.png similarity index 100% rename from doc/salome/gui/SMESH/images/mesh_order_321_res.png rename to doc/gui/images/mesh_order_321_res.png diff --git a/doc/salome/gui/SMESH/images/mesh_order_no_concurrent.png b/doc/gui/images/mesh_order_no_concurrent.png similarity index 100% rename from doc/salome/gui/SMESH/images/mesh_order_no_concurrent.png rename to doc/gui/images/mesh_order_no_concurrent.png diff --git a/doc/salome/gui/SMESH/images/mesh_order_preview.png b/doc/gui/images/mesh_order_preview.png similarity index 100% rename from doc/salome/gui/SMESH/images/mesh_order_preview.png rename to doc/gui/images/mesh_order_preview.png diff --git a/doc/salome/gui/SMESH/images/mesh_precompute.png b/doc/gui/images/mesh_precompute.png similarity index 100% rename from doc/salome/gui/SMESH/images/mesh_precompute.png rename to doc/gui/images/mesh_precompute.png diff --git a/doc/salome/gui/SMESH/images/mesh_radquad_01.png b/doc/gui/images/mesh_radquad_01.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/mesh_radquad_01.png rename to doc/gui/images/mesh_radquad_01.png diff --git a/doc/salome/gui/SMESH/images/mesh_radquad_02.png b/doc/gui/images/mesh_radquad_02.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/mesh_radquad_02.png rename to doc/gui/images/mesh_radquad_02.png diff --git a/doc/salome/gui/SMESH/images/mesh_split_diag_interactive.png b/doc/gui/images/mesh_split_diag_interactive.png similarity index 100% rename from doc/salome/gui/SMESH/images/mesh_split_diag_interactive.png rename to doc/gui/images/mesh_split_diag_interactive.png diff --git a/doc/salome/gui/SMESH/images/mesh_split_face_interactive.png b/doc/gui/images/mesh_split_face_interactive.png similarity index 100% rename from doc/salome/gui/SMESH/images/mesh_split_face_interactive.png rename to doc/gui/images/mesh_split_face_interactive.png diff --git a/doc/salome/gui/SMESH/images/meshcomputationfail.png b/doc/gui/images/meshcomputationfail.png similarity index 100% rename from doc/salome/gui/SMESH/images/meshcomputationfail.png rename to doc/gui/images/meshcomputationfail.png diff --git a/doc/salome/gui/SMESH/images/meshcomputationsucceed.png b/doc/gui/images/meshcomputationsucceed.png similarity index 100% rename from doc/salome/gui/SMESH/images/meshcomputationsucceed.png rename to doc/gui/images/meshcomputationsucceed.png diff --git a/doc/salome/gui/SMESH/images/meshcut_plugin.png b/doc/gui/images/meshcut_plugin.png similarity index 100% rename from doc/salome/gui/SMESH/images/meshcut_plugin.png rename to doc/gui/images/meshcut_plugin.png diff --git a/doc/salome/gui/SMESH/images/meshexportgroupwarning.png b/doc/gui/images/meshexportgroupwarning.png similarity index 100% rename from doc/salome/gui/SMESH/images/meshexportgroupwarning.png rename to doc/gui/images/meshexportgroupwarning.png diff --git a/doc/salome/gui/SMESH/images/meshexportmesh.png b/doc/gui/images/meshexportmesh.png similarity index 100% rename from doc/salome/gui/SMESH/images/meshexportmesh.png rename to doc/gui/images/meshexportmesh.png diff --git a/doc/salome/gui/SMESH/images/meshimportmesh.png b/doc/gui/images/meshimportmesh.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/meshimportmesh.png rename to doc/gui/images/meshimportmesh.png diff --git a/doc/salome/gui/SMESH/images/meshtopass1.png b/doc/gui/images/meshtopass1.png similarity index 100% rename from doc/salome/gui/SMESH/images/meshtopass1.png rename to doc/gui/images/meshtopass1.png diff --git a/doc/salome/gui/SMESH/images/meshtopass2.png b/doc/gui/images/meshtopass2.png similarity index 100% rename from doc/salome/gui/SMESH/images/meshtopass2.png rename to doc/gui/images/meshtopass2.png diff --git a/doc/salome/gui/SMESH/images/meshtopass3.png b/doc/gui/images/meshtopass3.png similarity index 100% rename from doc/salome/gui/SMESH/images/meshtopass3.png rename to doc/gui/images/meshtopass3.png diff --git a/doc/salome/gui/SMESH/images/meshtrianglemergeelem1.png b/doc/gui/images/meshtrianglemergeelem1.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/meshtrianglemergeelem1.png rename to doc/gui/images/meshtrianglemergeelem1.png diff --git a/doc/salome/gui/SMESH/images/min_distance.png b/doc/gui/images/min_distance.png similarity index 100% rename from doc/salome/gui/SMESH/images/min_distance.png rename to doc/gui/images/min_distance.png diff --git a/doc/salome/gui/SMESH/images/min_distance_preview.png b/doc/gui/images/min_distance_preview.png similarity index 100% rename from doc/salome/gui/SMESH/images/min_distance_preview.png rename to doc/gui/images/min_distance_preview.png diff --git a/doc/salome/gui/SMESH/images/movenodes.png b/doc/gui/images/movenodes.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/movenodes.png rename to doc/gui/images/movenodes.png diff --git a/doc/salome/gui/SMESH/images/moving_nodes1.png b/doc/gui/images/moving_nodes1.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/moving_nodes1.png rename to doc/gui/images/moving_nodes1.png diff --git a/doc/salome/gui/SMESH/images/moving_nodes2.png b/doc/gui/images/moving_nodes2.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/moving_nodes2.png rename to doc/gui/images/moving_nodes2.png diff --git a/doc/salome/gui/SMESH/images/number_of_layers.png b/doc/gui/images/number_of_layers.png similarity index 100% rename from doc/salome/gui/SMESH/images/number_of_layers.png rename to doc/gui/images/number_of_layers.png diff --git a/doc/salome/gui/SMESH/images/opengl_clipping.png b/doc/gui/images/opengl_clipping.png similarity index 100% rename from doc/salome/gui/SMESH/images/opengl_clipping.png rename to doc/gui/images/opengl_clipping.png diff --git a/doc/salome/gui/SMESH/images/orientaation1.png b/doc/gui/images/orientaation1.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/orientaation1.png rename to doc/gui/images/orientaation1.png diff --git a/doc/salome/gui/SMESH/images/over_constrained_faces.png b/doc/gui/images/over_constrained_faces.png similarity index 100% rename from doc/salome/gui/SMESH/images/over_constrained_faces.png rename to doc/gui/images/over_constrained_faces.png diff --git a/doc/salome/gui/SMESH/images/over_constrained_volumes.png b/doc/gui/images/over_constrained_volumes.png similarity index 100% rename from doc/salome/gui/SMESH/images/over_constrained_volumes.png rename to doc/gui/images/over_constrained_volumes.png diff --git a/doc/salome/gui/SMESH/images/pattern2d.png b/doc/gui/images/pattern2d.png similarity index 100% rename from doc/salome/gui/SMESH/images/pattern2d.png rename to doc/gui/images/pattern2d.png diff --git a/doc/salome/gui/SMESH/images/patternmapping1.png b/doc/gui/images/patternmapping1.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/patternmapping1.png rename to doc/gui/images/patternmapping1.png diff --git a/doc/salome/gui/SMESH/images/patternmapping2.png b/doc/gui/images/patternmapping2.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/patternmapping2.png rename to doc/gui/images/patternmapping2.png diff --git a/doc/salome/gui/SMESH/images/point_marker_widget1.png b/doc/gui/images/point_marker_widget1.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/point_marker_widget1.png rename to doc/gui/images/point_marker_widget1.png diff --git a/doc/salome/gui/SMESH/images/point_marker_widget2.png b/doc/gui/images/point_marker_widget2.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/point_marker_widget2.png rename to doc/gui/images/point_marker_widget2.png diff --git a/doc/salome/gui/SMESH/images/pref21.png b/doc/gui/images/pref21.png similarity index 100% rename from doc/salome/gui/SMESH/images/pref21.png rename to doc/gui/images/pref21.png diff --git a/doc/salome/gui/SMESH/images/pref22.png b/doc/gui/images/pref22.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/pref22.png rename to doc/gui/images/pref22.png diff --git a/doc/salome/gui/SMESH/images/pref23.png b/doc/gui/images/pref23.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/pref23.png rename to doc/gui/images/pref23.png diff --git a/doc/salome/gui/SMESH/images/pref24.png b/doc/gui/images/pref24.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/pref24.png rename to doc/gui/images/pref24.png diff --git a/doc/salome/gui/SMESH/images/preview_mesh_1D.png b/doc/gui/images/preview_mesh_1D.png similarity index 100% rename from doc/salome/gui/SMESH/images/preview_mesh_1D.png rename to doc/gui/images/preview_mesh_1D.png diff --git a/doc/salome/gui/SMESH/images/preview_mesh_2D.png b/doc/gui/images/preview_mesh_2D.png similarity index 100% rename from doc/salome/gui/SMESH/images/preview_mesh_2D.png rename to doc/gui/images/preview_mesh_2D.png diff --git a/doc/salome/gui/SMESH/images/preview_tmp_data.png b/doc/gui/images/preview_tmp_data.png similarity index 100% rename from doc/salome/gui/SMESH/images/preview_tmp_data.png rename to doc/gui/images/preview_tmp_data.png diff --git a/doc/salome/gui/SMESH/images/prism_mesh.png b/doc/gui/images/prism_mesh.png similarity index 100% rename from doc/salome/gui/SMESH/images/prism_mesh.png rename to doc/gui/images/prism_mesh.png diff --git a/doc/salome/gui/SMESH/images/prism_needs_hyps.png b/doc/gui/images/prism_needs_hyps.png similarity index 100% rename from doc/salome/gui/SMESH/images/prism_needs_hyps.png rename to doc/gui/images/prism_needs_hyps.png diff --git a/doc/salome/gui/SMESH/images/prism_ok_ko.png b/doc/gui/images/prism_ok_ko.png similarity index 100% rename from doc/salome/gui/SMESH/images/prism_ok_ko.png rename to doc/gui/images/prism_ok_ko.png diff --git a/doc/salome/gui/SMESH/images/prism_stack.png b/doc/gui/images/prism_stack.png similarity index 100% rename from doc/salome/gui/SMESH/images/prism_stack.png rename to doc/gui/images/prism_stack.png diff --git a/doc/salome/gui/SMESH/images/prism_tui_sample.png b/doc/gui/images/prism_tui_sample.png similarity index 100% rename from doc/salome/gui/SMESH/images/prism_tui_sample.png rename to doc/gui/images/prism_tui_sample.png diff --git a/doc/salome/gui/SMESH/images/projection_1d.png b/doc/gui/images/projection_1d.png similarity index 100% rename from doc/salome/gui/SMESH/images/projection_1d.png rename to doc/gui/images/projection_1d.png diff --git a/doc/salome/gui/SMESH/images/projection_2d.png b/doc/gui/images/projection_2d.png similarity index 100% rename from doc/salome/gui/SMESH/images/projection_2d.png rename to doc/gui/images/projection_2d.png diff --git a/doc/salome/gui/SMESH/images/projection_3d.png b/doc/gui/images/projection_3d.png similarity index 100% rename from doc/salome/gui/SMESH/images/projection_3d.png rename to doc/gui/images/projection_3d.png diff --git a/doc/salome/gui/SMESH/images/propagation_chain.png b/doc/gui/images/propagation_chain.png similarity index 100% rename from doc/salome/gui/SMESH/images/propagation_chain.png rename to doc/gui/images/propagation_chain.png diff --git a/doc/salome/gui/SMESH/images/quad_from_ma_medial_axis.png b/doc/gui/images/quad_from_ma_medial_axis.png similarity index 100% rename from doc/salome/gui/SMESH/images/quad_from_ma_medial_axis.png rename to doc/gui/images/quad_from_ma_medial_axis.png diff --git a/doc/salome/gui/SMESH/images/quad_from_ma_mesh.png b/doc/gui/images/quad_from_ma_mesh.png similarity index 100% rename from doc/salome/gui/SMESH/images/quad_from_ma_mesh.png rename to doc/gui/images/quad_from_ma_mesh.png diff --git a/doc/salome/gui/SMESH/images/quad_from_ma_ring_mesh.png b/doc/gui/images/quad_from_ma_ring_mesh.png similarity index 100% rename from doc/salome/gui/SMESH/images/quad_from_ma_ring_mesh.png rename to doc/gui/images/quad_from_ma_ring_mesh.png diff --git a/doc/salome/gui/SMESH/images/quad_mesh_invalid.png b/doc/gui/images/quad_mesh_invalid.png similarity index 100% rename from doc/salome/gui/SMESH/images/quad_mesh_invalid.png rename to doc/gui/images/quad_mesh_invalid.png diff --git a/doc/salome/gui/SMESH/images/quad_meshes.png b/doc/gui/images/quad_meshes.png similarity index 100% rename from doc/salome/gui/SMESH/images/quad_meshes.png rename to doc/gui/images/quad_meshes.png diff --git a/doc/salome/gui/SMESH/images/radial_prism_mesh.png b/doc/gui/images/radial_prism_mesh.png similarity index 100% rename from doc/salome/gui/SMESH/images/radial_prism_mesh.png rename to doc/gui/images/radial_prism_mesh.png diff --git a/doc/salome/gui/SMESH/images/reduce_three_to_one.png b/doc/gui/images/reduce_three_to_one.png similarity index 100% rename from doc/salome/gui/SMESH/images/reduce_three_to_one.png rename to doc/gui/images/reduce_three_to_one.png diff --git a/doc/salome/gui/SMESH/images/remove.gif b/doc/gui/images/remove.gif similarity index 100% rename from doc/salome/gui/SMESH/images/remove.gif rename to doc/gui/images/remove.gif diff --git a/doc/salome/gui/SMESH/images/remove.png b/doc/gui/images/remove.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/remove.png rename to doc/gui/images/remove.png diff --git a/doc/salome/gui/SMESH/images/remove_elements1.png b/doc/gui/images/remove_elements1.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/remove_elements1.png rename to doc/gui/images/remove_elements1.png diff --git a/doc/salome/gui/SMESH/images/remove_elements2.png b/doc/gui/images/remove_elements2.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/remove_elements2.png rename to doc/gui/images/remove_elements2.png diff --git a/doc/salome/gui/SMESH/images/remove_elements_icon.png b/doc/gui/images/remove_elements_icon.png similarity index 100% rename from doc/salome/gui/SMESH/images/remove_elements_icon.png rename to doc/gui/images/remove_elements_icon.png diff --git a/doc/salome/gui/SMESH/images/remove_node_reconnection.png b/doc/gui/images/remove_node_reconnection.png similarity index 100% rename from doc/salome/gui/SMESH/images/remove_node_reconnection.png rename to doc/gui/images/remove_node_reconnection.png diff --git a/doc/salome/gui/SMESH/images/remove_node_reconnection_dlg.png b/doc/gui/images/remove_node_reconnection_dlg.png similarity index 100% rename from doc/salome/gui/SMESH/images/remove_node_reconnection_dlg.png rename to doc/gui/images/remove_node_reconnection_dlg.png diff --git a/doc/salome/gui/SMESH/images/remove_node_reconnection_icon.png b/doc/gui/images/remove_node_reconnection_icon.png similarity index 100% rename from doc/salome/gui/SMESH/images/remove_node_reconnection_icon.png rename to doc/gui/images/remove_node_reconnection_icon.png diff --git a/doc/salome/gui/SMESH/images/remove_nodes1.png b/doc/gui/images/remove_nodes1.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/remove_nodes1.png rename to doc/gui/images/remove_nodes1.png diff --git a/doc/salome/gui/SMESH/images/remove_nodes2.png b/doc/gui/images/remove_nodes2.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/remove_nodes2.png rename to doc/gui/images/remove_nodes2.png diff --git a/doc/salome/gui/SMESH/images/remove_nodes_icon.png b/doc/gui/images/remove_nodes_icon.png similarity index 100% rename from doc/salome/gui/SMESH/images/remove_nodes_icon.png rename to doc/gui/images/remove_nodes_icon.png diff --git a/doc/salome/gui/SMESH/images/remove_orphan_nodes_icon.png b/doc/gui/images/remove_orphan_nodes_icon.png similarity index 100% rename from doc/salome/gui/SMESH/images/remove_orphan_nodes_icon.png rename to doc/gui/images/remove_orphan_nodes_icon.png diff --git a/doc/salome/gui/SMESH/images/removeelements.png b/doc/gui/images/removeelements.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/removeelements.png rename to doc/gui/images/removeelements.png diff --git a/doc/salome/gui/SMESH/images/removenodes.png b/doc/gui/images/removenodes.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/removenodes.png rename to doc/gui/images/removenodes.png diff --git a/doc/salome/gui/SMESH/images/removeorphannodes.png b/doc/gui/images/removeorphannodes.png similarity index 100% rename from doc/salome/gui/SMESH/images/removeorphannodes.png rename to doc/gui/images/removeorphannodes.png diff --git a/doc/salome/gui/SMESH/images/renumberelements.png b/doc/gui/images/renumberelements.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/renumberelements.png rename to doc/gui/images/renumberelements.png diff --git a/doc/salome/gui/SMESH/images/renumbernodes.png b/doc/gui/images/renumbernodes.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/renumbernodes.png rename to doc/gui/images/renumbernodes.png diff --git a/doc/salome/gui/SMESH/images/reorient_2d_face.png b/doc/gui/images/reorient_2d_face.png similarity index 100% rename from doc/salome/gui/SMESH/images/reorient_2d_face.png rename to doc/gui/images/reorient_2d_face.png diff --git a/doc/salome/gui/SMESH/images/reorient_2d_point.png b/doc/gui/images/reorient_2d_point.png similarity index 100% rename from doc/salome/gui/SMESH/images/reorient_2d_point.png rename to doc/gui/images/reorient_2d_point.png diff --git a/doc/salome/gui/SMESH/images/reorient_2d_refgroup.png b/doc/gui/images/reorient_2d_refgroup.png similarity index 100% rename from doc/salome/gui/SMESH/images/reorient_2d_refgroup.png rename to doc/gui/images/reorient_2d_refgroup.png diff --git a/doc/salome/gui/SMESH/images/reorient_2d_volume.png b/doc/gui/images/reorient_2d_volume.png similarity index 100% rename from doc/salome/gui/SMESH/images/reorient_2d_volume.png rename to doc/gui/images/reorient_2d_volume.png diff --git a/doc/salome/gui/SMESH/images/reorient_faces_face.png b/doc/gui/images/reorient_faces_face.png similarity index 100% rename from doc/salome/gui/SMESH/images/reorient_faces_face.png rename to doc/gui/images/reorient_faces_face.png diff --git a/doc/salome/gui/SMESH/images/reorient_faces_point.png b/doc/gui/images/reorient_faces_point.png similarity index 100% rename from doc/salome/gui/SMESH/images/reorient_faces_point.png rename to doc/gui/images/reorient_faces_point.png diff --git a/doc/salome/gui/SMESH/images/reorient_faces_ref_groups.png b/doc/gui/images/reorient_faces_ref_groups.png similarity index 100% rename from doc/salome/gui/SMESH/images/reorient_faces_ref_groups.png rename to doc/gui/images/reorient_faces_ref_groups.png diff --git a/doc/salome/gui/SMESH/images/reorient_faces_volume.png b/doc/gui/images/reorient_faces_volume.png similarity index 100% rename from doc/salome/gui/SMESH/images/reorient_faces_volume.png rename to doc/gui/images/reorient_faces_volume.png diff --git a/doc/salome/gui/SMESH/images/rev_edges_helper_dlg.png b/doc/gui/images/rev_edges_helper_dlg.png similarity index 100% rename from doc/salome/gui/SMESH/images/rev_edges_helper_dlg.png rename to doc/gui/images/rev_edges_helper_dlg.png diff --git a/doc/salome/gui/SMESH/images/revolution1.png b/doc/gui/images/revolution1.png similarity index 100% rename from doc/salome/gui/SMESH/images/revolution1.png rename to doc/gui/images/revolution1.png diff --git a/doc/salome/gui/SMESH/images/revolutionsn1.png b/doc/gui/images/revolutionsn1.png similarity index 100% rename from doc/salome/gui/SMESH/images/revolutionsn1.png rename to doc/gui/images/revolutionsn1.png diff --git a/doc/salome/gui/SMESH/images/revolutionsn2.png b/doc/gui/images/revolutionsn2.png similarity index 100% rename from doc/salome/gui/SMESH/images/revolutionsn2.png rename to doc/gui/images/revolutionsn2.png diff --git a/doc/salome/gui/SMESH/images/rotation.png b/doc/gui/images/rotation.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/rotation.png rename to doc/gui/images/rotation.png diff --git a/doc/salome/gui/SMESH/images/rotation1.png b/doc/gui/images/rotation1.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/rotation1.png rename to doc/gui/images/rotation1.png diff --git a/doc/salome/gui/SMESH/images/rotation2.png b/doc/gui/images/rotation2.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/rotation2.png rename to doc/gui/images/rotation2.png diff --git a/doc/salome/gui/SMESH/images/rotation_ico.png b/doc/gui/images/rotation_ico.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/rotation_ico.png rename to doc/gui/images/rotation_ico.png diff --git a/doc/salome/gui/SMESH/images/scalar_bar_dlg.png b/doc/gui/images/scalar_bar_dlg.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/scalar_bar_dlg.png rename to doc/gui/images/scalar_bar_dlg.png diff --git a/doc/salome/gui/SMESH/images/scale01.png b/doc/gui/images/scale01.png similarity index 100% rename from doc/salome/gui/SMESH/images/scale01.png rename to doc/gui/images/scale01.png diff --git a/doc/salome/gui/SMESH/images/scale02.png b/doc/gui/images/scale02.png similarity index 100% rename from doc/salome/gui/SMESH/images/scale02.png rename to doc/gui/images/scale02.png diff --git a/doc/salome/gui/SMESH/images/scale03.png b/doc/gui/images/scale03.png similarity index 100% rename from doc/salome/gui/SMESH/images/scale03.png rename to doc/gui/images/scale03.png diff --git a/doc/salome/gui/SMESH/images/scale04.png b/doc/gui/images/scale04.png similarity index 100% rename from doc/salome/gui/SMESH/images/scale04.png rename to doc/gui/images/scale04.png diff --git a/doc/salome/gui/SMESH/images/scale06.png b/doc/gui/images/scale06.png similarity index 100% rename from doc/salome/gui/SMESH/images/scale06.png rename to doc/gui/images/scale06.png diff --git a/doc/salome/gui/SMESH/images/scale07.png b/doc/gui/images/scale07.png similarity index 100% rename from doc/salome/gui/SMESH/images/scale07.png rename to doc/gui/images/scale07.png diff --git a/doc/salome/gui/SMESH/images/scale09.png b/doc/gui/images/scale09.png similarity index 100% rename from doc/salome/gui/SMESH/images/scale09.png rename to doc/gui/images/scale09.png diff --git a/doc/salome/gui/SMESH/images/scaleinit01.png b/doc/gui/images/scaleinit01.png similarity index 100% rename from doc/salome/gui/SMESH/images/scaleinit01.png rename to doc/gui/images/scaleinit01.png diff --git a/doc/salome/gui/SMESH/images/scaleinit02.png b/doc/gui/images/scaleinit02.png similarity index 100% rename from doc/salome/gui/SMESH/images/scaleinit02.png rename to doc/gui/images/scaleinit02.png diff --git a/doc/salome/gui/SMESH/images/scaleres03.png b/doc/gui/images/scaleres03.png similarity index 100% rename from doc/salome/gui/SMESH/images/scaleres03.png rename to doc/gui/images/scaleres03.png diff --git a/doc/salome/gui/SMESH/images/scaleres04.png b/doc/gui/images/scaleres04.png similarity index 100% rename from doc/salome/gui/SMESH/images/scaleres04.png rename to doc/gui/images/scaleres04.png diff --git a/doc/salome/gui/SMESH/images/scaleres06.png b/doc/gui/images/scaleres06.png similarity index 100% rename from doc/salome/gui/SMESH/images/scaleres06.png rename to doc/gui/images/scaleres06.png diff --git a/doc/salome/gui/SMESH/images/scaleres07.png b/doc/gui/images/scaleres07.png similarity index 100% rename from doc/salome/gui/SMESH/images/scaleres07.png rename to doc/gui/images/scaleres07.png diff --git a/doc/salome/gui/SMESH/images/scaleres09.png b/doc/gui/images/scaleres09.png similarity index 100% rename from doc/salome/gui/SMESH/images/scaleres09.png rename to doc/gui/images/scaleres09.png diff --git a/doc/salome/gui/SMESH/images/selectionfilterlibrary.png b/doc/gui/images/selectionfilterlibrary.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/selectionfilterlibrary.png rename to doc/gui/images/selectionfilterlibrary.png diff --git a/doc/salome/gui/SMESH/images/sew_after_merge.png b/doc/gui/images/sew_after_merge.png similarity index 100% rename from doc/salome/gui/SMESH/images/sew_after_merge.png rename to doc/gui/images/sew_after_merge.png diff --git a/doc/salome/gui/SMESH/images/sew_using_merge.png b/doc/gui/images/sew_using_merge.png similarity index 100% rename from doc/salome/gui/SMESH/images/sew_using_merge.png rename to doc/gui/images/sew_using_merge.png diff --git a/doc/salome/gui/SMESH/images/sewing.png b/doc/gui/images/sewing.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/sewing.png rename to doc/gui/images/sewing.png diff --git a/doc/salome/gui/SMESH/images/sewing1.png b/doc/gui/images/sewing1.png similarity index 100% rename from doc/salome/gui/SMESH/images/sewing1.png rename to doc/gui/images/sewing1.png diff --git a/doc/salome/gui/SMESH/images/sewing2.png b/doc/gui/images/sewing2.png similarity index 100% rename from doc/salome/gui/SMESH/images/sewing2.png rename to doc/gui/images/sewing2.png diff --git a/doc/salome/gui/SMESH/images/sewing3.png b/doc/gui/images/sewing3.png similarity index 100% rename from doc/salome/gui/SMESH/images/sewing3.png rename to doc/gui/images/sewing3.png diff --git a/doc/salome/gui/SMESH/images/sewing4.png b/doc/gui/images/sewing4.png similarity index 100% rename from doc/salome/gui/SMESH/images/sewing4.png rename to doc/gui/images/sewing4.png diff --git a/doc/salome/gui/SMESH/images/sewing_auto.png b/doc/gui/images/sewing_auto.png similarity index 100% rename from doc/salome/gui/SMESH/images/sewing_auto.png rename to doc/gui/images/sewing_auto.png diff --git a/doc/salome/gui/SMESH/images/sewing_manual.png b/doc/gui/images/sewing_manual.png similarity index 100% rename from doc/salome/gui/SMESH/images/sewing_manual.png rename to doc/gui/images/sewing_manual.png diff --git a/doc/salome/gui/SMESH/images/show_bad_mesh.png b/doc/gui/images/show_bad_mesh.png similarity index 100% rename from doc/salome/gui/SMESH/images/show_bad_mesh.png rename to doc/gui/images/show_bad_mesh.png diff --git a/doc/salome/gui/SMESH/images/smesh_sort.png b/doc/gui/images/smesh_sort.png similarity index 100% rename from doc/salome/gui/SMESH/images/smesh_sort.png rename to doc/gui/images/smesh_sort.png diff --git a/doc/salome/gui/SMESH/images/smesh_sort_groups.png b/doc/gui/images/smesh_sort_groups.png similarity index 100% rename from doc/salome/gui/SMESH/images/smesh_sort_groups.png rename to doc/gui/images/smesh_sort_groups.png diff --git a/doc/salome/gui/SMESH/images/smoothing.png b/doc/gui/images/smoothing.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/smoothing.png rename to doc/gui/images/smoothing.png diff --git a/doc/salome/gui/SMESH/images/smoothing1.png b/doc/gui/images/smoothing1.png similarity index 100% rename from doc/salome/gui/SMESH/images/smoothing1.png rename to doc/gui/images/smoothing1.png diff --git a/doc/salome/gui/SMESH/images/smoothing2.png b/doc/gui/images/smoothing2.png similarity index 100% rename from doc/salome/gui/SMESH/images/smoothing2.png rename to doc/gui/images/smoothing2.png diff --git a/doc/salome/gui/SMESH/images/sort.gif b/doc/gui/images/sort.gif similarity index 100% rename from doc/salome/gui/SMESH/images/sort.gif rename to doc/gui/images/sort.gif diff --git a/doc/salome/gui/SMESH/images/sort.png b/doc/gui/images/sort.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/sort.png rename to doc/gui/images/sort.png diff --git a/doc/salome/gui/SMESH/images/split_biquad_to_linear_dlg.png b/doc/gui/images/split_biquad_to_linear_dlg.png similarity index 100% rename from doc/salome/gui/SMESH/images/split_biquad_to_linear_dlg.png rename to doc/gui/images/split_biquad_to_linear_dlg.png diff --git a/doc/salome/gui/SMESH/images/split_biquad_to_linear_icon.png b/doc/gui/images/split_biquad_to_linear_icon.png similarity index 100% rename from doc/salome/gui/SMESH/images/split_biquad_to_linear_icon.png rename to doc/gui/images/split_biquad_to_linear_icon.png diff --git a/doc/salome/gui/SMESH/images/split_biquad_to_linear_mesh.png b/doc/gui/images/split_biquad_to_linear_mesh.png similarity index 100% rename from doc/salome/gui/SMESH/images/split_biquad_to_linear_mesh.png rename to doc/gui/images/split_biquad_to_linear_mesh.png diff --git a/doc/salome/gui/SMESH/images/split_into_prisms.png b/doc/gui/images/split_into_prisms.png similarity index 100% rename from doc/salome/gui/SMESH/images/split_into_prisms.png rename to doc/gui/images/split_into_prisms.png diff --git a/doc/salome/gui/SMESH/images/split_into_tetra.png b/doc/gui/images/split_into_tetra.png similarity index 100% rename from doc/salome/gui/SMESH/images/split_into_tetra.png rename to doc/gui/images/split_into_tetra.png diff --git a/doc/salome/gui/SMESH/images/split_into_tetra_icon.png b/doc/gui/images/split_into_tetra_icon.png similarity index 100% rename from doc/salome/gui/SMESH/images/split_into_tetra_icon.png rename to doc/gui/images/split_into_tetra_icon.png diff --git a/doc/salome/gui/SMESH/images/std_point_marker.png b/doc/gui/images/std_point_marker.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/std_point_marker.png rename to doc/gui/images/std_point_marker.png diff --git a/doc/salome/gui/SMESH/images/straight_after.png b/doc/gui/images/straight_after.png similarity index 100% rename from doc/salome/gui/SMESH/images/straight_after.png rename to doc/gui/images/straight_after.png diff --git a/doc/salome/gui/SMESH/images/straight_before.png b/doc/gui/images/straight_before.png similarity index 100% rename from doc/salome/gui/SMESH/images/straight_before.png rename to doc/gui/images/straight_before.png diff --git a/doc/salome/gui/SMESH/images/swap.png b/doc/gui/images/swap.png similarity index 100% rename from doc/salome/gui/SMESH/images/swap.png rename to doc/gui/images/swap.png diff --git a/doc/salome/gui/SMESH/images/symmetry.png b/doc/gui/images/symmetry.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/symmetry.png rename to doc/gui/images/symmetry.png diff --git a/doc/salome/gui/SMESH/images/symmetry1.png b/doc/gui/images/symmetry1.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/symmetry1.png rename to doc/gui/images/symmetry1.png diff --git a/doc/salome/gui/SMESH/images/symmetry2.png b/doc/gui/images/symmetry2.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/symmetry2.png rename to doc/gui/images/symmetry2.png diff --git a/doc/salome/gui/SMESH/images/symmetry3.png b/doc/gui/images/symmetry3.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/symmetry3.png rename to doc/gui/images/symmetry3.png diff --git a/doc/salome/gui/SMESH/images/topo_equality.png b/doc/gui/images/topo_equality.png similarity index 100% rename from doc/salome/gui/SMESH/images/topo_equality.png rename to doc/gui/images/topo_equality.png diff --git a/doc/salome/gui/SMESH/images/translation.png b/doc/gui/images/translation.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/translation.png rename to doc/gui/images/translation.png diff --git a/doc/salome/gui/SMESH/images/translation1.png b/doc/gui/images/translation1.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/translation1.png rename to doc/gui/images/translation1.png diff --git a/doc/salome/gui/SMESH/images/translation2.png b/doc/gui/images/translation2.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/translation2.png rename to doc/gui/images/translation2.png diff --git a/doc/salome/gui/SMESH/images/union_groups1.png b/doc/gui/images/union_groups1.png similarity index 100% rename from doc/salome/gui/SMESH/images/union_groups1.png rename to doc/gui/images/union_groups1.png diff --git a/doc/salome/gui/SMESH/images/uniongroups.png b/doc/gui/images/uniongroups.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/uniongroups.png rename to doc/gui/images/uniongroups.png diff --git a/doc/salome/gui/SMESH/images/unionoftwotriangles.png b/doc/gui/images/unionoftwotriangles.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/unionoftwotriangles.png rename to doc/gui/images/unionoftwotriangles.png diff --git a/doc/salome/gui/SMESH/images/uniting_a_set_of_triangles1.png b/doc/gui/images/uniting_a_set_of_triangles1.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/uniting_a_set_of_triangles1.png rename to doc/gui/images/uniting_a_set_of_triangles1.png diff --git a/doc/salome/gui/SMESH/images/uniting_a_set_of_triangles2.png b/doc/gui/images/uniting_a_set_of_triangles2.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/uniting_a_set_of_triangles2.png rename to doc/gui/images/uniting_a_set_of_triangles2.png diff --git a/doc/salome/gui/SMESH/images/uniting_two_triangles1.png b/doc/gui/images/uniting_two_triangles1.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/uniting_two_triangles1.png rename to doc/gui/images/uniting_two_triangles1.png diff --git a/doc/salome/gui/SMESH/images/uniting_two_triangles2.png b/doc/gui/images/uniting_two_triangles2.png old mode 100755 new mode 100644 similarity index 100% rename from doc/salome/gui/SMESH/images/uniting_two_triangles2.png rename to doc/gui/images/uniting_two_triangles2.png diff --git a/doc/salome/gui/SMESH/images/use_existing_face_sample_mesh.png b/doc/gui/images/use_existing_face_sample_mesh.png similarity index 100% rename from doc/salome/gui/SMESH/images/use_existing_face_sample_mesh.png rename to doc/gui/images/use_existing_face_sample_mesh.png diff --git a/doc/salome/gui/SMESH/images/using_notebook_smesh.png b/doc/gui/images/using_notebook_smesh.png similarity index 100% rename from doc/salome/gui/SMESH/images/using_notebook_smesh.png rename to doc/gui/images/using_notebook_smesh.png diff --git a/doc/salome/gui/SMESH/images/viscous_layers_2d_hyp.png b/doc/gui/images/viscous_layers_2d_hyp.png similarity index 100% rename from doc/salome/gui/SMESH/images/viscous_layers_2d_hyp.png rename to doc/gui/images/viscous_layers_2d_hyp.png diff --git a/doc/salome/gui/SMESH/images/viscous_layers_extrusion_method.png b/doc/gui/images/viscous_layers_extrusion_method.png similarity index 100% rename from doc/salome/gui/SMESH/images/viscous_layers_extrusion_method.png rename to doc/gui/images/viscous_layers_extrusion_method.png diff --git a/doc/salome/gui/SMESH/images/viscous_layers_hyp.png b/doc/gui/images/viscous_layers_hyp.png similarity index 100% rename from doc/salome/gui/SMESH/images/viscous_layers_hyp.png rename to doc/gui/images/viscous_layers_hyp.png diff --git a/doc/salome/gui/SMESH/images/viscous_layers_mesh.png b/doc/gui/images/viscous_layers_mesh.png similarity index 100% rename from doc/salome/gui/SMESH/images/viscous_layers_mesh.png rename to doc/gui/images/viscous_layers_mesh.png diff --git a/doc/salome/gui/SMESH/images/viscous_layers_on_submesh.png b/doc/gui/images/viscous_layers_on_submesh.png similarity index 100% rename from doc/salome/gui/SMESH/images/viscous_layers_on_submesh.png rename to doc/gui/images/viscous_layers_on_submesh.png diff --git a/doc/salome/gui/SMESH/input/1d_meshing_hypo.rst b/doc/gui/input/1d_meshing_hypo.rst similarity index 100% rename from doc/salome/gui/SMESH/input/1d_meshing_hypo.rst rename to doc/gui/input/1d_meshing_hypo.rst diff --git a/doc/salome/gui/SMESH/input/2d_meshing_hypo.rst b/doc/gui/input/2d_meshing_hypo.rst similarity index 100% rename from doc/salome/gui/SMESH/input/2d_meshing_hypo.rst rename to doc/gui/input/2d_meshing_hypo.rst diff --git a/doc/salome/gui/SMESH/input/3d_meshing_hypo.rst b/doc/gui/input/3d_meshing_hypo.rst similarity index 100% rename from doc/salome/gui/SMESH/input/3d_meshing_hypo.rst rename to doc/gui/input/3d_meshing_hypo.rst diff --git a/doc/salome/gui/SMESH/input/StdMeshersBuilder.rst b/doc/gui/input/StdMeshersBuilder.rst similarity index 100% rename from doc/salome/gui/SMESH/input/StdMeshersBuilder.rst rename to doc/gui/input/StdMeshersBuilder.rst diff --git a/doc/salome/gui/SMESH/input/about_filters.rst b/doc/gui/input/about_filters.rst similarity index 100% rename from doc/salome/gui/SMESH/input/about_filters.rst rename to doc/gui/input/about_filters.rst diff --git a/doc/salome/gui/SMESH/input/about_hypo.rst b/doc/gui/input/about_hypo.rst similarity index 100% rename from doc/salome/gui/SMESH/input/about_hypo.rst rename to doc/gui/input/about_hypo.rst diff --git a/doc/salome/gui/SMESH/input/about_meshes.rst b/doc/gui/input/about_meshes.rst similarity index 100% rename from doc/salome/gui/SMESH/input/about_meshes.rst rename to doc/gui/input/about_meshes.rst diff --git a/doc/salome/gui/SMESH/input/about_quality_controls.rst b/doc/gui/input/about_quality_controls.rst similarity index 98% rename from doc/salome/gui/SMESH/input/about_quality_controls.rst rename to doc/gui/input/about_quality_controls.rst index 63b20dd1b..1e303af3e 100644 --- a/doc/salome/gui/SMESH/input/about_quality_controls.rst +++ b/doc/gui/input/about_quality_controls.rst @@ -31,6 +31,7 @@ Face quality controls: * :ref:`bare_border_faces_page` * :ref:`over_constrained_faces_page` * :ref:`length_2d_page` +* :ref:`deflection_2d_page` * :ref:`borders_at_multi_connection_2d_page` * :ref:`area_page` * :ref:`taper_page` @@ -84,6 +85,7 @@ To manage the quality controls call pop-up in the VTK viewer and select "Control bare_border_face.rst over_constrained_faces.rst length_2d.rst + deflection_2d.rst borders_at_multi_connection_2d.rst area.rst taper.rst diff --git a/doc/salome/gui/SMESH/input/adaptation.rst b/doc/gui/input/adaptation.rst similarity index 100% rename from doc/salome/gui/SMESH/input/adaptation.rst rename to doc/gui/input/adaptation.rst diff --git a/doc/salome/gui/SMESH/input/add_node_on_face.rst b/doc/gui/input/add_node_on_face.rst similarity index 100% rename from doc/salome/gui/SMESH/input/add_node_on_face.rst rename to doc/gui/input/add_node_on_face.rst diff --git a/doc/salome/gui/SMESH/input/add_node_on_segment.rst b/doc/gui/input/add_node_on_segment.rst similarity index 100% rename from doc/salome/gui/SMESH/input/add_node_on_segment.rst rename to doc/gui/input/add_node_on_segment.rst diff --git a/doc/salome/gui/SMESH/input/adding_nodes_and_elements.rst b/doc/gui/input/adding_nodes_and_elements.rst similarity index 100% rename from doc/salome/gui/SMESH/input/adding_nodes_and_elements.rst rename to doc/gui/input/adding_nodes_and_elements.rst diff --git a/doc/salome/gui/SMESH/input/adding_quadratic_elements.rst b/doc/gui/input/adding_quadratic_elements.rst similarity index 100% rename from doc/salome/gui/SMESH/input/adding_quadratic_elements.rst rename to doc/gui/input/adding_quadratic_elements.rst diff --git a/doc/salome/gui/SMESH/input/additional_hypo.rst b/doc/gui/input/additional_hypo.rst similarity index 100% rename from doc/salome/gui/SMESH/input/additional_hypo.rst rename to doc/gui/input/additional_hypo.rst diff --git a/doc/salome/gui/SMESH/input/area.rst b/doc/gui/input/area.rst similarity index 100% rename from doc/salome/gui/SMESH/input/area.rst rename to doc/gui/input/area.rst diff --git a/doc/salome/gui/SMESH/input/aspect_ratio.rst b/doc/gui/input/aspect_ratio.rst similarity index 100% rename from doc/salome/gui/SMESH/input/aspect_ratio.rst rename to doc/gui/input/aspect_ratio.rst diff --git a/doc/salome/gui/SMESH/input/aspect_ratio_3d.rst b/doc/gui/input/aspect_ratio_3d.rst similarity index 100% rename from doc/salome/gui/SMESH/input/aspect_ratio_3d.rst rename to doc/gui/input/aspect_ratio_3d.rst diff --git a/doc/salome/gui/SMESH/input/bare_border_face.rst b/doc/gui/input/bare_border_face.rst similarity index 100% rename from doc/salome/gui/SMESH/input/bare_border_face.rst rename to doc/gui/input/bare_border_face.rst diff --git a/doc/salome/gui/SMESH/input/bare_border_volumes.rst b/doc/gui/input/bare_border_volumes.rst similarity index 100% rename from doc/salome/gui/SMESH/input/bare_border_volumes.rst rename to doc/gui/input/bare_border_volumes.rst diff --git a/doc/salome/gui/SMESH/input/basic_meshing_algos.rst b/doc/gui/input/basic_meshing_algos.rst similarity index 100% rename from doc/salome/gui/SMESH/input/basic_meshing_algos.rst rename to doc/gui/input/basic_meshing_algos.rst diff --git a/doc/salome/gui/SMESH/input/borders_at_multi_connection.rst b/doc/gui/input/borders_at_multi_connection.rst similarity index 100% rename from doc/salome/gui/SMESH/input/borders_at_multi_connection.rst rename to doc/gui/input/borders_at_multi_connection.rst diff --git a/doc/salome/gui/SMESH/input/borders_at_multi_connection_2d.rst b/doc/gui/input/borders_at_multi_connection_2d.rst similarity index 100% rename from doc/salome/gui/SMESH/input/borders_at_multi_connection_2d.rst rename to doc/gui/input/borders_at_multi_connection_2d.rst diff --git a/doc/salome/gui/SMESH/input/building_compounds.rst b/doc/gui/input/building_compounds.rst similarity index 100% rename from doc/salome/gui/SMESH/input/building_compounds.rst rename to doc/gui/input/building_compounds.rst diff --git a/doc/salome/gui/SMESH/input/cartesian_algo.rst b/doc/gui/input/cartesian_algo.rst similarity index 100% rename from doc/salome/gui/SMESH/input/cartesian_algo.rst rename to doc/gui/input/cartesian_algo.rst diff --git a/doc/salome/gui/SMESH/input/changing_orientation_of_elements.rst b/doc/gui/input/changing_orientation_of_elements.rst similarity index 100% rename from doc/salome/gui/SMESH/input/changing_orientation_of_elements.rst rename to doc/gui/input/changing_orientation_of_elements.rst diff --git a/doc/salome/gui/SMESH/input/clipping.rst b/doc/gui/input/clipping.rst similarity index 100% rename from doc/salome/gui/SMESH/input/clipping.rst rename to doc/gui/input/clipping.rst diff --git a/doc/salome/gui/SMESH/input/colors_size.rst b/doc/gui/input/colors_size.rst similarity index 100% rename from doc/salome/gui/SMESH/input/colors_size.rst rename to doc/gui/input/colors_size.rst diff --git a/doc/salome/gui/SMESH/input/connectivity.rst b/doc/gui/input/connectivity.rst similarity index 100% rename from doc/salome/gui/SMESH/input/connectivity.rst rename to doc/gui/input/connectivity.rst diff --git a/doc/salome/gui/SMESH/input/constructing_meshes.rst b/doc/gui/input/constructing_meshes.rst similarity index 100% rename from doc/salome/gui/SMESH/input/constructing_meshes.rst rename to doc/gui/input/constructing_meshes.rst diff --git a/doc/salome/gui/SMESH/input/constructing_submeshes.rst b/doc/gui/input/constructing_submeshes.rst similarity index 100% rename from doc/salome/gui/SMESH/input/constructing_submeshes.rst rename to doc/gui/input/constructing_submeshes.rst diff --git a/doc/salome/gui/SMESH/input/convert_to_from_quadratic_mesh.rst b/doc/gui/input/convert_to_from_quadratic_mesh.rst similarity index 100% rename from doc/salome/gui/SMESH/input/convert_to_from_quadratic_mesh.rst rename to doc/gui/input/convert_to_from_quadratic_mesh.rst diff --git a/doc/salome/gui/SMESH/input/copy_mesh.rst b/doc/gui/input/copy_mesh.rst similarity index 100% rename from doc/salome/gui/SMESH/input/copy_mesh.rst rename to doc/gui/input/copy_mesh.rst diff --git a/doc/salome/gui/SMESH/input/create_groups_from_geometry.rst b/doc/gui/input/create_groups_from_geometry.rst similarity index 100% rename from doc/salome/gui/SMESH/input/create_groups_from_geometry.rst rename to doc/gui/input/create_groups_from_geometry.rst diff --git a/doc/salome/gui/SMESH/input/creating_groups.rst b/doc/gui/input/creating_groups.rst similarity index 100% rename from doc/salome/gui/SMESH/input/creating_groups.rst rename to doc/gui/input/creating_groups.rst diff --git a/doc/salome/gui/SMESH/input/cut_mesh_by_plane.rst b/doc/gui/input/cut_mesh_by_plane.rst similarity index 100% rename from doc/salome/gui/SMESH/input/cut_mesh_by_plane.rst rename to doc/gui/input/cut_mesh_by_plane.rst diff --git a/doc/salome/gui/SMESH/input/cutting_quadrangles.rst b/doc/gui/input/cutting_quadrangles.rst similarity index 100% rename from doc/salome/gui/SMESH/input/cutting_quadrangles.rst rename to doc/gui/input/cutting_quadrangles.rst diff --git a/doc/salome/gui/SMESH/input/define_mesh_by_script.rst b/doc/gui/input/define_mesh_by_script.rst similarity index 100% rename from doc/salome/gui/SMESH/input/define_mesh_by_script.rst rename to doc/gui/input/define_mesh_by_script.rst diff --git a/doc/gui/input/deflection_2d.rst b/doc/gui/input/deflection_2d.rst new file mode 100644 index 000000000..1af337630 --- /dev/null +++ b/doc/gui/input/deflection_2d.rst @@ -0,0 +1,24 @@ +.. _deflection_2d_page: + +************* +Deflection 2D +************* + +This quality control criterion consists of calculation of distance between a mesh face gravity corner +and the surface the face discretizes. + +*To apply the Deflection 2D quality criterion to your mesh:* + +.. |img| image:: ../images/mesh_deflection.png + +#. Display your mesh in the viewer. +#. Choose **Controls > Face Controls > Deflection 2D** or click *"Deflection 2D"* |img| button in the toolbar. + + +Your mesh will be displayed in the viewer with faces colored according to the applied mesh quality control criterion: + +.. image:: ../images/deflection_2d.png + :align: center + + +**See Also** a sample TUI Script of a :ref:`tui_deflection_2d` operation. diff --git a/doc/salome/gui/SMESH/input/deleting_groups.rst b/doc/gui/input/deleting_groups.rst similarity index 100% rename from doc/salome/gui/SMESH/input/deleting_groups.rst rename to doc/gui/input/deleting_groups.rst diff --git a/doc/salome/gui/SMESH/input/diagonal_inversion_of_elements.rst b/doc/gui/input/diagonal_inversion_of_elements.rst similarity index 100% rename from doc/salome/gui/SMESH/input/diagonal_inversion_of_elements.rst rename to doc/gui/input/diagonal_inversion_of_elements.rst diff --git a/doc/salome/gui/SMESH/input/display_entity.rst b/doc/gui/input/display_entity.rst similarity index 100% rename from doc/salome/gui/SMESH/input/display_entity.rst rename to doc/gui/input/display_entity.rst diff --git a/doc/salome/gui/SMESH/input/display_mode.rst b/doc/gui/input/display_mode.rst similarity index 100% rename from doc/salome/gui/SMESH/input/display_mode.rst rename to doc/gui/input/display_mode.rst diff --git a/doc/salome/gui/SMESH/input/double_elements_control.rst b/doc/gui/input/double_elements_control.rst similarity index 100% rename from doc/salome/gui/SMESH/input/double_elements_control.rst rename to doc/gui/input/double_elements_control.rst diff --git a/doc/salome/gui/SMESH/input/double_nodes_control.rst b/doc/gui/input/double_nodes_control.rst similarity index 100% rename from doc/salome/gui/SMESH/input/double_nodes_control.rst rename to doc/gui/input/double_nodes_control.rst diff --git a/doc/salome/gui/SMESH/input/double_nodes_page.rst b/doc/gui/input/double_nodes_page.rst similarity index 100% rename from doc/salome/gui/SMESH/input/double_nodes_page.rst rename to doc/gui/input/double_nodes_page.rst diff --git a/doc/salome/gui/SMESH/input/editing_groups.rst b/doc/gui/input/editing_groups.rst similarity index 100% rename from doc/salome/gui/SMESH/input/editing_groups.rst rename to doc/gui/input/editing_groups.rst diff --git a/doc/salome/gui/SMESH/input/editing_meshes.rst b/doc/gui/input/editing_meshes.rst similarity index 100% rename from doc/salome/gui/SMESH/input/editing_meshes.rst rename to doc/gui/input/editing_meshes.rst diff --git a/doc/salome/gui/SMESH/input/extrusion.rst b/doc/gui/input/extrusion.rst similarity index 100% rename from doc/salome/gui/SMESH/input/extrusion.rst rename to doc/gui/input/extrusion.rst diff --git a/doc/salome/gui/SMESH/input/extrusion_along_path.rst b/doc/gui/input/extrusion_along_path.rst similarity index 100% rename from doc/salome/gui/SMESH/input/extrusion_along_path.rst rename to doc/gui/input/extrusion_along_path.rst diff --git a/doc/salome/gui/SMESH/input/face_groups_by_sharp_edges.rst b/doc/gui/input/face_groups_by_sharp_edges.rst similarity index 100% rename from doc/salome/gui/SMESH/input/face_groups_by_sharp_edges.rst rename to doc/gui/input/face_groups_by_sharp_edges.rst diff --git a/doc/salome/gui/SMESH/input/find_element_by_point.rst b/doc/gui/input/find_element_by_point.rst similarity index 100% rename from doc/salome/gui/SMESH/input/find_element_by_point.rst rename to doc/gui/input/find_element_by_point.rst diff --git a/doc/salome/gui/SMESH/input/free_borders.rst b/doc/gui/input/free_borders.rst similarity index 100% rename from doc/salome/gui/SMESH/input/free_borders.rst rename to doc/gui/input/free_borders.rst diff --git a/doc/salome/gui/SMESH/input/free_edges.rst b/doc/gui/input/free_edges.rst similarity index 100% rename from doc/salome/gui/SMESH/input/free_edges.rst rename to doc/gui/input/free_edges.rst diff --git a/doc/salome/gui/SMESH/input/free_faces.rst b/doc/gui/input/free_faces.rst similarity index 100% rename from doc/salome/gui/SMESH/input/free_faces.rst rename to doc/gui/input/free_faces.rst diff --git a/doc/salome/gui/SMESH/input/free_nodes.rst b/doc/gui/input/free_nodes.rst similarity index 100% rename from doc/salome/gui/SMESH/input/free_nodes.rst rename to doc/gui/input/free_nodes.rst diff --git a/doc/salome/gui/SMESH/input/generate_flat_elements.rst b/doc/gui/input/generate_flat_elements.rst similarity index 100% rename from doc/salome/gui/SMESH/input/generate_flat_elements.rst rename to doc/gui/input/generate_flat_elements.rst diff --git a/doc/salome/gui/SMESH/input/group_of_underlying_elements.rst b/doc/gui/input/group_of_underlying_elements.rst similarity index 100% rename from doc/salome/gui/SMESH/input/group_of_underlying_elements.rst rename to doc/gui/input/group_of_underlying_elements.rst diff --git a/doc/salome/gui/SMESH/input/grouping_elements.rst b/doc/gui/input/grouping_elements.rst similarity index 100% rename from doc/salome/gui/SMESH/input/grouping_elements.rst rename to doc/gui/input/grouping_elements.rst diff --git a/doc/salome/gui/SMESH/input/homard_create_boundary.rst b/doc/gui/input/homard_create_boundary.rst similarity index 100% rename from doc/salome/gui/SMESH/input/homard_create_boundary.rst rename to doc/gui/input/homard_create_boundary.rst diff --git a/doc/salome/gui/SMESH/input/importing_exporting_meshes.rst b/doc/gui/input/importing_exporting_meshes.rst similarity index 100% rename from doc/salome/gui/SMESH/input/importing_exporting_meshes.rst rename to doc/gui/input/importing_exporting_meshes.rst diff --git a/doc/salome/gui/SMESH/input/index.rst b/doc/gui/input/index.rst similarity index 100% rename from doc/salome/gui/SMESH/input/index.rst rename to doc/gui/input/index.rst diff --git a/doc/salome/gui/SMESH/input/length.rst b/doc/gui/input/length.rst similarity index 100% rename from doc/salome/gui/SMESH/input/length.rst rename to doc/gui/input/length.rst diff --git a/doc/salome/gui/SMESH/input/length_2d.rst b/doc/gui/input/length_2d.rst similarity index 100% rename from doc/salome/gui/SMESH/input/length_2d.rst rename to doc/gui/input/length_2d.rst diff --git a/doc/salome/gui/SMESH/input/make_2dmesh_from_3d.rst b/doc/gui/input/make_2dmesh_from_3d.rst similarity index 100% rename from doc/salome/gui/SMESH/input/make_2dmesh_from_3d.rst rename to doc/gui/input/make_2dmesh_from_3d.rst diff --git a/doc/salome/gui/SMESH/input/max_element_length_2d.rst b/doc/gui/input/max_element_length_2d.rst similarity index 100% rename from doc/salome/gui/SMESH/input/max_element_length_2d.rst rename to doc/gui/input/max_element_length_2d.rst diff --git a/doc/salome/gui/SMESH/input/max_element_length_3d.rst b/doc/gui/input/max_element_length_3d.rst similarity index 100% rename from doc/salome/gui/SMESH/input/max_element_length_3d.rst rename to doc/gui/input/max_element_length_3d.rst diff --git a/doc/salome/gui/SMESH/input/measurements.rst b/doc/gui/input/measurements.rst similarity index 100% rename from doc/salome/gui/SMESH/input/measurements.rst rename to doc/gui/input/measurements.rst diff --git a/doc/salome/gui/SMESH/input/merging_elements.rst b/doc/gui/input/merging_elements.rst similarity index 100% rename from doc/salome/gui/SMESH/input/merging_elements.rst rename to doc/gui/input/merging_elements.rst diff --git a/doc/salome/gui/SMESH/input/merging_nodes.rst b/doc/gui/input/merging_nodes.rst similarity index 100% rename from doc/salome/gui/SMESH/input/merging_nodes.rst rename to doc/gui/input/merging_nodes.rst diff --git a/doc/salome/gui/SMESH/input/mesh_infos.rst b/doc/gui/input/mesh_infos.rst similarity index 100% rename from doc/salome/gui/SMESH/input/mesh_infos.rst rename to doc/gui/input/mesh_infos.rst diff --git a/doc/salome/gui/SMESH/input/mesh_preferences.rst b/doc/gui/input/mesh_preferences.rst similarity index 100% rename from doc/salome/gui/SMESH/input/mesh_preferences.rst rename to doc/gui/input/mesh_preferences.rst diff --git a/doc/salome/gui/SMESH/input/mesh_through_point.rst b/doc/gui/input/mesh_through_point.rst similarity index 100% rename from doc/salome/gui/SMESH/input/mesh_through_point.rst rename to doc/gui/input/mesh_through_point.rst diff --git a/doc/salome/gui/SMESH/input/minimum_angle.rst b/doc/gui/input/minimum_angle.rst similarity index 100% rename from doc/salome/gui/SMESH/input/minimum_angle.rst rename to doc/gui/input/minimum_angle.rst diff --git a/doc/salome/gui/SMESH/input/modifying_meshes.rst b/doc/gui/input/modifying_meshes.rst similarity index 100% rename from doc/salome/gui/SMESH/input/modifying_meshes.rst rename to doc/gui/input/modifying_meshes.rst diff --git a/doc/salome/gui/SMESH/input/modules.rst b/doc/gui/input/modules.rst similarity index 100% rename from doc/salome/gui/SMESH/input/modules.rst rename to doc/gui/input/modules.rst diff --git a/doc/salome/gui/SMESH/input/numbering.rst b/doc/gui/input/numbering.rst similarity index 100% rename from doc/salome/gui/SMESH/input/numbering.rst rename to doc/gui/input/numbering.rst diff --git a/doc/salome/gui/SMESH/input/over_constrained_faces.rst b/doc/gui/input/over_constrained_faces.rst similarity index 100% rename from doc/salome/gui/SMESH/input/over_constrained_faces.rst rename to doc/gui/input/over_constrained_faces.rst diff --git a/doc/salome/gui/SMESH/input/over_constrained_volumes.rst b/doc/gui/input/over_constrained_volumes.rst similarity index 100% rename from doc/salome/gui/SMESH/input/over_constrained_volumes.rst rename to doc/gui/input/over_constrained_volumes.rst diff --git a/doc/salome/gui/SMESH/input/pattern_mapping.rst b/doc/gui/input/pattern_mapping.rst similarity index 100% rename from doc/salome/gui/SMESH/input/pattern_mapping.rst rename to doc/gui/input/pattern_mapping.rst diff --git a/doc/salome/gui/SMESH/input/point_marker.rst b/doc/gui/input/point_marker.rst similarity index 100% rename from doc/salome/gui/SMESH/input/point_marker.rst rename to doc/gui/input/point_marker.rst diff --git a/doc/salome/gui/SMESH/input/prism_3d_algo.rst b/doc/gui/input/prism_3d_algo.rst similarity index 100% rename from doc/salome/gui/SMESH/input/prism_3d_algo.rst rename to doc/gui/input/prism_3d_algo.rst diff --git a/doc/salome/gui/SMESH/input/projection_algos.rst b/doc/gui/input/projection_algos.rst similarity index 100% rename from doc/salome/gui/SMESH/input/projection_algos.rst rename to doc/gui/input/projection_algos.rst diff --git a/doc/salome/gui/SMESH/input/quad_from_ma_algo.rst b/doc/gui/input/quad_from_ma_algo.rst similarity index 100% rename from doc/salome/gui/SMESH/input/quad_from_ma_algo.rst rename to doc/gui/input/quad_from_ma_algo.rst diff --git a/doc/salome/gui/SMESH/input/quad_ijk_algo.rst b/doc/gui/input/quad_ijk_algo.rst similarity index 100% rename from doc/salome/gui/SMESH/input/quad_ijk_algo.rst rename to doc/gui/input/quad_ijk_algo.rst diff --git a/doc/salome/gui/SMESH/input/radial_prism_algo.rst b/doc/gui/input/radial_prism_algo.rst similarity index 100% rename from doc/salome/gui/SMESH/input/radial_prism_algo.rst rename to doc/gui/input/radial_prism_algo.rst diff --git a/doc/salome/gui/SMESH/input/radial_quadrangle_1D2D_algo.rst b/doc/gui/input/radial_quadrangle_1D2D_algo.rst similarity index 100% rename from doc/salome/gui/SMESH/input/radial_quadrangle_1D2D_algo.rst rename to doc/gui/input/radial_quadrangle_1D2D_algo.rst diff --git a/doc/salome/gui/SMESH/input/removing_nodes_and_elements.rst b/doc/gui/input/removing_nodes_and_elements.rst similarity index 100% rename from doc/salome/gui/SMESH/input/removing_nodes_and_elements.rst rename to doc/gui/input/removing_nodes_and_elements.rst diff --git a/doc/salome/gui/SMESH/input/reorient_faces.rst b/doc/gui/input/reorient_faces.rst similarity index 100% rename from doc/salome/gui/SMESH/input/reorient_faces.rst rename to doc/gui/input/reorient_faces.rst diff --git a/doc/salome/gui/SMESH/input/revolution.rst b/doc/gui/input/revolution.rst similarity index 100% rename from doc/salome/gui/SMESH/input/revolution.rst rename to doc/gui/input/revolution.rst diff --git a/doc/salome/gui/SMESH/input/rotation.rst b/doc/gui/input/rotation.rst similarity index 100% rename from doc/salome/gui/SMESH/input/rotation.rst rename to doc/gui/input/rotation.rst diff --git a/doc/salome/gui/SMESH/input/scalar_bar.rst b/doc/gui/input/scalar_bar.rst similarity index 100% rename from doc/salome/gui/SMESH/input/scalar_bar.rst rename to doc/gui/input/scalar_bar.rst diff --git a/doc/salome/gui/SMESH/input/scale.rst b/doc/gui/input/scale.rst similarity index 100% rename from doc/salome/gui/SMESH/input/scale.rst rename to doc/gui/input/scale.rst diff --git a/doc/salome/gui/SMESH/input/segments_around_vertex_algo.rst b/doc/gui/input/segments_around_vertex_algo.rst similarity index 100% rename from doc/salome/gui/SMESH/input/segments_around_vertex_algo.rst rename to doc/gui/input/segments_around_vertex_algo.rst diff --git a/doc/salome/gui/SMESH/input/selection_filter_library.rst b/doc/gui/input/selection_filter_library.rst similarity index 100% rename from doc/salome/gui/SMESH/input/selection_filter_library.rst rename to doc/gui/input/selection_filter_library.rst diff --git a/doc/salome/gui/SMESH/input/sewing_meshes.rst b/doc/gui/input/sewing_meshes.rst similarity index 100% rename from doc/salome/gui/SMESH/input/sewing_meshes.rst rename to doc/gui/input/sewing_meshes.rst diff --git a/doc/salome/gui/SMESH/input/skew.rst b/doc/gui/input/skew.rst similarity index 100% rename from doc/salome/gui/SMESH/input/skew.rst rename to doc/gui/input/skew.rst diff --git a/doc/salome/gui/SMESH/input/smeshBuilder.rst b/doc/gui/input/smeshBuilder.rst similarity index 100% rename from doc/salome/gui/SMESH/input/smeshBuilder.rst rename to doc/gui/input/smeshBuilder.rst diff --git a/doc/salome/gui/SMESH/input/smesh_migration.rst b/doc/gui/input/smesh_migration.rst similarity index 100% rename from doc/salome/gui/SMESH/input/smesh_migration.rst rename to doc/gui/input/smesh_migration.rst diff --git a/doc/salome/gui/SMESH/input/smesh_module.rst b/doc/gui/input/smesh_module.rst similarity index 100% rename from doc/salome/gui/SMESH/input/smesh_module.rst rename to doc/gui/input/smesh_module.rst diff --git a/doc/salome/gui/SMESH/input/smeshpy_interface.rst b/doc/gui/input/smeshpy_interface.rst similarity index 97% rename from doc/salome/gui/SMESH/input/smeshpy_interface.rst rename to doc/gui/input/smeshpy_interface.rst index 8fa865382..2cdf76b6f 100644 --- a/doc/salome/gui/SMESH/input/smeshpy_interface.rst +++ b/doc/gui/input/smeshpy_interface.rst @@ -76,10 +76,10 @@ generation and for retrieving basic information on mesh nodes, elements and grou Example of 3d mesh generation: ############################## -.. literalinclude:: ../../../examples/3dmesh.py +.. literalinclude:: ../../examples/mesh_3d.py :language: python -:download:`Download this script <../../../examples/3dmesh.py>` +:download:`Download this script <../../examples/mesh_3d.py>` Examples of Python scripts for Mesh operations are available by the following links: diff --git a/doc/salome/gui/SMESH/input/smeshstudytools.rst b/doc/gui/input/smeshstudytools.rst similarity index 100% rename from doc/salome/gui/SMESH/input/smeshstudytools.rst rename to doc/gui/input/smeshstudytools.rst diff --git a/doc/salome/gui/SMESH/input/smoothing.rst b/doc/gui/input/smoothing.rst similarity index 100% rename from doc/salome/gui/SMESH/input/smoothing.rst rename to doc/gui/input/smoothing.rst diff --git a/doc/salome/gui/SMESH/input/split_biquad_to_linear.rst b/doc/gui/input/split_biquad_to_linear.rst similarity index 100% rename from doc/salome/gui/SMESH/input/split_biquad_to_linear.rst rename to doc/gui/input/split_biquad_to_linear.rst diff --git a/doc/salome/gui/SMESH/input/split_to_tetra.rst b/doc/gui/input/split_to_tetra.rst similarity index 100% rename from doc/salome/gui/SMESH/input/split_to_tetra.rst rename to doc/gui/input/split_to_tetra.rst diff --git a/doc/salome/gui/SMESH/input/symmetry.rst b/doc/gui/input/symmetry.rst similarity index 100% rename from doc/salome/gui/SMESH/input/symmetry.rst rename to doc/gui/input/symmetry.rst diff --git a/doc/salome/gui/SMESH/input/taper.rst b/doc/gui/input/taper.rst similarity index 100% rename from doc/salome/gui/SMESH/input/taper.rst rename to doc/gui/input/taper.rst diff --git a/doc/salome/gui/SMESH/input/tools.rst b/doc/gui/input/tools.rst similarity index 100% rename from doc/salome/gui/SMESH/input/tools.rst rename to doc/gui/input/tools.rst diff --git a/doc/salome/gui/SMESH/input/translation.rst b/doc/gui/input/translation.rst similarity index 100% rename from doc/salome/gui/SMESH/input/translation.rst rename to doc/gui/input/translation.rst diff --git a/doc/salome/gui/SMESH/input/transparency.rst b/doc/gui/input/transparency.rst similarity index 100% rename from doc/salome/gui/SMESH/input/transparency.rst rename to doc/gui/input/transparency.rst diff --git a/doc/gui/input/tui_adaptation.rst b/doc/gui/input/tui_adaptation.rst new file mode 100644 index 000000000..b8ec68630 --- /dev/null +++ b/doc/gui/input/tui_adaptation.rst @@ -0,0 +1,33 @@ +.. _tui_adaptation_page: + +********** +Adaptation +********** + +.. _tui_homard_adapt: + +HOMARD +====== + +.. literalinclude:: ../../examples/test_uniform_refinement.py + :language: python + +:download:`Download this script <../../examples/test_uniform_refinement.py>` + +.. literalinclude:: ../../examples/test_homard_adapt.py + :language: python + +:download:`Download this script <../../examples/test_homard_adapt.py>` + +.. _tui_mg_adapt: + +MG_Adapt +======== + +.. literalinclude:: ../../examples/MGAdaptTests_without_session.py + :language: python + +:download:`Download this script <../../examples/MGAdaptTests_without_session.py>` + + +**See Also** the GUI :ref:`adaptation_page`. diff --git a/doc/salome/gui/SMESH/input/tui_creating_meshes.rst b/doc/gui/input/tui_creating_meshes.rst similarity index 54% rename from doc/salome/gui/SMESH/input/tui_creating_meshes.rst rename to doc/gui/input/tui_creating_meshes.rst index d4c1c8f9a..9d3cb5077 100644 --- a/doc/salome/gui/SMESH/input/tui_creating_meshes.rst +++ b/doc/gui/input/tui_creating_meshes.rst @@ -15,60 +15,60 @@ First of all see :ref:`example_3d_mesh` which is an example of good python scrip Construction of a mesh ====================== -.. literalinclude:: ../../../examples/creating_meshes_ex01.py +.. literalinclude:: ../../examples/creating_meshes_ex01.py :language: python -:download:`Download this script <../../../examples/creating_meshes_ex01.py>` +:download:`Download this script <../../examples/creating_meshes_ex01.py>` .. _tui_construction_submesh: Construction of a sub-mesh ========================== -.. literalinclude:: ../../../examples/creating_meshes_ex02.py +.. literalinclude:: ../../examples/creating_meshes_ex02.py :language: python -:download:`Download this script <../../../examples/creating_meshes_ex02.py>` +:download:`Download this script <../../examples/creating_meshes_ex02.py>` .. _change_priority_of_submeshes_in_mesh: Change priority of sub-meshes in mesh ===================================== -.. literalinclude:: ../../../examples/creating_meshes_ex03.py +.. literalinclude:: ../../examples/creating_meshes_ex03.py :language: python -:download:`Download this script <../../../examples/creating_meshes_ex03.py>` +:download:`Download this script <../../examples/creating_meshes_ex03.py>` .. _tui_editing_while_meshing: Intermediate edition while meshing ================================== -.. literalinclude:: ../../../examples/a3DmeshOnModified2Dmesh.py +.. literalinclude:: ../../examples/a3DmeshOnModified2Dmesh.py :language: python -:download:`Download this script <../../../examples/a3DmeshOnModified2Dmesh.py>` +:download:`Download this script <../../examples/a3DmeshOnModified2Dmesh.py>` .. _tui_editing_mesh: Editing a mesh (i.e. changing hypotheses) ========================================= -.. literalinclude:: ../../../examples/creating_meshes_ex04.py +.. literalinclude:: ../../examples/creating_meshes_ex04.py :language: python -:download:`Download this script <../../../examples/creating_meshes_ex04.py>` +:download:`Download this script <../../examples/creating_meshes_ex04.py>` .. _tui_export_mesh: Export of a Mesh ================ -.. literalinclude:: ../../../examples/creating_meshes_ex05.py +.. literalinclude:: ../../examples/creating_meshes_ex05.py :language: python -:download:`Download this script <../../../examples/creating_meshes_ex05.py>` +:download:`Download this script <../../examples/creating_meshes_ex05.py>` .. _how_to_mesh_a_cylinder_with_hexahedrons: @@ -78,10 +78,10 @@ How to mesh a cylinder with hexahedrons? The next script creates a hexahedral mesh on a cylinder. A picture below the script demonstrates the resulting mesh. -.. literalinclude:: ../../../examples/creating_meshes_ex06.py +.. literalinclude:: ../../examples/creating_meshes_ex06.py :language: python -:download:`Download this script <../../../examples/creating_meshes_ex06.py>` +:download:`Download this script <../../examples/creating_meshes_ex06.py>` .. image:: ../images/mesh_cylinder_hexa.png :align: center @@ -92,18 +92,18 @@ demonstrates the resulting mesh. Building a compound of meshes ============================= -.. literalinclude:: ../../../examples/creating_meshes_ex07.py +.. literalinclude:: ../../examples/creating_meshes_ex07.py :language: python -:download:`Download this script <../../../examples/creating_meshes_ex07.py>` +:download:`Download this script <../../examples/creating_meshes_ex07.py>` .. _tui_copy_mesh: Mesh Copying ============ -.. literalinclude:: ../../../examples/creating_meshes_ex08.py +.. literalinclude:: ../../examples/creating_meshes_ex08.py :language: python -:download:`Download this script <../../../examples/creating_meshes_ex08.py>` +:download:`Download this script <../../examples/creating_meshes_ex08.py>` diff --git a/doc/salome/gui/SMESH/input/tui_defining_hypotheses.rst b/doc/gui/input/tui_defining_hypotheses.rst similarity index 58% rename from doc/salome/gui/SMESH/input/tui_defining_hypotheses.rst rename to doc/gui/input/tui_defining_hypotheses.rst index fd676a358..060888607 100644 --- a/doc/salome/gui/SMESH/input/tui_defining_hypotheses.rst +++ b/doc/gui/input/tui_defining_hypotheses.rst @@ -56,20 +56,20 @@ Defining 1D Hypotheses Arithmetic Progression and Geometric Progression ================================================ -.. literalinclude:: ../../../examples/defining_hypotheses_ex01.py +.. literalinclude:: ../../examples/defining_hypotheses_ex01.py :language: python -:download:`Download this script <../../../examples/defining_hypotheses_ex01.py>` +:download:`Download this script <../../examples/defining_hypotheses_ex01.py>` .. _tui_1d_adaptive: Adaptive ======== -.. literalinclude:: ../../../examples/defining_hypotheses_adaptive1d.py +.. literalinclude:: ../../examples/defining_hypotheses_adaptive1d.py :language: python -:download:`Download this script <../../../examples/defining_hypotheses_adaptive1d.py>` +:download:`Download this script <../../examples/defining_hypotheses_adaptive1d.py>` .. _tui_deflection_1d: @@ -77,10 +77,10 @@ Adaptive Deflection and Number of Segments ================================= -.. literalinclude:: ../../../examples/defining_hypotheses_ex02.py +.. literalinclude:: ../../examples/defining_hypotheses_ex02.py :language: python -:download:`Download this script <../../../examples/defining_hypotheses_ex02.py>` +:download:`Download this script <../../examples/defining_hypotheses_ex02.py>` .. _tui_start_and_end_length: @@ -88,10 +88,10 @@ Deflection and Number of Segments Start and End Length ==================== -.. literalinclude:: ../../../examples/defining_hypotheses_ex03.py +.. literalinclude:: ../../examples/defining_hypotheses_ex03.py :language: python -:download:`Download this script <../../../examples/defining_hypotheses_ex03.py>` +:download:`Download this script <../../examples/defining_hypotheses_ex03.py>` .. _tui_average_length: @@ -99,10 +99,10 @@ Start and End Length Local Length ============ -.. literalinclude:: ../../../examples/defining_hypotheses_ex04.py +.. literalinclude:: ../../examples/defining_hypotheses_ex04.py :language: python -:download:`Download this script <../../../examples/defining_hypotheses_ex04.py>` +:download:`Download this script <../../examples/defining_hypotheses_ex04.py>` Defining 2D and 3D hypotheses ############################# @@ -113,10 +113,10 @@ Defining 2D and 3D hypotheses Maximum Element Area ==================== -.. literalinclude:: ../../../examples/defining_hypotheses_ex05.py +.. literalinclude:: ../../examples/defining_hypotheses_ex05.py :language: python -:download:`Download this script <../../../examples/defining_hypotheses_ex05.py>` +:download:`Download this script <../../examples/defining_hypotheses_ex05.py>` .. _tui_max_element_volume: @@ -124,10 +124,10 @@ Maximum Element Area Maximum Element Volume ====================== -.. literalinclude:: ../../../examples/defining_hypotheses_ex06.py +.. literalinclude:: ../../examples/defining_hypotheses_ex06.py :language: python -:download:`Download this script <../../../examples/defining_hypotheses_ex06.py>` +:download:`Download this script <../../examples/defining_hypotheses_ex06.py>` .. _tui_length_from_edges: @@ -135,20 +135,20 @@ Maximum Element Volume Length from Edges ================= -.. literalinclude:: ../../../examples/defining_hypotheses_ex07.py +.. literalinclude:: ../../examples/defining_hypotheses_ex07.py :language: python -:download:`Download this script <../../../examples/defining_hypotheses_ex07.py>` +:download:`Download this script <../../examples/defining_hypotheses_ex07.py>` .. _tui_block_renumber: Renumber 3D hypothesis ====================== -.. literalinclude:: ../../../examples/filters_ex39.py +.. literalinclude:: ../../examples/filters_ex39.py :language: python -:download:`Download this script <../../../examples/filters_ex39.py>` +:download:`Download this script <../../examples/filters_ex39.py>` Defining Additional Hypotheses ############################## @@ -158,10 +158,10 @@ Defining Additional Hypotheses Propagation =========== -.. literalinclude:: ../../../examples/defining_hypotheses_ex08.py +.. literalinclude:: ../../examples/defining_hypotheses_ex08.py :language: python -:download:`Download this script <../../../examples/defining_hypotheses_ex08.py>` +:download:`Download this script <../../examples/defining_hypotheses_ex08.py>` .. _tui_defining_meshing_algos: @@ -169,10 +169,10 @@ Propagation Defining Meshing Algorithms ########################### -.. literalinclude:: ../../../examples/defining_hypotheses_ex09.py +.. literalinclude:: ../../examples/defining_hypotheses_ex09.py :language: python -:download:`Download this script <../../../examples/defining_hypotheses_ex09.py>` +:download:`Download this script <../../examples/defining_hypotheses_ex09.py>` .. _tui_projection: @@ -180,96 +180,96 @@ Defining Meshing Algorithms Projection Algorithms ===================== -.. literalinclude:: ../../../examples/defining_hypotheses_ex10.py +.. literalinclude:: ../../examples/defining_hypotheses_ex10.py :language: python -:download:`Download this script <../../../examples/defining_hypotheses_ex10.py>` +:download:`Download this script <../../examples/defining_hypotheses_ex10.py>` Projection 1D2D =============== -.. literalinclude:: ../../../examples/defining_hypotheses_ex11.py +.. literalinclude:: ../../examples/defining_hypotheses_ex11.py :language: python -:download:`Download this script <../../../examples/defining_hypotheses_ex11.py>` +:download:`Download this script <../../examples/defining_hypotheses_ex11.py>` .. _tui_fixed_points: 1D Mesh with Fixed Points example ################################# -.. literalinclude:: ../../../examples/defining_hypotheses_ex12.py +.. literalinclude:: ../../examples/defining_hypotheses_ex12.py :language: python -:download:`Download this script <../../../examples/defining_hypotheses_ex12.py>` +:download:`Download this script <../../examples/defining_hypotheses_ex12.py>` .. _tui_radial_quadrangle: Radial Quadrangle 1D-2D example ############################### -.. literalinclude:: ../../../examples/defining_hypotheses_ex13.py +.. literalinclude:: ../../examples/defining_hypotheses_ex13.py :language: python -:download:`Download this script <../../../examples/defining_hypotheses_ex13.py>` +:download:`Download this script <../../examples/defining_hypotheses_ex13.py>` .. _tui_quadrangle_parameters: Quadrangle Parameters example 1 (meshing a face with 3 edges) ############################################################## -.. literalinclude:: ../../../examples/defining_hypotheses_ex14.py +.. literalinclude:: ../../examples/defining_hypotheses_ex14.py :language: python -:download:`Download this script <../../../examples/defining_hypotheses_ex14.py>` +:download:`Download this script <../../examples/defining_hypotheses_ex14.py>` Quadrangle Parameters example 2 (using different types) ####################################################### -.. literalinclude:: ../../../examples/defining_hypotheses_ex15.py +.. literalinclude:: ../../examples/defining_hypotheses_ex15.py :language: python -:download:`Download this script <../../../examples/defining_hypotheses_ex15.py>` +:download:`Download this script <../../examples/defining_hypotheses_ex15.py>` .. _tui_import: "Import 1D-2D Elements from Another Mesh" example ################################################# -.. literalinclude:: ../../../examples/defining_hypotheses_ex16.py +.. literalinclude:: ../../examples/defining_hypotheses_ex16.py :language: python -:download:`Download this script <../../../examples/defining_hypotheses_ex16.py>` +:download:`Download this script <../../examples/defining_hypotheses_ex16.py>` .. _tui_viscous_layers: Viscous layers construction ########################### -.. literalinclude:: ../../../examples/defining_hypotheses_ex17.py +.. literalinclude:: ../../examples/defining_hypotheses_ex17.py :language: python -:download:`Download this script <../../../examples/defining_hypotheses_ex17.py>` +:download:`Download this script <../../examples/defining_hypotheses_ex17.py>` .. _tui_radial_prism: Radial Prism example #################### -.. literalinclude:: ../../../examples/radial_prism_3d_algo.py +.. literalinclude:: ../../examples/radial_prism_3d_algo.py :language: python -:download:`Download this script <../../../examples/radial_prism_3d_algo.py>` +:download:`Download this script <../../examples/radial_prism_3d_algo.py>` .. _tui_cartesian_algo: Usage of Body Fitting algorithm ############################### -.. literalinclude:: ../../../examples/cartesian_algo.py +.. literalinclude:: ../../examples/cartesian_algo.py :language: python -:download:`Download this script <../../../examples/cartesian_algo.py>` +:download:`Download this script <../../examples/cartesian_algo.py>` .. _tui_use_existing_faces: @@ -280,10 +280,10 @@ This sample demonstrates how to use **Use Faces to be Created Manually** algorit which is actually just a stub allowing to use your own 2D algorithm implemented in Python. -.. literalinclude:: ../../../examples/use_existing_faces.py +.. literalinclude:: ../../examples/use_existing_faces.py :language: python -:download:`Download this script <../../../examples/use_existing_faces.py>` +:download:`Download this script <../../examples/use_existing_faces.py>` Resulting mesh: @@ -296,10 +296,10 @@ Resulting mesh: Usage of Extrusion 3D meshing algorithm ######################################## -.. literalinclude:: ../../../examples/prism_3d_algo.py +.. literalinclude:: ../../examples/prism_3d_algo.py :language: python -:download:`Download this script <../../../examples/prism_3d_algo.py>` +:download:`Download this script <../../examples/prism_3d_algo.py>` The result geometry and mesh is shown below @@ -312,10 +312,10 @@ The result geometry and mesh is shown below Usage of Medial Axis Projection algorithm ######################################### -.. literalinclude:: ../../../examples/quad_medial_axis_algo.py +.. literalinclude:: ../../examples/quad_medial_axis_algo.py :language: python -:download:`Download this script <../../../examples/quad_medial_axis_algo.py>` +:download:`Download this script <../../examples/quad_medial_axis_algo.py>` .. _tui_segments_around_vertex: @@ -323,8 +323,8 @@ Usage of Medial Axis Projection algorithm Usage of Segments around Vertex algorithm ######################################### -.. literalinclude:: ../../../examples/defining_hypotheses_len_near_vertex.py +.. literalinclude:: ../../examples/defining_hypotheses_len_near_vertex.py :language: python -:download:`Download this script <../../../examples/defining_hypotheses_len_near_vertex.py>` +:download:`Download this script <../../examples/defining_hypotheses_len_near_vertex.py>` diff --git a/doc/salome/gui/SMESH/input/tui_filters.rst b/doc/gui/input/tui_filters.rst similarity index 74% rename from doc/salome/gui/SMESH/input/tui_filters.rst rename to doc/gui/input/tui_filters.rst index 35ecd8c70..0634328ae 100644 --- a/doc/salome/gui/SMESH/input/tui_filters.rst +++ b/doc/gui/input/tui_filters.rst @@ -36,10 +36,10 @@ filters 2D mesh elements (faces) according to the aspect ratio value: * functor type should be *SMESH.FT_AspectRatio* * threshold is floating point value (aspect ratio) -.. literalinclude:: ../../../examples/filters_ex01.py +.. literalinclude:: ../../examples/filters_ex01.py :language: python -:download:`Download this script <../../../examples/filters_ex01.py>` +:download:`Download this script <../../examples/filters_ex01.py>` **See also:** :ref:`tui_aspect_ratio` @@ -54,10 +54,10 @@ filters 3D mesh elements (volumes) according to the aspect ratio value: * functor type is *SMESH.FT_AspectRatio3D* * threshold is floating point value (aspect ratio) -.. literalinclude:: ../../../examples/filters_ex02.py +.. literalinclude:: ../../examples/filters_ex02.py :language: python -:download:`Download this script <../../../examples/filters_ex02.py>` +:download:`Download this script <../../examples/filters_ex02.py>` **See also:** :ref:`tui_aspect_ratio_3d` @@ -72,10 +72,10 @@ filters 2D mesh elements (faces) according to the warping angle value: * functor type is *SMESH.FT_Warping* * threshold is floating point value (warping angle) -.. literalinclude:: ../../../examples/filters_ex03.py +.. literalinclude:: ../../examples/filters_ex03.py :language: python -:download:`Download this script <../../../examples/filters_ex03.py>` +:download:`Download this script <../../examples/filters_ex03.py>` **See also:** :ref:`tui_warping` @@ -90,10 +90,10 @@ filters 2D mesh elements (faces) according to the minimum angle value: * functor type is *SMESH.FT_MinimumAngle* * threshold is floating point value (minimum angle) -.. literalinclude:: ../../../examples/filters_ex04.py +.. literalinclude:: ../../examples/filters_ex04.py :language: python -:download:`Download this script <../../../examples/filters_ex04.py>` +:download:`Download this script <../../examples/filters_ex04.py>` **See also:** :ref:`tui_minimum_angle` @@ -108,10 +108,10 @@ filters 2D mesh elements (faces) according to the taper value: * functor type is *SMESH.FT_Taper* * threshold is floating point value (taper) -.. literalinclude:: ../../../examples/filters_ex05.py +.. literalinclude:: ../../examples/filters_ex05.py :language: python -:download:`Download this script <../../../examples/filters_ex05.py>` +:download:`Download this script <../../examples/filters_ex05.py>` **See also:** :ref:`tui_taper` @@ -126,10 +126,10 @@ filters 2D mesh elements (faces) according to the skew value: * functor type is *SMESH.FT_Skew* * threshold is floating point value (skew) -.. literalinclude:: ../../../examples/filters_ex06.py +.. literalinclude:: ../../examples/filters_ex06.py :language: python -:download:`Download this script <../../../examples/filters_ex06.py>` +:download:`Download this script <../../examples/filters_ex06.py>` **See also:** :ref:`tui_skew` @@ -144,10 +144,10 @@ filters 2D mesh elements (faces) according to the area value: * functor type is *SMESH.FT_Area* * threshold is floating point value (area) -.. literalinclude:: ../../../examples/filters_ex07.py +.. literalinclude:: ../../examples/filters_ex07.py :language: python -:download:`Download this script <../../../examples/filters_ex07.py>` +:download:`Download this script <../../examples/filters_ex07.py>` **See also:** :ref:`tui_area` @@ -162,10 +162,10 @@ filters 3D mesh elements (volumes) according to the volume value: * functor type is *SMESH.FT_Volume3D* * threshold is floating point value (volume) -.. literalinclude:: ../../../examples/filters_ex08.py +.. literalinclude:: ../../examples/filters_ex08.py :language: python -:download:`Download this script <../../../examples/filters_ex08.py>` +:download:`Download this script <../../examples/filters_ex08.py>` **See also:** :ref:`tui_volume` @@ -180,10 +180,10 @@ filters 1D mesh elements (edges) which represent free borders of a mesh: * functor type is *SMESH.FT_FreeBorders* * threshold value is not required -.. literalinclude:: ../../../examples/filters_ex09.py +.. literalinclude:: ../../examples/filters_ex09.py :language: python -:download:`Download this script <../../../examples/filters_ex09.py>` +:download:`Download this script <../../examples/filters_ex09.py>` **See also:** :ref:`tui_free_borders` @@ -199,10 +199,10 @@ nodes, not mesh segments) belonging to one face of mesh only: * functor type is *SMESH.FT_FreeEdges* * threshold value is not required -.. literalinclude:: ../../../examples/filters_ex10.py +.. literalinclude:: ../../examples/filters_ex10.py :language: python -:download:`Download this script <../../../examples/filters_ex10.py>` +:download:`Download this script <../../examples/filters_ex10.py>` **See also:** :ref:`tui_free_edges` @@ -217,10 +217,10 @@ filters free nodes: * functor type is *SMESH.FT_FreeNodes* * threshold value is not required -.. literalinclude:: ../../../examples/filters_ex11.py +.. literalinclude:: ../../examples/filters_ex11.py :language: python -:download:`Download this script <../../../examples/filters_ex11.py>` +:download:`Download this script <../../examples/filters_ex11.py>` **See also:** :ref:`tui_free_nodes` @@ -235,10 +235,10 @@ filters free faces: * functor type is *SMESH.FT_FreeFaces* * threshold value is not required -.. literalinclude:: ../../../examples/filters_ex12.py +.. literalinclude:: ../../examples/filters_ex12.py :language: python -:download:`Download this script <../../../examples/filters_ex12.py>` +:download:`Download this script <../../examples/filters_ex12.py>` **See also:** :ref:`tui_free_faces` @@ -253,10 +253,10 @@ filters faces with bare borders: * functor type is *SMESH.FT_BareBorderFace* * threshold value is not required -.. literalinclude:: ../../../examples/filters_ex13.py +.. literalinclude:: ../../examples/filters_ex13.py :language: python -:download:`Download this script <../../../examples/filters_ex13.py>` +:download:`Download this script <../../examples/filters_ex13.py>` **See also:** :ref:`tui_bare_border_faces` @@ -272,10 +272,10 @@ filters coplanar faces: * threshold value is the face ID * tolerance is in degrees -.. literalinclude:: ../../../examples/filters_ex14.py +.. literalinclude:: ../../examples/filters_ex14.py :language: python -:download:`Download this script <../../../examples/filters_ex14.py>` +:download:`Download this script <../../examples/filters_ex14.py>` .. _filter_over_constrained_faces: @@ -288,10 +288,10 @@ filters over-constrained faces: * functor type is *SMESH.FT_OverConstrainedFace* * threshold value is not required -.. literalinclude:: ../../../examples/filters_ex15.py +.. literalinclude:: ../../examples/filters_ex15.py :language: python -:download:`Download this script <../../../examples/filters_ex15.py>` +:download:`Download this script <../../examples/filters_ex15.py>` **See also:** :ref:`tui_over_constrained_faces` @@ -306,10 +306,10 @@ filters mesh elements basing on the same set of nodes: * functor type is either *SMESH.FT_EqualEdges*, *SMESH.FT_EqualFaces* or *SMESH.FT_EqualVolumes*, * threshold value is not required -.. literalinclude:: ../../../examples/filters_ex16.py +.. literalinclude:: ../../examples/filters_ex16.py :language: python -:download:`Download this script <../../../examples/filters_ex16.py>` +:download:`Download this script <../../examples/filters_ex16.py>` .. _tui_double_nodes_control: @@ -323,10 +323,10 @@ filters mesh nodes which are coincident with other nodes (within a given toleran * threshold value is not required * default tolerance is 1.0e-7 -.. literalinclude:: ../../../examples/filters_ex17.py +.. literalinclude:: ../../examples/filters_ex17.py :language: python -:download:`Download this script <../../../examples/filters_ex17.py>` +:download:`Download this script <../../examples/filters_ex17.py>` .. _filter_node_nb_conn: @@ -339,10 +339,10 @@ filters nodes according to a number of elements of highest dimension connected t * functor type should be *SMESH.FT_NodeConnectivityNumber* * threshold is an integer value (number of elements) -.. literalinclude:: ../../../examples/filters_node_nb_conn.py +.. literalinclude:: ../../examples/filters_node_nb_conn.py :language: python -:download:`Download this script <../../../examples/filters_node_nb_conn.py>` +:download:`Download this script <../../examples/filters_node_nb_conn.py>` .. _filter_borders_multiconnection: @@ -356,10 +356,10 @@ connections (faces and volumes on whose border the segment lies): * functor type is *SMESH.FT_MultiConnection* * threshold is integer value (number of connections) -.. literalinclude:: ../../../examples/filters_ex18.py +.. literalinclude:: ../../examples/filters_ex18.py :language: python -:download:`Download this script <../../../examples/filters_ex18.py>` +:download:`Download this script <../../examples/filters_ex18.py>` **See also:** :ref:`tui_borders_at_multiconnection` @@ -375,10 +375,10 @@ faces connected to a border (link between nodes, not mesh segment): * functor type is *SMESH.FT_MultiConnection2D* * threshold is integer value (number of connections) -.. literalinclude:: ../../../examples/filters_ex19.py +.. literalinclude:: ../../examples/filters_ex19.py :language: python -:download:`Download this script <../../../examples/filters_ex19.py>` +:download:`Download this script <../../examples/filters_ex19.py>` **See also:** :ref:`tui_borders_at_multiconnection_2d` @@ -393,10 +393,10 @@ filters 1D mesh elements (edges) according to the edge length value: * functor type should be *SMESH.FT_Length* * threshold is floating point value (length) -.. literalinclude:: ../../../examples/filters_ex20.py +.. literalinclude:: ../../examples/filters_ex20.py :language: python -:download:`Download this script <../../../examples/filters_ex20.py>` +:download:`Download this script <../../examples/filters_ex20.py>` **See also:** :ref:`tui_length_1d` @@ -412,10 +412,10 @@ edges (links between nodes): * functor type should be *SMESH.FT_Length2D* * threshold is floating point value (edge length) -.. literalinclude:: ../../../examples/filters_ex21.py +.. literalinclude:: ../../examples/filters_ex21.py :language: python -:download:`Download this script <../../../examples/filters_ex21.py>` +:download:`Download this script <../../examples/filters_ex21.py>` **See also:** :ref:`tui_length_2d` @@ -431,10 +431,10 @@ of its edges and diagonals: * functor type should be *SMESH.FT_MaxElementLength2D* * threshold is floating point value (length) -.. literalinclude:: ../../../examples/filters_ex22.py +.. literalinclude:: ../../examples/filters_ex22.py :language: python -:download:`Download this script <../../../examples/filters_ex22.py>` +:download:`Download this script <../../examples/filters_ex22.py>` **See also:** :ref:`tui_max_element_length_2d` @@ -450,10 +450,10 @@ of its edges and diagonals: * functor type should be *SMESH.FT_MaxElementLength3D* * threshold is floating point value (edge/diagonal length) -.. literalinclude:: ../../../examples/filters_ex23.py +.. literalinclude:: ../../examples/filters_ex23.py :language: python -:download:`Download this script <../../../examples/filters_ex23.py>` +:download:`Download this script <../../examples/filters_ex23.py>` **See also:** :ref:`tui_max_element_length_3d` @@ -469,10 +469,10 @@ shared with other volumes and without a face on it: * functor type is *SMESH.FT_BareBorderVolume* * threshold value is not required -.. literalinclude:: ../../../examples/filters_ex24.py +.. literalinclude:: ../../examples/filters_ex24.py :language: python -:download:`Download this script <../../../examples/filters_ex24.py>` +:download:`Download this script <../../examples/filters_ex24.py>` **See also:** :ref:`tui_bare_border_volumes` @@ -487,10 +487,10 @@ filters over-constrained volumes, whose all nodes are on the mesh boundary: * functor type is *SMESH.FT_OverConstrainedVolume* * threshold value is not required -.. literalinclude:: ../../../examples/filters_ex25.py +.. literalinclude:: ../../examples/filters_ex25.py :language: python -:download:`Download this script <../../../examples/filters_ex25.py>` +:download:`Download this script <../../examples/filters_ex25.py>` **See also:** :ref:`tui_over_constrained_faces` @@ -506,10 +506,10 @@ defined by threshold value: * functor type should be *SMESH.FT_BelongToMeshGroup* * threshold is mesh group object -.. literalinclude:: ../../../examples/filters_belong2group.py +.. literalinclude:: ../../examples/filters_belong2group.py :language: python -:download:`Download this script <../../../examples/filters_belong2group.py>` +:download:`Download this script <../../examples/filters_belong2group.py>` .. _filter_belong_to_geom: @@ -524,10 +524,10 @@ shape defined by threshold value: * threshold is geometrical object * tolerance is a distance between a node and the geometrical object; it is used if an node is not associated to any geometry. -.. literalinclude:: ../../../examples/filters_ex26.py +.. literalinclude:: ../../examples/filters_ex26.py :language: python -:download:`Download this script <../../../examples/filters_ex26.py>` +:download:`Download this script <../../examples/filters_ex26.py>` .. _filter_lying_on_geom: @@ -544,10 +544,10 @@ shape defined by threshold value: it is used if an node is not associated to any geometry. -.. literalinclude:: ../../../examples/filters_ex27.py +.. literalinclude:: ../../examples/filters_ex27.py :language: python -:download:`Download this script <../../../examples/filters_ex27.py>` +:download:`Download this script <../../examples/filters_ex27.py>` .. _filter_belong_to_plane: @@ -562,10 +562,10 @@ plane defined by threshold value with the given tolerance: * threshold is geometrical object (plane) * default tolerance is 1.0e-7 -.. literalinclude:: ../../../examples/filters_ex28.py +.. literalinclude:: ../../examples/filters_ex28.py :language: python -:download:`Download this script <../../../examples/filters_ex28.py>` +:download:`Download this script <../../examples/filters_ex28.py>` .. _filter_belong_to_cylinder: @@ -580,10 +580,10 @@ cylindrical face defined by threshold value with the given tolerance: * threshold is geometrical object (cylindrical face) * default tolerance is 1.0e-7 -.. literalinclude:: ../../../examples/filters_ex29.py +.. literalinclude:: ../../examples/filters_ex29.py :language: python -:download:`Download this script <../../../examples/filters_ex29.py>` +:download:`Download this script <../../examples/filters_ex29.py>` .. _filter_belong_to_surface: @@ -598,10 +598,10 @@ arbitrary surface defined by threshold value with the given tolerance: * threshold is geometrical object (arbitrary surface) * default tolerance is 1.0e-7 -.. literalinclude:: ../../../examples/filters_ex30.py +.. literalinclude:: ../../examples/filters_ex30.py :language: python -:download:`Download this script <../../../examples/filters_ex30.py>` +:download:`Download this script <../../examples/filters_ex30.py>` .. _filter_range_of_ids: @@ -615,10 +615,10 @@ specified identifiers range: * functor type is *SMESH.FT_RangeOfIds* * threshold is string listing required IDs and/or ranges of IDs, e.g."1,2,3,50-60,63,67,70-78" -.. literalinclude:: ../../../examples/filters_ex31.py +.. literalinclude:: ../../examples/filters_ex31.py :language: python -:download:`Download this script <../../../examples/filters_ex31.py>` +:download:`Download this script <../../examples/filters_ex31.py>` .. _filter_bad_oriented_volume: @@ -632,10 +632,10 @@ the point of view of MED convention. * functor type is *SMESH.FT_BadOrientedVolume* * threshold is not required -.. literalinclude:: ../../../examples/filters_ex32.py +.. literalinclude:: ../../examples/filters_ex32.py :language: python -:download:`Download this script <../../../examples/filters_ex32.py>` +:download:`Download this script <../../examples/filters_ex32.py>` .. _filter_linear_or_quadratic: @@ -649,10 +649,10 @@ filters linear / quadratic mesh elements: * threshold is not required * if unary operator is set to SMESH.FT_LogicalNOT, the quadratic elements are selected, otherwise (by default) linear elements are selected -.. literalinclude:: ../../../examples/filters_ex33.py +.. literalinclude:: ../../examples/filters_ex33.py :language: python -:download:`Download this script <../../../examples/filters_ex33.py>` +:download:`Download this script <../../examples/filters_ex33.py>` .. _filter_group_color: @@ -665,10 +665,10 @@ filters mesh entities, belonging to the group with the color defined by the thre * functor type is *SMESH.FT_GroupColor* * threshold should be of SALOMEDS.Color type -.. literalinclude:: ../../../examples/filters_ex34.py +.. literalinclude:: ../../examples/filters_ex34.py :language: python -:download:`Download this script <../../../examples/filters_ex34.py>` +:download:`Download this script <../../examples/filters_ex34.py>` .. _filter_geom_type: @@ -683,10 +683,10 @@ entity type. * functor type should be *SMESH.FT_ElemGeomType* * threshold is either of smesh.GeometryType values. Type *SMESH.GeometryType._items* in the Python Console to see all geometric types. -.. literalinclude:: ../../../examples/filters_ex35.py +.. literalinclude:: ../../examples/filters_ex35.py :language: python -:download:`Download this script <../../../examples/filters_ex35.py>` +:download:`Download this script <../../examples/filters_ex35.py>` .. _filter_entity_type: @@ -699,10 +699,10 @@ filters mesh elements by the geometric type and number of nodes. * functor type should be *SMESH.FT_EntityType* * threshold is either of SMESH.EntityType values. Type *SMESH.EntityType._items* in the Python Console to see all entity types. -.. literalinclude:: ../../../examples/filters_ex37.py +.. literalinclude:: ../../examples/filters_ex37.py :language: python -:download:`Download this script <../../../examples/filters_ex37.py>` +:download:`Download this script <../../examples/filters_ex37.py>` .. _filter_ball_diam: @@ -715,10 +715,10 @@ filters ball elements by diameter. * functor type should be *SMESH.FT_BallDiameter* * threshold is floating point value (ball diameter) -.. literalinclude:: ../../../examples/filters_ex38.py +.. literalinclude:: ../../examples/filters_ex38.py :language: python -:download:`Download this script <../../../examples/filters_ex38.py>` +:download:`Download this script <../../examples/filters_ex38.py>` .. _filter_domain: @@ -731,10 +731,10 @@ filters elements of a specified domain. * functor type should be *SMESH.FT_ConnectedElements* * threshold is either (1) node ID or (2) geometrical vertex or (3) 3 coordinates of a point. -.. literalinclude:: ../../../examples/filters_ex39.py +.. literalinclude:: ../../examples/filters_ex39.py :language: python -:download:`Download this script <../../../examples/filters_ex39.py>` +:download:`Download this script <../../examples/filters_ex39.py>` .. _combining_filters: @@ -743,7 +743,7 @@ How to combine several criteria into a filter? Several criteria can be combined into a filter. -.. literalinclude:: ../../../examples/filters_ex36.py +.. literalinclude:: ../../examples/filters_ex36.py :language: python -:download:`Download this script <../../../examples/filters_ex36.py>` +:download:`Download this script <../../examples/filters_ex36.py>` diff --git a/doc/salome/gui/SMESH/input/tui_grouping_elements.rst b/doc/gui/input/tui_grouping_elements.rst similarity index 52% rename from doc/salome/gui/SMESH/input/tui_grouping_elements.rst rename to doc/gui/input/tui_grouping_elements.rst index 01bcf9b31..90bd66b0b 100644 --- a/doc/salome/gui/SMESH/input/tui_grouping_elements.rst +++ b/doc/gui/input/tui_grouping_elements.rst @@ -10,10 +10,10 @@ Grouping Elements Create a Standalone Group ========================= -.. literalinclude:: ../../../examples/grouping_elements_ex01.py +.. literalinclude:: ../../examples/grouping_elements_ex01.py :language: python -:download:`Download this script <../../../examples/grouping_elements_ex01.py>` +:download:`Download this script <../../examples/grouping_elements_ex01.py>` .. image:: ../images/create_group.png :align: center @@ -24,30 +24,30 @@ Create a Standalone Group Create a Group on Geometry ========================== -.. literalinclude:: ../../../examples/grouping_elements_ex02.py +.. literalinclude:: ../../examples/grouping_elements_ex02.py :language: python -:download:`Download this script <../../../examples/grouping_elements_ex02.py>` +:download:`Download this script <../../examples/grouping_elements_ex02.py>` .. _tui_create_group_on_filter: Create a Group on Filter ======================== -.. literalinclude:: ../../../examples/grouping_elements_ex03.py +.. literalinclude:: ../../examples/grouping_elements_ex03.py :language: python -:download:`Download this script <../../../examples/grouping_elements_ex03.py>` +:download:`Download this script <../../examples/grouping_elements_ex03.py>` .. _tui_edit_group: Edit a Group ============ -.. literalinclude:: ../../../examples/grouping_elements_ex04.py +.. literalinclude:: ../../examples/grouping_elements_ex04.py :language: python -:download:`Download this script <../../../examples/grouping_elements_ex04.py>` +:download:`Download this script <../../examples/grouping_elements_ex04.py>` .. image:: ../images/editing_groups1.png :align: center @@ -58,10 +58,10 @@ Edit a Group Union of groups =============== -.. literalinclude:: ../../../examples/grouping_elements_ex05.py +.. literalinclude:: ../../examples/grouping_elements_ex05.py :language: python -:download:`Download this script <../../../examples/grouping_elements_ex05.py>` +:download:`Download this script <../../examples/grouping_elements_ex05.py>` .. image:: ../images/union_groups1.png :align: center @@ -72,10 +72,10 @@ Union of groups Intersection of groups ====================== -.. literalinclude:: ../../../examples/grouping_elements_ex06.py +.. literalinclude:: ../../examples/grouping_elements_ex06.py :language: python -:download:`Download this script <../../../examples/grouping_elements_ex06.py>` +:download:`Download this script <../../examples/grouping_elements_ex06.py>` .. image:: ../images/intersect_groups1.png :align: center @@ -86,10 +86,10 @@ Intersection of groups Cut of groups ============= -.. literalinclude:: ../../../examples/grouping_elements_ex07.py +.. literalinclude:: ../../examples/grouping_elements_ex07.py :language: python -:download:`Download this script <../../../examples/grouping_elements_ex07.py>` +:download:`Download this script <../../examples/grouping_elements_ex07.py>` .. image:: ../images/cut_groups1.png :align: center @@ -100,10 +100,10 @@ Cut of groups Creating groups of entities basing on nodes of other groups =========================================================== -.. literalinclude:: ../../../examples/grouping_elements_ex08.py +.. literalinclude:: ../../examples/grouping_elements_ex08.py :language: python -:download:`Download this script <../../../examples/grouping_elements_ex08.py>` +:download:`Download this script <../../examples/grouping_elements_ex08.py>` .. image:: ../images/dimgroup_tui1.png :align: center @@ -114,8 +114,8 @@ Creating groups of entities basing on nodes of other groups Creating face groups separated by sharp edges ============================================= -.. literalinclude:: ../../../examples/grouping_elements_ex09.py +.. literalinclude:: ../../examples/grouping_elements_ex09.py :language: python -:download:`Download this script <../../../examples/grouping_elements_ex09.py>` +:download:`Download this script <../../examples/grouping_elements_ex09.py>` diff --git a/doc/gui/input/tui_measurements.rst b/doc/gui/input/tui_measurements.rst new file mode 100644 index 000000000..a891e2a39 --- /dev/null +++ b/doc/gui/input/tui_measurements.rst @@ -0,0 +1,43 @@ +.. _tui_measurements_page: + +************ +Measurements +************ + +.. _tui_min_distance: + +Minimum Distance +================ + +.. literalinclude:: ../../examples/measurements_ex01.py + :language: python + +:download:`Download this script <../../examples/measurements_ex01.py>` + +.. _tui_bounding_box: + +Bounding Box +============ + +.. literalinclude:: ../../examples/measurements_ex02.py + :language: python + +:download:`Download this script <../../examples/measurements_ex02.py>` + +.. _tui_basic_properties: + +Basic Properties +================ + +.. literalinclude:: ../../examples/measurements_ex03.py + :language: python + +:download:`Download this script <../../examples/measurements_ex03.py>` + +Angle +===== + +.. literalinclude:: ../../examples/measurements_ex04.py + :language: python + +:download:`Download this script <../../examples/measurements_ex04.py>` diff --git a/doc/salome/gui/SMESH/input/tui_modifying_meshes.rst b/doc/gui/input/tui_modifying_meshes.rst similarity index 52% rename from doc/salome/gui/SMESH/input/tui_modifying_meshes.rst rename to doc/gui/input/tui_modifying_meshes.rst index 72e541c4d..c8297eea8 100644 --- a/doc/salome/gui/SMESH/input/tui_modifying_meshes.rst +++ b/doc/gui/input/tui_modifying_meshes.rst @@ -17,100 +17,100 @@ Adding Nodes and Elements Add Node ******** -.. literalinclude:: ../../../examples/modifying_meshes_ex01.py +.. literalinclude:: ../../examples/modifying_meshes_ex01.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex01.py>` +:download:`Download this script <../../examples/modifying_meshes_ex01.py>` .. _tui_add_0DElement: Add 0D Element ************** -.. literalinclude:: ../../../examples/modifying_meshes_ex02.py +.. literalinclude:: ../../examples/modifying_meshes_ex02.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex02.py>` +:download:`Download this script <../../examples/modifying_meshes_ex02.py>` .. _tui_add_0DElement_on_all_nodes: Add 0D Element on Element Nodes ******************************* -.. literalinclude:: ../../../examples/modifying_meshes_ex03.py +.. literalinclude:: ../../examples/modifying_meshes_ex03.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex03.py>` +:download:`Download this script <../../examples/modifying_meshes_ex03.py>` .. _tui_add_edge: Add Edge ******** -.. literalinclude:: ../../../examples/modifying_meshes_ex04.py +.. literalinclude:: ../../examples/modifying_meshes_ex04.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex04.py>` +:download:`Download this script <../../examples/modifying_meshes_ex04.py>` .. _tui_add_triangle: Add Triangle ************ -.. literalinclude:: ../../../examples/modifying_meshes_ex05.py +.. literalinclude:: ../../examples/modifying_meshes_ex05.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex05.py>` +:download:`Download this script <../../examples/modifying_meshes_ex05.py>` .. _tui_add_quadrangle: Add Quadrangle ************** -.. literalinclude:: ../../../examples/modifying_meshes_ex06.py +.. literalinclude:: ../../examples/modifying_meshes_ex06.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex06.py>` +:download:`Download this script <../../examples/modifying_meshes_ex06.py>` .. _tui_add_tetrahedron: Add Tetrahedron *************** -.. literalinclude:: ../../../examples/modifying_meshes_ex07.py +.. literalinclude:: ../../examples/modifying_meshes_ex07.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex07.py>` +:download:`Download this script <../../examples/modifying_meshes_ex07.py>` .. _tui_add_hexahedron: Add Hexahedron ************** -.. literalinclude:: ../../../examples/modifying_meshes_ex08.py +.. literalinclude:: ../../examples/modifying_meshes_ex08.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex08.py>` +:download:`Download this script <../../examples/modifying_meshes_ex08.py>` .. _tui_add_polygon: Add Polygon *********** -.. literalinclude:: ../../../examples/modifying_meshes_ex09.py +.. literalinclude:: ../../examples/modifying_meshes_ex09.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex09.py>` +:download:`Download this script <../../examples/modifying_meshes_ex09.py>` .. _tui_add_polyhedron: Add Polyhedron ************** -.. literalinclude:: ../../../examples/modifying_meshes_ex10.py +.. literalinclude:: ../../examples/modifying_meshes_ex10.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex10.py>` +:download:`Download this script <../../examples/modifying_meshes_ex10.py>` .. _tui_removing_nodes_and_elements: @@ -122,180 +122,180 @@ Removing Nodes and Elements Removing Nodes ************** -.. literalinclude:: ../../../examples/modifying_meshes_ex11.py +.. literalinclude:: ../../examples/modifying_meshes_ex11.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex11.py>` +:download:`Download this script <../../examples/modifying_meshes_ex11.py>` .. _tui_removing_elements: Removing Elements ***************** -.. literalinclude:: ../../../examples/modifying_meshes_ex12.py +.. literalinclude:: ../../examples/modifying_meshes_ex12.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex12.py>` +:download:`Download this script <../../examples/modifying_meshes_ex12.py>` .. _tui_removing_orphan_nodes: Removing Orphan Nodes ********************* -.. literalinclude:: ../../../examples/modifying_meshes_ex13.py +.. literalinclude:: ../../examples/modifying_meshes_ex13.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex13.py>` +:download:`Download this script <../../examples/modifying_meshes_ex13.py>` .. _tui_moving_nodes: Moving Nodes ============ -.. literalinclude:: ../../../examples/modifying_meshes_ex15.py +.. literalinclude:: ../../examples/modifying_meshes_ex15.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex15.py>` +:download:`Download this script <../../examples/modifying_meshes_ex15.py>` .. _tui_diagonal_inversion: Diagonal Inversion ================== -.. literalinclude:: ../../../examples/modifying_meshes_ex16.py +.. literalinclude:: ../../examples/modifying_meshes_ex16.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex16.py>` +:download:`Download this script <../../examples/modifying_meshes_ex16.py>` .. _tui_uniting_two_triangles: Uniting two Triangles ===================== -.. literalinclude:: ../../../examples/modifying_meshes_ex17.py +.. literalinclude:: ../../examples/modifying_meshes_ex17.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex17.py>` +:download:`Download this script <../../examples/modifying_meshes_ex17.py>` .. _tui_uniting_set_of_triangles: Uniting a Set of Triangles ========================== -.. literalinclude:: ../../../examples/modifying_meshes_ex18.py +.. literalinclude:: ../../examples/modifying_meshes_ex18.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex18.py>` +:download:`Download this script <../../examples/modifying_meshes_ex18.py>` .. _tui_orientation: Orientation =========== -.. literalinclude:: ../../../examples/modifying_meshes_ex19.py +.. literalinclude:: ../../examples/modifying_meshes_ex19.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex19.py>` +:download:`Download this script <../../examples/modifying_meshes_ex19.py>` .. _tui_cutting_quadrangles: Cutting Quadrangles =================== -.. literalinclude:: ../../../examples/modifying_meshes_ex20.py +.. literalinclude:: ../../examples/modifying_meshes_ex20.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex20.py>` +:download:`Download this script <../../examples/modifying_meshes_ex20.py>` .. _tui_cutting_triangles: Cutting Triangles ================= -.. literalinclude:: ../../../examples/modifying_meshes_cut_triangles.py +.. literalinclude:: ../../examples/modifying_meshes_cut_triangles.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_cut_triangles.py>` +:download:`Download this script <../../examples/modifying_meshes_cut_triangles.py>` .. _modifying_meshes_split_vol: Split Volumes into Tetrahedra ============================= -.. literalinclude:: ../../../examples/modifying_meshes_split_vol.py +.. literalinclude:: ../../examples/modifying_meshes_split_vol.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_split_vol.py>` +:download:`Download this script <../../examples/modifying_meshes_split_vol.py>` .. _tui_smoothing: Smoothing ========= -.. literalinclude:: ../../../examples/modifying_meshes_ex21.py +.. literalinclude:: ../../examples/modifying_meshes_ex21.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex21.py>` +:download:`Download this script <../../examples/modifying_meshes_ex21.py>` .. _tui_extrusion: Extrusion ========= -.. literalinclude:: ../../../examples/modifying_meshes_ex22.py +.. literalinclude:: ../../examples/modifying_meshes_ex22.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex22.py>` +:download:`Download this script <../../examples/modifying_meshes_ex22.py>` .. _tui_extrusion_along_path: Extrusion along a Path ====================== -.. literalinclude:: ../../../examples/modifying_meshes_ex23.py +.. literalinclude:: ../../examples/modifying_meshes_ex23.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex23.py>` +:download:`Download this script <../../examples/modifying_meshes_ex23.py>` .. _tui_revolution: Revolution ========== -.. literalinclude:: ../../../examples/modifying_meshes_ex24.py +.. literalinclude:: ../../examples/modifying_meshes_ex24.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex24.py>` +:download:`Download this script <../../examples/modifying_meshes_ex24.py>` .. _tui_pattern_mapping: Pattern Mapping =============== -.. literalinclude:: ../../../examples/modifying_meshes_ex25.py +.. literalinclude:: ../../examples/modifying_meshes_ex25.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex25.py>` +:download:`Download this script <../../examples/modifying_meshes_ex25.py>` .. _tui_quadratic: Convert mesh to/from quadratic ============================== -.. literalinclude:: ../../../examples/modifying_meshes_ex26.py +.. literalinclude:: ../../examples/modifying_meshes_ex26.py :language: python -:download:`Download this script <../../../examples/modifying_meshes_ex26.py>` +:download:`Download this script <../../examples/modifying_meshes_ex26.py>` .. _tui_split_biquad: Split bi-quadratic into linear ============================== -.. literalinclude:: ../../../examples/split_biquad.py +.. literalinclude:: ../../examples/split_biquad.py :language: python -:download:`Download this script <../../../examples/split_biquad.py>` +:download:`Download this script <../../examples/split_biquad.py>` .. _tui_double_nodes_on_group_boundaries: @@ -321,10 +321,10 @@ The flat element of the multiple junctions between the simple junction are store This example represents an iron cable (a thin cylinder) in a concrete block (a big cylinder). The big cylinder is defined by two geometric volumes. -.. literalinclude:: ../../../examples/generate_flat_elements.py +.. literalinclude:: ../../examples/generate_flat_elements.py :language: python -:download:`Download this script <../../../examples/generate_flat_elements.py>` +:download:`Download this script <../../examples/generate_flat_elements.py>` Here, the 4 groups of volumes [Solid_1_1, Solid_2_1, Solid_3_1, Solid_4_1] constitute a partition of the mesh. The flat elements on group boundaries and on faces are built with the diff --git a/doc/salome/gui/SMESH/input/tui_notebook_smesh.rst b/doc/gui/input/tui_notebook_smesh.rst similarity index 58% rename from doc/salome/gui/SMESH/input/tui_notebook_smesh.rst rename to doc/gui/input/tui_notebook_smesh.rst index e05865b47..7384e67b4 100644 --- a/doc/salome/gui/SMESH/input/tui_notebook_smesh.rst +++ b/doc/gui/input/tui_notebook_smesh.rst @@ -10,7 +10,7 @@ Using SALOME NoteBook Notebook Smesh ============== -.. literalinclude:: ../../../examples/notebook_smesh.py +.. literalinclude:: ../../examples/notebook_smesh.py :language: python -:download:`Download this script <../../../examples/notebook_smesh.py>` +:download:`Download this script <../../examples/notebook_smesh.py>` diff --git a/doc/gui/input/tui_quality_controls.rst b/doc/gui/input/tui_quality_controls.rst new file mode 100644 index 000000000..5a331a1f4 --- /dev/null +++ b/doc/gui/input/tui_quality_controls.rst @@ -0,0 +1,242 @@ +.. _tui_quality_controls_page: + +**************** +Quality Controls +**************** + +.. contents:: `Table of contents` + + +.. _tui_free_borders: + +Free Borders +============ + +.. literalinclude:: ../../examples/quality_controls_ex01.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex01.py>` + + +.. _tui_borders_at_multiconnection: + +Borders at Multiconnection +========================== + +.. literalinclude:: ../../examples/quality_controls_ex02.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex02.py>` + + +.. _tui_length_1d: + +Length 1D +========= + +.. literalinclude:: ../../examples/quality_controls_ex03.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex03.py>` + +.. _tui_free_edges: + +Free Edges +========== + +.. literalinclude:: ../../examples/quality_controls_ex04.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex04.py>` + +.. _tui_free_nodes: + +Free Nodes +========== + +.. literalinclude:: ../../examples/quality_controls_ex05.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex05.py>` + +.. _tui_free_faces: + +Free Faces +========== + +.. literalinclude:: ../../examples/quality_controls_ex06.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex06.py>` + +.. _tui_bare_border_faces: + +Bare border faces +================= + +.. literalinclude:: ../../examples/quality_controls_ex07.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex07.py>` + +.. _tui_bare_border_volumes: + +Bare border volumes +=================== + +.. literalinclude:: ../../examples/quality_controls_ex08.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex08.py>` + +.. _tui_over_constrained_faces: + +Over-constrained faces +====================== + +.. literalinclude:: ../../examples/quality_controls_ex09.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex09.py>` + +.. _tui_over_constrained_volumes: + +Over-constrained volumes +======================== + +.. literalinclude:: ../../examples/quality_controls_ex10.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex10.py>` + +.. _tui_length_2d: + +Length 2D +========= + +.. literalinclude:: ../../examples/quality_controls_ex11.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex11.py>` + + +.. _tui_deflection_2d: + +Deflection 2D +============= + +.. literalinclude:: ../../examples/quality_controls_defl.py + :language: python + +:download:`Download this script <../../examples/quality_controls_defl.py>` + + +.. _tui_borders_at_multiconnection_2d: + +Borders at Multiconnection 2D +============================= + +.. literalinclude:: ../../examples/quality_controls_ex12.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex12.py>` + +.. _tui_area: + +Area +==== + +.. literalinclude:: ../../examples/quality_controls_ex13.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex13.py>` + +.. _tui_taper: + +Taper +===== + +.. literalinclude:: ../../examples/quality_controls_ex14.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex14.py>` + +.. _tui_aspect_ratio: + +Aspect Ratio +============ + +.. literalinclude:: ../../examples/quality_controls_ex15.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex15.py>` + +.. _tui_minimum_angle: + +Minimum Angle +============= + +.. literalinclude:: ../../examples/quality_controls_ex16.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex16.py>` + +.. _tui_warping: + +Warping +======= + +.. literalinclude:: ../../examples/quality_controls_ex17.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex17.py>` + +.. _tui_skew: + +Skew +==== + +.. literalinclude:: ../../examples/quality_controls_ex18.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex18.py>` + +.. _tui_max_element_length_2d: + +Element Diameter 2D +=================== + +.. literalinclude:: ../../examples/quality_controls_ex19.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex19.py>` + +.. _tui_aspect_ratio_3d: + +Aspect Ratio 3D +=============== + +.. literalinclude:: ../../examples/quality_controls_ex20.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex20.py>` + +.. _tui_volume: + +Volume +====== + +.. literalinclude:: ../../examples/quality_controls_ex21.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex21.py>` + +.. _tui_max_element_length_3d: + +Element Diameter 3D +=================== + +.. literalinclude:: ../../examples/quality_controls_ex22.py + :language: python + +:download:`Download this script <../../examples/quality_controls_ex22.py>` diff --git a/doc/gui/input/tui_transforming_meshes.rst b/doc/gui/input/tui_transforming_meshes.rst new file mode 100644 index 000000000..b1a09a1dc --- /dev/null +++ b/doc/gui/input/tui_transforming_meshes.rst @@ -0,0 +1,138 @@ +.. _tui_transforming_meshes_page: + +******************* +Transforming Meshes +******************* + +.. contents:: `Table of contents` + + +.. _tui_translation: + +Translation +=========== + +.. literalinclude:: ../../examples/transforming_meshes_ex01.py + :language: python + +:download:`Download this script <../../examples/transforming_meshes_ex01.py>` + +.. _tui_rotation: + +Rotation +======== + +.. literalinclude:: ../../examples/transforming_meshes_ex02.py + :language: python + +:download:`Download this script <../../examples/transforming_meshes_ex02.py>` + +.. _tui_scale: + +Scale +===== + +.. literalinclude:: ../../examples/transforming_meshes_ex03.py + :language: python + +:download:`Download this script <../../examples/transforming_meshes_ex03.py>` + +.. _tui_symmetry: + +Symmetry +======== + +.. literalinclude:: ../../examples/transforming_meshes_ex04.py + :language: python + +:download:`Download this script <../../examples/transforming_meshes_ex04.py>` + +.. _tui_merging_nodes: + +Merging Nodes +============= + +.. literalinclude:: ../../examples/transforming_meshes_ex05.py + :language: python + +:download:`Download this script <../../examples/transforming_meshes_ex05.py>` + +.. _tui_merging_elements: + +Merging Elements +================ + +.. literalinclude:: ../../examples/transforming_meshes_ex06.py + :language: python + +:download:`Download this script <../../examples/transforming_meshes_ex06.py>` + +.. _tui_sew_meshes_border_to_side: + +Sew Meshes Border to Side +========================= + +.. literalinclude:: ../../examples/transforming_meshes_ex07.py + :language: python + +:download:`Download this script <../../examples/transforming_meshes_ex07.py>` + +.. _tui_sew_conform_free_borders: + +Sew Conform Free Borders +======================== + +.. literalinclude:: ../../examples/transforming_meshes_ex08.py + :language: python + +:download:`Download this script <../../examples/transforming_meshes_ex08.py>` + +.. _tui_sew_free_borders: + +Sew Free Borders +================ + +.. literalinclude:: ../../examples/transforming_meshes_ex09.py + :language: python + +:download:`Download this script <../../examples/transforming_meshes_ex09.py>` + +.. _tui_sew_side_elements: + +Sew Side Elements +================= + +.. literalinclude:: ../../examples/transforming_meshes_ex10.py + :language: python + +:download:`Download this script <../../examples/transforming_meshes_ex10.py>` + +.. _tui_duplicate_nodes: + +Duplicate nodes or/and elements +=============================== + +.. literalinclude:: ../../examples/transforming_meshes_ex11.py + :language: python + +:download:`Download this script <../../examples/transforming_meshes_ex11.py>` + +.. _tui_make_2dmesh_from_3d: + +Create boundary elements +======================== + +.. literalinclude:: ../../examples/transforming_meshes_ex12.py + :language: python + +:download:`Download this script <../../examples/transforming_meshes_ex12.py>` + +.. _tui_reorient_faces: + +Reorient faces +============== + +.. literalinclude:: ../../examples/transforming_meshes_ex13.py + :language: python + +:download:`Download this script <../../examples/transforming_meshes_ex13.py>` diff --git a/doc/gui/input/tui_viewing_meshes.rst b/doc/gui/input/tui_viewing_meshes.rst new file mode 100644 index 000000000..984cee9d0 --- /dev/null +++ b/doc/gui/input/tui_viewing_meshes.rst @@ -0,0 +1,27 @@ + +.. _tui_viewing_meshes_page: + +************** +Viewing Meshes +************** + +.. _tui_viewing_mesh_infos: + +Viewing Mesh Infos +################## + +.. literalinclude:: ../../examples/viewing_meshes_ex01.py + :language: python + +:download:`Download this script <../../examples/viewing_meshes_ex01.py>` + +.. _tui_find_element_by_point: + + +Find Element by Point +##################### + +.. literalinclude:: ../../examples/viewing_meshes_ex02.py + :language: python + +:download:`Download this script <../../examples/viewing_meshes_ex02.py>` diff --git a/doc/salome/gui/SMESH/input/tui_work_on_objects_from_gui.rst b/doc/gui/input/tui_work_on_objects_from_gui.rst similarity index 100% rename from doc/salome/gui/SMESH/input/tui_work_on_objects_from_gui.rst rename to doc/gui/input/tui_work_on_objects_from_gui.rst diff --git a/doc/salome/gui/SMESH/input/uniting_set_of_triangles.rst b/doc/gui/input/uniting_set_of_triangles.rst similarity index 100% rename from doc/salome/gui/SMESH/input/uniting_set_of_triangles.rst rename to doc/gui/input/uniting_set_of_triangles.rst diff --git a/doc/salome/gui/SMESH/input/uniting_two_triangles.rst b/doc/gui/input/uniting_two_triangles.rst similarity index 100% rename from doc/salome/gui/SMESH/input/uniting_two_triangles.rst rename to doc/gui/input/uniting_two_triangles.rst diff --git a/doc/salome/gui/SMESH/input/use_existing_algos.rst b/doc/gui/input/use_existing_algos.rst similarity index 100% rename from doc/salome/gui/SMESH/input/use_existing_algos.rst rename to doc/gui/input/use_existing_algos.rst diff --git a/doc/salome/gui/SMESH/input/using_notebook_smesh_page.rst b/doc/gui/input/using_notebook_smesh_page.rst similarity index 100% rename from doc/salome/gui/SMESH/input/using_notebook_smesh_page.rst rename to doc/gui/input/using_notebook_smesh_page.rst diff --git a/doc/salome/gui/SMESH/input/using_operations_on_groups.rst b/doc/gui/input/using_operations_on_groups.rst similarity index 100% rename from doc/salome/gui/SMESH/input/using_operations_on_groups.rst rename to doc/gui/input/using_operations_on_groups.rst diff --git a/doc/salome/gui/SMESH/input/viewing_meshes_overview.rst b/doc/gui/input/viewing_meshes_overview.rst similarity index 100% rename from doc/salome/gui/SMESH/input/viewing_meshes_overview.rst rename to doc/gui/input/viewing_meshes_overview.rst diff --git a/doc/salome/gui/SMESH/input/volume.rst b/doc/gui/input/volume.rst similarity index 100% rename from doc/salome/gui/SMESH/input/volume.rst rename to doc/gui/input/volume.rst diff --git a/doc/salome/gui/SMESH/input/warping.rst b/doc/gui/input/warping.rst similarity index 100% rename from doc/salome/gui/SMESH/input/warping.rst rename to doc/gui/input/warping.rst diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/1d_meshing_hypo.po b/doc/gui/locale/fr/LC_MESSAGES/1d_meshing_hypo.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/1d_meshing_hypo.po rename to doc/gui/locale/fr/LC_MESSAGES/1d_meshing_hypo.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/2d_meshing_hypo.po b/doc/gui/locale/fr/LC_MESSAGES/2d_meshing_hypo.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/2d_meshing_hypo.po rename to doc/gui/locale/fr/LC_MESSAGES/2d_meshing_hypo.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/about_filters.po b/doc/gui/locale/fr/LC_MESSAGES/about_filters.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/about_filters.po rename to doc/gui/locale/fr/LC_MESSAGES/about_filters.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/about_hypo.po b/doc/gui/locale/fr/LC_MESSAGES/about_hypo.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/about_hypo.po rename to doc/gui/locale/fr/LC_MESSAGES/about_hypo.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/about_meshes.po b/doc/gui/locale/fr/LC_MESSAGES/about_meshes.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/about_meshes.po rename to doc/gui/locale/fr/LC_MESSAGES/about_meshes.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/about_quality_controls.po b/doc/gui/locale/fr/LC_MESSAGES/about_quality_controls.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/about_quality_controls.po rename to doc/gui/locale/fr/LC_MESSAGES/about_quality_controls.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/adding_nodes_and_elements.po b/doc/gui/locale/fr/LC_MESSAGES/adding_nodes_and_elements.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/adding_nodes_and_elements.po rename to doc/gui/locale/fr/LC_MESSAGES/adding_nodes_and_elements.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/adding_quadratic_elements.po b/doc/gui/locale/fr/LC_MESSAGES/adding_quadratic_elements.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/adding_quadratic_elements.po rename to doc/gui/locale/fr/LC_MESSAGES/adding_quadratic_elements.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/additional_hypo.po b/doc/gui/locale/fr/LC_MESSAGES/additional_hypo.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/additional_hypo.po rename to doc/gui/locale/fr/LC_MESSAGES/additional_hypo.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/area.po b/doc/gui/locale/fr/LC_MESSAGES/area.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/area.po rename to doc/gui/locale/fr/LC_MESSAGES/area.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/aspect_ratio.po b/doc/gui/locale/fr/LC_MESSAGES/aspect_ratio.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/aspect_ratio.po rename to doc/gui/locale/fr/LC_MESSAGES/aspect_ratio.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/aspect_ratio_3d.po b/doc/gui/locale/fr/LC_MESSAGES/aspect_ratio_3d.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/aspect_ratio_3d.po rename to doc/gui/locale/fr/LC_MESSAGES/aspect_ratio_3d.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/bare_border_face.po b/doc/gui/locale/fr/LC_MESSAGES/bare_border_face.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/bare_border_face.po rename to doc/gui/locale/fr/LC_MESSAGES/bare_border_face.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/bare_border_volumes.po b/doc/gui/locale/fr/LC_MESSAGES/bare_border_volumes.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/bare_border_volumes.po rename to doc/gui/locale/fr/LC_MESSAGES/bare_border_volumes.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/basic_meshing_algos.po b/doc/gui/locale/fr/LC_MESSAGES/basic_meshing_algos.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/basic_meshing_algos.po rename to doc/gui/locale/fr/LC_MESSAGES/basic_meshing_algos.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/borders_at_multi_connection.po b/doc/gui/locale/fr/LC_MESSAGES/borders_at_multi_connection.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/borders_at_multi_connection.po rename to doc/gui/locale/fr/LC_MESSAGES/borders_at_multi_connection.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/borders_at_multi_connection_2d.po b/doc/gui/locale/fr/LC_MESSAGES/borders_at_multi_connection_2d.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/borders_at_multi_connection_2d.po rename to doc/gui/locale/fr/LC_MESSAGES/borders_at_multi_connection_2d.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/building_compounds.po b/doc/gui/locale/fr/LC_MESSAGES/building_compounds.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/building_compounds.po rename to doc/gui/locale/fr/LC_MESSAGES/building_compounds.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/cartesian_algo.po b/doc/gui/locale/fr/LC_MESSAGES/cartesian_algo.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/cartesian_algo.po rename to doc/gui/locale/fr/LC_MESSAGES/cartesian_algo.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/changing_orientation_of_elements.po b/doc/gui/locale/fr/LC_MESSAGES/changing_orientation_of_elements.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/changing_orientation_of_elements.po rename to doc/gui/locale/fr/LC_MESSAGES/changing_orientation_of_elements.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/clipping.po b/doc/gui/locale/fr/LC_MESSAGES/clipping.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/clipping.po rename to doc/gui/locale/fr/LC_MESSAGES/clipping.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/colors_size.po b/doc/gui/locale/fr/LC_MESSAGES/colors_size.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/colors_size.po rename to doc/gui/locale/fr/LC_MESSAGES/colors_size.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/connectivity.po b/doc/gui/locale/fr/LC_MESSAGES/connectivity.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/connectivity.po rename to doc/gui/locale/fr/LC_MESSAGES/connectivity.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/constructing_meshes.po b/doc/gui/locale/fr/LC_MESSAGES/constructing_meshes.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/constructing_meshes.po rename to doc/gui/locale/fr/LC_MESSAGES/constructing_meshes.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/constructing_submeshes.po b/doc/gui/locale/fr/LC_MESSAGES/constructing_submeshes.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/constructing_submeshes.po rename to doc/gui/locale/fr/LC_MESSAGES/constructing_submeshes.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/convert_to_from_quadratic_mesh.po b/doc/gui/locale/fr/LC_MESSAGES/convert_to_from_quadratic_mesh.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/convert_to_from_quadratic_mesh.po rename to doc/gui/locale/fr/LC_MESSAGES/convert_to_from_quadratic_mesh.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/copy_mesh.po b/doc/gui/locale/fr/LC_MESSAGES/copy_mesh.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/copy_mesh.po rename to doc/gui/locale/fr/LC_MESSAGES/copy_mesh.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/create_groups_from_geometry.po b/doc/gui/locale/fr/LC_MESSAGES/create_groups_from_geometry.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/create_groups_from_geometry.po rename to doc/gui/locale/fr/LC_MESSAGES/create_groups_from_geometry.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/creating_groups.po b/doc/gui/locale/fr/LC_MESSAGES/creating_groups.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/creating_groups.po rename to doc/gui/locale/fr/LC_MESSAGES/creating_groups.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/cut_mesh_by_plane.po b/doc/gui/locale/fr/LC_MESSAGES/cut_mesh_by_plane.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/cut_mesh_by_plane.po rename to doc/gui/locale/fr/LC_MESSAGES/cut_mesh_by_plane.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/cutting_quadrangles.po b/doc/gui/locale/fr/LC_MESSAGES/cutting_quadrangles.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/cutting_quadrangles.po rename to doc/gui/locale/fr/LC_MESSAGES/cutting_quadrangles.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/define_mesh_by_script.po b/doc/gui/locale/fr/LC_MESSAGES/define_mesh_by_script.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/define_mesh_by_script.po rename to doc/gui/locale/fr/LC_MESSAGES/define_mesh_by_script.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/deleting_groups.po b/doc/gui/locale/fr/LC_MESSAGES/deleting_groups.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/deleting_groups.po rename to doc/gui/locale/fr/LC_MESSAGES/deleting_groups.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/diagonal_inversion_of_elements.po b/doc/gui/locale/fr/LC_MESSAGES/diagonal_inversion_of_elements.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/diagonal_inversion_of_elements.po rename to doc/gui/locale/fr/LC_MESSAGES/diagonal_inversion_of_elements.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/display_entity.po b/doc/gui/locale/fr/LC_MESSAGES/display_entity.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/display_entity.po rename to doc/gui/locale/fr/LC_MESSAGES/display_entity.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/display_mode.po b/doc/gui/locale/fr/LC_MESSAGES/display_mode.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/display_mode.po rename to doc/gui/locale/fr/LC_MESSAGES/display_mode.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/double_elements_control.po b/doc/gui/locale/fr/LC_MESSAGES/double_elements_control.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/double_elements_control.po rename to doc/gui/locale/fr/LC_MESSAGES/double_elements_control.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/double_nodes_control.po b/doc/gui/locale/fr/LC_MESSAGES/double_nodes_control.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/double_nodes_control.po rename to doc/gui/locale/fr/LC_MESSAGES/double_nodes_control.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/double_nodes_page.po b/doc/gui/locale/fr/LC_MESSAGES/double_nodes_page.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/double_nodes_page.po rename to doc/gui/locale/fr/LC_MESSAGES/double_nodes_page.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/editing_groups.po b/doc/gui/locale/fr/LC_MESSAGES/editing_groups.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/editing_groups.po rename to doc/gui/locale/fr/LC_MESSAGES/editing_groups.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/editing_meshes.po b/doc/gui/locale/fr/LC_MESSAGES/editing_meshes.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/editing_meshes.po rename to doc/gui/locale/fr/LC_MESSAGES/editing_meshes.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/extrusion.po b/doc/gui/locale/fr/LC_MESSAGES/extrusion.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/extrusion.po rename to doc/gui/locale/fr/LC_MESSAGES/extrusion.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/extrusion_along_path.po b/doc/gui/locale/fr/LC_MESSAGES/extrusion_along_path.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/extrusion_along_path.po rename to doc/gui/locale/fr/LC_MESSAGES/extrusion_along_path.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/find_element_by_point.po b/doc/gui/locale/fr/LC_MESSAGES/find_element_by_point.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/find_element_by_point.po rename to doc/gui/locale/fr/LC_MESSAGES/find_element_by_point.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/free_borders.po b/doc/gui/locale/fr/LC_MESSAGES/free_borders.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/free_borders.po rename to doc/gui/locale/fr/LC_MESSAGES/free_borders.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/free_edges.po b/doc/gui/locale/fr/LC_MESSAGES/free_edges.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/free_edges.po rename to doc/gui/locale/fr/LC_MESSAGES/free_edges.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/free_faces.po b/doc/gui/locale/fr/LC_MESSAGES/free_faces.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/free_faces.po rename to doc/gui/locale/fr/LC_MESSAGES/free_faces.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/free_nodes.po b/doc/gui/locale/fr/LC_MESSAGES/free_nodes.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/free_nodes.po rename to doc/gui/locale/fr/LC_MESSAGES/free_nodes.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/generate_flat_elements.po b/doc/gui/locale/fr/LC_MESSAGES/generate_flat_elements.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/generate_flat_elements.po rename to doc/gui/locale/fr/LC_MESSAGES/generate_flat_elements.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/group_of_underlying_elements.po b/doc/gui/locale/fr/LC_MESSAGES/group_of_underlying_elements.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/group_of_underlying_elements.po rename to doc/gui/locale/fr/LC_MESSAGES/group_of_underlying_elements.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/grouping_elements.po b/doc/gui/locale/fr/LC_MESSAGES/grouping_elements.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/grouping_elements.po rename to doc/gui/locale/fr/LC_MESSAGES/grouping_elements.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/importing_exporting_meshes.po b/doc/gui/locale/fr/LC_MESSAGES/importing_exporting_meshes.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/importing_exporting_meshes.po rename to doc/gui/locale/fr/LC_MESSAGES/importing_exporting_meshes.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/index.po b/doc/gui/locale/fr/LC_MESSAGES/index.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/index.po rename to doc/gui/locale/fr/LC_MESSAGES/index.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/introduction.po b/doc/gui/locale/fr/LC_MESSAGES/introduction.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/introduction.po rename to doc/gui/locale/fr/LC_MESSAGES/introduction.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/length.po b/doc/gui/locale/fr/LC_MESSAGES/length.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/length.po rename to doc/gui/locale/fr/LC_MESSAGES/length.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/length_2d.po b/doc/gui/locale/fr/LC_MESSAGES/length_2d.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/length_2d.po rename to doc/gui/locale/fr/LC_MESSAGES/length_2d.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/make_2dmesh_from_3d.po b/doc/gui/locale/fr/LC_MESSAGES/make_2dmesh_from_3d.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/make_2dmesh_from_3d.po rename to doc/gui/locale/fr/LC_MESSAGES/make_2dmesh_from_3d.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/max_element_length_2d.po b/doc/gui/locale/fr/LC_MESSAGES/max_element_length_2d.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/max_element_length_2d.po rename to doc/gui/locale/fr/LC_MESSAGES/max_element_length_2d.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/max_element_length_3d.po b/doc/gui/locale/fr/LC_MESSAGES/max_element_length_3d.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/max_element_length_3d.po rename to doc/gui/locale/fr/LC_MESSAGES/max_element_length_3d.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/max_element_volume_hypo.po b/doc/gui/locale/fr/LC_MESSAGES/max_element_volume_hypo.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/max_element_volume_hypo.po rename to doc/gui/locale/fr/LC_MESSAGES/max_element_volume_hypo.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/measurements.po b/doc/gui/locale/fr/LC_MESSAGES/measurements.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/measurements.po rename to doc/gui/locale/fr/LC_MESSAGES/measurements.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/merging_elements.po b/doc/gui/locale/fr/LC_MESSAGES/merging_elements.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/merging_elements.po rename to doc/gui/locale/fr/LC_MESSAGES/merging_elements.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/merging_nodes.po b/doc/gui/locale/fr/LC_MESSAGES/merging_nodes.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/merging_nodes.po rename to doc/gui/locale/fr/LC_MESSAGES/merging_nodes.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/mesh_infos.po b/doc/gui/locale/fr/LC_MESSAGES/mesh_infos.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/mesh_infos.po rename to doc/gui/locale/fr/LC_MESSAGES/mesh_infos.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/mesh_preferences.po b/doc/gui/locale/fr/LC_MESSAGES/mesh_preferences.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/mesh_preferences.po rename to doc/gui/locale/fr/LC_MESSAGES/mesh_preferences.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/mesh_through_point.po b/doc/gui/locale/fr/LC_MESSAGES/mesh_through_point.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/mesh_through_point.po rename to doc/gui/locale/fr/LC_MESSAGES/mesh_through_point.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/minimum_angle.po b/doc/gui/locale/fr/LC_MESSAGES/minimum_angle.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/minimum_angle.po rename to doc/gui/locale/fr/LC_MESSAGES/minimum_angle.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/modifying_meshes.po b/doc/gui/locale/fr/LC_MESSAGES/modifying_meshes.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/modifying_meshes.po rename to doc/gui/locale/fr/LC_MESSAGES/modifying_meshes.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/modules.po b/doc/gui/locale/fr/LC_MESSAGES/modules.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/modules.po rename to doc/gui/locale/fr/LC_MESSAGES/modules.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/numbering.po b/doc/gui/locale/fr/LC_MESSAGES/numbering.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/numbering.po rename to doc/gui/locale/fr/LC_MESSAGES/numbering.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/over_constrained_faces.po b/doc/gui/locale/fr/LC_MESSAGES/over_constrained_faces.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/over_constrained_faces.po rename to doc/gui/locale/fr/LC_MESSAGES/over_constrained_faces.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/over_constrained_volumes.po b/doc/gui/locale/fr/LC_MESSAGES/over_constrained_volumes.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/over_constrained_volumes.po rename to doc/gui/locale/fr/LC_MESSAGES/over_constrained_volumes.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/pattern_mapping.po b/doc/gui/locale/fr/LC_MESSAGES/pattern_mapping.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/pattern_mapping.po rename to doc/gui/locale/fr/LC_MESSAGES/pattern_mapping.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/point_marker.po b/doc/gui/locale/fr/LC_MESSAGES/point_marker.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/point_marker.po rename to doc/gui/locale/fr/LC_MESSAGES/point_marker.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/prism_3d_algo.po b/doc/gui/locale/fr/LC_MESSAGES/prism_3d_algo.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/prism_3d_algo.po rename to doc/gui/locale/fr/LC_MESSAGES/prism_3d_algo.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/projection_algos.po b/doc/gui/locale/fr/LC_MESSAGES/projection_algos.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/projection_algos.po rename to doc/gui/locale/fr/LC_MESSAGES/projection_algos.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/python_api.po b/doc/gui/locale/fr/LC_MESSAGES/python_api.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/python_api.po rename to doc/gui/locale/fr/LC_MESSAGES/python_api.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/quad_from_ma_algo.po b/doc/gui/locale/fr/LC_MESSAGES/quad_from_ma_algo.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/quad_from_ma_algo.po rename to doc/gui/locale/fr/LC_MESSAGES/quad_from_ma_algo.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/quad_ijk_algo.po b/doc/gui/locale/fr/LC_MESSAGES/quad_ijk_algo.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/quad_ijk_algo.po rename to doc/gui/locale/fr/LC_MESSAGES/quad_ijk_algo.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/radial_prism_algo.po b/doc/gui/locale/fr/LC_MESSAGES/radial_prism_algo.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/radial_prism_algo.po rename to doc/gui/locale/fr/LC_MESSAGES/radial_prism_algo.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/radial_quadrangle_1D2D_algo.po b/doc/gui/locale/fr/LC_MESSAGES/radial_quadrangle_1D2D_algo.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/radial_quadrangle_1D2D_algo.po rename to doc/gui/locale/fr/LC_MESSAGES/radial_quadrangle_1D2D_algo.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/removing_nodes_and_elements.po b/doc/gui/locale/fr/LC_MESSAGES/removing_nodes_and_elements.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/removing_nodes_and_elements.po rename to doc/gui/locale/fr/LC_MESSAGES/removing_nodes_and_elements.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/reorient_faces.po b/doc/gui/locale/fr/LC_MESSAGES/reorient_faces.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/reorient_faces.po rename to doc/gui/locale/fr/LC_MESSAGES/reorient_faces.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/revolution.po b/doc/gui/locale/fr/LC_MESSAGES/revolution.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/revolution.po rename to doc/gui/locale/fr/LC_MESSAGES/revolution.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/rotation.po b/doc/gui/locale/fr/LC_MESSAGES/rotation.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/rotation.po rename to doc/gui/locale/fr/LC_MESSAGES/rotation.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/scalar_bar.po b/doc/gui/locale/fr/LC_MESSAGES/scalar_bar.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/scalar_bar.po rename to doc/gui/locale/fr/LC_MESSAGES/scalar_bar.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/scale.po b/doc/gui/locale/fr/LC_MESSAGES/scale.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/scale.po rename to doc/gui/locale/fr/LC_MESSAGES/scale.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/segments_around_vertex_algo.po b/doc/gui/locale/fr/LC_MESSAGES/segments_around_vertex_algo.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/segments_around_vertex_algo.po rename to doc/gui/locale/fr/LC_MESSAGES/segments_around_vertex_algo.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/selection_filter_library.po b/doc/gui/locale/fr/LC_MESSAGES/selection_filter_library.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/selection_filter_library.po rename to doc/gui/locale/fr/LC_MESSAGES/selection_filter_library.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/sewing_meshes.po b/doc/gui/locale/fr/LC_MESSAGES/sewing_meshes.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/sewing_meshes.po rename to doc/gui/locale/fr/LC_MESSAGES/sewing_meshes.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/skew.po b/doc/gui/locale/fr/LC_MESSAGES/skew.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/skew.po rename to doc/gui/locale/fr/LC_MESSAGES/skew.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/smesh_migration.po b/doc/gui/locale/fr/LC_MESSAGES/smesh_migration.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/smesh_migration.po rename to doc/gui/locale/fr/LC_MESSAGES/smesh_migration.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/smeshpy_interface.po b/doc/gui/locale/fr/LC_MESSAGES/smeshpy_interface.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/smeshpy_interface.po rename to doc/gui/locale/fr/LC_MESSAGES/smeshpy_interface.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/smoothing.po b/doc/gui/locale/fr/LC_MESSAGES/smoothing.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/smoothing.po rename to doc/gui/locale/fr/LC_MESSAGES/smoothing.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/split_biquad_to_linear.po b/doc/gui/locale/fr/LC_MESSAGES/split_biquad_to_linear.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/split_biquad_to_linear.po rename to doc/gui/locale/fr/LC_MESSAGES/split_biquad_to_linear.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/split_to_tetra.po b/doc/gui/locale/fr/LC_MESSAGES/split_to_tetra.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/split_to_tetra.po rename to doc/gui/locale/fr/LC_MESSAGES/split_to_tetra.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/symmetry.po b/doc/gui/locale/fr/LC_MESSAGES/symmetry.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/symmetry.po rename to doc/gui/locale/fr/LC_MESSAGES/symmetry.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/taper.po b/doc/gui/locale/fr/LC_MESSAGES/taper.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/taper.po rename to doc/gui/locale/fr/LC_MESSAGES/taper.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tools.po b/doc/gui/locale/fr/LC_MESSAGES/tools.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tools.po rename to doc/gui/locale/fr/LC_MESSAGES/tools.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/translation.po b/doc/gui/locale/fr/LC_MESSAGES/translation.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/translation.po rename to doc/gui/locale/fr/LC_MESSAGES/translation.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/transparency.po b/doc/gui/locale/fr/LC_MESSAGES/transparency.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/transparency.po rename to doc/gui/locale/fr/LC_MESSAGES/transparency.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_cartesian_algo.po b/doc/gui/locale/fr/LC_MESSAGES/tui_cartesian_algo.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_cartesian_algo.po rename to doc/gui/locale/fr/LC_MESSAGES/tui_cartesian_algo.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_creating_meshes.po b/doc/gui/locale/fr/LC_MESSAGES/tui_creating_meshes.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_creating_meshes.po rename to doc/gui/locale/fr/LC_MESSAGES/tui_creating_meshes.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_defining_hypotheses.po b/doc/gui/locale/fr/LC_MESSAGES/tui_defining_hypotheses.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_defining_hypotheses.po rename to doc/gui/locale/fr/LC_MESSAGES/tui_defining_hypotheses.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_filters.po b/doc/gui/locale/fr/LC_MESSAGES/tui_filters.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_filters.po rename to doc/gui/locale/fr/LC_MESSAGES/tui_filters.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_generate_flat_elements.po b/doc/gui/locale/fr/LC_MESSAGES/tui_generate_flat_elements.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_generate_flat_elements.po rename to doc/gui/locale/fr/LC_MESSAGES/tui_generate_flat_elements.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_grouping_elements.po b/doc/gui/locale/fr/LC_MESSAGES/tui_grouping_elements.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_grouping_elements.po rename to doc/gui/locale/fr/LC_MESSAGES/tui_grouping_elements.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_measurements.po b/doc/gui/locale/fr/LC_MESSAGES/tui_measurements.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_measurements.po rename to doc/gui/locale/fr/LC_MESSAGES/tui_measurements.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_modifying_meshes.po b/doc/gui/locale/fr/LC_MESSAGES/tui_modifying_meshes.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_modifying_meshes.po rename to doc/gui/locale/fr/LC_MESSAGES/tui_modifying_meshes.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_notebook_smesh.po b/doc/gui/locale/fr/LC_MESSAGES/tui_notebook_smesh.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_notebook_smesh.po rename to doc/gui/locale/fr/LC_MESSAGES/tui_notebook_smesh.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_prism_3d_algo.po b/doc/gui/locale/fr/LC_MESSAGES/tui_prism_3d_algo.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_prism_3d_algo.po rename to doc/gui/locale/fr/LC_MESSAGES/tui_prism_3d_algo.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_quality_controls.po b/doc/gui/locale/fr/LC_MESSAGES/tui_quality_controls.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_quality_controls.po rename to doc/gui/locale/fr/LC_MESSAGES/tui_quality_controls.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_transforming_meshes.po b/doc/gui/locale/fr/LC_MESSAGES/tui_transforming_meshes.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_transforming_meshes.po rename to doc/gui/locale/fr/LC_MESSAGES/tui_transforming_meshes.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_use_existing_faces.po b/doc/gui/locale/fr/LC_MESSAGES/tui_use_existing_faces.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_use_existing_faces.po rename to doc/gui/locale/fr/LC_MESSAGES/tui_use_existing_faces.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_viewing_meshes.po b/doc/gui/locale/fr/LC_MESSAGES/tui_viewing_meshes.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_viewing_meshes.po rename to doc/gui/locale/fr/LC_MESSAGES/tui_viewing_meshes.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_work_on_objects_from_gui.po b/doc/gui/locale/fr/LC_MESSAGES/tui_work_on_objects_from_gui.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/tui_work_on_objects_from_gui.po rename to doc/gui/locale/fr/LC_MESSAGES/tui_work_on_objects_from_gui.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/uniting_set_of_triangles.po b/doc/gui/locale/fr/LC_MESSAGES/uniting_set_of_triangles.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/uniting_set_of_triangles.po rename to doc/gui/locale/fr/LC_MESSAGES/uniting_set_of_triangles.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/uniting_two_triangles.po b/doc/gui/locale/fr/LC_MESSAGES/uniting_two_triangles.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/uniting_two_triangles.po rename to doc/gui/locale/fr/LC_MESSAGES/uniting_two_triangles.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/use_existing_algos.po b/doc/gui/locale/fr/LC_MESSAGES/use_existing_algos.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/use_existing_algos.po rename to doc/gui/locale/fr/LC_MESSAGES/use_existing_algos.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/using_notebook_smesh_page.po b/doc/gui/locale/fr/LC_MESSAGES/using_notebook_smesh_page.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/using_notebook_smesh_page.po rename to doc/gui/locale/fr/LC_MESSAGES/using_notebook_smesh_page.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/using_operations_on_groups.po b/doc/gui/locale/fr/LC_MESSAGES/using_operations_on_groups.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/using_operations_on_groups.po rename to doc/gui/locale/fr/LC_MESSAGES/using_operations_on_groups.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/viewing_meshes_overview.po b/doc/gui/locale/fr/LC_MESSAGES/viewing_meshes_overview.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/viewing_meshes_overview.po rename to doc/gui/locale/fr/LC_MESSAGES/viewing_meshes_overview.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/volume.po b/doc/gui/locale/fr/LC_MESSAGES/volume.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/volume.po rename to doc/gui/locale/fr/LC_MESSAGES/volume.po diff --git a/doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/warping.po b/doc/gui/locale/fr/LC_MESSAGES/warping.po similarity index 100% rename from doc/salome/gui/SMESH/locale/fr/LC_MESSAGES/warping.po rename to doc/gui/locale/fr/LC_MESSAGES/warping.po diff --git a/doc/salome/gui/SMESH/merge_mesh_class.py b/doc/gui/merge_mesh_class.py similarity index 100% rename from doc/salome/gui/SMESH/merge_mesh_class.py rename to doc/gui/merge_mesh_class.py diff --git a/doc/salome/gui/SMESH/static/switchers.js.in b/doc/gui/static/switchers.js.in similarity index 100% rename from doc/salome/gui/SMESH/static/switchers.js.in rename to doc/gui/static/switchers.js.in diff --git a/doc/salome/gui/SMESH/templates/layout.html b/doc/gui/templates/layout.html similarity index 100% rename from doc/salome/gui/SMESH/templates/layout.html rename to doc/gui/templates/layout.html diff --git a/doc/salome/examples/creating_meshes_ex06.py b/doc/salome/examples/creating_meshes_ex06.py deleted file mode 100644 index 60360e14b..000000000 --- a/doc/salome/examples/creating_meshes_ex06.py +++ /dev/null @@ -1,120 +0,0 @@ -# Creating a hexahedral mesh on a cylinder. -# -# This example uses Partition to divide the cylinder into blocks, which is -# a general approach. But for the case of cylinder there is a dedicated -# command creating a blocked cylinder: geompy.MakeDividedCylinder() - -import salome -salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() - -import SMESH, SALOMEDS -from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() - -import math - -# Parameters -# ---------- - -radius = 50 -height = 200 - -# Build a cylinder -# ---------------- - -base = geompy.MakeVertex(0, 0, 0) -direction = geompy.MakeVectorDXDYDZ(0, 0, 1) - -cylinder = geompy.MakeCylinder(base, direction, radius, height) - -geompy.addToStudy(cylinder, "cylinder") - -# Build blocks -# ------------ - -size = radius/2.0 - -box_rot = geompy.MakeBox(-size, -size, 0, +size, +size, height) -box_axis = geompy.MakeLine(base, direction) -box = geompy.MakeRotation(box_rot, box_axis, math.pi/4) - -hole = geompy.MakeCut(cylinder, box) - -plane_trim = 2000 - -plane_a = geompy.MakePlane(base, geompy.MakeVectorDXDYDZ(1, 0, 0), plane_trim) -plane_b = geompy.MakePlane(base, geompy.MakeVectorDXDYDZ(0, 1, 0), plane_trim) - -blocks_part = geompy.MakePartition([hole], [plane_a, plane_b], [], [], geompy.ShapeType["SOLID"]) -blocks_list = [box] + geompy.SubShapeAll(blocks_part, geompy.ShapeType["SOLID"]) -blocks_all = geompy.MakeCompound(blocks_list) -blocks = geompy.MakeGlueFaces(blocks_all, 0.0001) - -geompy.addToStudy(blocks, "cylinder:blocks") - -# Build geometric groups -# ---------------------- - -group_a = geompy.CreateGroup(blocks, geompy.ShapeType["FACE"]) -geompy.addToStudyInFather(blocks, group_a, "baseA") -items = geompy.GetShapesOnPlaneWithLocationIDs(blocks, geompy.ShapeType["FACE"], direction, base, GEOM.ST_ON) -geompy.UnionIDs(group_a, items) - -base_b = geompy.MakeVertex(0, 0, height) -group_b = geompy.CreateGroup(blocks, geompy.ShapeType["FACE"]) -geompy.addToStudyInFather(blocks, group_b, "baseB") -items = geompy.GetShapesOnPlaneWithLocationIDs(blocks, geompy.ShapeType["FACE"], direction, base_b, GEOM.ST_ON) -geompy.UnionIDs(group_b, items) - -group_1 = geompy.CreateGroup(blocks, geompy.ShapeType["SOLID"]) -geompy.addToStudyInFather(blocks, group_1, "limit") -group_1_all = geompy.SubShapeAllIDs(blocks, geompy.ShapeType["SOLID"]) -geompy.UnionIDs(group_1, group_1_all) -group_1_box = geompy.GetBlockNearPoint(blocks, base) -geompy.DifferenceList(group_1, [group_1_box]) - -# Mesh the blocks with hexahedral -# ------------------------------- - -smesh.UpdateStudy() - -hexa = smesh.Mesh(blocks) - -hexa_1d = hexa.Segment() -hexa_1d.NumberOfSegments(1) - -vertex = geompy.MakeVertex(+radius, +radius, 0) -edge = geompy.GetEdgeNearPoint(blocks, vertex) -algo = hexa.Segment(edge) -algo.NumberOfSegments(5) -algo.Propagation() - -vertex = geompy.MakeVertex(-radius, +radius, 0) -edge = geompy.GetEdgeNearPoint(blocks, vertex) -algo = hexa.Segment(edge) -algo.NumberOfSegments(8) -algo.Propagation() - -vertex = geompy.MakeVertex((radius+size)/2, 0, 0) -edge = geompy.GetEdgeNearPoint(blocks, vertex) -algo = hexa.Segment(edge) -algo.NumberOfSegments(10) -algo.Propagation() - -vertex = geompy.MakeVertex(+radius, 0, height/2) -edge = geompy.GetEdgeNearPoint(blocks, vertex) -algo = hexa.Segment(edge) -algo.NumberOfSegments(20) -algo.Propagation() - -hexa.Quadrangle() -hexa.Hexahedron() - -hexa.Compute() - -hexa.Group(group_a) -hexa.Group(group_b) -hexa.Group(group_1) diff --git a/doc/salome/examples/creating_meshes_ex07.py b/doc/salome/examples/creating_meshes_ex07.py deleted file mode 100644 index f18109cda..000000000 --- a/doc/salome/examples/creating_meshes_ex07.py +++ /dev/null @@ -1,85 +0,0 @@ -# Building a compound of meshes - -import salome -salome.salome_init_without_session() -from salome.geom import geomBuilder -geompy = geomBuilder.New() -from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() - -## create a bottom box -Box_inf = geompy.MakeBox(0., 0., 0., 200., 200., 50.) - -# get a top face -Psup1=geompy.MakeVertex(100., 100., 50.) -Fsup1=geompy.GetFaceNearPoint(Box_inf, Psup1) -# get a bottom face -Pinf1=geompy.MakeVertex(100., 100., 0.) -Finf1=geompy.GetFaceNearPoint(Box_inf, Pinf1) - -## create a top box -Box_sup = geompy.MakeBox(100., 100., 50., 200., 200., 100.) - -# get a top face -Psup2=geompy.MakeVertex(150., 150., 100.) -Fsup2=geompy.GetFaceNearPoint(Box_sup, Psup2) -# get a bottom face -Pinf2=geompy.MakeVertex(150., 150., 50.) -Finf2=geompy.GetFaceNearPoint(Box_sup, Pinf2) - -## Publish in the study -geompy.addToStudy(Box_inf, "Box_inf") -geompy.addToStudyInFather(Box_inf, Fsup1, "Fsup") -geompy.addToStudyInFather(Box_inf, Finf1, "Finf") - -geompy.addToStudy(Box_sup, "Box_sup") -geompy.addToStudyInFather(Box_sup, Fsup2, "Fsup") -geompy.addToStudyInFather(Box_sup, Finf2, "Finf") - -smesh.UpdateStudy() - -## create a bottom mesh -Mesh_inf = smesh.Mesh(Box_inf, "Mesh_inf") -algo1D_1=Mesh_inf.Segment() -algo1D_1.NumberOfSegments(10) -algo2D_1=Mesh_inf.Quadrangle() -algo3D_1=Mesh_inf.Hexahedron() -Mesh_inf.Compute() - -# create a group on the top face -Gsup1=Mesh_inf.Group(Fsup1, "Sup") -# create a group on the bottom face -Ginf1=Mesh_inf.Group(Finf1, "Inf") - -## create a top mesh -Mesh_sup = smesh.Mesh(Box_sup, "Mesh_sup") -algo1D_2=Mesh_sup.Segment() -algo1D_2.NumberOfSegments(5) -algo2D_2=Mesh_sup.Quadrangle() -algo3D_2=Mesh_sup.Hexahedron() -Mesh_sup.Compute() - -# create a group on the top face -Gsup2=Mesh_sup.Group(Fsup2, "Sup") -# create a group on the bottom face -Ginf2=Mesh_sup.Group(Finf2, "Inf") - -## create compounds -# create a compound of two meshes with renaming namesake groups and -# merging elements with the given tolerance -Compound1 = smesh.Concatenate([Mesh_inf, Mesh_sup], 0, 1, 1e-05, - name='Compound with RenamedGrps and MergeElems') -# create a compound of two meshes with uniting namesake groups and -# creating groups of all elements -Compound2 = smesh.Concatenate([Mesh_inf, Mesh_sup], 1, 0, 1e-05, True, - name='Compound with UniteGrps and GrpsOfAllElems') - -# copy Gsup1 into a separate mesh and translate it -groupMesh = Mesh_inf.TranslateObjectMakeMesh( Gsup1, [300,0,0] ) - -# add Ginf2 to groupMesh -smesh.Concatenate([Ginf2], False, meshToAppendTo = groupMesh ) - - -if salome.sg.hasDesktop(): - salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/creating_meshes_ex08.py b/doc/salome/examples/creating_meshes_ex08.py deleted file mode 100644 index 2f506fa2b..000000000 --- a/doc/salome/examples/creating_meshes_ex08.py +++ /dev/null @@ -1,59 +0,0 @@ -# Mesh Copying - -import salome -salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() - -import SMESH, SALOMEDS -from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() - -# make geometry of a box -box = geompy.MakeBoxDXDYDZ(100,100,100) -face = geompy.SubShapeAllSorted(box, geompy.ShapeType["FACE"])[0] - -# generate a prismatic 3D mesh -mesh = smesh.Mesh(box, "box") -localAlgo = mesh.Triangle(face) -mesh.Segment().NumberOfSegments( 3 ) -mesh.Quadrangle() -mesh.Prism() -mesh.Compute() - -# objects to copy -fGroup = mesh.GroupOnGeom( face, "2D on face") -nGroup = mesh.GroupOnGeom( face, "nodes on face", SMESH.NODE) -subMesh = localAlgo.GetSubMesh() - -# make a new mesh by copying different parts of the mesh - -# 1. copy the whole mesh -newMesh = smesh.CopyMesh( mesh, "whole mesh copy") - -# 2. copy a group of 2D elements along with groups -newMesh = smesh.CopyMesh( fGroup, "face group copy with groups",toCopyGroups=True) - -# 3. copy a group of nodes -newMesh = smesh.CopyMesh( nGroup, "node group copy") - -# 4. copy some faces -faceIds = fGroup.GetIDs()[-10:] -newMesh = smesh.CopyMesh( mesh.GetIDSource( faceIds, SMESH.FACE ), "some faces copy") - -# 5. copy some nodes -nodeIds = nGroup.GetIDs()[-10:] -newMesh = smesh.CopyMesh( mesh.GetIDSource( nodeIds, SMESH.NODE), "some nodes copy") - -# 6. copy a sub-mesh -newMesh = smesh.CopyMesh( subMesh, "sub-mesh copy" ) - - -# make a new mesh with same hypotheses on a modified geometry - -smallBox = geompy.MakeScaleAlongAxes( box, None, 1, 0.5, 0.5 ) -cutBox = geompy.MakeCut( box, smallBox, theName="box - smallBox" ) - -ok, newMesh, groups, submehses, hyps, invIDs = smesh.CopyMeshWithGeom( mesh, cutBox, "cutBox" ) -newMesh.Compute() diff --git a/doc/salome/examples/defining_hypotheses_adaptive1d.py b/doc/salome/examples/defining_hypotheses_adaptive1d.py deleted file mode 100644 index 48d927daa..000000000 --- a/doc/salome/examples/defining_hypotheses_adaptive1d.py +++ /dev/null @@ -1,30 +0,0 @@ -import salome, math -salome.salome_init_without_session() -from salome.geom import geomBuilder -geompy = geomBuilder.New() -from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() - - -box = geompy.MakeBoxDXDYDZ( 100, 100, 100 ) -tool = geompy.MakeTranslation( box, 50, 0, 10 ) -axis = geompy.MakeVector( geompy.MakeVertex( 100, 0, 100 ),geompy.MakeVertex( 100, 10, 100 ),) -tool = geompy.Rotate( tool, axis, math.pi * 25 / 180. ) -shape = geompy.MakeCut( box, tool ) -cyl = geompy.MakeCylinder( geompy.MakeVertex( -10,5, 95 ), geompy.MakeVectorDXDYDZ(1,0,0), 2, 90) -shape = geompy.MakeCut( shape, cyl ) -tool = geompy.MakeBoxTwoPnt( geompy.MakeVertex( -10, 2, 15 ), geompy.MakeVertex( 90, 5, 16 )) -shape = geompy.MakeCut( shape, tool, theName="shape" ) - -# Parameters of Adaptive hypothesis. minSize and maxSize are such that they do not limit -# size of segments because size of geometrical features lies within [2.-100.] range, hence -# size of segments is defined by deflection parameter and size of geometrical features only. -minSize = 0.1 -maxSize = 200 -deflection = 0.05 - -mesh = smesh.Mesh( shape ) -mesh.Segment().Adaptive( minSize, maxSize, deflection ) -mesh.Triangle().MaxElementArea( 300 ) -mesh.Compute() - diff --git a/doc/salome/examples/defining_hypotheses_ex05.py b/doc/salome/examples/defining_hypotheses_ex05.py deleted file mode 100644 index 25fe5429f..000000000 --- a/doc/salome/examples/defining_hypotheses_ex05.py +++ /dev/null @@ -1,44 +0,0 @@ -# Maximum Element Area - -import salome -salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() - -import SMESH, SALOMEDS -from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() - -# create a face -px = geompy.MakeVertex(100., 0. , 0. ) -py = geompy.MakeVertex(0. , 100., 0. ) -pz = geompy.MakeVertex(0. , 0. , 100.) - -vxy = geompy.MakeVector(px, py) -arc = geompy.MakeArc(py, pz, px) -wire = geompy.MakeWire([vxy, arc]) - -isPlanarFace = 1 -face = geompy.MakeFace(wire, isPlanarFace) - -# add the face in the study -id_face = geompy.addToStudy(face, "Face to be meshed") - -# create a mesh -tria_mesh = smesh.Mesh(face, "Face : triangulation") - -# define 1D meshing: -algo = tria_mesh.Segment() -algo.NumberOfSegments(20) - -# define 2D meshing: - -# assign triangulation algorithm -algo = tria_mesh.Triangle() - -# assign "Max Element Area" hypothesis -algo.MaxElementArea(100) - -# compute the mesh -tria_mesh.Compute() diff --git a/doc/salome/examples/defining_hypotheses_ex16.py b/doc/salome/examples/defining_hypotheses_ex16.py deleted file mode 100644 index 2826aa15e..000000000 --- a/doc/salome/examples/defining_hypotheses_ex16.py +++ /dev/null @@ -1,50 +0,0 @@ -# "Import 2D Elements from Another Mesh" example - -import salome -salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() - -import SMESH, SALOMEDS -from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() - -# Make a patritioned box - -box = geompy.MakeBoxDXDYDZ(100,100,100) - -N = geompy.MakeVectorDXDYDZ( 1,0,0 ) -O = geompy.MakeVertex( 50,0,0 ) -plane = geompy.MakePlane( O, N, 200 ) # plane YOZ - -shape2boxes = geompy.MakeHalfPartition( box, plane ) -boxes = geompy.SubShapeAllSorted(shape2boxes, geompy.ShapeType["SOLID"]) - -geompy.addToStudy( boxes[0], "boxes[0]") -geompy.addToStudy( boxes[1], "boxes[1]") -midFace0 = geompy.SubShapeAllSorted(boxes[0], geompy.ShapeType["FACE"])[5] -geompy.addToStudyInFather( boxes[0], midFace0, "middle Face") -midFace1 = geompy.SubShapeAllSorted(boxes[1], geompy.ShapeType["FACE"])[0] -geompy.addToStudyInFather( boxes[1], midFace1, "middle Face") - -# Mesh one of boxes with quadrangles. It is a source mesh - -srcMesh = smesh.Mesh(boxes[0], "source mesh") # box coloser to CS origin -nSeg1 = srcMesh.Segment().NumberOfSegments(4) -srcMesh.Quadrangle() -srcMesh.Compute() -srcFaceGroup = srcMesh.GroupOnGeom( midFace0, "src faces", SMESH.FACE ) - -# Import faces from midFace0 to the target mesh - -tgtMesh = smesh.Mesh(boxes[1], "target mesh") -importAlgo = tgtMesh.UseExisting2DElements(midFace1) -import2hyp = importAlgo.SourceFaces( [srcFaceGroup] ) -tgtMesh.Segment().NumberOfSegments(3) -tgtMesh.Quadrangle() -tgtMesh.Compute() - -# Import the whole source mesh with groups -import2hyp.SetCopySourceMesh(True,True) -tgtMesh.Compute() diff --git a/doc/salome/examples/filters_ex07.py b/doc/salome/examples/filters_ex07.py deleted file mode 100644 index 7d781dc22..000000000 --- a/doc/salome/examples/filters_ex07.py +++ /dev/null @@ -1,10 +0,0 @@ -# Area - -# create mesh -from SMESH_mechanic import * -# get faces with area > 60 and < 90 -criterion1 = smesh.GetCriterion(SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, 60) -criterion2 = smesh.GetCriterion(SMESH.FACE, SMESH.FT_Area, SMESH.FT_LessThan, 90) -filter = smesh.GetFilterFromCriteria([criterion1,criterion2], SMESH.FT_LogicalAND) -ids = mesh.GetIdsFromFilter(filter) -print("Number of faces with area in range (60,90):", len(ids)) diff --git a/doc/salome/examples/filters_ex30.py b/doc/salome/examples/filters_ex30.py deleted file mode 100644 index 856010b9d..000000000 --- a/doc/salome/examples/filters_ex30.py +++ /dev/null @@ -1,12 +0,0 @@ -# Belong to Surface - -# create mesh -from SMESH_mechanic import * -# create b-spline -spline_1 = geompy.MakeInterpol([p4,p6,p3,p1]) -surface_1 = geompy.MakePrismVecH( spline_1, vz, 70.0 ) -geompy.addToStudy(surface_1, "surface_1") -# get all nodes which lie on the surface \a surface_1 -filter = smesh.GetFilter(SMESH.NODE, SMESH.FT_BelongToGenSurface, surface_1) -ids = mesh.GetIdsFromFilter(filter) -print("Number of nodes which lie on the surface surface_1:", len(ids)) diff --git a/doc/salome/examples/filters_ex31.py b/doc/salome/examples/filters_ex31.py deleted file mode 100644 index 209bb9f77..000000000 --- a/doc/salome/examples/filters_ex31.py +++ /dev/null @@ -1,12 +0,0 @@ -# Range of IDs - -# create mesh -from SMESH_mechanic import * -# get nodes with identifiers [5-10] and [15-30] -criterion1 = smesh.GetCriterion(SMESH.NODE, SMESH.FT_RangeOfIds, Threshold="5-10",\ - BinaryOp=SMESH.FT_LogicalOR) -criterion2 = smesh.GetCriterion(SMESH.NODE, SMESH.FT_RangeOfIds, Threshold="15-30") -filter = smesh.CreateFilterManager().CreateFilter() -filter.SetCriteria([criterion1,criterion2]) -ids = mesh.GetIdsFromFilter(filter) -print("Number of nodes in ranges [5-10] and [15-30]:", len(ids)) diff --git a/doc/salome/examples/generate_flat_elements.py b/doc/salome/examples/generate_flat_elements.py deleted file mode 100644 index d14cb0495..000000000 --- a/doc/salome/examples/generate_flat_elements.py +++ /dev/null @@ -1,65 +0,0 @@ -# Double nodes on groups boundaries - -# This example represents an iron cable (a thin cylinder) in a concrete block (a big cylinder). -# The big cylinder is defined by two geometric volumes. - - -import salome -salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() - -import SMESH, SALOMEDS -from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() - - -# geometry - -O = geompy.MakeVertex(0, 0, 0) -OX = geompy.MakeVectorDXDYDZ(1, 0, 0) -OY = geompy.MakeVectorDXDYDZ(0, 1, 0) -OZ = geompy.MakeVectorDXDYDZ(0, 0, 1) -Vertex_1 = geompy.MakeVertex(50, 0, 0) -Cylinder_1 = geompy.MakeCylinder(O, OX, 10, 500) -Cylinder_2 = geompy.MakeCylinder(Vertex_1, OX, 100, 400) -Vertex_2 = geompy.MakeVertex(-200, -200, -200) -Vertex_3 = geompy.MakeVertex(250, 200, 200) -Box_1 = geompy.MakeBoxTwoPnt(Vertex_2, Vertex_3) -Fuse_1 = geompy.MakeFuse(Cylinder_1, Cylinder_2) -Partition_1 = geompy.MakePartition([Fuse_1], [Cylinder_1, Box_1], [], [], geompy.ShapeType["SOLID"], 0, [], 0) -[Solid_1,Solid_2] = geompy.GetShapesOnShape(Cylinder_1, Partition_1, geompy.ShapeType["SOLID"], GEOM.ST_IN) -[Solid_3,Solid_4] = geompy.GetShapesOnShape(Cylinder_2, Partition_1, geompy.ShapeType["SOLID"], GEOM.ST_IN) -Vertex_4 = geompy.MakeVertex(450, 0, 0) -Vertex_5 = geompy.MakeVertex(500, 0, 0) -Vertex_6 = geompy.MakeVertex(550, 0, 0) -vec1 = geompy.MakeVector(Vertex_4, Vertex_5) -vec2 = geompy.MakeVector(Vertex_5, Vertex_6) -[Face_1] = geompy.GetShapesOnPlane(Partition_1, geompy.ShapeType["FACE"], vec1, GEOM.ST_ON) -[Face_2] = geompy.GetShapesOnPlane(Partition_1, geompy.ShapeType["FACE"], vec2, GEOM.ST_ON) - -# meshing (we have linear tetrahedrons here, but other elements are OK) - -Mesh_1 = smesh.Mesh(Partition_1) -Regular_1D = Mesh_1.Segment() -Nb_Segments_1 = Regular_1D.NumberOfSegments(15) -MEFISTO_2D = Mesh_1.Triangle(algo=smeshBuilder.MEFISTO) -Length_From_Edges_2D = MEFISTO_2D.LengthFromEdges() -ALGO3D = Mesh_1.Tetrahedron() -isDone = Mesh_1.Compute() - -# relevant groups of volumes and faces - -Solid_1_1 = Mesh_1.GroupOnGeom(Solid_1,'Solid_1',SMESH.VOLUME) -Solid_2_1 = Mesh_1.GroupOnGeom(Solid_2,'Solid_2',SMESH.VOLUME) -Solid_3_1 = Mesh_1.GroupOnGeom(Solid_3,'Solid_3',SMESH.VOLUME) -Solid_4_1 = Mesh_1.GroupOnGeom(Solid_4,'Solid_4',SMESH.VOLUME) -Face_1_1 = Mesh_1.GroupOnGeom(Face_1,'Face_1',SMESH.FACE) -Face_2_1 = Mesh_1.GroupOnGeom(Face_2,'Face_2',SMESH.FACE) - -# Building of flat elements - -Mesh_1.DoubleNodesOnGroupBoundaries([Solid_1_1, Solid_2_1, Solid_3_1, Solid_4_1], 1) - -Mesh_1.CreateFlatElementsOnFacesGroups([Face_1_1, Face_2_1]) diff --git a/doc/salome/examples/grouping_elements_ex02.py b/doc/salome/examples/grouping_elements_ex02.py deleted file mode 100644 index 16feda41f..000000000 --- a/doc/salome/examples/grouping_elements_ex02.py +++ /dev/null @@ -1,46 +0,0 @@ -# Create a Group on Geometry - - -import salome -salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() - -import SMESH, SALOMEDS -from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() - -# create a box -box = geompy.MakeBox(0., 0., 0., 100., 100., 100.) -geompy.addToStudy(box, "box") - -# add the first face of the box to the study -subShapeList = geompy.SubShapeAll(box, geompy.ShapeType["FACE"]) -face = subShapeList[0] -geompy.addToStudyInFather(box, face, "face 1") - -# create group of edges on the face -aGeomGroupE = geompy.CreateGroup(face, geompy.ShapeType["EDGE"]) -geompy.AddObject(aGeomGroupE, 3) -geompy.AddObject(aGeomGroupE, 6) -geompy.AddObject(aGeomGroupE, 8) -geompy.AddObject(aGeomGroupE, 10) -geompy.addToStudyInFather(face, aGeomGroupE, "Group of Edges") - -# create quadrangle 2D mesh on the box -quadra = smesh.Mesh(box, "Box : quadrangle 2D mesh") -algo1D = quadra.Segment() -quadra.Quadrangle() -algo1D.NumberOfSegments(7) - -# compute the mesh -quadra.Compute() - -# create SMESH group on the face with name "SMESHGroup1" -aSmeshGroup1 = quadra.GroupOnGeom(face, "SMESHGroup1") - -# create SMESH group on with default name -aSmeshGroup2 = quadra.GroupOnGeom(aGeomGroupE) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/measurements_ex01.py b/doc/salome/examples/measurements_ex01.py deleted file mode 100644 index b8ccae02a..000000000 --- a/doc/salome/examples/measurements_ex01.py +++ /dev/null @@ -1,58 +0,0 @@ -# Minimum Distance - -import salome -salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() - -import SMESH, SALOMEDS -from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -import salome_notebook - -from SMESH_mechanic import mesh as mesh1 -from SMESH_test1 import mesh as mesh2 - -mesh1.Compute() -mesh2.Compute() - -# compute min distance from mesh1 to the origin (not available yet) -smesh.MinDistance(mesh1) - -# compute min distance from node 10 of mesh1 to the origin -smesh.MinDistance(mesh1, id1=10) -# ... or -mesh1.MinDistance(10) - -# compute min distance between nodes 10 and 20 of mesh1 -smesh.MinDistance(mesh1, id1=10, id2=20) -# ... or -mesh1.MinDistance(10, 20) - -# compute min distance from element 100 of mesh1 to the origin (not available yet) -smesh.MinDistance(mesh1, id1=100, isElem1=True) -# ... or -mesh1.MinDistance(100, isElem1=True) - -# compute min distance between elements 100 and 200 of mesh1 (not available yet) -smesh.MinDistance(mesh1, id1=100, id2=200, isElem1=True, isElem2=True) -# ... or -mesh1.MinDistance(100, 200, True, True) - -# compute min distance from element 100 to node 20 of mesh1 (not available yet) -smesh.MinDistance(mesh1, id1=100, id2=20, isElem1=True) -# ... or -mesh1.MinDistance(100, 20, True) - -# compute min distance from mesh1 to mesh2 (not available yet) -smesh.MinDistance(mesh1, mesh2) - -# compute min distance from node 10 of mesh1 to node 20 of mesh2 -smesh.MinDistance(mesh1, mesh2, 10, 20) - -# compute min distance from node 10 of mesh1 to element 200 of mesh2 (not available yet) -smesh.MinDistance(mesh1, mesh2, 10, 200, isElem2=True) - -# etc... - diff --git a/doc/salome/examples/measurements_ex02.py b/doc/salome/examples/measurements_ex02.py deleted file mode 100644 index 20c04bcc8..000000000 --- a/doc/salome/examples/measurements_ex02.py +++ /dev/null @@ -1,33 +0,0 @@ -# Bounding Box - - -import salome -salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() - -import SMESH, SALOMEDS -from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -import salome_notebook - -from SMESH_mechanic import mesh as mesh1 -from SMESH_test1 import mesh as mesh2 - -mesh1.Compute() -mesh2.Compute() - -# compute bounding box for mesh1 -mesh1.BoundingBox() - -# compute bounding box for list of nodes of mesh1 -mesh1.BoundingBox([363, 364, 370, 371, 372, 373, 379, 380, 381]) - -# compute bounding box for list of elements of mesh1 -mesh1.BoundingBox([363, 364, 370, 371, 372, 373, 379, 380, 381], isElem=True) - -# compute common bounding box of mesh1 and mesh2 -smesh.BoundingBox([mesh1, mesh2]) - -# etc... diff --git a/doc/salome/examples/modifying_meshes_ex11.py b/doc/salome/examples/modifying_meshes_ex11.py deleted file mode 100644 index 16ffe8777..000000000 --- a/doc/salome/examples/modifying_meshes_ex11.py +++ /dev/null @@ -1,18 +0,0 @@ -# Removing Nodes - -import SMESH_mechanic -mesh = SMESH_mechanic.mesh - -# remove nodes #246 and #255 - -res = mesh.RemoveNodes([246, 255]) -if res == 1: print("Nodes removing is OK!") -else: print("KO nodes removing.") - - -# Removing a Node with Reconnection -# ================================== - -print("Before RemoveNodeWithReconnection(): %s nodes, %s faces" % ( mesh.NbNodes(), mesh.NbFaces())) -mesh.RemoveNodeWithReconnection( 600 ) -print("After RemoveNodeWithReconnection(): %s nodes, %s faces" % ( mesh.NbNodes(), mesh.NbFaces())) diff --git a/doc/salome/examples/modifying_meshes_ex14.py b/doc/salome/examples/modifying_meshes_ex14.py deleted file mode 100644 index 7bb10fd9f..000000000 --- a/doc/salome/examples/modifying_meshes_ex14.py +++ /dev/null @@ -1,9 +0,0 @@ -# Renumbering Nodes and Elements - -import SMESH_mechanic - -mesh = SMESH_mechanic.mesh - -mesh.RenumberNodes() - -mesh.RenumberElements() diff --git a/doc/salome/examples/modifying_meshes_ex21.py b/doc/salome/examples/modifying_meshes_ex21.py deleted file mode 100644 index 6aa3f230d..000000000 --- a/doc/salome/examples/modifying_meshes_ex21.py +++ /dev/null @@ -1,35 +0,0 @@ -# Smoothing - - -import salome -salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() - -import SMESH, SALOMEDS -from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() - -import SMESH_mechanic - -#smesh = SMESH_mechanic.smesh -mesh = SMESH_mechanic.mesh - -# select the top face -faces = geompy.SubShapeAllSorted(SMESH_mechanic.shape_mesh, geompy.ShapeType["FACE"]) -face = faces[3] -geompy.addToStudyInFather(SMESH_mechanic.shape_mesh, face, "face planar with hole") - -# create a group of faces to be smoothed -GroupSmooth = mesh.GroupOnGeom(face, "Group of faces (smooth)", SMESH.FACE) - -# perform smoothing - -# boolean SmoothObject(Object, IDsOfFixedNodes, MaxNbOfIterations, MaxAspectRatio, Method) -res = mesh.SmoothObject(GroupSmooth, [], 20, 2., smesh.CENTROIDAL_SMOOTH) -print("\nSmoothing ... ", end=' ') -if not res: print("failed!") -else: print("done.") - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/quality_controls_ex06.py b/doc/salome/examples/quality_controls_ex06.py deleted file mode 100644 index c0cecd4b0..000000000 --- a/doc/salome/examples/quality_controls_ex06.py +++ /dev/null @@ -1,78 +0,0 @@ -# Free Faces - - -import salome -salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() - -import SMESH, SALOMEDS -from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() - -####### GEOM part ######## - -Box_1 = geompy.MakeBoxDXDYDZ(200, 200, 200) -Box_1_vertex_6 = geompy.GetSubShape(Box_1, [6]) -Box_1 = geompy.GetMainShape(Box_1_vertex_6) -Box_1_vertex_16 = geompy.GetSubShape(Box_1, [16]) -Box_1 = geompy.GetMainShape(Box_1_vertex_16) -Box_1_vertex_11 = geompy.GetSubShape(Box_1, [11]) -Box_1 = geompy.GetMainShape(Box_1_vertex_11) -Plane_1 = geompy.MakePlaneThreePnt(Box_1_vertex_6, Box_1_vertex_16, Box_1_vertex_11, 2000) -Partition_1 = geompy.MakePartition([Box_1], [Plane_1], [], [], geompy.ShapeType["SOLID"], 0, [], 0) - -Box_1_vertex_19 = geompy.GetSubShape(Box_1, [19]) -Box_1_vertex_21 = geompy.GetSubShape(Box_1, [21]) -Plane_2 = geompy.MakePlaneThreePnt(Box_1_vertex_16, Box_1_vertex_19, Box_1_vertex_21, 2000) - -geompy.addToStudy( Box_1, "Box_1" ) -geompy.addToStudyInFather( Box_1, Box_1_vertex_6, "Box_1:vertex_6" ) -geompy.addToStudyInFather( Box_1, Box_1_vertex_16, "Box_1:vertex_16" ) -geompy.addToStudyInFather( Box_1, Box_1_vertex_11, "Box_1:vertex_11" ) -geompy.addToStudy( Plane_1, "Plane_1" ) -geompy.addToStudy( Partition_1, "Partition_1" ) -geompy.addToStudyInFather( Box_1, Box_1_vertex_19, "Box_1:vertex_19" ) -geompy.addToStudyInFather( Box_1, Box_1_vertex_21, "Box_1:vertex_21" ) -geompy.addToStudy( Plane_2, "Plane_2" ) - -###### SMESH part ###### - -Mesh_1 = smesh.Mesh(Partition_1) -Regular_1D = Mesh_1.Segment() -Max_Size_1 = Regular_1D.MaxSize(34.641) -MEFISTO_2D = Mesh_1.Triangle() -Tetrahedronn = Mesh_1.Tetrahedron() -isDone = Mesh_1.Compute() - -# create a group of free faces -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_FreeFaces ) -aFaceIds = Mesh_1.GetIdsFromFilter(aFilter) - -aGroup = Mesh_1.CreateEmptyGroup(SMESH.FACE, "Free_faces") -aGroup.Add(aFaceIds) - -# print the result -print("Criterion: Free faces Nb = ", len(aFaceIds)) -j = 1 -for i in range(len(aFaceIds)): - if j > 20: j = 1; print("") - print(aFaceIds[i], end=' ') - j = j + 1 - pass -print("") - -#filter faces from plane 2 -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_BelongToPlane, Plane_2) -aFaceIds = Mesh_1.GetIdsFromFilter(aFilter) -aGroup.Remove(aFaceIds) - -# create a group of shared faces (located on partition boundary inside box) -aFilter = smesh.GetFilter(SMESH.FACE, SMESH.FT_BelongToPlane, Plane_1) -aFaceIds = Mesh_1.GetIdsFromFilter(aFilter) - -aGroup = Mesh_1.CreateEmptyGroup(SMESH.FACE, "Shared_faces") -aGroup.Add(aFaceIds) - -salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/quality_controls_ex10.py b/doc/salome/examples/quality_controls_ex10.py deleted file mode 100644 index b71b5d6da..000000000 --- a/doc/salome/examples/quality_controls_ex10.py +++ /dev/null @@ -1,25 +0,0 @@ -# Over-constrained volumes - - -import salome -salome.salome_init_without_session() -import GEOM -from salome.geom import geomBuilder -geompy = geomBuilder.New() - -import SMESH, SALOMEDS -from salome.smesh import smeshBuilder -smesh = smeshBuilder.New() -import salome_notebook - - -mesh = smesh.Mesh() -volumeFilter = smesh.GetFilter(SMESH.VOLUME,SMESH.FT_OverConstrainedVolume) - -# make volumes by extrusion of one face -n1 = mesh.AddNode(0,0,0) -n2 = mesh.AddNode(10,0,0) -edge = mesh.AddEdge([n1,n2]) -mesh.ExtrusionSweep([edge], smesh.MakeDirStruct(0,7,0), 1) -mesh.ExtrusionSweep( mesh.GetElementsByType(SMESH.FACE), smesh.MakeDirStruct(0,0,5), 7) -assert( 7 == len( mesh.GetIdsFromFilter( volumeFilter ))) diff --git a/doc/salome/examples/tests.py.in b/doc/salome/examples/tests.py.in deleted file mode 100644 index cd8917419..000000000 --- a/doc/salome/examples/tests.py.in +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright (C) 2018-2022 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -DIR='@CMAKE_CURRENT_SOURCE_DIR@' -TESTS='@GOOD_TESTS@' -REINIT_SALOME=@TEST_REINIT_SALOME@ - -import os -import unittest -import salome - -class MyTest(unittest.TestCase): - def setUp(self): - if REINIT_SALOME: - salome.salome_init() - def tearDown(self): - if REINIT_SALOME: - salome.salome_close() - pass - -if __name__ == "__main__": - tests = TESTS.split(';') - for test in tests: - file_name = os.path.basename(test) - if os.path.isabs(test): - file_path = file_name - else: - file_path = os.path.join(DIR, file_name) - case_name = 'test_' + file_name[:-3] - code = """ -def func(self): - with open('{}') as f: - exec(f.read()) -""" - exec(code.format(file_path)) - setattr(MyTest, case_name, func) - - unittest.main() diff --git a/doc/salome/examples/transforming_meshes_ex04.py b/doc/salome/examples/transforming_meshes_ex04.py deleted file mode 100644 index 910035521..000000000 --- a/doc/salome/examples/transforming_meshes_ex04.py +++ /dev/null @@ -1,14 +0,0 @@ -# Symmetry - -import math - -import SMESH_mechanic -import SMESH - -smesh = SMESH_mechanic.smesh -mesh = SMESH_mechanic.mesh - -# create a symmetrical copy of the mesh mirrored through a point -axis = SMESH.AxisStruct(0, 0, 0, 0, 0, 0) - -mesh.Mirror([], axis, smesh.POINT, 1) diff --git a/doc/salome/gui/SMESH/input/tui_adaptation.rst b/doc/salome/gui/SMESH/input/tui_adaptation.rst deleted file mode 100644 index 2e90aad82..000000000 --- a/doc/salome/gui/SMESH/input/tui_adaptation.rst +++ /dev/null @@ -1,33 +0,0 @@ -.. _tui_adaptation_page: - -********** -Adaptation -********** - -.. _tui_homard_adapt: - -HOMARD -====== - -.. literalinclude:: ../../../examples/test_uniform_refinement.py - :language: python - -:download:`Download this script <../../../examples/test_uniform_refinement.py>` - -.. literalinclude:: ../../../examples/test_homard_adapt.py - :language: python - -:download:`Download this script <../../../examples/test_homard_adapt.py>` - -.. _tui_mg_adapt: - -MG_Adapt -======== - -.. literalinclude:: ../../../examples/MGAdaptTests_without_session.py - :language: python - -:download:`Download this script <../../../examples/MGAdaptTests_without_session.py>` - - -**See Also** the GUI :ref:`adaptation_page`. diff --git a/doc/salome/gui/SMESH/input/tui_measurements.rst b/doc/salome/gui/SMESH/input/tui_measurements.rst deleted file mode 100644 index a4e056531..000000000 --- a/doc/salome/gui/SMESH/input/tui_measurements.rst +++ /dev/null @@ -1,43 +0,0 @@ -.. _tui_measurements_page: - -************ -Measurements -************ - -.. _tui_min_distance: - -Minimum Distance -================ - -.. literalinclude:: ../../../examples/measurements_ex01.py - :language: python - -:download:`Download this script <../../../examples/measurements_ex01.py>` - -.. _tui_bounding_box: - -Bounding Box -============ - -.. literalinclude:: ../../../examples/measurements_ex02.py - :language: python - -:download:`Download this script <../../../examples/measurements_ex02.py>` - -.. _tui_basic_properties: - -Basic Properties -================ - -.. literalinclude:: ../../../examples/measurements_ex03.py - :language: python - -:download:`Download this script <../../../examples/measurements_ex03.py>` - -Angle -===== - -.. literalinclude:: ../../../examples/measurements_ex04.py - :language: python - -:download:`Download this script <../../../examples/measurements_ex04.py>` diff --git a/doc/salome/gui/SMESH/input/tui_quality_controls.rst b/doc/salome/gui/SMESH/input/tui_quality_controls.rst deleted file mode 100644 index 566d69bac..000000000 --- a/doc/salome/gui/SMESH/input/tui_quality_controls.rst +++ /dev/null @@ -1,231 +0,0 @@ -.. _tui_quality_controls_page: - -**************** -Quality Controls -**************** - -.. contents:: `Table of contents` - - -.. _tui_free_borders: - -Free Borders -============ - -.. literalinclude:: ../../../examples/quality_controls_ex01.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex01.py>` - - -.. _tui_borders_at_multiconnection: - -Borders at Multiconnection -========================== - -.. literalinclude:: ../../../examples/quality_controls_ex02.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex02.py>` - - -.. _tui_length_1d: - -Length 1D -========= - -.. literalinclude:: ../../../examples/quality_controls_ex03.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex03.py>` - -.. _tui_free_edges: - -Free Edges -========== - -.. literalinclude:: ../../../examples/quality_controls_ex04.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex04.py>` - -.. _tui_free_nodes: - -Free Nodes -========== - -.. literalinclude:: ../../../examples/quality_controls_ex05.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex05.py>` - -.. _tui_free_faces: - -Free Faces -========== - -.. literalinclude:: ../../../examples/quality_controls_ex06.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex06.py>` - -.. _tui_bare_border_faces: - -Bare border faces -================= - -.. literalinclude:: ../../../examples/quality_controls_ex07.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex07.py>` - -.. _tui_bare_border_volumes: - -Bare border volumes -=================== - -.. literalinclude:: ../../../examples/quality_controls_ex08.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex08.py>` - -.. _tui_over_constrained_faces: - -Over-constrained faces -====================== - -.. literalinclude:: ../../../examples/quality_controls_ex09.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex09.py>` - -.. _tui_over_constrained_volumes: - -Over-constrained volumes -======================== - -.. literalinclude:: ../../../examples/quality_controls_ex10.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex10.py>` - -.. _tui_length_2d: - -Length 2D -========= - -.. literalinclude:: ../../../examples/quality_controls_ex11.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex11.py>` - - -.. _tui_borders_at_multiconnection_2d: - -Borders at Multiconnection 2D -============================= - -.. literalinclude:: ../../../examples/quality_controls_ex12.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex12.py>` - -.. _tui_area: - -Area -==== - -.. literalinclude:: ../../../examples/quality_controls_ex13.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex13.py>` - -.. _tui_taper: - -Taper -===== - -.. literalinclude:: ../../../examples/quality_controls_ex14.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex14.py>` - -.. _tui_aspect_ratio: - -Aspect Ratio -============ - -.. literalinclude:: ../../../examples/quality_controls_ex15.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex15.py>` - -.. _tui_minimum_angle: - -Minimum Angle -============= - -.. literalinclude:: ../../../examples/quality_controls_ex16.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex16.py>` - -.. _tui_warping: - -Warping -======= - -.. literalinclude:: ../../../examples/quality_controls_ex17.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex17.py>` - -.. _tui_skew: - -Skew -==== - -.. literalinclude:: ../../../examples/quality_controls_ex18.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex18.py>` - -.. _tui_max_element_length_2d: - -Element Diameter 2D -=================== - -.. literalinclude:: ../../../examples/quality_controls_ex19.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex19.py>` - -.. _tui_aspect_ratio_3d: - -Aspect Ratio 3D -=============== - -.. literalinclude:: ../../../examples/quality_controls_ex20.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex20.py>` - -.. _tui_volume: - -Volume -====== - -.. literalinclude:: ../../../examples/quality_controls_ex21.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex21.py>` - -.. _tui_max_element_length_3d: - -Element Diameter 3D -=================== - -.. literalinclude:: ../../../examples/quality_controls_ex22.py - :language: python - -:download:`Download this script <../../../examples/quality_controls_ex22.py>` diff --git a/doc/salome/gui/SMESH/input/tui_transforming_meshes.rst b/doc/salome/gui/SMESH/input/tui_transforming_meshes.rst deleted file mode 100644 index 23b755f80..000000000 --- a/doc/salome/gui/SMESH/input/tui_transforming_meshes.rst +++ /dev/null @@ -1,138 +0,0 @@ -.. _tui_transforming_meshes_page: - -******************* -Transforming Meshes -******************* - -.. contents:: `Table of contents` - - -.. _tui_translation: - -Translation -=========== - -.. literalinclude:: ../../../examples/transforming_meshes_ex01.py - :language: python - -:download:`Download this script <../../../examples/transforming_meshes_ex01.py>` - -.. _tui_rotation: - -Rotation -======== - -.. literalinclude:: ../../../examples/transforming_meshes_ex02.py - :language: python - -:download:`Download this script <../../../examples/transforming_meshes_ex02.py>` - -.. _tui_scale: - -Scale -===== - -.. literalinclude:: ../../../examples/transforming_meshes_ex03.py - :language: python - -:download:`Download this script <../../../examples/transforming_meshes_ex03.py>` - -.. _tui_symmetry: - -Symmetry -======== - -.. literalinclude:: ../../../examples/transforming_meshes_ex04.py - :language: python - -:download:`Download this script <../../../examples/transforming_meshes_ex04.py>` - -.. _tui_merging_nodes: - -Merging Nodes -============= - -.. literalinclude:: ../../../examples/transforming_meshes_ex05.py - :language: python - -:download:`Download this script <../../../examples/transforming_meshes_ex05.py>` - -.. _tui_merging_elements: - -Merging Elements -================ - -.. literalinclude:: ../../../examples/transforming_meshes_ex06.py - :language: python - -:download:`Download this script <../../../examples/transforming_meshes_ex06.py>` - -.. _tui_sew_meshes_border_to_side: - -Sew Meshes Border to Side -========================= - -.. literalinclude:: ../../../examples/transforming_meshes_ex07.py - :language: python - -:download:`Download this script <../../../examples/transforming_meshes_ex07.py>` - -.. _tui_sew_conform_free_borders: - -Sew Conform Free Borders -======================== - -.. literalinclude:: ../../../examples/transforming_meshes_ex08.py - :language: python - -:download:`Download this script <../../../examples/transforming_meshes_ex08.py>` - -.. _tui_sew_free_borders: - -Sew Free Borders -================ - -.. literalinclude:: ../../../examples/transforming_meshes_ex09.py - :language: python - -:download:`Download this script <../../../examples/transforming_meshes_ex09.py>` - -.. _tui_sew_side_elements: - -Sew Side Elements -================= - -.. literalinclude:: ../../../examples/transforming_meshes_ex10.py - :language: python - -:download:`Download this script <../../../examples/transforming_meshes_ex10.py>` - -.. _tui_duplicate_nodes: - -Duplicate nodes or/and elements -=============================== - -.. literalinclude:: ../../../examples/transforming_meshes_ex11.py - :language: python - -:download:`Download this script <../../../examples/transforming_meshes_ex11.py>` - -.. _tui_make_2dmesh_from_3d: - -Create boundary elements -======================== - -.. literalinclude:: ../../../examples/transforming_meshes_ex12.py - :language: python - -:download:`Download this script <../../../examples/transforming_meshes_ex12.py>` - -.. _tui_reorient_faces: - -Reorient faces -============== - -.. literalinclude:: ../../../examples/transforming_meshes_ex13.py - :language: python - -:download:`Download this script <../../../examples/transforming_meshes_ex13.py>` diff --git a/doc/salome/gui/SMESH/input/tui_viewing_meshes.rst b/doc/salome/gui/SMESH/input/tui_viewing_meshes.rst deleted file mode 100644 index d1320ec87..000000000 --- a/doc/salome/gui/SMESH/input/tui_viewing_meshes.rst +++ /dev/null @@ -1,27 +0,0 @@ - -.. _tui_viewing_meshes_page: - -************** -Viewing Meshes -************** - -.. _tui_viewing_mesh_infos: - -Viewing Mesh Infos -################## - -.. literalinclude:: ../../../examples/viewing_meshes_ex01.py - :language: python - -:download:`Download this script <../../../examples/viewing_meshes_ex01.py>` - -.. _tui_find_element_by_point: - - -Find Element by Point -##################### - -.. literalinclude:: ../../../examples/viewing_meshes_ex02.py - :language: python - -:download:`Download this script <../../../examples/viewing_meshes_ex02.py>` diff --git a/doc/salome/tui/CMakeLists.txt b/doc/tui/CMakeLists.txt similarity index 100% rename from doc/salome/tui/CMakeLists.txt rename to doc/tui/CMakeLists.txt diff --git a/doc/salome/tui/doxyfile.in b/doc/tui/doxyfile.in similarity index 100% rename from doc/salome/tui/doxyfile.in rename to doc/tui/doxyfile.in diff --git a/doc/salome/tui/images/application.gif b/doc/tui/images/application.gif similarity index 100% rename from doc/salome/tui/images/application.gif rename to doc/tui/images/application.gif diff --git a/doc/salome/tui/images/head.png b/doc/tui/images/head.png similarity index 100% rename from doc/salome/tui/images/head.png rename to doc/tui/images/head.png diff --git a/doc/salome/tui/images/logocorp.gif b/doc/tui/images/logocorp.gif similarity index 100% rename from doc/salome/tui/images/logocorp.gif rename to doc/tui/images/logocorp.gif diff --git a/doc/salome/tui/images/smeshscreen.png b/doc/tui/images/smeshscreen.png similarity index 100% rename from doc/salome/tui/images/smeshscreen.png rename to doc/tui/images/smeshscreen.png diff --git a/doc/salome/tui/input/index.doc b/doc/tui/input/index.doc similarity index 100% rename from doc/salome/tui/input/index.doc rename to doc/tui/input/index.doc diff --git a/doc/salome/tui/static/footer.html b/doc/tui/static/footer.html similarity index 100% rename from doc/salome/tui/static/footer.html rename to doc/tui/static/footer.html diff --git a/doc/salome/tui/static/header.html.in b/doc/tui/static/header.html.in similarity index 100% rename from doc/salome/tui/static/header.html.in rename to doc/tui/static/header.html.in diff --git a/doc/salome/tui/static/salome_extra.css b/doc/tui/static/salome_extra.css similarity index 100% rename from doc/salome/tui/static/salome_extra.css rename to doc/tui/static/salome_extra.css diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in index a6190a675..6c359bd51 100644 --- a/resources/SalomeApp.xml.in +++ b/resources/SalomeApp.xml.in @@ -134,4 +134,7 @@
+
+ +
diff --git a/src/SMESH_SWIG/CMakeLists.txt b/src/SMESH_SWIG/CMakeLists.txt index d29bd3cbd..e39db09f9 100644 --- a/src/SMESH_SWIG/CMakeLists.txt +++ b/src/SMESH_SWIG/CMakeLists.txt @@ -32,79 +32,11 @@ include_directories( ) # scripts / static -SET(_bin_SCRIPTS - ex00_all.py - ex01_cube2build.py - ex02_cube2primitive.py - ex03_cube2partition.py - ex04_cube5tetraHexa.py - ex05_hole1build.py - ex06_hole1boolean.py - ex07_hole1partition.py - ex08_hole2build.py - ex09_grid4build.py - ex10_grid4geometry.py - ex11_grid3partition.py - ex12_grid17partition.py - ex13_hole1partial.py - ex14_cyl1holed.py - ex15_cyl2geometry.py - ex16_cyl2complementary.py - ex17_dome1.py - ex18_dome2.py - ex19_sphereINcube.py - ex21_lamp.py - ex24_cylinder.py - ex29_refine.py - ex30_tepal.py - ex30_groupsOp.py - ex31_dimGroup.py - SMESH_test.py - SMESH_test0.py - SMESH_test1.py - SMESH_test1_AndDisplay.py - SMESH_test2.py - SMESH_test3.py - SMESH_test4.py - SMESH_test5.py - SMESH_mechanic.py - SMESH_mechanic_tetra.py - SMESH_mechanic_editor.py - SMESH_mechanic_netgen.py - SMESH_fixation.py - SMESH_fixation_hexa.py - SMESH_fixation_tetra.py - SMESH_fixation_netgen.py - SMESH_box_tetra.py - SMESH_box2_tetra.py - SMESH_box3_tetra.py - SMESH_flight_skin.py - SMESH_Partition1_tetra.py - SMESH_controls.py - SMESH_freebord.py - SMESH_blocks.py - SMESH_BelongToGeom.py - SMESH_GroupFromGeom2.py - SMESH_box.py - SMESH_demo_hexa2_upd.py - SMESH_hexaedre.py - SMESH_Sphere.py - SMESH_GroupFromGeom.py - SMESH_Nut.py - SMESH_GroupLyingOnGeom.py - SMESH_AdvancedEditor.py - SMESH_BuildCompound.py - PAL_MESH_041_mesh.py - PAL_MESH_043_2D.py - PAL_MESH_043_3D.py - SMESH_reg.py - smesh_selection.py - YACS_geomesh0.py -) SET(smesh_SCRIPTS smeshBuilder.py smesh_algorithm.py + smesh_selection.py ) SET(StdMeshers_SCRIPTS @@ -135,7 +67,5 @@ install(FILES ${SMeshHelper_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_BINS} EXTRA_DPYS "${SWIG_MODULE_SMeshHelper_REAL_NAME}") # --- rules --- -SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_PYTHON} DEF_PERMS) SALOME_INSTALL_SCRIPTS("${smesh_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/smesh DEF_PERMS) SALOME_INSTALL_SCRIPTS("${StdMeshers_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/StdMeshers DEF_PERMS) -SALOME_INSTALL_SCRIPTS(SMESH_shared_modules.py ${SALOME_INSTALL_PYTHON}/shared_modules DEF_PERMS) diff --git a/src/SMESH_SWIG/SMESH_shared_modules.py b/src/SMESH_SWIG/SMESH_shared_modules.py deleted file mode 100644 index 21f2121f6..000000000 --- a/src/SMESH_SWIG/SMESH_shared_modules.py +++ /dev/null @@ -1,44 +0,0 @@ -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2022 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -""" - -""" - -# force SMESH importation at interpreter initialization -# see salome_shared_modules.py -# (avoids incomplete import at run time) - -from launchConfigureParser import verbose - -if verbose(): print("============== import SMESH =======================") - -import SMESH - -# this function is required - -def init_shared_modules(): - """ - This function initializes shared modules that need to be - """ - pass diff --git a/src/SMESH_SWIG/YACS_geomesh0.py b/src/SMESH_SWIG/YACS_geomesh0.py deleted file mode 100644 index 93e71bfa3..000000000 --- a/src/SMESH_SWIG/YACS_geomesh0.py +++ /dev/null @@ -1,192 +0,0 @@ -#!/usr/bin/env python3 -# Copyright (C) 2018-2022 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# test used in YACS, ForEachLoop - -def geomesh(l0, r0, h0, d0, d1, my_container, direc): - print("Géometrie et maillage barre : (l0, r0, h0, d0, d1)=", (l0, r0, h0, d0, d1)) - - import sys - import salome - salome.salome_init() - import GEOM - from salome.geom import geomBuilder - import math - import os - import SALOMEDS - import SMESH - from salome.smesh import smeshBuilder - - my_container.load_component_Library("GEOM") - #engineGeom = my_container.create_component_instance("GEOM") - engineGeom = my_container.load_impl("GEOM","") - geompy = geomBuilder.New(engineGeom) - my_container.load_component_Library("SMESH") - #engineSmesh = my_container.create_component_instance("SMESH") - engineSmesh = my_container.load_impl("SMESH","") - smesh = smeshBuilder.New(engineSmesh,engineGeom) - print("instances Names:", engineGeom.instanceName, engineSmesh.instanceName) - print("instances:", engineGeom, engineSmesh) - print("builders:", geompy, smesh) - - volume = (2.*l0*r0 + 0.75*math.pi*r0*r0)*h0 - O = geompy.MakeVertex(0, 0, 0) - OX = geompy.MakeVectorDXDYDZ(1, 0, 0) - OY = geompy.MakeVectorDXDYDZ(0, 1, 0) - OZ = geompy.MakeVectorDXDYDZ(0, 0, 1) - Vertex_1 = geompy.MakeVertex(-l0, -r0, 0) - Vertex_2 = geompy.MakeVertex(-l0-r0, 0, 0) - Vertex_3 = geompy.MakeVertex(-l0, r0, 0) - Vertex_4 = geompy.MakeVertex(l0, r0, 0) - Vertex_5 = geompy.MakeVertex(l0+r0, 0, 0) - Vertex_6 = geompy.MakeVertex(l0, -r0, 0) - Arc_1 = geompy.MakeArc(Vertex_1, Vertex_2, Vertex_3) - Arc_2 = geompy.MakeArc(Vertex_4, Vertex_5, Vertex_6) - Line_1 = geompy.MakeLineTwoPnt(Vertex_3, Vertex_4) - Line_2 = geompy.MakeLineTwoPnt(Vertex_6, Vertex_1) - Face_1 = geompy.MakeFaceWires([Arc_1, Arc_2, Line_1, Line_2], 1) - barre0 = geompy.MakePrismVecH(Face_1, OZ, h0) - Vertex_1a = geompy.MakeVertex(-l0, -r0/2, 0) - Vertex_2a = geompy.MakeVertex(-l0-r0/2, 0, 0) - Vertex_3a = geompy.MakeVertex(-l0, r0/2, 0) - Vertex_4a = geompy.MakeVertex(l0, r0/2, 0) - Vertex_5a = geompy.MakeVertex(l0+r0/2, 0, 0) - Vertex_6a = geompy.MakeVertex(l0, -r0/2, 0) - Arc_1a = geompy.MakeArc(Vertex_1a, Vertex_2a, Vertex_3a) - Arc_2a = geompy.MakeArc(Vertex_4a, Vertex_5a, Vertex_6a) - Line_1a = geompy.MakeLineTwoPnt(Vertex_3a, Vertex_4a) - Line_2a = geompy.MakeLineTwoPnt(Vertex_6a, Vertex_1a) - Face_1a = geompy.MakeFaceWires([Arc_1a, Arc_2a, Line_1a, Line_2a], 1) - barrea = geompy.MakePrismVecH(Face_1a, OZ, h0) - barreb = geompy.MakeCut(barre0, barrea) - Plane_1 = geompy.MakePlane(Vertex_1, OX, 2000) - Plane_2 = geompy.MakePlane(Vertex_6, OX, 2000) - barre = geompy.MakePartition([barreb], [Plane_1, Plane_2], [], [], geompy.ShapeType["SOLID"], 0, [], 0) - v1 = geompy.MakeVertex(-l0-r0, 0, h0/2.) - v2 = geompy.MakeVertex(l0+r0, 0, h0/2.) - f1 = geompy.GetShapesNearPoint(barre, v1, geompy.ShapeType["FACE"]) - f2 = geompy.GetShapesNearPoint(barre, v2, geompy.ShapeType["FACE"]) - #f1 = geompy.CreateGroup(barre, geompy.ShapeType["FACE"]) - #geompy.UnionIDs(f1, [3]) - #f2 = geompy.CreateGroup(barre, geompy.ShapeType["FACE"]) - #geompy.UnionIDs(f2, [20]) - - Auto_group_for_Sub_mesh_1 = geompy.CreateGroup(barre, geompy.ShapeType["FACE"]) - geompy.UnionList(Auto_group_for_Sub_mesh_1, [f1, f2]) - nom = r'barre_l_{:03d}__r_{:05.2f}__h_{:05.2f}__d0_{:05.2f}__d1_{:05.2f}'.format(int(l0), r0, h0, d0, d1) - nombrep = nom + ".brep" - geompy.ExportBREP(barre, direc + os.sep + nombrep ) - props = geompy.BasicProperties(barre) - geomvol = props[2] - - #geompy.addToStudy( barre, 'barre' ) - #geompy.addToStudyInFather( barre, f1, 'f1' ) - #geompy.addToStudyInFather( barre, f2, 'f2' ) - - smesh.SetEnablePublish( False ) - - isTetra = False - barre_1 = smesh.Mesh(barre) - # SO = salome.myStudy.FindObjectIOR(salome.myStudy.ConvertObjectToIOR(barre_1.GetMesh())) - # if SO: - # print ("_______",SO.GetID(),SO.GetName()) - # else: - # print ("_______NO_SO!!!") - if (isTetra): - NETGEN_1D_2D_3D = barre_1.Tetrahedron(algo=smeshBuilder.NETGEN_1D2D3D) - NETGEN_3D_Parameters_1 = NETGEN_1D_2D_3D.Parameters() - NETGEN_3D_Parameters_1.SetMaxSize( d0 ) - NETGEN_3D_Parameters_1.SetSecondOrder( 0 ) - NETGEN_3D_Parameters_1.SetOptimize( 1 ) - NETGEN_3D_Parameters_1.SetFineness( 3 ) - NETGEN_3D_Parameters_1.SetChordalError( 0.1 ) - NETGEN_3D_Parameters_1.SetChordalErrorEnabled( 0 ) - NETGEN_3D_Parameters_1.SetMinSize( d0 ) - NETGEN_3D_Parameters_1.SetUseSurfaceCurvature( 1 ) - NETGEN_3D_Parameters_1.SetFuseEdges( 1 ) - NETGEN_3D_Parameters_1.SetQuadAllowed( 0 ) - NETGEN_1D_2D = barre_1.Triangle(algo=smeshBuilder.NETGEN_1D2D,geom=Auto_group_for_Sub_mesh_1) - NETGEN_2D_Parameters_1 = NETGEN_1D_2D.Parameters() - NETGEN_2D_Parameters_1.SetMaxSize( d1 ) - NETGEN_2D_Parameters_1.SetSecondOrder( 0 ) - NETGEN_2D_Parameters_1.SetOptimize( 1 ) - NETGEN_2D_Parameters_1.SetFineness( 3 ) - NETGEN_2D_Parameters_1.SetChordalError( 0.1 ) - NETGEN_2D_Parameters_1.SetChordalErrorEnabled( 0 ) - NETGEN_2D_Parameters_1.SetMinSize( d1 ) - NETGEN_2D_Parameters_1.SetUseSurfaceCurvature( 1 ) - NETGEN_2D_Parameters_1.SetFuseEdges( 1 ) - NETGEN_2D_Parameters_1.SetQuadAllowed( 0 ) - else: - Regular_1D = barre_1.Segment() - Number_of_Segments_1 = Regular_1D.NumberOfSegments(15) - Quadrangle_2D = barre_1.Quadrangle(algo=smeshBuilder.QUADRANGLE) - Hexa_3D = barre_1.Hexahedron(algo=smeshBuilder.Hexa) - isDone = barre_1.Compute() - - f1_1 = barre_1.GroupOnGeom(f1,'f1',SMESH.FACE) - f2_1 = barre_1.GroupOnGeom(f2,'f2',SMESH.FACE) - smesh.SetName(barre_1, nom) - nommed = nom + ".med" - barre_1.ExportMED( direc + os.sep + nommed, auto_groups=0, minor=0, overwrite=1, meshPart=None, autoDimension=1 ) - measure = smesh.CreateMeasurements() - meshvol = measure.Volume(barre_1.mesh) - print("Maillage publié : ", direc + os.sep + nommed) - clearMesh(barre_1, salome.myStudy, nom) - deltag = abs(geomvol - volume)/volume - deltam = abs(meshvol - geomvol)/geomvol - delta = abs(meshvol - volume)/volume - print("volumes:", volume, geomvol, meshvol, deltag, deltam) - assert(deltag < 1.e-5) - assert(deltam < 2.e-3) - #import time - #time.sleep(30) - return delta - - -def clearMesh(theMesh, theStudy, aName): - theMesh.Clear() - aMesh = theMesh.GetMesh() - aMesh.UnRegister() - # aStudyBuilder = theStudy.NewBuilder() - # SO = theStudy.FindObjectIOR(theStudy.ConvertObjectToIOR(aMesh)) - # objects_to_unpublish = [SO] - # refs = theStudy.FindDependances(SO) - # objects_to_unpublish += refs - # for o in objects_to_unpublish: - # if o is not None: - # aStudyBuilder.RemoveObjectWithChildren(o) - print("clearMesh done:", aName) - -def genere(r0, h0, my_container, direc): - l0 = 50.0 - d0 = min(r0/2., h0/6.) - d1 = d0/2. - res = geomesh(l0, r0, h0, d0, d1, my_container, direc) - return res - -def genere2(r0h0, my_container, direc): - l0 = 50.0 - r0 = r0h0[0] - h0 = r0h0[1] - d0 = min(r0/2., h0/6.) - d1 = d0/2. - res = geomesh(l0, r0, h0, d0, d1, my_container, direc) - return res diff --git a/src/Tools/MacMesh/CMakeLists.txt b/src/Tools/MacMesh/CMakeLists.txt index d27b4b152..15c1bd5de 100644 --- a/src/Tools/MacMesh/CMakeLists.txt +++ b/src/Tools/MacMesh/CMakeLists.txt @@ -57,10 +57,10 @@ SET(sample_SCRIPT SALOME_INSTALL_SCRIPTS("${plugin_SCRIPTS}" ${MACMESH_INSTALL_PY}) SALOME_INSTALL_SCRIPTS("${sample_SCRIPT}" ${SALOME_INSTALL_SCRIPT_PYTHON} DEF_PERMS) -SET(testname MacMesh_Example_PressureValve) -SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env) -ADD_TEST( - NAME ${testname} - COMMAND ${PYTHON_EXECUTABLE} -B ${CMAKE_SOURCE_DIR}/doc/salome/examples/testme.py ${sample_SCRIPT}) -SET_TESTS_PROPERTIES(${testname} PROPERTIES ENVIRONMENT "${tests_env}") - +IF(SALOME_BUILD_TESTS) + SET(testname MacMesh_Example_PressureValve) + SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env) + ADD_TEST(NAME ${testname} + COMMAND ${PYTHON_EXECUTABLE} -B ${CMAKE_SOURCE_DIR}/test/test_helper.py ${sample_SCRIPT}) + SET_TESTS_PROPERTIES(${testname} PROPERTIES ENVIRONMENT "${tests_env}" LABELS "macmesh") +ENDIF() diff --git a/src/Tools/TopIIVolMeshPlug/CMakeLists.txt b/src/Tools/TopIIVolMeshPlug/CMakeLists.txt index 20588ca40..da7d2f8e9 100644 --- a/src/Tools/TopIIVolMeshPlug/CMakeLists.txt +++ b/src/Tools/TopIIVolMeshPlug/CMakeLists.txt @@ -49,7 +49,6 @@ ENDIF(SALOME_BUILD_GUI) # --- rules --- SALOME_INSTALL_SCRIPTS("${_plugin_SCRIPTS}" ${SALOME_SMESH_INSTALL_PLUGINS}) -MESSAGE(VERBOSE "iNSTALLATION FOLDER ${SALOME_SMESH_INSTALL_PLUGINS}") IF(SALOME_BUILD_GUI) SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_SMESH_INSTALL_PLUGINS} TARGET_NAME _target_name_pyuic_py) # add dependency of compiled py files on uic files in order diff --git a/test/0README b/test/0README new file mode 100644 index 000000000..3cb175163 --- /dev/null +++ b/test/0README @@ -0,0 +1,7 @@ +This folder contains test scripts for SMESH module. + +These tests are exported into the ${SMESH_ROOT_DIR}/bin/test folder and can be executed with the +`salome test` command, as a part of whole testing procedure. + +The example Python scripts to be used in the documentation of Mesh module, must be put into the +{root_src}/doc/examples folder! diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1c0ac0b14..e5817ca3d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -20,23 +20,47 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +INCLUDE(tests.set) + +SET(RESTRICTED_ROOT_DIR $ENV{RESTRICTED_ROOT_DIR} CACHE PATH "Path to the restricted repository") +SET(TEST_INSTALL_DIRECTORY ${SMESH_TEST_DIR}/other) + +# Install 'salome test' staff +# --------------------------- + +SALOME_CONFIGURE_FILE(CTestTestfileInstall.cmake + ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CTestTestfile.cmake + INSTALL ${TEST_INSTALL_DIRECTORY}) +INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) +INSTALL(FILES ${GOOD_TESTS} ${BAD_TESTS} ${SESSION_FREE_TESTS} ${OTHER_FILES} DESTINATION ${TEST_INSTALL_DIRECTORY}) +INSTALL(DIRECTORY data DESTINATION ${TEST_INSTALL_DIRECTORY}) + +# Add tests for 'make test' +# ------------------------- + SALOME_GENERATE_TESTS_ENVIRONMENT(_test_env) -SET(_test_helper ${CMAKE_SOURCE_DIR}/doc/salome/examples/testme.py) -# Tests from RESTRICTED repository ----------------------------------- +# 1. Tests from here +# ------------------ -SET(RESTRICTED_ROOT_DIR $ENV{RESTRICTED_ROOT_DIR} CACHE PATH "Path to the restricted repository") +FOREACH(_test ${GOOD_TESTS}) + GET_FILENAME_COMPONENT(testname ${_test} NAME_WE) + ADD_TEST(NAME ${testname} + COMMAND ${PYTHON_EXECUTABLE} -B ${CMAKE_SOURCE_DIR}/test/test_helper.py ${CMAKE_CURRENT_SOURCE_DIR}/${_test}) + SET_TESTS_PROPERTIES(${testname} PROPERTIES ENVIRONMENT "${tests_env}" LABELS "tests") +ENDFOREACH() + +# 2. Tests from RESTRICTED repository +# ----------------------------------- IF(WITH_SHAPER_STUDY AND EXISTS ${RESTRICTED_ROOT_DIR}) FILE(GLOB _restricted_tests "${RESTRICTED_ROOT_DIR}/SMESH/*.py") FOREACH(_test ${_restricted_tests}) GET_FILENAME_COMPONENT(_test_name ${_test} NAME_WE) ADD_TEST(NAME ${_test_name} - COMMAND ${PYTHON_EXECUTABLE} -B ${_test_helper} ${_test}) - SET_TESTS_PROPERTIES(${_test_name} PROPERTIES ENVIRONMENT "${_test_env}") + COMMAND ${PYTHON_EXECUTABLE} -B ${CMAKE_SOURCE_DIR}/test/test_helper.py ${_test}) + SET_TESTS_PROPERTIES(${_test_name} PROPERTIES ENVIRONMENT "${_test_env}" LABELS "restricted") ENDFOREACH() ELSE() MESSAGE(WARNING "Tests from RESTRICTED repository aren't available") ENDIF() - -# -------------------------------------------------------------------- diff --git a/doc/salome/examples/CTestTestfileInstall.cmake b/test/CTestTestfileInstall.cmake similarity index 73% rename from doc/salome/examples/CTestTestfileInstall.cmake rename to test/CTestTestfileInstall.cmake index 73cc4c7af..c485059c7 100644 --- a/doc/salome/examples/CTestTestfileInstall.cmake +++ b/test/CTestTestfileInstall.cmake @@ -17,23 +17,18 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(MED_INT_IS_LONG @MED_INT_IS_LONG@) -SET(PYTHON_TEST_DRIVER "$ENV{KERNEL_ROOT_DIR}/bin/salome/appliskel/python_test_driver.py") -SET(COMPONENT_NAME SMESH) -SET(TIMEOUT 300) - INCLUDE(tests.set) FOREACH(tfile ${GOOD_TESTS} ${BAD_TESTS}) GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE) SET(TEST_NAME SMESH_${BASE_NAME}) ADD_TEST(${TEST_NAME} python ${PYTHON_TEST_DRIVER} ${TIMEOUT} ${tfile}) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME};${COMPONENT_NAME}_tests") ENDFOREACH() -foreach(tfile ${SESSION_FREE_TESTS}) - get_filename_component(BASE_NAME ${tfile} NAME_WE) - set(TEST_NAME SMESH_${BASE_NAME}) - add_test(${TEST_NAME} python ${tfile}) - set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") +FOREACH(tfile ${SESSION_FREE_TESTS}) + GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE) + SET(TEST_NAME SMESH_${BASE_NAME}) + ADD_TEST(${TEST_NAME} python ${tfile}) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME};${COMPONENT_NAME}_tests") endforeach() diff --git a/src/SMESH_SWIG/PAL_MESH_041_mesh.py b/test/PAL_MESH_041_mesh.py similarity index 100% rename from src/SMESH_SWIG/PAL_MESH_041_mesh.py rename to test/PAL_MESH_041_mesh.py diff --git a/src/SMESH_SWIG/PAL_MESH_043_2D.py b/test/PAL_MESH_043_2D.py similarity index 100% rename from src/SMESH_SWIG/PAL_MESH_043_2D.py rename to test/PAL_MESH_043_2D.py diff --git a/src/SMESH_SWIG/PAL_MESH_043_3D.py b/test/PAL_MESH_043_3D.py similarity index 100% rename from src/SMESH_SWIG/PAL_MESH_043_3D.py rename to test/PAL_MESH_043_3D.py diff --git a/src/SMESH_SWIG/SMESH_AdvancedEditor.py b/test/SMESH_AdvancedEditor.py similarity index 100% rename from src/SMESH_SWIG/SMESH_AdvancedEditor.py rename to test/SMESH_AdvancedEditor.py diff --git a/src/SMESH_SWIG/SMESH_BelongToGeom.py b/test/SMESH_BelongToGeom.py similarity index 100% rename from src/SMESH_SWIG/SMESH_BelongToGeom.py rename to test/SMESH_BelongToGeom.py diff --git a/src/SMESH_SWIG/SMESH_BuildCompound.py b/test/SMESH_BuildCompound.py similarity index 100% rename from src/SMESH_SWIG/SMESH_BuildCompound.py rename to test/SMESH_BuildCompound.py diff --git a/src/SMESH_SWIG/SMESH_GroupFromGeom.py b/test/SMESH_GroupFromGeom.py similarity index 100% rename from src/SMESH_SWIG/SMESH_GroupFromGeom.py rename to test/SMESH_GroupFromGeom.py diff --git a/src/SMESH_SWIG/SMESH_GroupFromGeom2.py b/test/SMESH_GroupFromGeom2.py similarity index 100% rename from src/SMESH_SWIG/SMESH_GroupFromGeom2.py rename to test/SMESH_GroupFromGeom2.py diff --git a/src/SMESH_SWIG/SMESH_GroupLyingOnGeom.py b/test/SMESH_GroupLyingOnGeom.py similarity index 100% rename from src/SMESH_SWIG/SMESH_GroupLyingOnGeom.py rename to test/SMESH_GroupLyingOnGeom.py diff --git a/src/SMESH_SWIG/SMESH_Nut.py b/test/SMESH_Nut.py similarity index 100% rename from src/SMESH_SWIG/SMESH_Nut.py rename to test/SMESH_Nut.py diff --git a/src/SMESH_SWIG/SMESH_Partition1_tetra.py b/test/SMESH_Partition1_tetra.py similarity index 100% rename from src/SMESH_SWIG/SMESH_Partition1_tetra.py rename to test/SMESH_Partition1_tetra.py diff --git a/src/SMESH_SWIG/SMESH_Sphere.py b/test/SMESH_Sphere.py similarity index 100% rename from src/SMESH_SWIG/SMESH_Sphere.py rename to test/SMESH_Sphere.py diff --git a/src/SMESH_SWIG/SMESH_blocks.py b/test/SMESH_blocks.py similarity index 100% rename from src/SMESH_SWIG/SMESH_blocks.py rename to test/SMESH_blocks.py diff --git a/src/SMESH_SWIG/SMESH_box.py b/test/SMESH_box.py similarity index 100% rename from src/SMESH_SWIG/SMESH_box.py rename to test/SMESH_box.py diff --git a/src/SMESH_SWIG/SMESH_box2_tetra.py b/test/SMESH_box2_tetra.py similarity index 100% rename from src/SMESH_SWIG/SMESH_box2_tetra.py rename to test/SMESH_box2_tetra.py diff --git a/src/SMESH_SWIG/SMESH_box3_tetra.py b/test/SMESH_box3_tetra.py similarity index 100% rename from src/SMESH_SWIG/SMESH_box3_tetra.py rename to test/SMESH_box3_tetra.py diff --git a/src/SMESH_SWIG/SMESH_box_tetra.py b/test/SMESH_box_tetra.py similarity index 100% rename from src/SMESH_SWIG/SMESH_box_tetra.py rename to test/SMESH_box_tetra.py diff --git a/src/SMESH_SWIG/SMESH_controls.py b/test/SMESH_controls.py similarity index 100% rename from src/SMESH_SWIG/SMESH_controls.py rename to test/SMESH_controls.py diff --git a/src/SMESH_SWIG/SMESH_demo_hexa2_upd.py b/test/SMESH_demo_hexa2_upd.py similarity index 100% rename from src/SMESH_SWIG/SMESH_demo_hexa2_upd.py rename to test/SMESH_demo_hexa2_upd.py diff --git a/src/SMESH_SWIG/SMESH_fixation.py b/test/SMESH_fixation.py similarity index 100% rename from src/SMESH_SWIG/SMESH_fixation.py rename to test/SMESH_fixation.py diff --git a/src/SMESH_SWIG/SMESH_fixation_hexa.py b/test/SMESH_fixation_hexa.py similarity index 100% rename from src/SMESH_SWIG/SMESH_fixation_hexa.py rename to test/SMESH_fixation_hexa.py diff --git a/src/SMESH_SWIG/SMESH_fixation_netgen.py b/test/SMESH_fixation_netgen.py similarity index 100% rename from src/SMESH_SWIG/SMESH_fixation_netgen.py rename to test/SMESH_fixation_netgen.py diff --git a/src/SMESH_SWIG/SMESH_fixation_tetra.py b/test/SMESH_fixation_tetra.py similarity index 100% rename from src/SMESH_SWIG/SMESH_fixation_tetra.py rename to test/SMESH_fixation_tetra.py diff --git a/src/SMESH_SWIG/SMESH_flight_skin.py b/test/SMESH_flight_skin.py similarity index 98% rename from src/SMESH_SWIG/SMESH_flight_skin.py rename to test/SMESH_flight_skin.py index 1ae510ee7..846741729 100644 --- a/src/SMESH_SWIG/SMESH_flight_skin.py +++ b/test/SMESH_flight_skin.py @@ -48,7 +48,7 @@ filePath = filePath + "/Shapes/Brep/" filename = "flight_solid.brep" filename = filePath + filename -shape = geompy.Import(filename, "BREP") +shape = geompy.ImportBREP(filename) idShape = geompy.addToStudy(shape, "flight") print("Analysis of the geometry flight :") diff --git a/src/SMESH_SWIG/SMESH_freebord.py b/test/SMESH_freebord.py similarity index 100% rename from src/SMESH_SWIG/SMESH_freebord.py rename to test/SMESH_freebord.py diff --git a/src/SMESH_SWIG/SMESH_hexaedre.py b/test/SMESH_hexaedre.py similarity index 100% rename from src/SMESH_SWIG/SMESH_hexaedre.py rename to test/SMESH_hexaedre.py diff --git a/src/SMESH_SWIG/SMESH_mechanic.py b/test/SMESH_mechanic.py similarity index 100% rename from src/SMESH_SWIG/SMESH_mechanic.py rename to test/SMESH_mechanic.py diff --git a/src/SMESH_SWIG/SMESH_mechanic_editor.py b/test/SMESH_mechanic_editor.py similarity index 100% rename from src/SMESH_SWIG/SMESH_mechanic_editor.py rename to test/SMESH_mechanic_editor.py diff --git a/src/SMESH_SWIG/SMESH_mechanic_netgen.py b/test/SMESH_mechanic_netgen.py similarity index 100% rename from src/SMESH_SWIG/SMESH_mechanic_netgen.py rename to test/SMESH_mechanic_netgen.py diff --git a/src/SMESH_SWIG/SMESH_mechanic_tetra.py b/test/SMESH_mechanic_tetra.py similarity index 100% rename from src/SMESH_SWIG/SMESH_mechanic_tetra.py rename to test/SMESH_mechanic_tetra.py diff --git a/src/SMESH_SWIG/SMESH_reg.py b/test/SMESH_reg.py similarity index 100% rename from src/SMESH_SWIG/SMESH_reg.py rename to test/SMESH_reg.py diff --git a/src/SMESH_SWIG/SMESH_test.py b/test/SMESH_test.py similarity index 100% rename from src/SMESH_SWIG/SMESH_test.py rename to test/SMESH_test.py diff --git a/src/SMESH_SWIG/SMESH_test0.py b/test/SMESH_test0.py similarity index 100% rename from src/SMESH_SWIG/SMESH_test0.py rename to test/SMESH_test0.py diff --git a/src/SMESH_SWIG/SMESH_test1.py b/test/SMESH_test1.py similarity index 100% rename from src/SMESH_SWIG/SMESH_test1.py rename to test/SMESH_test1.py diff --git a/src/SMESH_SWIG/SMESH_test1_AndDisplay.py b/test/SMESH_test1_AndDisplay.py similarity index 100% rename from src/SMESH_SWIG/SMESH_test1_AndDisplay.py rename to test/SMESH_test1_AndDisplay.py diff --git a/src/SMESH_SWIG/SMESH_test2.py b/test/SMESH_test2.py similarity index 100% rename from src/SMESH_SWIG/SMESH_test2.py rename to test/SMESH_test2.py diff --git a/src/SMESH_SWIG/SMESH_test3.py b/test/SMESH_test3.py similarity index 100% rename from src/SMESH_SWIG/SMESH_test3.py rename to test/SMESH_test3.py diff --git a/src/SMESH_SWIG/SMESH_test4.py b/test/SMESH_test4.py similarity index 100% rename from src/SMESH_SWIG/SMESH_test4.py rename to test/SMESH_test4.py diff --git a/src/SMESH_SWIG/SMESH_test5.py b/test/SMESH_test5.py similarity index 65% rename from src/SMESH_SWIG/SMESH_test5.py rename to test/SMESH_test5.py index 87acd5964..64c7ba3a4 100644 --- a/src/SMESH_SWIG/SMESH_test5.py +++ b/test/SMESH_test5.py @@ -24,6 +24,7 @@ # File : SMESH_test5.py # Module : SMESH # + import salome salome.salome_init() import GEOM @@ -36,7 +37,10 @@ smesh = smeshBuilder.New() import CORBA import os -import os.path +import shutil +import tempfile + +aOutPath = tempfile.mkdtemp() def SetSObjName(theSObj,theName) : ok, anAttr = theSObj.FindAttribute("AttributeName") @@ -45,40 +49,31 @@ def SetSObjName(theSObj,theName) : #print aName.__dict__ aName.SetValue(theName) -def ConvertMED2UNV(thePath,theFile) : - anInitFileName = thePath + theFile - aMeshes,aResult = smesh.CreateMeshesFromMED(anInitFileName) - print(aResult, aMeshes) +def ConvertMED2UNV(theFile): + print(theFile) + aMeshes, aResult = smesh.CreateMeshesFromMED(theFile) + print(aMeshes, aResult) - for iMesh in range(len(aMeshes)) : - aMesh = aMeshes[iMesh] + for aMesh in aMeshes: print(aMesh.GetName(), end=' ') - aFileName = anInitFileName - aFileName = os.path.basename(aFileName) - aMesh.SetName(aFileName) + aMesh.SetName(os.path.basename(theFile)) print(aMesh.GetName()) - aOutPath = '/tmp/' - aFileName = aOutPath + theFile + "." + str(iMesh) + ".unv" + aFileName = os.path.join(aOutPath, theFile + ".unv") aMesh.ExportUNV(aFileName) + aMesh = smesh.CreateMeshesFromUNV(aFileName) print(aMesh.GetName(), end=' ') - os.remove(aFileName) - aFileName = os.path.basename(aFileName) - aMesh.SetName(aFileName) + aMesh.SetName(os.path.basename(aFileName)) print(aMesh.GetName()) -aPath = os.getenv('DATA_DIR') + '/MedFiles/' -aListDir = os.listdir(aPath) -print(aListDir) +aPath = os.path.join(os.getenv('DATA_DIR'), 'MedFiles') + +for aFileName in sorted(os.listdir(aPath)): + if os.path.splitext(aFileName)[-1] == ".med": + ConvertMED2UNV(os.path.join(aPath, aFileName)) -for iFile in range(len(aListDir)) : - aFileName = aListDir[iFile] - aName,anExt = os.path.splitext(aFileName) - if anExt == ".med" : - aFileName = os.path.basename(aFileName) - print(aFileName) - ConvertMED2UNV(aPath,aFileName) - #break +if os.getenv('SMESH_KEEP_TMP_DIR') != '1': + shutil.rmtree(aOutPath) salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/basic_geom_smesh_without_session.py b/test/basic_geom_smesh_without_session.py similarity index 100% rename from doc/salome/examples/basic_geom_smesh_without_session.py rename to test/basic_geom_smesh_without_session.py diff --git a/doc/salome/examples/basic_shaper_smesh_without_session.py b/test/basic_shaper_smesh_without_session.py similarity index 100% rename from doc/salome/examples/basic_shaper_smesh_without_session.py rename to test/basic_shaper_smesh_without_session.py diff --git a/doc/salome/examples/basic_smesh_output_with_mc_field.py b/test/basic_smesh_output_with_mc_field.py similarity index 100% rename from doc/salome/examples/basic_smesh_output_with_mc_field.py rename to test/basic_smesh_output_with_mc_field.py diff --git a/doc/salome/examples/blocFissure_01_without_session.py b/test/blocFissure_01_without_session.py similarity index 100% rename from doc/salome/examples/blocFissure_01_without_session.py rename to test/blocFissure_01_without_session.py diff --git a/doc/salome/examples/blocFissure_02_without_session.py b/test/blocFissure_02_without_session.py similarity index 100% rename from doc/salome/examples/blocFissure_02_without_session.py rename to test/blocFissure_02_without_session.py diff --git a/doc/salome/examples/blocFissure_03_without_session.py b/test/blocFissure_03_without_session.py similarity index 100% rename from doc/salome/examples/blocFissure_03_without_session.py rename to test/blocFissure_03_without_session.py diff --git a/doc/salome/examples/blocFissure_04_without_session.py b/test/blocFissure_04_without_session.py similarity index 100% rename from doc/salome/examples/blocFissure_04_without_session.py rename to test/blocFissure_04_without_session.py diff --git a/doc/salome/examples/blocFissure_05_without_session.py b/test/blocFissure_05_without_session.py similarity index 100% rename from doc/salome/examples/blocFissure_05_without_session.py rename to test/blocFissure_05_without_session.py diff --git a/doc/salome/examples/blocFissure_06_without_session.py b/test/blocFissure_06_without_session.py similarity index 100% rename from doc/salome/examples/blocFissure_06_without_session.py rename to test/blocFissure_06_without_session.py diff --git a/doc/salome/examples/blocFissure_07_without_session.py b/test/blocFissure_07_without_session.py similarity index 100% rename from doc/salome/examples/blocFissure_07_without_session.py rename to test/blocFissure_07_without_session.py diff --git a/doc/salome/examples/create_penta_biquad.py b/test/create_penta_biquad.py similarity index 100% rename from doc/salome/examples/create_penta_biquad.py rename to test/create_penta_biquad.py diff --git a/doc/salome/examples/Mesh_tri.med b/test/data/Mesh_tri.med similarity index 100% rename from doc/salome/examples/Mesh_tri.med rename to test/data/Mesh_tri.med diff --git a/doc/salome/examples/doublenodes_polyhedra.py b/test/doublenodes_polyhedra.py similarity index 100% rename from doc/salome/examples/doublenodes_polyhedra.py rename to test/doublenodes_polyhedra.py diff --git a/src/SMESH_SWIG/ex00_all.py b/test/ex00_all.py similarity index 100% rename from src/SMESH_SWIG/ex00_all.py rename to test/ex00_all.py diff --git a/src/SMESH_SWIG/ex01_cube2build.py b/test/ex01_cube2build.py similarity index 100% rename from src/SMESH_SWIG/ex01_cube2build.py rename to test/ex01_cube2build.py diff --git a/src/SMESH_SWIG/ex02_cube2primitive.py b/test/ex02_cube2primitive.py similarity index 100% rename from src/SMESH_SWIG/ex02_cube2primitive.py rename to test/ex02_cube2primitive.py diff --git a/src/SMESH_SWIG/ex03_cube2partition.py b/test/ex03_cube2partition.py similarity index 100% rename from src/SMESH_SWIG/ex03_cube2partition.py rename to test/ex03_cube2partition.py diff --git a/src/SMESH_SWIG/ex04_cube5tetraHexa.py b/test/ex04_cube5tetraHexa.py similarity index 100% rename from src/SMESH_SWIG/ex04_cube5tetraHexa.py rename to test/ex04_cube5tetraHexa.py diff --git a/src/SMESH_SWIG/ex05_hole1build.py b/test/ex05_hole1build.py similarity index 100% rename from src/SMESH_SWIG/ex05_hole1build.py rename to test/ex05_hole1build.py diff --git a/src/SMESH_SWIG/ex06_hole1boolean.py b/test/ex06_hole1boolean.py similarity index 100% rename from src/SMESH_SWIG/ex06_hole1boolean.py rename to test/ex06_hole1boolean.py diff --git a/src/SMESH_SWIG/ex07_hole1partition.py b/test/ex07_hole1partition.py similarity index 100% rename from src/SMESH_SWIG/ex07_hole1partition.py rename to test/ex07_hole1partition.py diff --git a/src/SMESH_SWIG/ex08_hole2build.py b/test/ex08_hole2build.py similarity index 100% rename from src/SMESH_SWIG/ex08_hole2build.py rename to test/ex08_hole2build.py diff --git a/src/SMESH_SWIG/ex09_grid4build.py b/test/ex09_grid4build.py similarity index 100% rename from src/SMESH_SWIG/ex09_grid4build.py rename to test/ex09_grid4build.py diff --git a/src/SMESH_SWIG/ex10_grid4geometry.py b/test/ex10_grid4geometry.py similarity index 100% rename from src/SMESH_SWIG/ex10_grid4geometry.py rename to test/ex10_grid4geometry.py diff --git a/src/SMESH_SWIG/ex11_grid3partition.py b/test/ex11_grid3partition.py similarity index 100% rename from src/SMESH_SWIG/ex11_grid3partition.py rename to test/ex11_grid3partition.py diff --git a/src/SMESH_SWIG/ex12_grid17partition.py b/test/ex12_grid17partition.py similarity index 100% rename from src/SMESH_SWIG/ex12_grid17partition.py rename to test/ex12_grid17partition.py diff --git a/src/SMESH_SWIG/ex13_hole1partial.py b/test/ex13_hole1partial.py similarity index 100% rename from src/SMESH_SWIG/ex13_hole1partial.py rename to test/ex13_hole1partial.py diff --git a/src/SMESH_SWIG/ex14_cyl1holed.py b/test/ex14_cyl1holed.py similarity index 100% rename from src/SMESH_SWIG/ex14_cyl1holed.py rename to test/ex14_cyl1holed.py diff --git a/src/SMESH_SWIG/ex15_cyl2geometry.py b/test/ex15_cyl2geometry.py similarity index 100% rename from src/SMESH_SWIG/ex15_cyl2geometry.py rename to test/ex15_cyl2geometry.py diff --git a/src/SMESH_SWIG/ex16_cyl2complementary.py b/test/ex16_cyl2complementary.py similarity index 100% rename from src/SMESH_SWIG/ex16_cyl2complementary.py rename to test/ex16_cyl2complementary.py diff --git a/src/SMESH_SWIG/ex17_dome1.py b/test/ex17_dome1.py similarity index 100% rename from src/SMESH_SWIG/ex17_dome1.py rename to test/ex17_dome1.py diff --git a/src/SMESH_SWIG/ex18_dome2.py b/test/ex18_dome2.py similarity index 100% rename from src/SMESH_SWIG/ex18_dome2.py rename to test/ex18_dome2.py diff --git a/src/SMESH_SWIG/ex19_sphereINcube.py b/test/ex19_sphereINcube.py similarity index 100% rename from src/SMESH_SWIG/ex19_sphereINcube.py rename to test/ex19_sphereINcube.py diff --git a/src/SMESH_SWIG/ex21_lamp.py b/test/ex21_lamp.py similarity index 100% rename from src/SMESH_SWIG/ex21_lamp.py rename to test/ex21_lamp.py diff --git a/src/SMESH_SWIG/ex24_cylinder.py b/test/ex24_cylinder.py similarity index 100% rename from src/SMESH_SWIG/ex24_cylinder.py rename to test/ex24_cylinder.py diff --git a/src/SMESH_SWIG/ex29_refine.py b/test/ex29_refine.py similarity index 96% rename from src/SMESH_SWIG/ex29_refine.py rename to test/ex29_refine.py index 353e68403..662448998 100644 --- a/src/SMESH_SWIG/ex29_refine.py +++ b/test/ex29_refine.py @@ -21,6 +21,11 @@ # ======================================= # Procedure that take a triangulation and split all triangles in 4 others triangles # + +import os +import shutil +import tempfile + import salome salome.salome_init() import GEOM @@ -31,16 +36,14 @@ import SMESH, SALOMEDS from salome.smesh import smeshBuilder smesh = smeshBuilder.New() -import os - # Values # ------ -tmpDir = os.getenv('SALOME_TMP_DIR', '/tmp') +tmpDir = tempfile.mkdtemp() print("Output directory:", tmpDir) # Path for ".med" files -path = os.path.join( tmpDir, "ex29_%s_" % os.getenv('USER','unknown')) +path = os.path.join(tmpDir, "ex29_") # Name of the shape and the mesh name = "Carre" @@ -229,6 +232,12 @@ print(("Mesh with "+str(NbCells4)+" cells computed.")) MyMesh.ExportMED(path+str(NbCells4)+"_triangles.med", 0) +# Remove temporary directory +# -------------------------- + +if os.getenv('SMESH_KEEP_TMP_DIR') != '1': + shutil.rmtree(tmpDir) + # Update the object browser # ------------------------- diff --git a/src/SMESH_SWIG/ex30_groupsOp.py b/test/ex30_groupsOp.py similarity index 100% rename from src/SMESH_SWIG/ex30_groupsOp.py rename to test/ex30_groupsOp.py diff --git a/src/SMESH_SWIG/ex30_tepal.py b/test/ex30_tepal.py similarity index 100% rename from src/SMESH_SWIG/ex30_tepal.py rename to test/ex30_tepal.py diff --git a/src/SMESH_SWIG/ex31_dimGroup.py b/test/ex31_dimGroup.py similarity index 100% rename from src/SMESH_SWIG/ex31_dimGroup.py rename to test/ex31_dimGroup.py diff --git a/doc/salome/examples/ex_MakePolyLine.py b/test/ex_MakePolyLine.py similarity index 62% rename from doc/salome/examples/ex_MakePolyLine.py rename to test/ex_MakePolyLine.py index 20919129f..e73b71fb7 100644 --- a/doc/salome/examples/ex_MakePolyLine.py +++ b/test/ex_MakePolyLine.py @@ -24,11 +24,11 @@ Mesh_1.Compute() segments = [] # between nodes 20 and 1, default plane -segments.append( SMESH.PolySegment( 20, 0, 1, 0, smesh.MakeDirStruct(0,0,0) )) +segments.append( SMESH.PolySegment( 20, 0, SMESH.PointStruct(-1, -1, -1), 1, 0, SMESH.PointStruct(-1, -1, -1), smesh.MakeDirStruct(0,0,0) )) # between nodes 1 and 100, default plane -segments.append( SMESH.PolySegment( 1, 0, 200, 0, smesh.MakeDirStruct(0,0,0) )) +segments.append( SMESH.PolySegment( 1, 0, SMESH.PointStruct(-1, -1, -1), 200, 0, SMESH.PointStruct(-1, -1, -1), smesh.MakeDirStruct(0,0,0) )) # between nodes 200 and edge (578, 577), plane includes vector (1,1,1) -segments.append( SMESH.PolySegment( 200, 0, 578, 577, smesh.MakeDirStruct(1,1,1) )) +segments.append( SMESH.PolySegment( 200, 0, SMESH.PointStruct(-1, -1, -1), 578, 577, SMESH.PointStruct(-1, -1, -1), smesh.MakeDirStruct(1,1,1) )) Mesh_1.MakePolyLine( segments, "1D group") diff --git a/doc/salome/examples/extrusion_penta_biquad.py b/test/extrusion_penta_biquad.py similarity index 100% rename from doc/salome/examples/extrusion_penta_biquad.py rename to test/extrusion_penta_biquad.py diff --git a/doc/salome/examples/shaper_smesh_groups_without_session.py b/test/shaper_smesh_groups_without_session.py similarity index 100% rename from doc/salome/examples/shaper_smesh_groups_without_session.py rename to test/shaper_smesh_groups_without_session.py diff --git a/doc/salome/examples/ssl_hdf5_symbols_conflicts.py b/test/ssl_hdf5_symbols_conflicts.py similarity index 76% rename from doc/salome/examples/ssl_hdf5_symbols_conflicts.py rename to test/ssl_hdf5_symbols_conflicts.py index c88863890..eb6d4611f 100644 --- a/doc/salome/examples/ssl_hdf5_symbols_conflicts.py +++ b/test/ssl_hdf5_symbols_conflicts.py @@ -5,6 +5,9 @@ tuleap26358 : Non regression test pointing to an incompatibiliy between hdf5 sym in hdf5 library. """ +import inspect +import os + import salome salome.standalone() salome.salome_init() @@ -13,7 +16,7 @@ from salome.smesh import smeshBuilder smesh = smeshBuilder.New() -inputMED="Mesh_tri.med" +inputMED = os.path.abspath(os.path.join(os.path.dirname(inspect.getfile(lambda: None)), 'data', 'Mesh_tri.med')) ([Mesh_tri_1], status) = smesh.CreateMeshesFromMED(inputMED) import SMESH diff --git a/doc/salome/examples/testme.py b/test/test_helper.py similarity index 100% rename from doc/salome/examples/testme.py rename to test/test_helper.py diff --git a/doc/salome/examples/test_polyhedron_per_solid.py b/test/test_polyhedron_per_solid.py similarity index 100% rename from doc/salome/examples/test_polyhedron_per_solid.py rename to test/test_polyhedron_per_solid.py diff --git a/doc/salome/examples/test_smeshplugin_mg_tetra_parallele.py b/test/test_smeshplugin_mg_tetra_parallele.py similarity index 100% rename from doc/salome/examples/test_smeshplugin_mg_tetra_parallele.py rename to test/test_smeshplugin_mg_tetra_parallele.py diff --git a/doc/salome/examples/test_smeshplugins.py b/test/test_smeshplugins.py similarity index 100% rename from doc/salome/examples/test_smeshplugins.py rename to test/test_smeshplugins.py diff --git a/test/tests.set b/test/tests.set new file mode 100644 index 000000000..1290a198b --- /dev/null +++ b/test/tests.set @@ -0,0 +1,133 @@ +# Copyright (C) 2015-2021 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# The following tests cannot be executed with 'make test' because they use +# external meshing plug-ins. +# On the other hand these tests can be executed with 'salome test'. +# --------------------------------------------------------------------------- + +SET(BAD_TESTS + blocFissure_01_without_session.py + blocFissure_02_without_session.py + blocFissure_03_without_session.py + blocFissure_04_without_session.py + blocFissure_05_without_session.py + blocFissure_06_without_session.py + blocFissure_07_without_session.py + test_smeshplugins.py + ) +IF(NOT WIN32) + LIST(APPEND BAD_TESTS + test_smeshplugin_mg_tetra_parallele.py + ) +ENDIF(NOT WIN32) + +# The following tests can be executed with both 'make test' and 'salome test'. +# ---------------------------------------------------------------------------- + +SET(GOOD_TESTS + create_penta_biquad.py + ex_MakePolyLine.py + extrusion_penta_biquad.py + test_polyhedron_per_solid.py + + ex01_cube2build.py + ex02_cube2primitive.py + ex03_cube2partition.py + ex04_cube5tetraHexa.py + ex05_hole1build.py + ex06_hole1boolean.py + ex07_hole1partition.py + ex08_hole2build.py + ex09_grid4build.py + ex10_grid4geometry.py + ex11_grid3partition.py + ex12_grid17partition.py + ex13_hole1partial.py + ex14_cyl1holed.py + ex15_cyl2geometry.py + ex16_cyl2complementary.py + ex17_dome1.py + ex18_dome2.py + ex19_sphereINcube.py + ex21_lamp.py + ex24_cylinder.py + ex29_refine.py + ex30_groupsOp.py + ex30_tepal.py + ex31_dimGroup.py + PAL_MESH_041_mesh.py + PAL_MESH_043_2D.py + PAL_MESH_043_3D.py + SMESH_AdvancedEditor.py + SMESH_BelongToGeom.py + SMESH_blocks.py + SMESH_box2_tetra.py + SMESH_box3_tetra.py + SMESH_box.py + SMESH_box_tetra.py + SMESH_BuildCompound.py + SMESH_controls.py + SMESH_demo_hexa2_upd.py + SMESH_fixation_hexa.py + SMESH_fixation_netgen.py + SMESH_fixation.py + SMESH_fixation_tetra.py + SMESH_flight_skin.py + SMESH_freebord.py + SMESH_GroupFromGeom2.py + SMESH_GroupFromGeom.py + SMESH_GroupLyingOnGeom.py + SMESH_hexaedre.py + SMESH_mechanic_editor.py + SMESH_mechanic_netgen.py + SMESH_mechanic.py + SMESH_mechanic_tetra.py + SMESH_Nut.py + SMESH_Partition1_tetra.py + SMESH_reg.py + SMESH_Sphere.py + SMESH_test0.py + SMESH_test1_AndDisplay.py + SMESH_test1.py + SMESH_test2.py + SMESH_test3.py + SMESH_test4.py + SMESH_test5.py + SMESH_test.py + ) + +# The following tests can be executed without driver, just by python. +# ---------------------------------------------------------------------------- + +SET(SESSION_FREE_TESTS + basic_geom_smesh_without_session.py + basic_shaper_smesh_without_session.py + basic_smesh_output_with_mc_field.py + doublenodes_polyhedra.py + shaper_smesh_groups_without_session.py + ssl_hdf5_symbols_conflicts.py + ) + +# Additional files to install (not tests) +# --------------------------------------- + +SET(OTHER_FILES + ex00_all.py + ) -- 2.39.2