From 57b43b4d010e2d0a1529d3c131bbb9d416e63258 Mon Sep 17 00:00:00 2001 From: jfa Date: Sat, 6 May 2006 08:51:48 +0000 Subject: [PATCH] Join modifications from branch OCC_debug_for_3_2_0b1 --- INSTALL | 10 +- Makefile.in | 27 +- adm_local/Makefile.in | 19 + adm_local/unix/make_commence.in | 20 +- bin/VERSION | 2 +- build_configure | 6 +- doc/Makefile.in | 19 + doc/salome/Makefile.in | 19 + doc/salome/gui/SMESH/about_viewing_meshes.htm | 134 +- .../adding_quadratic_nodes_and_elements.htm | 119 + doc/salome/gui/SMESH/aspect_ratio_3d.htm | 109 +- .../gui/SMESH/borders_at_multi-connection.htm | 15 +- .../SMESH/borders_at_multiconnection_2d.htm | 2 +- doc/salome/gui/SMESH/clipping.htm | 30 +- doc/salome/gui/SMESH/constructing_meshes.htm | 2 +- .../gui/SMESH/defining_hypotheses_tui.htm | 441 ++- doc/salome/gui/SMESH/display_entity.htm | 21 +- .../gui/SMESH/extrusion_along_a_path.htm | 5 +- .../gui/SMESH/files/about_hypotheses.htm | 45 +- .../SMESH/files/about_quality_controls.htm | 2 + .../SMESH/files/adding_nodes_and_elements.htm | 35 +- .../gui/SMESH/files/area_of_elements.htm | 4 +- doc/salome/gui/SMESH/files/arithmetic_1d.htm | 177 +- doc/salome/gui/SMESH/files/aspect_ratio.htm | 123 +- .../changing_orientation_of_elements.htm | 8 +- .../gui/SMESH/files/constructing_meshes.htm | 16 +- .../SMESH/files/constructing_submeshes.htm | 18 +- .../gui/SMESH/files/creating_groups.htm | 45 +- .../gui/SMESH/files/cutting_quadrangles.htm | 85 +- doc/salome/gui/SMESH/files/editing_groups.htm | 8 +- .../files/importing_and_exporting_meshes.htm | 8 +- .../gui/SMESH/files/introduction_to_smesh.htm | 125 +- .../gui/SMESH/files/length_of_edges.htm | 2 +- .../files/max._element_area_hypothesis.htm | 87 +- .../files/max._element_volume_hypothsis.htm | 13 +- doc/salome/gui/SMESH/files/merging_nodes.htm | 6 +- .../non_conform_mesh_allowed_hypothesis.htm | 33 +- .../reassigning_hypotheses_and_algorithms.htm | 33 +- .../files/removing_nodes_and_elements.htm | 142 +- .../files/renumbering_nodes_and_elements.htm | 69 +- doc/salome/gui/SMESH/files/skew.htm | 42 +- doc/salome/gui/SMESH/files/smoothing.htm | 19 +- doc/salome/gui/SMESH/files/taper.htm | 4 +- .../files/uniting_a_set_of_triangles.htm | 16 +- .../gui/SMESH/files/viewing_mesh_info.htm | 81 +- doc/salome/gui/SMESH/files/vtk_3d_viewer.htm | 224 ++ doc/salome/gui/SMESH/free_borders.htm | 13 +- doc/salome/gui/SMESH/free_edges.htm | 2 +- doc/salome/gui/SMESH/grouping_elements.htm | 154 +- doc/salome/gui/SMESH/image129.gif | Bin 10074 -> 0 bytes doc/salome/gui/SMESH/image142.gif | Bin 0 -> 1631 bytes doc/salome/gui/SMESH/image143.gif | Bin 0 -> 3947 bytes doc/salome/gui/SMESH/image144.gif | Bin 0 -> 1010 bytes doc/salome/gui/SMESH/image145.gif | Bin 0 -> 1046 bytes doc/salome/gui/SMESH/image146.gif | Bin 0 -> 3036 bytes doc/salome/gui/SMESH/image147.gif | Bin 0 -> 3292 bytes doc/salome/gui/SMESH/image148.gif | Bin 0 -> 5739 bytes doc/salome/gui/SMESH/image15.jpg | Bin 0 -> 69893 bytes doc/salome/gui/SMESH/image151.gif | Bin 0 -> 5160 bytes doc/salome/gui/SMESH/image152.gif | Bin 0 -> 3127 bytes doc/salome/gui/SMESH/image19.jpg | Bin 54361 -> 0 bytes doc/salome/gui/SMESH/image22.gif | Bin 1287 -> 0 bytes doc/salome/gui/SMESH/image26.jpg | Bin 6922 -> 0 bytes doc/salome/gui/SMESH/image73.gif | Bin 2977 -> 0 bytes doc/salome/gui/SMESH/length.htm | 15 +- doc/salome/gui/SMESH/merge_elements.htm | 96 + doc/salome/gui/SMESH/modifying_meshes.htm | 908 +++++-- doc/salome/gui/SMESH/pattern_mapping.htm | 26 +- doc/salome/gui/SMESH/pics/a-advmeshinfo.png | Bin 16686 -> 0 bytes doc/salome/gui/SMESH/pics/a-createmesh1.png | Bin 16311 -> 0 bytes doc/salome/gui/SMESH/pics/a-editmesh.png | Bin 18398 -> 0 bytes doc/salome/gui/SMESH/pics/a-exportmesh.png | Bin 17304 -> 0 bytes doc/salome/gui/SMESH/pics/a-nbsegments3.png | Bin 19652 -> 0 bytes doc/salome/gui/SMESH/pics/a-nbsegments4.png | Bin 16263 -> 0 bytes .../gui/SMESH/pics/advanced_mesh_infos.png | Bin 0 -> 23883 bytes doc/salome/gui/SMESH/pics/aqt.png | Bin 0 -> 15347 bytes doc/salome/gui/SMESH/pics/automaticlength.png | Bin 0 -> 10040 bytes doc/salome/gui/SMESH/pics/b-create_group.png | Bin 28719 -> 0 bytes .../pics/borders_at_multi_connections1.png | Bin 6603 -> 0 bytes doc/salome/gui/SMESH/pics/c-createmesh.png | Bin 17917 -> 0 bytes doc/salome/gui/SMESH/pics/c-editmesh.png | Bin 17581 -> 0 bytes doc/salome/gui/SMESH/pics/creategroup.png | Bin 19382 -> 22502 bytes doc/salome/gui/SMESH/pics/createmesh-inv.png | Bin 0 -> 19734 bytes doc/salome/gui/SMESH/pics/createmesh-inv2.png | Bin 0 -> 20798 bytes doc/salome/gui/SMESH/pics/createmesh-inv3.png | Bin 0 -> 19436 bytes .../pics/distributionwithanalyticdensity.png | Bin 0 -> 27728 bytes .../pics/distributionwithtabledensity.png | Bin 0 -> 30802 bytes doc/salome/gui/SMESH/pics/editgroup.png | Bin 19969 -> 29322 bytes doc/salome/gui/SMESH/pics/graduatedaxes1.png | Bin 0 -> 18919 bytes doc/salome/gui/SMESH/pics/image100.gif | Bin 0 -> 1040 bytes doc/salome/gui/SMESH/pics/image102.gif | Bin 0 -> 2409 bytes doc/salome/gui/SMESH/pics/image107.gif | Bin 0 -> 2435 bytes doc/salome/gui/SMESH/pics/image108.gif | Bin 0 -> 1046 bytes doc/salome/gui/SMESH/pics/image109.gif | Bin 0 -> 1009 bytes doc/salome/gui/SMESH/{ => pics}/image138.gif | Bin doc/salome/gui/SMESH/{ => pics}/image139.gif | Bin doc/salome/gui/SMESH/{ => pics}/image21.gif | Bin doc/salome/gui/SMESH/{ => pics}/image23.gif | Bin doc/salome/gui/SMESH/{ => pics}/image27.gif | Bin doc/salome/gui/SMESH/pics/image77.gif | Bin 0 -> 1022 bytes doc/salome/gui/SMESH/pics/image78.gif | Bin 0 -> 1000 bytes doc/salome/gui/SMESH/pics/image89.gif | Bin 0 -> 1020 bytes doc/salome/gui/SMESH/pics/image91.gif | Bin 0 -> 1010 bytes doc/salome/gui/SMESH/pics/image96.gif | Bin 0 -> 1055 bytes doc/salome/gui/SMESH/pics/image97.gif | Bin 0 -> 1065 bytes doc/salome/gui/SMESH/pics/image98.gif | Bin 0 -> 1047 bytes doc/salome/gui/SMESH/pics/image99.gif | Bin 0 -> 1035 bytes doc/salome/gui/SMESH/pics/importmesh.png | Bin 16731 -> 0 bytes doc/salome/gui/SMESH/pics/length-crit.png | Bin 0 -> 3113 bytes doc/salome/gui/SMESH/pics/length1.png | Bin 7001 -> 0 bytes doc/salome/gui/SMESH/pics/mergeelems.png | Bin 0 -> 8680 bytes doc/salome/gui/SMESH/pics/meshexportmesh.png | Bin 0 -> 21288 bytes doc/salome/gui/SMESH/pics/meshimportmesh.png | Bin 0 -> 19532 bytes .../gui/SMESH/pics/meshtrianglemergeelem1.png | Bin 0 -> 2921 bytes .../gui/SMESH/pics/submeshconstruction.png | Bin 15135 -> 0 bytes doc/salome/gui/SMESH/presentation.htm | 42 +- doc/salome/gui/SMESH/quality_controls.htm | 135 +- doc/salome/gui/SMESH/revolution.htm | 17 +- doc/salome/gui/SMESH/smesh.log | 65 +- doc/salome/gui/SMESH/transforming_meshes.htm | 199 +- doc/salome/gui/SMESH/transparency.htm | 5 +- doc/salome/gui/SMESH/volume.htm | 118 + doc/salome/gui/SMESH/whdata/whftdata0.htm | 4 + doc/salome/gui/SMESH/whdata/whfts.htm | 4 +- doc/salome/gui/SMESH/whdata/whfwdata0.htm | 2419 +++++++++-------- doc/salome/gui/SMESH/whdata/whtdata0.htm | 18 +- doc/salome/gui/SMESH/whgdata/whlstf0.htm | 4 +- doc/salome/gui/SMESH/whgdata/whlstf1.htm | 6 +- doc/salome/gui/SMESH/whgdata/whlstf10.htm | 4 +- doc/salome/gui/SMESH/whgdata/whlstf11.htm | 12 +- doc/salome/gui/SMESH/whgdata/whlstf12.htm | 9 +- doc/salome/gui/SMESH/whgdata/whlstf13.htm | 46 + doc/salome/gui/SMESH/whgdata/whlstf2.htm | 4 +- doc/salome/gui/SMESH/whgdata/whlstf3.htm | 6 +- doc/salome/gui/SMESH/whgdata/whlstf4.htm | 8 +- doc/salome/gui/SMESH/whgdata/whlstf5.htm | 10 +- doc/salome/gui/SMESH/whgdata/whlstf6.htm | 10 +- doc/salome/gui/SMESH/whgdata/whlstf7.htm | 6 +- doc/salome/gui/SMESH/whgdata/whlstf8.htm | 6 +- doc/salome/gui/SMESH/whgdata/whlstf9.htm | 6 +- doc/salome/gui/SMESH/whgdata/whlstfl0.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl1.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl10.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl11.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl12.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl13.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl14.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl15.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl16.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl17.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl18.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl19.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl2.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl20.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl21.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl22.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl23.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl24.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl25.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl3.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl4.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl5.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl6.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl7.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl8.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl9.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstt3.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstt4.htm | 3 +- doc/salome/gui/SMESH/whgdata/whlstt5.htm | 1 + doc/salome/gui/SMESH/whgdata/whlstt7.htm | 1 + doc/salome/gui/SMESH/whgdata/whlstt8.htm | 2 + doc/salome/gui/SMESH/whgdata/whnvl32.htm | 2 +- doc/salome/gui/SMESH/whskin_info.htm | 2 +- doc/salome/gui/SMESH/whxdata/whftdata0.xml | 4 + doc/salome/gui/SMESH/whxdata/whfts.xml | 4 +- doc/salome/gui/SMESH/whxdata/whfwdata0.xml | 2419 +++++++++-------- doc/salome/gui/SMESH/whxdata/whtdata0.xml | 8 +- doc/salome/tui/Makefile.in | 49 +- doc/salome/tui/SMESH/doxyfile | 123 +- doc/salome/tui/SMESH/doxyfile_py | 126 +- doc/salome/tui/SMESH/sources/footer.html | 5 + doc/salome/tui/SMESH/sources/myheader.html | 12 - .../tui/SMESH/sources/static/doxygen.css | 153 +- doc/salome/tui/SMESH/sources/static/tree.js | 2 +- idl/Makefile.in | 19 + idl/SMESH_Filter.idl | 8 +- idl/SMESH_Gen.idl | 6 + idl/SMESH_Mesh.idl | 180 +- idl/SMESH_Pattern.idl | 1 + resources/SMESHCatalog.xml | 2 +- resources/SalomeApp.xml | 47 + resources/StdMeshers.xml | 14 +- resources/mesh_conv_to_quad.png | Bin 0 -> 226 bytes resources/mesh_tree_algo_netgen_2d.png | Bin 0 -> 225 bytes resources/mesh_tree_algo_netgen_2d3d.png | Bin 0 -> 278 bytes resources/mesh_tree_hypo_netgen.png | Bin 0 -> 278 bytes resources/mesh_tree_hypo_netgen_2d.png | Bin 0 -> 225 bytes src/Controls/SMESH_Controls.cxx | 98 +- src/Controls/SMESH_ControlsDef.hxx | 1 + src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx | 2 + src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx | 198 +- src/DriverUNV/DriverUNV_R_SMDS_Mesh.h | 20 + src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx | 102 +- src/DriverUNV/DriverUNV_W_SMDS_Mesh.h | 10 + src/DriverUNV/Makefile.in | 2 +- src/DriverUNV/UNV2412_Structure.cxx | 7 +- src/DriverUNV/UNV2417_Structure.cxx | 184 ++ src/DriverUNV/UNV2417_Structure.hxx | 49 + src/MEFISTO2/Makefile.in | 19 + src/MEFISTO2/aptrte.cxx | 66 +- src/MEFISTO2/trte.f | 224 +- src/NETGEN/Makefile.in | 19 + src/NETGENPlugin/NETGENPlugin_icons.po | 19 + src/OBJECT/Makefile.in | 2 + src/OBJECT/SMESH_Actor.cxx | 98 +- src/OBJECT/SMESH_Actor.h | 38 +- src/OBJECT/SMESH_ActorDef.h | 51 +- src/OBJECT/SMESH_ActorUtils.cxx | 44 +- src/OBJECT/SMESH_ActorUtils.h | 42 +- src/OBJECT/SMESH_DeviceActor.cxx | 162 +- src/OBJECT/SMESH_DeviceActor.h | 20 +- src/OBJECT/SMESH_ExtractGeometry.cxx | 22 +- src/OBJECT/SMESH_ExtractGeometry.h | 4 +- src/OBJECT/SMESH_Object.cxx | 4 +- src/SMDS/SMDS_Mesh.cxx | 291 +- src/SMDS/SMDS_MeshElement.cxx | 17 + src/SMDS/SMDS_MeshElement.hxx | 7 + src/SMDS/SMDS_MeshGroup.hxx | 13 + src/SMESH/Makefile.in | 8 +- src/SMESH/SMESH_Mesh.cxx | 176 +- src/SMESH/SMESH_Mesh.hxx | 27 +- src/SMESH/SMESH_MeshEditor.cxx | 1129 ++++++-- src/SMESH/SMESH_MeshEditor.hxx | 75 +- src/SMESH/SMESH_MesherHelper.cxx | 698 +++++ .../SMESH_MesherHelper.hxx} | 116 +- src/SMESH/SMESH_Pattern.cxx | 172 +- src/SMESH/SMESH_Pattern.hxx | 1 + src/SMESH/SMESH_subMesh.cxx | 70 +- src/SMESHClient/SMESH_Client.cxx | 267 +- src/SMESHDS/SMESHDS_Group.cxx | 3 +- src/SMESHDS/SMESHDS_Mesh.cxx | 19 +- src/SMESHDS/SMESHDS_Script.cxx | 4 + src/SMESHFiltersSelection/Makefile.in | 4 +- src/SMESHGUI/Makefile.in | 14 +- src/SMESHGUI/SMESHGUI.cxx | 174 +- src/SMESHGUI/SMESHGUI.h | 4 + src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx | 63 +- src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h | 4 + .../SMESHGUI_AddQuadraticElementDlg.cxx | 83 +- .../SMESHGUI_AddQuadraticElementDlg.h | 25 +- src/SMESHGUI/SMESHGUI_ClippingDlg.cxx | 87 +- src/SMESHGUI/SMESHGUI_ClippingDlg.h | 3 + src/SMESHGUI/SMESHGUI_ConvToQuadDlg.cxx | 130 + src/SMESHGUI/SMESHGUI_ConvToQuadDlg.h | 81 + src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx | 286 ++ src/SMESHGUI/SMESHGUI_ConvToQuadOp.h | 70 + src/SMESHGUI/SMESHGUI_CreateHypothesesDlg.cxx | 296 -- src/SMESHGUI/SMESHGUI_CreateHypothesesDlg.h | 94 - src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx | 26 + src/SMESHGUI/SMESHGUI_CreatePatternDlg.h | 4 + .../SMESHGUI_CreatePolyhedralVolumeDlg.cxx | 32 +- .../SMESHGUI_CreatePolyhedralVolumeDlg.h | 4 + src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx | 25 + src/SMESHGUI/SMESHGUI_DeleteGroupDlg.h | 4 + src/SMESHGUI/SMESHGUI_Dialog.h | 2 +- src/SMESHGUI/SMESHGUI_EditHypothesesDlg.cxx | 960 ------- src/SMESHGUI/SMESHGUI_EditHypothesesDlg.h | 151 - src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx | 27 + src/SMESHGUI/SMESHGUI_EditMeshDlg.h | 4 + .../SMESHGUI_ExtrusionAlongPathDlg.cxx | 27 + src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.h | 4 + src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx | 71 +- src/SMESHGUI/SMESHGUI_ExtrusionDlg.h | 5 + src/SMESHGUI/SMESHGUI_Filter.cxx | 12 +- src/SMESHGUI/SMESHGUI_FilterDlg.cxx | 25 +- src/SMESHGUI/SMESHGUI_FilterDlg.h | 5 +- src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx | 26 +- src/SMESHGUI/SMESHGUI_FilterLibraryDlg.h | 4 +- src/SMESHGUI/SMESHGUI_GroupDlg.cxx | 102 +- src/SMESHGUI/SMESHGUI_GroupDlg.h | 6 +- src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx | 39 +- src/SMESHGUI/SMESHGUI_GroupOpDlg.h | 4 + src/SMESHGUI/SMESHGUI_Hypotheses.cxx | 66 +- src/SMESHGUI/SMESHGUI_Hypotheses.h | 39 +- src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx | 43 +- src/SMESHGUI/SMESHGUI_HypothesesUtils.h | 7 + src/SMESHGUI/SMESHGUI_MergeNodesDlg.cxx | 28 + src/SMESHGUI/SMESHGUI_MergeNodesDlg.h | 4 + src/SMESHGUI/SMESHGUI_MeshDlg.cxx | 44 +- src/SMESHGUI/SMESHGUI_MeshDlg.h | 6 +- src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx | 130 +- src/SMESHGUI/SMESHGUI_MeshInfosDlg.h | 26 +- src/SMESHGUI/SMESHGUI_MeshOp.cxx | 691 +++-- src/SMESHGUI/SMESHGUI_MeshOp.h | 55 +- src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx | 30 +- src/SMESHGUI/SMESHGUI_MeshPatternDlg.h | 4 + src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx | 29 +- src/SMESHGUI/SMESHGUI_MoveNodesDlg.h | 4 + src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx | 32 +- src/SMESHGUI/SMESHGUI_MultiEditDlg.h | 4 + src/SMESHGUI/SMESHGUI_NodesDlg.cxx | 33 +- src/SMESHGUI/SMESHGUI_NodesDlg.h | 4 + src/SMESHGUI/SMESHGUI_Operation.cxx | 28 +- src/SMESHGUI/SMESHGUI_Operation.h | 3 + src/SMESHGUI/SMESHGUI_PrecisionDlg.cxx | 202 -- src/SMESHGUI/SMESHGUI_PrecisionDlg.h | 97 - .../SMESHGUI_Preferences_ScalarBarDlg.cxx | 18 +- src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx | 27 + src/SMESHGUI/SMESHGUI_RemoveElementsDlg.h | 4 + src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx | 28 + src/SMESHGUI/SMESHGUI_RemoveNodesDlg.h | 4 + src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx | 33 +- src/SMESHGUI/SMESHGUI_RenumberingDlg.h | 4 + src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx | 28 + src/SMESHGUI/SMESHGUI_RevolutionDlg.h | 4 + src/SMESHGUI/SMESHGUI_RotationDlg.cxx | 27 + src/SMESHGUI/SMESHGUI_RotationDlg.h | 4 + src/SMESHGUI/SMESHGUI_Selection.cxx | 2 +- src/SMESHGUI/SMESHGUI_SelectionOp.cxx | 44 +- src/SMESHGUI/SMESHGUI_SelectionOp.h | 2 +- src/SMESHGUI/SMESHGUI_SewingDlg.cxx | 27 + src/SMESHGUI/SMESHGUI_SewingDlg.h | 4 + src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx | 299 +- src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.h | 100 +- src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx | 24 + src/SMESHGUI/SMESHGUI_SingleEditDlg.h | 4 + src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx | 27 + src/SMESHGUI/SMESHGUI_SmoothingDlg.h | 4 + .../SMESHGUI_StandardMeshInfosDlg.cxx | 30 +- src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.h | 4 + src/SMESHGUI/SMESHGUI_Swig.cxx | 838 +++--- src/SMESHGUI/SMESHGUI_Swig.hxx | 16 - src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx | 28 + src/SMESHGUI/SMESHGUI_SymmetryDlg.h | 4 + src/SMESHGUI/SMESHGUI_TranslationDlg.cxx | 30 +- src/SMESHGUI/SMESHGUI_TranslationDlg.h | 4 + src/SMESHGUI/SMESHGUI_TransparencyDlg.cxx | 35 +- src/SMESHGUI/SMESHGUI_TransparencyDlg.h | 4 + src/SMESHGUI/SMESHGUI_XmlHandler.cxx | 17 +- src/SMESHGUI/SMESHGUI_XmlHandler.h | 1 + src/SMESHGUI/SMESH_icons.po | 19 + src/SMESHGUI/SMESH_images.po | 22 + src/SMESHGUI/SMESH_msg_en.po | 54 +- src/SMESH_I/SMESH_2smeshpy.cxx | 219 +- src/SMESH_I/SMESH_2smeshpy.hxx | 55 +- src/SMESH_I/SMESH_DumpPython.cxx | 212 +- src/SMESH_I/SMESH_Filter_i.cxx | 27 +- src/SMESH_I/SMESH_Gen_i.cxx | 52 +- src/SMESH_I/SMESH_Gen_i.hxx | 4 + src/SMESH_I/SMESH_Gen_i_1.cxx | 33 +- src/SMESH_I/SMESH_Hypothesis_i.hxx | 4 +- src/SMESH_I/SMESH_MEDFamily_i.hxx | 2 +- src/SMESH_I/SMESH_MEDMesh_i.cxx | 2 +- src/SMESH_I/SMESH_MEDMesh_i.hxx | 387 +-- src/SMESH_I/SMESH_MeshEditor_i.cxx | 773 ++++-- src/SMESH_I/SMESH_MeshEditor_i.hxx | 67 +- src/SMESH_I/SMESH_Mesh_i.cxx | 577 +++- src/SMESH_I/SMESH_Mesh_i.hxx | 125 + src/SMESH_I/SMESH_Pattern_i.cxx | 16 +- src/SMESH_I/SMESH_PythonDump.hxx | 29 + src/SMESH_SWIG/Makefile.in | 2 + src/SMESH_SWIG/PAL_MESH_041_mesh.py | 19 + src/SMESH_SWIG/SMESH_BelongToGeom.py | 19 + src/SMESH_SWIG/SMESH_GroupFromGeom2.py | 19 + src/SMESH_SWIG/SMESH_GroupLyingOnGeom.py | 19 + src/SMESH_SWIG/SMESH_Nut.py | 19 + src/SMESH_SWIG/SMESH_Partition1_tetra.py | 19 + src/SMESH_SWIG/SMESH_box.py | 19 + src/SMESH_SWIG/SMESH_box2_tetra.py | 19 + src/SMESH_SWIG/SMESH_box3_tetra.py | 19 + src/SMESH_SWIG/SMESH_box_tetra.py | 19 + src/SMESH_SWIG/SMESH_demo_hexa2_upd.py | 19 + src/SMESH_SWIG/SMESH_fixation_hexa.py | 19 + src/SMESH_SWIG/SMESH_fixation_netgen.py | 75 + src/SMESH_SWIG/SMESH_fixation_tetra.py | 19 + src/SMESH_SWIG/SMESH_flight_skin.py | 19 + src/SMESH_SWIG/SMESH_freebord.py | 19 + src/SMESH_SWIG/SMESH_hexaedre.py | 19 + src/SMESH_SWIG/SMESH_mechanic_netgen.py | 136 + src/SMESH_SWIG/SMESH_shared_modules.py | 19 + src/SMESH_SWIG/SMESH_test0.py | 1 - src/SMESH_SWIG/SMESH_test4.py | 19 + src/SMESH_SWIG/batchmode_mefisto.py | 19 + src/SMESH_SWIG/ex00_all.py | 19 + src/SMESH_SWIG/ex01_cube2build.py | 19 + src/SMESH_SWIG/ex02_cube2primitive.py | 19 + src/SMESH_SWIG/ex03_cube2partition.py | 19 + src/SMESH_SWIG/ex04_cube5tetraHexa.py | 19 + src/SMESH_SWIG/ex05_hole1build.py | 19 + src/SMESH_SWIG/ex06_hole1boolean.py | 19 + src/SMESH_SWIG/ex07_hole1partition.py | 19 + src/SMESH_SWIG/ex08_hole2build.py | 19 + src/SMESH_SWIG/ex09_grid4build.py | 19 + src/SMESH_SWIG/ex10_grid4geometry.py | 19 + src/SMESH_SWIG/ex11_grid3partition.py | 19 + src/SMESH_SWIG/ex12_grid17partition.py | 19 + src/SMESH_SWIG/ex13_hole1partial.py | 19 + src/SMESH_SWIG/ex14_cyl1holed.py | 19 + src/SMESH_SWIG/ex15_cyl2geometry.py | 19 + src/SMESH_SWIG/ex16_cyl2complementary.py | 19 + src/SMESH_SWIG/ex17_dome1.py | 19 + src/SMESH_SWIG/ex18_dome2.py | 19 + src/SMESH_SWIG/ex19_sphereINcube.py | 19 + src/SMESH_SWIG/smesh.py | 47 + src/StdMeshers/Makefile.in | 2 - src/StdMeshers/StdMeshers_AutomaticLength.cxx | 5 +- src/StdMeshers/StdMeshers_Helper.cxx | 437 --- src/StdMeshers/StdMeshers_Hexa_3D.cxx | 2 +- src/StdMeshers/StdMeshers_Hexa_3D.hxx | 2 +- src/StdMeshers/StdMeshers_MEFISTO_2D.cxx | 9 +- src/StdMeshers/StdMeshers_MEFISTO_2D.hxx | 4 +- src/StdMeshers/StdMeshers_Penta_3D.cxx | 8 +- src/StdMeshers/StdMeshers_Penta_3D.hxx | 4 +- src/StdMeshers/StdMeshers_Quadrangle_2D.cxx | 2 +- src/StdMeshers/StdMeshers_Quadrangle_2D.hxx | 4 +- src/StdMeshers/StdMeshers_Regular_1D.cxx | 15 +- src/StdMeshersGUI/Makefile.in | 6 +- .../StdMeshersGUI_DistrPreview.cxx | 19 + .../StdMeshersGUI_DistrPreview.h | 19 + .../StdMeshersGUI_NbSegmentsCreator.cxx | 20 + .../StdMeshersGUI_NbSegmentsCreator.h | 19 + .../StdMeshersGUI_StdHypothesisCreator.cxx | 4 + .../StdMeshersGUI_StdHypothesisCreator.h | 3 +- src/StdMeshersGUI/StdMeshers_images.po | 19 + src/StdMeshersGUI/StdMeshers_msg_en.po | 19 + .../StdMeshers_NumberOfSegments_i.cxx | 11 +- src/StdMeshers_I/StdMeshers_i.cxx | 40 +- 427 files changed, 16624 insertions(+), 8749 deletions(-) create mode 100755 doc/salome/gui/SMESH/adding_quadratic_nodes_and_elements.htm create mode 100755 doc/salome/gui/SMESH/files/vtk_3d_viewer.htm delete mode 100755 doc/salome/gui/SMESH/image129.gif create mode 100755 doc/salome/gui/SMESH/image142.gif create mode 100755 doc/salome/gui/SMESH/image143.gif create mode 100755 doc/salome/gui/SMESH/image144.gif create mode 100755 doc/salome/gui/SMESH/image145.gif create mode 100755 doc/salome/gui/SMESH/image146.gif create mode 100755 doc/salome/gui/SMESH/image147.gif create mode 100755 doc/salome/gui/SMESH/image148.gif create mode 100755 doc/salome/gui/SMESH/image15.jpg create mode 100755 doc/salome/gui/SMESH/image151.gif create mode 100755 doc/salome/gui/SMESH/image152.gif delete mode 100755 doc/salome/gui/SMESH/image19.jpg delete mode 100755 doc/salome/gui/SMESH/image22.gif delete mode 100755 doc/salome/gui/SMESH/image26.jpg delete mode 100755 doc/salome/gui/SMESH/image73.gif create mode 100755 doc/salome/gui/SMESH/merge_elements.htm delete mode 100755 doc/salome/gui/SMESH/pics/a-advmeshinfo.png delete mode 100755 doc/salome/gui/SMESH/pics/a-createmesh1.png delete mode 100755 doc/salome/gui/SMESH/pics/a-editmesh.png delete mode 100755 doc/salome/gui/SMESH/pics/a-exportmesh.png delete mode 100755 doc/salome/gui/SMESH/pics/a-nbsegments3.png delete mode 100755 doc/salome/gui/SMESH/pics/a-nbsegments4.png create mode 100755 doc/salome/gui/SMESH/pics/advanced_mesh_infos.png create mode 100755 doc/salome/gui/SMESH/pics/aqt.png create mode 100755 doc/salome/gui/SMESH/pics/automaticlength.png delete mode 100755 doc/salome/gui/SMESH/pics/b-create_group.png delete mode 100755 doc/salome/gui/SMESH/pics/borders_at_multi_connections1.png delete mode 100755 doc/salome/gui/SMESH/pics/c-createmesh.png delete mode 100755 doc/salome/gui/SMESH/pics/c-editmesh.png create mode 100755 doc/salome/gui/SMESH/pics/createmesh-inv.png create mode 100755 doc/salome/gui/SMESH/pics/createmesh-inv2.png create mode 100755 doc/salome/gui/SMESH/pics/createmesh-inv3.png create mode 100755 doc/salome/gui/SMESH/pics/distributionwithanalyticdensity.png create mode 100755 doc/salome/gui/SMESH/pics/distributionwithtabledensity.png create mode 100755 doc/salome/gui/SMESH/pics/graduatedaxes1.png create mode 100755 doc/salome/gui/SMESH/pics/image100.gif create mode 100755 doc/salome/gui/SMESH/pics/image102.gif create mode 100755 doc/salome/gui/SMESH/pics/image107.gif create mode 100755 doc/salome/gui/SMESH/pics/image108.gif create mode 100755 doc/salome/gui/SMESH/pics/image109.gif rename doc/salome/gui/SMESH/{ => pics}/image138.gif (100%) mode change 100644 => 100755 rename doc/salome/gui/SMESH/{ => pics}/image139.gif (100%) mode change 100644 => 100755 rename doc/salome/gui/SMESH/{ => pics}/image21.gif (100%) rename doc/salome/gui/SMESH/{ => pics}/image23.gif (100%) rename doc/salome/gui/SMESH/{ => pics}/image27.gif (100%) create mode 100755 doc/salome/gui/SMESH/pics/image77.gif create mode 100755 doc/salome/gui/SMESH/pics/image78.gif create mode 100755 doc/salome/gui/SMESH/pics/image89.gif create mode 100755 doc/salome/gui/SMESH/pics/image91.gif create mode 100755 doc/salome/gui/SMESH/pics/image96.gif create mode 100755 doc/salome/gui/SMESH/pics/image97.gif create mode 100755 doc/salome/gui/SMESH/pics/image98.gif create mode 100755 doc/salome/gui/SMESH/pics/image99.gif delete mode 100755 doc/salome/gui/SMESH/pics/importmesh.png create mode 100755 doc/salome/gui/SMESH/pics/length-crit.png delete mode 100755 doc/salome/gui/SMESH/pics/length1.png create mode 100755 doc/salome/gui/SMESH/pics/mergeelems.png create mode 100755 doc/salome/gui/SMESH/pics/meshexportmesh.png create mode 100755 doc/salome/gui/SMESH/pics/meshimportmesh.png create mode 100755 doc/salome/gui/SMESH/pics/meshtrianglemergeelem1.png delete mode 100755 doc/salome/gui/SMESH/pics/submeshconstruction.png create mode 100755 doc/salome/gui/SMESH/volume.htm create mode 100755 doc/salome/gui/SMESH/whgdata/whlstf13.htm create mode 100755 doc/salome/tui/SMESH/sources/footer.html create mode 100644 resources/SalomeApp.xml create mode 100755 resources/mesh_conv_to_quad.png create mode 100755 resources/mesh_tree_algo_netgen_2d.png create mode 100644 resources/mesh_tree_algo_netgen_2d3d.png create mode 100644 resources/mesh_tree_hypo_netgen.png create mode 100644 resources/mesh_tree_hypo_netgen_2d.png create mode 100644 src/DriverUNV/UNV2417_Structure.cxx create mode 100644 src/DriverUNV/UNV2417_Structure.hxx create mode 100644 src/SMESH/SMESH_MesherHelper.cxx rename src/{StdMeshers/StdMeshers_Helper.hxx => SMESH/SMESH_MesherHelper.hxx} (54%) create mode 100644 src/SMESHGUI/SMESHGUI_ConvToQuadDlg.cxx create mode 100644 src/SMESHGUI/SMESHGUI_ConvToQuadDlg.h create mode 100644 src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx create mode 100644 src/SMESHGUI/SMESHGUI_ConvToQuadOp.h delete mode 100644 src/SMESHGUI/SMESHGUI_CreateHypothesesDlg.cxx delete mode 100644 src/SMESHGUI/SMESHGUI_CreateHypothesesDlg.h delete mode 100644 src/SMESHGUI/SMESHGUI_EditHypothesesDlg.cxx delete mode 100644 src/SMESHGUI/SMESHGUI_EditHypothesesDlg.h delete mode 100755 src/SMESHGUI/SMESHGUI_PrecisionDlg.cxx delete mode 100755 src/SMESHGUI/SMESHGUI_PrecisionDlg.h create mode 100644 src/SMESH_SWIG/SMESH_fixation_netgen.py create mode 100644 src/SMESH_SWIG/SMESH_mechanic_netgen.py delete mode 100644 src/StdMeshers/StdMeshers_Helper.cxx diff --git a/INSTALL b/INSTALL index dd103826d..6d03e0a4a 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ -This is the version 3.2.0a2 of SMESH +This is the version 3.2.0b1 of SMESH Compatible with : - - KERNEL 3.2.0a2 - - SALOMEGUI 3.2.0a2 - - GEOM 3.2.0a2 - - MED 3.2.0a2 + - KERNEL 3.2.0b1 + - SALOMEGUI 3.2.0b1 + - GEOM 3.2.0b1 + - MED 3.2.0b1 diff --git a/Makefile.in b/Makefile.in index ded60d8ed..c74723194 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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. +# +# 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/ +# # -* Makefile *- # # Author : Patrick GOLDBRONN (CEA) @@ -76,11 +95,15 @@ mesh_tree_algo.png \ mesh_tree_algo_quad.png \ mesh_tree_algo_regular.png \ mesh_tree_algo_tetra.png \ +mesh_tree_algo_netgen_2d3d.png \ +mesh_tree_algo_netgen_2d.png \ mesh_tree_hypo_area.png \ mesh_tree_hypo_length.png \ mesh_tree_hypo.png \ mesh_tree_hypo_segment.png \ mesh_tree_hypo_volume.png \ +mesh_tree_hypo_netgen.png \ +mesh_tree_hypo_netgen_2d.png \ mesh_tree_mesh.png \ mesh_tree_importedmesh.png \ mesh_tree_mesh_warn.png \ @@ -127,6 +150,7 @@ SMESH_en.xml \ SMESH.config \ StdMeshers.xml \ SMESHCatalog.xml \ +SalomeApp.xml \ mesh_pattern.png \ pattern_sample_2d.png \ pattern_sample_3D.png \ @@ -138,7 +162,8 @@ mesh_quad_quadrangle.png \ mesh_quad_tetrahedron.png \ mesh_quad_pyramid.png \ mesh_quad_pentahedron.png \ -mesh_quad_hexahedron.png +mesh_quad_hexahedron.png \ +mesh_conv_to_quad.png BIN_SCRIPT= \ VERSION diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in index 9b5e810db..734bc820a 100644 --- a/adm_local/Makefile.in +++ b/adm_local/Makefile.in @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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. +# +# 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/ +# # source path top_srcdir=@top_srcdir@ top_builddir=.. diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 7f57ab3d8..3c259c88c 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -168,6 +168,10 @@ CXXFLAGS+= $(CORBA_CXXFLAGS) #LDFLAGS+= $(CORBA_LIBS) LIBS+=$(CORBA_LIBS) +DOXYGEN = @DOXYGEN@ +DOXYGEN_WITH_PYTHON = @DOXYGEN_WITH_PYTHON@ +DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@ + ## Shared libraries LT_STATIC_EXEC=@LT_STATIC_EXEC@ DYNAMIC_DIRS=@DYNAMIC_DIRS@ @@ -224,7 +228,13 @@ all: Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in cd $(top_builddir) ; ./config.status -$(top_builddir)/config.status: $(top_srcdir)/configure +LOCAL_MAKE = make_commence make_conclude make_omniorb + +KERNEL_MAKE = make_module depend SALOMEconfig.h F77config.h sstream envScript + +$(top_builddir)/config.status: $(top_srcdir)/configure \ + $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ + $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) cd $(top_builddir) ; ./config.status --recheck # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) @@ -239,7 +249,7 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base cd $(top_srcdir) && ./build_configure -ACLOCAL_SRC = \ +ACLOCAL_KERNEL = \ ac_cxx_bool.m4 check_corba.m4 \ ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \ ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \ @@ -255,12 +265,12 @@ check_GUI.m4 check_corba_in_GUI.m4 ACLOCAL_MED = check_Med.m4 ACLOCAL_GEOM = check_GEOM.m4 -$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \ +$(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \ $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%) \ $(ACLOCAL_MED:%=@MED_ROOT_DIR@/adm_local/unix/config_files/%) \ $(ACLOCAL_GEOM:%=@GEOM_ROOT_DIR@/adm_local/unix/config_files/%) - cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \ + cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \ -I @GUI_ROOT_DIR@/adm_local/unix/config_files \ -I @MED_ROOT_DIR@/adm_local/unix/config_files \ -I @GEOM_ROOT_DIR@/adm_local/unix/config_files - \ No newline at end of file + diff --git a/bin/VERSION b/bin/VERSION index 3fb4d29dd..a32989223 100755 --- a/bin/VERSION +++ b/bin/VERSION @@ -1 +1 @@ -THIS IS SALOME - SMESH VERSION: 3.2.0a2 +THIS IS SALOME - SMESH VERSION: 3.2.0b1 diff --git a/build_configure b/build_configure index 2d81c7eae..121fb5d2a 100755 --- a/build_configure +++ b/build_configure @@ -150,10 +150,10 @@ echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1 echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 -echo " ./adm_local/unix/make_omniorb \\" >> configure.in_tmp1 +echo " ./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 -echo " ./adm_local/unix/make_commence \\" >> configure.in_tmp1 -echo " ./adm_local/unix/make_conclude \\" >> configure.in_tmp1 +echo " ./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1 +echo " ./adm_local/unix/make_conclude:${ABS_CONF_DIR}/adm_local/unix/make_conclude.in \\" >> configure.in_tmp1 echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 \rm -f configure.in_tmp2 configure.in_tmp3 diff --git a/doc/Makefile.in b/doc/Makefile.in index 7295ede75..59e6c5962 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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. +# +# 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/ +# # -* Makefile *- # diff --git a/doc/salome/Makefile.in b/doc/salome/Makefile.in index bd9a4eab5..224ee0881 100644 --- a/doc/salome/Makefile.in +++ b/doc/salome/Makefile.in @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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. +# +# 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/ +# # -* Makefile *- # diff --git a/doc/salome/gui/SMESH/about_viewing_meshes.htm b/doc/salome/gui/SMESH/about_viewing_meshes.htm index 77ef54955..1cba90dab 100755 --- a/doc/salome/gui/SMESH/about_viewing_meshes.htm +++ b/doc/salome/gui/SMESH/about_viewing_meshes.htm @@ -14,23 +14,13 @@ if (navigator.appName !="Netscape") - -

About viewing meshes

- -

You can get information about your mesh, change its presentation parameters - and access to other useful functionalities by right-clicking on it in - the Object Browser.

- -

Then the - following pop-up menu appears:

- -

  

+

Viewing meshes

-

+

After definition of algorithms and hypotheses a new mesh is listed in + the Object Browser. Right-click on it and select Compute - the mesh will be automatically + displayed in the VTK + 3D Viewer. Alternatively click + Display only to hide all other objects at the same time.

 

-

The Update button refreshes the presentation of your mesh in the Object - Browser, applying all recent changes.

- -

By clicking on Standard Mesh Infos - and Advanced Mesh - Infos you can learn the Mesh - Infos.

- -

Via Numbering -  you can - display the ID numbers of all meshing elements or nodes composing your - mesh in the viewer.

- -

Via Display Mode, Display - Entity,  Colors - / Size, and  Transparency - you can change the way of presentation of your mesh.

+

After the mesh has appeared in the Viewer, you can select it with left + mouse click and  get + information about it, change its presentation parameters and access to + other useful options by right-clicking on the selected mesh.

-

In the Clipping menu you can create - cross-sections of the selected objects.

- -

Quality Controls are described in - the next chapter.

- -

By clicking on Display Only - you hide all other objects.

- -

The Erase button deletes the - selected object from the session.

+

  

-

Using the Change background - button you can set the background color. By default it is black.  

+

 

-

See Also - a sample TUI Script of a Viewing Mesh Infos - operation.  

+

 

diff --git a/doc/salome/gui/SMESH/adding_quadratic_nodes_and_elements.htm b/doc/salome/gui/SMESH/adding_quadratic_nodes_and_elements.htm new file mode 100755 index 000000000..8f7706a41 --- /dev/null +++ b/doc/salome/gui/SMESH/adding_quadratic_nodes_and_elements.htm @@ -0,0 +1,119 @@ + + + + + +Adding Quadratic Nodes and Elements + + + + + + + + + +

Adding Quadratic Elements

+ +

MESH modules allows you to work with Quadratic + Elements.

+ +

Quadratic Edge in not a straight but a broken line and can be defined + by three points: first, middle and last. All more complex Quadratic + Elements differ from ordinary ones in that they consist of Quadratic + Edges.

+ +

To + add a quadratic element to your mesh:

+ +

1. Select your mesh in the Object Browser + or in the 3D viewer.

+ +

2. From the Modification + menu choose the Add item + and select one of the following:

+ +

+ +

To create any Quadratic + Element specify the nodes which will form your triangle by selecting + them in the 3D viewer with pressed Shift button. Their numbers will appear + in the dialog box as Corner Nodes + (alternatively you can just input numbers in this field without selection).The + edges formed by the corner nodes will appear in the table. To define the + middle nodes for each edge double-click on the respective field and input + the number of the node. All edges and the object formed by them will be + displayed in the Object browser. When all edges are defined you will be + able to click OK or Apply + button to add the element to the mesh.

+ +

 

+ +

Reverse + button for Quadratic Edges switches the first and the last nodes. For all other elements it reverses the element. +

+ +

 

+ + + + diff --git a/doc/salome/gui/SMESH/aspect_ratio_3d.htm b/doc/salome/gui/SMESH/aspect_ratio_3d.htm index 20573a1fd..90c6d6c80 100755 --- a/doc/salome/gui/SMESH/aspect_ratio_3d.htm +++ b/doc/salome/gui/SMESH/aspect_ratio_3d.htm @@ -16,21 +16,22 @@ if (navigator.appName !="Netscape")

Display Entity

-

In this submenu you can choose to display only faces,

+

In this submenu you can choose to display only volumes, faces or edges + or combine them.

 

-

+

Only Faces                                                  Only + Edges

-

 

- -

only edges,

- -

 

- -

+

 

 

-

or both.

-

Adding nodes and elements

-

In SMESH you can add to your mesh different elements such as:

+

In MESH you can add to your mesh different elements such as:

 

@@ -101,9 +101,13 @@ else

  • Quadrangles

    • +

  • Polygons

    • +

  • Tetrahedrons

  • Hexahedrons

    • + +

  • Polyhedrons

    •  

    @@ -123,9 +127,7 @@ else

     

    -

    - -

     

    +

     

    @@ -143,7 +145,11 @@ else

    Adding nodes

    -

         

    +

        

    + +

     

    + +

     

     

    @@ -197,7 +203,8 @@ else

     

    -

    Adding polygons

    +

    Adding polygons +

              

    @@ -244,7 +251,7 @@ else

     

    -

    Adding polyhedrons

    +

    Adding polyhedrons

            

    diff --git a/doc/salome/gui/SMESH/files/area_of_elements.htm b/doc/salome/gui/SMESH/files/area_of_elements.htm index d92aa5ef3..5f8bcb65e 100755 --- a/doc/salome/gui/SMESH/files/area_of_elements.htm +++ b/doc/salome/gui/SMESH/files/area_of_elements.htm @@ -89,7 +89,7 @@ else

    Area mesh quality control is based on the algorithm of area calculation of  meshing - elements . It can be applied to meshes consisting of 2D meshing elements + elements. It can be applied to meshes consisting of 2D meshing elements with 3 and 4 nodes (triangles and quadrangles).    

     

    @@ -116,7 +116,7 @@ else

     

    See Also - a sample TUI Script of an Area + a sample TUI Script of an Area quality control operation.  

     

    diff --git a/doc/salome/gui/SMESH/files/arithmetic_1d.htm b/doc/salome/gui/SMESH/files/arithmetic_1d.htm index ead4f03b7..6a4e2b48a 100755 --- a/doc/salome/gui/SMESH/files/arithmetic_1d.htm +++ b/doc/salome/gui/SMESH/files/arithmetic_1d.htm @@ -14,28 +14,36 @@ if (navigator.appName !="Netscape")

    1D Meshing Hypotheses

    -

    Arithmetic 1D hypothesis

    + + +

    Arithmetic 1D hypothesis

    Arithmetic 1D hypothesis allows to split edges into segments with a length that changes in arithmetic @@ -106,15 +141,15 @@ else

     

    -

         

    +

         

     

    -

    See Also +

    See Also a sample TUI Script of a Defining Arithmetic 1D hypothesis operation.  

    -

    Deflection 1D hypothesis

    +

    Deflection 1D hypothesis

    Deflection ID hypothesis can be applied for meshing curvilinear edges composing your geometrical object. @@ -128,19 +163,19 @@ else

     

    -

          

    +

          

     

    -

    See Also +

    See Also a sample TUI Script of a Defining Deflection 1D hypothesis operation.  

     

    -

    +

    -

    Average Length hypothesis

    +

    Average Length hypothesis

    Average Length hypothesis can be applied for meshing of edges composing your geometrical object. Definition @@ -151,19 +186,19 @@ else

     

    -

           

    +

           

     

    -

    See Also +

    See Also a sample TUI Script of a Defining Average Length hypothesis operation.  

     

    -

    +

    -

    Number of segments hypothesis

    +

    Number of segments hypothesis

    Number of segments hypothesis can be applied for meshing of edges composing your geometrical object. @@ -176,53 +211,60 @@ else

     

    -

    You can set the type of distribution for this +

    You can set the type of distribution for this hypothesis in the Hypothesis Construction dialog bog :

    -

     

    +

     

    + +

    Equidistant + Distribution - all segments will have the same length, you define + only the Number of Segments.

    -

    Equidistant - Distribution - all segments will have the same length

    +

     

    -

             

    +

             

     

    -

    Scale Distribution - each +

    Scale Distribution - each next segment differs from the previous according to the formula: Ai+1 = Ai - * k, where k is - Scale Factor

    + * k, where k is + a Scale Factor.

    -

    \

    +

    \

    -

     

    +

     

    -

    Distribution with Table Density - you - input a number of pairs t - F(t) and - the program computes the formula, which will rule the change of length - of segments.

    +

    Distribution with Table Density - you + input a number of pairs t - F(t), + where t ranges from 0 to 1, +  and + the module computes the formula, which will rule the change of length + of segments and shows the curve in the plot. You can select the Conversion + mode from Exponent + and Cut negative.

    -

     

    +

     

    -

    +

    -

     

    +

     

    -

    Distribution with Analytic Density - Distribution with Analytic Density - you input the formula, which will rule the - change of length of segments

    + change of length of segments and the module shows the curve in the plot.

    -

    +

    -

    See Also +

    See Also a sample TUI Script of a Defining Number of Segments hypothesis operation.  

     

    -

    Start and End Length hypothesis.

    +

    Start and End Length hypothesis.

    Start and End Length hypothesis allows to divide a geometrical edge into segments so that the first and @@ -233,15 +275,44 @@ else

     

    -

          

    +

          

    -

     

    +

     

    -

    See Also +

    See Also a sample TUI Script of a Defining Start and End Length  hypothesis operation.  

    +

     

    + +

    Automatic Length

    + +

    This hypothesis is automatically applied when you select Assign + a set of hypotheses option in Create Mesh menu.

    + +

     

    + +

    + +

     

    + +

    The dialog box prompts you to define the quality of the future mesh + by only one parameter, which is Fineness, + ranging from 0 (coarse mesh, low number of elements) to 1 (extremely fine + mesh, great number of elements). Compare one and the same object (sphere) + meshed with minimum and maximum value of this parameter.

    + +

     

    + +

       

    + +

     

    + +

     

    + +

     

    +

     

    + -

    Max Element Area hypothesis

    +

    2D Meshing Hypotheses

    -

    Max - Element Area hypothesis is applied for meshing of 2D faces composing - your geometrical object. Definition of this hypothesis consists of setting - the maximum area of meshing elements - (depending on the chosen meshing algorithm it can be triangles - or quadrangles), which will compose - the mesh of these 2D faces.

    + + +

    Max Element Area

    + +

    Max Element Area hypothesis + is applied for meshing of 2D faces composing your geometrical object. + Definition of this hypothesis consists of setting the maximum + area of meshing elements (depending on the chosen meshing algorithm + it can be triangles or quadrangles), + which will compose the mesh of these 2D faces.

     

    -

    +

    -

     

    +

     

    -

    See Also +

    See Also a sample TUI Script of a Maximum Element Area hypothesis operation.  

     

    -

    +

    + +

     

    + +

     

    + +

    Length from Edges

    + +

    Length from edges hypothesis + builds 1D mesh segments having a length calculated as an average edge + length for a given wire.

    + +

     

    + +

    See Also + a sample TUI Script of a Length + from Edges hypothesis operation.  

    + +

     

    + +

    Quadrangle Preference

    + +

    This algorithm can be used only together with Quadrangle (Mapping) algorithm. + It allows to build quadrangular meshes even if the number of nodes at + the opposite edges of a meshed face is not equal, otherwise this mesh + will contain some triangular elements.

    + +

     

    + +

     

    Removing nodes and elements

    -

    In SMESH you can remove nodes and all types of cells of your mesh.

    +

    In MESH you can remove nodes and all types of cells of your mesh.

     

    -

    To remove a node:

    + + +

     

    + +

    To remove a node:

     

    -

    1. Select your mesh in the Object Browser +

    1. Select your mesh in the Object Browser or in the 3D viewer.

    -

     

    +

     

    -

    2. From the Modification +

    2. From the Modification menu choose Remove and from the associated submenu select the Remove - nodes, or just click icon in the toolbar. The + nodes, or just click icon in the toolbar. The following dialog box will appear:

     

    -

    +

    -

     

    +

     

    -

    In this dialog box you can specify one or +

    In this dialog box you can specify one or several nodes (with pressed Shift button) by choosing them in the 3D viewer.

    -

     

    +

     

    -

    3. Click OK +

    3. Click OK or Apply  to confirm deletion of the specified nodes.

    -

     

    +

     

    -

    Be careful while removing +

    Be careful while removing nodes because if you remove a definite node of your mesh all adjacent elements will be also deleted.

    -

     

    +

     

    - --+
    ++- - - + + +
    -

    		 -

    +

    		 +

    -

     

    +

     

     

    -

    To remove an element:

    +

    To remove an element:

     

    -

    1. Select your mesh in the Object Browser +

    1. Select your mesh in the Object Browser or in the 3D viewer.

    -

     

    +

     

    -

    2. From the Modification +

    2. From the Modification menu choose Remove and from the associated submenu select the Remove - elements, or just click icon in the toolbar. The + elements, or just click icon in the toolbar. The following dialog box will appear:

     

    -

    +

    -

     

    +

     

    -

    In this dialog box you can specify one or +

    In this dialog box you can specify one or several elements of your mesh (with pressed Shift button) by choosing them in the 3D viewer.

    -

     

    +

     

    -

    3. Click OK +

    3. Click OK or Apply  to confirm deletion of the specified elements.

    -

     

    +

     

    - --+
    ++- - - + + +
    -

    		 -

    +

    		 +

    -

     

    +

     

     

    diff --git a/doc/salome/gui/SMESH/files/renumbering_nodes_and_elements.htm b/doc/salome/gui/SMESH/files/renumbering_nodes_and_elements.htm index 49b0b0339..460da6f39 100755 --- a/doc/salome/gui/SMESH/files/renumbering_nodes_and_elements.htm +++ b/doc/salome/gui/SMESH/files/renumbering_nodes_and_elements.htm @@ -14,10 +14,12 @@ if (navigator.appName !="Netscape")

    Renumbering nodes and elements

    -

    In SMESH you can renumber the nodes and elements of your mesh.

    +

    In MESH you can renumber the nodes and elements of your mesh.

     

    -

    To renumber the nodes of your mesh:

    + + +

     

    + +

    To renumber the nodes of your mesh:

     

    -

    1. In the Modification +

    1. In the Modification menu select Renumbering submenu and choose the Nodes item or click - button in the toolbar. The following dialog box will + button in the toolbar. The following dialog box will appear:

    -

     

    +

     

    -

    +

    -

     

    +

     

    -

    2. Fill the Mesh +

    2. Fill the Mesh field by selecting your mesh in the Object Browser or in the 3D viewer.

    -

     

    +

     

    -

    3. Click the Apply +

    3. Click the Apply or OK button to perform the operation.

    -

     

    +

     

    -

     

    +

     

    -

    To renumber the elements of your mesh:

    +

    To renumber the elements of your + mesh:

     

    -

    1. In the Modification +

    1. In the Modification menu select Renumbering submenu and choose the Elements item or - click button in the toolbar. The following dialog box will + click button in the toolbar. The following dialog box will appear:

    -

     

    +

     

    -

    +

    -

     

    +

     

    -

    2. Fill the Mesh +

    2. Fill the Mesh field by selecting your mesh in the Object Browser or in the 3D viewer.

    -

     

    +

     

    -

    3. Click the Apply +

    3. Click the Apply or OK button to perform the operation.

    -

     

    +

     

      See Also a sample TUI Script of a Renumbering @@ -144,7 +159,7 @@ else

     

    -

     

    +

     

    + + + + + + + + +

    VTK 3D Viewer

    + +

    VTK + 3D viewer is the default viewer for Mesh Module, allowing to visualize + meshes. It is also used in Post-Pro module for all 3D presentations except + for Gauss Points.

    + +

     

    + +

    The functionalities of + VTK viewer are available via its Viewer Toolbar. Buttons marked with small + downward triangles have extended functionality which can be accessed by + locking on them with left mouse button.  

    + +

     

    + +

    + +
      + +

    • Dump View - exports + an object from the viewer in bmp, png, jpg or jpeg image format.

      • + +

    • Show/Hide Trihedron + - shows or hides coordinate axes.

      • + +

    •  Fit + all - allows to select a point to be the center of a scene representing + all displayed objects in the visible area. +

      • + +

    •   Fit area - resizes + the view to place in the visible area only the contents of a frame drawn + with pressed left mouse button.

      • + +

    • Zoom -  allows + to zoom in and out.

      • + +

    • Panning - if the + represented objects are greater that the visible area and you don't wish + to use Fit all functionality, + click on this button and you'll be able to drag the scene to see its remote + parts.

      • + +

    • Global panning - + represents all displayed objects in the visible area.

      • + +

    • Rotation - allows + to rotate the selected object using the mouse.

      • + +

    • These buttons orientate the scene strictly about coordinate + axes.

      • + +

    • Reset - restores + the default position (isometric) of objects in the scene.

      • + +

    • Scaling - represents + objects deformed (stretched or stuffed) along the axes of coordinates

      • + +

    •  Graduated axes - allows + to define parameters of axes and graduate them.

      • +
    + +

     

    + +

    + +
      + +

    • Axis name

      • + +

    • Is visible - if checked the axis name is displayed in + the viewer.

      • + +

    • Name + - allows to redefine the name of the axis.

      • + +

    • Font + - allows to define color and properties of the font of axis name.

      • + +

    • Labels +

      • + +

    • Is visible - if checked the labels are displayed in the + viewer.

      • + +

    • Number + - allows to define the number of labels.

      • + +

    • Offset + - allows to define the distance between labels.

      • + +

    • Font + - allows to define color and properties of the font of labels names.

      • + +

    • Tick marks

      • + +

    • Is visible - if checked the tick marks are displayed in + the viewer.

      • + +

    • Length + - allows to define the length of tick marks

      • + +

    • Is visible if + checked the axis is displayed in the viewer.

      • +
    + + + + diff --git a/doc/salome/gui/SMESH/free_borders.htm b/doc/salome/gui/SMESH/free_borders.htm index ebfcb53d4..6330ba381 100755 --- a/doc/salome/gui/SMESH/free_borders.htm +++ b/doc/salome/gui/SMESH/free_borders.htm @@ -15,15 +15,16 @@ if (navigator.appName !="Netscape") + + + + + + + +

    Merging Elements

    + +

    This functionality allows to merge coincident elements + of a mesh selectable in the dialog box.

    + +

    + +

    In this picture you see a triangle which coincides with one of the elements + of the mesh. After we apply Merge Elements + functionality, the triangle will be completely merged with the mesh.

    + +

    + +

      See + Also a sample TUI Script of a Merge + Elements operation.  

    + +

     

    + +

     

    + + + + diff --git a/doc/salome/gui/SMESH/modifying_meshes.htm b/doc/salome/gui/SMESH/modifying_meshes.htm index 8ba2b742c..2bf6951c3 100755 --- a/doc/salome/gui/SMESH/modifying_meshes.htm +++ b/doc/salome/gui/SMESH/modifying_meshes.htm @@ -14,11 +14,13 @@ LI.kadov-P { }

    Transparency

    -

    +

     

    diff --git a/doc/salome/gui/SMESH/volume.htm b/doc/salome/gui/SMESH/volume.htm new file mode 100755 index 000000000..ffc11759b --- /dev/null +++ b/doc/salome/gui/SMESH/volume.htm @@ -0,0 +1,118 @@ + + + + + +Volume + + + + + + + + + + +

    Volume

    + +

    Volume mesh quality + criterion reflects the volume of meshes of a 3D object.

    + +

    + +

    To + apply the Volume quality criterion to your mesh:

    + +

    1. Display your mesh in the viewer.

    + +

    2. Choose Controls + > Volume or click button in the toolbar. Your + mesh will be displayed in the viewer with its elements colored according + to the applied mesh quality control criterion:

    + +

    See Also + a sample TUI Script of a Volume quality control operation. +  

    + +

     

    + +

     

    + +

     

    + + + + diff --git a/doc/salome/gui/SMESH/whdata/whftdata0.htm b/doc/salome/gui/SMESH/whdata/whftdata0.htm index 3ecd68c6c..16b2b1b7d 100755 --- a/doc/salome/gui/SMESH/whdata/whftdata0.htm +++ b/doc/salome/gui/SMESH/whdata/whftdata0.htm @@ -13,6 +13,7 @@ diff --git a/doc/salome/gui/SMESH/whdata/whfts.htm b/doc/salome/gui/SMESH/whdata/whfts.htm index 1b6176ed0..15e5cf489 100755 --- a/doc/salome/gui/SMESH/whdata/whfts.htm +++ b/doc/salome/gui/SMESH/whdata/whfts.htm @@ -8,9 +8,9 @@ diff --git a/doc/salome/gui/SMESH/whdata/whfwdata0.htm b/doc/salome/gui/SMESH/whdata/whfwdata0.htm index dfe30b817..96f981b31 100755 --- a/doc/salome/gui/SMESH/whdata/whfwdata0.htm +++ b/doc/salome/gui/SMESH/whdata/whfwdata0.htm @@ -12,1136 +12,1305 @@ diff --git a/doc/salome/gui/SMESH/whdata/whtdata0.htm b/doc/salome/gui/SMESH/whdata/whtdata0.htm index 19d460aee..f1da36132 100755 --- a/doc/salome/gui/SMESH/whdata/whtdata0.htm +++ b/doc/salome/gui/SMESH/whdata/whtdata0.htm @@ -8,7 +8,7 @@