From 0febe018bcde111dc7aca1f3e44d4aa2995b59a2 Mon Sep 17 00:00:00 2001 From: smh Date: Tue, 19 Oct 2004 11:50:09 +0000 Subject: [PATCH] Integration of PAL/SALOME V2.1.0c from OCC --- INSTALL | 9 +- Makefile.in | 28 +- adm_local/unix/config_files/check_Geom.m4 | 11 +- adm_local/unix/config_files/check_Med.m4 | 11 +- adm_local/unix/config_files/check_Netgen.m4 | 126 - adm_local/unix/make_commence.in | 5 +- adm_local/unix/make_conclude.in | 346 ++ bin/VERSION | 2 +- build_configure | 2 +- configure.in.base | 2 +- doc/salome/gui/SMESH/SMESH.log | 62 +- .../gui/SMESH/files/1d_meshing_algorithm.htm | 13 +- .../2d_(quadrangle)_meshing_algorithm.htm | 12 +- .../gui/SMESH/files/2d_meshing_algorithm.htm | 13 +- .../gui/SMESH/files/3d_meshing_algorithm.htm | 15 +- .../gui/SMESH/files/about_hypotheses.htm | 79 +- doc/salome/gui/SMESH/files/about_meshes.htm | 2 +- .../SMESH/files/about_meshing_algorithms.htm | 48 +- .../files/about_modification_of_meshes.htm | 2 +- .../SMESH/files/about_quality_controls.htm | 2 +- .../SMESH/files/adding_nodes_and_elements.htm | 2 +- .../gui/SMESH/files/area_of_elements.htm | 2 +- doc/salome/gui/SMESH/files/arithmetic_1d.htm | 164 + doc/salome/gui/SMESH/files/aspect_ratio.htm | 2 +- .../changing_orientation_of_elements.htm | 2 +- .../gui/SMESH/files/computing_meshes.htm | 2 +- doc/salome/gui/SMESH/files/connectivity.htm | 2 +- .../gui/SMESH/files/constructing_meshes.htm | 2 +- .../SMESH/files/constructing_submeshes.htm | 2 +- doc/salome/gui/SMESH/files/deflection_1d.htm | 163 + .../files/diagonal_iversion_of_elements.htm | 2 +- .../gui/SMESH/files/displacing_nodes.htm | 2 +- .../files/displaying_elements_numbers.htm | 2 +- .../SMESH/files/displaying_nodes_numbers.htm | 2 +- .../gui/SMESH/files/editing_hypotheses.htm | 2 +- .../files/importing_and_exporting_meshes.htm | 2 +- .../gui/SMESH/files/introduction_to_smesh.htm | 2 +- .../gui/SMESH/files/length_from_edges.htm | 127 + .../gui/SMESH/files/length_of_edges.htm | 2 +- .../SMESH/files/local_length_hypothesis.htm | 50 +- .../files/max._element_area_hypothesis.htm | 38 +- .../files/max._element_volume_hypothsis.htm | 36 +- doc/salome/gui/SMESH/files/minimum_angle.htm | 2 +- .../non_conform_mesh_allowed_hypothesis.htm | 118 + .../files/number_of_segments_hypothesis.htm | 38 +- ...ion_of_1d_hypothesis_on_opposite_edges.htm | 132 + .../reassigning_hypotheses_and_algorithms.htm | 2 +- .../files/removing_nodes_and_elements.htm | 2 +- .../gui/SMESH/files/running_smesh_module.htm | 2 +- .../gui/SMESH/files/scalar_bar_properties.htm | 2 +- doc/salome/gui/SMESH/files/shading.htm | 2 +- doc/salome/gui/SMESH/files/shrink.htm | 2 +- doc/salome/gui/SMESH/files/skew.htm | 2 +- .../files/start_and_end_length_hypothesis.htm | 165 + doc/salome/gui/SMESH/files/taper.htm | 2 +- ...tetrahedron_(netgen)_meshing_algorithm.htm | 36 +- .../gui/SMESH/files/using_smesh_module.htm | 2 +- doc/salome/gui/SMESH/files/view_update.htm | 2 +- .../gui/SMESH/files/viewing_mesh_info.htm | 4 +- .../gui/SMESH/files/visualization_modes.htm | 18 +- .../SMESH/files/visualization_properties.htm | 2 +- doc/salome/gui/SMESH/files/warp.htm | 2 +- doc/salome/gui/SMESH/files/wireframe.htm | 2 +- doc/salome/gui/SMESH/image12.gif | Bin 0 -> 983 bytes doc/salome/gui/SMESH/image13.gif | Bin 0 -> 950 bytes doc/salome/gui/SMESH/image14.gif | Bin 0 -> 978 bytes doc/salome/gui/SMESH/image15.gif | Bin 0 -> 998 bytes doc/salome/gui/SMESH/image16.gif | Bin 0 -> 1026 bytes doc/salome/gui/SMESH/image16.jpg | Bin 0 -> 20555 bytes doc/salome/gui/SMESH/image17.jpg | Bin 0 -> 18256 bytes doc/salome/gui/SMESH/image18.jpg | Bin 0 -> 21345 bytes doc/salome/gui/SMESH/image20.jpg | Bin 0 -> 32034 bytes doc/salome/gui/SMESH/image21.jpg | Bin 0 -> 38677 bytes doc/salome/gui/SMESH/image7.gif | Bin 0 -> 1047 bytes doc/salome/gui/SMESH/image8.gif | Bin 0 -> 998 bytes doc/salome/gui/SMESH/image9.gif | Bin 0 -> 30034 bytes doc/salome/gui/SMESH/smesh.htm | 150 + doc/salome/gui/SMESH/smesh_csh.htm | 100 + doc/salome/gui/SMESH/smesh_rhc.htm | 100 + .../tetrahedron_(ghs3d)_meshing_algorithm.htm | 132 + doc/salome/gui/SMESH/whdata/whftdata0.htm | 7 + doc/salome/gui/SMESH/whdata/whftdata0.xml | 7 + doc/salome/gui/SMESH/whdata/whfts.htm | 2 +- doc/salome/gui/SMESH/whdata/whfts.xml | 2 +- doc/salome/gui/SMESH/whdata/whfwdata0.htm | 535 +- doc/salome/gui/SMESH/whdata/whfwdata0.xml | 535 +- doc/salome/gui/SMESH/whdata/whtdata0.htm | 21 +- doc/salome/gui/SMESH/whdata/whtdata0.xml | 11 +- doc/salome/gui/SMESH/whgdata/whlstf0.htm | 10 +- doc/salome/gui/SMESH/whgdata/whlstf1.htm | 20 +- doc/salome/gui/SMESH/whgdata/whlstf2.htm | 20 +- doc/salome/gui/SMESH/whgdata/whlstf3.htm | 17 +- doc/salome/gui/SMESH/whgdata/whlstf4.htm | 46 + 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/whlstfl16.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl17.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl18.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl2.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl21.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl22.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl3.htm | 2 +- doc/salome/gui/SMESH/whgdata/whlstfl6.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 | 10 +- doc/salome/gui/SMESH/whgdata/whlstt7.htm | 1 + doc/salome/gui/SMESH/whgdata/whnvl32.htm | 4 +- doc/salome/gui/SMESH/whskin_info.htm | 4 +- .../tui/SMESH/HTML/SMESH_BasicHypothesis.html | 104 +- doc/salome/tui/SMESH/HTML/SMESH_Gen.html | 48 +- .../tui/SMESH/HTML/SMESH_Hypothesis.html | 4 + doc/salome/tui/SMESH/HTML/SMESH_Mesh.html | 164 +- doc/salome/tui/SMESH/doxyfile | 2 +- .../tui/SMESH/sources/static/page2.html | 4 + doc/salome/tui/SMESH/sources/static/tree.js | 2 +- idl/Makefile.in | 3 +- idl/SMESH_BasicHypothesis.idl | 63 + idl/SMESH_Filter.idl | 365 +- idl/SMESH_Gen.idl | 31 +- idl/SMESH_Mesh.idl | 189 +- idl/SMESH_Pattern.idl | 160 + resources/SMESH_Meshers.xml | 78 - resources/SMESH_MeshersWithNETGEN.xml | 89 - resources/SMESH_en.xml | 102 +- resources/SMESH_fr.xml | 34 +- resources/StdMeshers.xml | 24 +- resources/mesh_algo_tetra.png | Bin 371 -> 616 bytes resources/mesh_cutGroups.png | Bin 0 -> 340 bytes resources/mesh_cutquad.png | Bin 0 -> 417 bytes resources/mesh_deleteGroups.png | Bin 0 -> 212 bytes resources/mesh_extrusion.png | Bin 0 -> 427 bytes resources/mesh_intersectGroups.png | Bin 0 -> 324 bytes resources/mesh_merge_nodes.png | Bin 0 -> 560 bytes resources/mesh_pattern.png | Bin 0 -> 292 bytes resources/mesh_renumbering_elements.png | Bin 0 -> 346 bytes resources/mesh_renumbering_nodes.png | Bin 0 -> 388 bytes resources/mesh_revolution.png | Bin 0 -> 450 bytes resources/mesh_rotation.png | Bin 0 -> 646 bytes resources/mesh_sew_bordertoside.png | Bin 0 -> 359 bytes resources/mesh_sew_conform_freeborders.png | Bin 0 -> 419 bytes resources/mesh_sew_freeborders.png | Bin 0 -> 412 bytes resources/mesh_sew_sideelements.png | Bin 0 -> 295 bytes resources/mesh_smoothing.png | Bin 0 -> 416 bytes resources/mesh_symmetry_axis.png | Bin 0 -> 430 bytes resources/mesh_symmetry_plane.png | Bin 0 -> 426 bytes resources/mesh_symmetry_point.png | Bin 0 -> 430 bytes resources/mesh_translation_points.png | Bin 0 -> 469 bytes resources/mesh_translation_vector.png | Bin 0 -> 458 bytes resources/mesh_tree_algo_tetra.png | Bin 148 -> 281 bytes resources/mesh_union2tri.png | Bin 0 -> 504 bytes resources/mesh_unionGroups.png | Bin 0 -> 425 bytes resources/mesh_uniontri.png | Bin 0 -> 417 bytes resources/pattern_sample_2d.png | Bin 0 -> 1180 bytes resources/pattern_sample_3D.png | Bin 0 -> 2160 bytes src/Controls/Makefile.in | 52 + .../SMESHControls.cxx} | 41 +- src/Controls/SMESH_Controls.cxx | 1762 ++++++ src/Controls/SMESH_Controls.hxx | 527 ++ src/Driver/Document_Reader.h | 44 - src/Driver/Driver_Document.cxx | 36 + .../{Mesh_Reader.h => Driver_Document.h} | 33 +- .../{Document_Reader.cxx => Driver_Mesh.cxx} | 22 +- .../{Document_Writer.h => Driver_Mesh.h} | 33 +- .../{Mesh_Reader.cxx => Driver_SMDS_Mesh.cxx} | 18 +- src/Driver/Driver_SMDS_Mesh.h | 38 + ...ent_Writer.cxx => Driver_SMESHDS_Mesh.cxx} | 21 +- src/Driver/Driver_SMESHDS_Mesh.h | 38 + src/Driver/Driver_dl.cxx | 209 - src/Driver/Makefile.in | 14 +- src/Driver/SMESHDriver.cxx | 139 - src/DriverDAT/DAT_Test.cxx | 28 + src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx | 333 +- src/DriverDAT/DriverDAT_R_SMDS_Mesh.h | 34 +- .../DriverDAT_R_SMESHDS_Document.cxx | 97 - src/DriverDAT/DriverDAT_R_SMESHDS_Document.h | 28 +- src/DriverDAT/DriverDAT_R_SMESHDS_Mesh.cxx | 66 - src/DriverDAT/DriverDAT_R_SMESHDS_Mesh.h | 33 +- src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx | 280 +- src/DriverDAT/DriverDAT_W_SMDS_Mesh.h | 28 +- .../DriverDAT_W_SMESHDS_Document.cxx | 89 - src/DriverDAT/DriverDAT_W_SMESHDS_Document.h | 29 +- src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.cxx | 203 - src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.h | 27 +- src/DriverDAT/Makefile.in | 12 +- src/DriverMED/DriverMED_Family.cxx | 2 + src/DriverMED/DriverMED_Family.h | 26 +- src/DriverMED/DriverMED_R_SMDS_Mesh.cxx | 600 -- src/DriverMED/DriverMED_R_SMDS_Mesh.h | 36 +- .../DriverMED_R_SMESHDS_Document.cxx | 103 - src/DriverMED/DriverMED_R_SMESHDS_Document.h | 30 +- src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx | 142 +- src/DriverMED/DriverMED_R_SMESHDS_Mesh.h | 50 +- src/DriverMED/DriverMED_W_SMDS_Mesh.cxx | 395 -- src/DriverMED/DriverMED_W_SMDS_Mesh.h | 38 +- .../DriverMED_W_SMESHDS_Document.cxx | 76 - src/DriverMED/DriverMED_W_SMESHDS_Document.h | 33 +- src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx | 99 +- src/DriverMED/DriverMED_W_SMESHDS_Mesh.h | 38 +- src/DriverMED/MED_Test.cxx | 28 + src/DriverMED/Makefile.in | 11 +- src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx | 344 ++ .../DriverSTL/DriverSTL_R_SMDS_Mesh.h | 40 +- src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx | 261 + .../DriverSTL_W_SMDS_Mesh.h} | 34 +- src/DriverSTL/Makefile.in | 61 + src/DriverSTL/STL_Test.cxx | 28 + src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx | 330 +- src/DriverUNV/DriverUNV_R_SMDS_Mesh.h | 46 +- .../DriverUNV_R_SMESHDS_Document.cxx | 108 +- src/DriverUNV/DriverUNV_R_SMESHDS_Document.h | 40 +- src/DriverUNV/DriverUNV_R_SMESHDS_Mesh.cxx | 74 +- src/DriverUNV/DriverUNV_R_SMESHDS_Mesh.h | 45 +- src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx | 351 +- src/DriverUNV/DriverUNV_W_SMDS_Mesh.h | 48 +- .../DriverUNV_W_SMESHDS_Document.cxx | 101 +- src/DriverUNV/DriverUNV_W_SMESHDS_Document.h | 41 +- src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.cxx | 250 +- src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.h | 46 +- src/DriverUNV/Makefile.in | 23 +- src/DriverUNV/UNV2411_Structure.cxx | 124 + .../UNV2411_Structure.hxx} | 39 +- src/DriverUNV/UNV2412_Structure.cxx | 203 + src/DriverUNV/UNV2412_Structure.hxx | 61 + src/DriverUNV/UNV_Test.cxx | 69 + src/DriverUNV/UNV_Utilities.cxx | 37 + src/DriverUNV/UNV_Utilities.hxx | 104 + src/MEFISTO2/Rn.h | 21 +- src/MEFISTO2/aptrte.cxx | 39 +- src/Makefile.in | 2 +- src/OBJECT/Makefile.in | 8 +- src/OBJECT/SMESH_Actor.cxx | 565 +- src/OBJECT/SMESH_Actor.h | 61 +- src/OBJECT/SMESH_ActorUtils.cxx | 39 + .../SMESH_ActorUtils.h} | 21 +- src/OBJECT/SMESH_DeviceActor.cxx | 244 +- src/OBJECT/SMESH_DeviceActor.h | 41 +- src/OBJECT/SMESH_ExtractGeometry.cxx | 254 + .../SMESH_ExtractGeometry.h} | 69 +- src/OBJECT/SMESH_Object.cxx | 112 +- src/OBJECT/SMESH_Object.h | 23 +- src/SMDS/Makefile.in | 10 +- src/SMDS/SMDSAbs_ElementType.hxx | 2 +- src/SMDS/SMDSControl.cxx | 234 - src/SMDS/SMDSControl.hxx | 115 - src/SMDS/SMDSControl_BoundaryEdges.cxx | 79 - src/SMDS/SMDSControl_BoundaryEdges.hxx | 114 - src/SMDS/SMDSControl_BoundaryFaces.cxx | 102 - src/SMDS/SMDSControl_BoundaryFaces.hxx | 114 - src/SMDS/SMDSControl_MeshBoundary.cxx | 60 - src/SMDS/SMDSControl_MeshBoundary.hxx | 114 - src/SMDS/SMDSEdit_Transform.cxx | 120 - src/SMDS/SMDSEdit_Transform.hxx | 115 - src/SMDS/SMDS_EdgePosition.cxx | 3 + src/SMDS/SMDS_FaceOfEdges.cxx | 2 + src/SMDS/SMDS_FaceOfEdges.hxx | 8 +- src/SMDS/SMDS_FaceOfNodes.cxx | 24 + src/SMDS/SMDS_FaceOfNodes.hxx | 10 +- src/SMDS/SMDS_FacePosition.cxx | 3 + src/SMDS/SMDS_HexahedronOfNodes.cxx | 95 - src/SMDS/SMDS_IteratorOfElements.hxx | 5 +- src/SMDS/SMDS_Mesh.cxx | 220 +- src/SMDS/SMDS_Mesh.hxx | 71 +- src/SMDS/SMDS_MeshEdge.cxx | 17 +- src/SMDS/SMDS_MeshEdge.hxx | 4 +- src/SMDS/SMDS_MeshElement.cxx | 3 + src/SMDS/SMDS_MeshElement.hxx | 5 +- src/SMDS/SMDS_MeshElementIDFactory.cxx | 31 + src/SMDS/SMDS_MeshElementIDFactory.hxx | 8 +- src/SMDS/SMDS_MeshGroup.cxx | 4 +- src/SMDS/SMDS_MeshGroup.hxx | 14 +- src/SMDS/SMDS_MeshHexahedron.cxx | 217 - src/SMDS/SMDS_MeshHexahedron.hxx | 125 - src/SMDS/SMDS_MeshIDFactory.cxx | 2 + src/SMDS/SMDS_MeshIDFactory.hxx | 4 +- src/SMDS/SMDS_MeshNode.cxx | 2 + src/SMDS/SMDS_MeshNode.hxx | 6 +- src/SMDS/SMDS_MeshNodeIDFactory.hxx | 112 - src/SMDS/SMDS_MeshPrism.cxx | 182 - src/SMDS/SMDS_MeshPrism.hxx | 125 - src/SMDS/SMDS_MeshPyramid.cxx | 168 - src/SMDS/SMDS_MeshPyramid.hxx | 125 - src/SMDS/SMDS_MeshQuadrangle.cxx | 83 - src/SMDS/SMDS_MeshQuadrangle.hxx | 119 - src/SMDS/SMDS_MeshTetrahedron.cxx | 149 - src/SMDS/SMDS_MeshTetrahedron.hxx | 125 - src/SMDS/SMDS_MeshTriangle.cxx | 71 - src/SMDS/SMDS_MeshTriangle.hxx | 119 - src/SMDS/SMDS_Position.cxx | 19 + src/SMDS/SMDS_Position.hxx | 6 +- src/SMDS/SMDS_Tria3OfNodes.cxx | 107 - src/SMDS/SMDS_Tria3OfNodes.hxx | 50 - src/SMDS/SMDS_TypeOfPosition.hxx | 12 +- src/SMDS/SMDS_VertexPosition.cxx | 3 + src/SMDS/SMDS_VolumeOfFaces.cxx | 3 + src/SMDS/SMDS_VolumeOfFaces.hxx | 6 +- src/SMDS/SMDS_VolumeOfNodes.cxx | 18 +- src/SMDS/SMDS_VolumeOfNodes.hxx | 8 +- src/SMDS/SMDS_VolumeTool.cxx | 771 +++ src/SMDS/SMDS_VolumeTool.hxx | 230 + src/SMESH/Makefile.in | 15 +- src/SMESH/SMESH_Algo.hxx | 11 +- src/SMESH/SMESH_Gen.cxx | 175 +- src/SMESH/SMESH_Gen.hxx | 16 +- src/SMESH/SMESH_Group.cxx | 7 +- src/SMESH/SMESH_Group.hxx | 7 +- src/SMESH/SMESH_Hypothesis.hxx | 2 +- src/SMESH/SMESH_Mesh.cxx | 519 +- src/SMESH/SMESH_Mesh.hxx | 240 +- src/SMESH/SMESH_MeshEditor.cxx | 3525 ++++++++++++ src/SMESH/SMESH_MeshEditor.hxx | 220 + src/SMESH/SMESH_Pattern.cxx | 3655 ++++++++++++ src/SMESH/SMESH_Pattern.hxx | 257 + src/SMESH/SMESH_subMesh.cxx | 809 ++- src/SMESH/SMESH_subMesh.hxx | 20 +- src/SMESHDS/Makefile.in | 2 +- src/SMESHDS/SMESHDS_Command.cxx | 42 +- src/SMESHDS/SMESHDS_Command.hxx | 10 +- src/SMESHDS/SMESHDS_CommandType.hxx | 28 +- src/SMESHDS/SMESHDS_Document.cxx | 2 + src/SMESHDS/SMESHDS_Document.hxx | 12 +- src/SMESHDS/SMESHDS_Group.cxx | 8 +- src/SMESHDS/SMESHDS_Group.hxx | 12 +- src/SMESHDS/SMESHDS_Hypothesis.cxx | 3 +- src/SMESHDS/SMESHDS_Hypothesis.hxx | 16 +- src/SMESHDS/SMESHDS_Mesh.cxx | 121 +- src/SMESHDS/SMESHDS_Mesh.hxx | 45 +- src/SMESHDS/SMESHDS_Script.cxx | 267 +- src/SMESHDS/SMESHDS_Script.hxx | 11 +- src/SMESHDS/SMESHDS_SubMesh.cxx | 170 +- src/SMESHDS/SMESHDS_SubMesh.hxx | 36 +- src/SMESHFiltersSelection/Makefile.in | 28 +- .../SMESH_NumberFilter.cxx | 225 + .../SMESH_NumberFilter.hxx | 124 + .../SMESH_TypeFilter.cxx | 51 +- src/SMESHGUI/Makefile.in | 90 +- src/SMESHGUI/SMESHBin.cxx | 4 + src/SMESHGUI/SMESHGUI.cxx | 4881 ++++------------- src/SMESHGUI/SMESHGUI.h | 233 +- src/SMESHGUI/SMESHGUI_AddAlgorithmDlg.cxx | 466 -- src/SMESHGUI/SMESHGUI_AddAlgorithmDlg.h | 130 - src/SMESHGUI/SMESHGUI_AddEdgeDlg.cxx | 388 -- src/SMESHGUI/SMESHGUI_AddHypothesisDlg.cxx | 467 -- src/SMESHGUI/SMESHGUI_AddHypothesisDlg.h | 132 - src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx | 696 +++ ...entsDlg.h => SMESHGUI_AddMeshElementDlg.h} | 78 +- src/SMESHGUI/SMESHGUI_AddSubMeshDlg.cxx | 126 +- src/SMESHGUI/SMESHGUI_AddSubMeshDlg.h | 3 +- src/SMESHGUI/SMESHGUI_AddVolumeDlg.cxx | 406 -- src/SMESHGUI/SMESHGUI_ClippingDlg.cxx | 756 +++ src/SMESHGUI/SMESHGUI_ClippingDlg.h | 126 + src/SMESHGUI/SMESHGUI_ComputeScalarValue.cxx | 425 -- src/SMESHGUI/SMESHGUI_CreateHypothesesDlg.cxx | 36 +- src/SMESHGUI/SMESHGUI_CreateHypothesesDlg.h | 3 - src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx | 797 +++ src/SMESHGUI/SMESHGUI_CreatePatternDlg.h | 158 + src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx | 295 + src/SMESHGUI/SMESHGUI_DeleteGroupDlg.h | 96 + .../SMESHGUI_DiagonalInversionDlg.cxx | 369 -- src/SMESHGUI/SMESHGUI_EditHypothesesDlg.cxx | 278 +- src/SMESHGUI/SMESHGUI_EditHypothesesDlg.h | 6 +- src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx | 590 ++ ...InversionDlg.h => SMESHGUI_ExtrusionDlg.h} | 73 +- src/SMESHGUI/SMESHGUI_Filter.cxx | 312 +- src/SMESHGUI/SMESHGUI_Filter.h | 114 +- src/SMESHGUI/SMESHGUI_FilterDlg.cxx | 2523 ++++++--- src/SMESHGUI/SMESHGUI_FilterDlg.h | 514 +- src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx | 1159 ++++ src/SMESHGUI/SMESHGUI_FilterLibraryDlg.h | 154 + src/SMESHGUI/SMESHGUI_FilterUtils.cxx | 37 + src/SMESHGUI/SMESHGUI_FilterUtils.h | 34 + src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx | 57 + src/SMESHGUI/SMESHGUI_GEOMGenUtils.h | 38 + src/SMESHGUI/SMESHGUI_GroupDlg.cxx | 448 +- src/SMESHGUI/SMESHGUI_GroupDlg.h | 12 +- src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx | 401 ++ src/SMESHGUI/SMESHGUI_GroupOpDlg.h | 109 + src/SMESHGUI/SMESHGUI_GroupUtils.cxx | 46 + src/SMESHGUI/SMESHGUI_GroupUtils.h | 36 + src/SMESHGUI/SMESHGUI_Hypotheses.cxx | 490 ++ src/SMESHGUI/SMESHGUI_Hypotheses.h | 1 + src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx | 554 ++ src/SMESHGUI/SMESHGUI_HypothesesUtils.h | 71 + src/SMESHGUI/SMESHGUI_IdValidator.h | 68 + src/SMESHGUI/SMESHGUI_InitMeshDlg.cxx | 58 +- src/SMESHGUI/SMESHGUI_InitMeshDlg.h | 5 +- src/SMESHGUI/SMESHGUI_MergeNodesDlg.cxx | 707 +++ src/SMESHGUI/SMESHGUI_MergeNodesDlg.h | 134 + src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx | 30 +- src/SMESHGUI/SMESHGUI_MeshInfosDlg.h | 5 - src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx | 1151 ++++ src/SMESHGUI/SMESHGUI_MeshPatternDlg.h | 169 + src/SMESHGUI/SMESHGUI_MeshUtils.cxx | 47 + src/SMESHGUI/SMESHGUI_MeshUtils.h | 36 + src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx | 816 +-- src/SMESHGUI/SMESHGUI_MoveNodesDlg.h | 124 +- src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx | 1121 ++++ src/SMESHGUI/SMESHGUI_MultiEditDlg.h | 209 + src/SMESHGUI/SMESHGUI_NodesDlg.cxx | 379 +- src/SMESHGUI/SMESHGUI_NodesDlg.h | 8 +- .../SMESHGUI_OrientationElementsDlg.cxx | 372 -- src/SMESHGUI/SMESHGUI_PatternUtils.cxx | 32 + src/SMESHGUI/SMESHGUI_PatternUtils.h | 34 + src/SMESHGUI/SMESHGUI_PatternWidget.cxx | 171 + src/SMESHGUI/SMESHGUI_PatternWidget.h | 74 + src/SMESHGUI/SMESHGUI_PrecisionDlg.cxx | 221 + src/SMESHGUI/SMESHGUI_PrecisionDlg.h | 96 + .../SMESHGUI_Preferences_ScalarBarDlg.cxx | 13 +- .../SMESHGUI_Preferences_SelectionDlg.cxx | 6 +- src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx | 177 +- src/SMESHGUI/SMESHGUI_RemoveElementsDlg.h | 11 +- src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx | 187 +- src/SMESHGUI/SMESHGUI_RemoveNodesDlg.h | 10 +- ...aceDlg.cxx => SMESHGUI_RenumberingDlg.cxx} | 373 +- ...AddEdgeDlg.h => SMESHGUI_RenumberingDlg.h} | 53 +- src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx | 745 +++ src/SMESHGUI/SMESHGUI_RevolutionDlg.h | 142 + src/SMESHGUI/SMESHGUI_RotationDlg.cxx | 836 +++ src/SMESHGUI/SMESHGUI_RotationDlg.h | 143 + .../SMESHGUI_SMESHGenUtils.cxx} | 38 +- src/SMESHGUI/SMESHGUI_SMESHGenUtils.h | 35 + src/SMESHGUI/SMESHGUI_SewingDlg.cxx | 878 +++ ...HGUI_AddFaceDlg.h => SMESHGUI_SewingDlg.h} | 96 +- src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx | 544 ++ src/SMESHGUI/SMESHGUI_SingleEditDlg.h | 129 + src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx | 703 +++ ...AddVolumeDlg.h => SMESHGUI_SmoothingDlg.h} | 76 +- src/SMESHGUI/SMESHGUI_SpinBox.cxx | 4 +- src/SMESHGUI/SMESHGUI_StudyAPI.cxx | 457 -- src/SMESHGUI/SMESHGUI_StudyAPI.h | 98 - src/SMESHGUI/SMESHGUI_Swig.cxx | 9 +- src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx | 906 +++ src/SMESHGUI/SMESHGUI_SymmetryDlg.h | 144 + src/SMESHGUI/SMESHGUI_TranslationDlg.cxx | 842 +++ src/SMESHGUI/SMESHGUI_TranslationDlg.h | 137 + src/SMESHGUI/SMESHGUI_TransparencyDlg.cxx | 34 +- src/SMESHGUI/SMESHGUI_Utils.cxx | 196 + src/SMESHGUI/SMESHGUI_Utils.h | 99 + src/SMESHGUI/SMESHGUI_VTKUtils.cxx | 653 +++ src/SMESHGUI/SMESHGUI_VTKUtils.h | 189 + src/SMESHGUI/SMESHGUI_XmlHandler.cxx | 14 +- src/SMESHGUI/SMESHGUI_XmlHandler.h | 12 +- src/SMESHGUI/SMESHGUI_aParameter.cxx | 119 + src/SMESHGUI/SMESHGUI_aParameter.h | 117 + src/SMESHGUI/SMESHGUI_aParameterDlg.cxx | 206 +- src/SMESHGUI/SMESHGUI_aParameterDlg.h | 41 +- src/SMESHGUI/SMESH_icons.po | 98 +- src/SMESHGUI/SMESH_msg_en.po | 916 +++- src/SMESH_I/Makefile.in | 23 +- src/SMESH_I/SMESHEngine.cxx | 23 + src/SMESH_I/SMESH_Algo_i.cxx | 2 +- src/SMESH_I/SMESH_Filter_i.cxx | 2730 ++++++--- src/SMESH_I/SMESH_Filter_i.hxx | 1039 ++-- src/SMESH_I/SMESH_Gen_i.cxx | 736 ++- src/SMESH_I/SMESH_Gen_i.hxx | 33 +- src/SMESH_I/SMESH_MEDFamily_i.cxx | 8 +- src/SMESH_I/SMESH_MEDMesh_i.cxx | 3 +- src/SMESH_I/SMESH_MeshEditor_i.cxx | 682 ++- src/SMESH_I/SMESH_MeshEditor_i.hxx | 104 +- src/SMESH_I/SMESH_Mesh_i.cxx | 748 ++- src/SMESH_I/SMESH_Mesh_i.hxx | 65 +- src/SMESH_I/SMESH_Pattern_i.cxx | 359 ++ src/SMESH_I/SMESH_Pattern_i.hxx | 93 + src/SMESH_I/SMESH_subMesh_i.cxx | 50 +- src/SMESH_I/SMESH_subMesh_i.hxx | 3 +- src/SMESH_I/SMESH_test.py | 173 +- src/SMESH_SWIG/Makefile.in | 11 +- src/SMESH_SWIG/SMESH_BelongToGeom.py | 28 + src/SMESH_SWIG/SMESH_GroupFromGeom.py | 49 + src/SMESH_SWIG/SMESH_Partition1_tetra.py | 133 +- src/SMESH_SWIG/SMESH_blocks.py | 43 + src/SMESH_SWIG/SMESH_box2_tetra.py | 69 +- src/SMESH_SWIG/SMESH_box3_tetra.py | 82 +- src/SMESH_SWIG/SMESH_box_tetra.py | 36 +- src/SMESH_SWIG/SMESH_controls.py | 20 +- src/SMESH_SWIG/SMESH_fixation.py | 350 +- src/SMESH_SWIG/SMESH_fixation_hexa.py | 38 +- src/SMESH_SWIG/SMESH_fixation_tetra.py | 43 +- src/SMESH_SWIG/SMESH_flight_skin.py | 48 +- src/SMESH_SWIG/SMESH_freebord.py | 20 +- src/SMESH_SWIG/SMESH_mechanic.py | 351 +- src/SMESH_SWIG/SMESH_mechanic_tetra.py | 130 +- src/SMESH_SWIG/SMESH_test0.py | 46 +- src/SMESH_SWIG/SMESH_test1.py | 60 +- src/SMESH_SWIG/SMESH_test2.py | 5 +- src/SMESH_SWIG/SMESH_test3.py | 84 +- src/SMESH_SWIG/SMESH_test4.py | 21 +- src/SMESH_SWIG/SMESH_test5.py | 79 + src/SMESH_SWIG/batchmode_mefisto.py | 64 +- src/SMESH_SWIG/batchmode_smesh.py | 247 +- src/StdMeshers/Makefile.in | 14 +- src/StdMeshers/StdMeshers_Arithmetic1D.cxx | 139 + src/StdMeshers/StdMeshers_Arithmetic1D.hxx | 55 + src/StdMeshers/StdMeshers_Deflection1D.cxx | 136 + .../StdMeshers_Deflection1D.hxx} | 36 +- src/StdMeshers/StdMeshers_Hexa_3D.cxx | 158 +- src/StdMeshers/StdMeshers_MEFISTO_2D.cxx | 717 ++- src/StdMeshers/StdMeshers_MEFISTO_2D.hxx | 32 +- src/StdMeshers/StdMeshers_Propagation.cxx | 102 + src/StdMeshers/StdMeshers_Propagation.hxx | 47 + src/StdMeshers/StdMeshers_Quadrangle_2D.cxx | 1286 +++-- src/StdMeshers/StdMeshers_Quadrangle_2D.hxx | 12 +- src/StdMeshers/StdMeshers_Regular_1D.cxx | 680 ++- src/StdMeshers/StdMeshers_Regular_1D.hxx | 39 +- src/StdMeshers/StdMeshers_StartEndLength.cxx | 143 + src/StdMeshers/StdMeshers_StartEndLength.hxx | 53 + src/StdMeshersGUI/Makefile.in | 28 +- src/StdMeshersGUI/StdMeshersGUI.cxx | 146 +- .../StdMeshersGUI_CreateHypothesisDlg.cxx | 343 ++ ....h => StdMeshersGUI_CreateHypothesisDlg.h} | 45 +- .../StdMeshersGUI_CreateStdHypothesisDlg.cxx | 109 + .../StdMeshersGUI_CreateStdHypothesisDlg.h} | 58 +- .../StdMeshersGUI_LocalLengthDlg.cxx | 296 - .../StdMeshersGUI_MaxElementAreaDlg.cxx | 299 - .../StdMeshersGUI_MaxElementAreaDlg.h | 89 - .../StdMeshersGUI_MaxElementVolumeDlg.cxx | 298 - .../StdMeshersGUI_MaxElementVolumeDlg.h | 89 - .../StdMeshersGUI_NbSegmentsDlg.cxx | 297 - .../StdMeshersGUI_NbSegmentsDlg.h | 89 - .../StdMeshersGUI_Parameters.cxx | 306 ++ src/StdMeshersGUI/StdMeshersGUI_Parameters.h | 54 + src/StdMeshersGUI/StdMeshers_icons.po | 32 + src/StdMeshersGUI/StdMeshers_msg_en.po | 49 +- src/StdMeshers_I/Makefile.in | 8 +- .../StdMeshers_Arithmetic1D_i.cxx | 120 + .../StdMeshers_Arithmetic1D_i.hxx | 63 + .../StdMeshers_Deflection1D_i.cxx | 119 + .../StdMeshers_Deflection1D_i.hxx} | 69 +- src/StdMeshers_I/StdMeshers_Propagation_i.cxx | 76 + src/StdMeshers_I/StdMeshers_Propagation_i.hxx | 57 + .../StdMeshers_StartEndLength_i.cxx | 120 + .../StdMeshers_StartEndLength_i.hxx | 67 + src/StdMeshers_I/StdMeshers_i.cxx | 16 +- 534 files changed, 56743 insertions(+), 25907 deletions(-) delete mode 100644 adm_local/unix/config_files/check_Netgen.m4 create mode 100644 adm_local/unix/make_conclude.in create mode 100755 doc/salome/gui/SMESH/files/arithmetic_1d.htm create mode 100755 doc/salome/gui/SMESH/files/deflection_1d.htm create mode 100755 doc/salome/gui/SMESH/files/length_from_edges.htm create mode 100755 doc/salome/gui/SMESH/files/non_conform_mesh_allowed_hypothesis.htm create mode 100755 doc/salome/gui/SMESH/files/propagation_of_1d_hypothesis_on_opposite_edges.htm create mode 100755 doc/salome/gui/SMESH/files/start_and_end_length_hypothesis.htm create mode 100755 doc/salome/gui/SMESH/image12.gif create mode 100755 doc/salome/gui/SMESH/image13.gif create mode 100755 doc/salome/gui/SMESH/image14.gif create mode 100755 doc/salome/gui/SMESH/image15.gif create mode 100755 doc/salome/gui/SMESH/image16.gif create mode 100755 doc/salome/gui/SMESH/image16.jpg create mode 100755 doc/salome/gui/SMESH/image17.jpg create mode 100755 doc/salome/gui/SMESH/image18.jpg create mode 100755 doc/salome/gui/SMESH/image20.jpg create mode 100755 doc/salome/gui/SMESH/image21.jpg create mode 100755 doc/salome/gui/SMESH/image7.gif create mode 100755 doc/salome/gui/SMESH/image8.gif create mode 100755 doc/salome/gui/SMESH/image9.gif create mode 100755 doc/salome/gui/SMESH/smesh.htm create mode 100755 doc/salome/gui/SMESH/smesh_csh.htm create mode 100755 doc/salome/gui/SMESH/smesh_rhc.htm create mode 100755 doc/salome/gui/SMESH/tetrahedron_(ghs3d)_meshing_algorithm.htm create mode 100755 doc/salome/gui/SMESH/whgdata/whlstf4.htm create mode 100644 idl/SMESH_Pattern.idl delete mode 100644 resources/SMESH_Meshers.xml delete mode 100644 resources/SMESH_MeshersWithNETGEN.xml create mode 100644 resources/mesh_cutGroups.png create mode 100644 resources/mesh_cutquad.png create mode 100644 resources/mesh_deleteGroups.png create mode 100644 resources/mesh_extrusion.png create mode 100644 resources/mesh_intersectGroups.png create mode 100644 resources/mesh_merge_nodes.png create mode 100755 resources/mesh_pattern.png create mode 100644 resources/mesh_renumbering_elements.png create mode 100644 resources/mesh_renumbering_nodes.png create mode 100644 resources/mesh_revolution.png create mode 100644 resources/mesh_rotation.png create mode 100644 resources/mesh_sew_bordertoside.png create mode 100644 resources/mesh_sew_conform_freeborders.png create mode 100644 resources/mesh_sew_freeborders.png create mode 100644 resources/mesh_sew_sideelements.png create mode 100644 resources/mesh_smoothing.png create mode 100644 resources/mesh_symmetry_axis.png create mode 100644 resources/mesh_symmetry_plane.png create mode 100644 resources/mesh_symmetry_point.png create mode 100644 resources/mesh_translation_points.png create mode 100644 resources/mesh_translation_vector.png create mode 100644 resources/mesh_union2tri.png create mode 100644 resources/mesh_unionGroups.png create mode 100644 resources/mesh_uniontri.png create mode 100755 resources/pattern_sample_2d.png create mode 100755 resources/pattern_sample_3D.png create mode 100644 src/Controls/Makefile.in rename src/{SMDS/SMDS_IteratorOfArray.hxx => Controls/SMESHControls.cxx} (69%) create mode 100644 src/Controls/SMESH_Controls.cxx create mode 100644 src/Controls/SMESH_Controls.hxx delete mode 100644 src/Driver/Document_Reader.h create mode 100644 src/Driver/Driver_Document.cxx rename src/Driver/{Mesh_Reader.h => Driver_Document.h} (71%) rename src/Driver/{Document_Reader.cxx => Driver_Mesh.cxx} (79%) rename src/Driver/{Document_Writer.h => Driver_Mesh.h} (60%) rename src/Driver/{Mesh_Reader.cxx => Driver_SMDS_Mesh.cxx} (85%) create mode 100644 src/Driver/Driver_SMDS_Mesh.h rename src/Driver/{Document_Writer.cxx => Driver_SMESHDS_Mesh.cxx} (75%) create mode 100644 src/Driver/Driver_SMESHDS_Mesh.h delete mode 100644 src/Driver/Driver_dl.cxx delete mode 100644 src/Driver/SMESHDriver.cxx create mode 100644 src/DriverDAT/DAT_Test.cxx create mode 100644 src/DriverMED/MED_Test.cxx create mode 100644 src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx rename idl/SMESH_NetgenAlgorithm.idl => src/DriverSTL/DriverSTL_R_SMDS_Mesh.h (65%) create mode 100644 src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx rename src/{Driver/Mesh_Writer.h => DriverSTL/DriverSTL_W_SMDS_Mesh.h} (59%) create mode 100644 src/DriverSTL/Makefile.in create mode 100644 src/DriverSTL/STL_Test.cxx create mode 100644 src/DriverUNV/UNV2411_Structure.cxx rename src/{Driver/SMESHDriver.h => DriverUNV/UNV2411_Structure.hxx} (59%) create mode 100644 src/DriverUNV/UNV2412_Structure.cxx create mode 100644 src/DriverUNV/UNV2412_Structure.hxx create mode 100644 src/DriverUNV/UNV_Test.cxx create mode 100644 src/DriverUNV/UNV_Utilities.cxx create mode 100644 src/DriverUNV/UNV_Utilities.hxx create mode 100644 src/OBJECT/SMESH_ActorUtils.cxx rename src/{Driver/Mesh_Writer.cxx => OBJECT/SMESH_ActorUtils.h} (84%) create mode 100644 src/OBJECT/SMESH_ExtractGeometry.cxx rename src/{SMDS/SMDS_HexahedronOfNodes.hxx => OBJECT/SMESH_ExtractGeometry.h} (51%) delete mode 100644 src/SMDS/SMDSControl.cxx delete mode 100644 src/SMDS/SMDSControl.hxx delete mode 100644 src/SMDS/SMDSControl_BoundaryEdges.cxx delete mode 100644 src/SMDS/SMDSControl_BoundaryEdges.hxx delete mode 100644 src/SMDS/SMDSControl_BoundaryFaces.cxx delete mode 100644 src/SMDS/SMDSControl_BoundaryFaces.hxx delete mode 100644 src/SMDS/SMDSControl_MeshBoundary.cxx delete mode 100644 src/SMDS/SMDSControl_MeshBoundary.hxx delete mode 100644 src/SMDS/SMDSEdit_Transform.cxx delete mode 100644 src/SMDS/SMDSEdit_Transform.hxx delete mode 100644 src/SMDS/SMDS_HexahedronOfNodes.cxx delete mode 100644 src/SMDS/SMDS_MeshHexahedron.cxx delete mode 100644 src/SMDS/SMDS_MeshHexahedron.hxx delete mode 100644 src/SMDS/SMDS_MeshNodeIDFactory.hxx delete mode 100644 src/SMDS/SMDS_MeshPrism.cxx delete mode 100644 src/SMDS/SMDS_MeshPrism.hxx delete mode 100644 src/SMDS/SMDS_MeshPyramid.cxx delete mode 100644 src/SMDS/SMDS_MeshPyramid.hxx delete mode 100644 src/SMDS/SMDS_MeshQuadrangle.cxx delete mode 100644 src/SMDS/SMDS_MeshQuadrangle.hxx delete mode 100644 src/SMDS/SMDS_MeshTetrahedron.cxx delete mode 100644 src/SMDS/SMDS_MeshTetrahedron.hxx delete mode 100644 src/SMDS/SMDS_MeshTriangle.cxx delete mode 100644 src/SMDS/SMDS_MeshTriangle.hxx delete mode 100644 src/SMDS/SMDS_Tria3OfNodes.cxx delete mode 100644 src/SMDS/SMDS_Tria3OfNodes.hxx create mode 100644 src/SMDS/SMDS_VolumeTool.cxx create mode 100644 src/SMDS/SMDS_VolumeTool.hxx create mode 100644 src/SMESH/SMESH_MeshEditor.cxx create mode 100644 src/SMESH/SMESH_MeshEditor.hxx create mode 100644 src/SMESH/SMESH_Pattern.cxx create mode 100644 src/SMESH/SMESH_Pattern.hxx create mode 100644 src/SMESHFiltersSelection/SMESH_NumberFilter.cxx create mode 100644 src/SMESHFiltersSelection/SMESH_NumberFilter.hxx create mode 100644 src/SMESHGUI/SMESHBin.cxx delete mode 100644 src/SMESHGUI/SMESHGUI_AddAlgorithmDlg.cxx delete mode 100644 src/SMESHGUI/SMESHGUI_AddAlgorithmDlg.h delete mode 100644 src/SMESHGUI/SMESHGUI_AddEdgeDlg.cxx delete mode 100644 src/SMESHGUI/SMESHGUI_AddHypothesisDlg.cxx delete mode 100644 src/SMESHGUI/SMESHGUI_AddHypothesisDlg.h create mode 100644 src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx rename src/SMESHGUI/{SMESHGUI_OrientationElementsDlg.h => SMESHGUI_AddMeshElementDlg.h} (53%) delete mode 100644 src/SMESHGUI/SMESHGUI_AddVolumeDlg.cxx create mode 100644 src/SMESHGUI/SMESHGUI_ClippingDlg.cxx create mode 100644 src/SMESHGUI/SMESHGUI_ClippingDlg.h delete mode 100644 src/SMESHGUI/SMESHGUI_ComputeScalarValue.cxx create mode 100755 src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx create mode 100755 src/SMESHGUI/SMESHGUI_CreatePatternDlg.h create mode 100644 src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx create mode 100644 src/SMESHGUI/SMESHGUI_DeleteGroupDlg.h delete mode 100644 src/SMESHGUI/SMESHGUI_DiagonalInversionDlg.cxx create mode 100644 src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx rename src/SMESHGUI/{SMESHGUI_DiagonalInversionDlg.h => SMESHGUI_ExtrusionDlg.h} (63%) create mode 100644 src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx create mode 100644 src/SMESHGUI/SMESHGUI_FilterLibraryDlg.h create mode 100644 src/SMESHGUI/SMESHGUI_FilterUtils.cxx create mode 100644 src/SMESHGUI/SMESHGUI_FilterUtils.h create mode 100644 src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx create mode 100644 src/SMESHGUI/SMESHGUI_GEOMGenUtils.h create mode 100644 src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx create mode 100644 src/SMESHGUI/SMESHGUI_GroupOpDlg.h create mode 100644 src/SMESHGUI/SMESHGUI_GroupUtils.cxx create mode 100644 src/SMESHGUI/SMESHGUI_GroupUtils.h create mode 100644 src/SMESHGUI/SMESHGUI_Hypotheses.cxx create mode 100644 src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx create mode 100644 src/SMESHGUI/SMESHGUI_HypothesesUtils.h create mode 100644 src/SMESHGUI/SMESHGUI_IdValidator.h create mode 100644 src/SMESHGUI/SMESHGUI_MergeNodesDlg.cxx create mode 100644 src/SMESHGUI/SMESHGUI_MergeNodesDlg.h create mode 100755 src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx create mode 100755 src/SMESHGUI/SMESHGUI_MeshPatternDlg.h create mode 100644 src/SMESHGUI/SMESHGUI_MeshUtils.cxx create mode 100644 src/SMESHGUI/SMESHGUI_MeshUtils.h create mode 100755 src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx create mode 100755 src/SMESHGUI/SMESHGUI_MultiEditDlg.h delete mode 100644 src/SMESHGUI/SMESHGUI_OrientationElementsDlg.cxx create mode 100644 src/SMESHGUI/SMESHGUI_PatternUtils.cxx create mode 100644 src/SMESHGUI/SMESHGUI_PatternUtils.h create mode 100644 src/SMESHGUI/SMESHGUI_PatternWidget.cxx create mode 100644 src/SMESHGUI/SMESHGUI_PatternWidget.h create mode 100755 src/SMESHGUI/SMESHGUI_PrecisionDlg.cxx create mode 100755 src/SMESHGUI/SMESHGUI_PrecisionDlg.h rename src/SMESHGUI/{SMESHGUI_AddFaceDlg.cxx => SMESHGUI_RenumberingDlg.cxx} (59%) rename src/SMESHGUI/{SMESHGUI_AddEdgeDlg.h => SMESHGUI_RenumberingDlg.h} (74%) create mode 100644 src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx create mode 100644 src/SMESHGUI/SMESHGUI_RevolutionDlg.h create mode 100644 src/SMESHGUI/SMESHGUI_RotationDlg.cxx create mode 100644 src/SMESHGUI/SMESHGUI_RotationDlg.h rename src/{SMDS/SMDS_MeshNodeIDFactory.cxx => SMESHGUI/SMESHGUI_SMESHGenUtils.cxx} (63%) create mode 100644 src/SMESHGUI/SMESHGUI_SMESHGenUtils.h create mode 100644 src/SMESHGUI/SMESHGUI_SewingDlg.cxx rename src/SMESHGUI/{SMESHGUI_AddFaceDlg.h => SMESHGUI_SewingDlg.h} (59%) create mode 100755 src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx create mode 100755 src/SMESHGUI/SMESHGUI_SingleEditDlg.h create mode 100644 src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx rename src/SMESHGUI/{SMESHGUI_AddVolumeDlg.h => SMESHGUI_SmoothingDlg.h} (61%) delete mode 100644 src/SMESHGUI/SMESHGUI_StudyAPI.cxx delete mode 100644 src/SMESHGUI/SMESHGUI_StudyAPI.h create mode 100644 src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx create mode 100644 src/SMESHGUI/SMESHGUI_SymmetryDlg.h create mode 100644 src/SMESHGUI/SMESHGUI_TranslationDlg.cxx create mode 100644 src/SMESHGUI/SMESHGUI_TranslationDlg.h create mode 100644 src/SMESHGUI/SMESHGUI_Utils.cxx create mode 100644 src/SMESHGUI/SMESHGUI_Utils.h create mode 100644 src/SMESHGUI/SMESHGUI_VTKUtils.cxx create mode 100644 src/SMESHGUI/SMESHGUI_VTKUtils.h create mode 100644 src/SMESHGUI/SMESHGUI_aParameter.cxx create mode 100644 src/SMESHGUI/SMESHGUI_aParameter.h create mode 100644 src/SMESH_I/SMESHEngine.cxx create mode 100644 src/SMESH_I/SMESH_Pattern_i.cxx create mode 100644 src/SMESH_I/SMESH_Pattern_i.hxx create mode 100644 src/SMESH_SWIG/SMESH_BelongToGeom.py create mode 100644 src/SMESH_SWIG/SMESH_GroupFromGeom.py create mode 100644 src/SMESH_SWIG/SMESH_blocks.py create mode 100644 src/SMESH_SWIG/SMESH_test5.py create mode 100644 src/StdMeshers/StdMeshers_Arithmetic1D.cxx create mode 100644 src/StdMeshers/StdMeshers_Arithmetic1D.hxx create mode 100644 src/StdMeshers/StdMeshers_Deflection1D.cxx rename src/{SMESHGUI/SMESHGUI_ComputeScalarValue.h => StdMeshers/StdMeshers_Deflection1D.hxx} (56%) create mode 100644 src/StdMeshers/StdMeshers_Propagation.cxx create mode 100644 src/StdMeshers/StdMeshers_Propagation.hxx create mode 100644 src/StdMeshers/StdMeshers_StartEndLength.cxx create mode 100644 src/StdMeshers/StdMeshers_StartEndLength.hxx create mode 100644 src/StdMeshersGUI/StdMeshersGUI_CreateHypothesisDlg.cxx rename src/StdMeshersGUI/{StdMeshersGUI_LocalLengthDlg.h => StdMeshersGUI_CreateHypothesisDlg.h} (65%) create mode 100644 src/StdMeshersGUI/StdMeshersGUI_CreateStdHypothesisDlg.cxx rename src/{SMESH_I/SMESH_topo.cxx => StdMeshersGUI/StdMeshersGUI_CreateStdHypothesisDlg.h} (51%) delete mode 100644 src/StdMeshersGUI/StdMeshersGUI_LocalLengthDlg.cxx delete mode 100644 src/StdMeshersGUI/StdMeshersGUI_MaxElementAreaDlg.cxx delete mode 100644 src/StdMeshersGUI/StdMeshersGUI_MaxElementAreaDlg.h delete mode 100644 src/StdMeshersGUI/StdMeshersGUI_MaxElementVolumeDlg.cxx delete mode 100644 src/StdMeshersGUI/StdMeshersGUI_MaxElementVolumeDlg.h delete mode 100644 src/StdMeshersGUI/StdMeshersGUI_NbSegmentsDlg.cxx delete mode 100644 src/StdMeshersGUI/StdMeshersGUI_NbSegmentsDlg.h create mode 100644 src/StdMeshersGUI/StdMeshersGUI_Parameters.cxx create mode 100644 src/StdMeshersGUI/StdMeshersGUI_Parameters.h create mode 100644 src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx create mode 100644 src/StdMeshers_I/StdMeshers_Arithmetic1D_i.hxx create mode 100644 src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx rename src/{SMESH_I/SMESH_topo.hxx => StdMeshers_I/StdMeshers_Deflection1D_i.hxx} (51%) create mode 100644 src/StdMeshers_I/StdMeshers_Propagation_i.cxx create mode 100644 src/StdMeshers_I/StdMeshers_Propagation_i.hxx create mode 100644 src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx create mode 100644 src/StdMeshers_I/StdMeshers_StartEndLength_i.hxx diff --git a/INSTALL b/INSTALL index 694c906d4..d17758ff4 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,5 @@ -This is SMESH V2.0.0 - +This is the version 2.1.0 of SMESH Compatible with : - GEOM V2_0_0 - KERNEL V2_0_0 - MED V2_0_0 + - KERNEL 2.1.0 + - GEOM 2.1.0 + - MED 2.1.0 diff --git a/Makefile.in b/Makefile.in index a79be56d3..cae80c162 100644 --- a/Makefile.in +++ b/Makefile.in @@ -86,13 +86,39 @@ mesh_wrap.png \ mesh_tree_group.png \ mesh_edit_group.png \ mesh_make_group.png \ +mesh_union2tri.png \ +mesh_uniontri.png \ +mesh_cutquad.png \ +mesh_smoothing.png \ +mesh_renumbering_nodes.png \ +mesh_renumbering_elements.png \ +mesh_extrusion.png \ +mesh_revolution.png \ ModuleMesh.png \ +mesh_unionGroups.png \ +mesh_intersectGroups.png \ +mesh_cutGroups.png \ +mesh_deleteGroups.png \ +mesh_translation_vector.png \ +mesh_translation_points.png \ +mesh_rotation.png \ +mesh_symmetry_point.png \ +mesh_symmetry_axis.png \ +mesh_symmetry_plane.png \ +mesh_sew_freeborders.png \ +mesh_sew_conform_freeborders.png \ +mesh_sew_bordertoside.png \ +mesh_sew_sideelements.png \ +mesh_merge_nodes.png \ select1.png \ SMESH_en.xml \ SMESH.config \ StdMeshers.xml \ SMESHCatalog.xml \ -flight_solid.brep +flight_solid.brep \ +mesh_pattern.png \ +pattern_sample_2d.png \ +pattern_sample_3D.png BIN_SCRIPT= \ VERSION diff --git a/adm_local/unix/config_files/check_Geom.m4 b/adm_local/unix/config_files/check_Geom.m4 index 803ca754b..13f3be40c 100644 --- a/adm_local/unix/config_files/check_Geom.m4 +++ b/adm_local/unix/config_files/check_Geom.m4 @@ -22,20 +22,11 @@ if test "x$GEOM_DIR" == "x" ; then # GEOM_ROOT_DIR environment variable defined GEOM_DIR=$GEOM_ROOT_DIR - else - - # search Geom binaries in PATH variable - AC_PATH_PROG(TEMP, libGEOM_Swig.py) - if test "x$TEMP" != "x" ; then - GEOM_BIN_DIR=`dirname $TEMP` - GEOM_DIR=`dirname $GEOM_BIN_DIR` - fi - fi # fi -if test -f ${GEOM_DIR}/bin/salome/libGEOM_Swig.py ; then +if test -f ${GEOM_DIR}/lib/salome/libGEOMClient.so ; then Geom_ok=yes AC_MSG_RESULT(Using Geom module distribution in ${GEOM_DIR}) diff --git a/adm_local/unix/config_files/check_Med.m4 b/adm_local/unix/config_files/check_Med.m4 index 492727053..727bf4381 100644 --- a/adm_local/unix/config_files/check_Med.m4 +++ b/adm_local/unix/config_files/check_Med.m4 @@ -22,20 +22,11 @@ if test "x$MED_DIR" == "x" ; then # MED_ROOT_DIR environment variable defined MED_DIR=$MED_ROOT_DIR - else - - # search Med binaries in PATH variable - AC_PATH_PROG(TEMP, libMEDMEM_Swig.py) - if test "x$TEMP" != "x" ; then - MED_BIN_DIR=`dirname $TEMP` - MED_DIR=`dirname $MED_BIN_DIR` - fi - fi # fi -if test -f ${MED_DIR}/bin/salome/libMEDMEM_Swig.py ; then +if test -f ${MED_DIR}/idl/salome/MED.idl ; then Med_ok=yes AC_MSG_RESULT(Using Med module distribution in ${MED_DIR}) diff --git a/adm_local/unix/config_files/check_Netgen.m4 b/adm_local/unix/config_files/check_Netgen.m4 deleted file mode 100644 index 971477c3d..000000000 --- a/adm_local/unix/config_files/check_Netgen.m4 +++ /dev/null @@ -1,126 +0,0 @@ -AC_DEFUN([CHECK_NETGEN],[ - -AC_REQUIRE([AC_PROG_CXX])dnl -AC_REQUIRE([AC_PROG_CXXCPP])dnl - -AC_CHECKING(for Netgen Libraries) - -AC_LANG_SAVE -AC_LANG_CPLUSPLUS - -AC_ARG_WITH(netgen, - [ --with-netgen=DIR root directory path of NETGEN installation], - WITHNETGEN="yes",WITHNETGEN="no") - -NETGEN_INCLUDES="" -NETGEN_LIBS="" - -Netgen_ok=no - -if test "$WITHNETGEN" = yes; then - - echo - echo - echo ------------------------------------------------- - echo You are about to choose to use somehow the - echo Netgen Library to generate Tetrahedric mesh. - echo - echo WARNING - echo ---------------------------------------------------------- - echo ---------------------------------------------------------- - echo You are strongly advised to consult the file - echo SMESH_SRC/src/NETGEN/ReadMeForNgUsers, particularly about - echo assumptions made on the installation of the Netgen - echo application and libraries. - echo Ask your system administrator for those details. - echo ---------------------------------------------------------- - echo ---------------------------------------------------------- - echo - echo - - NETGEN_HOME=$withval - - if test "$NETGEN_HOME"; then - NETGEN_INCLUDES="-I$NETGEN_HOME/include" - NETGEN_LIBS_DIR="$NETGEN_HOME/lib/LINUX" - NETGEN_LIBS="-L$NETGEN_LIBS_DIR" - fi - - CPPFLAGS_old="$CPPFLAGS" - CPPFLAGS="$NETGEN_INCLUDES $CPPFLAGS" - CXXFLAGS_old="$CXXFLAGS" - CXXFLAGS="$NETGEN_INCLUDES $CXXFLAGS" - - AC_MSG_CHECKING(for Netgen header file) - - AC_CHECK_HEADER(nglib.h,Netgen_ok=yes,Netgen_ok=no) - CPPFLAGS="$CPPFLAGS_old" - CXXFLAGS="$CXXFLAGS_old" - - if test "$WITHNETGEN" = "yes";then - NETGEN_LIBS="-L. -lNETGEN" - - AC_MSG_CHECKING(for Netgen libraries) - - CPPFLAGS_old="$CPPFLAGS" - CPPFLAGS="$NETGEN_INCLUDES $CPPFLAGS" - CXXFLAGS_old="$CXXFLAGS" - CXXFLAGS="$NETGEN_INCLUDES $CXXFLAGS" - - LDFLAGS_old="$LDFLAGS" - LDFLAGS="$NETGEN_LIBS $LDFLAGS" - - AC_TRY_COMPILE(#include -#include -#include "nglib.h" -,Ng_Init(); - Ng_Exit();,Netgen_ok=yes;ar x "$NETGEN_LIBS_DIR/libnginterface.a"; - ar x "$NETGEN_LIBS_DIR/libcsg.a"; - ar x "$NETGEN_LIBS_DIR/libgprim.a"; - ar x "$NETGEN_LIBS_DIR/libmesh.a"; - ar x "$NETGEN_LIBS_DIR/libopti.a"; - ar x "$NETGEN_LIBS_DIR/libgen.a"; - ar x "$NETGEN_LIBS_DIR/libla.a"; - ar x "$NETGEN_LIBS_DIR/libstlgeom.a"; - ar x "$NETGEN_LIBS_DIR/libgeom2d.a"; - $CXX -shared linopt.o bfgs.o linsearch.o global.o bisect.o meshtool.o refine.o ruler3.o improve3.o adfront3.o tetrarls.o prism2rls.o pyramidrls.o pyramid2rls.o netrule3.o ruler2.o meshclass.o improve2.o adfront2.o netrule2.o triarls.o geomsearch.o secondorder.o meshtype.o parser3.o quadrls.o specials.o parser2.o meshing2.o meshing3.o meshfunc.o localh.o improve2gen.o delaunay.o boundarylayer.o msghandler.o meshfunc2d.o smoothing2.o smoothing3.o topology.o curvedelems.o clusters.o zrefine.o ngexception.o geomtest3d.o geom2d.o geom3d.o adtree.o transform3d.o geomfuncs.o polynomial.o densemat.o vector.o basemat.o sparsmat.o algprim.o brick.o manifold.o bspline2d.o meshsurf.o csgeom.o polyhedra.o curve2d.o singularref.o edgeflw.o solid.o explicitcurve2d.o specpoin.o gencyl.o revolution.o genmesh.o spline3d.o surface.o identify.o triapprox.o meshstlsurface.o stlline.o stltopology.o stltool.o stlgeom.o stlgeomchart.o stlgeommesh.o table.o optmem.o spbita2d.o hashtabl.o sort.o flags.o seti.o bitarray.o array.o symbolta.o mystring.o moveablemem.o spline2d.o splinegeometry2.o ngnewdelete.o nglib.o -o libNETGEN.so; - rm -rf adfront2.o adfront3.o adtree.o algprim.o array.o basemat.o bfgs.o bisect.o bitarray.o boundarylayer.o brick.o bspline2d.o clusters.o csgeom.o csgparser.o curve2d.o curvedelems.o delaunay.o densemat.o dynamicmem.o edgeflw.o explicitcurve2d.o extrusion.o flags.o gencyl.o genmesh.o geom2dmesh.o geom2d.o geom3d.o geomfuncs.o geomsearch.o geomtest3d.o global.o hashtabl.o hprefinement.o identify.o importsolution.o improve2gen.o improve2.o improve3.o linopt.o linsearch.o localh.o manifold.o meshclass.o meshfunc2d.o meshfunc.o meshing2.o meshing3.o meshstlsurface.o meshsurf.o meshtool.o meshtype.o moveablemem.o msghandler.o mystring.o netrule2.o netrule3.o ngexception.o nglib.o ngnewdelete.o optmem.o parser2.o parser3.o parthreads.o polyhedra.o polynomial.o prism2rls.o pyramid2rls.o pyramidrls.o quadrls.o readuser.o refine.o revolution.o ruler2.o ruler3.o secondorder.o seti.o singularref.o smoothing2.o smoothing3.o solid.o sort.o sparsmat.o spbita2d.o specials.o specpoin.o spline2d.o spline3d.o splinegeometry2.o stlgeomchart.o stlgeommesh.o stlgeom.o stlline.o stltool.o stltopology.o surface.o symbolta.o table.o tetrarls.o topology.o transform3d.o triapprox.o triarls.o vector.o writeabaqus.o writediffpack.o writefeap.o writefluent.o writepermas.o writetecplot.o writetochnog.o writeuser.o wuchemnitz.o zrefine.o, - Netgen_ok=no) - - AC_CACHE_VAL(salome_netgen_lib,[ - AC_TRY_LINK( -#include -#include -#include "nglib.h" -,Ng_Init(); - Ng_Exit();, - eval "salome_netgen_lib=yes";rm -rf libNETGEN.so,eval "salome_netgen_lib=no";rm -rf libNETGEN.so) - ]) - Netgen_ok="$salome_netgen_lib" - - - LDFLAGS="$LDFLAGS_old" - CPPFLAGS="$CPPFLAGS_old" - CXXFLAGS="$CXXFLAGS_old" - fi - - -if test "x$Netgen_ok" = xno ; then - AC_MSG_RESULT(no) - AC_MSG_WARN(Netgen libraries not found or not properly installed) -else - AC_MSG_RESULT(yes) - NETGEN_LIBS="-lNETGEN" - CPPFLAGS="${CPPFLAGS} -DHAVE_NETGEN" - IDLCXXFLAGS="${IDLCXXFLAGS} -DHAVE_NETGEN" - OMNIORB_IDLPYFLAGS="${OMNIORB_IDLPYFLAGS} -DHAVE_NETGEN" -fi -fi -AC_SUBST(NETGEN_INCLUDES) -AC_SUBST(NETGEN_LIBS) -AC_SUBST(NETGEN_LIBS_DIR) -AC_SUBST(WITHNETGEN) - -AC_LANG_RESTORE - -])dnl diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index ad1a9a52f..43b015ee6 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -10,9 +10,12 @@ HAVE_SSTREAM=@HAVE_SSTREAM@ LIBS=@LIBS@ +LIBSFORBIN=@LIBS@ LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome +LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome # add libstdc++ to link c++ library with libtool ! LDFLAGS+= -lstdc++ +LDFLAGSFORBIN+= -lstdc++ CP=@CP@ @@ -31,7 +34,7 @@ C_DEPEND_FLAG = @C_DEPEND_FLAG@ # C++ CXX = @CXX@ -CXXFLAGS = @CXXFLAGS@ +CXXFLAGS = @CXXFLAGS@ CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@ # BOOST Library diff --git a/adm_local/unix/make_conclude.in b/adm_local/unix/make_conclude.in new file mode 100644 index 000000000..9eac1df82 --- /dev/null +++ b/adm_local/unix/make_conclude.in @@ -0,0 +1,346 @@ +#======================================================================= +# This section of this makefile comes from the file +# 'adm/unix/make_conclude' which was generated with config.status +# from file adm/unix/make_conclude.in +#======================================================================= +# -* Makefile *- +# +# Authors : Patrick GOLDBRONN (CEA) - Marc Tajchman (CEA) +# Date : 6/07/2001 +# $Header$ +# + +# ORB Specifics rules +@CORBA@ + +# transform idl reference in appropriate obj file +LIB_CLIENT_SRC = $(LIB_CLIENT_IDL:%.idl=%$(IDL_CLN_CXX)) +LIB_SERVER_SRC = $(LIB_SERVER_IDL:%.idl=%$(IDL_SRV_CXX)) +LIB_MOC_SRC = $(LIB_MOC:%.h=%_moc.cxx) +LIB_SRC+=$(LIB_MOC_SRC) +LIB_SWIG_SRC = $(SWIG_DEF:%.i=%_wrap.cxx) +LIB_DEP= $(LIB_SRC) $(LIB_CLIENT_SRC) $(LIB_SERVER_SRC) $(LIB_SWIG_SRC) + +LIB_CLIENT_OBJ = $(LIB_CLIENT_IDL:%.idl=%$(IDL_CLN_OBJ)) +LIB_SERVER_OBJ = $(LIB_SERVER_IDL:%.idl=%$(IDL_SRV_OBJ)) + + +# transform c file in appropriate libtool obj file (.c, .cc and .cxx) +LIB_OBJ_C = $(patsubst %.c, %.lo, $(filter %.c, $(LIB_SRC))) +LIB_OBJ_CC = $(patsubst %.cc, %.lo, $(filter %.cc, $(LIB_SRC))) +LIB_OBJ_CXX = $(patsubst %.cxx, %.lo, $(filter %.cxx, $(LIB_SRC))) +LIB_SWIG_OBJ = $(LIB_SWIG_SRC:%.cxx=%.lo) +LIB_OBJ_F = $(patsubst %.f, %.lo, $(filter %.f, $(LIB_SRC))) + +# all libtool obj file in library +LIB_OBJ = $(LIB_OBJ_CXX) $(LIB_OBJ_CC) $(LIB_OBJ_C) $(LIB_CLIENT_OBJ:%.o=%.lo) $(LIB_SERVER_OBJ:%.o=%.lo) $(LIB_SWIG_OBJ) $(LIB_OBJ_F) + +# LIB_BUILD = $(LIB:%.la=$(top_builddir)/lib/salome/%.la) +LIB_BUILD = $(patsubst %.la, $(top_builddir)/lib/salome/%.la, $(filter %.la, $(LIB))) +LIB_BUILD_A = $(patsubst %.a, $(top_builddir)/lib/salome/%.a, $(filter %.a, $(LIB))) + +ifneq ($(findstring cmodule.la,$(filter %.la, $(LIB))),) +LIB_SWIG = $(patsubst %cmodule.la,%.so, $(filter %.la, $(LIB))) +else +LIB_SWIG = +endif + +lib: $(LIB_BUILD) $(LIB_CLIENT_PY) +# we don't build static library ! + +$(LIB_BUILD): $(top_builddir)/lib/salome/%.la: %.la + -$(RM) $@ + -$(RM) $(patsubst %.la, %.so, $@) + -$(RM) $(patsubst %.la, %.a, $@) + ln -sf $(CURDIR)/$< $@ || true + ln -sf $(patsubst %.la, %.so, $(CURDIR)/.libs/$<) \ + $(patsubst %.la, %.so, $@) || true + ln -sf $(patsubst %.la, %.so, $(CURDIR)/.libs/$<).0 \ + $(patsubst %.la, %.so, $@).0 || true + + if ! test -z $(LIB_SWIG) ; then \ + ln -sf $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib/salome/_$(LIB_SWIG) || true;\ + fi; + +$(LIB_BUILD_A): $(top_builddir)/lib/salome/%.a: %.a + -$(RM) $@ + ln -sf $(CURDIR)/$< $@ || true + +$(LIB): $(LIB_OBJ) + @$(LT) --mode=link $(CXX) -rpath $(libdir) -o $@ $(CXXFLAGS) $(LIB_OBJ) $(LDFLAGS) $(LIBS) + +# transform idl reference in appropriate obj file +BIN_CLIENT_SRC = $(BIN_CLIENT_IDL:%.idl=%$(IDL_CLN_CXX)) +BIN_SERVER_SRC = $(BIN_SERVER_IDL:%.idl=%$(IDL_SRV_CXX)) +BIN_MOC_SRC = $(BIN_MOC:%.h=%_moc.cxx) +BIN_SRC+=$(BIN_MOC_SRC) +BIN_DEP=$(BIN:%=%.cxx) $(BIN_SRC) $(BIN_CLIENT_SRC) $(BIN_SERVER_SRC) + +BIN_CLIENT_OBJ = $(BIN_CLIENT_IDL:%.idl=%$(IDL_CLN_OBJ)) +BIN_SERVER_OBJ = $(BIN_SERVER_IDL:%.idl=%$(IDL_SRV_OBJ)) +# transform c file in appropriate libtool obj file (.c) +BIN_OBJ_C = $(patsubst %.c, %.o, $(filter %.c, $(BIN_SRC))) +# transform c++ file in appropriate libtool obj file (.cc and .cxx) +BIN_OBJ_CC = $(patsubst %.cc, %.o, $(filter %.cc, $(BIN_SRC))) +BIN_OBJ_CXX = $(patsubst %.cxx, %.o, $(filter %.cxx, $(BIN_SRC))) +# all obj file in bin target +BIN_OBJ = $(BIN_OBJ_CC) $(BIN_OBJ_CXX) $(BIN_OBJ_C) $(BIN_CLIENT_OBJ) $(BIN_SERVER_OBJ) + +bin: $(BIN:%=$(top_builddir)/bin/salome/%) $(BIN) $(LIB) pyscripts sharedpyscripts + +BIN_LIB=$(LIB:lib%.la=-l%) + +$(BIN:%=$(top_builddir)/bin/salome/%) $(TEST_PROGS:%=$(top_builddir)/bin/salome/%): $(top_builddir)/bin/salome/%: % + -$(RM) $@ + ln -sf $(CURDIR)/$< $@ + +$(BIN) $(TEST_PROGS): %: %.lo $(BIN_OBJ) + $(CXX) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGSFORBIN) $(LIBSFORBIN) + +# copy python scripts in $(top_builddir)/bin/salome +# +DEST_PYSCRIPTS = $(EXPORT_PYSCRIPTS:%=$(top_builddir)/bin/salome/%) +pyscripts: $(DEST_PYSCRIPTS) +$(DEST_PYSCRIPTS): $(top_builddir)/bin/salome/%: % + cp -f $< $@ + +# copy pyqt files in $(PYTHON_SHARED_SITE) +# +PYTHON_SHARED_SITE=$(top_builddir)/lib/python$(PYTHON_VERSION)/site-packages/salome/shared_modules + +$(PYTHON_SHARED_SITE): + $(INSTALL) -d $@ + +DEST_SHAREDPYSCRIPTS = $(EXPORT_SHAREDPYSCRIPTS:%=$(PYTHON_SHARED_SITE)/%) +sharedpyscripts: $(PYTHON_SHARED_SITE) $(DEST_SHAREDPYSCRIPTS) +$(DEST_SHAREDPYSCRIPTS): $(PYTHON_SHARED_SITE)/%: % + cp -f $< $@ + +check: test + +tests: test + +test: $(LIB) $(TEST_PROGS:%=$(top_builddir)/bin/salome/%) + + +# copy header file in $(inc_builddir) +# +DEST_HEADERS = $(EXPORT_HEADERS:%=$(inc_builddir)/%) +inc: $(DEST_HEADERS) +$(DEST_HEADERS): $(inc_builddir)/%: % + cp -f $< $@ + +# build resources file (icons and messages) : .qm file from .po file +resources: $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/%.qm) + +# Make installation directories if they don't exist. +$(libdir) $(includedir) $(bindir) $(datadir) $(idldir) $(sharedpydir): + $(INSTALL) -d $@ && chmod 755 $@ + +# Install the library, the public header files, and programs. +install: $(LIB) $(BIN) $(TEST_PROGS) $(libdir) $(includedir) $(bindir) $(datadir) $(idldir) install-python install-sharedpyqt install-qm + @for f in X $(LIB); do \ + if test $$f != X; then \ + ($(LT_INSTALL_LIB) $$f $(libdir)/. || exit 1); \ + fi; \ + done + @if ! test -z $(LIB_SWIG) ; then \ + (cd $(libdir); ln -sf $(patsubst %.so, %cmodule.so, $(LIB_SWIG)) _$(LIB_SWIG) || true); \ + fi; + @for f in X $(BIN); do \ + if test $$f != X; then \ + ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ + fi; \ + done +# Install tests programmes in bindir + @for f in X $(TEST_PROGS); do \ + if test $$f != X; then \ + ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ + fi; \ + done +# Install exported includes in includedir + @for f in X $(EXPORT_HEADERS:%=$(srcdir)/%); do \ + if test $$f != X; then \ + (cp -p -f $$f $(includedir) || exit 1); \ + fi; \ + done + +# Install python script in $(bindir) +install-python: $(bindir) $(EXPORT_PYSCRIPTS:%=install-%) + +$(EXPORT_PYSCRIPTS:%=install-%): install-%: % + $(INSTALL_PROGRAM) $< $(bindir)/. + +#install-python: $(bindir) $(EXPORT_PYSCRIPTS) +# @for f in X $(EXPORT_PYSCRIPTS); do \ +# if test $$f != X; then \ +# ($(INSTALL_PROGRAM) $$f $(bindir)/. || exit 1); \ +# fi; \ +# done + +# Install pyqt script in $(install-sharedpyqt) +install-sharedpyqt: $(sharedpydir) $(EXPORT_SHAREDPYSCRIPTS:%=install-%) + +$(EXPORT_SHAREDPYSCRIPTS:%=install-%): install-%: % + $(INSTALL_PROGRAM) $< $(sharedpydir)/. + + +# generic rule to install .qm files : +install-qm: resources + $(INSTALL) -d $(datadir)/resources + @for f in X $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/%.qm); do \ + if test $$f != X; then \ + ($(INSTALL_DATA) $$f $(datadir)/resources/. || exit 1); \ + fi; \ + done + +# Removes those things that `make install' (would have) installed. +uninstall: + @if test "X$(LIB)" != X; then \ + for f in $(LIB); do \ + $(LT_UNINSTALL) $(libdir)/$$f; \ + done; \ + fi + @if test "X$(BIN)" != X; then \ + for f in $(BIN); do \ + $(LT_UNINSTALL) $(bindir)/$$f; \ + done; \ + fi + @for f in X $(TEST_PROGS); do \ + if test $$f != X; then \ + $(LT_UNINSTALL) $(bindir)/$$f; \ + fi; \ + done +# Uninstall exported includes in includedir + @for f in X $(EXPORT_HEADERS); do \ + if test $$f != X; then \ + $(LT_UNINSTALL) $(includedir)/$$f; \ + fi; \ + done +# Uninstall python script in $(bindir) + @for f in X $(EXPORT_PYSCRIPTS); do \ + if test $$f != X; then \ + $(LT_UNINSTALL) $(bindir)/$$f ; \ + fi; \ + done + +# Uninstall pyqt script in $(sharedpydir) + @for f in X $(EXPORT_SHAREDPYSCRIPTS); do \ + if test $$f != X; then \ + $(LT_UNINSTALL) $(sharedpydir)/$$f ; \ + fi; \ + done + +# Uninstall qm files + @for f in X $(PO_FILES:%.po=%.qm); do \ + if test $$f != X; then \ + $(LT_UNINSTALL) $(datadir)/resources/$$f ; \ + fi; \ + done + +# remove all dependencies files +# +cleandep: + -$(RM) .dep* + +# Removes temporary files without removing the final target files. That is, +# remove things like object files but not libraries or executables. +# +mostlyclean: cleandep + -$(RM) $(LIB_OBJ) $(LIB_OBJ:.lo=.o) + -$(RM) $(BIN_OBJ) $(BIN:%=%.o) + -$(RM) $(TEST_OBJ) $(TEST_OBJ:.lo=.o) + -$(RM) $(PROG_OBJ) $(PROG_OBJ:.lo=.o) $(MOSTLYCLEAN) + +# Like `mostlyclean' except it also removes the final targets: things like +# libraries and executables. This target doesn't remove any file that +# is part of the SALOME distribution. +# +clean: mostlyclean + -$(RM) $(LIB) $(TEST_PROGS) $(BIN) $(CLEAN) + -$(RM) TAGS *~ *# core *.core + -$(RM) -r .libs + -$(RM) $(top_builddir)/lib/salome/$(LIB) + -$(RM) $(patsubst %,$(top_builddir)/bin/salome/%, $(BIN)) + -$(RM) $(patsubst %.la, %.so, $(top_builddir)/lib/salome/$(LIB)) + -$(RM) $(patsubst %.la, %.a, $(top_builddir)/lib/salome/$(LIB)) +# remove idl generated files (sources) + -$(RM) $(LIB_CLIENT_SRC) $(LIB_SERVER_SRC) $(BIN_CLIENT_SRC) $(BIN_SERVER_SRC) +# remove idl generated files (headers) + -$(RM) $(LIB_CLIENT_IDL:%.idl=%$(IDL_CLN_H)) $(LIB_SERVER_IDL:%.idl=%$(IDL_SRV_H)) + -$(RM) $(BIN_CLIENT_IDL:%.idl=%$(IDL_CLN_H)) $(BIN_SERVER_IDL:%.idl=%$(IDL_SRV_H)) + -$(RM) $(LIB_MOC_SRC) $(BIN_MOC_SRC) + -$(RM) $(LIB_SWIG_SRC) + +# Like `clean' except it also removes files that were created by running +# configure. If you've unpacked the source and built without creating +# any other files, then `make distclean' will leave only the files that were +# in the distribution. +# +distclean: clean + #remove qm file ! + -$(RM) $(PO_FILES:%.po=%.qm) $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/%.qm) + #remove include files + -$(RM) $(DEST_HEADERS) + -$(RM) $(DISTCLEAN) *.bak *.old *.new .dep* + @if test -f $(srcdir)/Makefile.in; then \ + (@SETX@; $(RM) Makefile); \ + fi + + +#implicits rules +.cc.o: + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< + +.cc.lo: + $(LT) --mode=compile $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< + +.cxx.o: + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< + +.cxx.lo: + $(LT) --mode=compile $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< + +.c.o: + $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + +.c.lo: + $(LT_COMPILE) $(CFLAGS) $(CPPFLAGS) -c $< + +.f.o: + $(FC) $(FFLAGS) -c $< -o $@ + +.f.lo: + $(LT) --mode=compile $(FC) $(FFLAGS) -c $< + +.ui.h: + $(UIC) -o $@ $< + +.ui.cxx: + $(UIC) -o $@ -i $*.h $< + +#pattern rules +%_moc.cxx : %.h + $(MOC) $< -o $@ + +%_wrap.cxx : %.i + $(SWIG) $(SWIG_FLAGS) -o $@ $< + +$(top_builddir)/share/salome/resources/%.qm: %.po + if test -e ${KERNEL_ROOT_DIR}/bin/salome/msg2qm ; then \ + ${KERNEL_ROOT_DIR}/bin/salome/msg2qm $< $@ ; \ + else \ + $(top_builddir)/bin/salome/msg2qm $< $@ ; \ + fi + +#------------------------------------------------------------------------------ +# The following section of this makefile contains dependencies between the +# source files and the header files. If GNU make and GCC are being used then +# the dependencies are in the form of rules that cause the information to +# be kept updated automatically. Otherwise the dependencies are listed +# explicitly and come from the `.distdep' files in the various directories. +# These files are part of the distribution and are generated automatically on +# GNU/GCC systems. +#------------------------------------------------------------------------------ + +@DEPEND@ diff --git a/bin/VERSION b/bin/VERSION index fe67dd416..662ebbd99 100755 --- a/bin/VERSION +++ b/bin/VERSION @@ -1,2 +1,2 @@ -THIS IS SALOME - SMESH VERSION: 2.0.0 +THIS IS SALOME - SMESH VERSION: 2.1.0 diff --git a/build_configure b/build_configure index 163b46353..a0dda39dc 100755 --- a/build_configure +++ b/build_configure @@ -128,7 +128,7 @@ echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 echo " ./adm_local/unix/make_omniorb \\" >> configure.in_tmp1 echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 echo " ./adm_local/unix/make_commence \\" >> configure.in_tmp1 -echo " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1 +echo " ./adm_local/unix/make_conclude \\" >> configure.in_tmp1 echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 \rm -f configure.in_tmp2 configure.in_tmp3 diff --git a/configure.in.base b/configure.in.base index 5573498ca..16b6b77fa 100644 --- a/configure.in.base +++ b/configure.in.base @@ -303,7 +303,7 @@ echo dnl generals files which could be included in every makefile AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence -AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude +AC_SUBST_FILE(CONCLUDE) CONCLUDE=adm_local/unix/make_conclude AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module dnl les dependences diff --git a/doc/salome/gui/SMESH/SMESH.log b/doc/salome/gui/SMESH/SMESH.log index 4552b0906..104de30dc 100755 --- a/doc/salome/gui/SMESH/SMESH.log +++ b/doc/salome/gui/SMESH/SMESH.log @@ -1,5 +1,5 @@ |SourceProjectName:SMESH.hpr -|DestinationProjectName:smesh.html +|DestinationProjectName:smesh.htm whhost.js whmsg.js whmozemu.js @@ -138,12 +138,14 @@ files\about_modification_of_meshes.htm files\about_quality_controls.htm files\adding_nodes_and_elements.htm files\area_of_elements.htm +files\arithmetic_1d.htm files\aspect_ratio.htm files\changing_orientation_of_elements.htm files\computing_meshes.htm files\connectivity.htm files\constructing_meshes.htm files\constructing_submeshes.htm +files\deflection_1d.htm files\diagonal_iversion_of_elements.htm files\displacing_nodes.htm files\displaying_elements_numbers.htm @@ -151,12 +153,15 @@ files\displaying_nodes_numbers.htm files\editing_hypotheses.htm files\importing_and_exporting_meshes.htm files\introduction_to_smesh.htm +files\length_from_edges.htm files\length_of_edges.htm files\local_length_hypothesis.htm files\max._element_area_hypothesis.htm files\max._element_volume_hypothsis.htm files\minimum_angle.htm +files\non_conform_mesh_allowed_hypothesis.htm files\number_of_segments_hypothesis.htm +files\propagation_of_1d_hypothesis_on_opposite_edges.htm files\reassigning_hypotheses_and_algorithms.htm files\removing_nodes_and_elements.htm files\running_smesh_module.htm @@ -164,6 +169,7 @@ files\scalar_bar_properties.htm files\shading.htm files\shrink.htm files\skew.htm +files\start_and_end_length_hypothesis.htm files\taper.htm files\tetrahedron_(netgen)_meshing_algorithm.htm files\using_smesh_module.htm @@ -173,60 +179,65 @@ files\visualization_modes.htm files\visualization_properties.htm files\warp.htm files\wireframe.htm -texture_horiz_ltbluebubbles.jpg +tetrahedron_(ghs3d)_meshing_algorithm.htm ehlpdhtm.js +texture_horiz_ltbluebubbles.jpg smesh.glo default.css -image3.jpg -image55.gif image44.gif image33.gif image22.gif image25.jpg -image4.jpg -image56.gif -image45.gif +image12.gif +image3.jpg image34.gif image26.jpg -image2.gif +image13.gif +image16.jpg +image4.jpg image46.gif image35.gif image27.jpg image24.gif -image6.jpg -image47.gif +image14.gif +image17.jpg +image2.gif image36.gif image28.jpg image25.gif -image4.gif -image7.jpg +image15.gif +image18.jpg +image6.jpg image48.gif image37.gif image29.jpg image26.gif -image8.jpg +note1.gif +image16.gif +image4.gif +image7.jpg image49.gif image38.gif image27.gif -note1.gif -image6.gif -image9.jpg +image8.jpg image39.gif image28.gif +image6.gif +image9.jpg +pics\exemple.gif image29.gif +image7.gif i_blue.jpg -image50.gif +image8.gif +image9.gif pics\new.jpg +image20.jpg +image21.jpg image10.jpg -image51.gif image40.gif image11.jpg -image52.gif image41.gif image12.jpg -pics\exemple.gif -image53.gif -image42.gif image31.gif image43.gif image32.gif @@ -282,7 +293,8 @@ whgdata\whlstf0.htm whgdata\whlstf1.htm whgdata\whlstf2.htm whgdata\whlstf3.htm +whgdata\whlstf4.htm whgdata\whlstg0.htm -smesh.html -smesh_csh.html -smesh_rhc.html +smesh.htm +smesh_csh.htm +smesh_rhc.htm diff --git a/doc/salome/gui/SMESH/files/1d_meshing_algorithm.htm b/doc/salome/gui/SMESH/files/1d_meshing_algorithm.htm index d34ee9f28..121b0cc94 100755 --- a/doc/salome/gui/SMESH/files/1d_meshing_algorithm.htm +++ b/doc/salome/gui/SMESH/files/1d_meshing_algorithm.htm @@ -19,8 +19,8 @@ - - + + @@ -36,7 +36,7 @@ if (navigator.appName !="Netscape") + + + + + + + + + + + + + + + + + +

Arithmetic 1D hypothesis

+ +

Arithmetic 1D + - hypothesis for the Regular 1D algorithm. It allows to split edges into + segments with a length that changes in arithmetic progression (Lk = Lk-1 + + d) beginning from a given starting length and up to a given end length.

+ +

 

+ +

Similar to Start and End Length.

+ +

 

+ +

To define the Arithmetic 1D hypothesis:

+ +

 

+ +

From the Create + Hypotheses menu select Arithmetic + 1D and click Create. The + following dialog box will appear:

+ +

 

+ +

+ +

 

+ +

In this dialog box you can set:

+ +

 

+ +
    + +

  • Name + of your Arithmetic 1D hypothesis;

    • + +

  • Start + and End length values

    • +
+ + + + + diff --git a/doc/salome/gui/SMESH/files/aspect_ratio.htm b/doc/salome/gui/SMESH/files/aspect_ratio.htm index b7e6cdb1d..1e1117fd0 100755 --- a/doc/salome/gui/SMESH/files/aspect_ratio.htm +++ b/doc/salome/gui/SMESH/files/aspect_ratio.htm @@ -105,7 +105,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","",""); if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/changing_orientation_of_elements.htm b/doc/salome/gui/SMESH/files/changing_orientation_of_elements.htm index 0df9544cc..832aa0d44 100755 --- a/doc/salome/gui/SMESH/files/changing_orientation_of_elements.htm +++ b/doc/salome/gui/SMESH/files/changing_orientation_of_elements.htm @@ -81,7 +81,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","",""); if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/computing_meshes.htm b/doc/salome/gui/SMESH/files/computing_meshes.htm index 17cf3cc04..a700eb285 100755 --- a/doc/salome/gui/SMESH/files/computing_meshes.htm +++ b/doc/salome/gui/SMESH/files/computing_meshes.htm @@ -87,7 +87,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","",""); if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/connectivity.htm b/doc/salome/gui/SMESH/files/connectivity.htm index f845f0d81..fcc85986a 100755 --- a/doc/salome/gui/SMESH/files/connectivity.htm +++ b/doc/salome/gui/SMESH/files/connectivity.htm @@ -80,7 +80,7 @@ if (window.gbWhTopic) if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/constructing_meshes.htm b/doc/salome/gui/SMESH/files/constructing_meshes.htm index 5c46cb7e5..2b2ca9544 100755 --- a/doc/salome/gui/SMESH/files/constructing_meshes.htm +++ b/doc/salome/gui/SMESH/files/constructing_meshes.htm @@ -102,7 +102,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","",""); if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/constructing_submeshes.htm b/doc/salome/gui/SMESH/files/constructing_submeshes.htm index 1c9396e95..b12c2c105 100755 --- a/doc/salome/gui/SMESH/files/constructing_submeshes.htm +++ b/doc/salome/gui/SMESH/files/constructing_submeshes.htm @@ -102,7 +102,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","",""); if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/deflection_1d.htm b/doc/salome/gui/SMESH/files/deflection_1d.htm new file mode 100755 index 000000000..47ffdae92 --- /dev/null +++ b/doc/salome/gui/SMESH/files/deflection_1d.htm @@ -0,0 +1,163 @@ + + + + + + + + + + +Deflection 1D + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Deflection 1D hypothesis

+ +

Deflection 1D + hypothesis is used to build 1D mesh on geometrical edges.

+ +

A geometrical edge is divided into equal segments so that the maximum + distance between the edge curve and the line connecting segment ends is + not more than the specified deflection value. Then mesh nodes are constructed + at segment ends location and 1D mesh elements are constructed on them.

+ +

 

+ +

To define the Deflection 1D hypothesis:

+ +

 

+ +

From the Create + Hypotheses menu select Deflection + 1D and click Create. The + following dialog box will appear:

+ +

 

+ +

+ +

 

+ +

In this dialog box you can set:

+ +

 

+ +
    + +

  • Name + of your Deflection 1D hypothesis;

    • + +

  • Deflection value

    • +
+ + + + + diff --git a/doc/salome/gui/SMESH/files/diagonal_iversion_of_elements.htm b/doc/salome/gui/SMESH/files/diagonal_iversion_of_elements.htm index da44a8912..911138019 100755 --- a/doc/salome/gui/SMESH/files/diagonal_iversion_of_elements.htm +++ b/doc/salome/gui/SMESH/files/diagonal_iversion_of_elements.htm @@ -81,7 +81,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","",""); if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/displacing_nodes.htm b/doc/salome/gui/SMESH/files/displacing_nodes.htm index 8c2d3e064..b81369300 100755 --- a/doc/salome/gui/SMESH/files/displacing_nodes.htm +++ b/doc/salome/gui/SMESH/files/displacing_nodes.htm @@ -81,7 +81,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","",""); if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/displaying_elements_numbers.htm b/doc/salome/gui/SMESH/files/displaying_elements_numbers.htm index dd57c5fc0..cf8d702b3 100755 --- a/doc/salome/gui/SMESH/files/displaying_elements_numbers.htm +++ b/doc/salome/gui/SMESH/files/displaying_elements_numbers.htm @@ -99,7 +99,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","",""); if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/displaying_nodes_numbers.htm b/doc/salome/gui/SMESH/files/displaying_nodes_numbers.htm index 1e776eef8..c51eba23e 100755 --- a/doc/salome/gui/SMESH/files/displaying_nodes_numbers.htm +++ b/doc/salome/gui/SMESH/files/displaying_nodes_numbers.htm @@ -99,7 +99,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","",""); if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/editing_hypotheses.htm b/doc/salome/gui/SMESH/files/editing_hypotheses.htm index e36d19b96..9a35c061f 100755 --- a/doc/salome/gui/SMESH/files/editing_hypotheses.htm +++ b/doc/salome/gui/SMESH/files/editing_hypotheses.htm @@ -81,7 +81,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","",""); if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/importing_and_exporting_meshes.htm b/doc/salome/gui/SMESH/files/importing_and_exporting_meshes.htm index e627b5af8..618bc80be 100755 --- a/doc/salome/gui/SMESH/files/importing_and_exporting_meshes.htm +++ b/doc/salome/gui/SMESH/files/importing_and_exporting_meshes.htm @@ -87,7 +87,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","",""); if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/introduction_to_smesh.htm b/doc/salome/gui/SMESH/files/introduction_to_smesh.htm index cdfcac213..eb44da016 100755 --- a/doc/salome/gui/SMESH/files/introduction_to_smesh.htm +++ b/doc/salome/gui/SMESH/files/introduction_to_smesh.htm @@ -90,7 +90,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","",""); if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/length_from_edges.htm b/doc/salome/gui/SMESH/files/length_from_edges.htm new file mode 100755 index 000000000..86ccb437d --- /dev/null +++ b/doc/salome/gui/SMESH/files/length_from_edges.htm @@ -0,0 +1,127 @@ + + + + + + + + + + +Length from edges + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Length from edges (2D hypothesis for Triangulator) hypothesis

+ +

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

+ +

 

+ +

This hypothesis has no parameters.

+ +

 

+ +

 

+ +

 

+ +

 

+ + + + + diff --git a/doc/salome/gui/SMESH/files/length_of_edges.htm b/doc/salome/gui/SMESH/files/length_of_edges.htm index e49ef746c..70acb620a 100755 --- a/doc/salome/gui/SMESH/files/length_of_edges.htm +++ b/doc/salome/gui/SMESH/files/length_of_edges.htm @@ -89,7 +89,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","",""); if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/local_length_hypothesis.htm b/doc/salome/gui/SMESH/files/local_length_hypothesis.htm index 10316eaf2..77d30b63c 100755 --- a/doc/salome/gui/SMESH/files/local_length_hypothesis.htm +++ b/doc/salome/gui/SMESH/files/local_length_hypothesis.htm @@ -19,8 +19,8 @@ - - + + @@ -38,11 +38,10 @@ img_whs1 {border-style: none; border: none; width: 30px; height: 30px; float: no p.whs2 {font-weight: bold; margin-left: 40px;} img_whs3 {border-style: none; border: none; width: 367px; height: 224px;} p.whs4 {margin-left: 40px;} -img_whs5 {border-style: none; border: none; width: 26px; height: 24px;} -p.whs6 {margin-left: 80px;} -img_whs7 {border-style: none; border: none; width: 304px; height: 233px;} -p.whs8 {margin-left: 0px;} -ul.whs9 {list-style: disc;} +p.whs5 {margin-left: 80px;} +img_whs6 {border-style: none; border: none; width: 304px; height: 233px;} +p.whs7 {margin-left: 0px;} +ul.whs8 {list-style: disc;} --> -

Local Length hypothesis

+

Average Length hypothesis

-

Local Length hypothesis +

Average Length hypothesis can be applied for meshing of edges composing your geometrical object. Definition of this hypothesis consists of setting the length of segments, which will split these edges. The points on the edges generated @@ -131,34 +130,35 @@ else

 

-

To define the Local Length hypothesis:

+

To define the Average Length hypothesis:

 

-

From the Hypotheses - menu select Average Length or - click button. The following dialog box will appear:

+

From the Create + Hypotheses menu select Average + Length and click Create. + The following dialog box will appear:

 

-

+

-

 

+

 

-

In this dialog box you can set:

+

In this dialog box you can set:

-

 

+

 

-
    +
      -

    • Name - of your Local Length hypothesis

      • +

    • Name + of your Average Length hypothesis

      • -

    • Length +

    • Length of segments which will split the edges of your geometrical object

    -

     

    +

     

    + + + + + + + + + + + + + + + + +

    Non conform mesh allowed hypothesis

    + +

    Non Conform mesh allowed + hypothesis allows to generate non-conform meshes (that is, meshes having + some edges ending on an edge or face of adjacent elements).

    + +

     

    + +

    This hypothesis has no parameters.

    + + + + + diff --git a/doc/salome/gui/SMESH/files/number_of_segments_hypothesis.htm b/doc/salome/gui/SMESH/files/number_of_segments_hypothesis.htm index ec3ce9c4e..aeceb759d 100755 --- a/doc/salome/gui/SMESH/files/number_of_segments_hypothesis.htm +++ b/doc/salome/gui/SMESH/files/number_of_segments_hypothesis.htm @@ -19,8 +19,8 @@ - - + + @@ -37,11 +37,10 @@ if (navigator.appName !="Netscape") img_whs1 {border-style: none; border: none; width: 30px; height: 30px; float: none;} p.whs2 {margin-left: 40px;} img_whs3 {border-style: none; border: none; width: 431px; height: 233px;} -img_whs4 {border-style: none; border: none; width: 25px; height: 24px;} -p.whs5 {margin-left: 80px;} -img_whs6 {border-style: none; border: none; width: 304px; height: 233px;} -p.whs7 {margin-left: 0px;} -ul.whs8 {list-style: disc;} +p.whs4 {margin-left: 80px;} +img_whs5 {border-style: none; border: none; width: 304px; height: 233px;} +p.whs6 {margin-left: 0px;} +ul.whs7 {list-style: disc;} --> + + + + + + + + + + + + + + + + + +

    Propagation of 1D Hypothesis on opposite edges

    + +

    Propagation of 1D Hypothesis + on opposite edges allows to propagate a set hypothesis onto an + opposite edge. If a local hypothesis and propagation are set on one of + edges of a quadrangular face, the opposite edge will have the same hypothesis, + unless another hypothesis has been locally set on such opposite edge.

    + +

     

    + +

     

    + + + + + diff --git a/doc/salome/gui/SMESH/files/reassigning_hypotheses_and_algorithms.htm b/doc/salome/gui/SMESH/files/reassigning_hypotheses_and_algorithms.htm index 245bf84e0..c3abe59f4 100755 --- a/doc/salome/gui/SMESH/files/reassigning_hypotheses_and_algorithms.htm +++ b/doc/salome/gui/SMESH/files/reassigning_hypotheses_and_algorithms.htm @@ -81,7 +81,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","",""); if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/removing_nodes_and_elements.htm b/doc/salome/gui/SMESH/files/removing_nodes_and_elements.htm index 7029acdfd..4b9073fb7 100755 --- a/doc/salome/gui/SMESH/files/removing_nodes_and_elements.htm +++ b/doc/salome/gui/SMESH/files/removing_nodes_and_elements.htm @@ -81,7 +81,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","",""); if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/running_smesh_module.htm b/doc/salome/gui/SMESH/files/running_smesh_module.htm index d42bc5018..430218edd 100755 --- a/doc/salome/gui/SMESH/files/running_smesh_module.htm +++ b/doc/salome/gui/SMESH/files/running_smesh_module.htm @@ -95,7 +95,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","",""); if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/scalar_bar_properties.htm b/doc/salome/gui/SMESH/files/scalar_bar_properties.htm index 793178598..2d349f8ab 100755 --- a/doc/salome/gui/SMESH/files/scalar_bar_properties.htm +++ b/doc/salome/gui/SMESH/files/scalar_bar_properties.htm @@ -81,7 +81,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","",""); if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/shading.htm b/doc/salome/gui/SMESH/files/shading.htm index 28db384ad..2d937e4de 100755 --- a/doc/salome/gui/SMESH/files/shading.htm +++ b/doc/salome/gui/SMESH/files/shading.htm @@ -85,7 +85,7 @@ if (window.gbWhTopic) if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/shrink.htm b/doc/salome/gui/SMESH/files/shrink.htm index e7bc1038e..53386bb7e 100755 --- a/doc/salome/gui/SMESH/files/shrink.htm +++ b/doc/salome/gui/SMESH/files/shrink.htm @@ -85,7 +85,7 @@ if (window.gbWhTopic) if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/skew.htm b/doc/salome/gui/SMESH/files/skew.htm index 39f2f82db..24198ba15 100755 --- a/doc/salome/gui/SMESH/files/skew.htm +++ b/doc/salome/gui/SMESH/files/skew.htm @@ -102,7 +102,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","",""); if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/start_and_end_length_hypothesis.htm b/doc/salome/gui/SMESH/files/start_and_end_length_hypothesis.htm new file mode 100755 index 000000000..3cbddfdcc --- /dev/null +++ b/doc/salome/gui/SMESH/files/start_and_end_length_hypothesis.htm @@ -0,0 +1,165 @@ + + + + + + + + + + +Start and End Length hypothesis + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    Start and End Length hypothesis

    + +

    Start and End Length + hypothesis is used to build 1D mesh on geometrical edges.

    + +

    A geometrical edge is divided into segments so that the first and the + last segments have a specified length. Length of each but the first segment + differs from length of the previous one by a constant factor. Then mesh + nodes are constructed at segment ends location and 1D mesh elements are + constructed on them.

    + +

     

    + +

    To define the Average Length hypothesis:

    + +

     

    + +

    From the Create + Hypotheses menu select Start and + End Length and click Create. + The following dialog box will appear:

    + +

     

    + +

    + +

     

    + +

    In this dialog box you can set:

    + +

     

    + +
      + +

    • Name + of your Start and End Length hypothesis

      • + +

    • Start + and End Length of segments

      • +
    + + + + + diff --git a/doc/salome/gui/SMESH/files/taper.htm b/doc/salome/gui/SMESH/files/taper.htm index 958fd05f9..38e4f8951 100755 --- a/doc/salome/gui/SMESH/files/taper.htm +++ b/doc/salome/gui/SMESH/files/taper.htm @@ -90,7 +90,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","",""); if (window.setRelStartPage) { - setRelStartPage("../smesh.html"); + setRelStartPage("../smesh.htm"); autoSync(0); sendSyncInfo(); diff --git a/doc/salome/gui/SMESH/files/tetrahedron_(netgen)_meshing_algorithm.htm b/doc/salome/gui/SMESH/files/tetrahedron_(netgen)_meshing_algorithm.htm index c9f35898c..75a499923 100755 --- a/doc/salome/gui/SMESH/files/tetrahedron_(netgen)_meshing_algorithm.htm +++ b/doc/salome/gui/SMESH/files/tetrahedron_(netgen)_meshing_algorithm.htm @@ -19,8 +19,8 @@ - - + + @@ -36,9 +36,24 @@ if (navigator.appName !="Netscape") +

+

 

+ +

To set the visualization mode for displaying of your mesh:

+ +

 

+ +

1. Select your mesh in the Object + Browser.

+ +

 

+ +

2. Right-click on the mesh in the viewer + and from the pop-up menu select Properties + > Display mode

+ + SMESH reference manual + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/SMESH/smesh_csh.htm b/doc/salome/gui/SMESH/smesh_csh.htm new file mode 100755 index 000000000..187fb111f --- /dev/null +++ b/doc/salome/gui/SMESH/smesh_csh.htm @@ -0,0 +1,100 @@ + + +SMESH reference manual + + + + + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/SMESH/smesh_rhc.htm b/doc/salome/gui/SMESH/smesh_rhc.htm new file mode 100755 index 000000000..9acb37e4c --- /dev/null +++ b/doc/salome/gui/SMESH/smesh_rhc.htm @@ -0,0 +1,100 @@ + + +SMESH reference manual + + + + + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/SMESH/tetrahedron_(ghs3d)_meshing_algorithm.htm b/doc/salome/gui/SMESH/tetrahedron_(ghs3d)_meshing_algorithm.htm new file mode 100755 index 000000000..e6c912b52 --- /dev/null +++ b/doc/salome/gui/SMESH/tetrahedron_(ghs3d)_meshing_algorithm.htm @@ -0,0 +1,132 @@ + + + + + + + + + + +Tetrahedron (GHS3D) meshing algorithm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Tetrahedron (GHS3D) meshing algorithm

+ +

This algorithm is used for meshing of 3D entities of + geometrical objects - volume objects. + While NETGEN + generates 3D elements having a volume less than the one specified by hypothesis, + GHS3D does not need any hypotheses, all it needs is a surface mesh built + in advance

+ +

 

+ +

 

+ +

To apply the Tetrahedron GHS3D meshing algorithm:

+ +

 

+ +

From the Hypotheses + menu select Create Algorithms + >  Tetrahedron (GHS3D) and + click Create.

+ + + + + diff --git a/doc/salome/gui/SMESH/whdata/whftdata0.htm b/doc/salome/gui/SMESH/whdata/whftdata0.htm index fe18c10da..544350aeb 100755 --- a/doc/salome/gui/SMESH/whdata/whftdata0.htm +++ b/doc/salome/gui/SMESH/whdata/whftdata0.htm @@ -21,12 +21,14 @@ aTE("About modification of meshes","files/about_modification_of_meshes.htm"); aTE("About quality controls","files/about_quality_controls.htm"); aTE("Adding nodes and elements","files/adding_nodes_and_elements.htm"); aTE("Area of elements","files/area_of_elements.htm"); +aTE("Arithmetic 1D","files/arithmetic_1d.htm"); aTE("Aspect Ratio","files/aspect_ratio.htm"); aTE("Changing orientation of elements","files/changing_orientation_of_elements.htm"); aTE("Computing meshes","files/computing_meshes.htm"); aTE("Connectivity","files/connectivity.htm"); aTE("Constructing meshes","files/constructing_meshes.htm"); aTE("Constructing submeshes","files/constructing_submeshes.htm"); +aTE("Deflection 1D","files/deflection_1d.htm"); aTE("Diagonal iversion of elements","files/diagonal_iversion_of_elements.htm"); aTE("Displacing nodes","files/displacing_nodes.htm"); aTE("Displaying elements numbers","files/displaying_elements_numbers.htm"); @@ -34,17 +36,21 @@ aTE("Displaying nodes numbers","files/displaying_nodes_numbers.htm"); aTE("Editing hypotheses","files/editing_hypotheses.htm"); aTE("Importing and exporting meshes","files/importing_and_exporting_meshes.htm"); aTE("Introduction to SMESH","files/introduction_to_smesh.htm"); +aTE("Length from edges","files/length_from_edges.htm"); aTE("Length of edges","files/length_of_edges.htm"); aTE("Local Length hypothesis","files/local_length_hypothesis.htm"); aTE("Max. Element Area hypothesis","files/max._element_area_hypothesis.htm"); aTE("Max. Element volume hypothsis","files/max._element_volume_hypothsis.htm"); aTE("Minimum angle","files/minimum_angle.htm"); +aTE("Non conform mesh allowed hypothesis","files/non_conform_mesh_allowed_hypothesis.htm"); aTE("Number of segments hypothesis","files/number_of_segments_hypothesis.htm"); +aTE("Propagation of 1D Hypothesis on opposite edges","files/propagation_of_1d_hypothesis_on_opposite_edges.htm"); aTE("Reassigning hypotheses and algorithms","files/reassigning_hypotheses_and_algorithms.htm"); aTE("Removing nodes and elements","files/removing_nodes_and_elements.htm"); aTE("Running SMESH module","files/running_smesh_module.htm"); aTE("Scalar Bar properties","files/scalar_bar_properties.htm"); aTE("Skew","files/skew.htm"); +aTE("Start and End Length hypothesis","files/start_and_end_length_hypothesis.htm"); aTE("Taper","files/taper.htm"); aTE("Tetrahedron (Netgen) meshing algorithm","files/tetrahedron_(netgen)_meshing_algorithm.htm"); aTE("Using SMESH module","files/using_smesh_module.htm"); @@ -53,6 +59,7 @@ aTE("Viewing mesh info","files/viewing_mesh_info.htm"); aTE("Visualization modes","files/visualization_modes.htm"); aTE("Visualization properties","files/visualization_properties.htm"); aTE("Warp","files/warp.htm"); +aTE("Tetrahedron (GHS3D) meshing algorithm","tetrahedron_(ghs3d)_meshing_algorithm.htm"); //--> diff --git a/doc/salome/gui/SMESH/whdata/whftdata0.xml b/doc/salome/gui/SMESH/whdata/whftdata0.xml index 3a6d528f3..67c11bde8 100755 --- a/doc/salome/gui/SMESH/whdata/whftdata0.xml +++ b/doc/salome/gui/SMESH/whdata/whftdata0.xml @@ -11,12 +11,14 @@ + + @@ -24,17 +26,21 @@ + + + + @@ -43,5 +49,6 @@ + diff --git a/doc/salome/gui/SMESH/whdata/whfts.htm b/doc/salome/gui/SMESH/whdata/whfts.htm index 977cbfa97..778f78b8f 100755 --- a/doc/salome/gui/SMESH/whdata/whfts.htm +++ b/doc/salome/gui/SMESH/whdata/whfts.htm @@ -8,7 +8,7 @@ diff --git a/doc/salome/gui/SMESH/whdata/whfts.xml b/doc/salome/gui/SMESH/whdata/whfts.xml index 8322231b5..d17f2e6c9 100755 --- a/doc/salome/gui/SMESH/whdata/whfts.xml +++ b/doc/salome/gui/SMESH/whdata/whfts.xml @@ -2,6 +2,6 @@ - + diff --git a/doc/salome/gui/SMESH/whdata/whfwdata0.htm b/doc/salome/gui/SMESH/whdata/whfwdata0.htm index 8b0a6b8e3..97a4c6667 100755 --- a/doc/salome/gui/SMESH/whdata/whfwdata0.htm +++ b/doc/salome/gui/SMESH/whdata/whfwdata0.htm @@ -12,343 +12,384 @@ diff --git a/doc/salome/gui/SMESH/whdata/whfwdata0.xml b/doc/salome/gui/SMESH/whdata/whfwdata0.xml index 66eddc02d..fd09428b7 100755 --- a/doc/salome/gui/SMESH/whdata/whfwdata0.xml +++ b/doc/salome/gui/SMESH/whdata/whfwdata0.xml @@ -2,343 +2,384 @@ 5, 5, - 10,11,13,19,20,22,24,28,34,35,39,42, - 0,5,6,23, - 10,11,13,19,20,22,24,28,34,35,39,42, - 1,2,5,6,10,11,23,26,28,42, - 5,10,11,22,32,34,42, - 3,5,6,23,27,36, + 10,11,12,14,21,22,24,27,31,39,41,45,46,48, + 0,4,5,6,11,18,25,26,34,40, + 10,12,14,21,22,24,27,31,39,41,45,46,48, + 1,2,5,6,10,12,25,26,29,31,48, + 5,10,12,24,37,39,48, + 3,5,6,25,30,49,42, 5, - 5,10,11,34,35,42, + 5,10,12,39,41,48, 5, - 25,29, - 8,10,11,24,28,34,35,42, + 28,33, + 8,10,12,27,31,39,41,48, 4, 9, - 23, - 5,32, - 28, - 0,1,2,3,4,5,6,8,10,15,16,23,26,27,30,36, - 4,22,23, - 8,23,28,34,42, - 5, - 0,1,2,3,10,11,23,24,28,34,35,36,42, - 15,16,25,26,27,29,32, - 10,11,24,25,26,27,28,29,34,35,42, + 25, + 5,37, + 31,32, + 49, + 0,1,2,3,4,5,6,8,10,11,16,17,25,29,30,35,49,42, + 4,11,24,25,32,34, + 8,25,31,39,48, + 34, + 5,49, + 0,1,2,3,6,10,12,25,27,31,39,41,49,42,48, + 4,6,11,16,17,18,28,29,30,33,37,40, + 10,12,27,28,29,30,31,33,39,41,48, 8, - 4,15,16, - 29, - 42, - 4,8,10,23,26,27,35, - 8,11,23, - 42, - 25,42, - 42, - 8,33, - 4,10,23,42, + 4,16,17, + 33, + 48, + 4,8,10,25,29,30,41, + 4,11, + 8,12,25, + 48, + 4,26,28,40,48, + 48, + 8,38, + 4,10,25,48, 5, 4, - 32, - 42, - 42, - 23, - 32, + 37, + 11, + 48, + 48, + 25, + 37, 5, 4, - 15,16,22,25,26,27,29,32, - 13,39, - 0,1,2,3,10,11,13,15,16,22,24,25,26,27,28,29,34,35,36,39,42, + 11,16,17,18,24,28,29,30,33,37,40, + 14,45,46, + 18,26,40, + 49, + 10,12,14,16,17,24,27,31,39,41,45,48, 5, - 8,11,35, - 4,10,24,28, - 12, + 8,12,26,41, + 4,10,27,31, + 11,13, 8, 5, 4, - 10,11,22,24,28,32,34,35,42, - 26,27, - 0,1,2,3,10,11,13,15,16,22,24,25,26,27,28,29,32,34,35,36,39,42, + 10,12,24,27,31,37,39,41,48, + 29,30, + 0,1,2,3,4,6,10,11,12,14,16,17,18,24,27,28,29,30,31,33,37,39,40,41,49,42,45,46,48, 5, - 8,10,11,24,28,34,35,42, - 24, - 23,32, - 4,5,6,8,19,25,26,27,29,34, - 13, - 13,15,16, + 8,10,12,27,31,39,41,48, + 27, + 25,37, + 4,5,6,8,21,28,29,30,33,39, + 14, + 14,16,17, 4, - 5,23, - 14, + 4,32, + 18, + 5,25, + 15, 5, - 8,10,11,15,16,24,25,26,27,28,29,35, - 15,16, - 15,16, - 5,6,22, + 8,10,12,16,17,27,28,29,30,31,33,41, + 40, + 16,17,18,40, + 16,17, + 5,6,24, 5, - 8,10,11,23,24,28,34,35,42, + 8,10,12,25,27,31,39,41,48, 5, - 42, - 42, - 5,8,22, + 48, + 48, + 5,8,24, 5, - 5,23,32,42, - 5,32, - 23, - 10,11,24,28,34,35,42, - 42, - 5, + 0,1,2,3,4,5,6,11,18,25,28,29,30,33,37,40,49,42,48, + 5,37, + 25, + 10,12,27,31,39,41,48, + 48, + 5,18, + 11, 5, - 32, - 5,11,25,26,27,29, - 5,8,23,29, - 25,26,27,29, - 23, - 4,5,26,27, + 37, + 5,11,12,18,28,29,30,33,40, + 5,8,25,33, + 28,29,30,33, + 4,18, + 25, + 4,5,29,30, 5, - 32, - 5,8,23, + 37, + 5,8,25, 4, - 17,35, - 15,16,22,25,26,27,29, + 19,41, + 11,16,17,18,24,28,29,30,33,40, + 40, 4, 5, 5, - 42, + 48, 0,5,6, - 18, - 8,10,11,19,20,24,28,34,35,39,40,42, + 20, + 8,10,12,21,22,27,31,39,41,45,46,48, 8, - 42, + 18,48, + 18,40, + 49, 5, - 0,4,5,6,8,11,23,24,25,29,42, - 21, - 4,5,8,9,10,11,12,17,19,23,24,26,27,28,31,34,35,42, - 16, - 22, - 0,1,2,3,5,6,36, + 0,4,5,6,8,11,12,18,25,26,27,28,32,33,34,40,48, + 23, + 4,5,8,9,10,12,13,18,19,21,25,27,29,30,31,32,36,39,40,41,49,48, + 17, + 4,11,18,32,40, + 24, + 0,1,2,3,5,6,49,42, 5, - 11, - 11, + 12,18, + 12, 8, - 42, - 5, - 22,23, - 22, - 42, - 1,2,4,5,6,23,25,26,29,42, - 22, - 13, - 22, + 48, + 5,42, + 24,25, + 24, + 48, + 1,2,4,5,6,25,28,29,32,33,34,48, + 40, + 24, + 14, + 24, + 40, 5, - 4,5,6,8,11,15,16,19,20,25,26,27,29,32,39, - 22,23, - 5,42, - 5,23, + 4,5,6,8,11,12,16,17,18,21,22,28,29,30,33,37,40,45, + 24,25, + 5,48, + 5,25, 5, - 5,22, - 4,5,8,23,25,29,32, - 13, - 5,23, + 5,24, + 4,5,8,25,28,32,33,37,49, + 14, + 5,25, 5,8, - 0,1,2,3,4,5,6,15,16,23,25,26,27,29,36, - 15, - 23, - 42, - 11, - 11, - 42, - 11,42, + 0,1,2,3,4,5,6,16,17,18,25,28,29,30,33,40,49,42, + 49, + 11,26, + 16, + 25, + 48, + 12, + 12, + 48, + 26,32,49, + 12,48, 8, - 5,7,9,12,14,17,18,31,33,41, - 3,5,6,27, + 5,7,9,13,15,19,20,36,38,47, + 3,5,6,30, 5, - 15,16, - 0,1,2,3,4,15,16,21,23,25,26,27,29,30,36, - 4,25,26,27,29, + 16,17, + 0,1,2,3,4,6,11,16,17,18,23,25,28,29,30,33,35,40,49,42, + 4,11,18,26,28,29,30,32,33,34,40,49, 3, - 32, - 19,20, - 5, + 37, + 21,22, + 5,34, 5, - 22,23, - 22, + 24,25, + 24, 5, - 42, - 39, - 5,39, - 32, + 48, + 45, + 5,45, + 37, 5, - 23, + 25, 5, - 17, - 22, + 19, + 4,6,24, 3, - 34, + 39, 3, 6, - 42, - 11, - 32, - 4,8,11,23,24,25,29,42, + 48, + 12, + 40, + 37, + 4,8,11,12,25,26,27,28,33,40,48, + 49, 4, - 19,20,32, - 5,34, - 4,16,23,25,29, - 22, - 11, - 19,20,32, + 21,22,37, + 5,18,39, + 11, + 17,25,33,34, + 18,24,40, + 12, + 21,22,37, 5, - 32, + 4,6,37, 4, 1, - 4,23,26,27, - 26,27,34, + 4,25,29,30, + 18,29,30,39, 5, 5, - 42, + 48, 2, - 0,1,2,3,13,15,16,19,20,22,25,26,27,29,32,36,39, - 0,1,2,3,4,5,6,7,8,10,11,13,15,16,19,20,22,23,24,25,26,27,28,29,32,34,35,36,39,40,42, - 8,23,28, - 40, - 5,23, - 5,7,23, - 5,6,23,32, - 23, - 23, - 11, - 22,25,26,27,29, - 29, - 36, - 32, - 5,9,10,11,18,20,23,25,29,31,34,35,42, - 42, + 0,1,2,3,4,6,11,14,16,17,18,21,22,24,28,29,30,33,37,40,49,42,45,46, + 0,1,2,3,4,5,6,7,8,10,12,14,16,17,18,21,22,24,25,26,27,28,29,30,31,32,33,37,39,40,41,49,42,45,46,48, + 8,25,31, + 46, + 5,25, + 5,7,25, + 5,6,25,37, + 25, + 25, + 12, + 11,18,24,28,29,30,33,40, + 33, + 49, + 49, + 49,42, + 37, + 5,9,10,12,18,20,22,25,28,33,36,39,40,41,48, + 48, 5, - 4,5,23,29, - 19,20, - 0,1,2,3,4,6,13,15,16,25,26,27,29,36,39, - 22, - 5,15,16, - 23, - 34, + 4,5,25,33, + 21,22, + 0,1,2,3,4,6,14,16,17,28,29,30,33,49,42,45,46, + 24, + 4,5,6,16,17,34,40,49, + 34, + 25, + 4,34,39, 5, 5, - 12, - 42, + 13, + 48, 5, 5, - 4, + 4,26,32, 5, 5, - 11, - 23, - 42, - 42, - 32, - 5,25,29,42, + 12, + 25, + 48, + 48, + 37, + 5,28,33,48, + 46, 5, 4, 5, 8, 4, - 15,16,23, - 11, + 40, + 16,17,25, + 12, 5, - 42, - 42, - 33,41, - 42, - 1,5,6,10,11,24,26,28,34, - 8,10,11,23,24,28,34,35,42, + 48, + 11, + 48, + 34, + 4,34, + 38,46,47, + 48, + 1,5,6,10,12,27,29,31,39, + 34, + 8,10,12,25,27,31,39,41,48, 4, - 8,11,23,35,42, - 30, + 8,12,25,41,48, + 35, 5,8, 4, - 34, - 32, + 39, + 11, + 37, 5, 5, - 11, - 31, - 11, - 4,5,25,29,35, + 12, + 36, + 12, + 4,5,28,33,41, 5, 5, 4, - 11, + 12, 5, + 46, 4, - 32, - 11, - 23,32, - 5,29, - 8,33, + 37, + 12, + 25,37, + 5,33,34, + 8,38, 5, - 22, - 4,23,25,29, - 0,1,2,3,4,13,15,16,19,20,22,25,26,27,29,32,36,39, + 24, + 4,11,18,25,26,28,33,40, + 0,1,2,3,4,6,11,14,16,17,18,21,22,24,28,29,30,33,37,40,49,42,45,46, 5, - 35, - 5,6,23,25,26,27,29,32, - 40, - 4,5,11, - 11,42, - 32, + 41, + 5,6,11,18,25,28,29,30,33,34,37,40,46, + 46, + 4,5,12, + 12,48, + 37, 8, - 40, - 11,28,34, + 46, + 12,31,39, + 11, 5, - 8,23,34, - 4,5,6,8,19,20,22,23,32,37,40, - 4,11,35, + 8,25,39, + 4,5,6,8,21,22,24,25,37,43,46, + 4,12,18,40,41, 5, - 25,29, - 22,32, - 32, - 13, - 32, - 22, - 4,16, - 5, + 18,40,49, + 11,28,33, + 24,37, + 4,11,37,40, + 14, + 37, + 24, + 4,17, + 5,49, 5, 5, 4, - 8,23,35, - 5,6,27,36, - 7,9,12,14,17,18,31,33,41, - 5,40, - 0,1,2,3,11,13,15,16,24,32,34,35,36,39,42, - 7,9,12,14,17,18,31,33,41, + 8,25,41, + 5,6,30,49,42, + 7,9,13,15,19,20,36,38,47, + 18,40, + 5,46, + 12,14,16,17,27,37,39,41,45,48, + 7,9,13,15,19,20,36,38,47, 5, 5, - 2,5,6,10,11,24,26,28,34,35, - 5,11,28,35, - 5,7,9,12,14,17,18,31,33,41, + 2,5,6,10,12,27,29,31,39,41, + 26, + 5,12,31,41, + 5,7,9,13,15,19,20,36,38,47, 5, - 22, - 32,38, - 0,1,2,3,5,6,15,16,25,29,36,37, + 34, + 24, + 11,46, + 37,44, + 0,1,2,3,5,6,16,17,18,28,33,40,49,42,43, 8, 5, - 8,11,28,34, - 42, + 8,11,12,18,31,39, + 48, 5, - 10,11,19,20,24,28,32,34,35,38,39,40,42, + 10,12,21,22,27,31,37,39,41,44,45,46,48, 8, - 40,41, - 3,4,5,6,23,27,36, - 32, - 8,23,42, + 46,47, + 3,4,5,6,25,30,49,42, + 37, + 8,25,48, 5, - 4,5,10,11,15,16,19,20,22,24,25,26,27,28,29,32,34,35,39,42, - 32, - 0,6, - 40, - 29, - 32, - 5,42, + 49, + 4,5,6,10,11,12,16,17,18,21,22,24,27,28,29,30,31,33,34,37,39,40,41,45,48, + 37, + 0,6,26, + 46, + 33, + 37, + 5,48, 5, - 4,5,8,10,11,13,16,19,20,22,24,25,26,27,28,29,34,35,39,42, + 4,5,8,10,11,12,14,17,18,21,22,24,27,28,29,30,31,33,39,40,41,45,46,48, 5, diff --git a/doc/salome/gui/SMESH/whdata/whtdata0.htm b/doc/salome/gui/SMESH/whdata/whtdata0.htm index 429476ba8..7583fc28e 100755 --- a/doc/salome/gui/SMESH/whdata/whtdata0.htm +++ b/doc/salome/gui/SMESH/whdata/whtdata0.htm @@ -6,28 +6,35 @@