From c63ee099ad2b149bd70136839c973e8910137bc5 Mon Sep 17 00:00:00 2001 From: jfa Date: Thu, 1 Jun 2006 11:39:17 +0000 Subject: [PATCH] Join modifications from branch BR_DEBUG_3_2_0b1 --- INSTALL | 7 +- Makefile.in | 24 +- SMESH_version.h.in | 34 + adm_local/Makefile.in | 2 +- adm_local/unix/config_files/check_SMESH.m4 | 9 + adm_local/unix/make_commence.in | 63 +- adm_local/unix/make_conclude.in | 20 +- bin/VERSION | 1 - bin/VERSION.in | 1 + configure.in.base | 20 +- doc/Makefile.in | 13 +- doc/salome/Makefile.in | 37 +- doc/salome/SMESH_index_v3.1.0.html | 95 - doc/salome/gui/Makefile.in | 25 +- doc/salome/gui/SMESH/about_viewing_meshes.htm | 23 +- .../adding_quadratic_nodes_and_elements.htm | 23 +- doc/salome/gui/SMESH/aspect_ratio_3d.htm | 23 +- .../gui/SMESH/borders_at_multi-connection.htm | 23 +- .../SMESH/borders_at_multiconnection_2d.htm | 23 +- doc/salome/gui/SMESH/clipping.htm | 23 +- doc/salome/gui/SMESH/constructing_meshes.htm | 23 +- doc/salome/gui/SMESH/cshdat_robohelp.htm | 2 +- doc/salome/gui/SMESH/cshdat_webhelp.htm | 2 +- .../gui/SMESH/defining_hypotheses_tui.htm | 23 +- doc/salome/gui/SMESH/deleting_groups.htm | 23 +- doc/salome/gui/SMESH/display_entity.htm | 23 +- doc/salome/gui/SMESH/extrusion.htm | 23 +- .../gui/SMESH/extrusion_along_a_path.htm | 23 +- .../gui/SMESH/files/about_hypotheses.htm | 23 +- doc/salome/gui/SMESH/files/about_meshes.htm | 23 +- .../SMESH/files/about_meshing_algorithms.htm | 23 +- .../SMESH/files/about_quality_controls.htm | 23 +- .../SMESH/files/adding_nodes_and_elements.htm | 23 +- .../gui/SMESH/files/area_of_elements.htm | 23 +- doc/salome/gui/SMESH/files/arithmetic_1d.htm | 23 +- doc/salome/gui/SMESH/files/aspect_ratio.htm | 23 +- .../changing_orientation_of_elements.htm | 23 +- ...nstructing_groups_of_specific_elements.htm | 23 +- .../gui/SMESH/files/constructing_meshes.htm | 23 +- .../SMESH/files/constructing_submeshes.htm | 23 +- .../gui/SMESH/files/creating_groups.htm | 23 +- .../gui/SMESH/files/cutting_quadrangles.htm | 23 +- .../files/diagonal_iversion_of_elements.htm | 23 +- .../gui/SMESH/files/displacing_nodes.htm | 23 +- .../SMESH/files/displaying_nodes_numbers.htm | 23 +- doc/salome/gui/SMESH/files/editing_groups.htm | 23 +- .../files/importing_and_exporting_meshes.htm | 23 +- .../gui/SMESH/files/introduction_to_smesh.htm | 240 -- .../gui/SMESH/files/length_of_edges.htm | 23 +- .../files/max._element_area_hypothesis.htm | 25 +- .../files/max._element_volume_hypothsis.htm | 23 +- doc/salome/gui/SMESH/files/merging_nodes.htm | 23 +- doc/salome/gui/SMESH/files/minimum_angle.htm | 23 +- .../non_conform_mesh_allowed_hypothesis.htm | 23 +- .../reassigning_hypotheses_and_algorithms.htm | 23 +- .../files/removing_nodes_and_elements.htm | 23 +- .../files/renumbering_nodes_and_elements.htm | 23 +- doc/salome/gui/SMESH/files/rotation.htm | 23 +- .../gui/SMESH/files/running_smesh_module.htm | 23 +- doc/salome/gui/SMESH/files/sewing_meshes.htm | 23 +- doc/salome/gui/SMESH/files/skew.htm | 23 +- doc/salome/gui/SMESH/files/smoothing.htm | 23 +- doc/salome/gui/SMESH/files/symmetry.htm | 23 +- doc/salome/gui/SMESH/files/taper.htm | 23 +- doc/salome/gui/SMESH/files/translation.htm | 23 +- .../files/uniting_a_set_of_triangles.htm | 23 +- .../gui/SMESH/files/uniting_two_triangles.htm | 23 +- .../files/using_operations_on_groups.htm | 23 +- .../gui/SMESH/files/viewing_mesh_info.htm | 23 +- doc/salome/gui/SMESH/files/vtk_3d_viewer.htm | 23 +- doc/salome/gui/SMESH/files/warp.htm | 23 +- doc/salome/gui/SMESH/free_borders.htm | 23 +- doc/salome/gui/SMESH/free_edges.htm | 23 +- doc/salome/gui/SMESH/grouping_elements.htm | 23 +- doc/salome/gui/SMESH/index.htm | 180 ++ .../SMESH/{smesh_csh.htm => index_csh.htm} | 2 +- .../SMESH/{smesh_rhc.htm => index_rhc.htm} | 2 +- doc/salome/gui/SMESH/length.htm | 23 +- doc/salome/gui/SMESH/merge_elements.htm | 23 +- doc/salome/gui/SMESH/mesh.htm | 216 ++ doc/salome/gui/SMESH/modifying_meshes.htm | 23 +- doc/salome/gui/SMESH/pattern_mapping.htm | 23 +- doc/salome/gui/SMESH/presentation.htm | 23 +- doc/salome/gui/SMESH/quality_controls.htm | 23 +- doc/salome/gui/SMESH/revolution.htm | 23 +- .../gui/SMESH/selection_filter_library.htm | 23 +- doc/salome/gui/SMESH/smesh.htm | 139 -- doc/salome/gui/SMESH/smesh.log | 108 +- .../SMESH/smeshpy_doc/classsmesh_1_1Mesh.html | 1004 ++++++++ .../classsmesh_1_1Mesh__Algorithm.html | 461 ++++ ...esh_1_1Mesh__Algorithm__inherit__graph.jpg | Bin 0 -> 19672 bytes .../classsmesh_1_1Mesh__Hexahedron.html | 502 ++++ ...sh_1_1Mesh__Hexahedron__inherit__graph.jpg | Bin 0 -> 5526 bytes .../classsmesh_1_1Mesh__Netgen.html | 590 +++++ ...ssmesh_1_1Mesh__Netgen__inherit__graph.jpg | Bin 0 -> 5126 bytes .../classsmesh_1_1Mesh__Quadrangle.html | 533 +++++ ...sh_1_1Mesh__Quadrangle__inherit__graph.jpg | Bin 0 -> 5392 bytes .../classsmesh_1_1Mesh__Segment.html | 858 +++++++ .../classsmesh_1_1Mesh__Segment__Python.html | 910 ++++++++ ...1Mesh__Segment__Python__inherit__graph.jpg | Bin 0 -> 7802 bytes ...smesh_1_1Mesh__Segment__inherit__graph.jpg | Bin 0 -> 8272 bytes .../classsmesh_1_1Mesh__Tetrahedron.html | 553 +++++ ...h_1_1Mesh__Tetrahedron__inherit__graph.jpg | Bin 0 -> 5448 bytes .../classsmesh_1_1Mesh__Triangle.html | 578 +++++ ...mesh_1_1Mesh__Triangle__inherit__graph.jpg | Bin 0 -> 5149 bytes doc/salome/gui/SMESH/smeshpy_doc/doxygen.css | 218 ++ .../gui/SMESH/smeshpy_doc/namespacesmesh.html | 265 +++ doc/salome/gui/SMESH/transforming_meshes.htm | 23 +- doc/salome/gui/SMESH/transparency.htm | 23 +- doc/salome/gui/SMESH/viewing_meshes.htm | 23 +- doc/salome/gui/SMESH/volume.htm | 23 +- doc/salome/gui/SMESH/whcsh_home.htm | 2 +- doc/salome/gui/SMESH/whcshdata.htm | 2 +- .../SMESH/{whskin_pdhtml.htm => whd_dpns.htm} | 47 +- doc/salome/gui/SMESH/whd_hide0.gif | Bin 0 -> 190 bytes doc/salome/gui/SMESH/whd_hide1.gif | Bin 0 -> 190 bytes doc/salome/gui/SMESH/whd_hide2.gif | Bin 0 -> 190 bytes doc/salome/gui/SMESH/whd_next0.gif | Bin 0 -> 159 bytes doc/salome/gui/SMESH/whd_next1.gif | Bin 0 -> 159 bytes doc/salome/gui/SMESH/whd_next2.gif | Bin 0 -> 159 bytes doc/salome/gui/SMESH/whd_nvp10.htm | 15 + .../{whskin_papplet.htm => whd_nvp20.htm} | 140 +- doc/salome/gui/SMESH/whd_prev0.gif | Bin 0 -> 159 bytes doc/salome/gui/SMESH/whd_prev1.gif | Bin 0 -> 159 bytes doc/salome/gui/SMESH/whd_prev2.gif | Bin 0 -> 159 bytes doc/salome/gui/SMESH/whd_show0.gif | Bin 0 -> 199 bytes doc/salome/gui/SMESH/whd_show1.gif | Bin 0 -> 199 bytes doc/salome/gui/SMESH/whd_show2.gif | Bin 0 -> 199 bytes doc/salome/gui/SMESH/whd_sync0.gif | Bin 0 -> 231 bytes doc/salome/gui/SMESH/whd_sync1.gif | Bin 0 -> 231 bytes doc/salome/gui/SMESH/whd_sync2.gif | Bin 0 -> 231 bytes .../gui/SMESH/{wht_tab0.gif => whd_tab0.gif} | Bin .../gui/SMESH/{wht_tab1.gif => whd_tab1.gif} | Bin .../gui/SMESH/{wht_tab2.gif => whd_tab2.gif} | Bin .../gui/SMESH/{wht_tab3.gif => whd_tab3.gif} | Bin .../gui/SMESH/{wht_tab4.gif => whd_tab4.gif} | Bin .../gui/SMESH/{wht_tab5.gif => whd_tab5.gif} | Bin .../gui/SMESH/{wht_tab6.gif => whd_tab6.gif} | Bin .../gui/SMESH/{wht_tab7.gif => whd_tab7.gif} | Bin .../gui/SMESH/{wht_tab8.gif => whd_tab8.gif} | Bin doc/salome/gui/SMESH/whd_tabs.htm | 533 +++++ doc/salome/gui/SMESH/whd_toc1.gif | Bin 0 -> 153 bytes doc/salome/gui/SMESH/whd_toc2.gif | Bin 0 -> 173 bytes doc/salome/gui/SMESH/whd_toc3.gif | Bin 0 -> 158 bytes .../gui/SMESH/{wht_toc4.gif => whd_toc4.gif} | Bin .../SMESH/{whst_topics.xml => whd_topic.xml} | 35 +- doc/salome/gui/SMESH/whd_wbsh0.gif | Bin 0 -> 260 bytes doc/salome/gui/SMESH/whd_wbsh1.gif | Bin 0 -> 260 bytes doc/salome/gui/SMESH/whd_wbsh2.gif | Bin 0 -> 260 bytes doc/salome/gui/SMESH/whdata/whftdata0.htm | 2 +- doc/salome/gui/SMESH/whdata/whfwdata0.htm | 1136 ++++----- doc/salome/gui/SMESH/whdata/whtdata0.htm | 3 +- doc/salome/gui/SMESH/whestart.ico | Bin 10134 -> 0 bytes doc/salome/gui/SMESH/whfbody.htm | 12 +- doc/salome/gui/SMESH/whfdhtml.htm | 4 +- doc/salome/gui/SMESH/whfform.htm | 8 +- doc/salome/gui/SMESH/whgbody.htm | 10 +- doc/salome/gui/SMESH/whgdata/whlstf0.htm | 18 +- doc/salome/gui/SMESH/whgdata/whlstf1.htm | 20 +- doc/salome/gui/SMESH/whgdata/whlstf10.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstf11.htm | 18 +- doc/salome/gui/SMESH/whgdata/whlstf12.htm | 20 +- doc/salome/gui/SMESH/whgdata/whlstf13.htm | 18 +- doc/salome/gui/SMESH/whgdata/whlstf2.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstf3.htm | 18 +- doc/salome/gui/SMESH/whgdata/whlstf4.htm | 18 +- doc/salome/gui/SMESH/whgdata/whlstf5.htm | 20 +- doc/salome/gui/SMESH/whgdata/whlstf6.htm | 20 +- doc/salome/gui/SMESH/whgdata/whlstf7.htm | 18 +- doc/salome/gui/SMESH/whgdata/whlstf8.htm | 20 +- doc/salome/gui/SMESH/whgdata/whlstf9.htm | 20 +- doc/salome/gui/SMESH/whgdata/whlstfl0.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl1.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl10.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl11.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl12.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl13.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl14.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl15.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl16.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl17.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl18.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl19.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl2.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl20.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl21.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl22.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl23.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl24.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl25.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl3.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl4.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl5.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl6.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl7.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl8.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstfl9.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstg0.htm | 14 +- doc/salome/gui/SMESH/whgdata/whlsti0.htm | 16 +- doc/salome/gui/SMESH/whgdata/whlstt0.htm | 14 +- doc/salome/gui/SMESH/whgdata/whlstt1.htm | 30 +- doc/salome/gui/SMESH/whgdata/whlstt2.htm | 44 +- doc/salome/gui/SMESH/whgdata/whlstt3.htm | 54 +- doc/salome/gui/SMESH/whgdata/whlstt4.htm | 46 +- doc/salome/gui/SMESH/whgdata/whlstt5.htm | 60 +- doc/salome/gui/SMESH/whgdata/whlstt6.htm | 42 +- doc/salome/gui/SMESH/whgdata/whlstt7.htm | 63 +- doc/salome/gui/SMESH/whgdata/whlstt8.htm | 74 +- doc/salome/gui/SMESH/whgdata/whlstt9.htm | 44 +- doc/salome/gui/SMESH/whgdata/whnvl31.htm | 16 +- doc/salome/gui/SMESH/whgdata/whnvl32.htm | 16 +- doc/salome/gui/SMESH/whgdata/whnvl33.htm | 16 +- doc/salome/gui/SMESH/whgdata/whnvt30.htm | 14 +- doc/salome/gui/SMESH/whgdata/whnvt31.htm | 16 +- doc/salome/gui/SMESH/whgdata/whnvt32.htm | 16 +- doc/salome/gui/SMESH/whgdata/whnvt33.htm | 16 +- doc/salome/gui/SMESH/whgdef.htm | 4 +- doc/salome/gui/SMESH/whgdhtml.htm | 4 +- doc/salome/gui/SMESH/whibody.htm | 12 +- doc/salome/gui/SMESH/whidhtml.htm | 4 +- doc/salome/gui/SMESH/whiform.htm | 6 +- doc/salome/gui/SMESH/whnjs.htm | 4 +- doc/salome/gui/SMESH/whres.xml | 72 +- doc/salome/gui/SMESH/whrstart.ico | Bin 10134 -> 0 bytes doc/salome/gui/SMESH/whskin_banner.htm | 49 - doc/salome/gui/SMESH/whskin_frmset01.htm | 172 -- doc/salome/gui/SMESH/whskin_frmset010.htm | 50 - doc/salome/gui/SMESH/whskin_homepage.htm | 189 +- doc/salome/gui/SMESH/whskin_info.htm | 6 +- doc/salome/gui/SMESH/whskin_mbars.htm | 59 - doc/salome/gui/SMESH/whskin_pickup.htm | 12 +- doc/salome/gui/SMESH/whskin_plist.htm | 238 -- doc/salome/gui/SMESH/whskin_tbars.htm | 101 - doc/salome/gui/SMESH/whstart.ico | Bin 10134 -> 0 bytes doc/salome/gui/SMESH/whstart.js | 6 +- doc/salome/gui/SMESH/wht_abge.jpg | Bin 6210 -> 0 bytes doc/salome/gui/SMESH/wht_abgi.jpg | Bin 4967 -> 0 bytes doc/salome/gui/SMESH/wht_abgw.jpg | Bin 5659 -> 0 bytes doc/salome/gui/SMESH/wht_abte.jpg | Bin 9810 -> 0 bytes doc/salome/gui/SMESH/wht_abti.jpg | Bin 3863 -> 0 bytes doc/salome/gui/SMESH/wht_abtw.jpg | Bin 3973 -> 0 bytes doc/salome/gui/SMESH/wht_fts_h.gif | Bin 188 -> 0 bytes doc/salome/gui/SMESH/wht_fts_n.gif | Bin 188 -> 0 bytes doc/salome/gui/SMESH/wht_glo_h.gif | Bin 142 -> 0 bytes doc/salome/gui/SMESH/wht_glo_n.gif | Bin 142 -> 0 bytes doc/salome/gui/SMESH/wht_go.gif | Bin 260 -> 0 bytes doc/salome/gui/SMESH/wht_hide.gif | Bin 842 -> 0 bytes doc/salome/gui/SMESH/wht_idx_h.gif | Bin 168 -> 0 bytes doc/salome/gui/SMESH/wht_idx_n.gif | Bin 168 -> 0 bytes doc/salome/gui/SMESH/wht_logo1.gif | Bin 1405 -> 0 bytes doc/salome/gui/SMESH/wht_logo2.gif | Bin 1393 -> 0 bytes doc/salome/gui/SMESH/wht_next.gif | Bin 73 -> 0 bytes doc/salome/gui/SMESH/wht_next_g.gif | Bin 73 -> 0 bytes doc/salome/gui/SMESH/wht_prev.gif | Bin 73 -> 0 bytes doc/salome/gui/SMESH/wht_prev_g.gif | Bin 73 -> 0 bytes doc/salome/gui/SMESH/wht_spac.gif | Bin 43 -> 0 bytes doc/salome/gui/SMESH/wht_sync.gif | Bin 846 -> 0 bytes doc/salome/gui/SMESH/wht_toc1.gif | Bin 124 -> 0 bytes doc/salome/gui/SMESH/wht_toc2.gif | Bin 922 -> 0 bytes doc/salome/gui/SMESH/wht_toc3.gif | Bin 911 -> 0 bytes doc/salome/gui/SMESH/wht_toc_h.gif | Bin 204 -> 0 bytes doc/salome/gui/SMESH/wht_toc_n.gif | Bin 195 -> 0 bytes doc/salome/gui/SMESH/wht_ws.gif | Bin 973 -> 0 bytes doc/salome/gui/SMESH/wht_ws_g.gif | Bin 949 -> 0 bytes doc/salome/gui/SMESH/whtbar.js | 2043 ----------------- doc/salome/gui/SMESH/whtdhtml.htm | 26 +- doc/salome/gui/SMESH/whtopic.js | 3 +- doc/salome/gui/SMESH/whxdata/whftdata0.xml | 2 +- doc/salome/gui/SMESH/whxdata/whfwdata0.xml | 1136 ++++----- doc/salome/gui/SMESH/whxdata/whtdata0.xml | 3 +- doc/salome/tui/Makefile.in | 24 +- .../tui/SMESH/{doxyfile_py => doxyfile.in} | 4 +- .../tui/SMESH/{doxyfile => doxyfile_py.in} | 2 +- doc/salome/tui/SMESH/sources/myheader.html | 1 + .../tui/SMESH/sources/static/doxygen.css | 10 - .../sources/static/{tree.js => tree.js.in} | 2 +- idl/Makefile.in | 4 +- idl/SMESH_BasicHypothesis.idl | 2 +- idl/SMESH_Filter.idl | 2 +- idl/SMESH_Gen.idl | 2 +- idl/SMESH_Group.idl | 2 +- idl/SMESH_Hypothesis.idl | 2 +- idl/SMESH_Mesh.idl | 2 +- idl/SMESH_Pattern.idl | 2 +- .../{SMESHCatalog.xml => SMESHCatalog.xml.in} | 2 +- src/Controls/Makefile.in | 8 +- src/Controls/SMESHControls.cxx | 2 +- src/Controls/SMESH_Controls.cxx | 2 +- src/Controls/SMESH_Controls.hxx | 2 +- src/Controls/SMESH_ControlsDef.hxx | 2 +- src/Driver/Driver_Document.cxx | 2 +- src/Driver/Driver_Document.h | 2 +- src/Driver/Driver_Mesh.cxx | 2 +- src/Driver/Driver_Mesh.h | 2 +- src/Driver/Driver_SMDS_Mesh.cxx | 2 +- src/Driver/Driver_SMDS_Mesh.h | 2 +- src/Driver/Driver_SMESHDS_Mesh.cxx | 2 +- src/Driver/Driver_SMESHDS_Mesh.h | 2 +- src/Driver/Makefile.in | 4 +- src/DriverDAT/DAT_Test.cxx | 2 +- src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx | 2 +- src/DriverDAT/DriverDAT_R_SMDS_Mesh.h | 2 +- .../DriverDAT_R_SMESHDS_Document.cxx | 2 +- src/DriverDAT/DriverDAT_R_SMESHDS_Document.h | 2 +- src/DriverDAT/DriverDAT_R_SMESHDS_Mesh.cxx | 2 +- src/DriverDAT/DriverDAT_R_SMESHDS_Mesh.h | 2 +- src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx | 2 +- src/DriverDAT/DriverDAT_W_SMDS_Mesh.h | 2 +- .../DriverDAT_W_SMESHDS_Document.cxx | 2 +- src/DriverDAT/DriverDAT_W_SMESHDS_Document.h | 2 +- src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.cxx | 2 +- src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.h | 2 +- src/DriverDAT/Makefile.in | 8 +- src/DriverMED/DriverMED_Family.cxx | 2 +- src/DriverMED/DriverMED_Family.h | 2 +- src/DriverMED/DriverMED_R_SMDS_Mesh.cxx | 2 +- src/DriverMED/DriverMED_R_SMDS_Mesh.h | 2 +- .../DriverMED_R_SMESHDS_Document.cxx | 2 +- src/DriverMED/DriverMED_R_SMESHDS_Document.h | 2 +- src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx | 94 +- src/DriverMED/DriverMED_R_SMESHDS_Mesh.h | 5 +- src/DriverMED/DriverMED_W_SMDS_Mesh.cxx | 2 +- src/DriverMED/DriverMED_W_SMDS_Mesh.h | 2 +- .../DriverMED_W_SMESHDS_Document.cxx | 2 +- src/DriverMED/DriverMED_W_SMESHDS_Document.h | 2 +- src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx | 2 +- src/DriverMED/DriverMED_W_SMESHDS_Mesh.h | 2 +- src/DriverMED/MED_Test.cxx | 2 +- src/DriverMED/Makefile.in | 10 +- src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx | 2 +- src/DriverSTL/DriverSTL_R_SMDS_Mesh.h | 2 +- src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx | 2 +- src/DriverSTL/DriverSTL_W_SMDS_Mesh.h | 2 +- src/DriverSTL/Makefile.in | 8 +- src/DriverSTL/STL_Test.cxx | 2 +- src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx | 2 +- src/DriverUNV/DriverUNV_R_SMDS_Mesh.h | 2 +- .../DriverUNV_R_SMESHDS_Document.cxx | 2 +- src/DriverUNV/DriverUNV_R_SMESHDS_Document.h | 2 +- src/DriverUNV/DriverUNV_R_SMESHDS_Mesh.cxx | 2 +- src/DriverUNV/DriverUNV_R_SMESHDS_Mesh.h | 2 +- src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx | 2 +- src/DriverUNV/DriverUNV_W_SMDS_Mesh.h | 2 +- .../DriverUNV_W_SMESHDS_Document.cxx | 2 +- src/DriverUNV/DriverUNV_W_SMESHDS_Document.h | 2 +- src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.cxx | 2 +- src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.h | 2 +- src/DriverUNV/Makefile.in | 8 +- src/DriverUNV/UNV2411_Structure.cxx | 2 +- src/DriverUNV/UNV2411_Structure.hxx | 2 +- src/DriverUNV/UNV2412_Structure.cxx | 2 +- src/DriverUNV/UNV2412_Structure.hxx | 2 +- src/DriverUNV/UNV2417_Structure.cxx | 2 +- src/DriverUNV/UNV2417_Structure.hxx | 2 +- src/DriverUNV/UNV_Test.cxx | 2 +- src/DriverUNV/UNV_Utilities.cxx | 21 +- src/DriverUNV/UNV_Utilities.hxx | 21 +- src/MEFISTO2/Makefile.in | 6 +- src/Makefile.in | 4 +- src/NETGEN/Makefile.in | 2 +- src/NETGENPlugin/Makefile.in | 12 +- src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_i.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_icons.po | 2 +- src/OBJECT/Makefile.in | 18 +- src/OBJECT/SMESH_Actor.cxx | 2 +- src/OBJECT/SMESH_Actor.h | 2 +- src/OBJECT/SMESH_ActorDef.h | 2 +- src/OBJECT/SMESH_ActorUtils.cxx | 2 +- src/OBJECT/SMESH_ActorUtils.h | 2 +- src/OBJECT/SMESH_DeviceActor.cxx | 2 +- src/OBJECT/SMESH_DeviceActor.h | 2 +- src/OBJECT/SMESH_ExtractGeometry.cxx | 2 +- src/OBJECT/SMESH_ExtractGeometry.h | 2 +- src/OBJECT/SMESH_Object.cxx | 2 +- src/OBJECT/SMESH_Object.h | 2 +- src/OBJECT/SMESH_ObjectDef.h | 2 +- src/SMDS/Makefile.in | 9 +- src/SMDS/SMDSAbs_ElementType.hxx | 2 +- src/SMDS/SMDS_EdgePosition.cxx | 2 +- src/SMDS/SMDS_EdgePosition.hxx | 2 +- src/SMDS/SMDS_ElemIterator.hxx | 2 +- src/SMDS/SMDS_FaceOfEdges.cxx | 2 +- src/SMDS/SMDS_FaceOfEdges.hxx | 2 +- src/SMDS/SMDS_FaceOfNodes.cxx | 2 +- src/SMDS/SMDS_FaceOfNodes.hxx | 2 +- src/SMDS/SMDS_FacePosition.cxx | 2 +- src/SMDS/SMDS_FacePosition.hxx | 2 +- src/SMDS/SMDS_Iterator.hxx | 2 +- src/SMDS/SMDS_IteratorOfElements.cxx | 2 +- src/SMDS/SMDS_IteratorOfElements.hxx | 2 +- src/SMDS/SMDS_Mesh.cxx | 2 +- src/SMDS/SMDS_Mesh.hxx | 2 +- src/SMDS/SMDS_MeshEdge.cxx | 2 +- src/SMDS/SMDS_MeshEdge.hxx | 2 +- src/SMDS/SMDS_MeshElement.cxx | 2 +- src/SMDS/SMDS_MeshElement.hxx | 2 +- src/SMDS/SMDS_MeshElementIDFactory.cxx | 2 +- src/SMDS/SMDS_MeshElementIDFactory.hxx | 2 +- src/SMDS/SMDS_MeshFace.cxx | 2 +- src/SMDS/SMDS_MeshFace.hxx | 2 +- src/SMDS/SMDS_MeshGroup.cxx | 2 +- src/SMDS/SMDS_MeshGroup.hxx | 2 +- src/SMDS/SMDS_MeshIDFactory.cxx | 2 +- src/SMDS/SMDS_MeshIDFactory.hxx | 2 +- src/SMDS/SMDS_MeshNode.cxx | 2 +- src/SMDS/SMDS_MeshNode.hxx | 2 +- src/SMDS/SMDS_MeshObject.cxx | 2 +- src/SMDS/SMDS_MeshObject.hxx | 2 +- src/SMDS/SMDS_MeshVolume.cxx | 2 +- src/SMDS/SMDS_MeshVolume.hxx | 2 +- src/SMDS/SMDS_PolygonalFaceOfNodes.cxx | 2 +- src/SMDS/SMDS_PolygonalFaceOfNodes.hxx | 2 +- src/SMDS/SMDS_PolyhedralVolumeOfNodes.cxx | 2 +- src/SMDS/SMDS_PolyhedralVolumeOfNodes.hxx | 2 +- src/SMDS/SMDS_Position.cxx | 2 +- src/SMDS/SMDS_Position.hxx | 2 +- src/SMDS/SMDS_QuadraticEdge.cxx | 2 +- src/SMDS/SMDS_QuadraticEdge.hxx | 2 +- src/SMDS/SMDS_QuadraticFaceOfNodes.cxx | 2 +- src/SMDS/SMDS_QuadraticFaceOfNodes.hxx | 2 +- src/SMDS/SMDS_QuadraticVolumeOfNodes.cxx | 2 +- src/SMDS/SMDS_QuadraticVolumeOfNodes.hxx | 2 +- src/SMDS/SMDS_SetIterator.hxx | 2 +- src/SMDS/SMDS_SpacePosition.cxx | 2 +- src/SMDS/SMDS_SpacePosition.hxx | 2 +- src/SMDS/SMDS_TypeOfPosition.hxx | 2 +- src/SMDS/SMDS_VertexPosition.cxx | 2 +- src/SMDS/SMDS_VertexPosition.hxx | 2 +- src/SMDS/SMDS_VolumeOfFaces.cxx | 2 +- src/SMDS/SMDS_VolumeOfFaces.hxx | 2 +- src/SMDS/SMDS_VolumeOfNodes.cxx | 2 +- src/SMDS/SMDS_VolumeOfNodes.hxx | 2 +- src/SMDS/SMDS_VolumeTool.cxx | 2 +- src/SMDS/SMDS_VolumeTool.hxx | 2 +- src/SMESH/Makefile.in | 14 +- src/SMESH/SMESH_1D_Algo.cxx | 2 +- src/SMESH/SMESH_1D_Algo.hxx | 2 +- src/SMESH/SMESH_2D_Algo.cxx | 2 +- src/SMESH/SMESH_2D_Algo.hxx | 2 +- src/SMESH/SMESH_3D_Algo.cxx | 2 +- src/SMESH/SMESH_3D_Algo.hxx | 2 +- src/SMESH/SMESH_Algo.cxx | 2 +- src/SMESH/SMESH_Algo.hxx | 2 +- src/SMESH/SMESH_Block.cxx | 2 +- src/SMESH/SMESH_Block.hxx | 2 +- ...MESH_DataMapOfElemPtrSequenceOfElemPtr.hxx | 2 +- src/SMESH/SMESH_Gen.cxx | 2 +- src/SMESH/SMESH_Gen.hxx | 2 +- src/SMESH/SMESH_Group.cxx | 2 +- src/SMESH/SMESH_Group.hxx | 2 +- src/SMESH/SMESH_HypoFilter.cxx | 2 +- src/SMESH/SMESH_HypoFilter.hxx | 2 +- src/SMESH/SMESH_Hypothesis.cxx | 2 +- src/SMESH/SMESH_Hypothesis.hxx | 2 +- ...IndexedDataMapOfShapeIndexedMapOfShape.hxx | 2 +- src/SMESH/SMESH_Mesh.cxx | 2 +- src/SMESH/SMESH_Mesh.hxx | 2 +- src/SMESH/SMESH_MeshEditor.cxx | 147 +- src/SMESH/SMESH_MeshEditor.hxx | 2 +- src/SMESH/SMESH_MesherHelper.cxx | 2 +- src/SMESH/SMESH_MesherHelper.hxx | 2 +- src/SMESH/SMESH_Pattern.cxx | 2 +- src/SMESH/SMESH_Pattern.hxx | 2 +- src/SMESH/SMESH_SequenceOfElemPtr.hxx | 4 +- src/SMESH/SMESH_SequenceOfNode.hxx | 2 +- src/SMESH/SMESH_subMesh.cxx | 2 +- src/SMESH/SMESH_subMesh.hxx | 2 +- src/SMESHClient/Makefile.in | 84 +- src/SMESHClient/SMESHClientBin.cxx | 2 +- src/SMESHClient/SMESH_Client.cxx | 2 +- src/SMESHClient/SMESH_Client.hxx | 2 +- src/SMESHDS/Makefile.in | 6 +- src/SMESHDS/SMESHDS_Command.cxx | 2 +- src/SMESHDS/SMESHDS_Command.hxx | 2 +- src/SMESHDS/SMESHDS_CommandType.hxx | 2 +- src/SMESHDS/SMESHDS_Document.cxx | 2 +- src/SMESHDS/SMESHDS_Document.hxx | 2 +- src/SMESHDS/SMESHDS_Group.cxx | 2 +- src/SMESHDS/SMESHDS_Group.hxx | 2 +- src/SMESHDS/SMESHDS_GroupBase.cxx | 2 +- src/SMESHDS/SMESHDS_GroupBase.hxx | 2 +- src/SMESHDS/SMESHDS_GroupOnGeom.cxx | 2 +- src/SMESHDS/SMESHDS_GroupOnGeom.hxx | 2 +- src/SMESHDS/SMESHDS_Hypothesis.cxx | 2 +- src/SMESHDS/SMESHDS_Hypothesis.hxx | 2 +- src/SMESHDS/SMESHDS_Mesh.cxx | 2 +- src/SMESHDS/SMESHDS_Mesh.hxx | 2 +- src/SMESHDS/SMESHDS_Script.cxx | 2 +- src/SMESHDS/SMESHDS_Script.hxx | 2 +- src/SMESHDS/SMESHDS_SubMesh.cxx | 2 +- src/SMESHDS/SMESHDS_SubMesh.hxx | 2 +- .../Handle_SMESH_TypeFilter.hxx | 31 +- src/SMESHFiltersSelection/Makefile.in | 16 +- .../SMESH_LogicalFilter.cxx | 2 +- .../SMESH_LogicalFilter.hxx | 2 +- .../SMESH_NumberFilter.cxx | 2 +- .../SMESH_NumberFilter.hxx | 2 +- src/SMESHFiltersSelection/SMESH_Type.h | 2 +- .../SMESH_TypeFilter.cxx | 2 +- .../SMESH_TypeFilter.hxx | 2 +- .../SMESH_TypeFilter.ixx | 32 +- .../SMESH_TypeFilter.jxx | 2 +- src/SMESHGUI/Makefile.in | 14 +- src/SMESHGUI/SMESHBin.cxx | 2 +- src/SMESHGUI/SMESHGUI.cxx | 2 +- src/SMESHGUI/SMESHGUI.h | 2 +- src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h | 2 +- .../SMESHGUI_AddQuadraticElementDlg.cxx | 2 +- .../SMESHGUI_AddQuadraticElementDlg.h | 2 +- src/SMESHGUI/SMESHGUI_ClippingDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_ClippingDlg.h | 2 +- src/SMESHGUI/SMESHGUI_ConvToQuadDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_ConvToQuadDlg.h | 2 +- src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx | 2 +- src/SMESHGUI/SMESHGUI_ConvToQuadOp.h | 2 +- src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_CreatePatternDlg.h | 2 +- .../SMESHGUI_CreatePolyhedralVolumeDlg.cxx | 2 +- .../SMESHGUI_CreatePolyhedralVolumeDlg.h | 2 +- src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_DeleteGroupDlg.h | 2 +- src/SMESHGUI/SMESHGUI_Dialog.cxx | 2 +- src/SMESHGUI/SMESHGUI_Dialog.h | 2 +- src/SMESHGUI/SMESHGUI_Displayer.cxx | 2 +- src/SMESHGUI/SMESHGUI_Displayer.h | 2 +- src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_EditMeshDlg.h | 2 +- .../SMESHGUI_ExtrusionAlongPathDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.h | 2 +- src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_ExtrusionDlg.h | 2 +- src/SMESHGUI/SMESHGUI_Filter.cxx | 2 +- src/SMESHGUI/SMESHGUI_Filter.h | 2 +- src/SMESHGUI/SMESHGUI_FilterDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_FilterDlg.h | 2 +- src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_FilterLibraryDlg.h | 2 +- src/SMESHGUI/SMESHGUI_FilterUtils.cxx | 2 +- src/SMESHGUI/SMESHGUI_FilterUtils.h | 2 +- src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx | 2 +- src/SMESHGUI/SMESHGUI_GEOMGenUtils.h | 2 +- src/SMESHGUI/SMESHGUI_GroupDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_GroupDlg.h | 2 +- src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_GroupOpDlg.h | 2 +- src/SMESHGUI/SMESHGUI_GroupUtils.cxx | 2 +- src/SMESHGUI/SMESHGUI_GroupUtils.h | 2 +- src/SMESHGUI/SMESHGUI_Hypotheses.cxx | 2 +- src/SMESHGUI/SMESHGUI_Hypotheses.h | 2 +- src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx | 2 +- src/SMESHGUI/SMESHGUI_HypothesesUtils.h | 2 +- src/SMESHGUI/SMESHGUI_IdValidator.h | 2 +- src/SMESHGUI/SMESHGUI_MergeNodesDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_MergeNodesDlg.h | 2 +- src/SMESHGUI/SMESHGUI_MeshDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_MeshDlg.h | 2 +- src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_MeshInfosDlg.h | 2 +- src/SMESHGUI/SMESHGUI_MeshOp.cxx | 2 +- src/SMESHGUI/SMESHGUI_MeshOp.h | 2 +- src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_MeshPatternDlg.h | 2 +- src/SMESHGUI/SMESHGUI_MeshUtils.cxx | 2 +- src/SMESHGUI/SMESHGUI_MeshUtils.h | 2 +- src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_MoveNodesDlg.h | 2 +- src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_MultiEditDlg.h | 2 +- src/SMESHGUI/SMESHGUI_NodesDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_NodesDlg.h | 2 +- src/SMESHGUI/SMESHGUI_Operation.cxx | 22 +- src/SMESHGUI/SMESHGUI_Operation.h | 22 +- src/SMESHGUI/SMESHGUI_PatternUtils.cxx | 2 +- src/SMESHGUI/SMESHGUI_PatternUtils.h | 2 +- src/SMESHGUI/SMESHGUI_PatternWidget.cxx | 2 +- src/SMESHGUI/SMESHGUI_PatternWidget.h | 2 +- .../SMESHGUI_Preferences_ColorDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.h | 2 +- .../SMESHGUI_Preferences_ScalarBarDlg.cxx | 2 +- .../SMESHGUI_Preferences_ScalarBarDlg.h | 2 +- .../SMESHGUI_Preferences_SelectionDlg.cxx | 2 +- .../SMESHGUI_Preferences_SelectionDlg.h | 2 +- src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_RemoveElementsDlg.h | 2 +- src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_RemoveNodesDlg.h | 2 +- src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_RenumberingDlg.h | 2 +- src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_RevolutionDlg.h | 2 +- src/SMESHGUI/SMESHGUI_RotationDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_RotationDlg.h | 2 +- src/SMESHGUI/SMESHGUI_SMESHGenUtils.cxx | 2 +- src/SMESHGUI/SMESHGUI_SMESHGenUtils.h | 2 +- src/SMESHGUI/SMESHGUI_Selection.cxx | 2 +- src/SMESHGUI/SMESHGUI_Selection.h | 2 +- src/SMESHGUI/SMESHGUI_SelectionOp.cxx | 2 +- src/SMESHGUI/SMESHGUI_SelectionOp.h | 2 +- src/SMESHGUI/SMESHGUI_SewingDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_SewingDlg.h | 2 +- src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.h | 2 +- src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_SingleEditDlg.h | 2 +- src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_SmoothingDlg.h | 2 +- src/SMESHGUI/SMESHGUI_SpinBox.cxx | 2 +- src/SMESHGUI/SMESHGUI_SpinBox.h | 2 +- .../SMESHGUI_StandardMeshInfosDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.h | 2 +- src/SMESHGUI/SMESHGUI_Swig.cxx | 2 +- src/SMESHGUI/SMESHGUI_Swig.hxx | 2 +- src/SMESHGUI/SMESHGUI_Swig.i | 2 +- src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_SymmetryDlg.h | 2 +- src/SMESHGUI/SMESHGUI_TranslationDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_TranslationDlg.h | 2 +- src/SMESHGUI/SMESHGUI_TransparencyDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_TransparencyDlg.h | 2 +- src/SMESHGUI/SMESHGUI_Utils.cxx | 2 +- src/SMESHGUI/SMESHGUI_Utils.h | 2 +- src/SMESHGUI/SMESHGUI_VTKUtils.cxx | 2 +- src/SMESHGUI/SMESHGUI_VTKUtils.h | 2 +- src/SMESHGUI/SMESHGUI_XmlHandler.cxx | 2 +- src/SMESHGUI/SMESHGUI_XmlHandler.h | 2 +- src/SMESHGUI/SMESHGUI_aParameter.h | 2 +- src/SMESHGUI/SMESH_icons.po | 2 +- src/SMESHGUI/SMESH_images.po | 2 +- src/SMESHGUI/SMESH_msg_en.po | 27 +- src/SMESH_I/Makefile.in | 51 +- src/SMESH_I/SMESH.hxx | 2 +- src/SMESH_I/SMESHEngine.cxx | 2 +- src/SMESH_I/SMESH_1D_Algo_i.cxx | 2 +- src/SMESH_I/SMESH_1D_Algo_i.hxx | 2 +- src/SMESH_I/SMESH_2D_Algo_i.cxx | 2 +- src/SMESH_I/SMESH_2D_Algo_i.hxx | 2 +- src/SMESH_I/SMESH_2smeshpy.cxx | 2 +- src/SMESH_I/SMESH_2smeshpy.hxx | 2 +- src/SMESH_I/SMESH_3D_Algo_i.cxx | 2 +- src/SMESH_I/SMESH_3D_Algo_i.hxx | 2 +- src/SMESH_I/SMESH_Algo_i.cxx | 2 +- src/SMESH_I/SMESH_Algo_i.hxx | 2 +- src/SMESH_I/SMESH_DumpPython.cxx | 2 +- src/SMESH_I/SMESH_Filter_i.cxx | 2 +- src/SMESH_I/SMESH_Filter_i.hxx | 2 +- src/SMESH_I/SMESH_Gen_i.cxx | 19 +- src/SMESH_I/SMESH_Gen_i.hxx | 2 +- src/SMESH_I/SMESH_Gen_i_1.cxx | 2 +- src/SMESH_I/SMESH_Group_i.cxx | 2 +- src/SMESH_I/SMESH_Group_i.hxx | 2 +- src/SMESH_I/SMESH_Hypothesis_i.cxx | 2 +- src/SMESH_I/SMESH_Hypothesis_i.hxx | 2 +- src/SMESH_I/SMESH_MEDFamily_i.cxx | 2 +- src/SMESH_I/SMESH_MEDFamily_i.hxx | 2 +- src/SMESH_I/SMESH_MEDMesh_i.cxx | 2 +- src/SMESH_I/SMESH_MEDMesh_i.hxx | 2 +- src/SMESH_I/SMESH_MEDSupport_i.cxx | 2 +- src/SMESH_I/SMESH_MEDSupport_i.hxx | 2 +- src/SMESH_I/SMESH_MeshEditor_i.cxx | 20 +- src/SMESH_I/SMESH_MeshEditor_i.hxx | 2 +- src/SMESH_I/SMESH_Mesh_i.cxx | 20 +- src/SMESH_I/SMESH_Mesh_i.hxx | 2 +- src/SMESH_I/SMESH_Pattern_i.cxx | 2 +- src/SMESH_I/SMESH_Pattern_i.hxx | 2 +- src/SMESH_I/SMESH_PythonDump.hxx | 2 +- src/SMESH_I/SMESH_subMesh_i.cxx | 2 +- src/SMESH_I/SMESH_subMesh_i.hxx | 2 +- src/SMESH_I/smeshpy.py | 2 +- src/SMESH_SWIG/Makefile.in | 6 +- src/SMESH_SWIG/PAL_MESH_041_mesh.py | 2 +- src/SMESH_SWIG/PAL_MESH_043_2D.py | 2 +- src/SMESH_SWIG/PAL_MESH_043_3D.py | 2 +- src/SMESH_SWIG/SMESH_AdvancedEditor.py | 209 ++ src/SMESH_SWIG/SMESH_BelongToGeom.py | 2 +- src/SMESH_SWIG/SMESH_GroupFromGeom.py | 2 +- src/SMESH_SWIG/SMESH_GroupFromGeom2.py | 2 +- src/SMESH_SWIG/SMESH_GroupLyingOnGeom.py | 2 +- src/SMESH_SWIG/SMESH_Nut.py | 2 +- src/SMESH_SWIG/SMESH_Partition1_tetra.py | 2 +- src/SMESH_SWIG/SMESH_Sphere.py | 2 +- src/SMESH_SWIG/SMESH_blocks.py | 2 +- src/SMESH_SWIG/SMESH_box.py | 2 +- src/SMESH_SWIG/SMESH_box2_tetra.py | 2 +- src/SMESH_SWIG/SMESH_box3_tetra.py | 2 +- src/SMESH_SWIG/SMESH_box_tetra.py | 2 +- src/SMESH_SWIG/SMESH_controls.py | 2 +- src/SMESH_SWIG/SMESH_demo_hexa2_upd.py | 2 +- src/SMESH_SWIG/SMESH_fixation.py | 2 +- src/SMESH_SWIG/SMESH_fixation_hexa.py | 2 +- src/SMESH_SWIG/SMESH_fixation_netgen.py | 2 +- src/SMESH_SWIG/SMESH_fixation_tetra.py | 2 +- src/SMESH_SWIG/SMESH_flight_skin.py | 2 +- src/SMESH_SWIG/SMESH_freebord.py | 2 +- src/SMESH_SWIG/SMESH_hexaedre.py | 2 +- src/SMESH_SWIG/SMESH_mechanic.py | 2 +- src/SMESH_SWIG/SMESH_mechanic_editor.py | 2 +- src/SMESH_SWIG/SMESH_mechanic_netgen.py | 2 +- src/SMESH_SWIG/SMESH_mechanic_tetra.py | 2 +- src/SMESH_SWIG/SMESH_reg.py | 2 +- src/SMESH_SWIG/SMESH_shared_modules.py | 2 +- src/SMESH_SWIG/SMESH_test.py | 2 +- src/SMESH_SWIG/SMESH_test0.py | 2 +- src/SMESH_SWIG/SMESH_test1.py | 2 +- src/SMESH_SWIG/SMESH_test2.py | 2 +- src/SMESH_SWIG/SMESH_test3.py | 2 +- src/SMESH_SWIG/SMESH_test4.py | 2 +- src/SMESH_SWIG/SMESH_test5.py | 2 +- src/SMESH_SWIG/batchmode_mefisto.py | 2 +- src/SMESH_SWIG/batchmode_smesh.py | 17 +- src/SMESH_SWIG/ex00_all.py | 2 +- src/SMESH_SWIG/ex01_cube2build.py | 2 +- src/SMESH_SWIG/ex02_cube2primitive.py | 2 +- src/SMESH_SWIG/ex03_cube2partition.py | 2 +- src/SMESH_SWIG/ex04_cube5tetraHexa.py | 2 +- src/SMESH_SWIG/ex05_hole1build.py | 2 +- src/SMESH_SWIG/ex06_hole1boolean.py | 2 +- src/SMESH_SWIG/ex07_hole1partition.py | 2 +- src/SMESH_SWIG/ex08_hole2build.py | 2 +- src/SMESH_SWIG/ex09_grid4build.py | 2 +- src/SMESH_SWIG/ex10_grid4geometry.py | 2 +- src/SMESH_SWIG/ex11_grid3partition.py | 2 +- src/SMESH_SWIG/ex12_grid17partition.py | 2 +- src/SMESH_SWIG/ex13_hole1partial.py | 2 +- src/SMESH_SWIG/ex14_cyl1holed.py | 2 +- src/SMESH_SWIG/ex15_cyl2geometry.py | 2 +- src/SMESH_SWIG/ex16_cyl2complementary.py | 2 +- src/SMESH_SWIG/ex17_dome1.py | 2 +- src/SMESH_SWIG/ex18_dome2.py | 2 +- src/SMESH_SWIG/ex19_sphereINcube.py | 2 +- src/SMESH_SWIG/libSMESH_Swig.i | 2 +- src/SMESH_SWIG/smesh.py | 384 ++-- src/StdMeshers/Makefile.in | 12 +- src/StdMeshers/StdMeshers_Arithmetic1D.cxx | 2 +- src/StdMeshers/StdMeshers_Arithmetic1D.hxx | 2 +- src/StdMeshers/StdMeshers_AutomaticLength.cxx | 2 +- src/StdMeshers/StdMeshers_AutomaticLength.hxx | 2 +- src/StdMeshers/StdMeshers_Deflection1D.cxx | 2 +- src/StdMeshers/StdMeshers_Deflection1D.hxx | 2 +- src/StdMeshers/StdMeshers_Distribution.cxx | 2 +- src/StdMeshers/StdMeshers_Distribution.hxx | 2 +- src/StdMeshers/StdMeshers_Hexa_3D.cxx | 9 +- src/StdMeshers/StdMeshers_Hexa_3D.hxx | 2 +- src/StdMeshers/StdMeshers_LengthFromEdges.cxx | 2 +- src/StdMeshers/StdMeshers_LengthFromEdges.hxx | 2 +- src/StdMeshers/StdMeshers_LocalLength.cxx | 2 +- src/StdMeshers/StdMeshers_LocalLength.hxx | 2 +- src/StdMeshers/StdMeshers_MEFISTO_2D.cxx | 2 +- src/StdMeshers/StdMeshers_MEFISTO_2D.hxx | 2 +- src/StdMeshers/StdMeshers_MaxElementArea.cxx | 2 +- src/StdMeshers/StdMeshers_MaxElementArea.hxx | 2 +- .../StdMeshers_MaxElementVolume.cxx | 2 +- .../StdMeshers_MaxElementVolume.hxx | 2 +- .../StdMeshers_NotConformAllowed.cxx | 2 +- .../StdMeshers_NotConformAllowed.hxx | 2 +- .../StdMeshers_NumberOfSegments.cxx | 2 +- .../StdMeshers_NumberOfSegments.hxx | 2 +- src/StdMeshers/StdMeshers_Penta_3D.cxx | 168 +- src/StdMeshers/StdMeshers_Penta_3D.hxx | 2 +- src/StdMeshers/StdMeshers_Propagation.cxx | 2 +- src/StdMeshers/StdMeshers_Propagation.hxx | 2 +- .../StdMeshers_QuadranglePreference.cxx | 2 +- .../StdMeshers_QuadranglePreference.hxx | 2 +- src/StdMeshers/StdMeshers_Quadrangle_2D.cxx | 2 +- src/StdMeshers/StdMeshers_Quadrangle_2D.hxx | 2 +- src/StdMeshers/StdMeshers_QuadraticMesh.cxx | 2 +- src/StdMeshers/StdMeshers_QuadraticMesh.hxx | 2 +- src/StdMeshers/StdMeshers_Regular_1D.cxx | 5 +- src/StdMeshers/StdMeshers_Regular_1D.hxx | 2 +- src/StdMeshers/StdMeshers_StartEndLength.cxx | 2 +- src/StdMeshers/StdMeshers_StartEndLength.hxx | 2 +- src/StdMeshersGUI/Makefile.in | 10 +- src/StdMeshersGUI/StdMeshersGUI.cxx | 2 +- .../StdMeshersGUI_DistrPreview.cxx | 2 +- .../StdMeshersGUI_DistrPreview.h | 2 +- .../StdMeshersGUI_DistrTable.cxx | 2 +- src/StdMeshersGUI/StdMeshersGUI_DistrTable.h | 2 +- .../StdMeshersGUI_NbSegmentsCreator.cxx | 2 +- .../StdMeshersGUI_NbSegmentsCreator.h | 2 +- .../StdMeshersGUI_StdHypothesisCreator.cxx | 2 +- .../StdMeshersGUI_StdHypothesisCreator.h | 2 +- src/StdMeshersGUI/StdMeshers_images.po | 2 +- src/StdMeshersGUI/StdMeshers_msg_en.po | 2 +- src/StdMeshers_I/Makefile.in | 11 +- .../StdMeshers_Arithmetic1D_i.cxx | 2 +- .../StdMeshers_Arithmetic1D_i.hxx | 2 +- .../StdMeshers_AutomaticLength_i.cxx | 2 +- .../StdMeshers_AutomaticLength_i.hxx | 2 +- .../StdMeshers_Deflection1D_i.cxx | 2 +- .../StdMeshers_Deflection1D_i.hxx | 2 +- src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx | 2 +- src/StdMeshers_I/StdMeshers_Hexa_3D_i.hxx | 2 +- .../StdMeshers_LengthFromEdges_i.cxx | 2 +- .../StdMeshers_LengthFromEdges_i.hxx | 2 +- src/StdMeshers_I/StdMeshers_LocalLength_i.cxx | 2 +- src/StdMeshers_I/StdMeshers_LocalLength_i.hxx | 2 +- src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx | 2 +- src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.hxx | 2 +- .../StdMeshers_MaxElementArea_i.cxx | 2 +- .../StdMeshers_MaxElementArea_i.hxx | 2 +- .../StdMeshers_MaxElementVolume_i.cxx | 2 +- .../StdMeshers_MaxElementVolume_i.hxx | 2 +- .../StdMeshers_NotConformAllowed_i.cxx | 2 +- .../StdMeshers_NotConformAllowed_i.hxx | 2 +- .../StdMeshers_NumberOfSegments_i.cxx | 2 +- .../StdMeshers_NumberOfSegments_i.hxx | 2 +- src/StdMeshers_I/StdMeshers_Propagation_i.cxx | 2 +- src/StdMeshers_I/StdMeshers_Propagation_i.hxx | 2 +- .../StdMeshers_QuadranglePreference_i.cxx | 2 +- .../StdMeshers_QuadranglePreference_i.hxx | 2 +- .../StdMeshers_Quadrangle_2D_i.cxx | 2 +- .../StdMeshers_Quadrangle_2D_i.hxx | 2 +- .../StdMeshers_QuadraticMesh_i.cxx | 2 +- .../StdMeshers_QuadraticMesh_i.hxx | 2 +- src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx | 2 +- src/StdMeshers_I/StdMeshers_Regular_1D_i.hxx | 2 +- .../StdMeshers_StartEndLength_i.cxx | 2 +- .../StdMeshers_StartEndLength_i.hxx | 2 +- src/StdMeshers_I/StdMeshers_i.cxx | 2 +- 823 files changed, 12301 insertions(+), 7092 deletions(-) create mode 100644 SMESH_version.h.in delete mode 100755 bin/VERSION create mode 100755 bin/VERSION.in delete mode 100644 doc/salome/SMESH_index_v3.1.0.html delete mode 100755 doc/salome/gui/SMESH/files/introduction_to_smesh.htm create mode 100755 doc/salome/gui/SMESH/index.htm rename doc/salome/gui/SMESH/{smesh_csh.htm => index_csh.htm} (93%) rename doc/salome/gui/SMESH/{smesh_rhc.htm => index_rhc.htm} (93%) create mode 100755 doc/salome/gui/SMESH/mesh.htm delete mode 100755 doc/salome/gui/SMESH/smesh.htm create mode 100644 doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh.html create mode 100644 doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Algorithm.html create mode 100644 doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Algorithm__inherit__graph.jpg create mode 100644 doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Hexahedron.html create mode 100644 doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Hexahedron__inherit__graph.jpg create mode 100644 doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Netgen.html create mode 100644 doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Netgen__inherit__graph.jpg create mode 100644 doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Quadrangle.html create mode 100644 doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Quadrangle__inherit__graph.jpg create mode 100644 doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Segment.html create mode 100644 doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Segment__Python.html create mode 100644 doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Segment__Python__inherit__graph.jpg create mode 100644 doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Segment__inherit__graph.jpg create mode 100644 doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Tetrahedron.html create mode 100644 doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Tetrahedron__inherit__graph.jpg create mode 100644 doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Triangle.html create mode 100644 doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Triangle__inherit__graph.jpg create mode 100644 doc/salome/gui/SMESH/smeshpy_doc/doxygen.css create mode 100644 doc/salome/gui/SMESH/smeshpy_doc/namespacesmesh.html rename doc/salome/gui/SMESH/{whskin_pdhtml.htm => whd_dpns.htm} (58%) create mode 100755 doc/salome/gui/SMESH/whd_hide0.gif create mode 100755 doc/salome/gui/SMESH/whd_hide1.gif create mode 100755 doc/salome/gui/SMESH/whd_hide2.gif create mode 100755 doc/salome/gui/SMESH/whd_next0.gif create mode 100755 doc/salome/gui/SMESH/whd_next1.gif create mode 100755 doc/salome/gui/SMESH/whd_next2.gif create mode 100755 doc/salome/gui/SMESH/whd_nvp10.htm rename doc/salome/gui/SMESH/{whskin_papplet.htm => whd_nvp20.htm} (62%) create mode 100755 doc/salome/gui/SMESH/whd_prev0.gif create mode 100755 doc/salome/gui/SMESH/whd_prev1.gif create mode 100755 doc/salome/gui/SMESH/whd_prev2.gif create mode 100755 doc/salome/gui/SMESH/whd_show0.gif create mode 100755 doc/salome/gui/SMESH/whd_show1.gif create mode 100755 doc/salome/gui/SMESH/whd_show2.gif create mode 100755 doc/salome/gui/SMESH/whd_sync0.gif create mode 100755 doc/salome/gui/SMESH/whd_sync1.gif create mode 100755 doc/salome/gui/SMESH/whd_sync2.gif rename doc/salome/gui/SMESH/{wht_tab0.gif => whd_tab0.gif} (100%) rename doc/salome/gui/SMESH/{wht_tab1.gif => whd_tab1.gif} (100%) rename doc/salome/gui/SMESH/{wht_tab2.gif => whd_tab2.gif} (100%) rename doc/salome/gui/SMESH/{wht_tab3.gif => whd_tab3.gif} (100%) rename doc/salome/gui/SMESH/{wht_tab4.gif => whd_tab4.gif} (100%) rename doc/salome/gui/SMESH/{wht_tab5.gif => whd_tab5.gif} (100%) rename doc/salome/gui/SMESH/{wht_tab6.gif => whd_tab6.gif} (100%) rename doc/salome/gui/SMESH/{wht_tab7.gif => whd_tab7.gif} (100%) rename doc/salome/gui/SMESH/{wht_tab8.gif => whd_tab8.gif} (100%) create mode 100755 doc/salome/gui/SMESH/whd_tabs.htm create mode 100755 doc/salome/gui/SMESH/whd_toc1.gif create mode 100755 doc/salome/gui/SMESH/whd_toc2.gif create mode 100755 doc/salome/gui/SMESH/whd_toc3.gif rename doc/salome/gui/SMESH/{wht_toc4.gif => whd_toc4.gif} (100%) rename doc/salome/gui/SMESH/{whst_topics.xml => whd_topic.xml} (79%) create mode 100755 doc/salome/gui/SMESH/whd_wbsh0.gif create mode 100755 doc/salome/gui/SMESH/whd_wbsh1.gif create mode 100755 doc/salome/gui/SMESH/whd_wbsh2.gif delete mode 100755 doc/salome/gui/SMESH/whestart.ico delete mode 100755 doc/salome/gui/SMESH/whrstart.ico delete mode 100755 doc/salome/gui/SMESH/whskin_banner.htm delete mode 100755 doc/salome/gui/SMESH/whskin_frmset01.htm delete mode 100755 doc/salome/gui/SMESH/whskin_frmset010.htm delete mode 100755 doc/salome/gui/SMESH/whskin_mbars.htm delete mode 100755 doc/salome/gui/SMESH/whskin_plist.htm delete mode 100755 doc/salome/gui/SMESH/whskin_tbars.htm delete mode 100755 doc/salome/gui/SMESH/whstart.ico delete mode 100755 doc/salome/gui/SMESH/wht_abge.jpg delete mode 100755 doc/salome/gui/SMESH/wht_abgi.jpg delete mode 100755 doc/salome/gui/SMESH/wht_abgw.jpg delete mode 100755 doc/salome/gui/SMESH/wht_abte.jpg delete mode 100755 doc/salome/gui/SMESH/wht_abti.jpg delete mode 100755 doc/salome/gui/SMESH/wht_abtw.jpg delete mode 100755 doc/salome/gui/SMESH/wht_fts_h.gif delete mode 100755 doc/salome/gui/SMESH/wht_fts_n.gif delete mode 100755 doc/salome/gui/SMESH/wht_glo_h.gif delete mode 100755 doc/salome/gui/SMESH/wht_glo_n.gif delete mode 100755 doc/salome/gui/SMESH/wht_go.gif delete mode 100755 doc/salome/gui/SMESH/wht_hide.gif delete mode 100755 doc/salome/gui/SMESH/wht_idx_h.gif delete mode 100755 doc/salome/gui/SMESH/wht_idx_n.gif delete mode 100755 doc/salome/gui/SMESH/wht_logo1.gif delete mode 100755 doc/salome/gui/SMESH/wht_logo2.gif delete mode 100755 doc/salome/gui/SMESH/wht_next.gif delete mode 100755 doc/salome/gui/SMESH/wht_next_g.gif delete mode 100755 doc/salome/gui/SMESH/wht_prev.gif delete mode 100755 doc/salome/gui/SMESH/wht_prev_g.gif delete mode 100755 doc/salome/gui/SMESH/wht_spac.gif delete mode 100755 doc/salome/gui/SMESH/wht_sync.gif delete mode 100755 doc/salome/gui/SMESH/wht_toc1.gif delete mode 100755 doc/salome/gui/SMESH/wht_toc2.gif delete mode 100755 doc/salome/gui/SMESH/wht_toc3.gif delete mode 100755 doc/salome/gui/SMESH/wht_toc_h.gif delete mode 100755 doc/salome/gui/SMESH/wht_toc_n.gif delete mode 100755 doc/salome/gui/SMESH/wht_ws.gif delete mode 100755 doc/salome/gui/SMESH/wht_ws_g.gif delete mode 100755 doc/salome/gui/SMESH/whtbar.js rename doc/salome/tui/SMESH/{doxyfile_py => doxyfile.in} (99%) rename doc/salome/tui/SMESH/{doxyfile => doxyfile_py.in} (99%) rename doc/salome/tui/SMESH/sources/static/{tree.js => tree.js.in} (96%) rename resources/{SMESHCatalog.xml => SMESHCatalog.xml.in} (99%) create mode 100644 src/SMESH_SWIG/SMESH_AdvancedEditor.py diff --git a/INSTALL b/INSTALL index 6d03e0a4a..0ea0b81cb 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1 @@ -This is the version 3.2.0b1 of SMESH -Compatible with : - - KERNEL 3.2.0b1 - - SALOMEGUI 3.2.0b1 - - GEOM 3.2.0b1 - - MED 3.2.0b1 +SALOME2 : SMESH module diff --git a/Makefile.in b/Makefile.in index c74723194..5c579e676 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # -* Makefile *- # @@ -28,7 +28,7 @@ top_srcdir=@top_srcdir@ top_builddir=. srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl +VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:./resources:@top_srcdir@/resources:./bin:@top_srcdir@/idl @COMMENCE@ @@ -169,14 +169,22 @@ BIN_SCRIPT= \ VERSION # copy header files in common directory -ifeq ($(HAVE_SSTREAM),yes) - include_list=include/salome/SALOMEconfig.h -else - include_list=include/salome/SALOMEconfig.h include/salome/sstream + +include_list = include/salome/SALOMEconfig.h \ + include/salome/SMESH_version.h + +ifneq ($(HAVE_SSTREAM),yes) + include_list += include/salome/sstream endif inc: idl $(include_list) +bin: bin/salome/VERSION + +bin/salome/VERSION : bin/VERSION + -$(RM) $@ + $(LN_S) ../../$< $@ + include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref -$(RM) $@ $(LN_S) ../../$< $@ @@ -194,6 +202,10 @@ include/salome/sstream: salome_adm/unix/sstream -$(RM) $@ $(LN_S) ../../$< $@ +include/salome/SMESH_version.h: SMESH_version.h + -$(RM) $@ + $(LN_S) ../../$< $@ + depend: depend_idl depend_idl: diff --git a/SMESH_version.h.in b/SMESH_version.h.in new file mode 100644 index 000000000..85259c4e3 --- /dev/null +++ b/SMESH_version.h.in @@ -0,0 +1,34 @@ +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ +// +// File : SMESH_version.h +// Author : Vadim SANDLER +// Module : SALOME + +#if !defined(__SMESH_VERSION_H__) +#define __SMESH_VERSION_H__ + +/* + SMESH_VERSION is (major << 16) + (minor << 8) + patch. +*/ + +#define SMESH_VERSION_STR "@VERSION@" +#define SMESH_VERSION @XVERSION@ + +#endif // __SMESH_VERSION_H__ diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in index 734bc820a..e2133b49b 100644 --- a/adm_local/Makefile.in +++ b/adm_local/Makefile.in @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # source path top_srcdir=@top_srcdir@ diff --git a/adm_local/unix/config_files/check_SMESH.m4 b/adm_local/unix/config_files/check_SMESH.m4 index 86a8264b2..f1dbf22f1 100644 --- a/adm_local/unix/config_files/check_SMESH.m4 +++ b/adm_local/unix/config_files/check_SMESH.m4 @@ -9,6 +9,9 @@ AC_CHECKING(for SMesh) SMesh_ok=no +SMESH_LDFLAGS="" +SMESH_CXXFLAGS="" + AC_ARG_WITH(smesh, [ --with-smesh=DIR root directory path of SMESH installation ], SMESH_DIR="$withval",SMESH_DIR="") @@ -44,6 +47,12 @@ if test -f ${SMESH_DIR}/bin/salome/libSMESH_Swig.py ; then fi AC_SUBST(SMESH_ROOT_DIR) + SMESH_LDFLAGS=-L${SMESH_DIR}/lib${LIB_LOCATION_SUFFIX}/salome + SMESH_CXXFLAGS=-I${SMESH_DIR}/include/salome + + AC_SUBST(SMESH_LDFLAGS) + AC_SUBST(SMESH_CXXFLAGS) + else AC_MSG_WARN("Cannot find compiled SMesh module distribution") fi diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 3c259c88c..71df45053 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -11,8 +11,8 @@ HAVE_SSTREAM=@HAVE_SSTREAM@ LIBS=@LIBS@ LIBSFORBIN=@LIBS@ -LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib/salome -LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib/salome +LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker +LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker # add libstdc++ to link c++ library with libtool ! LDFLAGS+= -lstdc++ LDFLAGSFORBIN+= -lstdc++ @@ -54,8 +54,8 @@ PYTHONHOME = @PYTHONHOME@ PYTHON_INCLUDES = @PYTHON_INCLUDES@ PYTHON_LIBS = @PYTHON_LIBS@ PYTHON_VERSION = @PYTHON_VERSION@ -PYTHON_SITE = @PYTHON_SITE@ -PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@ +PYTHON_SITE = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages +PYTHON_SITE_INSTALL = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome # QT @@ -192,16 +192,33 @@ INSTALL_DATA=@INSTALL_DATA@ # create a symbolic link (or a copie ?) LN_S=@LN_S@ +KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@ +KERNEL_SITE_DIR=@KERNEL_SITE_DIR@ +KERNEL_LDFLAGS=@KERNEL_LDFLAGS@ +KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@ + +GUI_ROOT_DIR=@GUI_ROOT_DIR@ +GUI_LDFLAGS=@GUI_LDFLAGS@ +GUI_CXXFLAGS=@GUI_CXXFLAGS@ + +MED_ROOT_DIR=@MED_ROOT_DIR@ +MED_LDFLAGS=@MED_LDFLAGS@ +MED_CXXFLAGS=@MED_CXXFLAGS@ + +GEOM_ROOT_DIR=@GEOM_ROOT_DIR@ +GEOM_LDFLAGS=@GEOM_LDFLAGS@ +GEOM_CXXFLAGS=@GEOM_CXXFLAGS@ + ## Installation points prefix=@prefix@ exec_prefix=@exec_prefix@ -bindir=@bindir@/salome -libdir=@libdir@/salome +bindir=@exec_prefix@/bin/salome +libdir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/salome # warning : if user give this path in configure we could have salome/salome :-( includedir=@includedir@/salome datadir=@datadir@/salome idldir=$(prefix)/idl/salome -sharedpydir=@libdir@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules +sharedpydir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules docdir=${prefix}/doc/salome @@ -250,17 +267,31 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base ACLOCAL_KERNEL = \ -ac_cxx_bool.m4 check_corba.m4 \ -ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \ -ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \ -ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \ -ac_cxx_partial_specialization.m4 python.m4 \ -ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \ -ac_cc_warnings.m4 check_boost.m4 check_swig.m4 + ac_cxx_bool.m4 \ + check_corba.m4 \ + ac_cxx_depend_flag.m4 \ + check_hdf5.m4 \ + enable_pthreads.m4 \ + ac_cxx_mutable.m4 \ + check_mico.m4 \ + ac_cxx_namespaces.m4 \ + check_omniorb.m4 \ + pyembed.m4 \ + ac_cxx_partial_specialization.m4 \ + python.m4 \ + ac_cxx_typename.m4 \ + check_pthreads.m4 \ + check_cas.m4 \ + ac_cc_warnings.m4 \ + check_boost.m4 \ + check_swig.m4 ACLOCAL_GUI = \ -check_vtk.m4 check_opengl.m4 check_qt.m4 \ -check_GUI.m4 check_corba_in_GUI.m4 + check_vtk.m4 \ + check_opengl.m4 \ + check_qt.m4 \ + check_GUI.m4 \ + check_corba_in_GUI.m4 ACLOCAL_MED = check_Med.m4 ACLOCAL_GEOM = check_GEOM.m4 diff --git a/adm_local/unix/make_conclude.in b/adm_local/unix/make_conclude.in index f4827fd31..37c65077f 100644 --- a/adm_local/unix/make_conclude.in +++ b/adm_local/unix/make_conclude.in @@ -35,9 +35,9 @@ 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))) +# LIB_BUILD = $(LIB:%.la=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.la) +LIB_BUILD = $(patsubst %.la, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.la, $(filter %.la, $(LIB))) +LIB_BUILD_A = $(patsubst %.a, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.a, $(filter %.a, $(LIB))) ifneq ($(findstring cmodule.la,$(filter %.la, $(LIB))),) LIB_SWIG = $(patsubst %cmodule.la,%.so, $(filter %.la, $(LIB))) @@ -48,7 +48,7 @@ endif lib: $(LIB_BUILD) $(LIB_CLIENT_PY) # we don't build static library ! -$(LIB_BUILD): $(top_builddir)/lib/salome/%.la: %.la +$(LIB_BUILD): $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.la: %.la -$(RM) $@ -$(RM) $(patsubst %.la, %.so, $@) -$(RM) $(patsubst %.la, %.a, $@) @@ -59,10 +59,10 @@ $(LIB_BUILD): $(top_builddir)/lib/salome/%.la: %.la $(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;\ + ln -sf $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/_$(LIB_SWIG) || true;\ fi; -$(LIB_BUILD_A): $(top_builddir)/lib/salome/%.a: %.a +$(LIB_BUILD_A): $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.a: %.a -$(RM) $@ ln -sf $(CURDIR)/$< $@ || true @@ -106,7 +106,7 @@ $(DEST_PYSCRIPTS): $(top_builddir)/bin/salome/%: % # copy pyqt files in $(PYTHON_SHARED_SITE) # -PYTHON_SHARED_SITE=$(top_builddir)/lib/python$(PYTHON_VERSION)/site-packages/salome/shared_modules +PYTHON_SHARED_SITE=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules $(PYTHON_SHARED_SITE): $(INSTALL) -d $@ @@ -260,10 +260,10 @@ clean: mostlyclean -$(RM) $(LIB) $(TEST_PROGS) $(BIN) $(CLEAN) -$(RM) TAGS *~ *# core *.core -$(RM) -r .libs - -$(RM) $(top_builddir)/lib/salome/$(LIB) + -$(RM) $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/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)) + -$(RM) $(patsubst %.la, %.so, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/$(LIB)) + -$(RM) $(patsubst %.la, %.a, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/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) diff --git a/bin/VERSION b/bin/VERSION deleted file mode 100755 index a32989223..000000000 --- a/bin/VERSION +++ /dev/null @@ -1 +0,0 @@ -THIS IS SALOME - SMESH VERSION: 3.2.0b1 diff --git a/bin/VERSION.in b/bin/VERSION.in new file mode 100755 index 000000000..fa49d303f --- /dev/null +++ b/bin/VERSION.in @@ -0,0 +1 @@ +THIS IS SALOME - SMESH VERSION: @VERSION@ diff --git a/configure.in.base b/configure.in.base index d0105c7b0..cc915a120 100644 --- a/configure.in.base +++ b/configure.in.base @@ -22,8 +22,10 @@ AC_CANONICAL_HOST PACKAGE=salome AC_SUBST(PACKAGE) -VERSION=0.0.1 +VERSION=3.2.0 +XVERSION=0x030200 AC_SUBST(VERSION) +AC_SUBST(XVERSION) dnl dnl Initialize source and build root directories @@ -113,13 +115,7 @@ dnl AC_CXX_HAVE_SSTREAM -echo -echo --------------------------------------------- -echo BOOST Library -echo --------------------------------------------- -echo -CHECK_BOOST dnl dnl --------------------------------------------- @@ -249,6 +245,14 @@ echo CHECK_HDF5 +echo +echo --------------------------------------------- +echo BOOST Library +echo --------------------------------------------- +echo + +CHECK_BOOST + echo echo --------------------------------------------- echo Testing OpenCascade @@ -346,7 +350,7 @@ else fi # make other build directories -for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources idl +for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources idl do # if test ! -d $rep ; then # eval mkdir $rep diff --git a/doc/Makefile.in b/doc/Makefile.in index 59e6c5962..af9e2aae5 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # -* Makefile *- @@ -38,6 +38,17 @@ docs: @@SETX@; for d in $(SUBDIRS); do \ (cd $$d && $(MAKE) $@) || exit 1; \ done + +usr_docs: + @@SETX@; for d in $(SUBDIRS); do \ + (cd $$d && $(MAKE) $@) || exit 1; \ + done + +dev_docs: + @@SETX@; for d in $(SUBDIRS); do \ + (cd $$d && $(MAKE) $@) || exit 1; \ + done + clean: @@SETX@; for d in $(SUBDIRS); do \ (cd $$d && $(MAKE) $@) || exit 1; \ diff --git a/doc/salome/Makefile.in b/doc/salome/Makefile.in index 224ee0881..4106d1ad3 100644 --- a/doc/salome/Makefile.in +++ b/doc/salome/Makefile.in @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # -* Makefile *- @@ -31,33 +31,48 @@ srcdir=@srcdir@ VPATH=.:@srcdir@ SUBDIRS= tui gui +SUBDIRSTUI= tui +SUBDIRSGUI= gui @COMMENCE@ -docs: - @@SETX@; for d in $(SUBDIRS); do \ +usr_docs: + @@SETX@; for d in $(SUBDIRSGUI); do \ + (cd $$d && $(MAKE) $@) || exit 1; \ + done; \ + +docs: usr_docs + +dev_docs: + @@SETX@; for d in $(SUBDIRSTUI); do \ (cd $$d && $(MAKE) $@) || exit 1; \ done; \ - cp -f $(srcdir)/SMESH_index_v3.1.0.html SMESH_index_v3.1.0.html clean: @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ + if test -d $$d/SMESH; then \ + (cd $$d && $(MAKE) $@) || exit 1; \ + fi; \ done distclean: clean @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ + if test -d $$d/SMESH; then \ + (cd $$d && $(MAKE) $@) || exit 1; \ + fi; \ done install: $(MAKE) docs - (cd tui && $(MAKE) install); - (cd gui && $(MAKE) install); - cp -f SMESH_index_v3.1.0.html $(docdir) + @@SETX@; for d in $(SUBDIRS); do \ + if test -d $$d/SMESH; then \ + (cd $$d && $(MAKE) $@); \ + fi; \ + done uninstall: @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ + if test -d $$d/SMESH; then \ + (cd $$d && $(MAKE) $@) || exit 1; \ + fi; \ done; \ - rm -fr $(docdir)/SMESH_index_v3.1.0.html diff --git a/doc/salome/SMESH_index_v3.1.0.html b/doc/salome/SMESH_index_v3.1.0.html deleted file mode 100644 index 8d4ef121a..000000000 --- a/doc/salome/SMESH_index_v3.1.0.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - Mesh Module Documentation - - - -
  -
-
                   -   
- - - - - - - - - -
- - - -
- -
-
-
-

Mesh MODULE Documentation

-
-
- - - - - -
-
- -
-

Application-About.png -     

-
- -
- - - - -
-
-
-
-
- -
- -
GUI Documentation
- -
- -
- -

-
- -
- -
TUI Documentation
- -
- -
- -

-
-
-
-
-
-
- - diff --git a/doc/salome/gui/Makefile.in b/doc/salome/gui/Makefile.in index 883a053da..c08ee2735 100644 --- a/doc/salome/gui/Makefile.in +++ b/doc/salome/gui/Makefile.in @@ -1,6 +1,21 @@ -# Copyright (C) 2003 CEA/DEN, EDF R&D +# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. # +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # File : Makefile.in # Author : Vasily Rusyaev (Open Cascade NN) @@ -14,9 +29,11 @@ VPATH=.:@srcdir@ @COMMENCE@ -docs: +usr_docs: cp -fr $(srcdir)/SMESH ./ - -find $(PWD) -name CVS -exec rm -rf {} \; + -find $(PWD) -name CVS -prune -exec rm -rf {} \; + +docs: usr_docs clean: rm -fr `ls | grep -v "Makefile"` @@ -27,7 +44,7 @@ distclean: clean install: mkdir -p $(docdir)/gui cp -rf SMESH $(docdir)/gui - -find $(PWD) -name CVS -exec rm -rf {} \; + -find $(PWD) -name CVS -prune -exec rm -rf {} \; uninstall: rm -rf $(docdir)/gui/SMESH diff --git a/doc/salome/gui/SMESH/about_viewing_meshes.htm b/doc/salome/gui/SMESH/about_viewing_meshes.htm index 1cba90dab..f7af36140 100755 --- a/doc/salome/gui/SMESH/about_viewing_meshes.htm +++ b/doc/salome/gui/SMESH/about_viewing_meshes.htm @@ -37,43 +37,48 @@ onerror = null; - - + +

Viewing meshes

After definition of algorithms and hypotheses a new mesh is listed in diff --git a/doc/salome/gui/SMESH/adding_quadratic_nodes_and_elements.htm b/doc/salome/gui/SMESH/adding_quadratic_nodes_and_elements.htm index 8f7706a41..86db2586e 100755 --- a/doc/salome/gui/SMESH/adding_quadratic_nodes_and_elements.htm +++ b/doc/salome/gui/SMESH/adding_quadratic_nodes_and_elements.htm @@ -28,43 +28,48 @@ onerror = null; - - + +

Adding Quadratic Elements

MESH modules allows you to work with Quadratic diff --git a/doc/salome/gui/SMESH/aspect_ratio_3d.htm b/doc/salome/gui/SMESH/aspect_ratio_3d.htm index 90c6d6c80..9b9e5bd0d 100755 --- a/doc/salome/gui/SMESH/aspect_ratio_3d.htm +++ b/doc/salome/gui/SMESH/aspect_ratio_3d.htm @@ -54,43 +54,48 @@ onerror = null; - - + +

Aspect ratio 3D

diff --git a/doc/salome/gui/SMESH/borders_at_multi-connection.htm b/doc/salome/gui/SMESH/borders_at_multi-connection.htm index e7500f2c3..cf5d3a9ca 100755 --- a/doc/salome/gui/SMESH/borders_at_multi-connection.htm +++ b/doc/salome/gui/SMESH/borders_at_multi-connection.htm @@ -47,43 +47,48 @@ onerror = null; - - + +

Borders at multi-connection

This mesh quality control highlights borders of faces diff --git a/doc/salome/gui/SMESH/borders_at_multiconnection_2d.htm b/doc/salome/gui/SMESH/borders_at_multiconnection_2d.htm index da61f5c2f..3cb8e549d 100755 --- a/doc/salome/gui/SMESH/borders_at_multiconnection_2d.htm +++ b/doc/salome/gui/SMESH/borders_at_multiconnection_2d.htm @@ -46,43 +46,48 @@ onerror = null; - - + +

Borders at multi-connection 2D

This mesh quality control highlights borders of elements diff --git a/doc/salome/gui/SMESH/clipping.htm b/doc/salome/gui/SMESH/clipping.htm index 4faad7d21..9cfba3b64 100755 --- a/doc/salome/gui/SMESH/clipping.htm +++ b/doc/salome/gui/SMESH/clipping.htm @@ -38,43 +38,48 @@ onerror = null; - - + +

Clipping

Using this menu you can create cross-section views (clipping planes) diff --git a/doc/salome/gui/SMESH/constructing_meshes.htm b/doc/salome/gui/SMESH/constructing_meshes.htm index 6fa5dae03..ca895c640 100755 --- a/doc/salome/gui/SMESH/constructing_meshes.htm +++ b/doc/salome/gui/SMESH/constructing_meshes.htm @@ -45,43 +45,48 @@ onerror = null; - - + +

Creating Meshes

Construction of a Mesh

diff --git a/doc/salome/gui/SMESH/cshdat_robohelp.htm b/doc/salome/gui/SMESH/cshdat_robohelp.htm index 2e1891e53..dae507e12 100755 --- a/doc/salome/gui/SMESH/cshdat_robohelp.htm +++ b/doc/salome/gui/SMESH/cshdat_robohelp.htm @@ -1,6 +1,6 @@ -SMESH reference manual +Mesh Module Reference Manual diff --git a/doc/salome/gui/SMESH/cshdat_webhelp.htm b/doc/salome/gui/SMESH/cshdat_webhelp.htm index 2fefa3ad4..6d79e6f4f 100755 --- a/doc/salome/gui/SMESH/cshdat_webhelp.htm +++ b/doc/salome/gui/SMESH/cshdat_webhelp.htm @@ -1,6 +1,6 @@ -SMESH reference manual +Mesh Module Reference Manual diff --git a/doc/salome/gui/SMESH/defining_hypotheses_tui.htm b/doc/salome/gui/SMESH/defining_hypotheses_tui.htm index 17ca2d2a9..9ef8f93c3 100755 --- a/doc/salome/gui/SMESH/defining_hypotheses_tui.htm +++ b/doc/salome/gui/SMESH/defining_hypotheses_tui.htm @@ -49,43 +49,48 @@ onerror = null; - - + +

Defining Hypotheses and Algorithms

Defining 1D Hypotheses

diff --git a/doc/salome/gui/SMESH/deleting_groups.htm b/doc/salome/gui/SMESH/deleting_groups.htm index 85b273571..7c7675e7f 100755 --- a/doc/salome/gui/SMESH/deleting_groups.htm +++ b/doc/salome/gui/SMESH/deleting_groups.htm @@ -38,43 +38,48 @@ onerror = null; - - + +

Deleting Groups

To delete a group in the diff --git a/doc/salome/gui/SMESH/display_entity.htm b/doc/salome/gui/SMESH/display_entity.htm index aaf2b1121..90ae19e3b 100755 --- a/doc/salome/gui/SMESH/display_entity.htm +++ b/doc/salome/gui/SMESH/display_entity.htm @@ -35,43 +35,48 @@ onerror = null; - - + +

Display Entity

In this submenu you can choose to display only volumes, faces or edges diff --git a/doc/salome/gui/SMESH/extrusion.htm b/doc/salome/gui/SMESH/extrusion.htm index 26d84d9c8..7b56ecd85 100755 --- a/doc/salome/gui/SMESH/extrusion.htm +++ b/doc/salome/gui/SMESH/extrusion.htm @@ -42,43 +42,48 @@ onerror = null; - - + +

Extrusion

Extrusion is a type of surface meshing by generation from discretized diff --git a/doc/salome/gui/SMESH/extrusion_along_a_path.htm b/doc/salome/gui/SMESH/extrusion_along_a_path.htm index b92ec6546..2058125a0 100755 --- a/doc/salome/gui/SMESH/extrusion_along_a_path.htm +++ b/doc/salome/gui/SMESH/extrusion_along_a_path.htm @@ -46,43 +46,48 @@ onerror = null; - - + +

Extrusion along a path

In principle, Extrusion along a path works in the same way as Extrusion, diff --git a/doc/salome/gui/SMESH/files/about_hypotheses.htm b/doc/salome/gui/SMESH/files/about_hypotheses.htm index 568ceec0c..0811bc586 100755 --- a/doc/salome/gui/SMESH/files/about_hypotheses.htm +++ b/doc/salome/gui/SMESH/files/about_hypotheses.htm @@ -47,43 +47,48 @@ onerror = null; - - + +

About hypotheses

Hypotheses represent diff --git a/doc/salome/gui/SMESH/files/about_meshes.htm b/doc/salome/gui/SMESH/files/about_meshes.htm index d4ba6d835..1b91ca434 100755 --- a/doc/salome/gui/SMESH/files/about_meshes.htm +++ b/doc/salome/gui/SMESH/files/about_meshes.htm @@ -40,43 +40,48 @@ onerror = null; - - + +

About meshes

MESH represents diff --git a/doc/salome/gui/SMESH/files/about_meshing_algorithms.htm b/doc/salome/gui/SMESH/files/about_meshing_algorithms.htm index ecc8de1c2..213fa1f13 100755 --- a/doc/salome/gui/SMESH/files/about_meshing_algorithms.htm +++ b/doc/salome/gui/SMESH/files/about_meshing_algorithms.htm @@ -65,43 +65,48 @@ onerror = null; - - + +

Defining meshing algorithms

The MESH module contains a set of meshing algorithms, diff --git a/doc/salome/gui/SMESH/files/about_quality_controls.htm b/doc/salome/gui/SMESH/files/about_quality_controls.htm index d102825c2..0bf3d0bf7 100755 --- a/doc/salome/gui/SMESH/files/about_quality_controls.htm +++ b/doc/salome/gui/SMESH/files/about_quality_controls.htm @@ -35,43 +35,48 @@ onerror = null; - - + +

About quality controls

Mesh diff --git a/doc/salome/gui/SMESH/files/adding_nodes_and_elements.htm b/doc/salome/gui/SMESH/files/adding_nodes_and_elements.htm index 89d6dc5b9..88826e3c8 100755 --- a/doc/salome/gui/SMESH/files/adding_nodes_and_elements.htm +++ b/doc/salome/gui/SMESH/files/adding_nodes_and_elements.htm @@ -48,43 +48,48 @@ onerror = null; - - + +

Adding nodes and elements

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

diff --git a/doc/salome/gui/SMESH/files/area_of_elements.htm b/doc/salome/gui/SMESH/files/area_of_elements.htm index 5f8bcb65e..78cbd6cdd 100755 --- a/doc/salome/gui/SMESH/files/area_of_elements.htm +++ b/doc/salome/gui/SMESH/files/area_of_elements.htm @@ -48,43 +48,48 @@ onerror = null; - - + +

Area

Area mesh quality diff --git a/doc/salome/gui/SMESH/files/arithmetic_1d.htm b/doc/salome/gui/SMESH/files/arithmetic_1d.htm index 6a4e2b48a..d421cd913 100755 --- a/doc/salome/gui/SMESH/files/arithmetic_1d.htm +++ b/doc/salome/gui/SMESH/files/arithmetic_1d.htm @@ -66,43 +66,48 @@ onerror = null; - - + +

1D Meshing Hypotheses

    diff --git a/doc/salome/gui/SMESH/files/aspect_ratio.htm b/doc/salome/gui/SMESH/files/aspect_ratio.htm index a79bf0884..52b40c9a1 100755 --- a/doc/salome/gui/SMESH/files/aspect_ratio.htm +++ b/doc/salome/gui/SMESH/files/aspect_ratio.htm @@ -56,43 +56,48 @@ onerror = null; - - + +

    Aspect Ratio

    The Aspect Ratio 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 3bea1d007..7a1c6e64d 100755 --- a/doc/salome/gui/SMESH/files/changing_orientation_of_elements.htm +++ b/doc/salome/gui/SMESH/files/changing_orientation_of_elements.htm @@ -37,43 +37,48 @@ onerror = null; - - + +

    Changing orientation of elements

    Orientation of an element is changed by reverting the order of nodes diff --git a/doc/salome/gui/SMESH/files/constructing_groups_of_specific_elements.htm b/doc/salome/gui/SMESH/files/constructing_groups_of_specific_elements.htm index db59e9e80..749449fdf 100755 --- a/doc/salome/gui/SMESH/files/constructing_groups_of_specific_elements.htm +++ b/doc/salome/gui/SMESH/files/constructing_groups_of_specific_elements.htm @@ -33,43 +33,48 @@ onerror = null; - - + +

    Constructing groups of specific elements

    In MESH you can easily construct groups of specific elements (nodes, diff --git a/doc/salome/gui/SMESH/files/constructing_meshes.htm b/doc/salome/gui/SMESH/files/constructing_meshes.htm index 895fc41f2..9005df312 100755 --- a/doc/salome/gui/SMESH/files/constructing_meshes.htm +++ b/doc/salome/gui/SMESH/files/constructing_meshes.htm @@ -55,43 +55,48 @@ onerror = null; - - + +

    Constructing meshes

    Construction of a mesh consists of:

    diff --git a/doc/salome/gui/SMESH/files/constructing_submeshes.htm b/doc/salome/gui/SMESH/files/constructing_submeshes.htm index d2fe652bd..07dd8dfec 100755 --- a/doc/salome/gui/SMESH/files/constructing_submeshes.htm +++ b/doc/salome/gui/SMESH/files/constructing_submeshes.htm @@ -51,43 +51,48 @@ onerror = null; - - + +

    Constructing submeshes

    Construction of a submesh consists of:

    diff --git a/doc/salome/gui/SMESH/files/creating_groups.htm b/doc/salome/gui/SMESH/files/creating_groups.htm index 87d6e3645..dbc19538e 100755 --- a/doc/salome/gui/SMESH/files/creating_groups.htm +++ b/doc/salome/gui/SMESH/files/creating_groups.htm @@ -69,43 +69,48 @@ onerror = null; - - + +

    Creating groups

       - - + +

    Cutting quadrangles

    This operation allows to cut one or several quadrangle 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 871430041..0217776c5 100755 --- a/doc/salome/gui/SMESH/files/diagonal_iversion_of_elements.htm +++ b/doc/salome/gui/SMESH/files/diagonal_iversion_of_elements.htm @@ -41,43 +41,48 @@ onerror = null; - - + +

    Diagonal inversion of elements

     In MESH diff --git a/doc/salome/gui/SMESH/files/displacing_nodes.htm b/doc/salome/gui/SMESH/files/displacing_nodes.htm index f90a4085c..17b20adb3 100755 --- a/doc/salome/gui/SMESH/files/displacing_nodes.htm +++ b/doc/salome/gui/SMESH/files/displacing_nodes.htm @@ -56,43 +56,48 @@ onerror = null; - - + +

    Moving nodes

    In MESH you can change the location of any node of your mesh. In this diff --git a/doc/salome/gui/SMESH/files/displaying_nodes_numbers.htm b/doc/salome/gui/SMESH/files/displaying_nodes_numbers.htm index 4f450b7dd..8f2bc264a 100755 --- a/doc/salome/gui/SMESH/files/displaying_nodes_numbers.htm +++ b/doc/salome/gui/SMESH/files/displaying_nodes_numbers.htm @@ -47,43 +47,48 @@ onerror = null; - - + +

    Displaying nodes numbers

    In MESH you can display the ID numbers of all nodes of your mesh in diff --git a/doc/salome/gui/SMESH/files/editing_groups.htm b/doc/salome/gui/SMESH/files/editing_groups.htm index 5a3556c36..0c5b3974c 100755 --- a/doc/salome/gui/SMESH/files/editing_groups.htm +++ b/doc/salome/gui/SMESH/files/editing_groups.htm @@ -48,43 +48,48 @@ onerror = null; - - + +

    Editing groups

    - - + +

    Importing and exporting meshes

    In MESH there is a functionality allowing importation/exportation diff --git a/doc/salome/gui/SMESH/files/introduction_to_smesh.htm b/doc/salome/gui/SMESH/files/introduction_to_smesh.htm deleted file mode 100755 index 25f68c957..000000000 --- a/doc/salome/gui/SMESH/files/introduction_to_smesh.htm +++ /dev/null @@ -1,240 +0,0 @@ - - - - - -Introduction to SMESH - - - - - - - - - - - - -

    Introduction to MESH

    - -

    MESH module of - SALOME is destined for:

    - -

     

    - - - -

    - -

     

    - -

    for edges:

    - -

     

    - - - -

     

    - -

    for faces:

    - -

     

    - - - -

     

    - -

    for solids:

    - -

     

    - - - -

     

    - -

     

    - - - - diff --git a/doc/salome/gui/SMESH/files/length_of_edges.htm b/doc/salome/gui/SMESH/files/length_of_edges.htm index 019fdf60e..259d204da 100755 --- a/doc/salome/gui/SMESH/files/length_of_edges.htm +++ b/doc/salome/gui/SMESH/files/length_of_edges.htm @@ -48,43 +48,48 @@ onerror = null; - - + +

    Length 2D

    This quality control criterion consists of calculation diff --git a/doc/salome/gui/SMESH/files/max._element_area_hypothesis.htm b/doc/salome/gui/SMESH/files/max._element_area_hypothesis.htm index c093456a5..d52787ce3 100755 --- a/doc/salome/gui/SMESH/files/max._element_area_hypothesis.htm +++ b/doc/salome/gui/SMESH/files/max._element_area_hypothesis.htm @@ -51,43 +51,48 @@ onerror = null; - - + +

    2D Meshing Hypotheses

      @@ -135,7 +140,7 @@ else

      Length from Edges

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

       

      diff --git a/doc/salome/gui/SMESH/files/max._element_volume_hypothsis.htm b/doc/salome/gui/SMESH/files/max._element_volume_hypothsis.htm index 508fbbe13..8876409e2 100755 --- a/doc/salome/gui/SMESH/files/max._element_volume_hypothsis.htm +++ b/doc/salome/gui/SMESH/files/max._element_volume_hypothsis.htm @@ -48,43 +48,48 @@ onerror = null; - - + +

      Max Element Volume hypothesis

      Max diff --git a/doc/salome/gui/SMESH/files/merging_nodes.htm b/doc/salome/gui/SMESH/files/merging_nodes.htm index 4c63bbfc2..ec83b7549 100755 --- a/doc/salome/gui/SMESH/files/merging_nodes.htm +++ b/doc/salome/gui/SMESH/files/merging_nodes.htm @@ -37,43 +37,48 @@ onerror = null; - - + +

      Merging nodes

      This functionality allows user to detect groups of coincident diff --git a/doc/salome/gui/SMESH/files/minimum_angle.htm b/doc/salome/gui/SMESH/files/minimum_angle.htm index b63188d79..202ab024e 100755 --- a/doc/salome/gui/SMESH/files/minimum_angle.htm +++ b/doc/salome/gui/SMESH/files/minimum_angle.htm @@ -48,43 +48,48 @@ onerror = null; - - + +

      Minimum angle

      Minimum angle diff --git a/doc/salome/gui/SMESH/files/non_conform_mesh_allowed_hypothesis.htm b/doc/salome/gui/SMESH/files/non_conform_mesh_allowed_hypothesis.htm index 13c7f1b1d..1083820b9 100755 --- a/doc/salome/gui/SMESH/files/non_conform_mesh_allowed_hypothesis.htm +++ b/doc/salome/gui/SMESH/files/non_conform_mesh_allowed_hypothesis.htm @@ -45,43 +45,48 @@ onerror = null; - - + +

      Additional Hypotheses

      Additional Hypotheses can be 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 6f942a745..5244eead1 100755 --- a/doc/salome/gui/SMESH/files/reassigning_hypotheses_and_algorithms.htm +++ b/doc/salome/gui/SMESH/files/reassigning_hypotheses_and_algorithms.htm @@ -51,43 +51,48 @@ onerror = null; - - + +

      Editing Meshes

      After you have created a mesh or submesh with definite applied hypotheses 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 fd42f8784..7137d89e6 100755 --- a/doc/salome/gui/SMESH/files/removing_nodes_and_elements.htm +++ b/doc/salome/gui/SMESH/files/removing_nodes_and_elements.htm @@ -65,43 +65,48 @@ onerror = null; - - + +

      Removing nodes and elements

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

      diff --git a/doc/salome/gui/SMESH/files/renumbering_nodes_and_elements.htm b/doc/salome/gui/SMESH/files/renumbering_nodes_and_elements.htm index 460da6f39..c329d1566 100755 --- a/doc/salome/gui/SMESH/files/renumbering_nodes_and_elements.htm +++ b/doc/salome/gui/SMESH/files/renumbering_nodes_and_elements.htm @@ -38,43 +38,48 @@ onerror = null; - - + +

      Renumbering nodes and elements

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

      diff --git a/doc/salome/gui/SMESH/files/rotation.htm b/doc/salome/gui/SMESH/files/rotation.htm index ea4fcd6f8..55b13144e 100755 --- a/doc/salome/gui/SMESH/files/rotation.htm +++ b/doc/salome/gui/SMESH/files/rotation.htm @@ -37,43 +37,48 @@ onerror = null; - - + +

      Rotation

      This geometrical operation allows to rotate in space your mesh or some diff --git a/doc/salome/gui/SMESH/files/running_smesh_module.htm b/doc/salome/gui/SMESH/files/running_smesh_module.htm index 735b385ff..a7422b23d 100755 --- a/doc/salome/gui/SMESH/files/running_smesh_module.htm +++ b/doc/salome/gui/SMESH/files/running_smesh_module.htm @@ -36,43 +36,48 @@ onerror = null; - - + +

      Running MESH module

      - - + +

      Sewing meshes

      In SMESH you can sew elements of  different diff --git a/doc/salome/gui/SMESH/files/skew.htm b/doc/salome/gui/SMESH/files/skew.htm index 32718fdd9..2a39312ab 100755 --- a/doc/salome/gui/SMESH/files/skew.htm +++ b/doc/salome/gui/SMESH/files/skew.htm @@ -49,43 +49,48 @@ onerror = null; - - + +

      Skew

      Skew mesh quality diff --git a/doc/salome/gui/SMESH/files/smoothing.htm b/doc/salome/gui/SMESH/files/smoothing.htm index b05b06933..7ceadedc9 100755 --- a/doc/salome/gui/SMESH/files/smoothing.htm +++ b/doc/salome/gui/SMESH/files/smoothing.htm @@ -43,43 +43,48 @@ onerror = null; - - + +

      Smoothing

      Smoothing is used to adjust the locations of element diff --git a/doc/salome/gui/SMESH/files/symmetry.htm b/doc/salome/gui/SMESH/files/symmetry.htm index d8f8a43d5..bc13e22f5 100755 --- a/doc/salome/gui/SMESH/files/symmetry.htm +++ b/doc/salome/gui/SMESH/files/symmetry.htm @@ -36,43 +36,48 @@ onerror = null; - - + +

      Symmetry

      This geometrical operation allows to perform a symmetrical copy of your diff --git a/doc/salome/gui/SMESH/files/taper.htm b/doc/salome/gui/SMESH/files/taper.htm index bd733a977..4e635c4e3 100755 --- a/doc/salome/gui/SMESH/files/taper.htm +++ b/doc/salome/gui/SMESH/files/taper.htm @@ -49,43 +49,48 @@ onerror = null; - - + +

      Taper

      Taper mesh quality diff --git a/doc/salome/gui/SMESH/files/translation.htm b/doc/salome/gui/SMESH/files/translation.htm index a07237880..8102d759d 100755 --- a/doc/salome/gui/SMESH/files/translation.htm +++ b/doc/salome/gui/SMESH/files/translation.htm @@ -36,43 +36,48 @@ onerror = null; - - + +

      Translation

      This geometrical operation allows to translate in space your mesh or diff --git a/doc/salome/gui/SMESH/files/uniting_a_set_of_triangles.htm b/doc/salome/gui/SMESH/files/uniting_a_set_of_triangles.htm index cb6054d98..514f50a76 100755 --- a/doc/salome/gui/SMESH/files/uniting_a_set_of_triangles.htm +++ b/doc/salome/gui/SMESH/files/uniting_a_set_of_triangles.htm @@ -52,43 +52,48 @@ onerror = null; - - + +

      Uniting a set of triangles

      In contrast to the diff --git a/doc/salome/gui/SMESH/files/uniting_two_triangles.htm b/doc/salome/gui/SMESH/files/uniting_two_triangles.htm index 98ad79f5b..61ad185fd 100755 --- a/doc/salome/gui/SMESH/files/uniting_two_triangles.htm +++ b/doc/salome/gui/SMESH/files/uniting_two_triangles.htm @@ -43,43 +43,48 @@ onerror = null; - - + +

      Uniting two triangles

       In MESH diff --git a/doc/salome/gui/SMESH/files/using_operations_on_groups.htm b/doc/salome/gui/SMESH/files/using_operations_on_groups.htm index 622120a22..b24231f23 100755 --- a/doc/salome/gui/SMESH/files/using_operations_on_groups.htm +++ b/doc/salome/gui/SMESH/files/using_operations_on_groups.htm @@ -68,43 +68,48 @@ onerror = null; - - + +

      Using operations on groups

      In MESH you can diff --git a/doc/salome/gui/SMESH/files/viewing_mesh_info.htm b/doc/salome/gui/SMESH/files/viewing_mesh_info.htm index 9c6806a7e..267ac4529 100755 --- a/doc/salome/gui/SMESH/files/viewing_mesh_info.htm +++ b/doc/salome/gui/SMESH/files/viewing_mesh_info.htm @@ -54,43 +54,48 @@ onerror = null; - - + +

      Mesh infos

      There are two types of information boxes: Standard diff --git a/doc/salome/gui/SMESH/files/vtk_3d_viewer.htm b/doc/salome/gui/SMESH/files/vtk_3d_viewer.htm index dec1eee66..e8ce5413c 100755 --- a/doc/salome/gui/SMESH/files/vtk_3d_viewer.htm +++ b/doc/salome/gui/SMESH/files/vtk_3d_viewer.htm @@ -62,43 +62,48 @@ onerror = null; - - + +

      VTK 3D Viewer

      VTK diff --git a/doc/salome/gui/SMESH/files/warp.htm b/doc/salome/gui/SMESH/files/warp.htm index acc2afc6f..b5191bdbf 100755 --- a/doc/salome/gui/SMESH/files/warp.htm +++ b/doc/salome/gui/SMESH/files/warp.htm @@ -49,43 +49,48 @@ onerror = null; - - + +

      Warping

      Warping indicates diff --git a/doc/salome/gui/SMESH/free_borders.htm b/doc/salome/gui/SMESH/free_borders.htm index 6330ba381..abe1d0fa3 100755 --- a/doc/salome/gui/SMESH/free_borders.htm +++ b/doc/salome/gui/SMESH/free_borders.htm @@ -47,43 +47,48 @@ onerror = null; - - + +

      Free borders

      This mesh quality control highlights borders of faces diff --git a/doc/salome/gui/SMESH/free_edges.htm b/doc/salome/gui/SMESH/free_edges.htm index 33822dfdf..52ea7f54a 100755 --- a/doc/salome/gui/SMESH/free_edges.htm +++ b/doc/salome/gui/SMESH/free_edges.htm @@ -47,43 +47,48 @@ onerror = null; - - + +

      Free edges

        This diff --git a/doc/salome/gui/SMESH/grouping_elements.htm b/doc/salome/gui/SMESH/grouping_elements.htm index 1b561a87e..64da11cf2 100755 --- a/doc/salome/gui/SMESH/grouping_elements.htm +++ b/doc/salome/gui/SMESH/grouping_elements.htm @@ -51,43 +51,48 @@ onerror = null; - - + +

      Grouping Elements

      Create a Standalone Group

      diff --git a/doc/salome/gui/SMESH/index.htm b/doc/salome/gui/SMESH/index.htm new file mode 100755 index 000000000..767e2b766 --- /dev/null +++ b/doc/salome/gui/SMESH/index.htm @@ -0,0 +1,180 @@ + + +Mesh Module Reference Manual + + + + + + + + + + + + + diff --git a/doc/salome/gui/SMESH/smesh_csh.htm b/doc/salome/gui/SMESH/index_csh.htm similarity index 93% rename from doc/salome/gui/SMESH/smesh_csh.htm rename to doc/salome/gui/SMESH/index_csh.htm index ebe4e93f8..2bd1f6387 100755 --- a/doc/salome/gui/SMESH/smesh_csh.htm +++ b/doc/salome/gui/SMESH/index_csh.htm @@ -1,6 +1,6 @@ -SMESH reference manual +Mesh Module Reference Manual diff --git a/doc/salome/gui/SMESH/smesh_rhc.htm b/doc/salome/gui/SMESH/index_rhc.htm similarity index 93% rename from doc/salome/gui/SMESH/smesh_rhc.htm rename to doc/salome/gui/SMESH/index_rhc.htm index 3bb6f9a54..4e8723907 100755 --- a/doc/salome/gui/SMESH/smesh_rhc.htm +++ b/doc/salome/gui/SMESH/index_rhc.htm @@ -1,6 +1,6 @@ -SMESH reference manual +Mesh Module Reference Manual diff --git a/doc/salome/gui/SMESH/length.htm b/doc/salome/gui/SMESH/length.htm index 3f2d3206e..d318cbe4a 100755 --- a/doc/salome/gui/SMESH/length.htm +++ b/doc/salome/gui/SMESH/length.htm @@ -47,43 +47,48 @@ onerror = null; - - + +

      Length

      The Length quality control criterion returns a value diff --git a/doc/salome/gui/SMESH/merge_elements.htm b/doc/salome/gui/SMESH/merge_elements.htm index f5ee6263b..32b5ebfb8 100755 --- a/doc/salome/gui/SMESH/merge_elements.htm +++ b/doc/salome/gui/SMESH/merge_elements.htm @@ -28,43 +28,48 @@ onerror = null; - - + +

      Merging Elements

      This functionality allows to merge coincident elements diff --git a/doc/salome/gui/SMESH/mesh.htm b/doc/salome/gui/SMESH/mesh.htm new file mode 100755 index 000000000..be7069d51 --- /dev/null +++ b/doc/salome/gui/SMESH/mesh.htm @@ -0,0 +1,216 @@ + + + + + +mesh + + + + + + + + + + + +

      Introduction to MESH

      + +

       

      + +

      MESH + module of SALOME is destined for:

      + + + +

      + +

      for edges:

      + +
        + + +
      + +

      for faces:

      + +
        + + +
      + +

      for solids:

      + +
        + + +
      + +

      .

      + + + + diff --git a/doc/salome/gui/SMESH/modifying_meshes.htm b/doc/salome/gui/SMESH/modifying_meshes.htm index 2bf6951c3..2d488e688 100755 --- a/doc/salome/gui/SMESH/modifying_meshes.htm +++ b/doc/salome/gui/SMESH/modifying_meshes.htm @@ -55,43 +55,48 @@ onerror = null; - - + +

      Modifying Meshes

      Adding Nodes and Elements

      diff --git a/doc/salome/gui/SMESH/pattern_mapping.htm b/doc/salome/gui/SMESH/pattern_mapping.htm index fcfef1301..2e1bccf29 100755 --- a/doc/salome/gui/SMESH/pattern_mapping.htm +++ b/doc/salome/gui/SMESH/pattern_mapping.htm @@ -69,43 +69,48 @@ onerror = null; - - + +

      Pattern mapping

      About patterns

      diff --git a/doc/salome/gui/SMESH/presentation.htm b/doc/salome/gui/SMESH/presentation.htm index d98ef124a..497621cae 100755 --- a/doc/salome/gui/SMESH/presentation.htm +++ b/doc/salome/gui/SMESH/presentation.htm @@ -40,43 +40,48 @@ onerror = null; - - + +

      Display Mode

      By default your objects are represented as set in Preferences.

      diff --git a/doc/salome/gui/SMESH/quality_controls.htm b/doc/salome/gui/SMESH/quality_controls.htm index 0e7907bb7..b1dc4c472 100755 --- a/doc/salome/gui/SMESH/quality_controls.htm +++ b/doc/salome/gui/SMESH/quality_controls.htm @@ -41,43 +41,48 @@ onerror = null; - - + +

      Quality Controls

      Free Borders

      diff --git a/doc/salome/gui/SMESH/revolution.htm b/doc/salome/gui/SMESH/revolution.htm index 3b7d3bde0..177ed997c 100755 --- a/doc/salome/gui/SMESH/revolution.htm +++ b/doc/salome/gui/SMESH/revolution.htm @@ -37,43 +37,48 @@ onerror = null; - - + +

      Revolution

      Revolution is a type of surface meshing by generation from discretized diff --git a/doc/salome/gui/SMESH/selection_filter_library.htm b/doc/salome/gui/SMESH/selection_filter_library.htm index 333b5b0d2..93ed142e9 100755 --- a/doc/salome/gui/SMESH/selection_filter_library.htm +++ b/doc/salome/gui/SMESH/selection_filter_library.htm @@ -36,43 +36,48 @@ onerror = null; - - + +

      Selection filter library

      Selection filter library is a powerful tool enabling to create filters diff --git a/doc/salome/gui/SMESH/smesh.htm b/doc/salome/gui/SMESH/smesh.htm deleted file mode 100755 index 4964c60ea..000000000 --- a/doc/salome/gui/SMESH/smesh.htm +++ /dev/null @@ -1,139 +0,0 @@ - - - - SMESH reference manual - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/doc/salome/gui/SMESH/smesh.log b/doc/salome/gui/SMESH/smesh.log index 0fde441b8..4d82ab088 100755 --- a/doc/salome/gui/SMESH/smesh.log +++ b/doc/salome/gui/SMESH/smesh.log @@ -1,5 +1,5 @@ |SourceProjectName:SMESH.hpr -|DestinationProjectName:smesh.htm +|DestinationProjectName:index.htm whhost.js whmsg.js whmozemu.js @@ -74,63 +74,47 @@ cshdat_webhelp.htm whcsh_home.htm whcshdata.htm cshdat_robohelp.htm -wht_tab0.gif -wht_tab1.gif -wht_tab2.gif -wht_tab3.gif -wht_tab4.gif -wht_tab5.gif -wht_tab6.gif -wht_tab7.gif -wht_tab8.gif -wht_glo_h.gif -wht_glo_n.gif -wht_fts_h.gif -wht_fts_n.gif -wht_idx_h.gif -wht_idx_n.gif -wht_toc_h.gif -wht_toc_n.gif -wht_ws.gif -wht_ws_g.gif -wht_logo1.gif -wht_logo2.gif -wht_abgw.jpg -wht_abgi.jpg -wht_abge.jpg -wht_abtw.jpg -wht_abte.jpg -wht_abti.jpg -wht_spac.gif -wht_next.gif -wht_next_g.gif -wht_prev.gif -wht_prev_g.gif -wht_sync.gif -wht_hide.gif -wht_go.gif -whstart.ico -whestart.ico -whrstart.ico +whd_topic.xml +whd_nvp10.htm +whd_nvp20.htm +whd_tabs.htm +whd_dpns.htm +whd_tab0.gif +whd_tab1.gif +whd_tab2.gif +whd_tab3.gif +whd_tab4.gif +whd_tab5.gif +whd_tab6.gif +whd_tab7.gif +whd_tab8.gif +whd_toc1.gif +whd_toc2.gif +whd_toc3.gif +whd_toc4.gif +whd_show0.gif +whd_show1.gif +whd_show2.gif +whd_hide0.gif +whd_hide1.gif +whd_hide2.gif +whd_sync0.gif +whd_sync1.gif +whd_sync2.gif +whd_prev0.gif +whd_prev1.gif +whd_prev2.gif +whd_next0.gif +whd_next1.gif +whd_next2.gif +whd_wbsh0.gif +whd_wbsh1.gif +whd_wbsh2.gif whidhtml.htm whfdhtml.htm -whskin_banner.htm -whtbar.js -whskin_pdhtml.htm -whskin_papplet.htm -whskin_plist.htm -whskin_tbars.htm -whskin_mbars.htm -wht_toc4.gif -wht_toc1.gif -wht_toc2.gif -wht_toc3.gif -whskin_frmset010.htm -whst_topics.xml -whskin_frmset01.htm -smesh_hha.hhk -smesh.hhc -smesh.hhk +index_hha.hhk +index.hhc +index.hhk about_viewing_meshes.htm adding_quadratic_nodes_and_elements.htm aspect_ratio_3d.htm @@ -162,7 +146,6 @@ files\displacing_nodes.htm files\displaying_nodes_numbers.htm files\editing_groups.htm files\importing_and_exporting_meshes.htm -files\introduction_to_smesh.htm files\length_of_edges.htm files\max._element_area_hypothesis.htm files\max._element_volume_hypothsis.htm @@ -191,6 +174,7 @@ free_edges.htm grouping_elements.htm length.htm merge_elements.htm +mesh.htm modifying_meshes.htm pattern_mapping.htm presentation.htm @@ -203,7 +187,7 @@ viewing_meshes.htm volume.htm ehelp.xml texture_horiz_ltbluebubbles.jpg -smesh.glo +index.glo default.css pics\add_node.png pics\remove_nodes2.png @@ -456,7 +440,7 @@ image94.jpg image106.gif image91.gif image80.gif -smesh.ppf +index.ppf ehlpdhtm.js default_ns.css whxdata\whtdata0.xml @@ -519,6 +503,6 @@ whgdata\whlstf11.htm whgdata\whlstf12.htm whgdata\whlstf13.htm whgdata\whlstg0.htm -smesh.htm -smesh_csh.htm -smesh_rhc.htm +index.htm +index_csh.htm +index_rhc.htm diff --git a/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh.html b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh.html new file mode 100644 index 000000000..b99783934 --- /dev/null +++ b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh.html @@ -0,0 +1,1004 @@ + + +SALOME - SMESH - v.version: smesh.Mesh Class Reference + + + + +

      smesh.Mesh Class Reference

      Class to define a mesh. +More... +

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

      Public Member Functions

      def __init__
       Constructor.
      def GetMesh
       Method that returns the mesh.
      def GetShape
       Method that returns the shape associated to the mesh.
      def MeshDimension
       Returns mesh dimension depending on shape one.
      def Segment
       Creates a segment discretization 1D algorithm.
      def Triangle
       Creates a triangle 2D algorithm for faces.
      def Quadrangle
       Creates a quadrangle 2D algorithm for faces.
      def Tetrahedron
       Creates a tetrahedron 3D algorithm for solids.
      def Hexahedron
       Creates a hexahedron 3D algorithm for solids.
      def Netgen
       Creates a NETGEN-based 2D or 3D independent algorithm (i.e.
      def Compute
       Compute the mesh and return the status of the computation.
      def AutomaticTetrahedralization
       Compute tetrahedral mesh using AutomaticLength + MEFISTO + NETGEN The parameter fineness [0.
      def AutomaticHexahedralization
       Compute hexahedral mesh using AutomaticLength + Quadrangle + Hexahedron The parameter fineness [0.
      def RemoveGlobalHypotheses
       Removes all global hypotheses.
      def Group
       Create a mesh group based on geometric object grp and give a name, if this parameter is not defined the name is the same as the geometric group name.
      def ExportToMED
       Export the mesh in a file with the MED format and choice the version of MED format.
      def ExportMED
       Export the mesh in a file with the MED format.
      def ExportDAT
       Export the mesh in a file with the DAT format.
      def ExportUNV
       Export the mesh in a file with the UNV format.
      def ExportSTL
       Export the mesh in a file with the STL format.

      Data Fields

       geom
       mesh

      Static Public Attributes

      int geom = 0
      int mesh = 0
      +

      Detailed Description

      +More details. +

      +

      Member Function Documentation

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh.__init__ (   self,
        geom,
        name = 0
      ) 
      +
      + + + + + +
      +   + + +

      +Creates mesh on the shape geom, sets GUI name of this mesh to name.

      Parameters:
      + + + +
      geom Shape to be meshed
      name Study name of the mesh
      +
      +
      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh.GetMesh (   self  ) 
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh.GetShape (   self  ) 
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh.MeshDimension (   self  ) 
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh.Segment (   self,
        algo = REGULAR,
        geom = 0
      ) 
      +
      + + + + + +
      +   + + +

      +If the optional algo parameter is not sets, this algorithm is REGULAR. If the optional geom parameter is not sets, this algorithm is global. Otherwise, this algorithm define a submesh based on geom subshape.

      Parameters:
      + + + +
      algo values are smesh.REGULAR or smesh.PYTHON for discretization via python function
      geom If defined, subshape to be meshed
      +
      +
      +

      + + + + +
      + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh.Triangle (   self,
        geom = 0
      ) 
      +
      + + + + + +
      +   + + +

      +If the optional geom parameter is not sets, this algorithm is global. Otherwise, this algorithm define a submesh based on geom subshape.

      Parameters:
      + + +
      geom If defined, subshape to be meshed
      +
      +
      +

      + + + + +
      + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh.Quadrangle (   self,
        geom = 0
      ) 
      +
      + + + + + +
      +   + + +

      +If the optional geom parameter is not sets, this algorithm is global. Otherwise, this algorithm define a submesh based on geom subshape.

      Parameters:
      + + +
      geom If defined, subshape to be meshed
      +
      +
      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh.Tetrahedron (   self,
        algo,
        geom = 0
      ) 
      +
      + + + + + +
      +   + + +

      +The parameter algo permits to choice the algorithm: NETGEN or GHS3D If the optional geom parameter is not sets, this algorithm is global. Otherwise, this algorithm define a submesh based on geom subshape.

      Parameters:
      + + + +
      algo values are: smesh.NETGEN, smesh.GHS3D
      geom If defined, subshape to be meshed
      +
      +
      +

      + + + + +
      + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh.Hexahedron (   self,
        geom = 0
      ) 
      +
      + + + + + +
      +   + + +

      +If the optional geom parameter is not sets, this algorithm is global. Otherwise, this algorithm define a submesh based on geom subshape.

      Parameters:
      + + +
      geom If defined, subshape to be meshed
      +
      +
      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh.Netgen (   self,
        is3D,
        geom = 0
      ) 
      +
      + + + + + +
      +   + + +

      +needs no discrete boundary). If the optional geom parameter is not sets, this algorithm is global. Otherwise, this algorithm defines a submesh based on geom subshape.

      Parameters:
      + + + +
      is3D If 0 then algorithm is 2D, otherwise 3D
      geom If defined, subshape to be meshed
      +
      +
      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh.Compute (   self  ) 
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh.AutomaticTetrahedralization (   self,
        fineness = 0
      ) 
      +
      + + + + + +
      +   + + +

      +-1.] defines mesh fineness

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh.AutomaticHexahedralization (   self,
        fineness = 0
      ) 
      +
      + + + + + +
      +   + + +

      +-1.] defines mesh fineness

      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh.RemoveGlobalHypotheses (   self  ) 
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh.Group (   self,
        grp,
        name = ""
      ) 
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + + +
      grp is a geometric group, a vertex, an edge, a face or a solid
      name is the name of the mesh group
      +
      +
      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh.ExportToMED (   self,
        f,
        version,
        opt = 0
      ) 
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + + +
      f is the file name
      version values are SMESH.MED_V2_1, SMESH.MED_V2_2
      +
      +
      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh.ExportMED (   self,
        f,
        opt = 0
      ) 
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + +
      f is the file name
      +
      +
      +

      + + + + +
      + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh.ExportDAT (   self,
        f
      ) 
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + +
      f is the file name
      +
      +
      +

      + + + + +
      + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh.ExportUNV (   self,
        f
      ) 
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + +
      f is the file name
      +
      +
      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh.ExportSTL (   self,
        f,
        ascii = 1
      ) 
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + + +
      f is the file name
      ascii defined the kind of file contents
      +
      +
      +

      Field Documentation

      +

      + + + + +
      + + + + +
      int smesh.Mesh.geom = 0 [static]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh.mesh = 0 [static]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh.geom
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh.mesh
      +
      + + + + + +
      +   + + +

      +

      + + diff --git a/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Algorithm.html b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Algorithm.html new file mode 100644 index 000000000..97d0e0ef7 --- /dev/null +++ b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Algorithm.html @@ -0,0 +1,461 @@ + + +SALOME - SMESH - v.version: smesh.Mesh_Algorithm Class Reference + + + + +

      smesh.Mesh_Algorithm Class Reference

      Mother class to define algorithm, recommended to don't use directly. +More... +

      +Inheritance diagram for smesh.Mesh_Algorithm:

      Inheritance graph
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

      Public Member Functions

      def GetSubMesh
      def GetAlgorithm
       Return the wrapped mesher.
      def TreatHypoStatus
       Private method.
      def Create
       Private method.
      def Hypothesis
       Private method.

      Data Fields

       mesh
       geom
       subm
       algo

      Static Public Attributes

      int mesh = 0
      int geom = 0
      int subm = 0
      int algo = 0
      +

      Detailed Description

      +More details. +

      +

      Member Function Documentation

      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Algorithm.GetSubMesh (   self  ) 
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Algorithm.GetAlgorithm (   self  ) 
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.TreatHypoStatus (   self,
        status,
        hypName,
        geomName,
        isAlgo
      ) 
      +
      + + + + + +
      +   + + +

      +Print error message if a hypothesis was not assigned.

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.Create (   self,
        mesh,
        geom,
        hypo,
        so = "libStdMeshersEngine.so"
      ) 
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.Hypothesis (   self,
        hyp,
        args = [],
        so = "libStdMeshersEngine.so"
      ) 
      +
      + + + + + +
      +   + + +

      +

      +

      Field Documentation

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.mesh = 0 [static]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.geom = 0 [static]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.subm = 0 [static]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.algo = 0 [static]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.mesh
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.geom
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.subm
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.algo
      +
      + + + + + +
      +   + + +

      +

      + + diff --git a/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Algorithm__inherit__graph.jpg b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Algorithm__inherit__graph.jpg new file mode 100644 index 0000000000000000000000000000000000000000..39dd1ddf86cae1f86535dc4e372d4c3da36aa562 GIT binary patch literal 19672 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 V>=N+$Ph<(e^JwpX9!QY+{{gXvgW&)G literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Hexahedron.html b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Hexahedron.html new file mode 100644 index 000000000..d177efa43 --- /dev/null +++ b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Hexahedron.html @@ -0,0 +1,502 @@ + + +SALOME - SMESH - v.version: smesh.Mesh_Hexahedron Class Reference + + + + +

      smesh.Mesh_Hexahedron Class Reference

      Class to define a hexahedron 3D algorithm. +More... +

      +Inheritance diagram for smesh.Mesh_Hexahedron:

      Inheritance graph
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

      Public Member Functions

      def __init__
       Private constructor.
      def GetSubMesh
      def GetAlgorithm
       Return the wrapped mesher.
      def TreatHypoStatus
       Private method.
      def Create
       Private method.
      def Hypothesis
       Private method.

      Data Fields

       mesh
       geom
       subm
       algo

      Static Public Attributes

      int mesh = 0
      int geom = 0
      int subm = 0
      int algo = 0
      +

      Detailed Description

      +More details. +

      +

      Member Function Documentation

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Hexahedron.__init__ (   self,
        mesh,
        geom = 0
      ) 
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Algorithm.GetSubMesh (   self  )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Algorithm.GetAlgorithm (   self  )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.TreatHypoStatus (   self,
        status,
        hypName,
        geomName,
        isAlgo
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +Print error message if a hypothesis was not assigned.

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.Create (   self,
        mesh,
        geom,
        hypo,
        so = "libStdMeshersEngine.so"
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.Hypothesis (   self,
        hyp,
        args = [],
        so = "libStdMeshersEngine.so"
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      Field Documentation

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.mesh = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.mesh [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.geom = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.geom [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.subm = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.subm [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.algo = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.algo [inherited]
      +
      + + + + + +
      +   + + +

      +

      + + diff --git a/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Hexahedron__inherit__graph.jpg b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Hexahedron__inherit__graph.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4d1e65ac6675d7b7cda598fd0e834ded872a02fb GIT binary patch literal 5526 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 ll8xc9c@-7mGwLx(xrro65|B=ftSnlsAHS^ri% + +SALOME - SMESH - v.version: smesh.Mesh_Netgen Class Reference + + + + +

      smesh.Mesh_Netgen Class Reference

      Class to define a NETGEN-based 2D or 3D algorithm that need no discrete boundary (i.e. +More... +

      +Inheritance diagram for smesh.Mesh_Netgen:

      Inheritance graph
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

      Public Member Functions

      def __init__
       Private constructor.
      def Parameters
       Define hypothesis containing parameters of the algorithm.
      def GetSubMesh
      def GetAlgorithm
       Return the wrapped mesher.
      def TreatHypoStatus
       Private method.
      def Create
       Private method.
      def Hypothesis
       Private method.

      Data Fields

       is3D
       mesh
       geom
       subm
       algo

      Static Public Attributes

      int is3D = 0
      int mesh = 0
      int geom = 0
      int subm = 0
      int algo = 0
      +

      Detailed Description

      +independent)

      +More details. +

      +

      Member Function Documentation

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Netgen.__init__ (   self,
        mesh,
        is3D,
        geom = 0
      ) 
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Netgen.Parameters (   self  ) 
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Algorithm.GetSubMesh (   self  )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Algorithm.GetAlgorithm (   self  )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.TreatHypoStatus (   self,
        status,
        hypName,
        geomName,
        isAlgo
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +Print error message if a hypothesis was not assigned.

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.Create (   self,
        mesh,
        geom,
        hypo,
        so = "libStdMeshersEngine.so"
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.Hypothesis (   self,
        hyp,
        args = [],
        so = "libStdMeshersEngine.so"
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      Field Documentation

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Netgen.is3D = 0 [static]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Netgen.is3D
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.mesh = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.mesh [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.geom = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.geom [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.subm = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.subm [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.algo = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.algo [inherited]
      +
      + + + + + +
      +   + + +

      +

      + + diff --git a/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Netgen__inherit__graph.jpg b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Netgen__inherit__graph.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d82cacddc9186f4ebd5d54f3c6afc5cc892726ac GIT binary patch literal 5126 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 E05smdbN~PV literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Quadrangle.html b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Quadrangle.html new file mode 100644 index 000000000..8febcc801 --- /dev/null +++ b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Quadrangle.html @@ -0,0 +1,533 @@ + + +SALOME - SMESH - v.version: smesh.Mesh_Quadrangle Class Reference + + + + +

      smesh.Mesh_Quadrangle Class Reference

      Class to define a quadrangle 2D algorithm. +More... +

      +Inheritance diagram for smesh.Mesh_Quadrangle:

      Inheritance graph
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

      Public Member Functions

      def __init__
       Private constructor.
      def QuadranglePreference
       Define "QuadranglePreference" hypothesis, forcing construction of quadrangles if the number of nodes on opposite edges is not the same in the case where the global number of nodes on edges is even.
      def GetSubMesh
      def GetAlgorithm
       Return the wrapped mesher.
      def TreatHypoStatus
       Private method.
      def Create
       Private method.
      def Hypothesis
       Private method.

      Data Fields

       mesh
       geom
       subm
       algo

      Static Public Attributes

      int mesh = 0
      int geom = 0
      int subm = 0
      int algo = 0
      +

      Detailed Description

      +More details. +

      +

      Member Function Documentation

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Quadrangle.__init__ (   self,
        mesh,
        geom = 0
      ) 
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Quadrangle.QuadranglePreference (   self  ) 
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Algorithm.GetSubMesh (   self  )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Algorithm.GetAlgorithm (   self  )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.TreatHypoStatus (   self,
        status,
        hypName,
        geomName,
        isAlgo
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +Print error message if a hypothesis was not assigned.

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.Create (   self,
        mesh,
        geom,
        hypo,
        so = "libStdMeshersEngine.so"
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.Hypothesis (   self,
        hyp,
        args = [],
        so = "libStdMeshersEngine.so"
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      Field Documentation

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.mesh = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.mesh [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.geom = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.geom [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.subm = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.subm [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.algo = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.algo [inherited]
      +
      + + + + + +
      +   + + +

      +

      + + diff --git a/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Quadrangle__inherit__graph.jpg b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Quadrangle__inherit__graph.jpg new file mode 100644 index 0000000000000000000000000000000000000000..38172d20022bc6d8654f1f6c5d93855a64a42a29 GIT binary patch literal 5392 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 + +SALOME - SMESH - v.version: smesh.Mesh_Segment Class Reference + + + + +

      smesh.Mesh_Segment Class Reference

      Class to define a segment 1D algorithm for discretization. +More... +

      +Inheritance diagram for smesh.Mesh_Segment:

      Inheritance graph
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

      Public Member Functions

      def __init__
       Private constructor.
      def LocalLength
       Define "LocalLength" hypothesis to cut an edge in several segments with the same length.
      def NumberOfSegments
       Define "NumberOfSegments" hypothesis to cut an edge in several fixed number of segments.
      def Arithmetic1D
       Define "Arithmetic1D" hypothesis to cut an edge in several segments with arithmetic length increasing.
      def StartEndLength
       Define "StartEndLength" hypothesis to cut an edge in several segments with geometric length increasing.
      def Deflection1D
       Define "Deflection1D" hypothesis.
      def Propagation
       Define "Propagation" hypothesis that propagate all other hypothesis on all others edges that are in the opposite side in the case of quadrangular faces.
      def AutomaticLength
       Define "AutomaticLength" hypothesis.
      def QuadraticMesh
       Define "QuadraticMesh" hypothesis, forcing construction of quadratic edges.
      def GetSubMesh
      def GetAlgorithm
       Return the wrapped mesher.
      def TreatHypoStatus
       Private method.
      def Create
       Private method.
      def Hypothesis
       Private method.

      Data Fields

       mesh
       geom
       subm
       algo

      Static Public Attributes

      int mesh = 0
      int geom = 0
      int subm = 0
      int algo = 0
      +

      Detailed Description

      +More details. +

      +

      Member Function Documentation

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Segment.__init__ (   self,
        mesh,
        geom = 0
      ) 
      +
      + + + + + +
      +   + + +

      + +

      +Reimplemented in smesh.Mesh_Segment_Python.

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Segment.LocalLength (   self,
        l
      ) 
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + +
      l for the length of segments that cut an edge
      +
      +
      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Segment.NumberOfSegments (   self,
        n,
        s = []
      ) 
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + + +
      n for the number of segments that cut an edge
      s for the scale factor (optional)
      +
      +
      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Segment.Arithmetic1D (   self,
        start,
        end
      ) 
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + + +
      start for the length of the first segment
      end for the length of the last segment
      +
      +
      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Segment.StartEndLength (   self,
        start,
        end
      ) 
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + + +
      start for the length of the first segment
      end for the length of the last segment
      +
      +
      +

      + + + + +
      + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Segment.Deflection1D (   self,
        d
      ) 
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + +
      d for the deflection
      +
      +
      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Segment.Propagation (   self  ) 
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Segment.AutomaticLength (   self,
        fineness = 0
      ) 
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + +
      fineness for the fineness [0-1]
      +
      +
      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Segment.QuadraticMesh (   self  ) 
      +
      + + + + + +
      +   + + +

      +If the 2D mesher sees that all boundary edges are quadratic ones, it generates quadratic faces, else it generates linear faces using medium nodes as if they were vertex ones. The 3D mesher generates quadratic volumes only if all boundary faces are quadratic ones, else it fails.

      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Algorithm.GetSubMesh (   self  )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Algorithm.GetAlgorithm (   self  )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.TreatHypoStatus (   self,
        status,
        hypName,
        geomName,
        isAlgo
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +Print error message if a hypothesis was not assigned.

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.Create (   self,
        mesh,
        geom,
        hypo,
        so = "libStdMeshersEngine.so"
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.Hypothesis (   self,
        hyp,
        args = [],
        so = "libStdMeshersEngine.so"
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      Field Documentation

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.mesh = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.mesh [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.geom = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.geom [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.subm = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.subm [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.algo = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.algo [inherited]
      +
      + + + + + +
      +   + + +

      +

      + + diff --git a/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Segment__Python.html b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Segment__Python.html new file mode 100644 index 000000000..230c9c259 --- /dev/null +++ b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Segment__Python.html @@ -0,0 +1,910 @@ + + +SALOME - SMESH - v.version: smesh.Mesh_Segment_Python Class Reference + + + + +

      smesh.Mesh_Segment_Python Class Reference

      Class to define a segment 1D algorithm for discretization with python function. +More... +

      +Inheritance diagram for smesh.Mesh_Segment_Python:

      Inheritance graph
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

      Public Member Functions

      def __init__
       Private constructor.
      def PythonSplit1D
       Define "PythonSplit1D" hypothesis based on the Erwan Adam patch, awaiting equivalent SALOME functionality.
      def LocalLength
       Define "LocalLength" hypothesis to cut an edge in several segments with the same length.
      def NumberOfSegments
       Define "NumberOfSegments" hypothesis to cut an edge in several fixed number of segments.
      def Arithmetic1D
       Define "Arithmetic1D" hypothesis to cut an edge in several segments with arithmetic length increasing.
      def StartEndLength
       Define "StartEndLength" hypothesis to cut an edge in several segments with geometric length increasing.
      def Deflection1D
       Define "Deflection1D" hypothesis.
      def Propagation
       Define "Propagation" hypothesis that propagate all other hypothesis on all others edges that are in the opposite side in the case of quadrangular faces.
      def AutomaticLength
       Define "AutomaticLength" hypothesis.
      def QuadraticMesh
       Define "QuadraticMesh" hypothesis, forcing construction of quadratic edges.
      def GetSubMesh
      def GetAlgorithm
       Return the wrapped mesher.
      def TreatHypoStatus
       Private method.
      def Create
       Private method.
      def Hypothesis
       Private method.

      Data Fields

       mesh
       geom
       subm
       algo

      Static Public Attributes

      int mesh = 0
      int geom = 0
      int subm = 0
      int algo = 0
      +

      Detailed Description

      +More details. +

      +

      Member Function Documentation

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Segment_Python.__init__ (   self,
        mesh,
        geom = 0
      ) 
      +
      + + + + + +
      +   + + +

      + +

      +Reimplemented from smesh.Mesh_Segment.

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Segment_Python.PythonSplit1D (   self,
        n,
        func
      ) 
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + + +
      n for the number of segments that cut an edge
      func for the python function that calculate the length of all segments
      +
      +
      +

      + + + + +
      + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Segment.LocalLength (   self,
        l
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + +
      l for the length of segments that cut an edge
      +
      +
      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Segment.NumberOfSegments (   self,
        n,
        s = []
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + + +
      n for the number of segments that cut an edge
      s for the scale factor (optional)
      +
      +
      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Segment.Arithmetic1D (   self,
        start,
        end
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + + +
      start for the length of the first segment
      end for the length of the last segment
      +
      +
      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Segment.StartEndLength (   self,
        start,
        end
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + + +
      start for the length of the first segment
      end for the length of the last segment
      +
      +
      +

      + + + + +
      + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Segment.Deflection1D (   self,
        d
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + +
      d for the deflection
      +
      +
      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Segment.Propagation (   self  )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Segment.AutomaticLength (   self,
        fineness = 0
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + +
      fineness for the fineness [0-1]
      +
      +
      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Segment.QuadraticMesh (   self  )  [inherited]
      +
      + + + + + +
      +   + + +

      +If the 2D mesher sees that all boundary edges are quadratic ones, it generates quadratic faces, else it generates linear faces using medium nodes as if they were vertex ones. The 3D mesher generates quadratic volumes only if all boundary faces are quadratic ones, else it fails.

      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Algorithm.GetSubMesh (   self  )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Algorithm.GetAlgorithm (   self  )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.TreatHypoStatus (   self,
        status,
        hypName,
        geomName,
        isAlgo
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +Print error message if a hypothesis was not assigned.

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.Create (   self,
        mesh,
        geom,
        hypo,
        so = "libStdMeshersEngine.so"
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.Hypothesis (   self,
        hyp,
        args = [],
        so = "libStdMeshersEngine.so"
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      Field Documentation

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.mesh = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.mesh [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.geom = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.geom [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.subm = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.subm [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.algo = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.algo [inherited]
      +
      + + + + + +
      +   + + +

      +

      + + diff --git a/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Segment__Python__inherit__graph.jpg b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Segment__Python__inherit__graph.jpg new file mode 100644 index 0000000000000000000000000000000000000000..68ae8f3e629c65d771e3326115c6e87c4f2c3fbf GIT binary patch literal 7802 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 literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Tetrahedron.html b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Tetrahedron.html new file mode 100644 index 000000000..e0064eea3 --- /dev/null +++ b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Tetrahedron.html @@ -0,0 +1,553 @@ + + +SALOME - SMESH - v.version: smesh.Mesh_Tetrahedron Class Reference + + + + +

      smesh.Mesh_Tetrahedron Class Reference

      Class to define a tetrahedron 3D algorithm. +More... +

      +Inheritance diagram for smesh.Mesh_Tetrahedron:

      Inheritance graph
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

      Public Member Functions

      def __init__
       Private constructor.
      def MaxElementVolume
       Define "MaxElementVolume" hypothesis to give the maximun volume of each tetrahedral.
      def GetSubMesh
      def GetAlgorithm
       Return the wrapped mesher.
      def TreatHypoStatus
       Private method.
      def Create
       Private method.
      def Hypothesis
       Private method.

      Data Fields

       mesh
       geom
       subm
       algo

      Static Public Attributes

      int mesh = 0
      int geom = 0
      int subm = 0
      int algo = 0
      +

      Detailed Description

      +More details. +

      +

      Member Function Documentation

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Tetrahedron.__init__ (   self,
        mesh,
        algo,
        geom = 0
      ) 
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Tetrahedron.MaxElementVolume (   self,
        vol
      ) 
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + +
      vol for the maximum volume of each tetrahedral
      +
      +
      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Algorithm.GetSubMesh (   self  )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Algorithm.GetAlgorithm (   self  )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.TreatHypoStatus (   self,
        status,
        hypName,
        geomName,
        isAlgo
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +Print error message if a hypothesis was not assigned.

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.Create (   self,
        mesh,
        geom,
        hypo,
        so = "libStdMeshersEngine.so"
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.Hypothesis (   self,
        hyp,
        args = [],
        so = "libStdMeshersEngine.so"
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      Field Documentation

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.mesh = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.mesh [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.geom = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.geom [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.subm = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.subm [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.algo = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.algo [inherited]
      +
      + + + + + +
      +   + + +

      +

      + + diff --git a/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Tetrahedron__inherit__graph.jpg b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Tetrahedron__inherit__graph.jpg new file mode 100644 index 0000000000000000000000000000000000000000..78d01b1be45e54c5984b4a7914c0b550a482a80e GIT binary patch literal 5448 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 E2X8%`umAu6 literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Triangle.html b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Triangle.html new file mode 100644 index 000000000..718cfc3de --- /dev/null +++ b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Triangle.html @@ -0,0 +1,578 @@ + + +SALOME - SMESH - v.version: smesh.Mesh_Triangle Class Reference + + + + +

      smesh.Mesh_Triangle Class Reference

      Class to define a triangle 2D algorithm. +More... +

      +Inheritance diagram for smesh.Mesh_Triangle:

      Inheritance graph
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

      Public Member Functions

      def __init__
       Private constructor.
      def MaxElementArea
       Define "MaxElementArea" hypothesis to give the maximun area of each triangles.
      def LengthFromEdges
       Define "LengthFromEdges" hypothesis to build triangles based on the length of the edges taken from the wire.
      def GetSubMesh
      def GetAlgorithm
       Return the wrapped mesher.
      def TreatHypoStatus
       Private method.
      def Create
       Private method.
      def Hypothesis
       Private method.

      Data Fields

       mesh
       geom
       subm
       algo

      Static Public Attributes

      int mesh = 0
      int geom = 0
      int subm = 0
      int algo = 0
      +

      Detailed Description

      +More details. +

      +

      Member Function Documentation

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Triangle.__init__ (   self,
        mesh,
        geom = 0
      ) 
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Triangle.MaxElementArea (   self,
        area
      ) 
      +
      + + + + + +
      +   + + +

      +

      Parameters:
      + + +
      area for the maximum area of each triangles
      +
      +
      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Triangle.LengthFromEdges (   self  ) 
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Algorithm.GetSubMesh (   self  )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + +
      def smesh.Mesh_Algorithm.GetAlgorithm (   self  )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.TreatHypoStatus (   self,
        status,
        hypName,
        geomName,
        isAlgo
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +Print error message if a hypothesis was not assigned.

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.Create (   self,
        mesh,
        geom,
        hypo,
        so = "libStdMeshersEngine.so"
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      def smesh.Mesh_Algorithm.Hypothesis (   self,
        hyp,
        args = [],
        so = "libStdMeshersEngine.so"
      )  [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      Field Documentation

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.mesh = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.mesh [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.geom = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.geom [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.subm = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.subm [inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.Mesh_Algorithm.algo = 0 [static, inherited]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      smesh.Mesh_Algorithm.algo [inherited]
      +
      + + + + + +
      +   + + +

      +

      + + diff --git a/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Triangle__inherit__graph.jpg b/doc/salome/gui/SMESH/smeshpy_doc/classsmesh_1_1Mesh__Triangle__inherit__graph.jpg new file mode 100644 index 0000000000000000000000000000000000000000..30692a195cd3e1e5c9fc808c1801c3cab7d4ccd9 GIT binary patch literal 5149 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 + +SALOME - SMESH - v.version: Package smesh + + + + +

      Package smesh

      +

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

      Data Structures

      class  Mesh_Algorithm
       Mother class to define algorithm, recommended to don't use directly. More...
      class  Mesh_Segment
       Class to define a segment 1D algorithm for discretization. More...
      class  Mesh_Segment_Python
       Class to define a segment 1D algorithm for discretization with python function. More...
      class  Mesh_Triangle
       Class to define a triangle 2D algorithm. More...
      class  Mesh_Quadrangle
       Class to define a quadrangle 2D algorithm. More...
      class  Mesh_Tetrahedron
       Class to define a tetrahedron 3D algorithm. More...
      class  Mesh_Hexahedron
       Class to define a hexahedron 3D algorithm. More...
      class  Mesh_Netgen
       Class to define a NETGEN-based 2D or 3D algorithm that need no discrete boundary (i.e. More...
      class  Mesh
       Class to define a mesh. More...

      Functions

      def GetName
      def SetName

      Variables

      int REGULAR = 1
      int PYTHON = 2
      int NETGEN = 3
      int GHS3D = 4
      tuple smesh = salome.lcc.FindOrLoadComponent("FactoryServer", "SMESH")
      string NO_NAME = "NoName"
      +

      Function Documentation

      +

      + + + + +
      + + + + + + + + + +
      def smesh.GetName (   obj  ) 
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + + + + + + + + + + + + + + + +
      def smesh.SetName (   obj,
        name
      ) 
      +
      + + + + + +
      +   + + +

      +

      +

      Variable Documentation

      +

      + + + + +
      + + + + +
      int smesh.REGULAR = 1 [static]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.PYTHON = 2 [static]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.NETGEN = 3 [static]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      int smesh.GHS3D = 4 [static]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      tuple smesh.smesh = salome.lcc.FindOrLoadComponent("FactoryServer", "SMESH") [static]
      +
      + + + + + +
      +   + + +

      +

      +

      + + + + +
      + + + + +
      string smesh.NO_NAME = "NoName" [static]
      +
      + + + + + +
      +   + + +

      +

      + + diff --git a/doc/salome/gui/SMESH/transforming_meshes.htm b/doc/salome/gui/SMESH/transforming_meshes.htm index 1020cdf63..078ea190b 100755 --- a/doc/salome/gui/SMESH/transforming_meshes.htm +++ b/doc/salome/gui/SMESH/transforming_meshes.htm @@ -45,43 +45,48 @@ onerror = null; - - + +

      Transforming Meshes

      Transforming Meshes

      diff --git a/doc/salome/gui/SMESH/transparency.htm b/doc/salome/gui/SMESH/transparency.htm index 923a13948..9f9244643 100755 --- a/doc/salome/gui/SMESH/transparency.htm +++ b/doc/salome/gui/SMESH/transparency.htm @@ -34,43 +34,48 @@ onerror = null; - - + +

      Transparency

      diff --git a/doc/salome/gui/SMESH/viewing_meshes.htm b/doc/salome/gui/SMESH/viewing_meshes.htm index d6a576e1a..b32bcc84a 100755 --- a/doc/salome/gui/SMESH/viewing_meshes.htm +++ b/doc/salome/gui/SMESH/viewing_meshes.htm @@ -39,43 +39,48 @@ onerror = null; - - + +

      Viewing Meshes

      Viewing Mesh Infos

      diff --git a/doc/salome/gui/SMESH/volume.htm b/doc/salome/gui/SMESH/volume.htm index ffc11759b..f55993eaf 100755 --- a/doc/salome/gui/SMESH/volume.htm +++ b/doc/salome/gui/SMESH/volume.htm @@ -42,43 +42,48 @@ onerror = null; - - + +

      Volume

      Volume mesh quality diff --git a/doc/salome/gui/SMESH/whcsh_home.htm b/doc/salome/gui/SMESH/whcsh_home.htm index 38f71d169..5a486ba28 100755 --- a/doc/salome/gui/SMESH/whcsh_home.htm +++ b/doc/salome/gui/SMESH/whcsh_home.htm @@ -14,7 +14,7 @@ else } var gCSHFileName="whcshdata.htm"; -var gHomePage="smesh.htm"; +var gHomePage="index.htm"; var gaProj=new Array(); gaProj[0]=new Object(); gaProj[0].sProjPath=_replaceSlash(_getPath(document.location.href)); diff --git a/doc/salome/gui/SMESH/whcshdata.htm b/doc/salome/gui/SMESH/whcshdata.htm index 2964043b7..14d55202c 100755 --- a/doc/salome/gui/SMESH/whcshdata.htm +++ b/doc/salome/gui/SMESH/whcshdata.htm @@ -1,6 +1,6 @@ -SMESH reference manual +Mesh Module Reference Manual diff --git a/doc/salome/gui/SMESH/whskin_pdhtml.htm b/doc/salome/gui/SMESH/whd_dpns.htm similarity index 58% rename from doc/salome/gui/SMESH/whskin_pdhtml.htm rename to doc/salome/gui/SMESH/whd_dpns.htm index 763aa1429..1bca23603 100755 --- a/doc/salome/gui/SMESH/whskin_pdhtml.htm +++ b/doc/salome/gui/SMESH/whd_dpns.htm @@ -1,6 +1,6 @@ - Navigation Pane +Navigator Pane @@ -14,27 +14,19 @@ diff --git a/doc/salome/gui/SMESH/whd_hide0.gif b/doc/salome/gui/SMESH/whd_hide0.gif new file mode 100755 index 0000000000000000000000000000000000000000..97ea0bb6d7aae6a5c303f7288804f3ea9f0e2adc GIT binary patch literal 190 zcmZ?wbhEHbRAmrm*vtR|4Pe{=rW$~}1`s%K;J|;N_#fBm(s{K5IA+wS(XUH&97X-)sr-!@Y0 U%`L5M?HwJV-95d1eS!?u0EaP9SpWb4 literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/whd_hide1.gif b/doc/salome/gui/SMESH/whd_hide1.gif new file mode 100755 index 0000000000000000000000000000000000000000..97ea0bb6d7aae6a5c303f7288804f3ea9f0e2adc GIT binary patch literal 190 zcmZ?wbhEHbRAmrm*vtR|4Pe{=rW$~}1`s%K;J|;N_#fBm(s{K5IA+wS(XUH&97X-)sr-!@Y0 U%`L5M?HwJV-95d1eS!?u0EaP9SpWb4 literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/whd_hide2.gif b/doc/salome/gui/SMESH/whd_hide2.gif new file mode 100755 index 0000000000000000000000000000000000000000..97ea0bb6d7aae6a5c303f7288804f3ea9f0e2adc GIT binary patch literal 190 zcmZ?wbhEHbRAmrm*vtR|4Pe{=rW$~}1`s%K;J|;N_#fBm(s{K5IA+wS(XUH&97X-)sr-!@Y0 U%`L5M?HwJV-95d1eS!?u0EaP9SpWb4 literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/whd_next0.gif b/doc/salome/gui/SMESH/whd_next0.gif new file mode 100755 index 0000000000000000000000000000000000000000..d92dda5223599ae2e8764bd25d24f93b5b35d887 GIT binary patch literal 159 zcmZ?wbhEHblx7fS*vtR|4Pe{=rW$~}1`s%K;J|;N_GOF0KgAF3IG5A literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/whd_next1.gif b/doc/salome/gui/SMESH/whd_next1.gif new file mode 100755 index 0000000000000000000000000000000000000000..d92dda5223599ae2e8764bd25d24f93b5b35d887 GIT binary patch literal 159 zcmZ?wbhEHblx7fS*vtR|4Pe{=rW$~}1`s%K;J|;N_GOF0KgAF3IG5A literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/whd_next2.gif b/doc/salome/gui/SMESH/whd_next2.gif new file mode 100755 index 0000000000000000000000000000000000000000..d92dda5223599ae2e8764bd25d24f93b5b35d887 GIT binary patch literal 159 zcmZ?wbhEHblx7fS*vtR|4Pe{=rW$~}1`s%K;J|;N_GOF0KgAF3IG5A literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/whd_nvp10.htm b/doc/salome/gui/SMESH/whd_nvp10.htm new file mode 100755 index 000000000..30f060c3b --- /dev/null +++ b/doc/salome/gui/SMESH/whd_nvp10.htm @@ -0,0 +1,15 @@ + + +Navigation Pane + + + + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/SMESH/whskin_papplet.htm b/doc/salome/gui/SMESH/whd_nvp20.htm similarity index 62% rename from doc/salome/gui/SMESH/whskin_papplet.htm rename to doc/salome/gui/SMESH/whd_nvp20.htm index 5f8296ad6..c5754bc41 100755 --- a/doc/salome/gui/SMESH/whskin_papplet.htm +++ b/doc/salome/gui/SMESH/whd_nvp20.htm @@ -1,6 +1,6 @@ -Navigation Pane +navigation pane @@ -35,6 +35,7 @@ function setShowPane(sName) { gsInitPane=sName; } + addPane("toc","whtdhtml.htm"); addPane("fts","whfdhtml.htm"); addPane("glo","whgdhtml.htm"); @@ -43,16 +44,13 @@ function setShowPane(sName) function window_unload() { - if (!gbNav4 || gbNav6) // resize will call unload, but the register code will never be called on Netscape 4. - { - UnRegisterListener2(this, WH_MSG_SHOWTOC); - UnRegisterListener2(this, WH_MSG_SHOWIDX); - UnRegisterListener2(this, WH_MSG_SHOWFTS); - UnRegisterListener2(this, WH_MSG_SHOWGLO); - UnRegisterListener2(this, WH_MSG_SYNCTOC); - UnRegisterListener2(this, WH_MSG_SEARCHTHIS); - UnRegisterListener2(this, WH_MSG_GETPANEINFO); - } + UnRegisterListener2(this, WH_MSG_SHOWTOC); + UnRegisterListener2(this, WH_MSG_SHOWIDX); + UnRegisterListener2(this, WH_MSG_SHOWFTS); + UnRegisterListener2(this, WH_MSG_SHOWGLO); + UnRegisterListener2(this, WH_MSG_SYNCTOC); + UnRegisterListener2(this, WH_MSG_SEARCHTHIS); + UnRegisterListener2(this, WH_MSG_GETPANEINFO); } function window_OnLoad() @@ -102,31 +100,6 @@ function window_OnLoad() oMsg=new whMessage(WH_MSG_SHOWGLO,this,1,null) SendMessage(oMsg); } - -} - -function onResize() -{ - var oMsg=null; - if (gbIE4) - { - if(document.body) - { - if(document.body.clientWidth > 1 && document.body.clientHeight>1) - { - oMsg = new whMessage(WH_MSG_RESIZEPANE,this,1,null); - SendMessage(oMsg); - } - } - } - else - { - if (window.innerWidth != 0 && window.innerHeight != 0) - { - oMsg = new whMessage(WH_MSG_RESIZEPANE,this,1,null); - SendMessage(oMsg); - } - } } function CheckLoadingPhase0() @@ -171,7 +144,7 @@ function CheckLoadingPhase2() function CheckAppletLoaded() { - if (typeof(document.WebHelp) == "undefined") + if (typeof(document.webhelp) == "undefined") { document.location.reload(); if (gbretried < gbmaxretry) @@ -209,76 +182,76 @@ function onSendMessage(oMsg) { WebHelpApplet = document.applets["WebHelp"]; if (!WebHelpApplet.Command) - document.location="whskin_plist.htm"; + document.location="whgdata/whnvp30.htm"; } else - WebHelpApplet = window.WebHelp; + WebHelpApplet = WebHelp; if(nMsgId==WH_MSG_GETPANEINFO) { oMsg.oParam=gsCurrentPane; return false; } - else if(gbLoading!="unknown" || gbNav6) + else if (gbLoading!="unknown"||gbNav6) { if (nMsgId == WH_MSG_SHOWTOC) { gsCurrentPane="toc"; - WebHelpApplet.Command("Contents",null); - var onMsg=new whMessage(WH_MSG_PANEINFO,this,1,"toc"); + WebHelpApplet .Command("Contents", null); + var onMsg=new whMessage(WH_MSG_PANEINFO, this, 1, "toc"); SendMessage(onMsg); - onMsg=new whMessage(WH_MSG_SHOWPANE,this,1,null); + onMsg = new whMessage(WH_MSG_SHOWPANE, this, 1, null); SendMessage(onMsg); } - else if(nMsgId==WH_MSG_SHOWIDX) + else if (nMsgId == WH_MSG_SHOWIDX) { gsCurrentPane="idx"; - WebHelpApplet.Command("Index",null); - var onMsg=new whMessage(WH_MSG_PANEINFO,this,1,"idx"); + WebHelpApplet .Command("Index", null); + var onMsg=new whMessage(WH_MSG_PANEINFO, this, 1, "idx"); SendMessage(onMsg); - onMsg=new whMessage(WH_MSG_SHOWPANE,this,1,null); + onMsg = new whMessage(WH_MSG_SHOWPANE, this, 1, null); SendMessage(onMsg); } - else if(nMsgId==WH_MSG_SHOWFTS) + else if (nMsgId == WH_MSG_SHOWFTS) { gsCurrentPane="fts"; - WebHelpApplet.Command("Search",null); - var onMsg=new whMessage(WH_MSG_PANEINFO,this,1,"fts"); + WebHelpApplet .Command("Search", null); + var onMsg=new whMessage(WH_MSG_PANEINFO, this, 1, "fts"); SendMessage(onMsg); - onMsg=new whMessage(WH_MSG_SHOWPANE,this,1,null); + onMsg = new whMessage(WH_MSG_SHOWPANE, this, 1, null); SendMessage(onMsg); } - else if(nMsgId==WH_MSG_SHOWGLO) + else if (nMsgId == WH_MSG_SHOWGLO) { gsCurrentPane="glo"; - WebHelpApplet.Command("Glossary",null); - var onMsg=new whMessage(WH_MSG_PANEINFO,this,1,"glo"); + WebHelpApplet .Command("Glossary", null); + var onMsg=new whMessage(WH_MSG_PANEINFO, this, 1, "glo"); SendMessage(onMsg); - onMsg=new whMessage(WH_MSG_SHOWPANE,this,1,null); + onMsg = new whMessage(WH_MSG_SHOWPANE, this, 1, null); SendMessage(onMsg); } - else if(nMsgId==WH_MSG_SYNCTOC) + else if (nMsgId == WH_MSG_SYNCTOC) { gsCurrentPane="toc"; - var oTopicParam=oMsg.oParam; - if(oTopicParam&&oTopicParam.aPaths&&oTopicParam.aPaths.length>0&&oTopicParam.sPPath) + var oTopicParam = oMsg.oParam; + if (oTopicParam && oTopicParam.aPaths && oTopicParam.aPaths.length > 0 && oTopicParam.sPPath) { - var sPPath=_browserStringToText(oTopicParam.sPPath); - var sParam=""; - for(var i=0;i0&&oTopicParam.sPPath) + var oTopicParam = oMsg.oParam.oTocInfo; + if (oTopicParam && oTopicParam.aPaths && oTopicParam.aPaths.length > 0 && oTopicParam.sPPath) { - var sPPath=_browserStringToText(oTopicParam.sPPath); - var sParam=""; - for(var i=0;i - diff --git a/doc/salome/gui/SMESH/whd_prev0.gif b/doc/salome/gui/SMESH/whd_prev0.gif new file mode 100755 index 0000000000000000000000000000000000000000..518561a0d284eea6b136e0f65591bbe3f00173ee GIT binary patch literal 159 zcmZ?wbhEHblx7fS*vtR|4Pe{=rW$~}1`s%K;J|;N_ oU;NgcIXC46r>s_>iMrWq#-jL{%@sa+vrjf`sXCjtTbaQc0N6r5jsO4v literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/whd_prev1.gif b/doc/salome/gui/SMESH/whd_prev1.gif new file mode 100755 index 0000000000000000000000000000000000000000..518561a0d284eea6b136e0f65591bbe3f00173ee GIT binary patch literal 159 zcmZ?wbhEHblx7fS*vtR|4Pe{=rW$~}1`s%K;J|;N_ oU;NgcIXC46r>s_>iMrWq#-jL{%@sa+vrjf`sXCjtTbaQc0N6r5jsO4v literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/whd_prev2.gif b/doc/salome/gui/SMESH/whd_prev2.gif new file mode 100755 index 0000000000000000000000000000000000000000..518561a0d284eea6b136e0f65591bbe3f00173ee GIT binary patch literal 159 zcmZ?wbhEHblx7fS*vtR|4Pe{=rW$~}1`s%K;J|;N_ oU;NgcIXC46r>s_>iMrWq#-jL{%@sa+vrjf`sXCjtTbaQc0N6r5jsO4v literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/whd_show0.gif b/doc/salome/gui/SMESH/whd_show0.gif new file mode 100755 index 0000000000000000000000000000000000000000..60e8e689798894e49320835bacdce74069bc2755 GIT binary patch literal 199 zcmZ?wbhEHb)M5~3*vtR|4Pe{=rW$~}1`s%K;J|;N_E$rasmle_fbS~emu&&XWTYKFwOuzj8WaIn> egZkzce)i6;?w;Ph{%-S0lc!9bHhsDvgEasywN*#} literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/whd_show1.gif b/doc/salome/gui/SMESH/whd_show1.gif new file mode 100755 index 0000000000000000000000000000000000000000..60e8e689798894e49320835bacdce74069bc2755 GIT binary patch literal 199 zcmZ?wbhEHb)M5~3*vtR|4Pe{=rW$~}1`s%K;J|;N_E$rasmle_fbS~emu&&XWTYKFwOuzj8WaIn> egZkzce)i6;?w;Ph{%-S0lc!9bHhsDvgEasywN*#} literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/whd_show2.gif b/doc/salome/gui/SMESH/whd_show2.gif new file mode 100755 index 0000000000000000000000000000000000000000..60e8e689798894e49320835bacdce74069bc2755 GIT binary patch literal 199 zcmZ?wbhEHb)M5~3*vtR|4Pe{=rW$~}1`s%K;J|;N_E$rasmle_fbS~emu&&XWTYKFwOuzj8WaIn> egZkzce)i6;?w;Ph{%-S0lc!9bHhsDvgEasywN*#} literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/whd_sync0.gif b/doc/salome/gui/SMESH/whd_sync0.gif new file mode 100755 index 0000000000000000000000000000000000000000..1a9785ce625d4b5226515db4d6e0c7af3e416fba GIT binary patch literal 231 zcmZ?wbhEHbv|vM`9&x+nI$ zNd8r_c*)1$HEPY51-@OEc3gZ{eya7pwBt{WU+i`cUmmp8QZH$8UqzwSs@BDAwHYZ@ zNoh?j`R(#$ZiyX{(Jdi~6SEt%OMG>D%4g2fo-=KIR Lx^4SrK?Z98%;sR# literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/whd_sync1.gif b/doc/salome/gui/SMESH/whd_sync1.gif new file mode 100755 index 0000000000000000000000000000000000000000..1a9785ce625d4b5226515db4d6e0c7af3e416fba GIT binary patch literal 231 zcmZ?wbhEHbv|vM`9&x+nI$ zNd8r_c*)1$HEPY51-@OEc3gZ{eya7pwBt{WU+i`cUmmp8QZH$8UqzwSs@BDAwHYZ@ zNoh?j`R(#$ZiyX{(Jdi~6SEt%OMG>D%4g2fo-=KIR Lx^4SrK?Z98%;sR# literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/whd_sync2.gif b/doc/salome/gui/SMESH/whd_sync2.gif new file mode 100755 index 0000000000000000000000000000000000000000..1a9785ce625d4b5226515db4d6e0c7af3e416fba GIT binary patch literal 231 zcmZ?wbhEHbv|vM`9&x+nI$ zNd8r_c*)1$HEPY51-@OEc3gZ{eya7pwBt{WU+i`cUmmp8QZH$8UqzwSs@BDAwHYZ@ zNoh?j`R(#$ZiyX{(Jdi~6SEt%OMG>D%4g2fo-=KIR Lx^4SrK?Z98%;sR# literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/wht_tab0.gif b/doc/salome/gui/SMESH/whd_tab0.gif similarity index 100% rename from doc/salome/gui/SMESH/wht_tab0.gif rename to doc/salome/gui/SMESH/whd_tab0.gif diff --git a/doc/salome/gui/SMESH/wht_tab1.gif b/doc/salome/gui/SMESH/whd_tab1.gif similarity index 100% rename from doc/salome/gui/SMESH/wht_tab1.gif rename to doc/salome/gui/SMESH/whd_tab1.gif diff --git a/doc/salome/gui/SMESH/wht_tab2.gif b/doc/salome/gui/SMESH/whd_tab2.gif similarity index 100% rename from doc/salome/gui/SMESH/wht_tab2.gif rename to doc/salome/gui/SMESH/whd_tab2.gif diff --git a/doc/salome/gui/SMESH/wht_tab3.gif b/doc/salome/gui/SMESH/whd_tab3.gif similarity index 100% rename from doc/salome/gui/SMESH/wht_tab3.gif rename to doc/salome/gui/SMESH/whd_tab3.gif diff --git a/doc/salome/gui/SMESH/wht_tab4.gif b/doc/salome/gui/SMESH/whd_tab4.gif similarity index 100% rename from doc/salome/gui/SMESH/wht_tab4.gif rename to doc/salome/gui/SMESH/whd_tab4.gif diff --git a/doc/salome/gui/SMESH/wht_tab5.gif b/doc/salome/gui/SMESH/whd_tab5.gif similarity index 100% rename from doc/salome/gui/SMESH/wht_tab5.gif rename to doc/salome/gui/SMESH/whd_tab5.gif diff --git a/doc/salome/gui/SMESH/wht_tab6.gif b/doc/salome/gui/SMESH/whd_tab6.gif similarity index 100% rename from doc/salome/gui/SMESH/wht_tab6.gif rename to doc/salome/gui/SMESH/whd_tab6.gif diff --git a/doc/salome/gui/SMESH/wht_tab7.gif b/doc/salome/gui/SMESH/whd_tab7.gif similarity index 100% rename from doc/salome/gui/SMESH/wht_tab7.gif rename to doc/salome/gui/SMESH/whd_tab7.gif diff --git a/doc/salome/gui/SMESH/wht_tab8.gif b/doc/salome/gui/SMESH/whd_tab8.gif similarity index 100% rename from doc/salome/gui/SMESH/wht_tab8.gif rename to doc/salome/gui/SMESH/whd_tab8.gif diff --git a/doc/salome/gui/SMESH/whd_tabs.htm b/doc/salome/gui/SMESH/whd_tabs.htm new file mode 100755 index 000000000..1568f573d --- /dev/null +++ b/doc/salome/gui/SMESH/whd_tabs.htm @@ -0,0 +1,533 @@ + + +WebHelp Tabs Frame in Navigation Pane + + + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/SMESH/whd_toc1.gif b/doc/salome/gui/SMESH/whd_toc1.gif new file mode 100755 index 0000000000000000000000000000000000000000..11017258c92970b19454ead146fd5b379bec281f GIT binary patch literal 153 zcmZ?wbhEHb6krfw*v!E29|#!!A2@KJ0SFix6c`j3@B+o3EQ|~cj0`#;RUk8*S=?{xVR_$zZm5-g_Pmk7#Uti(DzxdWm!V8gx$+Ye-*fKA Z&qxFbzbZW-RFiQ{v>{?oou(jzH2|ujEKL9a literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/whd_toc2.gif b/doc/salome/gui/SMESH/whd_toc2.gif new file mode 100755 index 0000000000000000000000000000000000000000..975e5f6f4dde718d6af7eb7aaca2301a398d0985 GIT binary patch literal 173 zcmZ?wbhEHb6krfw*v!E29|RbH@W6os4M4!qpunKOfEy_OWMO1rU}De#DFK<`%n}vg zp|pDIvWD7YY>bQ|?GtjD74se@CfrgKZZ@Bmp0zThw8(5iM~YSk!(9It&y2-*E@YG} v+8t4Edv%%mPet2C-OICinA>(d7FSUdOO|VTbKuP+zH@t`jkbp=F<1itbz3&o literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/whd_toc3.gif b/doc/salome/gui/SMESH/whd_toc3.gif new file mode 100755 index 0000000000000000000000000000000000000000..4b8122f0f430c4baa062d3681f98f0e41e749017 GIT binary patch literal 158 zcmZ?wbhEHb6krfw*v!E29|RbH@W6os4Gj$n3<^Lo2HZgLCkrD30~3P|ND0UcXBO{( z37)HW%xGY+`tCe2SC&&|MMdWPovo4CLd=bx@xKpd$4#<1nc$(rX1ea|6E)438OQq) gtyoviVpt_6a5ii8UHu;M1& literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/wht_toc4.gif b/doc/salome/gui/SMESH/whd_toc4.gif similarity index 100% rename from doc/salome/gui/SMESH/wht_toc4.gif rename to doc/salome/gui/SMESH/whd_toc4.gif diff --git a/doc/salome/gui/SMESH/whst_topics.xml b/doc/salome/gui/SMESH/whd_topic.xml similarity index 79% rename from doc/salome/gui/SMESH/whst_topics.xml rename to doc/salome/gui/SMESH/whd_topic.xml index 6dce99867..a1b0320fb 100755 --- a/doc/salome/gui/SMESH/whst_topics.xml +++ b/doc/salome/gui/SMESH/whd_topic.xml @@ -4,29 +4,22 @@ - + -";]]> - - - + +"]]> + + + + "]]> @@ -57,11 +60,11 @@ OutputInTopicNavBarDataWebSearch.form();]]> - + - + -";]]> +"]]> diff --git a/doc/salome/gui/SMESH/whd_wbsh0.gif b/doc/salome/gui/SMESH/whd_wbsh0.gif new file mode 100755 index 0000000000000000000000000000000000000000..383688e7cdf6fc64d789bef55fb569d00563682b GIT binary patch literal 260 zcmZ?wbhEHb^k5KX*vtR|4Pe{=rW$~}1`s%K;J|;N_pi3um7TZ!{OM~2XVw-kO|^-f^X$8OVoiBY zc2#mlo_l>saATyygp%rj?#ZQ7CMony>nWRpi3um7TZ!{OM~2XVw-kO|^-f^X$8OVoiBY zc2#mlo_l>saATyygp%rj?#ZQ7CMony>nWRpi3um7TZ!{OM~2XVw-kO|^-f^X$8OVoiBY zc2#mlo_l>saATyygp%rj?#ZQ7CMony>nWR diff --git a/doc/salome/gui/SMESH/whdata/whtdata0.htm b/doc/salome/gui/SMESH/whdata/whtdata0.htm index f1da36132..29ccd8d04 100755 --- a/doc/salome/gui/SMESH/whdata/whtdata0.htm +++ b/doc/salome/gui/SMESH/whdata/whtdata0.htm @@ -9,7 +9,7 @@ -<p>Your browser does not support frames. We recommend that you update your browser to a version that supports frames.</p><p>To view the Help system without frames click on this<a href="whgdata/whnvp30.htm">hyperlink.</a></p> +<p>Your browser does not support frames. We recommend that you update your browser to a version that supports frames.</p><p>To view the Help system without frames click on this<a href="whgdata/whnvp30.htm">hyperlink.</a></p> \ No newline at end of file diff --git a/doc/salome/gui/SMESH/whres.xml b/doc/salome/gui/SMESH/whres.xml index f3f010a3f..89ee8b328 100755 --- a/doc/salome/gui/SMESH/whres.xml +++ b/doc/salome/gui/SMESH/whres.xml @@ -188,69 +188,69 @@ - - + + - + - - - - + + + + - - + + - - - + + +

      - + <title name="Arial" size="9pt" color="#000000" style="normal" weight="normal" decoration="none" /> </fonts> <button normal="" hover="" /> - <editwith value="20" /> + <editwith value="28" /> </form> - <background color="#ffffff" img="" /> + <background color="" img="" /> <fonts> - <normal name="Tahoma" size="8pt" color="#000000" style="Normal" weight="Normal" decoration="none" /> - <hover name="Tahoma" size="8pt" color="#000080" style="Normal" weight="Normal" decoration="underline" /> - <empty name="" size="8pt" color="" style="" weight="" decoration="" /> + <normal name="Arial" size="9pt" color="#000000" style="normal" weight="normal" decoration="none" /> + <hover name="Arial" size="9pt" color="#007f00" style="normal" weight="normal" decoration="underline" /> + <empty name="Arial" size="9pt" color="#666666" style="normal" weight="normal" decoration="none" /> </fonts> - <activebackgroundcolor attr="#c0c0c0" /> - <margin attr="" /> - <indent attr="" /> + <activebackgroundcolor attr="#cccccc" /> + <margin attr="0pt" /> + <indent attr="9pt" /> </index> <fts> <form> <fonts> - <title name="Tahoma" size="8pt" color="#000080" style="Normal" weight="Normal" decoration="none" /> + <title name="Arial" size="9pt" color="#000000" style="normal" weight="normal" decoration="none" /> </fonts> <button normal="" hover="" /> - <editwith value="20" /> + <editwith value="28" /> </form> - <background color="#ffffff" img="" /> + <background color="" img="" /> <fonts> - <normal name="Tahoma" size="8pt" color="#000000" style="Normal" weight="Normal" decoration="none" /> - <hover name="Tahoma" size="8pt" color="#000080" style="Normal" weight="Normal" decoration="underline" /> - <error name="Tahoma" size="8pt" color="#000000" style="Normal" weight="Normal" decoration="none" /> + <normal name="Arial" size="9pt" color="#000000" style="normal" weight="normal" decoration="none" /> + <hover name="Arial" size="9pt" color="#007f00" style="normal" weight="normal" decoration="underline" /> + <error name="Arial" size="9pt" color="#000000" style="normal" weight="normal" decoration="none" /> </fonts> - <activebackgroundcolor attr="#c0c0c0" /> - <margin attr="" /> - <indent attr="" /> + <activebackgroundcolor attr="#cccccc" /> + <margin attr="0pt" /> + <indent attr="9pt" /> </fts> <glossary> - <background color="#ffffff" img="" /> + <background color="" img="" /> <fonts> - <normal name="Tahoma" size="8pt" color="#000000" style="Normal" weight="Normal" decoration="none" /> - <hover name="Tahoma" size="8pt" color="#000080" style="Normal" weight="Normal" decoration="underline" /> + <normal name="Arial" size="9pt" color="#000000" style="normal" weight="normal" decoration="none" /> + <hover name="Arial" size="9pt" color="#007f00" style="normal" weight="normal" decoration="underline" /> </fonts> - <activebackgroundcolor attr="#c0c0c0" /> - <margin attr="" /> - <indent attr="" /> + <activebackgroundcolor attr="#cccccc" /> + <margin attr="0pt" /> + <indent attr="9pt" /> </glossary> </paneskin> </resource> \ No newline at end of file diff --git a/doc/salome/gui/SMESH/whrstart.ico b/doc/salome/gui/SMESH/whrstart.ico deleted file mode 100755 index bffcd6eb9409a6e1121695adf763c2ab477ce902..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10134 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 UFMH1!hGZ~$el#mfpYA#HU*7IM9RL6T diff --git a/doc/salome/gui/SMESH/whskin_banner.htm b/doc/salome/gui/SMESH/whskin_banner.htm deleted file mode 100755 index 39ed797e6..000000000 --- a/doc/salome/gui/SMESH/whskin_banner.htm +++ /dev/null @@ -1,49 +0,0 @@ -<html> -<head> -<title>About WebHelp                                                                                    - - - - - - - - - - - - - - - - - - - - - - - - - - -
      -

      Macromedia

      -

      Copyright © 1992 - 2004, eHelp Corporation

      -

      Author: eHelp Corporation

      -
      -

      Powered by: WebHelp 5.50 -
      Generated by: RoboHelp X5 -
      www.ehelp.com

      -
      - - \ No newline at end of file diff --git a/doc/salome/gui/SMESH/whskin_frmset01.htm b/doc/salome/gui/SMESH/whskin_frmset01.htm deleted file mode 100755 index 3b8d56ad3..000000000 --- a/doc/salome/gui/SMESH/whskin_frmset01.htm +++ /dev/null @@ -1,172 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/doc/salome/gui/SMESH/whskin_frmset010.htm b/doc/salome/gui/SMESH/whskin_frmset010.htm deleted file mode 100755 index 8a02235c8..000000000 --- a/doc/salome/gui/SMESH/whskin_frmset010.htm +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/doc/salome/gui/SMESH/whskin_homepage.htm b/doc/salome/gui/SMESH/whskin_homepage.htm index 4964c60ea..767e2b766 100755 --- a/doc/salome/gui/SMESH/whskin_homepage.htm +++ b/doc/salome/gui/SMESH/whskin_homepage.htm @@ -1,40 +1,34 @@ - - - SMESH reference manual - - - - - - - + +Mesh Module Reference Manual - + + + + + + + - - - - - - - - - - \ No newline at end of file + + + + diff --git a/doc/salome/gui/SMESH/whskin_info.htm b/doc/salome/gui/SMESH/whskin_info.htm index 4e0c1b9a6..3ea59e6bb 100755 --- a/doc/salome/gui/SMESH/whskin_info.htm +++ b/doc/salome/gui/SMESH/whskin_info.htm @@ -7,9 +7,9 @@

      WebHelp 5.50 System Info

      - - - + + + diff --git a/doc/salome/gui/SMESH/whskin_mbars.htm b/doc/salome/gui/SMESH/whskin_mbars.htm deleted file mode 100755 index c4fa48af8..000000000 --- a/doc/salome/gui/SMESH/whskin_mbars.htm +++ /dev/null @@ -1,59 +0,0 @@ - - - WebHelp Navigation Mini-bar - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/doc/salome/gui/SMESH/whskin_pickup.htm b/doc/salome/gui/SMESH/whskin_pickup.htm index 1f1af7fc4..816fc7058 100755 --- a/doc/salome/gui/SMESH/whskin_pickup.htm +++ b/doc/salome/gui/SMESH/whskin_pickup.htm @@ -198,14 +198,14 @@ goFont=new whFont("Verdana","8pt","#000000","normal","normal","none"); goHoverFont=new whFont("Verdana","8pt","#666666","normal","normal","none"); -setBackgroundcolor("White"); -setFont("Table", "Tahoma","8pt","Navy","Normal","Normal","none"); -setListBackgroundcolor("White"); -setFont("Normal", "Tahoma","8pt","Black","Normal","Normal","none"); -setFont("Hover", "Tahoma","8pt","Navy","Normal","Normal","underline"); -setActiveBgColor("Silver"); +setFont("Table", "Arial","9pt","#000000","normal","normal","none"); + + +setFont("Normal", "Arial","9pt","#000000","normal","normal","none"); +setFont("Hover", "Arial","9pt","#007f00","normal","normal","underline"); +setActiveBgColor("#cccccc"); window.onload=window_OnLoad; window.onresize = window_onResize; diff --git a/doc/salome/gui/SMESH/whskin_plist.htm b/doc/salome/gui/SMESH/whskin_plist.htm deleted file mode 100755 index f7cf6d1d5..000000000 --- a/doc/salome/gui/SMESH/whskin_plist.htm +++ /dev/null @@ -1,238 +0,0 @@ - - - Navigation Pane - - - - - - - - - \ No newline at end of file diff --git a/doc/salome/gui/SMESH/whskin_tbars.htm b/doc/salome/gui/SMESH/whskin_tbars.htm deleted file mode 100755 index 6cb490239..000000000 --- a/doc/salome/gui/SMESH/whskin_tbars.htm +++ /dev/null @@ -1,101 +0,0 @@ - - - WebHelp Navigation Toolbar - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/doc/salome/gui/SMESH/whstart.ico b/doc/salome/gui/SMESH/whstart.ico deleted file mode 100755 index 365eceac87e1f84509afe98f098b13c5012ebef8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10134 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 Cw@GdQ diff --git a/doc/salome/gui/SMESH/whstart.js b/doc/salome/gui/SMESH/whstart.js index 77f37ee6a..50883b8e2 100755 --- a/doc/salome/gui/SMESH/whstart.js +++ b/doc/salome/gui/SMESH/whstart.js @@ -31,10 +31,10 @@ function delayReload() } } -var gsToolbarOrder = "toc|fts|glo|blankblock|searchform|banner"; -var gsMinibarOrder = "blankblock|hide2|"; +var gsToolbarOrder = ""; +var gsMinibarOrder = ""; -var gsTopic = "files/introduction_to_smesh.htm"; +var gsTopic = "mesh.htm"; var PANE_OPT_SEARCH = 1; var PANE_OPT_BROWSESEQ = 2; var gnOpts=-1; diff --git a/doc/salome/gui/SMESH/wht_abge.jpg b/doc/salome/gui/SMESH/wht_abge.jpg deleted file mode 100755 index 5e816c942d4b231a746569507acc41a29786ff41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6210 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 diff --git a/doc/salome/gui/SMESH/wht_abte.jpg b/doc/salome/gui/SMESH/wht_abte.jpg deleted file mode 100755 index a5638fabfa1ffb439302d7055d404f22fa78e942..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9810 zcmdUUcUV(PxA&$aRS(62hzf|Hf`EX4kfR8Q2r9jZkuD`fN&snjZJ;P1AR-{3A|lOD z6G()pC`c3OAch=@bP{?<-FJiUIp>~x-+SNlJ@>C~^6c4r)|#?rtu^yoGXV#{-+--W zP0UOHE^aR14D@98S@28)8z~&%f%46I0Kh%KeGnW0 zN4e?TCOoEm2YFZk_g}dH7gY9u9xi}~XQL%o^v3rF^^f$cAh46`;UC5S;bT*V`Az25 z4JkK!`R99s$1A$YOwAC80m$!u{*d=ck5v_drwt*wFINy1O>M zfI#T^Ip579Z~}UDLysU323!R~065?ZxIu4Ei1ruT|E&HO+D5yL_Wver%D!#064yU% zDY;qNkd0@PE3#4MZ-KInF(F+8d!f$@0H6YW^1lIg09@d|@_z~-cG3gs<_UQG1FFac z4gt3T5kW!0ErKFjwuo#K782ejB`zW&F115KLP|nn$2O78^v~DN!hg-VM1_S##YDG? ziEWh>6BCo%$iyUnHre)fIso4R+XSHrT;t)|4{ⅇ@QRpk|09}fFHSFkd%B}n+Xzl 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 diff --git a/doc/salome/gui/SMESH/wht_abti.jpg b/doc/salome/gui/SMESH/wht_abti.jpg deleted file mode 100755 index 14ac68cae4358e4c8b347e2e0a9124cc8e6e0b58..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3863 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 diff --git a/doc/salome/gui/SMESH/wht_fts_h.gif b/doc/salome/gui/SMESH/wht_fts_h.gif deleted file mode 100755 index feb79ae82af9eee69c53f26bb0259032aa075e4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 188 zcmZ?wbhEHb6k-ry*vtR||BZo|;r~pAw6rq}GyfZ(`9E{!|Cwk00|8hbg;4y-!pXqE z#h?Qc1)0IXk;x#+A>*+@!I6POSS!RrfT58|K-tSA;Q<3fBLi2!k`9H&MbLd(38!(I_bg5(mI)e{m-^3EslCSX>cVorP8PRGb9PR6=s1mS VaaxGfR)s^WLRThtQ&FfcSSumvosU}!wfETS0aGr@3? zdxspSh(KrHq9aoT-KUjs8mD>B;@}XNpmBMr|7?}oYb>uWEcfeVa+@?~=Y)rj)7TcL Tg-C5xIJ7EsWs<0b0E0CE)e1Lr diff --git a/doc/salome/gui/SMESH/wht_glo_h.gif b/doc/salome/gui/SMESH/wht_glo_h.gif deleted file mode 100755 index 12223e5cc1fce0341697756352f9b0c62a8bda9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmZ?wbhEHb;*%)rSZ<1s;@p_xON zNrEGx;cz=YBa6U|fCh#RKGmQj9D&M>U1H90Uv5lDKGrGE-oazpu;k=q>F}tW&P_`^ cr|TEqTeC7i(Tj<(iA(m^<^_R`jEoG{0RC$x-v9sr diff --git a/doc/salome/gui/SMESH/wht_glo_n.gif b/doc/salome/gui/SMESH/wht_glo_n.gif deleted file mode 100755 index 32803ebd9c781fc4af17f14b9adb90110ad849a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmZ?wbhEHb@X1N5r3sx&Z zBLV=4v;qQ96f125gAlJ(vTB>)VTcF>e1HjSQzA4<9|pnMWEc<%-et>uWHyKA(+U!g z4uJt+@c?WLQ_}Q_eFTV@14JlfC4%*0>~0PKD^E&u=k diff --git a/doc/salome/gui/SMESH/wht_idx_h.gif b/doc/salome/gui/SMESH/wht_idx_h.gif deleted file mode 100755 index 2df1b16a21c18de76f78db446889be1049f15b00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmZ?wbhEHbHIyb7gPvHyQ kB=ho<%9&Y;?rBphgO@tBstIyPcx}nJ(B#3&#=>9?0DB23GXMYp diff --git a/doc/salome/gui/SMESH/wht_idx_n.gif b/doc/salome/gui/SMESH/wht_idx_n.gif deleted file mode 100755 index fd193a0f7e3769bce176e5d3218e2da3c9be2047..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmZ?wbhEHbHIyb7gPvHyQ kB=ho<%9&Y;?rBphgO@tBstIyPcx}nJ(B#3&#=>9?0JH-snE(I) diff --git a/doc/salome/gui/SMESH/wht_logo1.gif b/doc/salome/gui/SMESH/wht_logo1.gif deleted file mode 100755 index 2ef5700f23ab96a8894ca981f6dd4e03d49f15da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1405 zcma)5|4$WE6hEw{WP@2sq*B9~s6A-aMR*TnGR<$WUK)=_0wxAtNI`_D1ml-yB@+dP zsBc$OLBW;418aN}T?NWeuY}?Bfsicx`ks)f$(obf=f1z7^V``u=W{-v&$)NSs^v!0 zhCK42aU!KdDkYTSN-?EKXHqIDl;lb>B}o^BR6;1hm0(Jc?&VT(p*UBZDNcHnNyUU> zTrs8?0ZEZmBouK)Oc4@b0~%NuMmOm_I)s#5N+u=gwaA2!f=j`qAk6|rE+prYGs#Jl zLN61Namkou1dbS$BqVW3OcJ(&HNZd`EI|u3ECx29frVkxf^?4HLNFmn>%&@PoD0qb zCoLB&P-I*%CKy3INTF8{7sLcX9{d1JOv4W72MH(yYk+|?SfUj?uo&2Y1{P`ObQw8< zaZcJu=)+oMjB!Tr6>`A>MNW(pe1y|50KCu+qoEd7!Vl2IH0%H;2!=wi1{g?V612br zi-8Sj(kIg0C?iJ@E(Rl^4{MPz(vL&?>bbWrdQPZq_FP5xdW_btd%V-59y|0AJPI|E zhqS(lhld9CK;t>!N-z(auxesr;>C*>&!0aZA0L1G__5378Xg|*>+9?2=xAtYa5x-x zyS==;+-9>C6cl7Ir5@_O*4oZ-Tq?);~Jw)@?`Uhkdf_@b?ChvDevnOl;F z{O)wEUF3fwWN`b)p`hmZ74ZqyTirWDCr?jHsG7Z?C^Xjcp&@tK+MJ-tiMM~t9y(JK zd-+uTg%MTgfphNkTBpS5^mmrr#| z=1}8IkeVGn}pQ zHCVpPI1rxNZ#=ktLsVCB(fa0eo*wA+OG$X#zE39BrDL!$%heFLP(bmTWMLtsXdezCQX!b?w-hht2M>_D5ZYzs^3rKC2$Fu?!mp%pGtM0mD$)S0T6oZ8-Q*iUS3+ zDzgE-%n30xlNRs;5XMTtl6*OipdgX0;uj$63{EkQgRk@UFX;Yu=iYnnIp@B&EOx2M zye^*tXpBhdkV*-qxKd0h(wUS>3MILcOi9v3A(aqHa3z=$qJXNr>^Wl}Mr z7*~ubMnF;|6$wRL5mST&*nkEWhS5!Wj}9Rvmy$_IdMz>`q~KC8DM+(GkqgPWP8G$24B?(Df5|f0jU=1*k220RF4U2&dXkcNOv>=@$xDZST()zF#8RvpC z!AZ*n3ltd_j0r|i4^rqA#04=ykOx0N6VtE*`auE;!5Uy74VGvH4=e^Ypn*l&IbBAM zV4RaS68f+f8DpFge1%-FK#>#U1Rvov3;-{*!)U05mGA>JF%3Jw34);ztN{knm;^2G zz+zwnn)HcuH_FHngp0vQ=)+oMjP&EszWVO1i@ppt)FsLu|41fN2U zU1*M@NT-hCCimS65eCTU%XSo!jlM ztgI|6E8DSSM?pb>-EL1$PftxvO-xL*SS)dIanaGyixw?1o6Sa}apA&+c+rD zNfU@hDNHx(KS7ff-Rhk3c74^E!pVWJynC+xKzs4DS^mMz)zxQ9XR^%xa|s(llR}r2 z1jioxuG2Md`IFVX4K?R0XT4bz{IaFL*)`ZvlVS57ip{xpY2?KG(bTHa`@JWp_&u}KZK_yd+ndw= zha=RHKc}R0(C=zQuhW#Y?VB9y!1iTl`Lj_SC#@D!ZPmbq>`6%{de#gqZfY|Hy5kS* zG1S*QW3W1sFK?qS&-rgzkUFDp_5M{o$?vcK`l*4^%p04(jTpGu;s5EX)ajO}X-VCl zH9x;KvnO}N6T7;qHLas$XMA{ZS+O(QdeCt#tFSu$N=k(#^7`qoc+K9Fl0jZx{`q?w z^8W4ZKJsc%c#T4}) D2$`RH diff --git a/doc/salome/gui/SMESH/wht_next.gif b/doc/salome/gui/SMESH/wht_next.gif deleted file mode 100755 index 8ea834d5e7032dbe1ad10ea4cddaf55ac91156cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 73 zcmZ?wbhEHbu&t4cF*@n~ Vey2jt%i6i7QHe!nS-}hp)&O=i6J!7Y diff --git a/doc/salome/gui/SMESH/wht_next_g.gif b/doc/salome/gui/SMESH/wht_next_g.gif deleted file mode 100755 index c0e9758468e31a83aea3f3d353e5d88920ca011b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 73 zcmZ?wbhEHb0c=>&3LIf YBPcn4pOU*-tpa=3)XoK`gBTdB0bkn^WB>pF diff --git a/doc/salome/gui/SMESH/wht_prev_g.gif b/doc/salome/gui/SMESH/wht_prev_g.gif deleted file mode 100755 index 86479091649ebee62ce8a95f7880d3aa95305ce1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 73 zcmZ?wbhEHbutpmhBaYhCPCMFj~25SJyItL8^ diff --git a/doc/salome/gui/SMESH/wht_sync.gif b/doc/salome/gui/SMESH/wht_sync.gif deleted file mode 100755 index 0ef174735ff57f43ff709fc824f326c8f7d9a772..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 846 zcmZ?wbhEHb1(%oXCs~51m>$<%ME692A|p#B_yPer#Ci)*`POB%^7dz+epkpkfn) diff --git a/doc/salome/gui/SMESH/wht_toc1.gif b/doc/salome/gui/SMESH/wht_toc1.gif deleted file mode 100755 index 515c352de2fa5d8ae7def9c3590b6ea3c49d26e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 124 zcmZ?wbhEHb6krfwSoEI(2>$>7&oJ-*fddDQ9Xr<2(gG4Ur-`p57buiKh)yOmArD}p8*#ut zAm9+x5Cb$Q@e~{w3~fk5%OknCMvY^t9znt%#-cJ)bL0xUpunZNsUt@ujR3%f=Li~Z z5hd~fCb|&^m|z$VK@BlLqZ3%*z+h-Y+G9oW8rP_C92-NB@Q1Oe%sm#E)*lpUqp{Dl zq<~7f$9hwg!I;vCZ70KloIJ$x6IM7#lOT=H0b4?N@RUYTp-?E5N|j2bTCHYTR;$(O z^?IJ?jYgx{Y_{9&PN&oDc6+^EzuzAW2E*ZSG#YL8{`-*s|L4HQ)^VbDbR=5iKSA5> z((Uox<+lqT@Bdicb>eezWjfzpXg#^L_I)XzC||u&Svz?0;oilWEwu3S(*s(qx8IM} zr)T%SSzP{b;pv&V@{O0*XGVu#&vCYXZ-alGozL#f?`WMr^yS&ko98b6{`%Zr9DVh8 Xd1Wd8HoIr4wQu54=hEe|F`E1fN0FWD diff --git a/doc/salome/gui/SMESH/wht_toc3.gif b/doc/salome/gui/SMESH/wht_toc3.gif deleted file mode 100755 index 330f3691c32e371e8af44c6d5780747737d30ed9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 911 zcmb7@J!_Ov5QWDmm;@qe-9i*h41P3@iC=}qMkQM<*oi4b9MBbPV;2y%2x5`NVi3gz z8w(eMTCI&lj4LCeMf3-3XSJ1Bjn94KAMiHIaPORX&Y5>FFI_rw_WHC;%Wv5^Dqosn6`5s$)%puXwb8QAYDopE%Dt?&in1_P z>6C3(h6{4#p)9|`Dh{eiNb@-GBm{$McJ-rgP#hojMGr}y87{Qp0P{_L3$c_YV5Yxz&e_#L@5@qDKD z?EU@Sd)N9Oo3+i>_sQAA3oOHR&S`}AscYi!@wT|dXa-58AhSX_T+>obiv;MS)X7 zqoGiRk&%sMS2{-t%PGMb54ie#tQ3VkTE>M8b>n fP2%BUxjRKxH>^)M>~=J2)0&$bc`mcDFjxZsWfwhm diff --git a/doc/salome/gui/SMESH/wht_toc_n.gif b/doc/salome/gui/SMESH/wht_toc_n.gif deleted file mode 100755 index ce283101f4204c55c042012228385fb6fefef830..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmZ?wbhEHb6l4%!*v!Ci;J^U}oR0_I6278?~j`dAG5&b;`T z(lAAtd4tFcA+_V}BAIqFnUf#;u$YFH{qdZ%{K6E=QoEX&fedGsSmj%V{=EF;$m)oN Sv)-K8y4t-hft8Jg!5RR!bUSIM3=H~ zN)dJACBnOLG2yCKg3_iIgCMkYRX44^=D7ne&-cwcGiS~@&%6J?t1s?4K7}d#g%MhM zv~;NdN!jsxUi#%e4Q`Mj3~49>2qQ>1AtHz*ih#o$bhtx~aHOLgJ}X>_BEVN7Eg zySCFEPKpdN$?5@4^O1F@oZ(DoIh&+ul)5M}#1u3M2>&BvDR zk}F*4D({iq-G!YS5mHJewG$RJ+o3X_iiplDN9wt zxED>Y-R`3HuM)Pip z&1NhV%2Xqdn_)5Z^%z@5WJXprc;ocQ?(V|Q<>cZ0h>MaYeOV@$EFFFJua3=suUH2B zi|zfgzlbSd)m1!P{p98E;;|FUH#~7C4$f`g_{fi&XD|OWxA)BYnfI1|Hvj$2Gk?7D z{@#UCv2)qF{b!%~`O|myoS58NJ!R{@{o>r=={0v(-9CTg>%-GqrnyG@K6&o*{~mvE zZQIO+=^a<+zsf5we}FgtJaT;IOKf}N*S7SGk;rHSbOjF#b2@K=7*bBJpJ0@wSy~PcO&VR2YQMZ#sDTX=cCZ{OXWotfu7aB%eW~9-LGKMjY zW$fBccQ`3B$Rw)=IL$}aopOdVo#kwjrcvsm#1K;~v6)+peh(@b!3J*i|Q zGg-;j$cl~RMHQo%#VTT`+vDUz9>pN7f?74Rf$b)l!jz^mVXzqs`BHu{^)(+` zx=XHbrK`M0c6S$cZbV2amDEmHsQGxOLJ`VPh1woVHA(NfRHQOhsrJlD&D^`W6s0Ux z3FBTgy>`2c+QYW1of$5g4K3Wp#IQ`uvNorE7y>y5ObmHiiQ%{TP|bZ{hi7`0w;0X4 zDK?w2P$*N4JZ^@?(AQ&Z8Ic)T(cq2KBfGl`JD1Dvmm+RUTJFoTjOCT1&;Hf1>D^=s z_z&CqWq%QK!0a`=Up;>&YHISq`gNaP-*j%Iq4yyztld;}i+4) - { - if (button.arguments[4+i]) - this.aIs[i]=_getFullPath(_getPath(document.location.href),button.arguments[4+i]); - else - this.aIs[i]=""; - i++; - } -} - -function getImage(oImage,sTitle) -{ - if(oImage.aIs[0]) - { - var sI=""; - if(sTitle=="") - sTitle=oImage.sText; - sI+="\""+sTitle+"\"0) - sI+=" width="+oImage.nWidth; - if(oImage.nHeight>0) - sI+=" height="+oImage.nHeight; - sI+=" border=0 align=\"absmiddle\">"; - return sI; - } - return ""; -} - -function getCurrentAveName() -{ - var oSelect=getElement("avenue"); - if(oSelect) - return oSelect.value; - else - return ""; -} - -function updateWebSearch(bEnable) -{ - var oWebSearch=getElement("btnwebsearch"); - var oWebSearchParent=null; - if(oWebSearch) - oWebSearchParent=getParentNode(oWebSearch); - goWebSearchEnable=bEnable; - if(oWebSearchParent) - { - if(bEnable) - enableButton(oWebSearchParent,goWebSearch); - else - disableButton(oWebSearchParent,goWebSearch); - } - -} - -function setState(oEL,sState) -{ - if(gbNav6||gbOpera) - oEL.setAttribute("state",sState); - else - oEL.state=sState; -} - -function updateAvenueIfNeeded() -{ - gbUpdateTimerCount--; - if (gbNeedUpdateAve&&gbUpdateTimerCount==0) - { - updateAvenue(); - } -} - -function updateAvenue() -{ - var sSelect=getAvenueHTML(gaAvenues); - var oSelect=getElement("avenue"); - if(oSelect) - { - if(gbNav6) - { - var oParent=getParentNode(oSelect); - - if(oParent) - { - removeThis(oSelect); - oParent.insertAdjacentHTML("afterBegin",sSelect); - } - } - else - oSelect.outerHTML=sSelect; - oSelect=getElement("avenue"); - if(isValidAvenue(gaAvenues,gsCurAveName)) - oSelect.value=gsCurAveName; - } - updateAveButton(); -} - -function initAveButtonObj() -{ - if(!gbAveButttnInited) - { - var oNext=getElement("btnavnext"); - if(oNext) - goNextParent=getParentNode(oNext); - - var oPrev=getElement("btnavprev"); - if(oPrev) - goPrevParent=getParentNode(oPrev); - } - gbAveButttnInited=true; -} - -function disableAveButton() -{ - initAveButtonObj(); - if(goNextParent) - disableButton(goNextParent,goNext); - if(goPrevParent) - disableButton(goPrevParent,goPrev); -} - -function disableButton(oEl,oBtn) -{ - setState(oEl,"disable"); - var sPF=oEl.className.substring(0,6); - oEl.className=sPF+"Disable"; - var oAs = getElementsByTag(oEl,"a"); - if (oAs.length>0) - { - oAs[0].style.cursor="default"; - } - var oIs=getElementsByTag(oEl,"img"); - if(oIs.length>0&&oBtn&&oBtn.aIs&&oBtn.aIs.length>3) - { - if(oBtn.aIs[3]) - oIs[0].src=oBtn.aIs[3]; - } - else - oEl.style.visibility="hidden"; -} - -function enableButton(oEl,oBtn) -{ - setState(oEl,"normal"); - if(oEl==goEl) - { - var sPF=oEl.className.substring(0,6); - oEl.className=sPF+"Up"; - } - var oAs = getElementsByTag(oEl,"a"); - if (oAs.length>0) - { - oAs[0].style.cursor="hand"; - } - var oIs=getElementsByTag(oEl,"img"); - if(oIs.length>0&&oBtn&&oBtn.aIs&&oBtn.aIs.length>0) - { - if(oBtn.aIs[0]) - oIs[0].src=oBtn.aIs[0]; - } - oEl.style.visibility="visible"; -} - -function updateAveButton() -{ - initAveButtonObj(); - var strAveName=getCurrentAvenue(); - if(strAveName!="") - { - if(gaAvenues) - { - for(var i=0;i0) - { - for(var i=0;i"; - sSelect+=""; - if(aAvenues) - { - for(var i=0;i"+aAvenues[i].sName+""; - } - } - sSelect+=""; - return sSelect; -} - -function addAvenueSelection() -{ - var oMsg=new whMessage(WH_MSG_GETAVIAVENUES,this,1,new Object()); - var sButton=""; - if(SendMessage(oMsg)) - { - sButton=getAvenueHTML(oMsg.oParam.aAvenues); - } - else - { - sButton=getAvenueHTML(null); - } - gaButtons[gaButtons.length]=""; -} - -function setSearchFormTitle(sTitle) -{ - gsSearchFormTitle=sTitle; -} - -function highLightIfNeeded() -{ - if(document.searchForm.searchString.value==gsSearchPrompt) - { - document.searchForm.searchString.select(); - } -} - -function addSearchForm() -{ - var sPropmptString=gsSearchPrompt; - - var nWidth=20; - if(!nWidth) nWidth=20; - if(gbNav4) nWidth=nWidth*.6; - - if(gsSearchFormTitle) - sPropmptString=""; - var sButton="
      Start Page smesh.htm
      Skin Name Default
      Generating Time 12:34 04/21/2006
      Start Page index.htm
      Skin Name
      Generating Time 12:45 05/22/2006
      Language ID 1033
      Compile Script webhelp5_compile_script.xml
      Compile Build Version 13.10.606
      "+sButton+"
      "; - if(gbNav6) - sButton=""+sButton; - if("image"=="text") - { - sButton+=""; - } - else if("image"=="image"&&gsIGo) - { - sButton+=""; - } - sButton+="
      "+_textToHtml(gsSearchFormTitle)+"" - sButton+="\"Go\"
      "; - if(gbNav6) - sButton+=""; - var nBtn=gaButtons.length; - gaButtons[nBtn]=""+sButton+""; - gaTypes[nBtn]="searchform"; -} - -function getShowHide() -{ - var sText=""; - var sI=""; - if(hasNavPane()) - { - if(goHide) - { - if(gnShowHideStyle&BTN_TEXT) - sText=goHide.sText; - if(gnShowHideStyle&BTN_IMG) - sI=getImage(goHide,"Hide"); - } - } - else - { - if(goShow) - { - if(gnShowHideStyle&BTN_TEXT) - sText=goShow.sText; - if(gnShowHideStyle&BTN_IMG) - sI=getImage(goShow,"Show"); - } - } - var sButton=genButton(sText,sI,gnShowHideStyle); - return sButton; -} - -function addBanner(sImage) -{ - if(sImage) - { - var nBtn=gaButtons.length; - gaButtons[nBtn]="     \"About"; - gaTypes[nBtn]="banner"; - } -} - -function showBanner() -{ - if (!gbPreview) - { - var nWidth=390; - var nHeight=204; - var nScreenWidth=screen.width; - var nScreenHeight=screen.height; - var nLeft=(nScreenWidth-nWidth)/2; - var nTop=(nScreenHeight-nHeight)/2; - if (gbIE4) - { - if (gbIE5) - nHeight+=20; - else - nHeight+=40; - window.showModalDialog("whskin_banner.htm","","dialogHeight:"+nHeight+"px;dialogWidth:"+nWidth+"px;resizable:no;status:no;scroll:no;help:no;center:yes;"); - } - else - window.open("whskin_banner.htm","banner","dependent,innerHeight="+nHeight+",innerWidth="+nWidth+",height="+nHeight+",width="+nWidth+",resizable=no,menubar=no,location=no,personalbar=no,status=no,scrollbar=no,toolbar=no,screenX="+nLeft+",screenY="+nTop); - } -} - -function addButton(sType,nStyle,sTitle,sHref,sOnClick,sOnMouseOver,sOnLoad,nWidth,nHeight,sI1,sI2,sI3,sI4,sI5,sI6) -{ - var sButton=""; - var bMini=false; - var sText=""; - var sI=""; - var bState=false; - var nBtn=gaButtons.length; - var bHref=false; - if(sType=="show"&&isShowHideEnable()) - { - var svTitle="Show Navigation Component"; - sButton=""; - gnShowHideStyle=nStyle; - goShow=new button(sType,sTitle,nWidth,nHeight,sI1,sI2,sI3); - gaObjBtns[nBtn]=goShow; - if(gnShowHide!=-1) - { - nBtn=gnShowHide; - } - else - { - gnShowHide=nBtn; - } - sButton+=getShowHide(); - sButton+=""; - bState=true; - } - else if(sType=="hide"&&isShowHideEnable()) - { - var svTitle="Hide Navigation Component"; - sButton=""; - gnShowHideStyle=nStyle; - goHide=new button(sType,sTitle,nWidth,nHeight,sI1,sI2,sI3); - gaObjBtns[nBtn]=goHide; - if(gnShowHide!=-1) - { - nBtn=gnShowHide; - } - else - { - gnShowHide=nBtn; - } - sButton+=getShowHide(); - sButton+=""; - bState=true; - } - else if(sType=="hide2"&&(!gbNav4)&&(!gbOpera)) - { - var svTitle="Hide Navigation Component"; - sButton=""; - gnShowHideStyle=nStyle; - if(!sI1) - sI1=gsIHide; - goHide2=new button(sType,sTitle,nWidth,nHeight,sI1,sI2,sI3); - gaObjBtns[nBtn]=goHide2; - if(nStyle&BTN_TEXT) - sText=goHide2.sText - - if(nStyle&BTN_IMG) - sI=getImage(goHide2,svTitle); - sButton+=genButton(sText,sI,nStyle); - sButton+=""; - bMini=true; - } - else if(sType=="synctoc") - { - var svTitle="Sync TOC"; - sButton=""; - if(!sI1) - sI1=gsISync; - goSync=new button(sType,sTitle,nWidth,nHeight,sI1,sI2,sI3); - gaObjBtns[nBtn]=goSync; - if(nStyle&BTN_TEXT) - sText=goSync.sText - - if(nStyle&BTN_IMG) - sI=getImage(goSync,svTitle); - sButton+=genButton(sText,sI,nStyle); - sButton+=""; - bMini=true; - } - else if(sType=="toc") - { - var svTitle="Contents"; - sButton=""; - if(!sI1) - sI1=gsIToc; - if(!sI2) - sI2=gsITocS; - if(!sI4) - sI4=gsITocS; - goToc=new button(sType,sTitle,nWidth,nHeight,sI1,sI2,sI3,sI4,sI5,sI6); - gaObjBtns[nBtn]=goToc; - if(nStyle&BTN_TEXT) - sText=goToc.sText - - if(nStyle&BTN_IMG) - sI=getImage(goToc,svTitle); - sButton+=genButton(sText,sI,nStyle); - sButton+=""; - bState=true; - } - else if(sType=="idx") - { - var svTitle="Index"; - sButton=""; - if(!sI1) - sI1=gsIIndex; - if(!sI2) - sI2=gsIIndexS; - if(!sI4) - sI4=gsIIndexS; - goIdx=new button(sType,sTitle,nWidth,nHeight,sI1,sI2,sI3,sI4,sI5,sI6); - gaObjBtns[nBtn]=goIdx; - if(nStyle&BTN_TEXT) - sText=goIdx.sText - - if(nStyle&BTN_IMG) - sI=getImage(goIdx,svTitle); - sButton+=genButton(sText,sI,nStyle); - sButton+=""; - bState=true; - } - else if(sType=="fts") - { - var svTitle="Search"; - sButton=""; - if(!sI1) - sI1=gsISearch; - if(!sI2) - sI2=gsISearchS; - if(!sI4) - sI4=gsISearchS; - goFts=new button(sType,sTitle,nWidth,nHeight,sI1,sI2,sI3,sI4,sI5,sI6); - gaObjBtns[nBtn]=goFts; - if(nStyle&BTN_TEXT) - sText=goFts.sText - - if(nStyle&BTN_IMG) - sI=getImage(goFts,svTitle); - sButton+=genButton(sText,sI,nStyle); - sButton+=""; - bState=true; - } - else if(sType=="glo") - { - var svTitle="Glossary"; - sButton=""; - if(!sI1) - sI1=gsIGlossary; - if(!sI2) - sI2=gsIGlossaryS; - if(!sI4) - sI4=gsIGlossaryS; - goGlo=new button(sType,sTitle,nWidth,nHeight,sI1,sI2,sI3,sI4,sI5,sI6); - gaObjBtns[nBtn]=goGlo; - if(nStyle&BTN_TEXT) - sText=goGlo.sText - - if(nStyle&BTN_IMG) - sI=getImage(goGlo,svTitle); - sButton+=genButton(sText,sI,nStyle); - sButton+=""; - bState=true; - } - else if(sType=="avnext") - { - var svTitle="Next Topic"; - sButton=""; - if(!sI1) - sI1=gsINext; - if(!sI4) - sI4=gsINextD; - goNext=new button(sType,sTitle,nWidth,nHeight,sI1,sI2,sI3,sI4,sI5,sI6); - gaObjBtns[nBtn]=goNext; - if(nStyle&BTN_TEXT) - sText=goNext.sText - - if(nStyle&BTN_IMG) - sI=getImage(goNext,svTitle); - sButton+=genButton(sText,sI,nStyle); - sButton+=""; - bMini=true; - } - else if(sType=="avprev") - { - var svTitle="Previous Topic"; - sButton=""; - if(!sI1) - sI1=gsIPrev; - if(!sI4) - sI4=gsIPrevD; - goPrev=new button(sType,sTitle,nWidth,nHeight,sI1,sI2,sI3,sI4,sI5,sI6); - gaObjBtns[nBtn]=goPrev; - if(nStyle&BTN_TEXT) - sText=goPrev.sText - - if(nStyle&BTN_IMG) - sI=getImage(goPrev,svTitle); - sButton+=genButton(sText,sI,nStyle); - sButton+=""; - bMini=true; - } - else if(sType=="blankblock") - { - gaButtons[nBtn]=null; - gaTypes[nBtn]=sType; - } - else if(sType=="websearch") - { - var svTitle="WebSearch"; - sButton=""; - if(!sI1) - sI1=gsIWebSearch; - if(!sI4) - sI4=gsIWebSearchD; - goWebSearch=new button(sType,sTitle,nWidth,nHeight,sI1,sI2,sI3,sI4,sI5,sI6); - gaObjBtns[nBtn]=goWebSearch; - if(nStyle&BTN_TEXT) - sText=goWebSearch.sText - - if(nStyle&BTN_IMG) - sI=getImage(goWebSearch,svTitle); - sButton+=genButton(sText,sI,nStyle); - sButton+=""; - } - else if(sType.indexOf("custom")==0) - { - var nCusBtnIdx=goCusButton.length; - goCusButton[nCusBtnIdx]=new cusButton(sType,sTitle,sOnClick,sOnMouseOver,sOnLoad,nWidth,nHeight,sI1,sI2,sI3); - gaObjBtns[nBtn]=goCusButton[nCusBtnIdx]; - var re=new RegExp("\"","g"); - var svTitle=sTitle.replace(re, """); - if(sHref&&sHref.length!=0) - { - sButton=""; - if(nStyle&BTN_TEXT) - sText=sTitle; - if(nStyle&BTN_IMG) - sI+=getImage(goCusButton[nCusBtnIdx],sTitle); - sButton+=genButton(sText,sI,nStyle); - sButton+=""; - } - if(sButton.length!=0) - { - var btnClass=""; - if(sText||bMini) - btnClass="clsBtnNormal"; - else - btnClass="clsNoBNormal"; - - if(!bState) - { - if(bHref) - gaButtons[nBtn]=""+sButton+""; - else - gaButtons[nBtn]=""+sButton+""; - } - else - gaButtons[nBtn]=""+sButton+""; - gaTypes[nBtn]=sType; - } - - if(sType=="avenuesel") - addAvenueSelection(); - else if(sType=="searchform") - addSearchForm(); - else if(sType=="banner") - { - if(!sI1) - sI1=gsIBanner; - addBanner(sI1); - } -} - -function isShowHideEnable() -{ - if(gbIE4) - return true; - else - return false; -} - -function genButton(sText,sI,nStyle) -{ - var sButton=""; - var sShowText=_textToHtml(sText); - if (gbNav4 && !gbNav6) - sShowText += " "; - if(sText!=""&&sI!="") - { - if(nStyle&BTN_IMG_TOP) - sButton+=sI+"
      "+ sShowText; - else if(nStyle&BTN_IMG_BOTTOM) - sButton+=sText+"
      "+sI; - else if(nStyle&BTN_IMG_RIGHT) - sButton+=sText+" "+sI; - else - sButton+=sI+" "+sShowText; - } - else if(sText!="") - { - sButton+=sShowText; - } - else if(sI!="") - { - sButton+=sI; - } - return sButton; -} - -function searchB() -{ - var onMsg=new whMessage(WH_MSG_SHOWFTS,this,1,null); - SendMessage(onMsg); - - var oMsg=new whMessage(WH_MSG_SEARCHTHIS,this,1,document.searchForm.searchString.value); - if(!SendMessage(oMsg)) - gstrSearch=document.searchForm.searchString.value; - else - gstrSearch=""; -} - -function ReSortToolbarButtons() -{ - var bSearchEnabled=isSearchEnabled(); - var strOrder=""; - var oMsg=new whMessage(WH_MSG_TOOLBARORDER,this,1,null); - if(SendMessage(oMsg)) - { - strOrder=oMsg.oParam; - } - if(strOrder.length>0) - { - gaOrders=strOrder.split("|"); - var aTempButtons=new Array(); - var ti=0; - for(var si=0;si0) - { - gaOrders=strOrder.split("|"); - var aTempButtons=new Array(); - var ti=0; - for(var si=0;si0) - { - var strHeight="100%"; - var strWidth="100%"; - if (gbNav4) - { - strHeight=window.innerHeight-4; - strWidth=window.innerWidth-4; - } - if (gbIE4) - { - strHeight=document.body.clientHeight-4; - strWidth=document.body.clientWidth-4; - } - if(gbNav6) - sHTML=""; - else - sHTML="
      "; - if((gnButtonLayout&LAYOUT)==HLAYOUT) - { - sHTML+=""; - for(var i=0;i"; - } - sHTML+=""; - } - else - { - for(var i=0;i"+gaButtons[i]+""; - else - sHTML+=""; - } - } - if(gbNav6) - sHTML+="
      "; - else - sHTML+=""; - } - document.write(sHTML); - if(document.body) - document.body.onselectstart=onSelect; - updateAveButton(); -} - -function hasNavPane() -{ - if(gnHasNavPane==-1) - { - gnHasNavPane=0; - var oParam=new Object(); - oParam.bVisible=false; - var oMsg=new whMessage(WH_MSG_ISPANEVISIBLE,this,1,oParam); - if(SendMessage(oMsg)) - { - if(oParam.bVisible) - gnHasNavPane=1; - } - - } - if(gnHasNavPane==1) - return true; - else - return false; -} - -function getTocInfo() -{ - var oParam=new Object(); - oParam.oTocInfo=null; - var oMsg=new whMessage(WH_MSG_GETTOCPATHS,this,1,oParam); - if(SendMessage(oMsg)) - { - goTocInfo=oParam.oTocInfo; - gbTocInfoInited=true; - } -} - -function onBtnClick(e) -{ - var oEl=null; - var oElo=null; - if(gbNav6) - { - oElo=e.target; - while(oElo&&oElo.nodeName.indexOf("#")==0) oElo=getParentNode(oElo); - oEl=oElo; - } - else - { - oElo=event.srcElement; - oEl=oElo; - event.cancelBubble=true; - } - while(-1==oEl.className.indexOf("clsBtn")&&-1==oEl.className.indexOf("clsNoB")) - { - oEl=getParentNode(oEl); - if(!oEl) return; - } - if(oElo.tagName=="A"||oElo.tagName=="IMG") return true; - var oaA=getElementsByTag(oElo,"A"); - if(oaA&&oaA.length) - { - var oA=oaA[0]; - if(gbNav6) - { - var sCmd=oA.getAttribute("onclick"); - var nCmd=sCmd.indexOf("return false;"); - if(nCmd!=-1); - sCmd=sCmd.substring(0,nCmd); - setTimeout(sCmd,1); - } - else - oA.onclick(); - } -} - -function onBtnMouseDown(e,nBtn) -{ - var oEl=null; - if(gbNav6) - { - var oElo=e.target; - while(oElo&&oElo.nodeName.indexOf("#")==0) oElo=getParentNode(oElo); - oEl=oElo; - } - else - { - oEl=event.srcElement; - event.cancelBubble=true; - } - while(-1==oEl.className.indexOf("clsBtn")&&-1==oEl.className.indexOf("clsNoB")) - { - oEl=getParentNode(oEl); - if(!oEl) return; - } - var sPF=oEl.className.substring(0,6); - var oIs=getElementsByTag(oEl,"img"); - if(oIs.length>0&&gaObjBtns[nBtn]&&gaObjBtns[nBtn].aIs&&gaObjBtns[nBtn].aIs.length>2) - { - if(gaObjBtns[nBtn].aIs[2]) - oIs[0].src=gaObjBtns[nBtn].aIs[2]; - } - var sState=getState(oEl); - if(sState!="disable") - { - oEl.className=sPF+"Down"; - } -} - -function onBtnMouseUp(e,nBtn) -{ - var oEl=null; - if(gbNav6) - { - var oElo=e.target; - while(oElo&&oElo.nodeName.indexOf("#")==0) oElo=getParentNode(oElo); - oEl=oElo; - } - else - { - oEl=event.srcElement; - event.cancelBubble=true; - } - while(-1==oEl.className.indexOf("clsBtn")&&-1==oEl.className.indexOf("clsNoB")) - { - oEl=getParentNode(oEl); - if(!oEl) return; - } - var sPF=oEl.className.substring(0,6); - var sState=getState(oEl); - if(sState=="down"||sState=="disable") - { - var oIs=getElementsByTag(oEl,"img"); - if(oIs.length>0&&gaObjBtns[nBtn]&&gaObjBtns[nBtn].aIs&&gaObjBtns[nBtn].aIs.length>3) - { - if(gaObjBtns[nBtn].aIs[3]) - oIs[0].src=gaObjBtns[nBtn].aIs[3]; - } - } - else - { - var oIs=getElementsByTag(oEl,"img"); - if(oIs.length>0&&gaObjBtns[nBtn]&&gaObjBtns[nBtn].aIs&&gaObjBtns[nBtn].aIs.length>0) - { - if(gaObjBtns[nBtn].aIs[0]) - oIs[0].src=gaObjBtns[nBtn].aIs[0]; - } - } - if(goEl==oEl) - { - if(sState!="down"&&sState!="disable") - { - oEl.className=sPF+"Up"; - } - } -} - -function getState(oEl) -{ - var sState=""; - if(gbNav6||gbOpera) - sState=oEl.getAttribute("state"); - else - if(oEl.state) - sState=oEl.state; - return sState; -} - -function onBtnMouseOver(e,nBtn) -{ - markButton(e); - var oEl=null; - if(gbNav6) - { - var oElo=e.target; - while(oElo&&oElo.nodeName.indexOf("#")==0) oElo=getParentNode(oElo); - oEl=oElo; - } - else - { - oEl=event.srcElement; - event.cancelBubble=true; - } - while(-1==oEl.className.indexOf("clsBtn")&&-1==oEl.className.indexOf("clsNoB")) - { - oEl=getParentNode(oEl); - if(!oEl) return; - } - var sPF=oEl.className.substring(0,6); - var sState=getState(oEl); - if(sState=="down"||sState=="disable") - { - if(sState=="down") - oEl.className=sPF+"Down"; - var oIs=getElementsByTag(oEl,"img"); - if(oIs.length>0&&gaObjBtns[nBtn]&&gaObjBtns[nBtn].aIs&&gaObjBtns[nBtn].aIs.length>4) - { - if(gaObjBtns[nBtn].aIs[4]) - oIs[0].src=gaObjBtns[nBtn].aIs[4]; - } - } - else - { - oEl.className=sPF+"Up"; - var oIs=getElementsByTag(oEl,"img"); - if(oIs.length>0&&gaObjBtns[nBtn]&&gaObjBtns[nBtn].aIs&&gaObjBtns[nBtn].aIs.length>1) - { - if(gaObjBtns[nBtn].aIs[1]) - oIs[0].src=gaObjBtns[nBtn].aIs[1]; - } - } -} - -function onBtnMouseOut(e,nBtn) -{ - goEl=null; - var oEl=null; - if(gbNav6) - { - var oElo=e.target; - while(oElo&&oElo.nodeName.indexOf("#")==0) oElo=getParentNode(oElo); - oEl=oElo; - } - else - { - oEl=event.srcElement; - event.cancelBubble=true; - } - while(-1==oEl.className.indexOf("clsBtn")&&-1==oEl.className.indexOf("clsNoB")) - { - oEl=getParentNode(oEl); - if(!oEl) return; - } - var sPF=oEl.className.substring(0,6); - var sState=getState(oEl); - if(sState=="down"||sState=="disable") - { - var oIs=getElementsByTag(oEl,"img"); - if(oIs.length>0&&gaObjBtns[nBtn]&&gaObjBtns[nBtn].aIs&&gaObjBtns[nBtn].aIs.length>3) - { - if(gaObjBtns[nBtn].aIs[3]) - oIs[0].src=gaObjBtns[nBtn].aIs[3]; - } - if(sState=="down") - oEl.className=sPF+"Down"; - } - else - { - var oIs=getElementsByTag(oEl,"img"); - if(oIs.length>0&&gaObjBtns[nBtn]&&gaObjBtns[nBtn].aIs&&gaObjBtns[nBtn].aIs.length>0) - { - if(gaObjBtns[nBtn].aIs[0]) - oIs[0].src=gaObjBtns[nBtn].aIs[0]; - } - oEl.className=sPF+"Normal"; - } -} - -function showToc() -{ - var oMsg=new whMessage(WH_MSG_SHOWTOC,this,1,null) - SendMessage(oMsg); -} - -function showIndex() -{ - var oMsg=new whMessage(WH_MSG_SHOWIDX,this,1,null) - SendMessage(oMsg); -} - -function showFts() -{ - var oMsg=new whMessage(WH_MSG_SHOWFTS,this,1,null) - SendMessage(oMsg); -} - -function showGlossary() -{ - var oMsg=new whMessage(WH_MSG_SHOWGLO,this,1,null) - SendMessage(oMsg); -} - -function syncWithShow() -{ - if(!gbTocInfoInited) - { - getTocInfo(); - } - if(goTocInfo) - { - showToc(); - var oParam=goTocInfo; - var oMsg=new whMessage(WH_MSG_SYNCTOC,this,1,oParam); - SendMessage(oMsg); - } -} - -function markButton(e) -{ - var oEl=null; - if(gbNav6) - { - var oElo=e.target; - while(oElo&&oElo.nodeName.indexOf("#")==0) oElo=getParentNode(oElo); - oEl=oElo; - } - else - oEl=event.srcElement; - while(oEl&&oEl.tagName!="TD") oEl=getParentNode(oEl); - if(oEl) - goEl=oEl; -} - -function showHidePane() -{ - var oMsg=null; - if(hasNavPane()) - oMsg=new whMessage(WH_MSG_HIDEPANE,this,1,null); - else - oMsg=new whMessage(WH_MSG_SHOWPANE,this,1,null); - SendMessage(oMsg); -} - -function goAveNext() -{ - goAvenue(true); -} - -function goAvePrev() -{ - goAvenue(false); -} - -function doWebSearch() -{ - if (goWebSearchEnable) - { - var oMsg=new whMessage(WH_MSG_WEBSEARCH,this,1,null); - SendMessage(oMsg); - } -} - -function goAvenue(bNext) -{ - var oMsg=null; - initAveButtonObj(); - gsCurAveName=getCurrentAveName(); - if(gbNav4&&!gbNav6) - { - if(bNext) - { - gaAvenues=null; - updateAvenue(); - oMsg=new whMessage(WH_MSG_NEXT,this,1,null); - SendMessage(oMsg); - } - else if(!bNext) - { - gaAvenues=null; - updateAvenue(); - oMsg=new whMessage(WH_MSG_PREV,this,1,null); - SendMessage(oMsg); - } - } - else - { - if(bNext&&goNextParent) - { - var sState=getState(goNextParent); - if(sState!="disable") - { - gaAvenues=null; - gbNeedUpdateAve=true; - gbUpdateTimerCount++; - setTimeout("updateAvenueIfNeeded();", 2000); - oMsg=new whMessage(WH_MSG_NEXT,this,1,null); - SendMessage(oMsg); - } - } - else if(!bNext&&goPrevParent) - { - var sState=getState(goPrevParent); - if(sState!="disable") - { - gaAvenues=null; - gbNeedUpdateAve=true; - gbUpdateTimerCount++; - setTimeout("updateAvenueIfNeeded();", 2000); - oMsg=new whMessage(WH_MSG_PREV,this,1,null); - SendMessage(oMsg); - } - } - } -} - -function window_Unload() -{ - if(!gbNav4||gbNav6) - { - UnRegisterListener2(this,WH_MSG_GETSEARCHS); - UnRegisterListener2(this,WH_MSG_PANESTATUE); - UnRegisterListener2(this,WH_MSG_SYNCINFO); - UnRegisterListener2(this,WH_MSG_PANEINFO); - UnRegisterListener2(this,WH_MSG_AVENUEINFO); - UnRegisterListener2(this,WH_MSG_GETCURRENTAVENUE); - UnRegisterListener2(this,WH_MSG_ENABLEWEBSEARCH); - UnRegisterListener2(this,WH_MSG_INITSEARCHSTRING); - UnRegisterListener2(this,WH_MSG_NOSEARCHINPUT); - UnRegisterListener2(this,WH_MSG_NOSYNC); - } -} - -function window_OnLoad() -{ - if(!gbOpera7&&document.body) - { - if(gsBgImage&&gsBgImage.length>0) - { - document.body.background=gsBgImage; - } - if(gsBgColor&&gsBgColor.length>0) - { - document.body.bgColor=gsBgColor; - } - } - doCusOnLoad(); - var oMsg=new whMessage(WH_MSG_GETPANEINFO,this,1,null); - if(SendMessage(oMsg)) - { - setTimeout("flipPaneButton(\""+oMsg.oParam+"\");",1); - } - if (!gaAvenues) - { - var oMsg2=new whMessage(WH_MSG_GETAVIAVENUES,this,1,new Object()); - if(SendMessage(oMsg2)) - { - gaAvenues=oMsg2.oParam.aAvenues; - gbNeedUpdateAve=false; - setTimeout("updateAvenue();",1); - } - } -} - -function onSendMessage(oMsg) -{ - var nMsgId=oMsg.nMessageId; - if(nMsgId==WH_MSG_GETSEARCHS) - { - if(document.searchForm&&document.searchForm.searchString) - { - oMsg.oParam.sValue=document.searchForm.searchString.value; - return false; - } - } - else if(nMsgId==WH_MSG_PANESTATUE) - { - if(oMsg.oParam=="visible") - { - if(isShowHideEnable()) - setTimeout("flipShowHide(true);",1); - setTimeout("showPaneButton();",1); - } - else - { - if(isShowHideEnable()) - setTimeout("flipShowHide(false);",1); - setTimeout("hidePaneButton();",1); - } - } - else if(nMsgId==WH_MSG_PANEINFO) - { - if(oMsg.oParam) - setTimeout("flipPaneButton(\""+oMsg.oParam+"\");",1); - else - setTimeout("hidePaneButton();",1); - } - else if(nMsgId==WH_MSG_SYNCINFO) - { - if(oMsg.oParam) - goTocInfo=oMsg.oParam; - else - goTocInfo=null; - gbTocInfoInited=true; - } - else if(nMsgId==WH_MSG_AVENUEINFO) - { - gaAvenues=oMsg.oParam; - gbNeedUpdateAve=false; - setTimeout("updateAvenue();",1); - } - else if(nMsgId==WH_MSG_GETCURRENTAVENUE) - { - var sAveName=getCurrentAvenue(); - if(sAveName!="") - { - oMsg.oParam.sAvenue=sAveName; - return false; - } - else - return true; - } - else if(nMsgId==WH_MSG_ENABLEWEBSEARCH) - { - setTimeout("updateWebSearch("+oMsg.oParam+");",1); - } - else if(nMsgId==WH_MSG_INITSEARCHSTRING) - { - if(gstrSearch!="") - { - oMsg.oParam=gstrSearch; - gstrSearch=""; - return false; - } - } - else if(nMsgId==WH_MSG_NOSEARCHINPUT) - { - var oSearchInput = getElement("searchInput"); - if (oSearchInput) - { - oSearchInput.style.visibility = "hidden"; - return false; - } - } - else if(nMsgId==WH_MSG_NOSYNC) - { - var oSync = getElement("btnsynctoc"); - if (oSync) - { - oSync.style.visibility = "hidden"; - return false; - } - } - return true; -} - -function getCurrentAvenue() -{ - var strAveName=""; - var oSelect=getElement("avenue"); - if(oSelect) - { - strAveName=oSelect.value; - } - return strAveName; -} - -function initBtn() -{ - var oBtn=null; - oBtn=getElement("btntoc"); - if(oBtn) - gaBtns[gaBtns.length]=oBtn; - oBtn=getElement("btnidx"); - if(oBtn) - gaBtns[gaBtns.length]=oBtn; - oBtn=getElement("btnfts"); - if(oBtn) - gaBtns[gaBtns.length]=oBtn; - oBtn=getElement("btnglo"); - if(oBtn) - gaBtns[gaBtns.length]=oBtn; - gbInitBtn=true; -} - -function showPaneButton() -{ - flipPaneButton(gsPane); -} - -function hidePaneButton() -{ - flipPaneButton(""); -} - -function flipPaneButton(sPane) -{ - if (sPane) - gsPane=sPane; - if(!gbInitBtn) - initBtn(); - - var oUp=null; - if(sPane) - { - oUp=getElement("btn"+sPane); - } - for(var i=0;i0) - { - var strClassName=oaA[0].className; - oaA[0].className="btnsel"+strClassName.substring(3); - } - } - var oIs=getElementsByTag(oEl,"img"); - var oBtn=getButtonObjByType(gaBtns[i].id.substring(3)); - if(oIs.length>0&&oBtn&&oBtn.aIs&&oBtn.aIs.length>3) - { - if(oBtn.aIs[3]) - oIs[0].src=oBtn.aIs[3]; - } - } - } - else - { - var oEl=getParentNode(gaBtns[i]); - var sState=getState(oEl); - var sPF=oEl.className.substring(0,6); - if(sState=="down") - { - setState(oEl,"up"); - if(oEl==goEl) - oEl.className=sPF+"Up"; - else - oEl.className=sPF+"Normal"; - - if(sPF=="clsBtn") - { - if(gaBtns[i].id) - { - var sColor=getBtnColor(gaBtns[i].id.substring(3),false); - if(sColor) - { - oEl.style.backgroundColor=sColor - } - else - { - oEl.style.backgroundColor=""; - } - } - - var oaA=getElementsByTag(oEl,"A"); - if(oaA.length>0) - { - var strClassName=oaA[0].className; - oaA[0].className="btn"+strClassName.substring(6); - } - } - var oIs=getElementsByTag(oEl,"img"); - var oBtn=getButtonObjByType(gaBtns[i].id.substring(3)); - if(oIs.length>0&&oBtn&&oBtn.aIs&&oBtn.aIs.length>0) - { - if(oBtn.aIs[0]) - oIs[0].src=oBtn.aIs[0]; - } - } - } - } - } -} - -function flipShowHide(bShow) -{ - gnHasNavPane=-1; - var oA=getElement("btnshowhide"); - if(oA) - { - var oEl=getParentNode(oA); - var sPF=oEl.className.substring(0,6); - if(oEl&&oEl.state) - { - if(bShow) - { - oEl.state="down"; - oEl.className=sPF+"Down"; - } - else - { - oEl.state="up"; - - if(oEl==goEl) - oEl.className=sPF+"Up"; - else - oEl.className=sPF+"Normal"; - } - } - oA.innerHTML=getShowHide(); - } -} - -function cusOnClick(nIdx) -{ - if(goCusButton.length>nIdx) - { - var sOnClick=goCusButton[nIdx].sOnClick; - if(sOnClick&&sOnClick.length>0) - { - if(!gbPreview) - eval(sOnClick); - return false; - } - } - return true; -} - -function cusOnMouseOver(nIdx) -{ - if(goCusButton.length>nIdx) - { - var sOnMouseOver=goCusButton[nIdx].sOnMouseOver; - if(sOnMouseOver&&sOnMouseOver.length>0) - { - if(!gbPreview) - eval(sOnMouseOver); - return false; - } - } - return true; -} - -function doCusOnLoad() -{ - if(!gbPreview&&gaOrders) - { - for(var i=0;ii+7) - { - if (cusButton.arguments[7+i]) - this.aIs[i]=_getFullPath(_getPath(document.location.href),cusButton.arguments[7+i]); - else - this.aIs[i]=""; - i++; - } - if(sOnLoad) - { - registerOnLoad(sOnLoad,sType); - } -} - -function getBtnColor(sType,bSel) -{ - var aBtnColors=null; - if(bSel) - aBtnColors=gaSelBtnBgColor; - else - aBtnColors=gaBtnBgColor; - if(aBtnColors) - { - for(var i=0;i - @@ -60,6 +59,7 @@ + diff --git a/doc/salome/gui/SMESH/whxdata/whfwdata0.xml b/doc/salome/gui/SMESH/whxdata/whfwdata0.xml index 3c93e1fa3..3f0829377 100755 --- a/doc/salome/gui/SMESH/whxdata/whfwdata0.xml +++ b/doc/salome/gui/SMESH/whxdata/whfwdata0.xml @@ -1,11 +1,11 @@ - 13,18,5,6,24,7,57,60,63,43,66,68, + 13,18,5,6,24,7,56,60,63,42,66,68, 66, 13, - 16,1,17,18,19,2,20,22,6,25,7,26,27,28,29,10,11,57,30,32,35,36,60,61,63,39,40,64,43,44,45,47,66,49,50,51,68,69,54, - 6,7,57,60,66,68, - 6,7,57,60,63,66, + 16,1,17,18,19,2,20,22,6,25,7,26,27,28,29,10,11,56,30,31,34,35,60,61,63,38,39,64,42,43,44,46,66,48,49,50,68,69,53, + 6,7,56,60,66,68, + 6,7,56,60,63,66, 66, 60, 66, @@ -23,10 +23,10 @@ 60,63, 60, 60, - 12,13,14,15,18,22,7,10,11,31,33,37,63,64, + 12,13,14,15,18,22,7,10,11,59,36,63,64, 60,63, - 16,1,17,19,2,20,22,6,25,7,26,27,28,29,10,11,30,32,36,60,61,63,39,40,64,43,44,45,47,66,49,50,51,68,69,54, - 6,7,57,60,63,66,68, + 16,1,17,19,2,20,22,6,25,7,26,27,28,29,10,11,30,31,35,60,61,63,38,39,64,42,43,44,46,66,48,49,50,68,69,53, + 6,7,56,60,63,66,68, 6,7,60, 60,66, 60,66, @@ -78,9 +78,9 @@ 60, 66, 60, - 12,13,14,15,17,19,4,22,6,7,10,11,31,33,32,36,60,61,63,64,43,66,54, - 13,17,19,20,22,6,25,26,27,10,11,57,30,60,61,63,39,40,64,43,44,45,66,49,50,68,54, - 7,57,60,63,66, + 12,13,14,15,17,19,4,22,6,7,10,11,32,31,59,35,60,61,63,64,42,66,53, + 13,17,19,20,22,6,25,26,27,10,11,56,30,60,61,63,38,39,64,42,43,44,66,48,49,68,53, + 7,56,60,63,66, 6,7, 60, 60, @@ -89,11 +89,11 @@ 60, 60,66, 60, - 12,13,14,15,0,16,1,19,2,20,22,24,25,7,8,26,27,28,10,11,31,34,63,39,40,64,43,45,49,50,69,53, + 12,13,14,15,0,16,1,19,2,20,22,24,25,7,8,26,27,28,10,11,59,33,63,38,39,64,42,44,48,49,69,52, 63, 13, 60, - 13,17,19,22,6,25,7,27,11,30,60,61,63,43,44,47,66,54, + 13,17,19,22,6,25,7,27,11,30,60,61,63,42,43,46,66,53, 60, 60, 60, @@ -107,19 +107,19 @@ 60, 66, 13, - 2,6,7,57,60,66,68, - 57,60, + 2,6,7,56,60,66,68, + 56,60, 60, 60, 66, - 6,7,57,60,63, + 6,7,56,60,63, 7,63,66, 60, 66, 66, 60, 60, - 57,60,66, + 56,60,66, 6,7, 60, 60, @@ -139,326 +139,326 @@ 24, 60, 60, - 16,1,53, + 16,1,52, 63, 63, - 11,60,45, + 11,60,44, 63, - 51, + 50, 67, 18, - 0,65,53, - 15,17,18,19,2,32,36,61,44,45,47,69,54, + 0,65,52, + 15,17,18,19,2,31,35,61,43,44,46,69,53, 12,61, 63,66, 66, - 37, - 16,1,20,24,25,57,60,49,51, - 16,1,20,22,6,24,25,7,29,11,57,60,63,65,49, + 36, + 16,1,20,24,25,56,60,48,50, + 16,1,20,22,6,24,25,7,29,11,56,60,63,65,48, 60, 60, - 6,7,57,60,63,68, - 25,31,60, - 12,13,22,7,37,61,42,65,45, + 6,7,56,60,63,68, + 25,59,60, + 12,13,22,7,36,61,41,65,44, 60, - 57, + 56, 60, 60, - 6,7,57,60,63,66,68, - 6,7,57,60,68, + 6,7,56,60,63,66,68, + 6,7,56,60,68, 60, - 27,36,37,39,43,49, - 45, - 37, - 0,52, - 57,63, - 57,60,63, - 57,60,63, - 57, - 57, - 57,63, - 57, - 57, - 57, - 57, - 57, - 57, + 27,35,36,38,42,48, + 44, + 36, + 0,51, + 56,63, + 56,60,63, + 56,60,63, + 56, + 56, + 56,63, + 56, + 56, + 56, + 56, + 56, + 56, 63, - 57, + 56, 63, - 57, - 57, + 56, + 56, 18, 60, 6,7,60,66, 6,63,68, 6,63,68, - 12,13,14,15,0,17,22,6,23,7,11,57,31,33,34,61,38,43,66, - 12,0,1,18,20,23,24,25,30,31,33,59,35,37,61,41,43,45,46,48,49,51,53, - 10,11,60,61,45,53, + 12,13,14,15,0,17,22,6,23,7,11,56,32,59,33,61,37,42,66, + 12,0,1,18,20,23,24,25,30,32,58,34,59,36,61,40,42,44,45,47,48,50,52, + 10,11,60,61,44,52, 22, 0,1, - 45, + 44, 60,66, 3, 18, 60,63,66, - 15,5,25,11,31,36,60,63,64,41,44,49,54, + 15,5,25,11,59,35,60,63,64,40,43,48,53, 66, 60, 11, 11, - 57,63, + 56,63, 60, 60, 60, 60, - 60,37, - 13,1,22,24,27,11,57,61,45, - 14,16,1,17,19,2,20,5,22,24,25,7,8,26,27,29,10,11,31,32,59,36,60,61,38,39,40,64,43,44,45,46,47,49,50,51,69,54, + 60,36, + 13,1,22,24,27,11,56,61,44, + 14,16,1,17,19,2,20,5,22,24,25,7,8,26,27,29,10,11,31,58,59,35,60,61,37,38,39,64,42,43,44,45,46,48,49,50,69,53, 22, - 0,16,1,20,22,23,25,26,27,29,10,11,35,61,39,40,64,41,46,48,49,50,51, + 0,16,1,20,22,23,25,26,27,29,10,11,34,61,38,39,64,40,45,47,48,49,50, 60,63, - 17,18,19,2,22,23,33,32,36,34,37,38,65,44,45,47,69,54, + 17,18,19,2,22,23,32,31,35,33,36,37,65,43,44,46,69,53, 19,65, 15,61, 12,0,22,23,24, 60, 22, 18, - 57,63, + 56,63, 7,60,66, - 54, - 12,15,17,7,57,31,33,34,63,45,47,53, - 12,18,6,7,31,66, + 53, + 12,15,17,7,56,32,59,33,63,44,46,52, + 12,18,6,7,59,66, 6,7,66,68, 5,11,64, 66, - 57, - 57, - 15,19,2,31,63,45, - 18,22,24,7,38,54, - 16,28,39, + 56, + 56, + 15,19,2,59,63,44, + 18,22,24,7,37,53, + 16,28,38, 24, 5, - 12,18,22,31,61, - 0,18,20,22,25,27,49, - 43,53, - 12,18,7,31,33,61,54, - 53, - 10,64,41,46,53,54, + 12,18,22,59,61, + 0,18,20,22,25,27,48, + 42,52, + 12,18,7,32,59,61,53, + 52, + 10,64,40,45,52,53, 60,66, 60,66, 0, 15, - 12,17,7,11,31,54, + 12,17,7,11,59,53, 13,22,23, 12,0, 61, 65,66, - 18,43, - 3,4,24,55,56,43,51, + 18,42, + 3,4,24,54,55,42,50, 60, - 43, + 42, 19, 65, - 54, - 54, + 53, + 53, 65, 0, 6,7, 3, - 0,53, + 0,52, 18, - 51, - 43,66, - 15,3,4,55,56,31,63,43,66, - 0,11,45,51, - 60,42, + 50, + 42,66, + 15,3,4,54,55,59,63,42,66, + 0,11,44,50, + 60,41, 13,61, 61, - 12,24,61,43,45, - 14,16,1,18,20,22,6,23,25,7,26,27,29,10,11,57,30,59,35,61,63,39,40,64,41,42,65,43,45,46,66,48,49,50,51,52,68, + 12,24,61,42,44, + 14,16,1,18,20,22,6,23,25,7,26,27,29,10,11,56,30,58,34,61,63,38,39,64,40,41,65,42,44,45,66,47,48,49,50,51,68, 60, 6,7, 66, 66, - 1,37, + 1,36, 24, - 0,16,1,21,22,23,24,8,29,62,39,40,65,52, - 7,10,33,60,37,61,64, - 19,23,61,45, - 16,1,17,19,2,20,5,22,23,24,25,8,26,27,29,10,11,30,32,36,61,38,39,40,64,41,65,43,44,45,46,47,48,49,50,51,52,69,53,54, + 0,16,1,21,22,23,24,8,29,62,38,39,65,51, + 7,10,32,60,36,61,64, + 19,23,61,44, + 16,1,17,19,2,20,5,22,23,24,25,8,26,27,29,10,11,30,31,35,61,37,38,39,64,40,65,42,43,44,45,46,47,48,49,50,51,69,52,53, 13, 61, - 15,19,2,33,47, - 12,17,32,36, - 39, - 16,22,6,7,27,60,61,66,52, - 24,39,50, - 11,45,53, - 45, - 45, + 15,19,2,32,46, + 12,17,31,35, + 38, + 16,22,6,7,27,60,61,66,51, + 24,38,49, + 11,44,52, + 44, + 44, 60, 24,61, - 0,18,20,6,27,60,37,38,68, + 0,18,20,6,27,60,36,37,68, 15, 13, - 24,43,53, - 16,65,48, + 24,42,52, + 16,65,47, 12,22,61, - 16,1,17,19,2,20,21,24,25,8,26,27,9,28,10,11,30,32,35,36,61,39,40,64,41,42,65,43,44,46,47,48,49,50,69,54, - 19,25,33,34,49, + 16,1,17,19,2,20,21,24,25,8,26,27,9,28,10,11,30,31,34,35,61,38,39,64,40,41,65,42,43,45,46,47,48,49,69,53, + 19,25,32,33,48, 11,60,66, 60,66, 65, - 0,16,1,17,19,2,20,5,21,22,23,24,25,8,26,27,28,29,10,11,30,32,36,61,62,38,39,40,64,42,65,43,44,45,47,49,50,51,52,69,53,54, + 0,16,1,17,19,2,20,5,21,22,23,24,25,8,26,27,28,29,10,11,30,31,35,61,62,37,38,39,64,41,65,42,43,44,46,48,49,50,51,69,52,53, 0,5, - 13,19,8,43, - 60,43, + 13,19,8,42, + 60,42, 18, - 59, - 59,35, - 15,0,17,19,2,24,32,36,44,47,69,53,54, - 9,32,62,65, - 26,65,50, - 18,43, - 59, + 58, + 58,34, + 15,0,17,19,2,24,31,35,43,46,69,52,53, + 9,31,62,65, + 26,65,49, + 18,42, + 58, 1, - 31,42, - 12,13,14,15,0,18,2,28,33,34,44, + 59,41, + 12,13,14,15,0,18,2,28,32,33,43, 6,7, - 0,18,22,6,7,57,60,61,63,43,66,68, - 22,23,7,57,60, - 37, + 0,18,22,6,7,56,60,61,63,42,66,68, + 22,23,7,56,60, + 36, 12,24, - 20,25,29,39,45,49,51, + 20,25,29,38,44,48,50, 24, - 12,37,43,66, + 12,36,42,66, 19, - 18,25,45, - 13,15,3,4,31,63, + 18,25,44, + 13,15,3,4,59,63, 61, 19,22, - 13,19,2,43, - 15,1,17,18,19,3,4,21,22,23,24,55,56,57,33,32,36,34,47, - 52, + 13,19,2,42, + 15,1,17,18,19,3,4,21,22,23,24,54,55,56,32,31,35,33,46, + 51, 18, - 18,21,22,6,23,38, + 18,21,22,6,23,37, 18,22,6,23, - 13,14,20,22,23,24,25,30,33,61,45,49, - 8,53, - 45, - 13,43, - 49, - 15,0,17,19,2,3,4,25,55,56,31,58,32,36,63,44,47,49,69,54, - 45, + 13,14,20,22,23,24,25,30,32,61,44,48, + 8,52, + 44, + 13,42, + 48, + 15,0,17,19,2,3,4,25,54,55,57,31,59,35,63,43,46,48,69,53, + 44, 18, - 13,16,27,61,53, - 41,65,46,66,48, - 1,54, - 25,45,54, - 13,15,30,60,61,63,65,43,48, + 13,16,27,61,52, + 40,65,45,66,47, + 1,53, + 25,44,53, + 13,15,30,60,61,63,65,42,47, 60, 13,16, - 43, + 42, 61, 22, - 13,14,0,16,1,18,5,22,6,23,24,7,29,57,31,35,60,37,61,63,38,41,65,46,66,48,51,54, + 13,14,0,16,1,18,5,22,6,23,24,7,29,56,34,59,60,36,61,63,37,40,65,45,66,47,50,53, 7, - 57,63, + 56,63, 63, 63, - 57,63, - 57,63, - 57,60,63, + 56,63, + 56,63, + 56,60,63, 63, 63, - 57,60,63, - 57, - 6,7,57,60,63,68, + 56,60,63, + 56, + 6,7,56,60,63,68, 63, 63, - 57,63, - 6,7,57,60,63,68, + 56,63, + 6,7,56,60,63,68, 60,63, - 57,63, + 56,63, 63, 63, 63, 63, 63, 63, - 13,37,61,38,51, - 31,65, - 17,19,2,24,25,57,58,32,36,63,65,44,47,49,69,54, - 0,5,54, + 13,36,61,37,50, + 59,65, + 17,19,2,24,25,56,57,31,35,63,65,43,46,48,69,53, + 0,5,53, 14, - 20,22,25,38,65,43,49, + 20,22,25,37,65,42,48, 13,18,11, 18,11, - 18,6,25,7,57,60,66,51, - 57, + 18,6,25,7,56,60,66,50, + 56, 60, 18, 13, 60, - 0,22,11,62,65,67,53, - 13,14,1,18,19,5,22,6,23,24,7,11,60,37,61,43,66,53, - 13,15,18,20,21,24,25,31,38,39,49, - 0,18,33,34, - 12,18,7,31, + 0,22,11,62,65,67,52, + 13,14,1,18,19,5,22,6,23,24,7,11,60,36,61,42,66,52, + 13,15,18,20,21,24,25,59,37,38,48, + 0,18,32,33, + 12,18,7,59, 7, - 53, + 52, 19,5, - 8,56,60,39,65, + 8,55,60,38,65, 60, - 39,50, + 38,49, 18, - 12,13,22,33,34, + 12,13,22,32,33, 13,61, 61, - 35, - 42, - 13,15,31, + 34, + 41, + 13,15,59, 12,0, - 35, + 34, 60, - 25,26,60,47, - 14,16,1,18,20,22,23,25,26,27,29,10,11,30,59,35,61,39,40,64,41,43,45,46,48,49,50,51, + 25,26,60,46, + 14,16,1,18,20,22,23,25,26,27,29,10,11,30,58,34,61,38,39,64,40,42,44,45,47,48,49,50, 19, 1, 18, - 11,43, - 12,16,24,38,65,43, - 13,2,22,10,64,52, - 13,43,45, - 61,54, + 11,42, + 12,16,24,37,65,42, + 13,2,22,10,64,51, + 13,42,44, + 61,53, 60,66, 6,7, 10,64, 13,14, 27, - 15,0,1,17,19,2,3,20,22,23,24,25,7,27,9,28,55,32,36,62,44,45,47,49,52,69,53,54, - 18,5,61,53,54, + 15,0,1,17,19,2,3,20,22,23,24,25,7,27,9,28,54,31,35,62,43,44,46,48,51,69,52,53, + 18,5,61,52,53, 24, - 45, + 44, 18, 18, 16, 61, - 13,22,37,53, + 13,22,36,52, 1, - 53, + 52, 60, - 53, - 53, - 0,53, + 52, + 52, + 0,52, 60, 60, - 19,22,23,25,61,43,49, + 19,22,23,25,61,42,48, 21, - 12,13,14,15,0,16,1,18,19,3,4,21,22,6,24,25,7,26,27,9,11,55,56,57,31,58,33,32,60,37,61,63,65,43,45,66,49,50,68,54, + 12,13,14,15,0,16,1,18,19,3,4,21,22,6,24,25,7,26,27,9,11,54,55,56,57,32,31,59,60,36,61,63,65,42,44,66,48,49,68,53, 66, 6,7, 6,7, @@ -472,39 +472,39 @@ 6,7, 6,7, 6,7, - 6,8,29,57,35,38, - 49, - 61,43, - 12,13,14,15,0,16,1,17,18,19,2,4,20,21,24,25,7,8,26,27,28,29,10,11,56,57,31,33,32,59,36,60,34,37,61,63,39,40,64,41,65,43,44,45,46,47,66,48,49,51,52,69,54, - 7,57,60,61, + 6,8,29,56,34,37, + 48, + 61,42, + 12,13,14,15,0,16,1,17,18,19,2,4,20,21,24,25,7,8,26,27,28,29,10,11,55,56,32,31,58,59,35,60,33,36,61,63,38,39,64,40,65,42,43,44,45,46,66,47,48,50,51,69,53, + 7,56,60,61, 65, 23, 61, - 12,18,7,31,37,65,43,48, - 43, - 24,26,27,30,50, + 12,18,7,59,36,65,42,47, + 42, + 24,26,27,30,49, 13,14, 13,0,9,65, - 18,33,61,65,43,45, + 18,32,61,65,42,44, 18, 19, 0, - 15,2,25,49, - 22,33, + 15,2,25,48, + 22,32, 61, - 54, + 53, 22, - 13,2,22,24,61,51, + 13,2,22,24,61,50, 18, - 45, - 43,53, - 12,20,24,25,29,61,65,49, + 44, + 42,52, + 12,20,24,25,29,61,65,48, 22, 18, - 0,6,30,31,53, + 0,6,30,59,52, 30, 6, - 53,54, + 52,53, 18, 5, 10,11,60,64, @@ -512,7 +512,7 @@ 60,66, 60, 18,7, - 12,13,14,0,16,18,2,3,21,22,6,23,24,7,9,55,57,31,33,60,37,61,63,65,43,66,52,68,54, + 12,13,14,0,16,18,2,3,21,22,6,23,24,7,9,54,56,32,59,60,36,61,63,65,42,66,51,68,53, 60, 60, 7,60,66, @@ -527,58 +527,58 @@ 6,7, 6,7, 18,25, - 6,7,57,60,63,68, + 6,7,56,60,63,68, 60, - 43, + 42, 11, - 45, + 44, 24, - 16,1,20,24,26,27,40,65,43,45,49,50, - 43, + 16,1,20,24,26,27,39,65,42,44,48,49, + 42, 30,61,65, - 63,40,43, - 20,24,25,65,49, + 63,39,42, + 20,24,25,65,48, 24,65, 18, - 30,61,43, + 30,61,42, 66, - 6,7,57,60,63,68, + 6,7,56,60,63,68, 18, - 1,18,22,57,60,37,61,43, - 53, + 1,18,22,56,60,36,61,42, + 52, 60, - 13,6,7,45,66, + 13,6,7,44,66, 61, 22,23, - 12,13,14,16,1,2,20,22,23,24,25,26,27,28,29,10,11,35,61,39,40,64,41,43,45,46,48,49,50,51,52, - 53, - 1,26,29,61,43, - 0,30,31,53, + 12,13,14,16,1,2,20,22,23,24,25,26,27,28,29,10,11,34,61,38,39,64,40,42,44,45,47,48,49,50,51, + 52, + 1,26,29,61,42, + 0,30,59,52, 18,19,2, - 13,19,54, + 13,19,53, 60, - 53, - 13,15,55,56,31,63,43,45,66, + 52, + 13,15,54,55,59,63,42,44,66, 13, - 53, - 22,30,59,35,43,53, + 52, + 22,30,58,34,42,52, 18, 23, - 53, - 12,13,15,18,22,31,37,61, + 52, + 12,13,15,18,22,59,36,61, 10,61,64, - 13,7,31,60, + 13,7,59,60, 13,15,7, - 12,13,14,18,22,23,24,31,33,34,61,38,41,45,46,48,52, - 23,24,57,60,45, - 6,7,57,60,63,66,68, - 0,5,22,7,11,61,52, + 12,13,14,18,22,23,24,32,59,33,61,37,40,44,45,47,51, + 23,24,56,60,44, + 6,7,56,60,63,66,68, + 0,5,22,7,11,61,51, 60, 63, - 57,63, + 56,63, 60, 6, - 57, + 56, 6,7, 6,7, 60,66, @@ -587,33 +587,33 @@ 6,7, 60, 7, - 65,52, - 18,33,43, - 53, + 65,51, + 18,32,42, + 52, 60, - 45, + 44, 61, - 53, + 52, 0, - 18,53, + 18,52, 19,2, 24, - 20,21,24,25,8,29,11,57,31,35,60,63,65,45,48,49,51,52, - 51, - 51, - 51, - 51, - 51, + 20,21,24,25,8,29,11,56,34,59,60,63,65,44,47,48,50,51, + 50, + 50, + 50, + 50, + 50, 60, 60, 66, 60, - 54, - 19,54, + 53, + 19,53, 5, - 19,33,37,61, + 19,32,36,61, 60, - 54, + 53, 11, 15, 61, @@ -625,71 +625,71 @@ 14,6,7, 22, 6,7, - 13,14,16,2,7,60,34,68, + 13,14,16,2,7,60,33,68, 60, - 0,53, + 0,52, 13, - 3,4,20,24,25,55,56,49, + 3,4,20,24,25,54,55,48, 19, - 56, + 55, 61, - 11,38, + 11,37, 23, 6,63,68, 6,63,68, 6,68, 6,68, 6,7, - 6,7,57, - 12,0,18,22,23,7,57,31,33,37,38, - 12,18,22,6,7,57,33,34,37,38,66,68, + 6,7,56, + 12,0,18,22,23,7,56,32,59,36,37, + 12,18,22,6,7,56,32,33,36,37,66,68, 6,7, - 19,22,25,57,60,61,63,43,49, - 29,39,42, - 0,18,20,24,25,26,27,28,10,11,64,43,45,49,50, + 19,22,25,56,60,61,63,42,48, + 29,38,41, + 0,18,20,24,25,26,27,28,10,11,64,42,44,48,49, 7, 60,66, 7, 7,60,66, - 6,7,57,63,68, + 6,7,56,63,68, 66, 11, 6,68, - 57, + 56, 6,63,66,68, - 13,16,5,22,6,23,7,10,11,57,33,60,37,61,38,39,64,65,43,45,49,53, + 13,16,5,22,6,23,7,10,11,56,32,60,36,61,37,38,64,65,42,44,48,52, 60, - 0,11,53, + 0,11,52, 13, - 6,7,57,30,31,60,63,66,68, + 6,7,56,30,59,60,63,66,68, 30, 6,7,63, - 13,52, + 13,51, 6,7,66, 24,61, 61, - 54, - 0,52,68, - 13,0,29,52,68, + 53, + 0,51,68, + 13,0,29,51,68, 6,7,63, 60, - 11,65,46,51, - 6,7,57, + 11,65,45,50, + 6,7,56, 1,18, 19, - 65,43, - 37,61, + 65,42, + 36,61, 8, 24, - 43, + 42, 13, - 43, + 42, 61, - 61,51, - 57, - 57,61,51, - 12,24,37, - 31, + 61,50, + 56, + 56,61,50, + 12,24,36, + 59, 13,26,60, 60, 26,60, @@ -697,63 +697,63 @@ 60, 61, 61, - 53, + 52, 7,60,66, - 16,1,20,21,25,26,27,29,10,11,30,35,61,40,64,41,43,45,46,48,49,50,51, - 11,45, - 45, - 44, - 0,53, - 0,53, - 1,61,39, + 16,1,20,21,25,26,27,29,10,11,30,34,61,39,64,40,42,44,45,47,48,49,50, + 11,44, + 44, + 43, + 0,52, + 0,52, + 1,61,38, 18,19, - 11,45,46, + 11,44,45, 61, 25, 61, 60, - 54, - 53, - 45, - 1,18,37,43, + 53, + 52, + 44, + 1,18,36,42, 60, 10,61,64, - 6,7,57,60,63,68, - 52, - 61,45, + 6,7,56,60,63,68, + 51, + 61,44, 22,8, - 0,11,61,53, + 0,11,61,52, 63, - 57,63, - 12,15,18,19,6,7,31,58,33,32,63,43,66,53,54, + 56,63, + 12,15,18,19,6,7,57,32,31,59,63,42,66,52,53, 7,60,66, - 65,43,45, + 65,42,44, 11, 12,16, 7, 24,65, - 6,7,57,60,63,68, - 16,2,28,43, - 61,43,45, - 13,1,18,10,37,61,64,44, - 43, - 0,16,20,24,25,8,11,65,49, + 6,7,56,60,63,68, + 16,2,28,42, + 61,42,44, + 13,1,18,10,36,61,64,43, + 42, + 0,16,20,24,25,8,11,65,48, 18, - 53, + 52, 61,65, 60, - 6,23,7,31,37,66, + 6,23,7,59,36,66, 7, - 61,43, - 18,27,30,45, - 25,45,53, + 61,42, + 18,27,30,44, + 25,44,52, 19, 28,61,65, 13,18, 61, - 20,25,8,11,37,61,65,49,51, + 20,25,8,11,36,61,65,48,50, 7,60,66, - 6,7,57,63,66,68, + 6,7,56,63,66,68, 60, 60,66, 6,7,63,66, @@ -770,11 +770,11 @@ 7,60,66, 12,16, 24,61, - 33,60,61, - 53, + 32,60,61, + 52, 11, 60,66, - 12,7,31,33,34,45, + 12,7,32,59,33,44, 60, 6,7,60,63,68, 6, @@ -782,18 +782,18 @@ 6,7, 6, 7, - 18,7,33,34,44,45,52, + 18,7,32,33,43,44,51, 13, 13, - 54, - 25,49, + 53, + 25,48, 6,7,63,68, 6,7, - 16,1,18,20,5,21,22,23,24,25,8,26,27,28,29,10,11,30,35,37,61,39,40,64,41,42,65,43,45,46,48,49,50,51,52, - 59,35,43,66, + 16,1,18,20,5,21,22,23,24,25,8,26,27,28,29,10,11,30,34,36,61,38,39,64,40,41,65,42,44,45,47,48,49,50,51, + 58,34,42,66, 66, 66, - 12,13,14,15,0,16,1,17,18,19,2,3,4,20,5,21,22,6,23,24,25,7,8,26,27,28,29,10,11,55,56,57,30,31,33,32,59,35,36,60,34,37,61,62,63,38,39,40,64,41,42,65,43,44,45,46,47,66,48,49,50,51,52,68,69,53,54, + 12,13,14,15,0,16,1,17,18,19,2,3,4,20,5,21,22,6,23,24,25,7,8,26,27,28,29,10,11,54,55,56,30,32,31,58,34,59,35,60,33,36,61,62,63,37,38,39,64,40,41,65,42,43,44,45,46,66,47,48,49,50,51,68,69,52,53, 22,60, 60, 63, @@ -801,30 +801,30 @@ 6,7, 60, 6, - 60,45, - 1,37, - 15,18,25,31,36,63,43,49, + 60,44, + 1,36, + 15,18,25,59,35,63,42,48, 66, 66, 0,18,62, - 13,31, - 13,16,1,20,25,26,27,29,10,11,31,35,61,39,40,64,41,43,45,46,48,49,50, - 20,25,29,60,49, - 13,14,1,18,24,31,60,42,53, - 0,24,53, + 13,59, + 13,16,1,20,25,26,27,29,10,11,34,59,61,38,39,64,40,42,44,45,47,48,49, + 20,25,29,60,48, + 13,14,1,18,24,59,60,41,52, + 0,24,52, 27,60, 60, - 15,3,4,31,63, + 15,3,4,59,63, 63, - 22,11,61,65,43, + 22,11,61,65,42, 63, 63, 63, 6,60,63,68, 6,7,63, - 61,43, - 22,6,23,24,29,57,30,65,51,68,53, - 57,63, + 61,42, + 22,6,23,24,29,56,30,65,50,68,52, + 56,63, 60, 60, 66,68, @@ -842,69 +842,69 @@ 22, 16, 18, - 26,50, + 26,49, 14, 7, 7, 7, - 0,5,22,23,24,27,61,38,65,51, + 0,5,22,23,24,27,61,37,65,50, 18,61, - 13,0,16,1,17,18,19,20,21,24,27,28,10,31,33,35,60,61,62,63,39,40,64,65,43,44,45,47,66,52,68,54, - 61,45, + 13,0,16,1,17,18,19,20,21,24,27,28,10,32,34,59,60,61,62,63,38,39,64,65,42,43,44,46,66,51,68,53, + 61,44, 60, 60, 22, - 46,54, + 45,53, 19, 16,19,22,24,8, 24, 13, 5,22,11,60, - 12,13,1,18,6,24,7,10,31,33,61,64,43,45,66,52,68,53, + 12,13,1,18,6,24,7,10,32,59,61,64,42,44,66,51,68,52, 0,1,28, - 6,7,57,60,63,66,68, + 6,7,56,60,63,66,68, 6, 7, 25, 12, - 43, - 12,14,0,16,1,18,5,21,22,23,24,25,7,8,29,30,33,60,34,61,62,38,39,40,41,48,49,52,69,53, + 42, + 12,14,0,16,1,18,5,21,22,23,24,25,7,8,29,30,32,60,33,61,62,37,38,39,40,47,48,51,69,52, 6,7,63, 24, 11, 16, - 53, - 16,1,20,5,25,8,26,27,29,10,11,30,60,39,40,64,43,45,49,50,51, - 13,1,18,22,23,25,8,26,10,55,56,59,37,61,63,38,39,64,65,43,45,46,48,49,51,68, - 49, - 37,61, + 52, + 16,1,20,5,25,8,26,27,29,10,11,30,60,38,39,64,42,44,48,49,50, + 13,1,18,22,23,25,8,26,10,54,55,58,36,61,63,37,38,64,65,42,44,45,47,48,50,68, + 48, + 36,61, 19, 67, 12, - 14,16,17,18,19,2,3,4,20,23,24,25,8,26,27,29,10,11,55,56,30,31,58,33,32,59,35,36,34,37,61,38,39,40,64,41,43,44,45,46,47,48,49,50,51,69,54, - 12,5,6,25,7,33,37,43,44,66, - 13,0,18,46,48, + 14,16,17,18,19,2,3,4,20,23,24,25,8,26,27,29,10,11,54,55,30,57,32,31,58,34,59,35,33,36,61,37,38,39,64,40,42,43,44,45,46,47,48,49,50,69,53, + 12,5,6,25,7,32,36,42,43,66, + 13,0,18,45,47, 22,11, 13,20,61, - 1,37, - 53, - 20,5,25,60,49, - 54, - 49, - 22,33, + 1,36, + 52, + 20,5,25,60,48, + 53, + 48, + 22,32, 22, - 53, - 56, + 52, + 55, 61, 13, 24,29, 18, - 53, - 13,18,2,65,43, - 12,0,5,11,41,43,53, + 52, + 13,18,2,65,42, + 12,0,5,11,40,42,52, 13,61, 23, - 43,45,53, + 42,44,52, 60, 13, 60, @@ -912,19 +912,19 @@ 60,61, 61, 2, - 31,40,43,46,51, + 59,39,42,45,50, 19, 60,66, - 3,24,11,55,56,59, - 43,53, - 5,63,46,54, - 54, - 24,42, + 3,24,11,54,55,58, + 42,52, + 5,63,45,53, + 53, + 24,41, 8, 18, 10,64, - 0,53, - 13,1,18,7,11,60,37,61,64,41,43,46,66,48,53,54, + 0,52, + 13,1,18,7,11,60,36,61,64,40,42,45,66,47,52,53, 6,7, 6,7, 6,7, @@ -939,365 +939,365 @@ 16,60, 16,60,68, 8,28, - 13,61,53, - 37, + 13,61,52, + 36, 65, 12,2,24,61, - 53, + 52, 65, 16, - 12,31,33,62, + 12,32,59,62, 65, 24, - 16,1,11,39,53, - 13,0,51, - 15,0,53, + 16,1,11,38,52, + 13,0,50, + 15,0,52, 61, 12, 16,5,25,61,65, - 18,49, - 23,24,31,61, + 18,48, + 23,24,59,61, 11, - 6,7,57,60,63,66,68, + 6,7,56,60,63,66,68, 68, - 53, - 6,7,57, + 52, + 6,7,56, 22,8, - 45, - 38, - 45, - 13,10,64,45, - 54, + 44, + 37, + 44, + 13,10,64,44, + 53, 22, 18, 61, - 61,54, + 61,53, 18, - 6,7,37,66, - 12,6,7,37,66,68, - 53, + 6,7,36,66, + 12,6,7,36,66,68, + 52, 0,16,25, 26, - 45, + 44, 7,60,66, 60,66, 7,60,66, 60,66, 68, 14, - 52, + 51, 7,60,66, 60,66, 2, 19,2, - 60,54, - 7,57, - 12,13,14,16,17,19,2,6,25,7,26,10,31,33,32,36,60,64,44,66,68, - 7,57, - 14,6,7,33,37,66, - 12,1,37, + 60,53, + 7,56, + 12,13,14,16,17,19,2,6,25,7,26,10,32,31,59,35,60,64,43,66,68, + 7,56, + 14,6,7,32,36,66, + 12,1,36, 60, - 15,0,17,18,19,2,3,4,25,55,56,31,58,32,36,63,44,47,49,69,54, + 15,0,17,18,19,2,3,4,25,54,55,57,31,59,35,63,43,46,48,69,53, 12, 60, - 20,24,25,41,43,46,49, + 20,24,25,40,42,45,48, 19,60, - 18,24,57,60,63, - 15,19,2,31,63,45,47,54, + 18,24,56,60,63, + 15,19,2,59,63,44,46,53, 22, 0, - 56, - 0,53, - 45, - 45, + 55, + 0,52, + 44, + 44, 61, 13,15,22,23, 12, - 61,44,69, + 61,43,69, 0, 19, - 6,7,57,63,68, - 6,7,57, - 42, + 6,7,56,63,68, + 6,7,56, + 41, 13, 13, - 53, - 20,6,24,25,8,29,11,57,60,39,65,49,68, - 31, + 52, + 20,6,24,25,8,29,11,56,60,38,65,48,68, + 59, 60,63, 6,68, 60, - 40, - 60,40, + 39, + 60,39, 60, 20,60, - 43, - 12,13,18,2,62,47,53, + 42, + 12,13,18,2,62,46,52, 13, - 26,27,50, - 53, - 53, + 26,27,49, + 52, + 52, 11, 1, - 61,43, - 53, + 61,42, + 52, 13, - 12,16,11,57,63,45,51, - 6,7,57, + 12,16,11,56,63,44,50, + 6,7,56, 13, - 58,60, + 57,60, 19, 1,61, 20, 10,60,64, 64, 0,21,8,27,28,11,62, - 10,11,60,64,41,66,53, + 10,11,60,64,40,66,52, 66, - 5,11,64,41,66,53, + 5,11,64,40,66,52, 60, 12, 60, - 18,37,43, - 42, + 18,36,42, + 41, 11, - 6,24,7,57,31,60,63,42,66,68, - 13,0,18,19,2,22,23,7,11,37,38,65,43,51, - 14,16,17,18,19,2,3,4,20,22,23,24,25,26,27,29,10,11,55,56,30,58,33,32,59,35,36,34,37,61,38,39,40,64,41,43,44,45,46,47,48,49,50,51,69,54, + 6,24,7,56,59,60,63,41,66,68, + 13,0,18,19,2,22,23,7,11,36,37,65,42,50, + 14,16,17,18,19,2,3,4,20,22,23,24,25,26,27,29,10,11,54,55,30,57,32,31,58,34,35,33,36,61,37,38,39,64,40,42,43,44,45,46,47,48,49,50,69,53, 65, - 18,53, + 18,52, 15, - 53, - 14,16,17,18,19,2,3,4,20,22,23,24,25,26,27,29,10,11,55,56,30,58,33,32,59,35,36,34,37,61,38,39,40,64,41,43,44,45,46,47,48,49,50,51,52,69,54, - 14,16,17,18,19,2,3,4,20,5,23,24,25,26,27,29,10,11,55,56,30,58,33,32,59,35,36,34,37,61,38,39,40,64,41,43,44,45,46,47,48,49,50,51,69,53,54, + 52, + 14,16,17,18,19,2,3,4,20,22,23,24,25,26,27,29,10,11,54,55,30,57,32,31,58,34,35,33,36,61,37,38,39,64,40,42,43,44,45,46,47,48,49,50,51,69,53, + 14,16,17,18,19,2,3,4,20,5,23,24,25,26,27,29,10,11,54,55,30,57,32,31,58,34,35,33,36,61,37,38,39,64,40,42,43,44,45,46,47,48,49,50,69,52,53, 61, 30,65, - 16,60,43, + 16,60,42, 0,5,22,61, - 12,18,6,7,31,33,60,66, - 12,14,0,16,1,18,20,21,22,23,24,25,8,26,27,29,10,11,30,35,37,61,62,39,40,64,41,42,65,43,45,46,48,49,50,51,52,53, - 59, - 16,1,20,24,25,8,65,49, + 12,18,6,7,32,59,60,66, + 12,14,0,16,1,18,20,21,22,23,24,25,8,26,27,29,10,11,30,34,36,61,62,38,39,64,40,41,65,42,44,45,47,48,49,50,51,52, + 58, + 16,1,20,24,25,8,65,48, 13, - 47, - 43, - 13,14,16,18,20,5,22,24,7,27,11,31,33,60,34,61,62,65,43,45,67,49, + 46, + 42, + 13,14,16,18,20,5,22,24,7,27,11,32,59,60,33,61,62,65,42,44,67,48, 6,60,63,68, 7, 6,68, - 57,63, + 56,63, 6,7,63,68, 6,7, 63, 6,7,63, - 6,7,57,60,63,68, - 57,63, - 57,63, + 6,7,56,60,63,68, + 56,63, + 56,63, 22, 7, - 63,43,66, + 63,42,66, 66, 66, 66, 66, - 6,7,57,60,63,66,68, + 6,7,56,60,63,66,68, 0,62,67, - 20,26,27,35,61,64,41,46,48,49,50, - 12,13,11,61,45, + 20,26,27,34,61,64,40,45,47,48,49, + 12,13,11,61,44, 60, - 6,7,57,60,63,66,68, - 16,1,25,39,45, - 54, - 18,24,10,11,61,64,41,65,43,45,51, - 18,5,11,65,53, - 15,45, + 6,7,56,60,63,66,68, + 16,1,25,38,44, + 53, + 18,24,10,11,61,64,40,65,42,44,50, + 18,5,11,65,52, + 15,44, 62, - 6,7,36,43,44,66, - 22,37, + 6,7,35,42,43,66, + 22,36, 13,16,61, 19,2, 60, - 0,45, + 0,44, 19,2, 7, 7, 7, 7, - 15,25,31,63,44,49, + 15,25,59,63,43,48, 67, - 53, - 6,7,57,60,63,43,66,68, - 57,60,63,66, + 52, + 6,7,56,60,63,42,66,68, + 56,60,63,66, 63, 60,66, - 57, - 57, + 56, + 56, 6,7,63, - 60,45, + 60,44, 60, 61, - 12,18,19,6,7,57,60,61,63,43,47,68, - 6,7,31, + 12,18,19,6,7,56,60,61,63,42,46,68, + 6,7,59, 16, - 20,24,25,49, + 20,24,25,48, 65, - 13,61,41,48, - 18,3,61,39,43,45, + 13,61,40,47, + 18,3,61,38,42,44, 21,65, - 16,1,25,10,11,61,39,64,41,65,45,46,48,51, + 16,1,25,10,11,61,38,64,40,65,44,45,47,50, 18,19,22, - 14,18,2,5,43, + 14,18,2,5,42, 60, - 24,57,65, - 0,30,52, - 12,18,5,7,11,31,42,43,48, + 24,56,65, + 0,30,51, + 12,18,5,7,11,59,41,42,47, 7, 60, - 6,7,57,60,63,68, + 6,7,56,60,63,68, 10,64, 61,65, - 1,7,37, - 53, - 53, + 1,7,36, + 52, + 52, 22,23, - 6,7,57,65, - 53, - 30,35,60,61,41,43,46,48, - 16,9,39,40, - 12,20,21,6,23,24,25,10,11,38,64,45,48,49,52, - 6,7,57,60,63,66,68, - 6,57,63,68, + 6,7,56,65, + 52, + 30,34,60,61,40,42,45,47, + 16,9,38,39, + 12,20,21,6,23,24,25,10,11,37,64,44,47,48,51, + 6,7,56,60,63,66,68, + 6,56,63,68, 66, 66, - 6,57,68, - 7,57, + 6,56,68, + 7,56, 2, - 37, + 36, 25, - 13,19,2,10,61,64,43, - 13,45, + 13,19,2,10,61,64,42, + 13,44, 60, 10,64, 1, - 46,66, - 46,66, + 45,66, + 45,66, 65, - 13,18,2,22,37,61,62,53, + 13,18,2,22,36,61,62,52, 1,18, - 19,49, + 19,48, 12,21,24,7,61, - 15,24,31,63,47, - 45, + 15,24,59,63,46, + 44, 7, 14, 22, - 13,14,16,2,7,60,34,68, - 61,43, - 12,16,1,18,2,24,8,9,10,11,35,39,64,43,45,53, - 25,49, - 13,1,19,7,60,37,43,46, + 13,14,16,2,7,60,33,68, + 61,42, + 12,16,1,18,2,24,8,9,10,11,34,38,64,42,44,52, + 25,48, + 13,1,19,7,60,36,42,45, 65, - 53, + 52, 0, 6, - 33, - 16,65,48, - 35,64,65,66, - 65,51, - 19,2,20,22,23,25,26,27,29,10,11,32,61,39,40,64,42,44,45,47,49,50,52,69,53,54, + 32, + 16,65,47, + 34,64,65,66, + 65,50, + 19,2,20,22,23,25,26,27,29,10,11,31,61,38,39,64,41,43,44,46,48,49,51,69,52,53, 60, - 13,43, + 13,42, 13, - 52, - 45, + 51, + 44, 27,66, - 35,41,43,46,48, - 66,48, + 34,40,42,45,47, + 66,47, 66, - 66,48, + 66,47, 0,67, 67, 66, 7,60,66, 7, - 13,14,16,1,17,19,7,26,10,33,32,59,36,60,64,44,47,66,49,50,68,53, + 13,14,16,1,17,19,7,26,10,32,31,58,35,60,64,43,46,66,48,49,68,52, 60, - 14,33, + 14,32, 7, - 53, + 52, 60, 22, 7, - 14,16,17,18,19,2,3,4,20,22,23,24,25,26,27,29,10,11,55,56,30,58,33,32,59,35,36,34,37,61,38,39,40,64,41,43,44,45,46,47,48,49,50,51,52,69,54, - 13,16,5,24,25,7,26,11,57,36,60,61,43,47,66,48,50,51,52, - 13,16,18,19,2,21,22,24,10,11,39,64,65,43,52, - 45, - 13,43, + 14,16,17,18,19,2,3,4,20,22,23,24,25,26,27,29,10,11,54,55,30,57,32,31,58,34,35,33,36,61,37,38,39,64,40,42,43,44,45,46,47,48,49,50,51,69,53, + 13,16,5,24,25,7,26,11,56,35,60,61,42,46,66,47,49,50,51, + 13,16,18,19,2,21,22,24,10,11,38,64,65,42,51, + 44, + 13,42, 65, - 38, - 45, - 57,49,50,51, - 57, - 60,43,49,50,51, - 37, + 37, + 44, + 56,48,49,50, + 56, + 60,42,48,49,50, + 36, 30, 18,8,28, - 0,42,45, - 6,7,57,60,63,66,68, + 0,41,44, + 6,7,56,60,63,66,68, 65, - 13,14,18,3,5,22,23,24,10,33,35,61,64,65,43,45,67,51,53, + 13,14,18,3,5,22,23,24,10,32,34,61,64,65,42,44,67,50,52, 15, 0,16,24,11, - 43,45, + 42,44, 13, - 12,15,18,19,2,22,6,11,58,36,37,38,65,44,68, + 12,15,18,19,2,22,6,11,57,35,36,37,65,43,68, 19, 0, 16, - 7,10,11,60,64,41,46,66,48,54, + 7,10,11,60,64,40,45,66,47,53, 13,61, 6,7,61, 16,11, - 65,52,53, - 0,16,1,17,19,2,20,5,24,25,8,26,27,28,10,11,32,36,39,40,64,65,43,44,45,47,49,50,52,68,69,53,54, - 53, + 65,51,52, + 0,16,1,17,19,2,20,5,24,25,8,26,27,28,10,11,31,35,38,39,64,65,42,43,44,46,48,49,51,68,69,52,53, + 52, 15, - 53, + 52, 2, - 12,13,14,15,16,2,21,24,7,9,31,60,34,63,65,66,52,68,69, - 0,53, + 12,13,14,15,16,2,21,24,7,9,59,60,33,63,65,66,51,68,69, + 0,52, 7,60,66, 61, - 15,25,31,63,49,54, - 13,16,22,23,24,11,61,38,51, - 45, + 15,25,59,63,48,53, + 13,16,22,23,24,11,61,37,50, + 44, 61, 65, - 39, - 55, - 2,10,11,60,64,65,45,48, - 20,24,25,37,49, - 12,13,0,16,1,17,18,19,2,20,21,22,23,24,25,8,27,28,29,10,11,30,33,32,59,36,60,34,37,61,39,40,64,42,65,43,44,45,47,67,49,51,52,69,54, + 38, + 54, + 2,10,11,60,64,65,44,47, + 20,24,25,36,48, + 12,13,0,16,1,17,18,19,2,20,21,22,23,24,25,8,27,28,29,10,11,30,32,31,58,35,60,33,36,61,38,39,64,41,65,42,43,44,46,67,48,50,51,69,53, 5, - 14,6,7,11,33,60,66, + 14,6,7,11,32,60,66, 60, 0,11,62, - 22,8,30,53, - 18,61,43, + 22,8,30,52, + 18,61,42, 1,63, 18, 1,11, 19, - 16,43, + 16,42, 7, - 13,5,54, + 13,5,53, 60, 13,5, 60, - 12,13,15,0,16,1,17,18,19,2,20,5,21,22,23,24,27,28,29,30,33,32,35,36,34,61,62,38,39,40,41,65,44,45,46,47,48,52,69,54, + 12,13,15,0,16,1,17,18,19,2,20,5,21,22,23,24,27,28,29,30,32,31,34,35,33,61,62,37,38,39,40,65,43,44,45,46,47,51,69,53, 13,5, 60, 61, - 53, + 52, diff --git a/doc/salome/gui/SMESH/whxdata/whtdata0.xml b/doc/salome/gui/SMESH/whxdata/whtdata0.xml index 855b6b9e0..3777dc98d 100755 --- a/doc/salome/gui/SMESH/whxdata/whtdata0.xml +++ b/doc/salome/gui/SMESH/whxdata/whtdata0.xml @@ -1,7 +1,7 @@ - + @@ -78,6 +78,7 @@ + diff --git a/doc/salome/tui/Makefile.in b/doc/salome/tui/Makefile.in index 50f7fa1b0..ba71fe6fb 100644 --- a/doc/salome/tui/Makefile.in +++ b/doc/salome/tui/Makefile.in @@ -1,6 +1,21 @@ -# Copyright (C) 2003 CEA/DEN, EDF R&D +# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. # +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # File : Makefile.in # Author : Vasily Rusyaev (Open Cascade NN) @@ -19,13 +34,14 @@ doxygen=@DOXYGEN@ PYTHON_SCRIPTS = \ smesh.py -docs: +dev_docs: cp -fr $(srcdir)/SMESH ./INPUT; \ + cp -fr ./SMESH/doxyfile ./SMESH/doxyfile_py ./INPUT; \ + cp -fr ./SMESH/sources/static/tree.js ./INPUT/sources/static; \ cd INPUT; \ sed 's|../../../share/salome|$(root_srcdir)|' ./doxyfile > ./doxyfile1; \ sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \ - sed "s|version|`cut -d: -f2 $(root_srcdir)/bin/VERSION`|" ./doxyfile2 > ./doxyfile3; \ - mv -f doxyfile3 doxyfile1; \ + mv -f doxyfile2 doxyfile1; \ if (test "x@DOXYGEN_WITH_PYTHON@" = "xyes"); then \ echo "DOXYGEN SUPPORT PYTHON - @DOXYGEN_WITH_PYTHON@"; \ sed 's|python_extension_must_be_here|*.py|' ./doxyfile1 > ./doxyfile2; \ diff --git a/doc/salome/tui/SMESH/doxyfile_py b/doc/salome/tui/SMESH/doxyfile.in similarity index 99% rename from doc/salome/tui/SMESH/doxyfile_py rename to doc/salome/tui/SMESH/doxyfile.in index ba0d3393f..e9705fdea 100755 --- a/doc/salome/tui/SMESH/doxyfile_py +++ b/doc/salome/tui/SMESH/doxyfile.in @@ -3,7 +3,7 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME - SMESH - v.version" +PROJECT_NAME = "SALOME - SMESH - v.@VERSION@" PROJECT_NUMBER = OUTPUT_DIRECTORY = ../ CREATE_SUBDIRS = NO @@ -39,7 +39,7 @@ EXTRACT_ALL = YES EXTRACT_PRIVATE = YES EXTRACT_STATIC = YES EXTRACT_LOCAL_CLASSES = YES -EXTRACT_LOCAL_METHODS = NO +EXTRACT_LOCAL_METHODS = YES HIDE_UNDOC_MEMBERS = NO HIDE_UNDOC_CLASSES = NO HIDE_FRIEND_COMPOUNDS = NO diff --git a/doc/salome/tui/SMESH/doxyfile b/doc/salome/tui/SMESH/doxyfile_py.in similarity index 99% rename from doc/salome/tui/SMESH/doxyfile rename to doc/salome/tui/SMESH/doxyfile_py.in index ba0d3393f..78d1407fd 100755 --- a/doc/salome/tui/SMESH/doxyfile +++ b/doc/salome/tui/SMESH/doxyfile_py.in @@ -3,7 +3,7 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME - SMESH - v.version" +PROJECT_NAME = "SALOME - SMESH - v.@VERSION@" PROJECT_NUMBER = OUTPUT_DIRECTORY = ../ CREATE_SUBDIRS = NO diff --git a/doc/salome/tui/SMESH/sources/myheader.html b/doc/salome/tui/SMESH/sources/myheader.html index 1dc1ce7a4..d2efb75fa 100755 --- a/doc/salome/tui/SMESH/sources/myheader.html +++ b/doc/salome/tui/SMESH/sources/myheader.html @@ -5,6 +5,7 @@ Main Page +   diff --git a/doc/salome/tui/SMESH/sources/static/doxygen.css b/doc/salome/tui/SMESH/sources/static/doxygen.css index 88e613d23..389449d87 100755 --- a/doc/salome/tui/SMESH/sources/static/doxygen.css +++ b/doc/salome/tui/SMESH/sources/static/doxygen.css @@ -115,16 +115,6 @@ BODY { border-color: #0D299A; }*/ -div.tabs { - text-align: justify; - margin-left : 2px; - margin-right : 2px; - margin-top : 2px; - margin-bottom : 2px - font-weight: bold; - color: #FFFFFF; -} - DIV.div-footer { margin-left: 1em; margin-right: 1em; diff --git a/doc/salome/tui/SMESH/sources/static/tree.js b/doc/salome/tui/SMESH/sources/static/tree.js.in similarity index 96% rename from doc/salome/tui/SMESH/sources/static/tree.js rename to doc/salome/tui/SMESH/sources/static/tree.js.in index ef81ae08e..36d021fcb 100755 --- a/doc/salome/tui/SMESH/sources/static/tree.js +++ b/doc/salome/tui/SMESH/sources/static/tree.js.in @@ -1,4 +1,4 @@ -foldersTree = gFld("SALOME v.3.2.0b1 ", "", "") +foldersTree = gFld("SALOME v.@VERSION@ ", "", "") insDoc(foldersTree, gLnk("Main Page", "", "main.html")) aux1 = insFld(foldersTree, gFld("TUI Reference Guide", "")) diff --git a/idl/Makefile.in b/idl/Makefile.in index 083911793..65dc0f799 100644 --- a/idl/Makefile.in +++ b/idl/Makefile.in @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # generate dependencies for idl file : @@ -53,7 +53,7 @@ $(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%) lib: pyidl -PYTHON_BUILD_SITE=$(top_builddir)/lib/python$(PYTHON_VERSION)/site-packages/@PACKAGE@ +PYTHON_BUILD_SITE=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/@PACKAGE@ pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py) diff --git a/idl/SMESH_BasicHypothesis.idl b/idl/SMESH_BasicHypothesis.idl index 7880020e7..2479147db 100644 --- a/idl/SMESH_BasicHypothesis.idl +++ b/idl/SMESH_BasicHypothesis.idl @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/idl/SMESH_Filter.idl b/idl/SMESH_Filter.idl index 4376a66a4..5018b0781 100644 --- a/idl/SMESH_Filter.idl +++ b/idl/SMESH_Filter.idl @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/idl/SMESH_Gen.idl b/idl/SMESH_Gen.idl index f9e3af677..2f608b954 100644 --- a/idl/SMESH_Gen.idl +++ b/idl/SMESH_Gen.idl @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/idl/SMESH_Group.idl b/idl/SMESH_Group.idl index 3cbb606da..2ef815f1b 100644 --- a/idl/SMESH_Group.idl +++ b/idl/SMESH_Group.idl @@ -14,7 +14,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/idl/SMESH_Hypothesis.idl b/idl/SMESH_Hypothesis.idl index 69832b9ed..b4fdd1c81 100644 --- a/idl/SMESH_Hypothesis.idl +++ b/idl/SMESH_Hypothesis.idl @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/idl/SMESH_Mesh.idl b/idl/SMESH_Mesh.idl index c11266ded..5134fe24b 100644 --- a/idl/SMESH_Mesh.idl +++ b/idl/SMESH_Mesh.idl @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/idl/SMESH_Pattern.idl b/idl/SMESH_Pattern.idl index 6317019bf..a844b3c49 100644 --- a/idl/SMESH_Pattern.idl +++ b/idl/SMESH_Pattern.idl @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/resources/SMESHCatalog.xml b/resources/SMESHCatalog.xml.in similarity index 99% rename from resources/SMESHCatalog.xml rename to resources/SMESHCatalog.xml.in index bbc8e1b8a..d5d2bb072 100644 --- a/resources/SMESHCatalog.xml +++ b/resources/SMESHCatalog.xml.in @@ -16,7 +16,7 @@ Mesh MESH NRI - 3.2.0b1 + @VERSION@ Mesh component 1 ModuleMesh.png diff --git a/src/Controls/Makefile.in b/src/Controls/Makefile.in index 5cc836126..3416e9751 100644 --- a/src/Controls/Makefile.in +++ b/src/Controls/Makefile.in @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -43,10 +43,10 @@ LIB_SRC = SMESH_Controls.cxx BIN = SMESHControls BIN_SRC = -CPPFLAGS+=$(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS+=$(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS+=$(OCC_KERNEL_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome -lOpUtil -lSMDS -lTKBRep -lTKG3d +LDFLAGS+=$(OCC_KERNEL_LIBS) $(KERNEL_LDFLAGS) -lOpUtil -lSMDS -lTKBRep -lTKG3d -LDFLAGSFORBIN += -lSMDS -L${KERNEL_ROOT_DIR}/lib/salome -lOpUtil -lSALOMELocalTrace -lSALOMEBasics $(OCC_KERNEL_LIBS) -lTKBRep -lTKG3d +LDFLAGSFORBIN += -lSMDS $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics $(OCC_KERNEL_LIBS) -lTKBRep -lTKG3d @CONCLUDE@ diff --git a/src/Controls/SMESHControls.cxx b/src/Controls/SMESHControls.cxx index 0c8d145a3..e36685db8 100644 --- a/src/Controls/SMESHControls.cxx +++ b/src/Controls/SMESHControls.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "SMESH_ControlsDef.hxx" diff --git a/src/Controls/SMESH_Controls.cxx b/src/Controls/SMESH_Controls.cxx index 7edaa0e21..bad6ae8f9 100644 --- a/src/Controls/SMESH_Controls.cxx +++ b/src/Controls/SMESH_Controls.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "SMESH_ControlsDef.hxx" diff --git a/src/Controls/SMESH_Controls.hxx b/src/Controls/SMESH_Controls.hxx index fa4558db5..db71dc43e 100644 --- a/src/Controls/SMESH_Controls.hxx +++ b/src/Controls/SMESH_Controls.hxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _SMESH_CONTROLS_HXX_ #define _SMESH_CONTROLS_HXX_ diff --git a/src/Controls/SMESH_ControlsDef.hxx b/src/Controls/SMESH_ControlsDef.hxx index a4018959f..32cd281f5 100644 --- a/src/Controls/SMESH_ControlsDef.hxx +++ b/src/Controls/SMESH_ControlsDef.hxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _SMESH_CONTROLSDEF_HXX_ #define _SMESH_CONTROLSDEF_HXX_ diff --git a/src/Driver/Driver_Document.cxx b/src/Driver/Driver_Document.cxx index 159c1a85a..2225868e8 100644 --- a/src/Driver/Driver_Document.cxx +++ b/src/Driver/Driver_Document.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "Driver_Document.h" diff --git a/src/Driver/Driver_Document.h b/src/Driver/Driver_Document.h index 8d4ff5a68..502a8f385 100644 --- a/src/Driver/Driver_Document.h +++ b/src/Driver/Driver_Document.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _INCLUDE_DRIVER_DOCUMENT #define _INCLUDE_DRIVER_DOCUMENT diff --git a/src/Driver/Driver_Mesh.cxx b/src/Driver/Driver_Mesh.cxx index f656bdd5d..8d35c31b7 100644 --- a/src/Driver/Driver_Mesh.cxx +++ b/src/Driver/Driver_Mesh.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/Driver/Driver_Mesh.h b/src/Driver/Driver_Mesh.h index 14ca22fd1..4ce90c074 100644 --- a/src/Driver/Driver_Mesh.h +++ b/src/Driver/Driver_Mesh.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/Driver/Driver_SMDS_Mesh.cxx b/src/Driver/Driver_SMDS_Mesh.cxx index dae030df0..50f178b98 100644 --- a/src/Driver/Driver_SMDS_Mesh.cxx +++ b/src/Driver/Driver_SMDS_Mesh.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "Driver_SMDS_Mesh.h" diff --git a/src/Driver/Driver_SMDS_Mesh.h b/src/Driver/Driver_SMDS_Mesh.h index 1ea37562d..d0dac6250 100644 --- a/src/Driver/Driver_SMDS_Mesh.h +++ b/src/Driver/Driver_SMDS_Mesh.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _INCLUDE_DRIVER_SMDS_MESH #define _INCLUDE_DRIVER_SMDS_MESH diff --git a/src/Driver/Driver_SMESHDS_Mesh.cxx b/src/Driver/Driver_SMESHDS_Mesh.cxx index 2bf88277d..faeeed88e 100644 --- a/src/Driver/Driver_SMESHDS_Mesh.cxx +++ b/src/Driver/Driver_SMESHDS_Mesh.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "Driver_SMESHDS_Mesh.h" diff --git a/src/Driver/Driver_SMESHDS_Mesh.h b/src/Driver/Driver_SMESHDS_Mesh.h index 30e059522..43faa44e4 100644 --- a/src/Driver/Driver_SMESHDS_Mesh.h +++ b/src/Driver/Driver_SMESHDS_Mesh.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _INCLUDE_DRIVER_SMESHDS_MESH #define _INCLUDE_DRIVER_SMESHDS_MESH diff --git a/src/Driver/Makefile.in b/src/Driver/Makefile.in index d1c71416d..3cea30b31 100644 --- a/src/Driver/Makefile.in +++ b/src/Driver/Makefile.in @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -51,7 +51,7 @@ LIB_SERVER_IDL = CPPFLAGS += CXXFLAGS += -LDFLAGS += $(OCC_KERNEL_LIBS) -lTKTopAlgo -lSMESHDS -L${KERNEL_ROOT_DIR}/lib/salome -lOpUtil +LDFLAGS += $(OCC_KERNEL_LIBS) -lTKTopAlgo -lSMESHDS $(KERNEL_LDFLAGS) -lOpUtil @CONCLUDE@ diff --git a/src/DriverDAT/DAT_Test.cxx b/src/DriverDAT/DAT_Test.cxx index a36b4dd10..cd81b6e65 100644 --- a/src/DriverDAT/DAT_Test.cxx +++ b/src/DriverDAT/DAT_Test.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "DriverDAT_R_SMDS_Mesh.h" #include "DriverDAT_W_SMDS_Mesh.h" diff --git a/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx b/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx index a49d7dbf3..431c94e0d 100644 --- a/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx +++ b/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/DriverDAT/DriverDAT_R_SMDS_Mesh.h b/src/DriverDAT/DriverDAT_R_SMDS_Mesh.h index d955cf7b7..80b71697f 100644 --- a/src/DriverDAT/DriverDAT_R_SMDS_Mesh.h +++ b/src/DriverDAT/DriverDAT_R_SMDS_Mesh.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _INCLUDE_DRIVERDAT_R_SMDS_MESH #define _INCLUDE_DRIVERDAT_R_SMDS_MESH diff --git a/src/DriverDAT/DriverDAT_R_SMESHDS_Document.cxx b/src/DriverDAT/DriverDAT_R_SMESHDS_Document.cxx index c7d9b2230..9726bf15a 100644 --- a/src/DriverDAT/DriverDAT_R_SMESHDS_Document.cxx +++ b/src/DriverDAT/DriverDAT_R_SMESHDS_Document.cxx @@ -15,6 +15,6 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "DriverDAT_R_SMESHDS_Document.h" diff --git a/src/DriverDAT/DriverDAT_R_SMESHDS_Document.h b/src/DriverDAT/DriverDAT_R_SMESHDS_Document.h index 3d63ced6a..359529e6b 100644 --- a/src/DriverDAT/DriverDAT_R_SMESHDS_Document.h +++ b/src/DriverDAT/DriverDAT_R_SMESHDS_Document.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _INCLUDE_DRIVERDAT_R_SMESHDS_DOCUMENT #define _INCLUDE_DRIVERDAT_R_SMESHDS_DOCUMENT diff --git a/src/DriverDAT/DriverDAT_R_SMESHDS_Mesh.cxx b/src/DriverDAT/DriverDAT_R_SMESHDS_Mesh.cxx index a7e974f52..5101213c9 100644 --- a/src/DriverDAT/DriverDAT_R_SMESHDS_Mesh.cxx +++ b/src/DriverDAT/DriverDAT_R_SMESHDS_Mesh.cxx @@ -15,6 +15,6 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "DriverDAT_R_SMESHDS_Mesh.h" diff --git a/src/DriverDAT/DriverDAT_R_SMESHDS_Mesh.h b/src/DriverDAT/DriverDAT_R_SMESHDS_Mesh.h index e74967581..e3ae20393 100644 --- a/src/DriverDAT/DriverDAT_R_SMESHDS_Mesh.h +++ b/src/DriverDAT/DriverDAT_R_SMESHDS_Mesh.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _INCLUDE_DRIVERDAT_R_SMESHDS_MESH #define _INCLUDE_DRIVERDAT_R_SMESHDS_MESH diff --git a/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx b/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx index a54156dc7..e48161c4e 100644 --- a/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx +++ b/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/DriverDAT/DriverDAT_W_SMDS_Mesh.h b/src/DriverDAT/DriverDAT_W_SMDS_Mesh.h index ebd3d642e..1739cfe5b 100644 --- a/src/DriverDAT/DriverDAT_W_SMDS_Mesh.h +++ b/src/DriverDAT/DriverDAT_W_SMDS_Mesh.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DriverDAT/DriverDAT_W_SMESHDS_Document.cxx b/src/DriverDAT/DriverDAT_W_SMESHDS_Document.cxx index 1cd9699af..37faa1d6f 100644 --- a/src/DriverDAT/DriverDAT_W_SMESHDS_Document.cxx +++ b/src/DriverDAT/DriverDAT_W_SMESHDS_Document.cxx @@ -15,6 +15,6 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "DriverDAT_W_SMESHDS_Document.h" diff --git a/src/DriverDAT/DriverDAT_W_SMESHDS_Document.h b/src/DriverDAT/DriverDAT_W_SMESHDS_Document.h index 6b2bad5a0..624f960de 100644 --- a/src/DriverDAT/DriverDAT_W_SMESHDS_Document.h +++ b/src/DriverDAT/DriverDAT_W_SMESHDS_Document.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _INCLUDE_DRIVERDAT_W_SMESHDS_DOCUMENT #define _INCLUDE_DRIVERDAT_W_SMESHDS_DOCUMENT diff --git a/src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.cxx b/src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.cxx index e17c6cdd2..7dc9fc830 100644 --- a/src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.cxx +++ b/src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.cxx @@ -15,6 +15,6 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "DriverDAT_W_SMESHDS_Mesh.h" diff --git a/src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.h b/src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.h index b9b9130c2..39a63233f 100644 --- a/src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.h +++ b/src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DriverDAT/Makefile.in b/src/DriverDAT/Makefile.in index 43bf623cb..198d419db 100644 --- a/src/DriverDAT/Makefile.in +++ b/src/DriverDAT/Makefile.in @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -49,11 +49,11 @@ LIB_CLIENT_IDL = LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += -I${KERNEL_ROOT_DIR}/include/salome $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS += $(KERNEL_CXXFLAGS) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) LDFLAGS += -lMeshDriver $(OCC_KERNEL_LIBS) -LDFLAGSFORBIN += -lMeshDriver -lSMDS -L${KERNEL_ROOT_DIR}/lib/salome -lOpUtil -lSALOMELocalTrace -lSALOMEBasics +LDFLAGSFORBIN += -lMeshDriver -lSMDS $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics @CONCLUDE@ diff --git a/src/DriverMED/DriverMED_Family.cxx b/src/DriverMED/DriverMED_Family.cxx index 0da2c4cff..ebd21783d 100644 --- a/src/DriverMED/DriverMED_Family.cxx +++ b/src/DriverMED/DriverMED_Family.cxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DriverMED/DriverMED_Family.h b/src/DriverMED/DriverMED_Family.h index 6a3622755..907cd8ea6 100644 --- a/src/DriverMED/DriverMED_Family.h +++ b/src/DriverMED/DriverMED_Family.h @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DriverMED/DriverMED_R_SMDS_Mesh.cxx b/src/DriverMED/DriverMED_R_SMDS_Mesh.cxx index cac48ff45..6c9c4dabc 100644 --- a/src/DriverMED/DriverMED_R_SMDS_Mesh.cxx +++ b/src/DriverMED/DriverMED_R_SMDS_Mesh.cxx @@ -15,6 +15,6 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "DriverMED_R_SMDS_Mesh.h" diff --git a/src/DriverMED/DriverMED_R_SMDS_Mesh.h b/src/DriverMED/DriverMED_R_SMDS_Mesh.h index a6ece3039..dc92dd864 100644 --- a/src/DriverMED/DriverMED_R_SMDS_Mesh.h +++ b/src/DriverMED/DriverMED_R_SMDS_Mesh.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _INCLUDE_DRIVERMED_R_SMDS_MESH #define _INCLUDE_DRIVERMED_R_SMDS_MESH diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Document.cxx b/src/DriverMED/DriverMED_R_SMESHDS_Document.cxx index 9527382ad..5843cd9cf 100644 --- a/src/DriverMED/DriverMED_R_SMESHDS_Document.cxx +++ b/src/DriverMED/DriverMED_R_SMESHDS_Document.cxx @@ -15,6 +15,6 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "DriverMED_R_SMESHDS_Document.h" diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Document.h b/src/DriverMED/DriverMED_R_SMESHDS_Document.h index c933e0c4a..82b97f5a5 100644 --- a/src/DriverMED/DriverMED_R_SMESHDS_Document.h +++ b/src/DriverMED/DriverMED_R_SMESHDS_Document.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _INCLUDE_DRIVERMED_R_SMESHDS_DOCUMENT #define _INCLUDE_DRIVERMED_R_SMESHDS_DOCUMENT diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx index 87f33c81c..7e7c9b6ae 100644 --- a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx +++ b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -83,6 +83,7 @@ DriverMED_R_SMESHDS_Mesh // Reading the MED mesh //--------------------- PMeshInfo aMeshInfo = aMed->GetPMeshInfo(iMesh+1); + string aMeshName; if (myMeshId != -1) { ostringstream aMeshNameStr; @@ -94,6 +95,7 @@ DriverMED_R_SMESHDS_Mesh if(MYDEBUG) MESSAGE("Perform - aMeshName : "<GetName()); if(aMeshName != aMeshInfo->GetName()) continue; aResult = DRS_OK; + //TInt aMeshDim = aMeshInfo->GetDim(); // Reading MED families to the temporary structure @@ -121,9 +123,14 @@ DriverMED_R_SMESHDS_Mesh } } + if (aMeshInfo->GetType() == MED::eSTRUCTURE){ + bool aRes = buildMeshGrille(aMed,aMeshInfo); + continue; + } + // Reading MED nodes to the corresponding SMDS structure //------------------------------------------------------ - PNodeInfo aNodeInfo = aMed->GetPNodeInfo(aMeshInfo); + PNodeInfo aNodeInfo = aMed->GetPNodeInfo(aMeshInfo); if(!aNodeInfo) continue; @@ -885,3 +892,86 @@ bool DriverMED_R_SMESHDS_Mesh::checkFamilyID(DriverMED_FamilyPtr & aFamily, int return ( aFamily->GetId() == anID ); } + +/*! \brief Reading the structured mesh and convert to non structured (by filling of smesh structure for non structured mesh) + * \param theWrapper - PWrapper const pointer + * \param theMeshInfo - PMeshInfo const pointer + * \return TRUE, if successfully. Else FALSE + */ +bool DriverMED_R_SMESHDS_Mesh::buildMeshGrille(const MED::PWrapper& theWrapper, + const MED::PMeshInfo& theMeshInfo) +{ + bool res = true; + + MED::PGrilleInfo aGrilleInfo = theWrapper->GetPGrilleInfo(theMeshInfo); + MED::TInt aNbNodes = aGrilleInfo->GetNbNodes(); + MED::TInt aNbCells = aGrilleInfo->GetNbCells(); + MED::TInt aMeshDim = theMeshInfo->GetDim(); + DriverMED_FamilyPtr aFamily; + for(MED::TInt iNode=0;iNode < aNbNodes; iNode++){ + double aCoords[3] = {0.0, 0.0, 0.0}; + const SMDS_MeshNode* aNode; + MED::TNodeCoord aMEDNodeCoord = aGrilleInfo->GetCoord(iNode); + for(MED::TInt iDim=0;iDimAddNodeWithID(aCoords[0],aCoords[1],aCoords[2],(int)iNode); + } + + /* not implemented FAMILY + + TInt aFamNum = aNodeInfo->GetFamNum(iElem); + if ( checkFamilyID ( aFamily, aFamNum )) + { + aFamily->AddElement(aNode); + aFamily->SetType(SMDSAbs_Node); + } + + */ + + SMDS_MeshElement* anElement = NULL; + MED::TIntVector aNodeIds; + for(MED::TInt iCell=0;iCell < aNbCells; iCell++){ + aNodeIds = aGrilleInfo->GetConn(iCell); + switch(aGrilleInfo->GetGeom()){ + case MED::eSEG2: + if(aNodeIds.size() != 2){ + res = false; + EXCEPTION(runtime_error,"buildMeshGrille Error. Incorrect size of ids 2!="<AddEdgeWithID(aNodeIds[0], + aNodeIds[1], + iCell); + break; + case MED::eQUAD4: + if(aNodeIds.size() != 4){ + res = false; + EXCEPTION(runtime_error,"buildMeshGrille Error. Incorrect size of ids 4!="<AddFaceWithID(aNodeIds[0], + aNodeIds[2], + aNodeIds[3], + aNodeIds[1], + iCell); + break; + case MED::eHEXA8: + if(aNodeIds.size() != 8){ + res = false; + EXCEPTION(runtime_error,"buildMeshGrille Error. Incorrect size of ids 8!="<AddVolumeWithID(aNodeIds[0], + aNodeIds[2], + aNodeIds[3], + aNodeIds[1], + aNodeIds[4], + aNodeIds[6], + aNodeIds[7], + aNodeIds[5], + iCell); + break; + default: + break; + } + } + + return res; +} diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h index cb72bccdf..ac3d0b130 100644 --- a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h +++ b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -60,6 +60,9 @@ class DriverMED_R_SMESHDS_Mesh: public Driver_SMESHDS_Mesh */ bool checkFamilyID(DriverMED_FamilyPtr & aFamily, int anID) const; + bool buildMeshGrille(const MED::PWrapper& theWrapper, + const MED::PMeshInfo& theMeshInfo); + private: std::string myMeshName; std::map myFamilies; diff --git a/src/DriverMED/DriverMED_W_SMDS_Mesh.cxx b/src/DriverMED/DriverMED_W_SMDS_Mesh.cxx index d48e08547..8a26e8852 100644 --- a/src/DriverMED/DriverMED_W_SMDS_Mesh.cxx +++ b/src/DriverMED/DriverMED_W_SMDS_Mesh.cxx @@ -15,6 +15,6 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "DriverMED_W_SMDS_Mesh.h" diff --git a/src/DriverMED/DriverMED_W_SMDS_Mesh.h b/src/DriverMED/DriverMED_W_SMDS_Mesh.h index 2151ae672..f21becd9d 100644 --- a/src/DriverMED/DriverMED_W_SMDS_Mesh.h +++ b/src/DriverMED/DriverMED_W_SMDS_Mesh.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _INCLUDE_DRIVERMED_W_SMDS_MESH #define _INCLUDE_DRIVERMED_W_SMDS_MESH diff --git a/src/DriverMED/DriverMED_W_SMESHDS_Document.cxx b/src/DriverMED/DriverMED_W_SMESHDS_Document.cxx index d0537c23a..44353fd49 100644 --- a/src/DriverMED/DriverMED_W_SMESHDS_Document.cxx +++ b/src/DriverMED/DriverMED_W_SMESHDS_Document.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DriverMED/DriverMED_W_SMESHDS_Document.h b/src/DriverMED/DriverMED_W_SMESHDS_Document.h index 2f0cce3bc..0a0a77e1e 100644 --- a/src/DriverMED/DriverMED_W_SMESHDS_Document.h +++ b/src/DriverMED/DriverMED_W_SMESHDS_Document.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _INCLUDE_DRIVERMED_W_SMESHDS_DOCUMENT #define _INCLUDE_DRIVERMED_W_SMESHDS_DOCUMENT diff --git a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx index 3a26f7553..634accfba 100644 --- a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx +++ b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h index 1cc864944..1c8cec4b7 100644 --- a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h +++ b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DriverMED/MED_Test.cxx b/src/DriverMED/MED_Test.cxx index 7d6c3cd21..0bde26f79 100644 --- a/src/DriverMED/MED_Test.cxx +++ b/src/DriverMED/MED_Test.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "DriverMED_R_SMESHDS_Mesh.h" #include "DriverMED_W_SMESHDS_Mesh.h" diff --git a/src/DriverMED/Makefile.in b/src/DriverMED/Makefile.in index 8c9e441e7..7634a3373 100644 --- a/src/DriverMED/Makefile.in +++ b/src/DriverMED/Makefile.in @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -59,11 +59,11 @@ LIB_CLIENT_IDL = LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) -I${MED_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += -lMeshDriver -L${MED_ROOT_DIR}/lib/salome -lMEDWrapper +CPPFLAGS += $(OCC_INCLUDES) $(MED_CXXFLAGS) $(BOOST_CPPFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) +LDFLAGS += -lMeshDriver $(MED_LDFLAGS) -lMEDWrapper -LDFLAGSFORBIN += -lMeshDriver -lSMDS -lSMESHDS -L${KERNEL_ROOT_DIR}/lib/salome -L${MED_ROOT_DIR}/lib/salome -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_1 -lmed_V2_1 -lMEDWrapper_V2_2 -lOpUtil -lSALOMELocalTrace -lSALOMEBasics +LDFLAGSFORBIN += -lMeshDriver -lSMDS -lSMESHDS $(KERNEL_LDFLAGS) $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_1 -lmed_V2_1 -lMEDWrapper_V2_2 -lOpUtil -lSALOMELocalTrace -lSALOMEBasics @CONCLUDE@ diff --git a/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx b/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx index 2064453af..16e9cabf4 100644 --- a/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx +++ b/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include #include diff --git a/src/DriverSTL/DriverSTL_R_SMDS_Mesh.h b/src/DriverSTL/DriverSTL_R_SMDS_Mesh.h index 14afd3c21..93b1d0857 100644 --- a/src/DriverSTL/DriverSTL_R_SMDS_Mesh.h +++ b/src/DriverSTL/DriverSTL_R_SMDS_Mesh.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _INCLUDE_DRIVERSTL_R_SMDS_MESH #define _INCLUDE_DRIVERSTL_R_SMDS_MESH diff --git a/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx b/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx index ed7c48ebc..8b2ed581b 100644 --- a/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx +++ b/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/DriverSTL/DriverSTL_W_SMDS_Mesh.h b/src/DriverSTL/DriverSTL_W_SMDS_Mesh.h index 49d752083..facfa2ea3 100644 --- a/src/DriverSTL/DriverSTL_W_SMDS_Mesh.h +++ b/src/DriverSTL/DriverSTL_W_SMDS_Mesh.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DriverSTL/Makefile.in b/src/DriverSTL/Makefile.in index ef7833be9..bf0653e1b 100644 --- a/src/DriverSTL/Makefile.in +++ b/src/DriverSTL/Makefile.in @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -49,11 +49,11 @@ LIB_CLIENT_IDL = LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) LDFLAGS += $(OCC_KERNEL_LIBS) -lMeshDriver -lTKSTL -lTKTopAlgo -lTKMesh -LDFLAGSFORBIN += -lMeshDriver -lSMDS -L${KERNEL_ROOT_DIR}/lib/salome -lOpUtil -lSALOMELocalTrace -lSALOMEBasics $(OCC_KERNEL_LIBS) -lTKSTL -lTKTopAlgo -lTKMesh -lTKBO +LDFLAGSFORBIN += -lMeshDriver -lSMDS $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics $(OCC_KERNEL_LIBS) -lTKSTL -lTKTopAlgo -lTKMesh -lTKBO @CONCLUDE@ diff --git a/src/DriverSTL/STL_Test.cxx b/src/DriverSTL/STL_Test.cxx index 78dc0df71..95a2e2d6b 100644 --- a/src/DriverSTL/STL_Test.cxx +++ b/src/DriverSTL/STL_Test.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com //#include "DriverSTL_R_SMDS_Mesh.h" #include "DriverSTL_W_SMDS_Mesh.h" diff --git a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx index 173339ac3..77a439a7d 100644 --- a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx +++ b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "DriverUNV_R_SMDS_Mesh.h" #include "SMDS_Mesh.hxx" diff --git a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.h b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.h index a07e9a5de..474f3713a 100644 --- a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.h +++ b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _INCLUDE_DRIVERUNV_R_SMDS_MESH #define _INCLUDE_DRIVERUNV_R_SMDS_MESH diff --git a/src/DriverUNV/DriverUNV_R_SMESHDS_Document.cxx b/src/DriverUNV/DriverUNV_R_SMESHDS_Document.cxx index 0e1b871fc..b5560b4dc 100644 --- a/src/DriverUNV/DriverUNV_R_SMESHDS_Document.cxx +++ b/src/DriverUNV/DriverUNV_R_SMESHDS_Document.cxx @@ -15,6 +15,6 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "DriverUNV_R_SMESHDS_Document.h" diff --git a/src/DriverUNV/DriverUNV_R_SMESHDS_Document.h b/src/DriverUNV/DriverUNV_R_SMESHDS_Document.h index 4d38a67c3..cbd3891c5 100644 --- a/src/DriverUNV/DriverUNV_R_SMESHDS_Document.h +++ b/src/DriverUNV/DriverUNV_R_SMESHDS_Document.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _INCLUDE_DRIVERUNV_R_SMESHDS_DOCUMENT #define _INCLUDE_DRIVERUNV_R_SMESHDS_DOCUMENT diff --git a/src/DriverUNV/DriverUNV_R_SMESHDS_Mesh.cxx b/src/DriverUNV/DriverUNV_R_SMESHDS_Mesh.cxx index e4fcbf3e0..64a0e1a21 100644 --- a/src/DriverUNV/DriverUNV_R_SMESHDS_Mesh.cxx +++ b/src/DriverUNV/DriverUNV_R_SMESHDS_Mesh.cxx @@ -15,6 +15,6 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "DriverUNV_R_SMESHDS_Mesh.h" diff --git a/src/DriverUNV/DriverUNV_R_SMESHDS_Mesh.h b/src/DriverUNV/DriverUNV_R_SMESHDS_Mesh.h index fce4b66bd..dfb4d92da 100644 --- a/src/DriverUNV/DriverUNV_R_SMESHDS_Mesh.h +++ b/src/DriverUNV/DriverUNV_R_SMESHDS_Mesh.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _INCLUDE_DRIVERUNV_R_SMESHDS_MESH #define _INCLUDE_DRIVERUNV_R_SMESHDS_MESH diff --git a/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx b/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx index 1a1a9dce7..eeb2ff4b8 100644 --- a/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx +++ b/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/DriverUNV/DriverUNV_W_SMDS_Mesh.h b/src/DriverUNV/DriverUNV_W_SMDS_Mesh.h index 17e8880d6..296f33c8e 100644 --- a/src/DriverUNV/DriverUNV_W_SMDS_Mesh.h +++ b/src/DriverUNV/DriverUNV_W_SMDS_Mesh.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _INCLUDE_DRIVERUNV_W_SMDS_MESH #define _INCLUDE_DRIVERUNV_W_SMDS_MESH diff --git a/src/DriverUNV/DriverUNV_W_SMESHDS_Document.cxx b/src/DriverUNV/DriverUNV_W_SMESHDS_Document.cxx index 0e73e1cae..f2070fabd 100644 --- a/src/DriverUNV/DriverUNV_W_SMESHDS_Document.cxx +++ b/src/DriverUNV/DriverUNV_W_SMESHDS_Document.cxx @@ -15,6 +15,6 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "DriverUNV_W_SMESHDS_Document.h" diff --git a/src/DriverUNV/DriverUNV_W_SMESHDS_Document.h b/src/DriverUNV/DriverUNV_W_SMESHDS_Document.h index 77feb0ede..eb138f1ee 100644 --- a/src/DriverUNV/DriverUNV_W_SMESHDS_Document.h +++ b/src/DriverUNV/DriverUNV_W_SMESHDS_Document.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _INCLUDE_DRIVERUNV_W_SMESHDS_DOCUMENT #define _INCLUDE_DRIVERUNV_W_SMESHDS_DOCUMENT diff --git a/src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.cxx b/src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.cxx index 2cbfe4dc9..c9c7d3ee7 100644 --- a/src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.cxx +++ b/src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.cxx @@ -15,6 +15,6 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "DriverUNV_W_SMESHDS_Mesh.h" diff --git a/src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.h b/src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.h index 8bc728451..9cf94b48b 100644 --- a/src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.h +++ b/src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _INCLUDE_DRIVERUNV_W_SMESHDS_MESH #define _INCLUDE_DRIVERUNV_W_SMESHDS_MESH diff --git a/src/DriverUNV/Makefile.in b/src/DriverUNV/Makefile.in index 1e72090a4..688764a12 100644 --- a/src/DriverUNV/Makefile.in +++ b/src/DriverUNV/Makefile.in @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -61,11 +61,11 @@ LIB_CLIENT_IDL = LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += -I${KERNEL_ROOT_DIR}/include/salome $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS += $(KERNEL_CXXFLAGS) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) LDFLAGS += -lMeshDriver $(OCC_KERNEL_LIBS) -LDFLAGSFORBIN += -lMeshDriver -lSMDS -L${KERNEL_ROOT_DIR}/lib/salome -lOpUtil -lSALOMELocalTrace -lSALOMEBasics +LDFLAGSFORBIN += -lMeshDriver -lSMDS $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics @CONCLUDE@ diff --git a/src/DriverUNV/UNV2411_Structure.cxx b/src/DriverUNV/UNV2411_Structure.cxx index 9b78920fc..35d19442a 100644 --- a/src/DriverUNV/UNV2411_Structure.cxx +++ b/src/DriverUNV/UNV2411_Structure.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include #include diff --git a/src/DriverUNV/UNV2411_Structure.hxx b/src/DriverUNV/UNV2411_Structure.hxx index 4f6a39317..c3347b3ae 100644 --- a/src/DriverUNV/UNV2411_Structure.hxx +++ b/src/DriverUNV/UNV2411_Structure.hxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef UNV2411_Structure_HeaderFile #define UNV2411_Structure_HeaderFile diff --git a/src/DriverUNV/UNV2412_Structure.cxx b/src/DriverUNV/UNV2412_Structure.cxx index cac7a91d7..ef41a9990 100644 --- a/src/DriverUNV/UNV2412_Structure.cxx +++ b/src/DriverUNV/UNV2412_Structure.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include #include diff --git a/src/DriverUNV/UNV2412_Structure.hxx b/src/DriverUNV/UNV2412_Structure.hxx index 0892c5f85..7b36a1d91 100644 --- a/src/DriverUNV/UNV2412_Structure.hxx +++ b/src/DriverUNV/UNV2412_Structure.hxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef UNV2412_Structure_HeaderFile #define UNV2412_Structure_HeaderFile diff --git a/src/DriverUNV/UNV2417_Structure.cxx b/src/DriverUNV/UNV2417_Structure.cxx index ac13c9bc3..67d2cbe25 100644 --- a/src/DriverUNV/UNV2417_Structure.cxx +++ b/src/DriverUNV/UNV2417_Structure.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "UNV2417_Structure.hxx" #include "UNV_Utilities.hxx" diff --git a/src/DriverUNV/UNV2417_Structure.hxx b/src/DriverUNV/UNV2417_Structure.hxx index d5dc31249..516e74739 100644 --- a/src/DriverUNV/UNV2417_Structure.hxx +++ b/src/DriverUNV/UNV2417_Structure.hxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef UNV2417_Structure_HeaderFile #define UNV2417_Structure_HeaderFile diff --git a/src/DriverUNV/UNV_Test.cxx b/src/DriverUNV/UNV_Test.cxx index 0156b5051..4c7a43329 100644 --- a/src/DriverUNV/UNV_Test.cxx +++ b/src/DriverUNV/UNV_Test.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "UNV2411_Structure.hxx" #include "UNV2412_Structure.hxx" diff --git a/src/DriverUNV/UNV_Utilities.cxx b/src/DriverUNV/UNV_Utilities.cxx index 0781e5a4c..0d65092bd 100644 --- a/src/DriverUNV/UNV_Utilities.cxx +++ b/src/DriverUNV/UNV_Utilities.cxx @@ -1,10 +1,21 @@ -// Copyright (C) 2003 CEA/DEN, EDF R&D +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// -// File : VISU_DatConvertor.cxx -// Author : Alexey PETROV -// Module : VISU +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "UNV_Utilities.hxx" diff --git a/src/DriverUNV/UNV_Utilities.hxx b/src/DriverUNV/UNV_Utilities.hxx index bf7b8d40a..6f8598341 100644 --- a/src/DriverUNV/UNV_Utilities.hxx +++ b/src/DriverUNV/UNV_Utilities.hxx @@ -1,10 +1,21 @@ -// Copyright (C) 2003 CEA/DEN, EDF R&D +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// -// File : VISU_DatConvertor.hxx -// Author : Alexey PETROV -// Module : VISU +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef MED_Utilities_HeaderFile #define MED_Utilities_HeaderFile diff --git a/src/MEFISTO2/Makefile.in b/src/MEFISTO2/Makefile.in index 2f9c33dc1..aea95bcfb 100644 --- a/src/MEFISTO2/Makefile.in +++ b/src/MEFISTO2/Makefile.in @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # File : Makefile.in # Author : @@ -42,8 +42,8 @@ LIB_CLIENT_IDL = LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) ifeq ($(F77),gfortran) LDFLAGS += -lgfortran diff --git a/src/Makefile.in b/src/Makefile.in index 66181974a..e9ce50778 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -31,6 +31,8 @@ VPATH=.:@srcdir@ @COMMENCE@ +MED_CXXFLAGS=@MED_CXXFLAGS@ + SUBDIRS = \ SMDS SMESHDS Controls Driver DriverMED DriverDAT DriverUNV DriverSTL \ SMESH SMESH_I SMESHClient OBJECT SMESHFiltersSelection SMESHGUI SMESH_SWIG \ diff --git a/src/NETGEN/Makefile.in b/src/NETGEN/Makefile.in index c13e8296d..dd6e419c7 100644 --- a/src/NETGEN/Makefile.in +++ b/src/NETGEN/Makefile.in @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # -* Makefile *- # diff --git a/src/NETGENPlugin/Makefile.in b/src/NETGENPlugin/Makefile.in index 577190928..a17bcf1b7 100644 --- a/src/NETGENPlugin/Makefile.in +++ b/src/NETGENPlugin/Makefile.in @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -57,11 +57,11 @@ BIN_SRC = # additionnal information to compil and link file NETGEN_INCLUDES=@NETGEN_INCLUDES@ -CPPFLAGS+= $(OCC_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome \ - -I${GEOM_ROOT_DIR}/include/salome $(NETGEN_INCLUDES) $(BOOST_CPPFLAGS) -CXXFLAGS+= $(OCC_CXXFLAGS) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome \ - -I${GEOM_ROOT_DIR}/include/salome $(NETGEN_INCLUDES) +CPPFLAGS+= $(OCC_INCLUDES) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) \ + $(GEOM_CXXFLAGS) $(NETGEN_INCLUDES) $(BOOST_CPPFLAGS) +CXXFLAGS+= $(OCC_CXXFLAGS) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) \ + $(GEOM_CXXFLAGS) $(NETGEN_INCLUDES) -LDFLAGS+= $(HDF5_LIBS) -lSMESHimpl -lSMESHEngine -lStdMeshers -lStdMeshersEngine -lNETGEN -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -lSalomeGenericObj +LDFLAGS+= $(HDF5_LIBS) -lSMESHimpl -lSMESHEngine -lStdMeshers -lStdMeshersEngine -lNETGEN $(KERNEL_LDFLAGS) $(GEOM_LDFLAGS) -lSalomeGenericObj @CONCLUDE@ diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx index 7c2f7a9bc..ca46afd0e 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //============================================================================= // File : NETGENPlugin_NETGEN_3D.cxx diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx index dd67278fb..f640b15d0 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //============================================================================= // File : NETGENPlugin_NETGEN_3D.hxx diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx index 489d6822e..0429bc9c1 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx index 724fafa55..ad0c59b4b 100644 --- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx +++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/NETGENPlugin/NETGENPlugin_i.cxx b/src/NETGENPlugin/NETGENPlugin_i.cxx index 7ec0e06f5..4401a1e54 100644 --- a/src/NETGENPlugin/NETGENPlugin_i.cxx +++ b/src/NETGENPlugin/NETGENPlugin_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/NETGENPlugin/NETGENPlugin_icons.po b/src/NETGENPlugin/NETGENPlugin_icons.po index e0208b4d1..544555e33 100644 --- a/src/NETGENPlugin/NETGENPlugin_icons.po +++ b/src/NETGENPlugin/NETGENPlugin_icons.po @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # This is a Qt message file in .po format. Each msgid starts with # a scope. This scope should *NOT* be translated - eg. "Foo::Bar" diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in index 51612bf32..aeddd7b2b 100644 --- a/src/OBJECT/Makefile.in +++ b/src/OBJECT/Makefile.in @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -65,17 +65,19 @@ BIN = BIN_SRC = CPPFLAGS+= \ - -I${KERNEL_ROOT_DIR}/include/salome \ - -I${GUI_ROOT_DIR}/include/salome \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ $(OCC_INCLUDES) \ $(VTK_INCLUDES) \ $(BOOST_CPPFLAGS) \ - $(QT_INCLUDES) + $(QT_INCLUDES) \ + $(MED_CXXFLAGS) LDFLAGS+= \ - -L${KERNEL_ROOT_DIR}/lib/salome \ - -L${GUI_ROOT_DIR}/lib/salome \ + $(KERNEL_LDFLAGS) \ + $(GUI_LDFLAGS) \ $(OCC_KERNEL_LIBS) \ $(VTK_LIBS) \ + $(MED_LDFLAGS) \ -lSMDS \ -lSMESHClient \ -lSalomeApp \ @@ -83,8 +85,8 @@ LDFLAGS+= \ -lSMESHControls LDFLAGSFORBIN += \ - -L${GEOM_ROOT_DIR}/lib/salome \ - -L${MED_ROOT_DIR}/lib/salome \ + $(GEOM_LDFLAGS) \ + $(MED_LDFLAGS) \ $(LDFLAGS) \ -lqtx \ -lsuit \ diff --git a/src/OBJECT/SMESH_Actor.cxx b/src/OBJECT/SMESH_Actor.cxx index cd2cec46e..53c8758f3 100644 --- a/src/OBJECT/SMESH_Actor.cxx +++ b/src/OBJECT/SMESH_Actor.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/OBJECT/SMESH_Actor.h b/src/OBJECT/SMESH_Actor.h index 977e1bdc0..ca273d3f3 100644 --- a/src/OBJECT/SMESH_Actor.h +++ b/src/OBJECT/SMESH_Actor.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/OBJECT/SMESH_ActorDef.h b/src/OBJECT/SMESH_ActorDef.h index c23f97728..c1e55d415 100644 --- a/src/OBJECT/SMESH_ActorDef.h +++ b/src/OBJECT/SMESH_ActorDef.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/OBJECT/SMESH_ActorUtils.cxx b/src/OBJECT/SMESH_ActorUtils.cxx index 127f25a9e..e498c2f72 100644 --- a/src/OBJECT/SMESH_ActorUtils.cxx +++ b/src/OBJECT/SMESH_ActorUtils.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "SMESH_ActorUtils.h" diff --git a/src/OBJECT/SMESH_ActorUtils.h b/src/OBJECT/SMESH_ActorUtils.h index 19ed7e282..438b0e9b6 100644 --- a/src/OBJECT/SMESH_ActorUtils.h +++ b/src/OBJECT/SMESH_ActorUtils.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef SMESH_ACTORUTILS_H #define SMESH_ACTORUTILS_H diff --git a/src/OBJECT/SMESH_DeviceActor.cxx b/src/OBJECT/SMESH_DeviceActor.cxx index bf094ba9b..0b3a424c4 100644 --- a/src/OBJECT/SMESH_DeviceActor.cxx +++ b/src/OBJECT/SMESH_DeviceActor.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/OBJECT/SMESH_DeviceActor.h b/src/OBJECT/SMESH_DeviceActor.h index 8c5b10880..a5e0b1656 100644 --- a/src/OBJECT/SMESH_DeviceActor.h +++ b/src/OBJECT/SMESH_DeviceActor.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/OBJECT/SMESH_ExtractGeometry.cxx b/src/OBJECT/SMESH_ExtractGeometry.cxx index c7f59df94..acd4a6f5f 100644 --- a/src/OBJECT/SMESH_ExtractGeometry.cxx +++ b/src/OBJECT/SMESH_ExtractGeometry.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "SMESH_ExtractGeometry.h" diff --git a/src/OBJECT/SMESH_ExtractGeometry.h b/src/OBJECT/SMESH_ExtractGeometry.h index cbbcdc044..f1bcbaca0 100644 --- a/src/OBJECT/SMESH_ExtractGeometry.h +++ b/src/OBJECT/SMESH_ExtractGeometry.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef SALOME_ExtractGeometry_HeaderFile #define SALOME_ExtractGeometry_HeaderFile diff --git a/src/OBJECT/SMESH_Object.cxx b/src/OBJECT/SMESH_Object.cxx index ca0e7418e..1e52ccb01 100644 --- a/src/OBJECT/SMESH_Object.cxx +++ b/src/OBJECT/SMESH_Object.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/OBJECT/SMESH_Object.h b/src/OBJECT/SMESH_Object.h index aea4f778e..44b737ba5 100644 --- a/src/OBJECT/SMESH_Object.h +++ b/src/OBJECT/SMESH_Object.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/OBJECT/SMESH_ObjectDef.h b/src/OBJECT/SMESH_ObjectDef.h index f45f14a63..fff2f819d 100644 --- a/src/OBJECT/SMESH_ObjectDef.h +++ b/src/OBJECT/SMESH_ObjectDef.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/Makefile.in b/src/SMDS/Makefile.in index 7ecaf313a..bfb94b798 100644 --- a/src/SMDS/Makefile.in +++ b/src/SMDS/Makefile.in @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -29,6 +29,7 @@ top_srcdir=@top_srcdir@ top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl +KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@ @COMMENCE@ @@ -109,9 +110,9 @@ EXPORT_HEADERS= \ SMDS_SetIterator.hxx # additionnal information to compil and link file -CPPFLAGS += -I${KERNEL_ROOT_DIR}/include/salome $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += -L${KERNEL_ROOT_DIR}/lib/salome $(OCC_KERNEL_LIBS) +CPPFLAGS += $(KERNEL_CXXFLAGS) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) +LDFLAGS += $(KERNEL_LDFLAGS) $(OCC_KERNEL_LIBS) # additional file to be cleaned diff --git a/src/SMDS/SMDSAbs_ElementType.hxx b/src/SMDS/SMDSAbs_ElementType.hxx index c474a4e55..fed89972f 100644 --- a/src/SMDS/SMDSAbs_ElementType.hxx +++ b/src/SMDS/SMDSAbs_ElementType.hxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org or email : webmaster@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_EdgePosition.cxx b/src/SMDS/SMDS_EdgePosition.cxx index 82c92b398..836b01e3a 100644 --- a/src/SMDS/SMDS_EdgePosition.cxx +++ b/src/SMDS/SMDS_EdgePosition.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_EdgePosition.hxx b/src/SMDS/SMDS_EdgePosition.hxx index fd297d3ab..597fedba3 100644 --- a/src/SMDS/SMDS_EdgePosition.hxx +++ b/src/SMDS/SMDS_EdgePosition.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_ElemIterator.hxx b/src/SMDS/SMDS_ElemIterator.hxx index 6ff098644..624113cf0 100755 --- a/src/SMDS/SMDS_ElemIterator.hxx +++ b/src/SMDS/SMDS_ElemIterator.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_FaceOfEdges.cxx b/src/SMDS/SMDS_FaceOfEdges.cxx index 7a014afb8..2e5651fff 100644 --- a/src/SMDS/SMDS_FaceOfEdges.cxx +++ b/src/SMDS/SMDS_FaceOfEdges.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifdef _MSC_VER #pragma warning(disable:4786) diff --git a/src/SMDS/SMDS_FaceOfEdges.hxx b/src/SMDS/SMDS_FaceOfEdges.hxx index 54a9a688f..10523ec6c 100644 --- a/src/SMDS/SMDS_FaceOfEdges.hxx +++ b/src/SMDS/SMDS_FaceOfEdges.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _SMDS_FaceOfEdges_HeaderFile #define _SMDS_FaceOfEdges_HeaderFile diff --git a/src/SMDS/SMDS_FaceOfNodes.cxx b/src/SMDS/SMDS_FaceOfNodes.cxx index 018bd88a0..0ad564ef7 100644 --- a/src/SMDS/SMDS_FaceOfNodes.cxx +++ b/src/SMDS/SMDS_FaceOfNodes.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifdef _MSC_VER #pragma warning(disable:4786) diff --git a/src/SMDS/SMDS_FaceOfNodes.hxx b/src/SMDS/SMDS_FaceOfNodes.hxx index 8cbdf6f33..f1a3010b8 100644 --- a/src/SMDS/SMDS_FaceOfNodes.hxx +++ b/src/SMDS/SMDS_FaceOfNodes.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _SMDS_FaceOfNodes_HeaderFile #define _SMDS_FaceOfNodes_HeaderFile diff --git a/src/SMDS/SMDS_FacePosition.cxx b/src/SMDS/SMDS_FacePosition.cxx index c97e64f7a..835f17bc6 100644 --- a/src/SMDS/SMDS_FacePosition.cxx +++ b/src/SMDS/SMDS_FacePosition.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_FacePosition.hxx b/src/SMDS/SMDS_FacePosition.hxx index 8ca74130f..f7032531b 100644 --- a/src/SMDS/SMDS_FacePosition.hxx +++ b/src/SMDS/SMDS_FacePosition.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_Iterator.hxx b/src/SMDS/SMDS_Iterator.hxx index 264438c7d..371bc0e1a 100644 --- a/src/SMDS/SMDS_Iterator.hxx +++ b/src/SMDS/SMDS_Iterator.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _SMDS_Iterator_HeaderFile #define _SMDS_Iterator_HeaderFile diff --git a/src/SMDS/SMDS_IteratorOfElements.cxx b/src/SMDS/SMDS_IteratorOfElements.cxx index 472ae0d54..77a00c802 100644 --- a/src/SMDS/SMDS_IteratorOfElements.cxx +++ b/src/SMDS/SMDS_IteratorOfElements.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifdef _MSC_VER #pragma warning(disable:4786) diff --git a/src/SMDS/SMDS_IteratorOfElements.hxx b/src/SMDS/SMDS_IteratorOfElements.hxx index faf777de9..de64f67c3 100644 --- a/src/SMDS/SMDS_IteratorOfElements.hxx +++ b/src/SMDS/SMDS_IteratorOfElements.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "SMDS_Iterator.hxx" #include "SMDS_MeshElement.hxx" diff --git a/src/SMDS/SMDS_Mesh.cxx b/src/SMDS/SMDS_Mesh.cxx index acb74c7bc..26a998117 100644 --- a/src/SMDS/SMDS_Mesh.cxx +++ b/src/SMDS/SMDS_Mesh.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifdef _MSC_VER #pragma warning(disable:4786) diff --git a/src/SMDS/SMDS_Mesh.hxx b/src/SMDS/SMDS_Mesh.hxx index 00db00fa1..130e05d44 100644 --- a/src/SMDS/SMDS_Mesh.hxx +++ b/src/SMDS/SMDS_Mesh.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_MeshEdge.cxx b/src/SMDS/SMDS_MeshEdge.cxx index dc1dab968..ee79fcd2c 100644 --- a/src/SMDS/SMDS_MeshEdge.cxx +++ b/src/SMDS/SMDS_MeshEdge.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_MeshEdge.hxx b/src/SMDS/SMDS_MeshEdge.hxx index c99b08198..75ff74e74 100644 --- a/src/SMDS/SMDS_MeshEdge.hxx +++ b/src/SMDS/SMDS_MeshEdge.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_MeshElement.cxx b/src/SMDS/SMDS_MeshElement.cxx index fa15e0e5f..e6f84076b 100644 --- a/src/SMDS/SMDS_MeshElement.cxx +++ b/src/SMDS/SMDS_MeshElement.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifdef _MSC_VER #pragma warning(disable:4786) diff --git a/src/SMDS/SMDS_MeshElement.hxx b/src/SMDS/SMDS_MeshElement.hxx index 794c352f5..7fdd180bb 100644 --- a/src/SMDS/SMDS_MeshElement.hxx +++ b/src/SMDS/SMDS_MeshElement.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_MeshElementIDFactory.cxx b/src/SMDS/SMDS_MeshElementIDFactory.cxx index 8fc09230b..cac5fc1c6 100644 --- a/src/SMDS/SMDS_MeshElementIDFactory.cxx +++ b/src/SMDS/SMDS_MeshElementIDFactory.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_MeshElementIDFactory.hxx b/src/SMDS/SMDS_MeshElementIDFactory.hxx index 526bcb5a0..edab00727 100644 --- a/src/SMDS/SMDS_MeshElementIDFactory.hxx +++ b/src/SMDS/SMDS_MeshElementIDFactory.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_MeshFace.cxx b/src/SMDS/SMDS_MeshFace.cxx index b7014293a..e67103e8b 100644 --- a/src/SMDS/SMDS_MeshFace.cxx +++ b/src/SMDS/SMDS_MeshFace.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "SMDS_MeshFace.hxx" diff --git a/src/SMDS/SMDS_MeshFace.hxx b/src/SMDS/SMDS_MeshFace.hxx index 36f2fa542..326a54bec 100644 --- a/src/SMDS/SMDS_MeshFace.hxx +++ b/src/SMDS/SMDS_MeshFace.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_MeshGroup.cxx b/src/SMDS/SMDS_MeshGroup.cxx index 0cb481c50..adbde5081 100644 --- a/src/SMDS/SMDS_MeshGroup.cxx +++ b/src/SMDS/SMDS_MeshGroup.cxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org or email : webmaster@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_MeshGroup.hxx b/src/SMDS/SMDS_MeshGroup.hxx index a670deb5e..90e6722af 100644 --- a/src/SMDS/SMDS_MeshGroup.hxx +++ b/src/SMDS/SMDS_MeshGroup.hxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org or email : webmaster@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_MeshIDFactory.cxx b/src/SMDS/SMDS_MeshIDFactory.cxx index 536b2f783..989e42be3 100644 --- a/src/SMDS/SMDS_MeshIDFactory.cxx +++ b/src/SMDS/SMDS_MeshIDFactory.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_MeshIDFactory.hxx b/src/SMDS/SMDS_MeshIDFactory.hxx index 8a6425ac2..fa37a2814 100644 --- a/src/SMDS/SMDS_MeshIDFactory.hxx +++ b/src/SMDS/SMDS_MeshIDFactory.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_MeshNode.cxx b/src/SMDS/SMDS_MeshNode.cxx index 06ab12173..1d968dcbb 100644 --- a/src/SMDS/SMDS_MeshNode.cxx +++ b/src/SMDS/SMDS_MeshNode.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifdef _MSC_VER #pragma warning(disable:4786) diff --git a/src/SMDS/SMDS_MeshNode.hxx b/src/SMDS/SMDS_MeshNode.hxx index fad622534..884e1280d 100644 --- a/src/SMDS/SMDS_MeshNode.hxx +++ b/src/SMDS/SMDS_MeshNode.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_MeshObject.cxx b/src/SMDS/SMDS_MeshObject.cxx index b822b8098..262bb59ec 100644 --- a/src/SMDS/SMDS_MeshObject.cxx +++ b/src/SMDS/SMDS_MeshObject.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_MeshObject.hxx b/src/SMDS/SMDS_MeshObject.hxx index f734309cf..b6c97ee3d 100644 --- a/src/SMDS/SMDS_MeshObject.hxx +++ b/src/SMDS/SMDS_MeshObject.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_MeshVolume.cxx b/src/SMDS/SMDS_MeshVolume.cxx index 561f0dccb..7300675e2 100644 --- a/src/SMDS/SMDS_MeshVolume.cxx +++ b/src/SMDS/SMDS_MeshVolume.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_MeshVolume.hxx b/src/SMDS/SMDS_MeshVolume.hxx index c543c3001..3ad37801c 100644 --- a/src/SMDS/SMDS_MeshVolume.hxx +++ b/src/SMDS/SMDS_MeshVolume.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_PolygonalFaceOfNodes.cxx b/src/SMDS/SMDS_PolygonalFaceOfNodes.cxx index 568bd34d0..897cd6993 100644 --- a/src/SMDS/SMDS_PolygonalFaceOfNodes.cxx +++ b/src/SMDS/SMDS_PolygonalFaceOfNodes.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifdef _MSC_VER #pragma warning(disable:4786) diff --git a/src/SMDS/SMDS_PolygonalFaceOfNodes.hxx b/src/SMDS/SMDS_PolygonalFaceOfNodes.hxx index c8884b319..973fb433c 100644 --- a/src/SMDS/SMDS_PolygonalFaceOfNodes.hxx +++ b/src/SMDS/SMDS_PolygonalFaceOfNodes.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _SMDS_PolygonalFaceOfNodes_HeaderFile #define _SMDS_PolygonalFaceOfNodes_HeaderFile diff --git a/src/SMDS/SMDS_PolyhedralVolumeOfNodes.cxx b/src/SMDS/SMDS_PolyhedralVolumeOfNodes.cxx index 84ce2134d..1c4fd4761 100644 --- a/src/SMDS/SMDS_PolyhedralVolumeOfNodes.cxx +++ b/src/SMDS/SMDS_PolyhedralVolumeOfNodes.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifdef _MSC_VER #pragma warning(disable:4786) diff --git a/src/SMDS/SMDS_PolyhedralVolumeOfNodes.hxx b/src/SMDS/SMDS_PolyhedralVolumeOfNodes.hxx index baecaf339..27caf5db8 100644 --- a/src/SMDS/SMDS_PolyhedralVolumeOfNodes.hxx +++ b/src/SMDS/SMDS_PolyhedralVolumeOfNodes.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_Position.cxx b/src/SMDS/SMDS_Position.cxx index 926aa4bf9..bd9a7a24b 100644 --- a/src/SMDS/SMDS_Position.cxx +++ b/src/SMDS/SMDS_Position.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_Position.hxx b/src/SMDS/SMDS_Position.hxx index 9b11dc6f9..18b84c6be 100644 --- a/src/SMDS/SMDS_Position.hxx +++ b/src/SMDS/SMDS_Position.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_QuadraticEdge.cxx b/src/SMDS/SMDS_QuadraticEdge.cxx index ca12343ff..1dac4ef13 100644 --- a/src/SMDS/SMDS_QuadraticEdge.cxx +++ b/src/SMDS/SMDS_QuadraticEdge.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_QuadraticEdge.hxx b/src/SMDS/SMDS_QuadraticEdge.hxx index dacdef01c..6c6099602 100644 --- a/src/SMDS/SMDS_QuadraticEdge.hxx +++ b/src/SMDS/SMDS_QuadraticEdge.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx b/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx index ecd69cc70..fa4249e66 100644 --- a/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx +++ b/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_QuadraticFaceOfNodes.hxx b/src/SMDS/SMDS_QuadraticFaceOfNodes.hxx index 77cda784a..d174e813e 100644 --- a/src/SMDS/SMDS_QuadraticFaceOfNodes.hxx +++ b/src/SMDS/SMDS_QuadraticFaceOfNodes.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_QuadraticVolumeOfNodes.cxx b/src/SMDS/SMDS_QuadraticVolumeOfNodes.cxx index b7f7e7821..ce14eccd0 100644 --- a/src/SMDS/SMDS_QuadraticVolumeOfNodes.cxx +++ b/src/SMDS/SMDS_QuadraticVolumeOfNodes.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_QuadraticVolumeOfNodes.hxx b/src/SMDS/SMDS_QuadraticVolumeOfNodes.hxx index 6fa60b0b6..23f4369d3 100644 --- a/src/SMDS/SMDS_QuadraticVolumeOfNodes.hxx +++ b/src/SMDS/SMDS_QuadraticVolumeOfNodes.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_SetIterator.hxx b/src/SMDS/SMDS_SetIterator.hxx index 8c08a737b..05fa6c046 100644 --- a/src/SMDS/SMDS_SetIterator.hxx +++ b/src/SMDS/SMDS_SetIterator.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_SpacePosition.cxx b/src/SMDS/SMDS_SpacePosition.cxx index 7ce582f91..399663d2f 100644 --- a/src/SMDS/SMDS_SpacePosition.cxx +++ b/src/SMDS/SMDS_SpacePosition.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_SpacePosition.hxx b/src/SMDS/SMDS_SpacePosition.hxx index f4c7bff1a..3ca394f45 100644 --- a/src/SMDS/SMDS_SpacePosition.hxx +++ b/src/SMDS/SMDS_SpacePosition.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_TypeOfPosition.hxx b/src/SMDS/SMDS_TypeOfPosition.hxx index 8c0631bfc..5384a8ce5 100644 --- a/src/SMDS/SMDS_TypeOfPosition.hxx +++ b/src/SMDS/SMDS_TypeOfPosition.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_VertexPosition.cxx b/src/SMDS/SMDS_VertexPosition.cxx index 022f76ad3..e39e3fc2d 100644 --- a/src/SMDS/SMDS_VertexPosition.cxx +++ b/src/SMDS/SMDS_VertexPosition.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_VertexPosition.hxx b/src/SMDS/SMDS_VertexPosition.hxx index 68c1e3a58..6dfe3714b 100644 --- a/src/SMDS/SMDS_VertexPosition.hxx +++ b/src/SMDS/SMDS_VertexPosition.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_VolumeOfFaces.cxx b/src/SMDS/SMDS_VolumeOfFaces.cxx index 51e71f86c..2d1dc94e6 100644 --- a/src/SMDS/SMDS_VolumeOfFaces.cxx +++ b/src/SMDS/SMDS_VolumeOfFaces.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_VolumeOfFaces.hxx b/src/SMDS/SMDS_VolumeOfFaces.hxx index ae3b28881..9938443df 100644 --- a/src/SMDS/SMDS_VolumeOfFaces.hxx +++ b/src/SMDS/SMDS_VolumeOfFaces.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_VolumeOfNodes.cxx b/src/SMDS/SMDS_VolumeOfNodes.cxx index 941f538c3..0428095da 100644 --- a/src/SMDS/SMDS_VolumeOfNodes.cxx +++ b/src/SMDS/SMDS_VolumeOfNodes.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifdef _MSC_VER #pragma warning(disable:4786) diff --git a/src/SMDS/SMDS_VolumeOfNodes.hxx b/src/SMDS/SMDS_VolumeOfNodes.hxx index 759517490..83628bd93 100644 --- a/src/SMDS/SMDS_VolumeOfNodes.hxx +++ b/src/SMDS/SMDS_VolumeOfNodes.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMDS/SMDS_VolumeTool.cxx b/src/SMDS/SMDS_VolumeTool.cxx index 9f35e0158..7ee1f81f2 100644 --- a/src/SMDS/SMDS_VolumeTool.cxx +++ b/src/SMDS/SMDS_VolumeTool.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : SMDS_VolumeTool.cxx // Created : Tue Jul 13 12:22:13 2004 diff --git a/src/SMDS/SMDS_VolumeTool.hxx b/src/SMDS/SMDS_VolumeTool.hxx index b5528c10e..4c0e1a911 100644 --- a/src/SMDS/SMDS_VolumeTool.hxx +++ b/src/SMDS/SMDS_VolumeTool.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/Makefile.in b/src/SMESH/Makefile.in index 13b54dd4d..f9154dca4 100644 --- a/src/SMESH/Makefile.in +++ b/src/SMESH/Makefile.in @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -70,7 +70,7 @@ LIB_SRC = SMESH_Gen.cxx SMESH_Mesh.cxx SMESH_subMesh.cxx \ SMESH_MeshEditor.cxx \ SMESH_Block.cxx \ SMESH_Pattern.cxx \ - SMESH_HypoFilter.cxx \ + SMESH_HypoFilter.cxx \ SMESH_MesherHelper.cxx LIB_SERVER_IDL = @@ -82,11 +82,11 @@ BIN = BIN_SRC = # additionnal information to compile and link file -CPPFLAGS+= $(OCC_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome \ - -I${MED_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) -CXXFLAGS+= $(OCC_CXXFLAGS) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome \ - -I${MED_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome -LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -L${MED_ROOT_DIR}/lib/salome -L${OCC_KERNEL_LIBS} $(OCC_LDPATH)-lNMTTools -lSMESHDS -lMeshDriverDAT -lMeshDriverSTL -lMeshDriverMED -lMeshDriverUNV -lTKShHealing +CPPFLAGS+= $(OCC_INCLUDES) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) \ + $(MED_CXXFLAGS) $(GEOM_CXX_FLAGS) $(BOOST_CPPFLAGS) +CXXFLAGS+= $(OCC_CXXFLAGS) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) \ + $(MED_CXXFLAGS) $(GEOM_CXX_FLAGS) +LDFLAGS+= $(KERNEL_LDFLAGS) $(GEOM_LDFLAGS) $(MED_LDFLAGS) -lNMTTools -lSMESHDS -lMeshDriverDAT -lMeshDriverSTL -lMeshDriverMED -lMeshDriverUNV @CAS_LDPATH@ -lTKShHealing @CONCLUDE@ diff --git a/src/SMESH/SMESH_1D_Algo.cxx b/src/SMESH/SMESH_1D_Algo.cxx index 37567a536..a8524eb88 100644 --- a/src/SMESH/SMESH_1D_Algo.cxx +++ b/src/SMESH/SMESH_1D_Algo.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/SMESH_1D_Algo.hxx b/src/SMESH/SMESH_1D_Algo.hxx index 378ed7545..4b433eef5 100644 --- a/src/SMESH/SMESH_1D_Algo.hxx +++ b/src/SMESH/SMESH_1D_Algo.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/SMESH_2D_Algo.cxx b/src/SMESH/SMESH_2D_Algo.cxx index 1c9af478a..a2a18202a 100644 --- a/src/SMESH/SMESH_2D_Algo.cxx +++ b/src/SMESH/SMESH_2D_Algo.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/SMESH_2D_Algo.hxx b/src/SMESH/SMESH_2D_Algo.hxx index 259a51157..d16e34b3d 100644 --- a/src/SMESH/SMESH_2D_Algo.hxx +++ b/src/SMESH/SMESH_2D_Algo.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/SMESH_3D_Algo.cxx b/src/SMESH/SMESH_3D_Algo.cxx index 6a05c16af..ccf4d9a20 100644 --- a/src/SMESH/SMESH_3D_Algo.cxx +++ b/src/SMESH/SMESH_3D_Algo.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/SMESH_3D_Algo.hxx b/src/SMESH/SMESH_3D_Algo.hxx index 21c53ca0f..d17416bc0 100644 --- a/src/SMESH/SMESH_3D_Algo.hxx +++ b/src/SMESH/SMESH_3D_Algo.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/SMESH_Algo.cxx b/src/SMESH/SMESH_Algo.cxx index 94803ac7c..45e0e234a 100644 --- a/src/SMESH/SMESH_Algo.cxx +++ b/src/SMESH/SMESH_Algo.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/SMESH_Algo.hxx b/src/SMESH/SMESH_Algo.hxx index 57bc4245a..218c5cad9 100644 --- a/src/SMESH/SMESH_Algo.hxx +++ b/src/SMESH/SMESH_Algo.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/SMESH_Block.cxx b/src/SMESH/SMESH_Block.cxx index 431208fcf..3a0868330 100644 --- a/src/SMESH/SMESH_Block.cxx +++ b/src/SMESH/SMESH_Block.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // File : SMESH_Pattern.hxx // Created : Mon Aug 2 10:30:00 2004 diff --git a/src/SMESH/SMESH_Block.hxx b/src/SMESH/SMESH_Block.hxx index 155104866..3a347a0f5 100644 --- a/src/SMESH/SMESH_Block.hxx +++ b/src/SMESH/SMESH_Block.hxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // File : SMESH_Block.hxx // Created : Tue Nov 30 12:42:18 2004 diff --git a/src/SMESH/SMESH_DataMapOfElemPtrSequenceOfElemPtr.hxx b/src/SMESH/SMESH_DataMapOfElemPtrSequenceOfElemPtr.hxx index a1c4dded3..16a847baa 100644 --- a/src/SMESH/SMESH_DataMapOfElemPtrSequenceOfElemPtr.hxx +++ b/src/SMESH/SMESH_DataMapOfElemPtrSequenceOfElemPtr.hxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: SMESH_DataMapOfElemPtrSequenceOfElemPtr.hxx // Created: 26.09.05 17:41:10 diff --git a/src/SMESH/SMESH_Gen.cxx b/src/SMESH/SMESH_Gen.cxx index b7e50f209..1febbb03a 100644 --- a/src/SMESH/SMESH_Gen.cxx +++ b/src/SMESH/SMESH_Gen.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/SMESH_Gen.hxx b/src/SMESH/SMESH_Gen.hxx index ab780a070..f2887c044 100644 --- a/src/SMESH/SMESH_Gen.hxx +++ b/src/SMESH/SMESH_Gen.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/SMESH_Group.cxx b/src/SMESH/SMESH_Group.cxx index 49cade122..c0a777b61 100644 --- a/src/SMESH/SMESH_Group.cxx +++ b/src/SMESH/SMESH_Group.cxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/SMESH_Group.hxx b/src/SMESH/SMESH_Group.hxx index 3819cd4aa..72ee80a79 100644 --- a/src/SMESH/SMESH_Group.hxx +++ b/src/SMESH/SMESH_Group.hxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/SMESH_HypoFilter.cxx b/src/SMESH/SMESH_HypoFilter.cxx index 2e4469fb4..fe0bcd466 100644 --- a/src/SMESH/SMESH_HypoFilter.cxx +++ b/src/SMESH/SMESH_HypoFilter.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/SMESH_HypoFilter.hxx b/src/SMESH/SMESH_HypoFilter.hxx index 9638495d1..a56d7d0f7 100644 --- a/src/SMESH/SMESH_HypoFilter.hxx +++ b/src/SMESH/SMESH_HypoFilter.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/SMESH_Hypothesis.cxx b/src/SMESH/SMESH_Hypothesis.cxx index 268581791..cc179d31c 100644 --- a/src/SMESH/SMESH_Hypothesis.cxx +++ b/src/SMESH/SMESH_Hypothesis.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/SMESH_Hypothesis.hxx b/src/SMESH/SMESH_Hypothesis.hxx index d7a12f9a0..3a8c3d2e6 100644 --- a/src/SMESH/SMESH_Hypothesis.hxx +++ b/src/SMESH/SMESH_Hypothesis.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/SMESH_IndexedDataMapOfShapeIndexedMapOfShape.hxx b/src/SMESH/SMESH_IndexedDataMapOfShapeIndexedMapOfShape.hxx index 5010b3ebc..952bb972d 100644 --- a/src/SMESH/SMESH_IndexedDataMapOfShapeIndexedMapOfShape.hxx +++ b/src/SMESH/SMESH_IndexedDataMapOfShapeIndexedMapOfShape.hxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: SMESH_IndexedDataMapOfShapeIndexedMapOfShape.hxx // Created: 20.09.05 09:51:12 diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx index 1426f061d..bb88ca0bd 100644 --- a/src/SMESH/SMESH_Mesh.cxx +++ b/src/SMESH/SMESH_Mesh.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx index c377ed25b..0e6e1aabe 100644 --- a/src/SMESH/SMESH_Mesh.hxx +++ b/src/SMESH/SMESH_Mesh.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/SMESH_MeshEditor.cxx b/src/SMESH/SMESH_MeshEditor.cxx index 4f335dcd4..c0a3b2771 100644 --- a/src/SMESH/SMESH_MeshEditor.cxx +++ b/src/SMESH/SMESH_MeshEditor.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -2938,15 +2938,21 @@ static void makeWalls (SMESHDS_Mesh* aMesh, static_cast( nList->first ); SMDS_ElemIteratorPtr eIt = node->GetInverseElementIterator(); int nbInitElems = 0; - const SMDS_MeshElement* el; + const SMDS_MeshElement* el = 0; + SMDSAbs_ElementType highType = SMDSAbs_Edge; // count most complex elements only while ( eIt->more() && nbInitElems < 2 ) { el = eIt->next(); - //if ( elemSet.find( eIt->next() ) != elemSet.end() ) + SMDSAbs_ElementType type = el->GetType(); + if ( type == SMDSAbs_Volume || type < highType ) continue; + if ( type > highType ) { + nbInitElems = 0; + highType = type; + } if ( elemSet.find(el->GetID()) != elemSet.end() ) nbInitElems++; } if ( nbInitElems < 2 ) { - bool NotCreateEdge = el->IsQuadratic() && el->IsMediumNode(node); + bool NotCreateEdge = el && el->IsQuadratic() && el->IsMediumNode(node); if(!NotCreateEdge) { vector newNodesItVec( 1, nList ); list newEdges; @@ -2965,16 +2971,20 @@ static void makeWalls (SMESHDS_Mesh* aMesh, vector& vecNewNodes = itElemNodes->second; if ( elem->GetType() == SMDSAbs_Edge ) { - if(!elem->IsQuadratic()) { - // create a ceiling edge - myLastCreatedElems.Append(aMesh->AddEdge(vecNewNodes[ 0 ]->second.back(), - vecNewNodes[ 1 ]->second.back())); + // create a ceiling edge + if (!elem->IsQuadratic()) { + if ( !aMesh->FindEdge( vecNewNodes[ 0 ]->second.back(), + vecNewNodes[ 1 ]->second.back())) + myLastCreatedElems.Append(aMesh->AddEdge(vecNewNodes[ 0 ]->second.back(), + vecNewNodes[ 1 ]->second.back())); } else { - // create a ceiling edge - myLastCreatedElems.Append(aMesh->AddEdge(vecNewNodes[ 0 ]->second.back(), - vecNewNodes[ 1 ]->second.back(), - vecNewNodes[ 2 ]->second.back())); + if ( !aMesh->FindEdge( vecNewNodes[ 0 ]->second.back(), + vecNewNodes[ 1 ]->second.back(), + vecNewNodes[ 2 ]->second.back())) + myLastCreatedElems.Append(aMesh->AddEdge(vecNewNodes[ 0 ]->second.back(), + vecNewNodes[ 1 ]->second.back(), + vecNewNodes[ 2 ]->second.back())); } } if ( elem->GetType() != SMDSAbs_Face ) @@ -2990,10 +3000,10 @@ static void makeWalls (SMESHDS_Mesh* aMesh, set aFaceLastNodes; int iNode, nbNodes = vecNewNodes.size(); if(!elem->IsQuadratic()) { - // loop on a face nodes + // loop on the face nodes for ( iNode = 0; iNode < nbNodes; iNode++ ) { aFaceLastNodes.insert( vecNewNodes[ iNode ]->second.back() ); - // look for free links of a face + // look for free links of the face int iNext = ( iNode + 1 == nbNodes ) ? 0 : iNode + 1; const SMDS_MeshNode* n1 = vecNewNodes[ iNode ]->first; const SMDS_MeshNode* n2 = vecNewNodes[ iNext ]->first; @@ -3070,6 +3080,7 @@ static void makeWalls (SMESHDS_Mesh* aMesh, continue; // create faces for all steps + // if such a face has been already created by sweep of edge, assure that its orientation is OK for ( iStep = 0; iStep < nbSteps; iStep++ ) { vTool.Set( *v ); vTool.SetExternalNormal(); @@ -3077,34 +3088,51 @@ static void makeWalls (SMESHDS_Mesh* aMesh, for ( ; ind != fInd.end(); ind++ ) { const SMDS_MeshNode** nodes = vTool.GetFaceNodes( *ind ); int nbn = vTool.NbFaceNodes( *ind ); - //switch ( vTool.NbFaceNodes( *ind ) ) { switch ( nbn ) { - case 3: - myLastCreatedElems.Append(aMesh->AddFace( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ] )); break; - case 4: - myLastCreatedElems.Append(aMesh->AddFace( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ], nodes[ 3 ] )); break; + case 3: { ///// triangle + const SMDS_MeshFace * f = aMesh->FindFace( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ]); + if ( !f ) + myLastCreatedElems.Append(aMesh->AddFace( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ] )); + else if ( nodes[ 1 ] != f->GetNode( f->GetNodeIndex( nodes[ 0 ] ) + 1 )) + aMesh->ChangeElementNodes( f, nodes, nbn ); + break; + } + case 4: { ///// quadrangle + const SMDS_MeshFace * f = aMesh->FindFace( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ], nodes[ 3 ]); + if ( !f ) + myLastCreatedElems.Append(aMesh->AddFace( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ], nodes[ 3 ] )); + else if ( nodes[ 1 ] != f->GetNode( f->GetNodeIndex( nodes[ 0 ] ) + 1 )) + aMesh->ChangeElementNodes( f, nodes, nbn ); + break; + } default: - { - if( (*v)->IsQuadratic() ) { - if(nbn==6) { + if( (*v)->IsQuadratic() ) { + if(nbn==6) { /////// quadratic triangle + const SMDS_MeshFace * f = aMesh->FindFace( nodes[0], nodes[2], nodes[4], + nodes[1], nodes[3], nodes[5] ); + if ( !f ) myLastCreatedElems.Append(aMesh->AddFace(nodes[0], nodes[2], nodes[4], - nodes[1], nodes[3], nodes[5])); break; - } - else { - myLastCreatedElems.Append(aMesh->AddFace(nodes[0], nodes[2], nodes[4], nodes[6], - nodes[1], nodes[3], nodes[5], nodes[7])); - break; - } + nodes[1], nodes[3], nodes[5])); + else if ( nodes[ 2 ] != f->GetNode( f->GetNodeIndex( nodes[ 0 ] ) + 1 )) + aMesh->ChangeElementNodes( f, nodes, nbn ); } - else { - int nbPolygonNodes = vTool.NbFaceNodes( *ind ); - vector polygon_nodes (nbPolygonNodes); - for (int inode = 0; inode < nbPolygonNodes; inode++) { - polygon_nodes[inode] = nodes[inode]; - } - myLastCreatedElems.Append(aMesh->AddPolygonalFace(polygon_nodes)); + else { /////// quadratic quadrangle + const SMDS_MeshFace * f = aMesh->FindFace( nodes[0], nodes[2], nodes[4], nodes[6], + nodes[1], nodes[3], nodes[5], nodes[7] ); + if ( !f ) + myLastCreatedElems.Append(aMesh->AddFace(nodes[0], nodes[2], nodes[4], nodes[6], + nodes[1], nodes[3], nodes[5], nodes[7])); + else if ( nodes[ 2 ] != f->GetNode( f->GetNodeIndex( nodes[ 0 ] ) + 1 )) + aMesh->ChangeElementNodes( f, nodes, nbn ); } - break; + } + else { //////// polygon + vector polygon_nodes ( nodes, &nodes[nbn] ); + const SMDS_MeshFace * f = aMesh->FindFace( polygon_nodes ); + if ( !f ) + myLastCreatedElems.Append(aMesh->AddPolygonalFace(polygon_nodes)); + else if ( nodes[ 1 ] != f->GetNode( f->GetNodeIndex( nodes[ 0 ] ) + 1 )) + aMesh->ChangeElementNodes( f, nodes, nbn ); } } } @@ -3136,36 +3164,29 @@ static void makeWalls (SMESHDS_Mesh* aMesh, myLastCreatedElems.Append(aMesh->AddFace( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ], nodes[ 3 ] )); break; default: - { - if(itElem->second.back()->IsQuadratic()) { - if(nbn==6) { - if (!hasFreeLinks || - !aMesh->FindFace(nodes[0], nodes[2], nodes[4], - nodes[1], nodes[3], nodes[5]) ) { - myLastCreatedElems.Append(aMesh->AddFace(nodes[0], nodes[2], nodes[4], - nodes[1], nodes[3], nodes[5])); break; - } - } - else { // nbn==8 - if (!hasFreeLinks || - !aMesh->FindFace(nodes[0], nodes[2], nodes[4], nodes[6], - nodes[1], nodes[3], nodes[5], nodes[7]) ) - myLastCreatedElems.Append(aMesh->AddFace(nodes[0], nodes[2], nodes[4], nodes[6], - nodes[1], nodes[3], nodes[5], nodes[7])); + if(itElem->second.back()->IsQuadratic()) { + if(nbn==6) { + if (!hasFreeLinks || + !aMesh->FindFace(nodes[0], nodes[2], nodes[4], + nodes[1], nodes[3], nodes[5]) ) { + myLastCreatedElems.Append(aMesh->AddFace(nodes[0], nodes[2], nodes[4], + nodes[1], nodes[3], nodes[5])); } } - else { - int nbPolygonNodes = lastVol.NbFaceNodes( iF ); - vector polygon_nodes (nbPolygonNodes); - for (int inode = 0; inode < nbPolygonNodes; inode++) { - polygon_nodes[inode] = nodes[inode]; - } - if (!hasFreeLinks || !aMesh->FindFace(polygon_nodes)) - myLastCreatedElems.Append(aMesh->AddPolygonalFace(polygon_nodes)); + else { // nbn==8 + if (!hasFreeLinks || + !aMesh->FindFace(nodes[0], nodes[2], nodes[4], nodes[6], + nodes[1], nodes[3], nodes[5], nodes[7]) ) + myLastCreatedElems.Append(aMesh->AddFace(nodes[0], nodes[2], nodes[4], nodes[6], + nodes[1], nodes[3], nodes[5], nodes[7])); } } - break; - } + else { + vector polygon_nodes ( nodes, &nodes[nbn] ); + if (!hasFreeLinks || !aMesh->FindFace(polygon_nodes)) + myLastCreatedElems.Append(aMesh->AddPolygonalFace(polygon_nodes)); + } + } // switch } } // loop on swept elements } diff --git a/src/SMESH/SMESH_MeshEditor.hxx b/src/SMESH/SMESH_MeshEditor.hxx index d09fb2de4..9373b832c 100644 --- a/src/SMESH/SMESH_MeshEditor.hxx +++ b/src/SMESH/SMESH_MeshEditor.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/SMESH_MesherHelper.cxx b/src/SMESH/SMESH_MesherHelper.cxx index fbae68b88..fd0a0dcfb 100644 --- a/src/SMESH/SMESH_MesherHelper.cxx +++ b/src/SMESH/SMESH_MesherHelper.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: SMESH_MesherHelper.cxx // Created: 15.02.06 15:22:41 diff --git a/src/SMESH/SMESH_MesherHelper.hxx b/src/SMESH/SMESH_MesherHelper.hxx index e6ec365ac..4ae2101ec 100644 --- a/src/SMESH/SMESH_MesherHelper.hxx +++ b/src/SMESH/SMESH_MesherHelper.hxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: SMESH_MesherHelper.hxx // Created: 15.02.06 14:48:09 diff --git a/src/SMESH/SMESH_Pattern.cxx b/src/SMESH/SMESH_Pattern.cxx index b5d732f58..61b0fa841 100644 --- a/src/SMESH/SMESH_Pattern.cxx +++ b/src/SMESH/SMESH_Pattern.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // File : SMESH_Pattern.hxx // Created : Mon Aug 2 10:30:00 2004 diff --git a/src/SMESH/SMESH_Pattern.hxx b/src/SMESH/SMESH_Pattern.hxx index b9688216c..3a487277b 100644 --- a/src/SMESH/SMESH_Pattern.hxx +++ b/src/SMESH/SMESH_Pattern.hxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // File : SMESH_Pattern.hxx // Created : Mon Aug 2 10:30:00 2004 diff --git a/src/SMESH/SMESH_SequenceOfElemPtr.hxx b/src/SMESH/SMESH_SequenceOfElemPtr.hxx index 6c0b740ed..d46d52ce3 100644 --- a/src/SMESH/SMESH_SequenceOfElemPtr.hxx +++ b/src/SMESH/SMESH_SequenceOfElemPtr.hxx @@ -15,12 +15,11 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: SMESH_SequenceOfElemPtr.hxx // Created: 26.09.05 17:41:10 // Author: Sergey KUUL -// Copyright: Airbus Industries 2004 #ifndef SMESH_SequenceOfElemPtr_HeaderFile @@ -28,7 +27,6 @@ #include -//#include #include typedef const SMDS_MeshElement* SMDS_MeshElementPtr; diff --git a/src/SMESH/SMESH_SequenceOfNode.hxx b/src/SMESH/SMESH_SequenceOfNode.hxx index 21b648a06..8d8f7d5f5 100644 --- a/src/SMESH/SMESH_SequenceOfNode.hxx +++ b/src/SMESH/SMESH_SequenceOfNode.hxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: SMESH_SequenceOfNode.hxx // Created: 11.11.05 10:00:04 diff --git a/src/SMESH/SMESH_subMesh.cxx b/src/SMESH/SMESH_subMesh.cxx index 13423354e..c968ac91a 100644 --- a/src/SMESH/SMESH_subMesh.cxx +++ b/src/SMESH/SMESH_subMesh.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH/SMESH_subMesh.hxx b/src/SMESH/SMESH_subMesh.hxx index 5c5b92ec6..e8f117575 100644 --- a/src/SMESH/SMESH_subMesh.hxx +++ b/src/SMESH/SMESH_subMesh.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHClient/Makefile.in b/src/SMESHClient/Makefile.in index 39b084a65..d367f0d27 100644 --- a/src/SMESHClient/Makefile.in +++ b/src/SMESHClient/Makefile.in @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -43,19 +43,19 @@ LIB = libSMESHClient.la LIB_SRC = SMESH_Client.cxx LIB_CLIENT_IDL = SALOME_Comm.idl \ - SALOME_Component.idl \ - SALOMEDS.idl \ - SALOMEDS_Attributes.idl \ - SALOME_Exception.idl \ - SALOME_GenericObj.idl \ - SMESH_Mesh.idl \ - SMESH_Gen.idl \ - SMESH_Group.idl \ - SMESH_Hypothesis.idl \ - SMESH_Pattern.idl \ - SMESH_Filter.idl \ - GEOM_Gen.idl \ - MED.idl + SALOME_Component.idl \ + SALOMEDS.idl \ + SALOMEDS_Attributes.idl \ + SALOME_Exception.idl \ + SALOME_GenericObj.idl \ + SMESH_Mesh.idl \ + SMESH_Gen.idl \ + SMESH_Group.idl \ + SMESH_Hypothesis.idl \ + SMESH_Pattern.idl \ + SMESH_Filter.idl \ + GEOM_Gen.idl \ + MED.idl # Executables targets BIN = SMESHClientBin @@ -64,32 +64,38 @@ BIN_CLIENT_IDL = BIN_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) LDFLAGS += $(OCC_KERNEL_LIBS) \ - -L${KERNEL_ROOT_DIR}/lib/salome \ - -L${GEOM_ROOT_DIR}/lib/salome \ - -L${MED_ROOT_DIR}/lib/salome \ - -lSMDS \ - -lSMESHimpl \ - -lSMESHDS \ - -lSMESHControls \ - -lNMTTools \ - -lNMTDS \ - -lmed_V2_1 \ - -lMEDWrapper \ - -lMEDWrapperBase \ - -lMEDWrapper_V2_1 \ - -lMEDWrapper_V2_2 \ - -lSalomeResourcesManager \ - -lSalomeLifeCycleCORBA \ - -lSalomeNotification \ - -lSalomeContainer \ - -lRegistry \ - -lSalomeNS \ - -lSALOMELocalTrace \ - -lSALOMEBasics \ - -lOpUtil + $(KERNEL_LDFLAGS) \ + $(GEOM_LDFLAGS) \ + $(MED_LDFLAGS) \ + -lSMDS \ + -lSMESHimpl \ + -lSMESHDS \ + -lSMESHControls \ + -lNMTTools \ + -lNMTDS \ + -lmed_V2_1 \ + -lMEDWrapper \ + -lMEDWrapperBase \ + -lMEDWrapper_V2_1 \ + -lMEDWrapper_V2_2 \ + -lSalomeResourcesManager \ + -lSalomeLifeCycleCORBA \ + -lSalomeNotification \ + -lSalomeContainer \ + -lRegistry \ + -lSalomeNS \ + -lSALOMELocalTrace \ + -lSALOMEBasics \ + -lOpUtil \ + -lTKShHealing \ + -lMeshDriverDAT \ + -lMeshDriverSTL \ + -lMeshDriverMED \ + -lMeshDriverUNV \ + -lMeshDriver LDFLAGSFORBIN += $(LDFLAGS) diff --git a/src/SMESHClient/SMESHClientBin.cxx b/src/SMESHClient/SMESHClientBin.cxx index 0ac9bf899..998d10727 100644 --- a/src/SMESHClient/SMESHClientBin.cxx +++ b/src/SMESHClient/SMESHClientBin.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : // Author : diff --git a/src/SMESHClient/SMESH_Client.cxx b/src/SMESHClient/SMESH_Client.cxx index 53ccca665..bd52bc042 100644 --- a/src/SMESHClient/SMESH_Client.cxx +++ b/src/SMESHClient/SMESH_Client.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHClient/SMESH_Client.hxx b/src/SMESHClient/SMESH_Client.hxx index 646811051..cc17cf88c 100644 --- a/src/SMESHClient/SMESH_Client.hxx +++ b/src/SMESHClient/SMESH_Client.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHDS/Makefile.in b/src/SMESHDS/Makefile.in index 50d4fa742..a182eaa83 100644 --- a/src/SMESHDS/Makefile.in +++ b/src/SMESHDS/Makefile.in @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -70,8 +70,8 @@ EXPORT_HEADERS= \ SMESHDS_GroupOnGeom.hxx # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) LDFLAGS += $(OCC_KERNEL_LIBS) -lSMDS diff --git a/src/SMESHDS/SMESHDS_Command.cxx b/src/SMESHDS/SMESHDS_Command.cxx index 7de0dc637..8ce255c7f 100644 --- a/src/SMESHDS/SMESHDS_Command.cxx +++ b/src/SMESHDS/SMESHDS_Command.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHDS/SMESHDS_Command.hxx b/src/SMESHDS/SMESHDS_Command.hxx index 7f1e3dbd3..91d81d452 100644 --- a/src/SMESHDS/SMESHDS_Command.hxx +++ b/src/SMESHDS/SMESHDS_Command.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHDS/SMESHDS_CommandType.hxx b/src/SMESHDS/SMESHDS_CommandType.hxx index 2f7455a58..9a11105b1 100644 --- a/src/SMESHDS/SMESHDS_CommandType.hxx +++ b/src/SMESHDS/SMESHDS_CommandType.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHDS/SMESHDS_Document.cxx b/src/SMESHDS/SMESHDS_Document.cxx index 8529c2b24..87fb9a0d4 100644 --- a/src/SMESHDS/SMESHDS_Document.cxx +++ b/src/SMESHDS/SMESHDS_Document.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHDS/SMESHDS_Document.hxx b/src/SMESHDS/SMESHDS_Document.hxx index 7378573ec..8a195db44 100644 --- a/src/SMESHDS/SMESHDS_Document.hxx +++ b/src/SMESHDS/SMESHDS_Document.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHDS/SMESHDS_Group.cxx b/src/SMESHDS/SMESHDS_Group.cxx index c193e91d0..1955f56bf 100644 --- a/src/SMESHDS/SMESHDS_Group.cxx +++ b/src/SMESHDS/SMESHDS_Group.cxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHDS/SMESHDS_Group.hxx b/src/SMESHDS/SMESHDS_Group.hxx index b318a0f97..c4ec5ec78 100644 --- a/src/SMESHDS/SMESHDS_Group.hxx +++ b/src/SMESHDS/SMESHDS_Group.hxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHDS/SMESHDS_GroupBase.cxx b/src/SMESHDS/SMESHDS_GroupBase.cxx index c4adcc53b..52b21e168 100644 --- a/src/SMESHDS/SMESHDS_GroupBase.cxx +++ b/src/SMESHDS/SMESHDS_GroupBase.cxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHDS/SMESHDS_GroupBase.hxx b/src/SMESHDS/SMESHDS_GroupBase.hxx index 1902f8e9d..d0095dec6 100644 --- a/src/SMESHDS/SMESHDS_GroupBase.hxx +++ b/src/SMESHDS/SMESHDS_GroupBase.hxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHDS/SMESHDS_GroupOnGeom.cxx b/src/SMESHDS/SMESHDS_GroupOnGeom.cxx index 187357a67..ede4f0566 100644 --- a/src/SMESHDS/SMESHDS_GroupOnGeom.cxx +++ b/src/SMESHDS/SMESHDS_GroupOnGeom.cxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHDS/SMESHDS_GroupOnGeom.hxx b/src/SMESHDS/SMESHDS_GroupOnGeom.hxx index 6a514e2f1..bbf2cd35a 100644 --- a/src/SMESHDS/SMESHDS_GroupOnGeom.hxx +++ b/src/SMESHDS/SMESHDS_GroupOnGeom.hxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHDS/SMESHDS_Hypothesis.cxx b/src/SMESHDS/SMESHDS_Hypothesis.cxx index 29501c440..023ebf20b 100644 --- a/src/SMESHDS/SMESHDS_Hypothesis.cxx +++ b/src/SMESHDS/SMESHDS_Hypothesis.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHDS/SMESHDS_Hypothesis.hxx b/src/SMESHDS/SMESHDS_Hypothesis.hxx index 9fb413fbd..51c5ef486 100644 --- a/src/SMESHDS/SMESHDS_Hypothesis.hxx +++ b/src/SMESHDS/SMESHDS_Hypothesis.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHDS/SMESHDS_Mesh.cxx b/src/SMESHDS/SMESHDS_Mesh.cxx index 6fab4c837..d8a1d5942 100644 --- a/src/SMESHDS/SMESHDS_Mesh.cxx +++ b/src/SMESHDS/SMESHDS_Mesh.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHDS/SMESHDS_Mesh.hxx b/src/SMESHDS/SMESHDS_Mesh.hxx index 61d223ebb..cecd0f33f 100644 --- a/src/SMESHDS/SMESHDS_Mesh.hxx +++ b/src/SMESHDS/SMESHDS_Mesh.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHDS/SMESHDS_Script.cxx b/src/SMESHDS/SMESHDS_Script.cxx index de9883a97..d5eea6ecc 100644 --- a/src/SMESHDS/SMESHDS_Script.cxx +++ b/src/SMESHDS/SMESHDS_Script.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHDS/SMESHDS_Script.hxx b/src/SMESHDS/SMESHDS_Script.hxx index a74f10d71..01108d3b8 100644 --- a/src/SMESHDS/SMESHDS_Script.hxx +++ b/src/SMESHDS/SMESHDS_Script.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHDS/SMESHDS_SubMesh.cxx b/src/SMESHDS/SMESHDS_SubMesh.cxx index 5bdbfc6a4..262649e86 100644 --- a/src/SMESHDS/SMESHDS_SubMesh.cxx +++ b/src/SMESHDS/SMESHDS_SubMesh.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHDS/SMESHDS_SubMesh.hxx b/src/SMESHDS/SMESHDS_SubMesh.hxx index ac3cd1c3f..36617577e 100644 --- a/src/SMESHDS/SMESHDS_SubMesh.hxx +++ b/src/SMESHDS/SMESHDS_SubMesh.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHFiltersSelection/Handle_SMESH_TypeFilter.hxx b/src/SMESHFiltersSelection/Handle_SMESH_TypeFilter.hxx index 79db47025..7a825b03d 100644 --- a/src/SMESHFiltersSelection/Handle_SMESH_TypeFilter.hxx +++ b/src/SMESHFiltersSelection/Handle_SMESH_TypeFilter.hxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Transient) +// SMESH SMDS : implementaion of Salome mesh data structure // -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2003 OPEN CASCADE +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_SMESH_TypeFilter_HeaderFile #define _Handle_SMESH_TypeFilter_HeaderFile diff --git a/src/SMESHFiltersSelection/Makefile.in b/src/SMESHFiltersSelection/Makefile.in index 8d4c875a5..c1e928244 100644 --- a/src/SMESHFiltersSelection/Makefile.in +++ b/src/SMESHFiltersSelection/Makefile.in @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -41,7 +41,8 @@ LIB_SRC = SMESH_TypeFilter.cxx \ SMESH_NumberFilter.cxx \ SMESH_LogicalFilter.cxx -LIB_CLIENT_IDL = SALOME_Exception.idl \ +LIB_CLIENT_IDL = SALOME_Comm.idl \ + SALOME_Exception.idl \ GEOM_Gen.idl \ SMESH_Gen.idl \ SMESH_Mesh.idl \ @@ -54,7 +55,6 @@ LIB_CLIENT_IDL = SALOME_Exception.idl \ SMESH_Filter.idl \ SMESH_Pattern.idl \ SALOME_GenericObj.idl \ - SALOME_Comm.idl \ MED.idl # header files @@ -65,11 +65,11 @@ EXPORT_HEADERS= SMESH_Type.h \ # additionnal information to compil and link file CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) \ - -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \ - -I${GEOM_ROOT_DIR}/include/salome ${BOOST_CPPFLAGS} -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \ - -I${GEOM_ROOT_DIR}/include/salome -I${BOOSTDIR} -LDFLAGS += $(OCC_KERNEL_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeDSClient -lSalomeDS -L${GUI_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -lSalomeApp -lsuit + $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) \ + $(GEOM_CXXFLAGS) ${BOOST_CPPFLAGS} +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) \ + $(GEOM_CXXFLAGS) -I${BOOSTDIR} +LDFLAGS += $(OCC_KERNEL_LIBS) $(KERNEL_LDFLAGS) -lSalomeDSClient -lSalomeDS $(GUI_LDFLAGS) $(GEOM_LDFLAGS) -lSalomeApp -lsuit # additional file to be cleaned MOSTLYCLEAN = diff --git a/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx b/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx index 5033f8e13..57cfea757 100644 --- a/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx +++ b/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : SMESH_LogicalFilter.cxx // Module : SMESH diff --git a/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx b/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx index 609865680..b5f62c9f7 100644 --- a/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx +++ b/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : SMESH_LogicalFilter.hxx // Module : SMESH diff --git a/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx b/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx index 176cd3fb6..929401562 100644 --- a/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx +++ b/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : SMESH_NumberFilter.cxx // Module : SMESH diff --git a/src/SMESHFiltersSelection/SMESH_NumberFilter.hxx b/src/SMESHFiltersSelection/SMESH_NumberFilter.hxx index 4b9f29cea..c4d3d8418 100644 --- a/src/SMESHFiltersSelection/SMESH_NumberFilter.hxx +++ b/src/SMESHFiltersSelection/SMESH_NumberFilter.hxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : SMESH_NumberFilter.hxx // Module : SMESH diff --git a/src/SMESHFiltersSelection/SMESH_Type.h b/src/SMESHFiltersSelection/SMESH_Type.h index e4d376832..03d63d19d 100644 --- a/src/SMESHFiltersSelection/SMESH_Type.h +++ b/src/SMESHFiltersSelection/SMESH_Type.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : SMESH_Type.h // Created : Mon Jun 03 15:14:15 2002 diff --git a/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx b/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx index bac11fe18..1b2d9ee29 100644 --- a/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx +++ b/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "SMESH_TypeFilter.hxx" diff --git a/src/SMESHFiltersSelection/SMESH_TypeFilter.hxx b/src/SMESHFiltersSelection/SMESH_TypeFilter.hxx index 46724b6b7..c31cc577b 100644 --- a/src/SMESHFiltersSelection/SMESH_TypeFilter.hxx +++ b/src/SMESHFiltersSelection/SMESH_TypeFilter.hxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : SMESH_TypeFilter.hxx // Module : SMESH diff --git a/src/SMESHFiltersSelection/SMESH_TypeFilter.ixx b/src/SMESHFiltersSelection/SMESH_TypeFilter.ixx index a01d02ee0..66c04efb2 100644 --- a/src/SMESHFiltersSelection/SMESH_TypeFilter.ixx +++ b/src/SMESHFiltersSelection/SMESH_TypeFilter.ixx @@ -1,17 +1,23 @@ -// File generated by CPPExt (Transient) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// SMESH SMDS : implementaion of Salome mesh data structure // +// Copyright (C) 2003 OPEN CASCADE +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include "SMESH_TypeFilter.jxx" #ifndef _Standard_TypeMismatch_HeaderFile diff --git a/src/SMESHFiltersSelection/SMESH_TypeFilter.jxx b/src/SMESHFiltersSelection/SMESH_TypeFilter.jxx index 2439074c8..508424ba9 100644 --- a/src/SMESHFiltersSelection/SMESH_TypeFilter.jxx +++ b/src/SMESHFiltersSelection/SMESH_TypeFilter.jxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _SMESH_TypeFilter_HeaderFile #include "SMESH_TypeFilter.hxx" diff --git a/src/SMESHGUI/Makefile.in b/src/SMESHGUI/Makefile.in index f600730c8..6871db105 100644 --- a/src/SMESHGUI/Makefile.in +++ b/src/SMESHGUI/Makefile.in @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -183,16 +183,16 @@ LIB_SERVER_IDL = #BIN = SMESHBin CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) \ - -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \ - -I${GEOM_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) + $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) \ + $(GEOM_CXXFLAGS) $(BOOST_CPPFLAGS) -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \ - -I${GEOM_ROOT_DIR}/include/salome +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) \ + $(GEOM_CXXFLAGS) LDFLAGS += -lSMESHObject -lSMESHFiltersSelection -lSMDS -lSMESHControls -lDlgRef \ - $(OCC_KERNEL_LIBS) -lTKBO -lTKAdvTools -L${KERNEL_ROOT_DIR}/lib/salome -L${GUI_ROOT_DIR}/lib/salome \ + $(OCC_KERNEL_LIBS) -lTKBO -lTKAdvTools $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) \ -lVTKViewer -lSalomeDSClient -lSalomeDS -lSalomeApp -lSalomePrs -lSalomeNS -lSalomeLifeCycleCORBA -lOpUtil -lSalomeObject \ - -lEvent -lSALOMELocalTrace -lSVTK -lOCCViewer -L${GEOM_ROOT_DIR}/lib/salome -lGEOM -lGEOMClient \ + -lEvent -lSALOMELocalTrace -lSVTK -lOCCViewer $(GEOM_LDFLAGS) -lGEOM -lGEOMClient \ -lGEOMBase -lGEOMObject -lGEOMFiltersSelection -lSalomeSession LDFLAGSFORBIN += $(LDFLAGS) diff --git a/src/SMESHGUI/SMESHBin.cxx b/src/SMESHGUI/SMESHBin.cxx index 3f87afeea..26da45734 100644 --- a/src/SMESHGUI/SMESHBin.cxx +++ b/src/SMESHGUI/SMESHBin.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // int main(int argc, char** argv){ return 0; diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index 47e2ee0b6..fe7994306 100644 --- a/src/SMESHGUI/SMESHGUI.cxx +++ b/src/SMESHGUI/SMESHGUI.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : SMESHGUI.cxx // Author : Nicolas REJNERI diff --git a/src/SMESHGUI/SMESHGUI.h b/src/SMESHGUI/SMESHGUI.h index 2115e2650..72f756e46 100644 --- a/src/SMESHGUI/SMESHGUI.h +++ b/src/SMESHGUI/SMESHGUI.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx index 28eba22e9..d7b4cb35b 100644 --- a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h index d91e8853b..7c710214e 100644 --- a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h +++ b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx index ac7ff0b83..da47fe190 100644 --- a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "SMESHGUI_AddQuadraticElementDlg.h" diff --git a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.h b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.h index 987a98c0a..ea63a83ec 100644 --- a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.h +++ b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef DIALOGBOX_ADD_QUADRATIC_ELEMENT_H #define DIALOGBOX_ADD_QUADRATIC_ELEMENT_H diff --git a/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx b/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx index 7770056ac..e513577b9 100644 --- a/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_ClippingDlg.h b/src/SMESHGUI/SMESHGUI_ClippingDlg.h index a9629699f..cbf044f60 100644 --- a/src/SMESHGUI/SMESHGUI_ClippingDlg.h +++ b/src/SMESHGUI/SMESHGUI_ClippingDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_ConvToQuadDlg.cxx b/src/SMESHGUI/SMESHGUI_ConvToQuadDlg.cxx index 1f5324781..6c2cf5dab 100644 --- a/src/SMESHGUI/SMESHGUI_ConvToQuadDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ConvToQuadDlg.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /** * SMESH SMESHGUI diff --git a/src/SMESHGUI/SMESHGUI_ConvToQuadDlg.h b/src/SMESHGUI/SMESHGUI_ConvToQuadDlg.h index 596b823a7..68d024bc6 100644 --- a/src/SMESHGUI/SMESHGUI_ConvToQuadDlg.h +++ b/src/SMESHGUI/SMESHGUI_ConvToQuadDlg.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /** * SMESH SMESHGUI diff --git a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx index a88743f2f..a5095e6a9 100644 --- a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx +++ b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /** * SMESH SMESHGUI diff --git a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.h b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.h index bc862f97b..129a4b91a 100644 --- a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.h +++ b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /** * SMESH SMESHGUI diff --git a/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx b/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx index 5545054d9..f4ed56a4b 100755 --- a/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_CreatePatternDlg.h b/src/SMESHGUI/SMESHGUI_CreatePatternDlg.h index 1c2c714c2..b7c1db78f 100755 --- a/src/SMESHGUI/SMESHGUI_CreatePatternDlg.h +++ b/src/SMESHGUI/SMESHGUI_CreatePatternDlg.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx index 5a8f950a7..7b0da5d83 100644 --- a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.h b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.h index b7d07df22..001351c3f 100644 --- a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.h +++ b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx b/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx index 69723cca2..9e02ccc4a 100644 --- a/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.h b/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.h index baf88c398..da8b62a9c 100644 --- a/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.h +++ b/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_Dialog.cxx b/src/SMESHGUI/SMESHGUI_Dialog.cxx index fc5938927..6736a5890 100644 --- a/src/SMESHGUI/SMESHGUI_Dialog.cxx +++ b/src/SMESHGUI/SMESHGUI_Dialog.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_Dialog.h b/src/SMESHGUI/SMESHGUI_Dialog.h index 00a2b4e7e..211860a54 100644 --- a/src/SMESHGUI/SMESHGUI_Dialog.h +++ b/src/SMESHGUI/SMESHGUI_Dialog.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_Displayer.cxx b/src/SMESHGUI/SMESHGUI_Displayer.cxx index 4f1a2457e..e039e1311 100644 --- a/src/SMESHGUI/SMESHGUI_Displayer.cxx +++ b/src/SMESHGUI/SMESHGUI_Displayer.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_Displayer.h b/src/SMESHGUI/SMESHGUI_Displayer.h index 8b030526e..815c5e1c4 100644 --- a/src/SMESHGUI/SMESHGUI_Displayer.h +++ b/src/SMESHGUI/SMESHGUI_Displayer.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx index 6ba65dd80..28401a22a 100644 --- a/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "SMESHGUI_EditMeshDlg.h" diff --git a/src/SMESHGUI/SMESHGUI_EditMeshDlg.h b/src/SMESHGUI/SMESHGUI_EditMeshDlg.h index 19069bf21..a69883fa6 100644 --- a/src/SMESHGUI/SMESHGUI_EditMeshDlg.h +++ b/src/SMESHGUI/SMESHGUI_EditMeshDlg.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef DIALOGBOX_GETMESH_H diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx b/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx index bf2aa3306..f8a3903a5 100644 --- a/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.h b/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.h index 7bbb8ce23..296c0a925 100644 --- a/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.h +++ b/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx index 16916a826..70fa135ad 100644 --- a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h index 3e2d421c0..55b7d2bf7 100644 --- a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h +++ b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_Filter.cxx b/src/SMESHGUI/SMESHGUI_Filter.cxx index e1c486fd7..bb0905239 100755 --- a/src/SMESHGUI/SMESHGUI_Filter.cxx +++ b/src/SMESHGUI/SMESHGUI_Filter.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_Filter.h b/src/SMESHGUI/SMESHGUI_Filter.h index 0114f38b8..c78cfe5ee 100755 --- a/src/SMESHGUI/SMESHGUI_Filter.h +++ b/src/SMESHGUI/SMESHGUI_Filter.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx index d04574b23..6826b0fc9 100755 --- a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.h b/src/SMESHGUI/SMESHGUI_FilterDlg.h index 5c1cfd5b5..635b37242 100755 --- a/src/SMESHGUI/SMESHGUI_FilterDlg.h +++ b/src/SMESHGUI/SMESHGUI_FilterDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx b/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx index 52ff8d24d..a131436a9 100644 --- a/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.h b/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.h index 8fd9700b0..8b464b84e 100644 --- a/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.h +++ b/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_FilterUtils.cxx b/src/SMESHGUI/SMESHGUI_FilterUtils.cxx index e5c529f16..c0e08a0cb 100644 --- a/src/SMESHGUI/SMESHGUI_FilterUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_FilterUtils.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "SMESHGUI_FilterUtils.h" diff --git a/src/SMESHGUI/SMESHGUI_FilterUtils.h b/src/SMESHGUI/SMESHGUI_FilterUtils.h index 6b8c75862..aec43960c 100644 --- a/src/SMESHGUI/SMESHGUI_FilterUtils.h +++ b/src/SMESHGUI/SMESHGUI_FilterUtils.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef SMESHGUI_FilterUtils_HeaderFile #define SMESHGUI_FilterUtils_HeaderFile diff --git a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx index 4ea7e9180..520499301 100644 --- a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.h b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.h index 6f2ccb9b3..76ff62407 100644 --- a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.h +++ b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef SMESHGUI_GEOMGenUtils_HeaderFile #define SMESHGUI_GEOMGenUtils_HeaderFile diff --git a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx index 3f83a3ea6..872d98a15 100644 --- a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_GroupDlg.h b/src/SMESHGUI/SMESHGUI_GroupDlg.h index b78709be2..c3fae7deb 100644 --- a/src/SMESHGUI/SMESHGUI_GroupDlg.h +++ b/src/SMESHGUI/SMESHGUI_GroupDlg.h @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx index d607b9daf..8ec058c01 100644 --- a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_GroupOpDlg.h b/src/SMESHGUI/SMESHGUI_GroupOpDlg.h index 6d4bb2f91..89e4d3ccc 100644 --- a/src/SMESHGUI/SMESHGUI_GroupOpDlg.h +++ b/src/SMESHGUI/SMESHGUI_GroupOpDlg.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_GroupUtils.cxx b/src/SMESHGUI/SMESHGUI_GroupUtils.cxx index d2aa17f3a..86063b09c 100644 --- a/src/SMESHGUI/SMESHGUI_GroupUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_GroupUtils.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "SMESHGUI_GroupUtils.h" diff --git a/src/SMESHGUI/SMESHGUI_GroupUtils.h b/src/SMESHGUI/SMESHGUI_GroupUtils.h index 9cd9783c1..207593d3f 100644 --- a/src/SMESHGUI/SMESHGUI_GroupUtils.h +++ b/src/SMESHGUI/SMESHGUI_GroupUtils.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef SMESHGUI_GroupUtils_HeaderFile #define SMESHGUI_GroupUtils_HeaderFile diff --git a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx index a5da9b73a..6e90a7093 100644 --- a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx +++ b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "SMESHGUI_Hypotheses.h" diff --git a/src/SMESHGUI/SMESHGUI_Hypotheses.h b/src/SMESHGUI/SMESHGUI_Hypotheses.h index 47546d233..43ad6734c 100644 --- a/src/SMESHGUI/SMESHGUI_Hypotheses.h +++ b/src/SMESHGUI/SMESHGUI_Hypotheses.h @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx index 556dc5591..9772724e6 100644 --- a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "SMESHGUI_HypothesesUtils.h" diff --git a/src/SMESHGUI/SMESHGUI_HypothesesUtils.h b/src/SMESHGUI/SMESHGUI_HypothesesUtils.h index 15767b0f7..b8ea3f846 100644 --- a/src/SMESHGUI/SMESHGUI_HypothesesUtils.h +++ b/src/SMESHGUI/SMESHGUI_HypothesesUtils.h @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_IdValidator.h b/src/SMESHGUI/SMESHGUI_IdValidator.h index 680dacba8..32004bc40 100644 --- a/src/SMESHGUI/SMESHGUI_IdValidator.h +++ b/src/SMESHGUI/SMESHGUI_IdValidator.h @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_MergeNodesDlg.cxx b/src/SMESHGUI/SMESHGUI_MergeNodesDlg.cxx index 7378a87ce..13e0a4b71 100644 --- a/src/SMESHGUI/SMESHGUI_MergeNodesDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MergeNodesDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_MergeNodesDlg.h b/src/SMESHGUI/SMESHGUI_MergeNodesDlg.h index 151ce9b15..2d50c6bbe 100644 --- a/src/SMESHGUI/SMESHGUI_MergeNodesDlg.h +++ b/src/SMESHGUI/SMESHGUI_MergeNodesDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_MeshDlg.cxx b/src/SMESHGUI/SMESHGUI_MeshDlg.cxx index e05e2022d..3d19a1278 100644 --- a/src/SMESHGUI/SMESHGUI_MeshDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshDlg.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /** * SMESH SMESHGUI diff --git a/src/SMESHGUI/SMESHGUI_MeshDlg.h b/src/SMESHGUI/SMESHGUI_MeshDlg.h index 0e97c8c30..84ca7a229 100644 --- a/src/SMESHGUI/SMESHGUI_MeshDlg.h +++ b/src/SMESHGUI/SMESHGUI_MeshDlg.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /** * SMESH SMESHGUI diff --git a/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx b/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx index d9fb08d3b..3b03a0256 100644 --- a/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_MeshInfosDlg.h b/src/SMESHGUI/SMESHGUI_MeshInfosDlg.h index d06d39033..9e44382b3 100644 --- a/src/SMESHGUI/SMESHGUI_MeshInfosDlg.h +++ b/src/SMESHGUI/SMESHGUI_MeshInfosDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx index 896e7f801..d325f77b2 100644 --- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /** * SMESH SMESHGUI diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.h b/src/SMESHGUI/SMESHGUI_MeshOp.h index 51492c3ee..cc7bae75c 100644 --- a/src/SMESHGUI/SMESHGUI_MeshOp.h +++ b/src/SMESHGUI/SMESHGUI_MeshOp.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /** * SMESH SMESHGUI diff --git a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx index 0022b3f5c..e9557f934 100755 --- a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.h b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.h index 841bb0bf0..15af7bd6d 100755 --- a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.h +++ b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx index 9c8d313c6..b8e5c3055 100644 --- a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "SMESHGUI_MeshUtils.h" diff --git a/src/SMESHGUI/SMESHGUI_MeshUtils.h b/src/SMESHGUI/SMESHGUI_MeshUtils.h index 011de3404..15a2b5472 100644 --- a/src/SMESHGUI/SMESHGUI_MeshUtils.h +++ b/src/SMESHGUI/SMESHGUI_MeshUtils.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef SMESHGUI_MeshUtils_HeaderFile #define SMESHGUI_MeshUtils_HeaderFile diff --git a/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx b/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx index ebcfd21d8..9c396ade8 100644 --- a/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_MoveNodesDlg.h b/src/SMESHGUI/SMESHGUI_MoveNodesDlg.h index d87d11e05..5544061d8 100644 --- a/src/SMESHGUI/SMESHGUI_MoveNodesDlg.h +++ b/src/SMESHGUI/SMESHGUI_MoveNodesDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx index f658c0d53..045ae5a17 100755 --- a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_MultiEditDlg.h b/src/SMESHGUI/SMESHGUI_MultiEditDlg.h index e956292ae..8cd85ccc6 100755 --- a/src/SMESHGUI/SMESHGUI_MultiEditDlg.h +++ b/src/SMESHGUI/SMESHGUI_MultiEditDlg.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_NodesDlg.cxx b/src/SMESHGUI/SMESHGUI_NodesDlg.cxx index 9ac5b9cc6..83e8c5723 100644 --- a/src/SMESHGUI/SMESHGUI_NodesDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_NodesDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_NodesDlg.h b/src/SMESHGUI/SMESHGUI_NodesDlg.h index b3bca9896..890f0c5d1 100644 --- a/src/SMESHGUI/SMESHGUI_NodesDlg.h +++ b/src/SMESHGUI/SMESHGUI_NodesDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_Operation.cxx b/src/SMESHGUI/SMESHGUI_Operation.cxx index e6ba1303b..8b62c6323 100755 --- a/src/SMESHGUI/SMESHGUI_Operation.cxx +++ b/src/SMESHGUI/SMESHGUI_Operation.cxx @@ -1,8 +1,22 @@ -// SALOME SMESHGUI -// -// Copyright (C) 2005 CEA/DEN, EDF R&D -// +// SMESH SMDS : implementaion of Salome mesh data structure // +// Copyright (C) 2003 OPEN CASCADE +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : SMESHGUI_Operation.h // Author : Sergey LITONIN diff --git a/src/SMESHGUI/SMESHGUI_Operation.h b/src/SMESHGUI/SMESHGUI_Operation.h index 66d75c27c..398f1f8d0 100755 --- a/src/SMESHGUI/SMESHGUI_Operation.h +++ b/src/SMESHGUI/SMESHGUI_Operation.h @@ -1,8 +1,22 @@ -// SALOME SMESHGUI -// -// Copyright (C) 2005 CEA/DEN, EDF R&D -// +// SMESH SMDS : implementaion of Salome mesh data structure // +// Copyright (C) 2003 OPEN CASCADE +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : SMESHGUI_Operation.h // Author : Sergey LITONIN diff --git a/src/SMESHGUI/SMESHGUI_PatternUtils.cxx b/src/SMESHGUI/SMESHGUI_PatternUtils.cxx index 718162f2b..9a63ae39a 100644 --- a/src/SMESHGUI/SMESHGUI_PatternUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_PatternUtils.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "SMESHGUI_PatternUtils.h" diff --git a/src/SMESHGUI/SMESHGUI_PatternUtils.h b/src/SMESHGUI/SMESHGUI_PatternUtils.h index fb09d01d9..1dae6288a 100644 --- a/src/SMESHGUI/SMESHGUI_PatternUtils.h +++ b/src/SMESHGUI/SMESHGUI_PatternUtils.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef SMESHGUI_PatternUtils_HeaderFile #define SMESHGUI_PatternUtils_HeaderFile diff --git a/src/SMESHGUI/SMESHGUI_PatternWidget.cxx b/src/SMESHGUI/SMESHGUI_PatternWidget.cxx index 178800a62..8deafd0eb 100644 --- a/src/SMESHGUI/SMESHGUI_PatternWidget.cxx +++ b/src/SMESHGUI/SMESHGUI_PatternWidget.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_PatternWidget.h b/src/SMESHGUI/SMESHGUI_PatternWidget.h index ddab7433b..784a16260 100644 --- a/src/SMESHGUI/SMESHGUI_PatternWidget.h +++ b/src/SMESHGUI/SMESHGUI_PatternWidget.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx index cef1b66eb..5028ed064 100644 --- a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.h b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.h index 43702b2ac..83d2dbaa6 100644 --- a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.h +++ b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx index 21f4fc917..b17a523eb 100644 --- a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h index 11fb1a9bd..1e4c8cbe2 100644 --- a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h +++ b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_Preferences_SelectionDlg.cxx b/src/SMESHGUI/SMESHGUI_Preferences_SelectionDlg.cxx index 79245d625..41d96be2d 100644 --- a/src/SMESHGUI/SMESHGUI_Preferences_SelectionDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_Preferences_SelectionDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_Preferences_SelectionDlg.h b/src/SMESHGUI/SMESHGUI_Preferences_SelectionDlg.h index 07b7a644a..b3326bfa4 100644 --- a/src/SMESHGUI/SMESHGUI_Preferences_SelectionDlg.h +++ b/src/SMESHGUI/SMESHGUI_Preferences_SelectionDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platorm.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx b/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx index f8c97166f..400d47add 100644 --- a/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.h b/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.h index 69081b2de..4b3590818 100644 --- a/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.h +++ b/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx b/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx index ae30d1dfb..db0d13e6c 100644 --- a/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.h b/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.h index e184536d0..ec18a062f 100644 --- a/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.h +++ b/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx b/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx index 117fbd49c..4e4f75a83 100644 --- a/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_RenumberingDlg.h b/src/SMESHGUI/SMESHGUI_RenumberingDlg.h index 20b583544..620606a32 100644 --- a/src/SMESHGUI/SMESHGUI_RenumberingDlg.h +++ b/src/SMESHGUI/SMESHGUI_RenumberingDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx b/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx index e56bf2560..46e23659e 100644 --- a/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_RevolutionDlg.h b/src/SMESHGUI/SMESHGUI_RevolutionDlg.h index bed182ef5..9e33d7c53 100644 --- a/src/SMESHGUI/SMESHGUI_RevolutionDlg.h +++ b/src/SMESHGUI/SMESHGUI_RevolutionDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_RotationDlg.cxx b/src/SMESHGUI/SMESHGUI_RotationDlg.cxx index 8e5777b7a..34efe7fc6 100644 --- a/src/SMESHGUI/SMESHGUI_RotationDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_RotationDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_RotationDlg.h b/src/SMESHGUI/SMESHGUI_RotationDlg.h index 31fdaf356..dcded2e23 100644 --- a/src/SMESHGUI/SMESHGUI_RotationDlg.h +++ b/src/SMESHGUI/SMESHGUI_RotationDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_SMESHGenUtils.cxx b/src/SMESHGUI/SMESHGUI_SMESHGenUtils.cxx index ddfe9fbd8..b215ee1d7 100644 --- a/src/SMESHGUI/SMESHGUI_SMESHGenUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_SMESHGenUtils.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "QAD_Desktop.h" diff --git a/src/SMESHGUI/SMESHGUI_SMESHGenUtils.h b/src/SMESHGUI/SMESHGUI_SMESHGenUtils.h index 54a8d4374..8f7c2a075 100644 --- a/src/SMESHGUI/SMESHGUI_SMESHGenUtils.h +++ b/src/SMESHGUI/SMESHGUI_SMESHGenUtils.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef SMESHGUI_SMESHGenUtils_HeaderFile #define SMESHGUI_SMESHGenUtils_HeaderFile diff --git a/src/SMESHGUI/SMESHGUI_Selection.cxx b/src/SMESHGUI/SMESHGUI_Selection.cxx index 46715f603..7602c410b 100644 --- a/src/SMESHGUI/SMESHGUI_Selection.cxx +++ b/src/SMESHGUI/SMESHGUI_Selection.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "SMESHGUI_Selection.h" diff --git a/src/SMESHGUI/SMESHGUI_Selection.h b/src/SMESHGUI/SMESHGUI_Selection.h index 5f2e05fb6..08d37c979 100644 --- a/src/SMESHGUI/SMESHGUI_Selection.h +++ b/src/SMESHGUI/SMESHGUI_Selection.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_SelectionOp.cxx b/src/SMESHGUI/SMESHGUI_SelectionOp.cxx index 2616fa69f..2e620f71c 100644 --- a/src/SMESHGUI/SMESHGUI_SelectionOp.cxx +++ b/src/SMESHGUI/SMESHGUI_SelectionOp.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_SelectionOp.h b/src/SMESHGUI/SMESHGUI_SelectionOp.h index e2075a1bb..c10ba7bb6 100644 --- a/src/SMESHGUI/SMESHGUI_SelectionOp.h +++ b/src/SMESHGUI/SMESHGUI_SelectionOp.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_SewingDlg.cxx b/src/SMESHGUI/SMESHGUI_SewingDlg.cxx index 30ae81d1f..67f2e0c8d 100644 --- a/src/SMESHGUI/SMESHGUI_SewingDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_SewingDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_SewingDlg.h b/src/SMESHGUI/SMESHGUI_SewingDlg.h index 17920a9c8..31bac24fd 100644 --- a/src/SMESHGUI/SMESHGUI_SewingDlg.h +++ b/src/SMESHGUI/SMESHGUI_SewingDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx index 33f8880c7..ba0778195 100644 --- a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.h b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.h index b90d006e4..cb093ff02 100644 --- a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.h +++ b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx index 26760c333..ab28af483 100755 --- a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_SingleEditDlg.h b/src/SMESHGUI/SMESHGUI_SingleEditDlg.h index 5dc565802..6f1761006 100755 --- a/src/SMESHGUI/SMESHGUI_SingleEditDlg.h +++ b/src/SMESHGUI/SMESHGUI_SingleEditDlg.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx b/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx index 52a1632d7..541f63475 100644 --- a/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_SmoothingDlg.h b/src/SMESHGUI/SMESHGUI_SmoothingDlg.h index 34a2b66eb..977dac63f 100644 --- a/src/SMESHGUI/SMESHGUI_SmoothingDlg.h +++ b/src/SMESHGUI/SMESHGUI_SmoothingDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_SpinBox.cxx b/src/SMESHGUI/SMESHGUI_SpinBox.cxx index 54c247a80..772a6d166 100644 --- a/src/SMESHGUI/SMESHGUI_SpinBox.cxx +++ b/src/SMESHGUI/SMESHGUI_SpinBox.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_SpinBox.h b/src/SMESHGUI/SMESHGUI_SpinBox.h index 8655e4dfb..73548671a 100644 --- a/src/SMESHGUI/SMESHGUI_SpinBox.h +++ b/src/SMESHGUI/SMESHGUI_SpinBox.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.cxx b/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.cxx index edcb80f95..d05a1d472 100644 --- a/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.h b/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.h index b93b35a6a..74c7bb8e9 100644 --- a/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.h +++ b/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_Swig.cxx b/src/SMESHGUI/SMESHGUI_Swig.cxx index 1304bb5d2..219b409a7 100644 --- a/src/SMESHGUI/SMESHGUI_Swig.cxx +++ b/src/SMESHGUI/SMESHGUI_Swig.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_Swig.hxx b/src/SMESHGUI/SMESHGUI_Swig.hxx index 5cde850d8..433f3c862 100644 --- a/src/SMESHGUI/SMESHGUI_Swig.hxx +++ b/src/SMESHGUI/SMESHGUI_Swig.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_Swig.i b/src/SMESHGUI/SMESHGUI_Swig.i index 2a99fe192..eadd476e4 100644 --- a/src/SMESHGUI/SMESHGUI_Swig.i +++ b/src/SMESHGUI/SMESHGUI_Swig.i @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx b/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx index 8616aef78..f0689d5d8 100644 --- a/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_SymmetryDlg.h b/src/SMESHGUI/SMESHGUI_SymmetryDlg.h index b0ec7a979..49cd8cda8 100644 --- a/src/SMESHGUI/SMESHGUI_SymmetryDlg.h +++ b/src/SMESHGUI/SMESHGUI_SymmetryDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx b/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx index 967696a2a..48e6fafb5 100644 --- a/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_TranslationDlg.h b/src/SMESHGUI/SMESHGUI_TranslationDlg.h index deb3586f3..e1c7c971a 100644 --- a/src/SMESHGUI/SMESHGUI_TranslationDlg.h +++ b/src/SMESHGUI/SMESHGUI_TranslationDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_TransparencyDlg.cxx b/src/SMESHGUI/SMESHGUI_TransparencyDlg.cxx index 2e87985de..6e1872311 100644 --- a/src/SMESHGUI/SMESHGUI_TransparencyDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_TransparencyDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_TransparencyDlg.h b/src/SMESHGUI/SMESHGUI_TransparencyDlg.h index c26614e61..54fa8e16f 100644 --- a/src/SMESHGUI/SMESHGUI_TransparencyDlg.h +++ b/src/SMESHGUI/SMESHGUI_TransparencyDlg.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_Utils.cxx b/src/SMESHGUI/SMESHGUI_Utils.cxx index 383b02c5c..04ae86959 100644 --- a/src/SMESHGUI/SMESHGUI_Utils.cxx +++ b/src/SMESHGUI/SMESHGUI_Utils.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/SMESHGUI/SMESHGUI_Utils.h b/src/SMESHGUI/SMESHGUI_Utils.h index d236533fe..12704ef19 100644 --- a/src/SMESHGUI/SMESHGUI_Utils.h +++ b/src/SMESHGUI/SMESHGUI_Utils.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef SMESHGUI_Utils_HeaderFile #define SMESHGUI_Utils_HeaderFile diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx index 76a8cb1a6..4e5c883c1 100644 --- a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "SMESHGUI_VTKUtils.h" diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.h b/src/SMESHGUI/SMESHGUI_VTKUtils.h index 6b64521f0..db98b5674 100644 --- a/src/SMESHGUI/SMESHGUI_VTKUtils.h +++ b/src/SMESHGUI/SMESHGUI_VTKUtils.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef SMESHGUI_VTKUtils_HeaderFile #define SMESHGUI_VTKUtils_HeaderFile diff --git a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx index 15cea62b5..e1e4d0dc7 100644 --- a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx +++ b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_XmlHandler.h b/src/SMESHGUI/SMESHGUI_XmlHandler.h index 33306c100..79ad43b38 100644 --- a/src/SMESHGUI/SMESHGUI_XmlHandler.h +++ b/src/SMESHGUI/SMESHGUI_XmlHandler.h @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESHGUI_aParameter.h b/src/SMESHGUI/SMESHGUI_aParameter.h index d8933731e..5bb79a04a 100644 --- a/src/SMESHGUI/SMESHGUI_aParameter.h +++ b/src/SMESHGUI/SMESHGUI_aParameter.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESHGUI/SMESH_icons.po b/src/SMESHGUI/SMESH_icons.po index d237f1fe8..889e4031b 100644 --- a/src/SMESHGUI/SMESH_icons.po +++ b/src/SMESHGUI/SMESH_icons.po @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # This is a Qt message file in .po format. Each msgid starts with # a scope. This scope should *NOT* be translated - eg. "Foo::Bar" diff --git a/src/SMESHGUI/SMESH_images.po b/src/SMESHGUI/SMESH_images.po index d6fdb6b38..37378d9d4 100644 --- a/src/SMESHGUI/SMESH_images.po +++ b/src/SMESHGUI/SMESH_images.po @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # This is a Qt message file in .po format. Each msgid starts with # a scope. This scope should *NOT* be translated - eg. "Foo::Bar" diff --git a/src/SMESHGUI/SMESH_msg_en.po b/src/SMESHGUI/SMESH_msg_en.po index 44adb6e45..3e7311722 100644 --- a/src/SMESHGUI/SMESH_msg_en.po +++ b/src/SMESHGUI/SMESH_msg_en.po @@ -1,8 +1,25 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR , YEAR. +# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # -#, fuzzy +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# This is a Qt message file in .po format. Each msgid starts with +# a scope. This scope should *NOT* be translated - eg. "Foo::Bar" +# would be translated to "Pub", not "Foo::Pub". msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -3195,4 +3212,4 @@ msgid "SMESHGUI_ConvToQuadOp::MESH_IS_NOT_SELECTED" msgstr "Mesh is not selected\nPlease specify it and try again" msgid "SMESHGUI_ConvToQuadOp::REF_IS_NULL" -msgstr "No valid mesh object selected" \ No newline at end of file +msgstr "No valid mesh object selected" diff --git a/src/SMESH_I/Makefile.in b/src/SMESH_I/Makefile.in index c8787fdd3..2558e560f 100644 --- a/src/SMESH_I/Makefile.in +++ b/src/SMESH_I/Makefile.in @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -60,15 +60,15 @@ LIB_SRC = \ SMESH_DumpPython.cxx \ SMESH_Mesh_i.cxx \ SMESH_MEDMesh_i.cxx \ - SMESH_MEDFamily_i.cxx \ + SMESH_MEDFamily_i.cxx \ SMESH_MEDSupport_i.cxx \ - SMESH_subMesh_i.cxx \ - SMESH_MeshEditor_i.cxx \ - SMESH_Hypothesis_i.cxx \ - SMESH_Algo_i.cxx \ - SMESH_1D_Algo_i.cxx \ - SMESH_2D_Algo_i.cxx \ - SMESH_3D_Algo_i.cxx \ + SMESH_subMesh_i.cxx \ + SMESH_MeshEditor_i.cxx \ + SMESH_Hypothesis_i.cxx \ + SMESH_Algo_i.cxx \ + SMESH_1D_Algo_i.cxx \ + SMESH_2D_Algo_i.cxx \ + SMESH_3D_Algo_i.cxx \ SMESH_Filter_i.cxx \ SMESH_Group_i.cxx \ SMESH_Pattern_i.cxx \ @@ -78,9 +78,9 @@ LIB_SERVER_IDL = \ SMESH_Gen.idl \ SMESH_Hypothesis.idl \ SMESH_Mesh.idl \ - SALOME_Component.idl \ + SALOME_Component.idl \ SALOME_Exception.idl \ - SMESH_Filter.idl \ + SMESH_Filter.idl \ SMESH_Group.idl \ SMESH_Pattern.idl @@ -101,19 +101,20 @@ CPPFLAGS+= \ $(OCC_INCLUDES) \ $(HDF5_INCLUDES) \ $(BOOST_CPPFLAGS) \ - -I${KERNEL_ROOT_DIR}/include/salome \ - -I${MED_ROOT_DIR}/include/salome \ - -I${GEOM_ROOT_DIR}/include/salome + $(KERNEL_CXXFLAGS) \ + $(MED_CXXFLAGS) \ + $(GEOM_CXXFLAGS) CXXFLAGS+= \ + $(OCC_INCLUDES) \ $(OCC_CXXFLAGS) \ $(HDF5_INCLUDES) \ - -I${KERNEL_ROOT_DIR}/include/salome \ - -I${MED_ROOT_DIR}/include/salome \ - -I${GEOM_ROOT_DIR}/include/salome + $(KERNEL_CXXFLAGS) \ + $(MED_CXXFLAGS) \ + $(GEOM_CXXFLAGS) LDFLAGS+= \ - -L${KERNEL_ROOT_DIR}/lib/salome \ + $(KERNEL_LDFLAGS) \ -lSalomeContainer \ -lSalomeNS \ -lRegistry \ @@ -121,18 +122,19 @@ LDFLAGS+= \ -lSalomeLifeCycleCORBA \ -lTOOLSDS \ -lSalomeGenericObj \ - -L${GEOM_ROOT_DIR}/lib/salome \ + $(GEOM_LDFLAGS) \ -lGEOMClient \ -lSMESHimpl \ -lSMESHControls \ $(OCC_LDPATH) \ -lTKCDF \ - -lTKBO + -lTKBO \ + -lTKShHealing LDFLAGSFORBIN+= \ -lSMDS \ -lSMESHDS \ - -L${MED_ROOT_DIR}/lib/salome \ + $(MED_LDFLAGS) \ -lMEDWrapper \ -lMEDWrapperBase \ -lMEDWrapper_V2_1 \ @@ -143,7 +145,7 @@ LDFLAGSFORBIN+= \ -lMeshDriverUNV \ -lMeshDriverDAT \ -lMeshDriverSTL \ - -L${KERNEL_ROOT_DIR}/lib/salome \ + $(KERNEL_LDFLAGS) \ -lSalomeContainer \ -lSalomeNS \ -lRegistry \ @@ -156,7 +158,7 @@ LDFLAGSFORBIN+= \ -lSalomeLifeCycleCORBA \ -lTOOLSDS \ -lSalomeGenericObj \ - -L${GEOM_ROOT_DIR}/lib/salome \ + $(GEOM_LDFLAGS) \ -lGEOMClient \ -lSMESHimpl \ -lSMESHControls \ @@ -165,6 +167,7 @@ LDFLAGSFORBIN+= \ $(OCC_LDPATH) \ -lTKCDF \ -lTKBO \ - -lTKMath + -lTKMath \ + -lTKShHealing @CONCLUDE@ diff --git a/src/SMESH_I/SMESH.hxx b/src/SMESH_I/SMESH.hxx index ea68b0445..80b70ee21 100644 --- a/src/SMESH_I/SMESH.hxx +++ b/src/SMESH_I/SMESH.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESHEngine.cxx b/src/SMESH_I/SMESHEngine.cxx index fc1bd440b..732aeb23c 100644 --- a/src/SMESH_I/SMESHEngine.cxx +++ b/src/SMESH_I/SMESHEngine.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com int main(int argc, char** argv) { diff --git a/src/SMESH_I/SMESH_1D_Algo_i.cxx b/src/SMESH_I/SMESH_1D_Algo_i.cxx index 06f621dc9..3c13663e6 100644 --- a/src/SMESH_I/SMESH_1D_Algo_i.cxx +++ b/src/SMESH_I/SMESH_1D_Algo_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_1D_Algo_i.hxx b/src/SMESH_I/SMESH_1D_Algo_i.hxx index 1112a4019..86800d315 100644 --- a/src/SMESH_I/SMESH_1D_Algo_i.hxx +++ b/src/SMESH_I/SMESH_1D_Algo_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_2D_Algo_i.cxx b/src/SMESH_I/SMESH_2D_Algo_i.cxx index 00744eea4..1fce7356f 100644 --- a/src/SMESH_I/SMESH_2D_Algo_i.cxx +++ b/src/SMESH_I/SMESH_2D_Algo_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_2D_Algo_i.hxx b/src/SMESH_I/SMESH_2D_Algo_i.hxx index 58664c9cf..839cb5faa 100644 --- a/src/SMESH_I/SMESH_2D_Algo_i.hxx +++ b/src/SMESH_I/SMESH_2D_Algo_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_2smeshpy.cxx b/src/SMESH_I/SMESH_2smeshpy.cxx index fdc6f3eb7..3171cbca2 100644 --- a/src/SMESH_I/SMESH_2smeshpy.cxx +++ b/src/SMESH_I/SMESH_2smeshpy.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_2smeshpy.hxx b/src/SMESH_I/SMESH_2smeshpy.hxx index aabba67dd..5319af279 100644 --- a/src/SMESH_I/SMESH_2smeshpy.hxx +++ b/src/SMESH_I/SMESH_2smeshpy.hxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : SMESH_smesh.hxx // Created : Fri Nov 18 12:05:18 2005 diff --git a/src/SMESH_I/SMESH_3D_Algo_i.cxx b/src/SMESH_I/SMESH_3D_Algo_i.cxx index 14276fe12..a59ef15b7 100644 --- a/src/SMESH_I/SMESH_3D_Algo_i.cxx +++ b/src/SMESH_I/SMESH_3D_Algo_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_3D_Algo_i.hxx b/src/SMESH_I/SMESH_3D_Algo_i.hxx index 8589e166a..2fce5a766 100644 --- a/src/SMESH_I/SMESH_3D_Algo_i.hxx +++ b/src/SMESH_I/SMESH_3D_Algo_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_Algo_i.cxx b/src/SMESH_I/SMESH_Algo_i.cxx index a57df7bef..a0e8b9aa0 100644 --- a/src/SMESH_I/SMESH_Algo_i.cxx +++ b/src/SMESH_I/SMESH_Algo_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_Algo_i.hxx b/src/SMESH_I/SMESH_Algo_i.hxx index 21630ec8a..eee44fc09 100644 --- a/src/SMESH_I/SMESH_Algo_i.hxx +++ b/src/SMESH_I/SMESH_Algo_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_DumpPython.cxx b/src/SMESH_I/SMESH_DumpPython.cxx index d640a6489..e0ecf8fcd 100644 --- a/src/SMESH_I/SMESH_DumpPython.cxx +++ b/src/SMESH_I/SMESH_DumpPython.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : SMESH_Gen_i_DumpPython.cxx // Created : Thu Mar 24 17:17:59 2005 diff --git a/src/SMESH_I/SMESH_Filter_i.cxx b/src/SMESH_I/SMESH_Filter_i.cxx index 701666342..917732d62 100644 --- a/src/SMESH_I/SMESH_Filter_i.cxx +++ b/src/SMESH_I/SMESH_Filter_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_Filter_i.hxx b/src/SMESH_I/SMESH_Filter_i.hxx index a96758049..51ad5893b 100644 --- a/src/SMESH_I/SMESH_Filter_i.hxx +++ b/src/SMESH_I/SMESH_Filter_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx index b77a98773..d2c435396 100644 --- a/src/SMESH_I/SMESH_Gen_i.cxx +++ b/src/SMESH_I/SMESH_Gen_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -248,7 +248,8 @@ SMESH_Gen_i::SMESH_Gen_i( CORBA::ORB_ptr orb, myShapeReader = NULL; // shape reader mySMESHGen = this; - OSD::SetSignal( true ); + // set it in standalone mode only + //OSD::SetSignal( true ); } //============================================================================= @@ -421,6 +422,20 @@ GEOM_Client* SMESH_Gen_i::GetShapeReader() void SMESH_Gen_i::SetEmbeddedMode( CORBA::Boolean theMode ) { myIsEmbeddedMode = theMode; + + if ( !myIsEmbeddedMode ) { + bool raiseFPE; +#ifdef _DEBUG_ + raiseFPE = true; + char* envDisableFPE = getenv("DISABLE_FPE"); + if (envDisableFPE && atoi(envDisableFPE)) + raiseFPE = false; +#else + raiseFPE = false; +#endif + OSD::SetSignal( raiseFPE ); + } + // else OSD::SetSignal() is called in GUI } //============================================================================= diff --git a/src/SMESH_I/SMESH_Gen_i.hxx b/src/SMESH_I/SMESH_Gen_i.hxx index 43dd6402b..86ee7f1b8 100644 --- a/src/SMESH_I/SMESH_Gen_i.hxx +++ b/src/SMESH_I/SMESH_Gen_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_Gen_i_1.cxx b/src/SMESH_I/SMESH_Gen_i_1.cxx index 1874fe167..2021f22e2 100644 --- a/src/SMESH_I/SMESH_Gen_i_1.cxx +++ b/src/SMESH_I/SMESH_Gen_i_1.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // File : SMESH_Gen_i_1.cxx diff --git a/src/SMESH_I/SMESH_Group_i.cxx b/src/SMESH_I/SMESH_Group_i.cxx index 9c0a2f52f..7a75b310b 100644 --- a/src/SMESH_I/SMESH_Group_i.cxx +++ b/src/SMESH_I/SMESH_Group_i.cxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_Group_i.hxx b/src/SMESH_I/SMESH_Group_i.hxx index cc7dabe72..b02f3d896 100644 --- a/src/SMESH_I/SMESH_Group_i.hxx +++ b/src/SMESH_I/SMESH_Group_i.hxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_Hypothesis_i.cxx b/src/SMESH_I/SMESH_Hypothesis_i.cxx index 768c37ad8..4f9a90d25 100644 --- a/src/SMESH_I/SMESH_Hypothesis_i.cxx +++ b/src/SMESH_I/SMESH_Hypothesis_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_Hypothesis_i.hxx b/src/SMESH_I/SMESH_Hypothesis_i.hxx index fd806b027..344444af6 100644 --- a/src/SMESH_I/SMESH_Hypothesis_i.hxx +++ b/src/SMESH_I/SMESH_Hypothesis_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_MEDFamily_i.cxx b/src/SMESH_I/SMESH_MEDFamily_i.cxx index 6e2508962..bb2fd8fab 100644 --- a/src/SMESH_I/SMESH_MEDFamily_i.cxx +++ b/src/SMESH_I/SMESH_MEDFamily_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_MEDFamily_i.hxx b/src/SMESH_I/SMESH_MEDFamily_i.hxx index 6baea0572..b2ea28e32 100644 --- a/src/SMESH_I/SMESH_MEDFamily_i.hxx +++ b/src/SMESH_I/SMESH_MEDFamily_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_MEDMesh_i.cxx b/src/SMESH_I/SMESH_MEDMesh_i.cxx index d67f7e62d..05ffe6701 100644 --- a/src/SMESH_I/SMESH_MEDMesh_i.cxx +++ b/src/SMESH_I/SMESH_MEDMesh_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_MEDMesh_i.hxx b/src/SMESH_I/SMESH_MEDMesh_i.hxx index 53c0d35d7..3fd6e7103 100644 --- a/src/SMESH_I/SMESH_MEDMesh_i.hxx +++ b/src/SMESH_I/SMESH_MEDMesh_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_MEDSupport_i.cxx b/src/SMESH_I/SMESH_MEDSupport_i.cxx index 7b5289ebb..27d8cf0df 100644 --- a/src/SMESH_I/SMESH_MEDSupport_i.cxx +++ b/src/SMESH_I/SMESH_MEDSupport_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_MEDSupport_i.hxx b/src/SMESH_I/SMESH_MEDSupport_i.hxx index c888661b6..68fb7fe41 100644 --- a/src/SMESH_I/SMESH_MEDSupport_i.hxx +++ b/src/SMESH_I/SMESH_MEDSupport_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_MeshEditor_i.cxx b/src/SMESH_I/SMESH_MeshEditor_i.cxx index acf9a4030..5227a9668 100644 --- a/src/SMESH_I/SMESH_MeshEditor_i.cxx +++ b/src/SMESH_I/SMESH_MeshEditor_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -519,16 +519,18 @@ CORBA::Boolean SMESH_MeshEditor_i::ReorientObject(SMESH::SMESH_IDSource_ptr theO //purpose : auxilary function for conversion long_array to std::map<> // which is used in some methods //======================================================================= -static void ToMap(const SMESH::long_array & IDs, - const SMESHDS_Mesh* aMesh, - std::map& aMap) +static void ToMap(const SMESH::long_array & IDs, + const SMESHDS_Mesh* aMesh, + std::map& aMap, + const SMDSAbs_ElementType aType = SMDSAbs_All ) { for (int i=0; i::iterator It = aMap.find(ind); if(It==aMap.end()) { const SMDS_MeshElement * elem = aMesh->FindElement(ind); - aMap.insert( make_pair(ind,elem) ); + if ( elem && ( aType == SMDSAbs_All || elem->GetType() == aType )) + aMap.insert( make_pair( elem->GetID(), elem )); } } } @@ -548,7 +550,7 @@ CORBA::Boolean SMESH_MeshEditor_i::TriToQuad (const SMESH::long_array & IDsOfE SMESHDS_Mesh* aMesh = GetMeshDS(); map faces; - ToMap(IDsOfElements, aMesh, faces); + ToMap(IDsOfElements, aMesh, faces, SMDSAbs_Face); SMESH::NumericalFunctor_i* aNumericalFunctor = dynamic_cast( SMESH_Gen_i::GetServant( Criterion ).in() ); @@ -624,7 +626,7 @@ CORBA::Boolean SMESH_MeshEditor_i::QuadToTri (const SMESH::long_array & IDsOfE SMESHDS_Mesh* aMesh = GetMeshDS(); map faces; - ToMap(IDsOfElements, aMesh, faces); + ToMap(IDsOfElements, aMesh, faces, SMDSAbs_Face); SMESH::NumericalFunctor_i* aNumericalFunctor = dynamic_cast( SMESH_Gen_i::GetServant( Criterion ).in() ); @@ -697,7 +699,7 @@ CORBA::Boolean SMESH_MeshEditor_i::SplitQuad (const SMESH::long_array & IDsOfEle SMESHDS_Mesh* aMesh = GetMeshDS(); map faces; - ToMap(IDsOfElements, aMesh, faces); + ToMap(IDsOfElements, aMesh, faces, SMDSAbs_Face); // Update Python script TPythonDump() << "isDone = " << this << ".SplitQuad( " @@ -861,7 +863,7 @@ CORBA::Boolean SMESHDS_Mesh* aMesh = GetMeshDS(); map elements; - ToMap(IDsOfElements, aMesh, elements); + ToMap(IDsOfElements, aMesh, elements, SMDSAbs_Face); set fixedNodes; for (int i = 0; i < IDsOfFixedNodes.length(); i++) { diff --git a/src/SMESH_I/SMESH_MeshEditor_i.hxx b/src/SMESH_I/SMESH_MeshEditor_i.hxx index e850759be..cd7538c62 100644 --- a/src/SMESH_I/SMESH_MeshEditor_i.hxx +++ b/src/SMESH_I/SMESH_MeshEditor_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_Mesh_i.cxx b/src/SMESH_I/SMESH_Mesh_i.cxx index fc489aa0c..367eda450 100644 --- a/src/SMESH_I/SMESH_Mesh_i.cxx +++ b/src/SMESH_I/SMESH_Mesh_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -1556,17 +1556,19 @@ char* SMESH_Mesh_i::Dump() //============================================================================= SMESH::long_array* SMESH_Mesh_i::GetIDs() { - SMESH::long_array_var aResult = new SMESH::long_array(); - SMESHDS_Mesh* aSMESHDS_Mesh = _impl->GetMeshDS(); - int aMinId = aSMESHDS_Mesh->MinElementID(); - int aMaxId = aSMESHDS_Mesh->MaxElementID(); +// SMESH::long_array_var aResult = new SMESH::long_array(); +// SMESHDS_Mesh* aSMESHDS_Mesh = _impl->GetMeshDS(); +// int aMinId = aSMESHDS_Mesh->MinElementID(); +// int aMaxId = aSMESHDS_Mesh->MaxElementID(); - aResult->length(aMaxId - aMinId + 1); +// aResult->length(aMaxId - aMinId + 1); - for (int i = 0, id = aMinId; id <= aMaxId; id++ ) - aResult[i++] = id; +// for (int i = 0, id = aMinId; id <= aMaxId; id++ ) +// aResult[i++] = id; - return aResult._retn(); +// return aResult._retn(); + // PAL12398 + return GetElementsId(); } //============================================================================= diff --git a/src/SMESH_I/SMESH_Mesh_i.hxx b/src/SMESH_I/SMESH_Mesh_i.hxx index e2fde0283..d7c37b1de 100644 --- a/src/SMESH_I/SMESH_Mesh_i.hxx +++ b/src/SMESH_I/SMESH_Mesh_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_Pattern_i.cxx b/src/SMESH_I/SMESH_Pattern_i.cxx index 24adf5a99..13ed3ac89 100644 --- a/src/SMESH_I/SMESH_Pattern_i.cxx +++ b/src/SMESH_I/SMESH_Pattern_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_Pattern_i.hxx b/src/SMESH_I/SMESH_Pattern_i.hxx index 29b5084cd..b1458636e 100644 --- a/src/SMESH_I/SMESH_Pattern_i.hxx +++ b/src/SMESH_I/SMESH_Pattern_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_PythonDump.hxx b/src/SMESH_I/SMESH_PythonDump.hxx index 2996183d6..3e9fd96d7 100644 --- a/src/SMESH_I/SMESH_PythonDump.hxx +++ b/src/SMESH_I/SMESH_PythonDump.hxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _SMESH_PYTHONDUMP_HXX_ #define _SMESH_PYTHONDUMP_HXX_ diff --git a/src/SMESH_I/SMESH_subMesh_i.cxx b/src/SMESH_I/SMESH_subMesh_i.cxx index 7772524b6..c7b876c5c 100644 --- a/src/SMESH_I/SMESH_subMesh_i.cxx +++ b/src/SMESH_I/SMESH_subMesh_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/SMESH_subMesh_i.hxx b/src/SMESH_I/SMESH_subMesh_i.hxx index e8d84b37e..3fca4373c 100644 --- a/src/SMESH_I/SMESH_subMesh_i.hxx +++ b/src/SMESH_I/SMESH_subMesh_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_I/smeshpy.py b/src/SMESH_I/smeshpy.py index 9fb4709e7..f7f36fca8 100644 --- a/src/SMESH_I/smeshpy.py +++ b/src/SMESH_I/smeshpy.py @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/SMESH_SWIG/Makefile.in b/src/SMESH_SWIG/Makefile.in index f0ba6eec1..ce5a54fd3 100644 --- a/src/SMESH_SWIG/Makefile.in +++ b/src/SMESH_SWIG/Makefile.in @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -115,8 +115,8 @@ LIB_CLIENT_IDL = SALOMEDS.idl \ EXPORT_SHAREDPYSCRIPTS=SMESH_shared_modules.py -CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -DHAVE_CONFIG_H +CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(KERNEL_CXXFLAGS) -DHAVE_CONFIG_H LIBS+= $(PYTHON_LIBS) -LDFLAGS+= -lSMESH -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeGenericObj +LDFLAGS+= -lSMESH $(KERNEL_LDFLAGS) -lSalomeGenericObj @CONCLUDE@ diff --git a/src/SMESH_SWIG/PAL_MESH_041_mesh.py b/src/SMESH_SWIG/PAL_MESH_041_mesh.py index de57c67ac..9e3b16a61 100755 --- a/src/SMESH_SWIG/PAL_MESH_041_mesh.py +++ b/src/SMESH_SWIG/PAL_MESH_041_mesh.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # import geompy import salome diff --git a/src/SMESH_SWIG/PAL_MESH_043_2D.py b/src/SMESH_SWIG/PAL_MESH_043_2D.py index 76ab25924..5af684bd5 100755 --- a/src/SMESH_SWIG/PAL_MESH_043_2D.py +++ b/src/SMESH_SWIG/PAL_MESH_043_2D.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/SMESH_SWIG/PAL_MESH_043_3D.py b/src/SMESH_SWIG/PAL_MESH_043_3D.py index cfd0f45c4..6d0993ba6 100755 --- a/src/SMESH_SWIG/PAL_MESH_043_3D.py +++ b/src/SMESH_SWIG/PAL_MESH_043_3D.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/SMESH_SWIG/SMESH_AdvancedEditor.py b/src/SMESH_SWIG/SMESH_AdvancedEditor.py new file mode 100644 index 000000000..914cd7931 --- /dev/null +++ b/src/SMESH_SWIG/SMESH_AdvancedEditor.py @@ -0,0 +1,209 @@ +# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +import smesh +import SMESH +import math + +def GetNewNodes(mesh,Elems,OldNodes): + """ + Auxilary function, which return list of nodes from + given Elems avoided nodes from OldNodes + """ + newnodes = [] + for i in Elems: + nbn = mesh.GetElemNbNodes(i) + for j in range(0,nbn): + nn = mesh.GetElemNode(i,j) + isold = 0 + for k in range(0,len(newnodes)): + if nn==newnodes[k]: + isold = 1 + break + pass + if isold: continue + for k in range(0,len(OldNodes)): + if nn==OldNodes[k]: + isold = 1 + break + pass + if isold: continue + newnodes.append(nn) + pass + pass + return newnodes + + +# create empty mesh +mesh = smesh.smesh.CreateEmptyMesh() + +ed = mesh.GetMeshEditor() +tol = 0.001 + +# create a cross from quadrangle faces +# 1. create first edge and make extrusion along 0x +n1 = ed.AddNode(55,-5,0) +n2 = ed.AddNode(55,5,0) +e1 = ed.AddEdge([n1,n2]) +dir1 = SMESH.DirStruct(SMESH.PointStruct(-10,0,0)) +ed.ExtrusionSweep([e1],dir1,11) +# 2. create second edge and make extrusion along 0y +n3 = ed.AddNode(-5,-55,0) +n4 = ed.AddNode(5,-55,0) +e2 = ed.AddEdge([n3,n4]) +dir2 = SMESH.DirStruct(SMESH.PointStruct(0,10,0)) +ed.ExtrusionSweep([e2],dir2,11) + +# since result has coincident nodes and faces +# we have to make merge +nodes = ed.FindCoincidentNodes(0.001) +ed.MergeNodes(nodes) +ed.MergeEqualElements() + +# make extrusion faces along 0z +faces = mesh.GetElementsByType(SMESH.FACE) +nbf = len(faces) +maxang = 2.0 +zstep = 5 +nbzsteps = 50 +dir3 = SMESH.DirStruct(SMESH.PointStruct(0,0,zstep)) +newfaces = [] # list for keeping created top faces + # during extrusion + +for i in range(0,nbzsteps): + ed.ExtrusionSweep(faces,dir3,1) + # find top faces after each extrusion and keep them + res = ed.GetLastCreatedElems() + nbr = len(res) + nfaces = [] + for j in res: + nbn = mesh.GetElemNbNodes(j) + if nbn!=4: continue + nn1 = mesh.GetElemNode(j,0) + xyz1 = mesh.GetNodeXYZ(nn1) + nn2 = mesh.GetElemNode(j,1) + xyz2 = mesh.GetNodeXYZ(nn2) + nn3 = mesh.GetElemNode(j,2) + xyz3 = mesh.GetNodeXYZ(nn3) + if abs(xyz1[2]-xyz2[2])2: faces1.append(i) + pass +nbf1 = len(faces1) + +# create other two edges and rotate them for creation +# other full circle +n8 = ed.AddNode(-65,0,0) +n9 = ed.AddNode(-67.5,0,0) +n10 = ed.AddNode(-70,0,0) +e8 = ed.AddEdge([n8,n9]) +e9 = ed.AddEdge([n9,n10]) +axisr3 = SMESH.AxisStruct(-65,0,0,0,-1,0) +ed.RotationSweep([e8,e9],axisr3, math.pi/6, 12, tol) +res = ed.GetLastCreatedElems() +faces2 = [] +for i in res: + nbn = mesh.GetElemNbNodes(i) + if nbn>2: faces2.append(i) + pass +nbf2 = len(faces2) + +# there are coincident nodes after rotation +# therefore we have to merge nodes +nodes = ed.FindCoincidentNodes(0.001) +ed.MergeNodes(nodes) + +nbcircs = 2 +nbrsteps = 24 +nbrs = nbcircs*nbrsteps +dz = nbzsteps*zstep/nbrs + +# create first spiral +oldnodes = [] +newnodes = GetNewNodes(mesh,faces1,oldnodes) +oldnodes = newnodes + +nodes = [] +ed.RotationSweep(faces1,axisr1, math.pi*2/nbrsteps, nbrs, tol) +res = ed.GetLastCreatedElems() + +for i in range(0,nbrs): + volumes = [] + for j in range(0,nbf1): volumes.append(res[i+j*nbrs]) + newnodes = GetNewNodes(mesh,volumes,oldnodes) + for j in newnodes: + xyz = mesh.GetNodeXYZ(j) + ed.MoveNode(j,xyz[0],xyz[1],xyz[2]+dz*(i+1)) + pass + oldnodes = newnodes + pass + +# create second spiral +oldnodes = [] +newnodes = GetNewNodes(mesh,faces2,oldnodes) +oldnodes = newnodes + +nodes = [] +ed.RotationSweep(faces2,axisr1, math.pi*2/nbrsteps, nbrs, tol) +res = ed.GetLastCreatedElems() + +for i in range(0,nbrs): + volumes = [] + for j in range(0,nbf2): volumes.append(res[i+j*nbrs]) + newnodes = GetNewNodes(mesh,volumes,oldnodes) + for j in newnodes: + xyz = mesh.GetNodeXYZ(j) + ed.MoveNode(j,xyz[0],xyz[1],xyz[2]+dz*(i+1)) + pass + oldnodes = newnodes + pass + + diff --git a/src/SMESH_SWIG/SMESH_BelongToGeom.py b/src/SMESH_SWIG/SMESH_BelongToGeom.py index 880ae20c0..482bd3b56 100644 --- a/src/SMESH_SWIG/SMESH_BelongToGeom.py +++ b/src/SMESH_SWIG/SMESH_BelongToGeom.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # import SMESH from SMESH_test1 import * diff --git a/src/SMESH_SWIG/SMESH_GroupFromGeom.py b/src/SMESH_SWIG/SMESH_GroupFromGeom.py index 3647c77d2..0faad0ab0 100644 --- a/src/SMESH_SWIG/SMESH_GroupFromGeom.py +++ b/src/SMESH_SWIG/SMESH_GroupFromGeom.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/SMESH_SWIG/SMESH_GroupFromGeom2.py b/src/SMESH_SWIG/SMESH_GroupFromGeom2.py index 6bab8375d..5364365e3 100755 --- a/src/SMESH_SWIG/SMESH_GroupFromGeom2.py +++ b/src/SMESH_SWIG/SMESH_GroupFromGeom2.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # #============================================================================== # Info. diff --git a/src/SMESH_SWIG/SMESH_GroupLyingOnGeom.py b/src/SMESH_SWIG/SMESH_GroupLyingOnGeom.py index 5f65d7852..a3cf9298c 100644 --- a/src/SMESH_SWIG/SMESH_GroupLyingOnGeom.py +++ b/src/SMESH_SWIG/SMESH_GroupLyingOnGeom.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # from smesh import * diff --git a/src/SMESH_SWIG/SMESH_Nut.py b/src/SMESH_SWIG/SMESH_Nut.py index 07329d23a..66bbe08bf 100755 --- a/src/SMESH_SWIG/SMESH_Nut.py +++ b/src/SMESH_SWIG/SMESH_Nut.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # ##################################################################### #Created :17/02/2005 diff --git a/src/SMESH_SWIG/SMESH_Partition1_tetra.py b/src/SMESH_SWIG/SMESH_Partition1_tetra.py index bba728959..332ca934f 100644 --- a/src/SMESH_SWIG/SMESH_Partition1_tetra.py +++ b/src/SMESH_SWIG/SMESH_Partition1_tetra.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # Tetrahedrization of the geometry generated by the Python script GEOM_Partition1.py diff --git a/src/SMESH_SWIG/SMESH_Sphere.py b/src/SMESH_SWIG/SMESH_Sphere.py index 893e5441f..45306bed5 100644 --- a/src/SMESH_SWIG/SMESH_Sphere.py +++ b/src/SMESH_SWIG/SMESH_Sphere.py @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/SMESH_SWIG/SMESH_blocks.py b/src/SMESH_SWIG/SMESH_blocks.py index 0430867fb..0b8d46cc2 100644 --- a/src/SMESH_SWIG/SMESH_blocks.py +++ b/src/SMESH_SWIG/SMESH_blocks.py @@ -16,7 +16,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/SMESH_SWIG/SMESH_box.py b/src/SMESH_SWIG/SMESH_box.py index 877e0882c..d0f490ee9 100755 --- a/src/SMESH_SWIG/SMESH_box.py +++ b/src/SMESH_SWIG/SMESH_box.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # #============================================================================== # Info. diff --git a/src/SMESH_SWIG/SMESH_box2_tetra.py b/src/SMESH_SWIG/SMESH_box2_tetra.py index 869a86a31..55a032e4c 100644 --- a/src/SMESH_SWIG/SMESH_box2_tetra.py +++ b/src/SMESH_SWIG/SMESH_box2_tetra.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # Tetrahedrization of the geometry union of 2 boxes having a face in common diff --git a/src/SMESH_SWIG/SMESH_box3_tetra.py b/src/SMESH_SWIG/SMESH_box3_tetra.py index a8d09a7bc..64ea53615 100644 --- a/src/SMESH_SWIG/SMESH_box3_tetra.py +++ b/src/SMESH_SWIG/SMESH_box3_tetra.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # Tetrahedrization of the geometry union of 3 boxes aligned where the middle diff --git a/src/SMESH_SWIG/SMESH_box_tetra.py b/src/SMESH_SWIG/SMESH_box_tetra.py index fab34ee05..7a5bc0364 100644 --- a/src/SMESH_SWIG/SMESH_box_tetra.py +++ b/src/SMESH_SWIG/SMESH_box_tetra.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # Tetrahedrization of a simple box. Hypothesis and algorithms for diff --git a/src/SMESH_SWIG/SMESH_controls.py b/src/SMESH_SWIG/SMESH_controls.py index 1d5080d87..9266516c9 100644 --- a/src/SMESH_SWIG/SMESH_controls.py +++ b/src/SMESH_SWIG/SMESH_controls.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/SMESH_SWIG/SMESH_demo_hexa2_upd.py b/src/SMESH_SWIG/SMESH_demo_hexa2_upd.py index 8f1956dab..2ef0ba6c7 100755 --- a/src/SMESH_SWIG/SMESH_demo_hexa2_upd.py +++ b/src/SMESH_SWIG/SMESH_demo_hexa2_upd.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # #============================================================================== # Info. diff --git a/src/SMESH_SWIG/SMESH_fixation.py b/src/SMESH_SWIG/SMESH_fixation.py index b10fcc81f..f5d1035ab 100644 --- a/src/SMESH_SWIG/SMESH_fixation.py +++ b/src/SMESH_SWIG/SMESH_fixation.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/SMESH_SWIG/SMESH_fixation_hexa.py b/src/SMESH_SWIG/SMESH_fixation_hexa.py index 62dfe01d0..6514f5054 100644 --- a/src/SMESH_SWIG/SMESH_fixation_hexa.py +++ b/src/SMESH_SWIG/SMESH_fixation_hexa.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # Hexahedrization of the geometry generated by the Python script diff --git a/src/SMESH_SWIG/SMESH_fixation_netgen.py b/src/SMESH_SWIG/SMESH_fixation_netgen.py index 9232f1a0d..31114905c 100644 --- a/src/SMESH_SWIG/SMESH_fixation_netgen.py +++ b/src/SMESH_SWIG/SMESH_fixation_netgen.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # Tetrahedrization of the geometry generated by the Python script diff --git a/src/SMESH_SWIG/SMESH_fixation_tetra.py b/src/SMESH_SWIG/SMESH_fixation_tetra.py index 3a6d24069..712c908e2 100644 --- a/src/SMESH_SWIG/SMESH_fixation_tetra.py +++ b/src/SMESH_SWIG/SMESH_fixation_tetra.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # Tetrahedrization of the geometry generated by the Python script diff --git a/src/SMESH_SWIG/SMESH_flight_skin.py b/src/SMESH_SWIG/SMESH_flight_skin.py index ea30ce371..9bcb944a4 100644 --- a/src/SMESH_SWIG/SMESH_flight_skin.py +++ b/src/SMESH_SWIG/SMESH_flight_skin.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # Triangulation of the skin of the geometry from a Brep representing a plane diff --git a/src/SMESH_SWIG/SMESH_freebord.py b/src/SMESH_SWIG/SMESH_freebord.py index bec007d06..373ba58e0 100644 --- a/src/SMESH_SWIG/SMESH_freebord.py +++ b/src/SMESH_SWIG/SMESH_freebord.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # import salome import geompy diff --git a/src/SMESH_SWIG/SMESH_hexaedre.py b/src/SMESH_SWIG/SMESH_hexaedre.py index ab3350cc9..0a058a2a0 100755 --- a/src/SMESH_SWIG/SMESH_hexaedre.py +++ b/src/SMESH_SWIG/SMESH_hexaedre.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # #============================================================================== # Info. diff --git a/src/SMESH_SWIG/SMESH_mechanic.py b/src/SMESH_SWIG/SMESH_mechanic.py index 7c1fdbd22..6170b51ff 100644 --- a/src/SMESH_SWIG/SMESH_mechanic.py +++ b/src/SMESH_SWIG/SMESH_mechanic.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/SMESH_SWIG/SMESH_mechanic_editor.py b/src/SMESH_SWIG/SMESH_mechanic_editor.py index 596786ed9..0eed6bbd6 100644 --- a/src/SMESH_SWIG/SMESH_mechanic_editor.py +++ b/src/SMESH_SWIG/SMESH_mechanic_editor.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/SMESH_SWIG/SMESH_mechanic_netgen.py b/src/SMESH_SWIG/SMESH_mechanic_netgen.py index 719aa0e41..b3a0ea2a7 100644 --- a/src/SMESH_SWIG/SMESH_mechanic_netgen.py +++ b/src/SMESH_SWIG/SMESH_mechanic_netgen.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # Quadrangulation of the geometry generated by the Python script diff --git a/src/SMESH_SWIG/SMESH_mechanic_tetra.py b/src/SMESH_SWIG/SMESH_mechanic_tetra.py index eee3f87d8..f5f56d4bc 100644 --- a/src/SMESH_SWIG/SMESH_mechanic_tetra.py +++ b/src/SMESH_SWIG/SMESH_mechanic_tetra.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/SMESH_SWIG/SMESH_reg.py b/src/SMESH_SWIG/SMESH_reg.py index 3a2f74ae8..2e3a8c534 100644 --- a/src/SMESH_SWIG/SMESH_reg.py +++ b/src/SMESH_SWIG/SMESH_reg.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/SMESH_SWIG/SMESH_shared_modules.py b/src/SMESH_SWIG/SMESH_shared_modules.py index e5844a9ad..22c2a0de6 100644 --- a/src/SMESH_SWIG/SMESH_shared_modules.py +++ b/src/SMESH_SWIG/SMESH_shared_modules.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # """ diff --git a/src/SMESH_SWIG/SMESH_test.py b/src/SMESH_SWIG/SMESH_test.py index d2385f3a9..1424181d1 100644 --- a/src/SMESH_SWIG/SMESH_test.py +++ b/src/SMESH_SWIG/SMESH_test.py @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/SMESH_SWIG/SMESH_test0.py b/src/SMESH_SWIG/SMESH_test0.py index ca574fd89..64794e623 100644 --- a/src/SMESH_SWIG/SMESH_test0.py +++ b/src/SMESH_SWIG/SMESH_test0.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/SMESH_SWIG/SMESH_test1.py b/src/SMESH_SWIG/SMESH_test1.py index c0b04299a..1943a9611 100644 --- a/src/SMESH_SWIG/SMESH_test1.py +++ b/src/SMESH_SWIG/SMESH_test1.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/SMESH_SWIG/SMESH_test2.py b/src/SMESH_SWIG/SMESH_test2.py index b552a1490..622f84a77 100644 --- a/src/SMESH_SWIG/SMESH_test2.py +++ b/src/SMESH_SWIG/SMESH_test2.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/SMESH_SWIG/SMESH_test3.py b/src/SMESH_SWIG/SMESH_test3.py index e10501858..93ab33aa9 100644 --- a/src/SMESH_SWIG/SMESH_test3.py +++ b/src/SMESH_SWIG/SMESH_test3.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/SMESH_SWIG/SMESH_test4.py b/src/SMESH_SWIG/SMESH_test4.py index 912297f85..d69f455af 100755 --- a/src/SMESH_SWIG/SMESH_test4.py +++ b/src/SMESH_SWIG/SMESH_test4.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # import salome import geompy diff --git a/src/SMESH_SWIG/SMESH_test5.py b/src/SMESH_SWIG/SMESH_test5.py index 4b31dcbc3..74a28c6ba 100644 --- a/src/SMESH_SWIG/SMESH_test5.py +++ b/src/SMESH_SWIG/SMESH_test5.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/SMESH_SWIG/batchmode_mefisto.py b/src/SMESH_SWIG/batchmode_mefisto.py index 800d3f270..58ca97b8c 100644 --- a/src/SMESH_SWIG/batchmode_mefisto.py +++ b/src/SMESH_SWIG/batchmode_mefisto.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # import os import re diff --git a/src/SMESH_SWIG/batchmode_smesh.py b/src/SMESH_SWIG/batchmode_smesh.py index 4964c8b0c..1d44f4360 100644 --- a/src/SMESH_SWIG/batchmode_smesh.py +++ b/src/SMESH_SWIG/batchmode_smesh.py @@ -1,6 +1,21 @@ -# Copyright (C) 2003 CEA/DEN, EDF R&D +# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. # +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # File : batchmode_smesh.py # Author : Oksana TCHEBANOVA diff --git a/src/SMESH_SWIG/ex00_all.py b/src/SMESH_SWIG/ex00_all.py index 40d7c964f..8e490d7be 100644 --- a/src/SMESH_SWIG/ex00_all.py +++ b/src/SMESH_SWIG/ex00_all.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # CEA/LGLS 2005, Francis KLOSS (OCC) # ================================== diff --git a/src/SMESH_SWIG/ex01_cube2build.py b/src/SMESH_SWIG/ex01_cube2build.py index 1eb5587dd..4493b6f32 100644 --- a/src/SMESH_SWIG/ex01_cube2build.py +++ b/src/SMESH_SWIG/ex01_cube2build.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # CEA/LGLS 2004-2005, Francis KLOSS (OCC) # ======================================= diff --git a/src/SMESH_SWIG/ex02_cube2primitive.py b/src/SMESH_SWIG/ex02_cube2primitive.py index 9d7057767..e82ee605d 100644 --- a/src/SMESH_SWIG/ex02_cube2primitive.py +++ b/src/SMESH_SWIG/ex02_cube2primitive.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # CEA/LGLS 2004-2005, Francis KLOSS (OCC) # ======================================= diff --git a/src/SMESH_SWIG/ex03_cube2partition.py b/src/SMESH_SWIG/ex03_cube2partition.py index da69515ad..4772e6375 100644 --- a/src/SMESH_SWIG/ex03_cube2partition.py +++ b/src/SMESH_SWIG/ex03_cube2partition.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # CEA/LGLS 2004-2005, Francis KLOSS (OCC) # ======================================= diff --git a/src/SMESH_SWIG/ex04_cube5tetraHexa.py b/src/SMESH_SWIG/ex04_cube5tetraHexa.py index 0790ab7f1..6d5ef4aa5 100644 --- a/src/SMESH_SWIG/ex04_cube5tetraHexa.py +++ b/src/SMESH_SWIG/ex04_cube5tetraHexa.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # CEA/LGLS 2004-2005, Francis KLOSS (OCC) # ======================================= diff --git a/src/SMESH_SWIG/ex05_hole1build.py b/src/SMESH_SWIG/ex05_hole1build.py index 8e480ae4b..7ec3af89e 100644 --- a/src/SMESH_SWIG/ex05_hole1build.py +++ b/src/SMESH_SWIG/ex05_hole1build.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # CEA/LGLS 2004-2005, Francis KLOSS (OCC) # ======================================= diff --git a/src/SMESH_SWIG/ex06_hole1boolean.py b/src/SMESH_SWIG/ex06_hole1boolean.py index 9e3156413..a10ea7af8 100644 --- a/src/SMESH_SWIG/ex06_hole1boolean.py +++ b/src/SMESH_SWIG/ex06_hole1boolean.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # CEA/LGLS 2004-2005, Francis KLOSS (OCC) # ======================================= diff --git a/src/SMESH_SWIG/ex07_hole1partition.py b/src/SMESH_SWIG/ex07_hole1partition.py index 71153f8f6..b5a4168b8 100644 --- a/src/SMESH_SWIG/ex07_hole1partition.py +++ b/src/SMESH_SWIG/ex07_hole1partition.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # CEA/LGLS 2004-2005, Francis KLOSS (OCC) # ======================================= diff --git a/src/SMESH_SWIG/ex08_hole2build.py b/src/SMESH_SWIG/ex08_hole2build.py index 052a263b3..1682968f1 100644 --- a/src/SMESH_SWIG/ex08_hole2build.py +++ b/src/SMESH_SWIG/ex08_hole2build.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # CEA/LGLS 2004-2005, Francis KLOSS (OCC) # ======================================= diff --git a/src/SMESH_SWIG/ex09_grid4build.py b/src/SMESH_SWIG/ex09_grid4build.py index bcbdd42da..26505515a 100644 --- a/src/SMESH_SWIG/ex09_grid4build.py +++ b/src/SMESH_SWIG/ex09_grid4build.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # CEA/LGLS 2004-2005, Francis KLOSS (OCC) # ======================================= diff --git a/src/SMESH_SWIG/ex10_grid4geometry.py b/src/SMESH_SWIG/ex10_grid4geometry.py index 9d929f4bd..67cb9efd5 100644 --- a/src/SMESH_SWIG/ex10_grid4geometry.py +++ b/src/SMESH_SWIG/ex10_grid4geometry.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # CEA/LGLS 2004-2005, Francis KLOSS (OCC) # ======================================= diff --git a/src/SMESH_SWIG/ex11_grid3partition.py b/src/SMESH_SWIG/ex11_grid3partition.py index 928fb7cdf..806b8e4f9 100644 --- a/src/SMESH_SWIG/ex11_grid3partition.py +++ b/src/SMESH_SWIG/ex11_grid3partition.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # CEA/LGLS 2004-2005, Francis KLOSS (OCC) # ======================================= diff --git a/src/SMESH_SWIG/ex12_grid17partition.py b/src/SMESH_SWIG/ex12_grid17partition.py index 247c9d119..a0f037195 100644 --- a/src/SMESH_SWIG/ex12_grid17partition.py +++ b/src/SMESH_SWIG/ex12_grid17partition.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # CEA/LGLS 2004-2005, Francis KLOSS (OCC) # ======================================= diff --git a/src/SMESH_SWIG/ex13_hole1partial.py b/src/SMESH_SWIG/ex13_hole1partial.py index 705509bee..d16b6c51f 100644 --- a/src/SMESH_SWIG/ex13_hole1partial.py +++ b/src/SMESH_SWIG/ex13_hole1partial.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # CEA/LGLS 2005, Francis KLOSS (OCC) # ================================== diff --git a/src/SMESH_SWIG/ex14_cyl1holed.py b/src/SMESH_SWIG/ex14_cyl1holed.py index 6107fd7a2..bbfca409e 100644 --- a/src/SMESH_SWIG/ex14_cyl1holed.py +++ b/src/SMESH_SWIG/ex14_cyl1holed.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # CEA/LGLS 2004-2005, Francis KLOSS (OCC) # ======================================= diff --git a/src/SMESH_SWIG/ex15_cyl2geometry.py b/src/SMESH_SWIG/ex15_cyl2geometry.py index a9138e26d..554620152 100644 --- a/src/SMESH_SWIG/ex15_cyl2geometry.py +++ b/src/SMESH_SWIG/ex15_cyl2geometry.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # CEA/LGLS 2004-2005, Francis KLOSS (OCC) # ======================================= diff --git a/src/SMESH_SWIG/ex16_cyl2complementary.py b/src/SMESH_SWIG/ex16_cyl2complementary.py index 0077ee025..3dee7b588 100644 --- a/src/SMESH_SWIG/ex16_cyl2complementary.py +++ b/src/SMESH_SWIG/ex16_cyl2complementary.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # CEA/LGLS 2004-2005, Francis KLOSS (OCC) # ======================================= diff --git a/src/SMESH_SWIG/ex17_dome1.py b/src/SMESH_SWIG/ex17_dome1.py index 19b6bdfeb..d3239e2fa 100644 --- a/src/SMESH_SWIG/ex17_dome1.py +++ b/src/SMESH_SWIG/ex17_dome1.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # CEA/LGLS 2004-2005, Francis KLOSS (OCC) # ======================================= diff --git a/src/SMESH_SWIG/ex18_dome2.py b/src/SMESH_SWIG/ex18_dome2.py index 2ca6864d2..e1c270eaf 100644 --- a/src/SMESH_SWIG/ex18_dome2.py +++ b/src/SMESH_SWIG/ex18_dome2.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # CEA/LGLS 2004-2005, Francis KLOSS (OCC) # ======================================= diff --git a/src/SMESH_SWIG/ex19_sphereINcube.py b/src/SMESH_SWIG/ex19_sphereINcube.py index 19e9f8471..02357b0f4 100644 --- a/src/SMESH_SWIG/ex19_sphereINcube.py +++ b/src/SMESH_SWIG/ex19_sphereINcube.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # CEA/LGLS 2005, Francis KLOSS (OCC) # ================================== diff --git a/src/SMESH_SWIG/libSMESH_Swig.i b/src/SMESH_SWIG/libSMESH_Swig.i index 7caf23381..247c0fc39 100644 --- a/src/SMESH_SWIG/libSMESH_Swig.i +++ b/src/SMESH_SWIG/libSMESH_Swig.i @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SMESH_SWIG/smesh.py b/src/SMESH_SWIG/smesh.py index 6b95891c7..82d0750e5 100644 --- a/src/SMESH_SWIG/smesh.py +++ b/src/SMESH_SWIG/smesh.py @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # File : smesh.py # Author : Francis KLOSS, OCC @@ -31,8 +31,6 @@ import geompy import StdMeshers import SMESH -# Public variables -# ---------------- REGULAR = 1 PYTHON = 2 @@ -43,8 +41,6 @@ GHS3D = 4 smesh = salome.lcc.FindOrLoadComponent("FactoryServer", "SMESH") smesh.SetCurrentStudy(salome.myStudy) -# Private functions -# ----------------- NO_NAME = "NoName" @@ -64,39 +60,31 @@ def SetName(obj, name): attr = sobj.FindAttribute("AttributeName")[1] attr.SetValue(name) -# Algorithms and hypothesis -# ========================= - -# Private class: Mesh_Algorithm -# ----------------------------- - +## Mother class to define algorithm, recommended to don't use directly. +# +# More details. class Mesh_Algorithm: - """ - Mother class to define algorithm, recommended to don't use directly - """ + # @class Mesh_Algorithm + # @brief Class Mesh_Algorithm mesh = 0 geom = 0 subm = 0 algo = 0 + ## If the algorithm is global, return 0 + # \fn else return the submesh associated to this algorithm. + # + # More details. def GetSubMesh(self): - """ - If the algorithm is global, return 0 - else return the submesh associated to this algorithm - """ return self.subm + ## Return the wrapped mesher. def GetAlgorithm(self): - """ - Return the wrapped mesher - """ return self.algo + ## Private method. Print error message if a hypothesis was not assigned. def TreatHypoStatus(self, status, hypName, geomName, isAlgo): - """ - Private method. Print error message if a hypothesis was not assigned - """ if isAlgo: hypType = "algorithm" else: @@ -125,10 +113,8 @@ class Mesh_Algorithm: print hypName, "was not assigned to",geomName,":", reason pass + ## Private method. def Create(self, mesh, geom, hypo, so="libStdMeshersEngine.so"): - """ - Private method - """ if geom is None: raise RuntimeError, "Attemp to create " + hypo + " algoritm on None shape" self.mesh = mesh @@ -149,10 +135,8 @@ class Mesh_Algorithm: status = mesh.mesh.AddHypothesis(self.geom, self.algo) self.TreatHypoStatus( status, hypo, name, 1 ) + ## Private method def Hypothesis(self, hyp, args=[], so="libStdMeshersEngine.so"): - """ - Private method - """ hypo = smesh.CreateHypothesis(hyp, so) a = "" s = "=" @@ -171,32 +155,26 @@ class Mesh_Algorithm: # Public class: Mesh_Segment # -------------------------- +## Class to define a segment 1D algorithm for discretization +# +# More details. class Mesh_Segment(Mesh_Algorithm): - """ - Class to define a segment 1D algorithm for discretization - """ + ## Private constructor. def __init__(self, mesh, geom=0): - """ - Private constructor - """ self.Create(mesh, geom, "Regular_1D") + ## Define "LocalLength" hypothesis to cut an edge in several segments with the same length + # @param l for the length of segments that cut an edge def LocalLength(self, l): - """ - Define "LocalLength" hypothesis to cut an edge in several segments with the same length - \param l for the length of segments that cut an edge - """ hyp = self.Hypothesis("LocalLength", [l]) hyp.SetLength(l) return hyp + ## Define "NumberOfSegments" hypothesis to cut an edge in several fixed number of segments + # @param n for the number of segments that cut an edge + # @param s for the scale factor (optional) def NumberOfSegments(self, n, s=[]): - """ - Define "NumberOfSegments" hypothesis to cut an edge in several fixed number of segments - \param n for the number of segments that cut an edge - \param s for the scale factor (optional) - """ if s == []: hyp = self.Hypothesis("NumberOfSegments", [n]) else: @@ -206,86 +184,70 @@ class Mesh_Segment(Mesh_Algorithm): hyp.SetNumberOfSegments(n) return hyp + ## Define "Arithmetic1D" hypothesis to cut an edge in several segments with arithmetic length increasing + # @param start for the length of the first segment + # @param end for the length of the last segment def Arithmetic1D(self, start, end): - """ - Define "Arithmetic1D" hypothesis to cut an edge in several segments with arithmetic length increasing - \param start for the length of the first segment - \param end for the length of the last segment - """ hyp = self.Hypothesis("Arithmetic1D", [start, end]) hyp.SetLength(start, 1) hyp.SetLength(end , 0) return hyp + ## Define "StartEndLength" hypothesis to cut an edge in several segments with geometric length increasing + # @param start for the length of the first segment + # @param end for the length of the last segment def StartEndLength(self, start, end): - """ - Define "StartEndLength" hypothesis to cut an edge in several segments with geometric length increasing - \param start for the length of the first segment - \param end for the length of the last segment - """ hyp = self.Hypothesis("StartEndLength", [start, end]) hyp.SetLength(start, 1) hyp.SetLength(end , 0) return hyp + ## Define "Deflection1D" hypothesis + # @param d for the deflection def Deflection1D(self, d): - """ - Define "Deflection1D" hypothesis - \param d for the deflection - """ hyp = self.Hypothesis("Deflection1D", [d]) hyp.SetDeflection(d) return hyp + ## Define "Propagation" hypothesis that propagate all other hypothesis on all others edges that are in + # the opposite side in the case of quadrangular faces def Propagation(self): - """ - Define "Propagation" hypothesis that propagate all other hypothesis on all others edges that are in - the opposite side in the case of quadrangular faces - """ return self.Hypothesis("Propagation") + ## Define "AutomaticLength" hypothesis + # @param fineness for the fineness [0-1] def AutomaticLength(self, fineness=0): - """ - Define "AutomaticLength" hypothesis - \param fineness for the fineness [0-1] - """ hyp = self.Hypothesis("AutomaticLength") hyp.SetFineness( fineness ) return hyp + ## Define "QuadraticMesh" hypothesis, forcing construction of quadratic edges. + # If the 2D mesher sees that all boundary edges are quadratic ones, + # it generates quadratic faces, else it generates linear faces using + # medium nodes as if they were vertex ones. + # The 3D mesher generates quadratic volumes only if all boundary faces + # are quadratic ones, else it fails. def QuadraticMesh(self): - """ - Define "QuadraticMesh" hypothesis, forcing construction of quadratic edges. - If the 2D mesher sees that all boundary edges are quadratic ones, - it generates quadratic faces, else it generates linear faces using - medium nodes as if they were vertex ones. - The 3D mesher generates quadratic volumes only if all boundary faces - are quadratic ones, else it fails. - """ hyp = self.Hypothesis("QuadraticMesh") return hyp # Public class: Mesh_Segment_Python # --------------------------------- +## Class to define a segment 1D algorithm for discretization with python function +# +# More details. class Mesh_Segment_Python(Mesh_Segment): - """ - Class to define a segment 1D algorithm for discretization with python function - """ + ## Private constructor. def __init__(self, mesh, geom=0): - """ - Private constructor - """ import Python1dPlugin self.Create(mesh, geom, "Python_1D", "libPython1dEngine.so") + ## Define "PythonSplit1D" hypothesis based on the Erwan Adam patch, awaiting equivalent SALOME functionality + # @param n for the number of segments that cut an edge + # @param func for the python function that calculate the length of all segments def PythonSplit1D(self, n, func): - """ - Define "PythonSplit1D" hypothesis based on the Erwan Adam patch, awaiting equivalent SALOME functionality - \param n for the number of segments that cut an edge - \param func for the python function that calculate the length of all segments - """ hyp = self.Hypothesis("PythonSplit1D", [n], "libPython1dEngine.so") hyp.SetNumberOfSegments(n) hyp.SetPythonLog10RatioFunction(func) @@ -294,78 +256,64 @@ class Mesh_Segment_Python(Mesh_Segment): # Public class: Mesh_Triangle # --------------------------- +## Class to define a triangle 2D algorithm +# +# More details. class Mesh_Triangle(Mesh_Algorithm): - """ - Class to define a triangle 2D algorithm - """ + ## Private constructor. def __init__(self, mesh, geom=0): - """ - Private constructor - """ self.Create(mesh, geom, "MEFISTO_2D") + ## Define "MaxElementArea" hypothesis to give the maximun area of each triangles + # @param area for the maximum area of each triangles def MaxElementArea(self, area): - """ - Define "MaxElementArea" hypothesis to give the maximun area of each triangles - \param area for the maximum area of each triangles - """ hyp = self.Hypothesis("MaxElementArea", [area]) hyp.SetMaxElementArea(area) return hyp + ## Define "LengthFromEdges" hypothesis to build triangles based on the length of the edges taken from the wire def LengthFromEdges(self): - """ - Define "LengthFromEdges" hypothesis to build triangles based on the length of the edges taken from the wire - """ return self.Hypothesis("LengthFromEdges") # Public class: Mesh_Quadrangle # ----------------------------- +## Class to define a quadrangle 2D algorithm +# +# More details. class Mesh_Quadrangle(Mesh_Algorithm): - """ - Class to define a quadrangle 2D algorithm - """ + ## Private constructor. def __init__(self, mesh, geom=0): - """ - Private constructor - """ self.Create(mesh, geom, "Quadrangle_2D") + ## Define "QuadranglePreference" hypothesis, forcing construction + # of quadrangles if the number of nodes on opposite edges is not the same + # in the case where the global number of nodes on edges is even def QuadranglePreference(self): - """ - Define "QuadranglePreference" hypothesis, forcing construction - of quadrangles if the number of nodes on opposite edges is not the same - in the case where the global number of nodes on edges is even - """ hyp = self.Hypothesis("QuadranglePreference") return hyp # Public class: Mesh_Tetrahedron # ------------------------------ +## Class to define a tetrahedron 3D algorithm +# +# More details. class Mesh_Tetrahedron(Mesh_Algorithm): - """ - Class to define a tetrahedron 3D algorithm - """ + ## Private constructor. def __init__(self, mesh, algo, geom=0): - """ - Private constructor - """ if algo == NETGEN: self.Create(mesh, geom, "NETGEN_3D", "libNETGENEngine.so") elif algo == GHS3D: import GHS3DPlugin self.Create(mesh, geom, "GHS3D_3D" , "libGHS3DEngine.so") + ## Define "MaxElementVolume" hypothesis to give the maximun volume of each tetrahedral + # @param vol for the maximum volume of each tetrahedral def MaxElementVolume(self, vol): - """ - Define "MaxElementVolume" hypothesis to give the maximun volume of each tetrahedral - \param vol for the maximum volume of each tetrahedral - """ hyp = self.Hypothesis("MaxElementVolume", [vol]) hyp.SetMaxElementVolume(vol) return hyp @@ -373,42 +321,36 @@ class Mesh_Tetrahedron(Mesh_Algorithm): # Public class: Mesh_Hexahedron # ------------------------------ +## Class to define a hexahedron 3D algorithm +# +# More details. class Mesh_Hexahedron(Mesh_Algorithm): - """ - Class to define a hexahedron 3D algorithm - """ + ## Private constructor. def __init__(self, mesh, geom=0): - """ - Private constructor - """ self.Create(mesh, geom, "Hexa_3D") # Public class: Mesh_Netgen # ------------------------------ +## Class to define a NETGEN-based 2D or 3D algorithm +# that need no discrete boundary (i.e. independent) +# +# More details. class Mesh_Netgen(Mesh_Algorithm): - """ - Class to define a NETGEN-based 2D or 3D algorithm - that need no discrete boundary (i.e. independent) - """ is3D = 0 + ## Private constructor. def __init__(self, mesh, is3D, geom=0): - """ - Private constructor - """ self.is3D = is3D if is3D: self.Create(mesh, geom, "NETGEN_2D3D", "libNETGENEngine.so") else: self.Create(mesh, geom, "NETGEN_2D", "libNETGENEngine.so") + ## Define hypothesis containing parameters of the algorithm def Parameters(self): - """ - Define hypothesis containing parameters of the algorithm - """ if self.is3D: hyp = self.Hypothesis("NETGEN_Parameters", [], "libNETGENEngine.so") else: @@ -418,23 +360,21 @@ class Mesh_Netgen(Mesh_Algorithm): # Public class: Mesh # ================== +## Class to define a mesh +# +# More details. class Mesh: - """ - Class to define a mesh - """ geom = 0 mesh = 0 + ## Constructor + # + # Creates mesh on the shape \a geom, + # sets GUI name of this mesh to \a name. + # @param geom Shape to be meshed + # @param name Study name of the mesh def __init__(self, geom, name=0): - """ - Constructor - - Creates mesh on the shape \a geom, - sets GUI name of this mesh to \a name. - \param geom Shape to be meshed - \param name Study name of the mesh - """ self.geom = geom self.mesh = smesh.CreateMesh(geom) if name == 0: @@ -442,22 +382,16 @@ class Mesh: else: SetName(self.mesh, name) + ## Method that returns the mesh def GetMesh(self): - """ - Method that returns the mesh - """ return self.mesh + ## Method that returns the shape associated to the mesh def GetShape(self): - """ - Method that returns the shape associated to the mesh - """ return self.geom + ## Returns mesh dimension depending on shape one def MeshDimension(self): - """ - Returns mesh dimension depending on shape one - """ shells = geompy.SubShapeAllIDs( self.geom, geompy.ShapeType["SHELL"] ) if len( shells ) > 0 : return 3 @@ -469,15 +403,13 @@ class Mesh: return 0; pass + ## Creates a segment discretization 1D algorithm. + # If the optional \a algo parameter is not sets, this algorithm is REGULAR. + # If the optional \a geom parameter is not sets, this algorithm is global. + # Otherwise, this algorithm define a submesh based on \a geom subshape. + # @param algo values are smesh.REGULAR or smesh.PYTHON for discretization via python function + # @param geom If defined, subshape to be meshed def Segment(self, algo=REGULAR, geom=0): - """ - Creates a segment discretization 1D algorithm. - If the optional \a algo parameter is not sets, this algorithm is REGULAR. - If the optional \a geom parameter is not sets, this algorithm is global. - Otherwise, this algorithm define a submesh based on \a geom subshape. - \param algo values are smesh.REGULAR or smesh.PYTHON for discretization via python function - \param geom If defined, subshape to be meshed - """ ## if Segment(geom) is called by mistake if ( isinstance( algo, geompy.GEOM._objref_GEOM_Object)): algo, geom = geom, algo @@ -489,63 +421,51 @@ class Mesh: else: return Mesh_Segment(self, geom) + ## Creates a triangle 2D algorithm for faces. + # If the optional \a geom parameter is not sets, this algorithm is global. + # Otherwise, this algorithm define a submesh based on \a geom subshape. + # @param geom If defined, subshape to be meshed def Triangle(self, geom=0): - """ - Creates a triangle 2D algorithm for faces. - If the optional \a geom parameter is not sets, this algorithm is global. - Otherwise, this algorithm define a submesh based on \a geom subshape. - \param geom If defined, subshape to be meshed - """ return Mesh_Triangle(self, geom) + ## Creates a quadrangle 2D algorithm for faces. + # If the optional \a geom parameter is not sets, this algorithm is global. + # Otherwise, this algorithm define a submesh based on \a geom subshape. + # @param geom If defined, subshape to be meshed def Quadrangle(self, geom=0): - """ - Creates a quadrangle 2D algorithm for faces. - If the optional \a geom parameter is not sets, this algorithm is global. - Otherwise, this algorithm define a submesh based on \a geom subshape. - \param geom If defined, subshape to be meshed - """ return Mesh_Quadrangle(self, geom) + ## Creates a tetrahedron 3D algorithm for solids. + # The parameter \a algo permits to choice the algorithm: NETGEN or GHS3D + # If the optional \a geom parameter is not sets, this algorithm is global. + # Otherwise, this algorithm define a submesh based on \a geom subshape. + # @param algo values are: smesh.NETGEN, smesh.GHS3D + # @param geom If defined, subshape to be meshed def Tetrahedron(self, algo, geom=0): - """ - Creates a tetrahedron 3D algorithm for solids. - The parameter \a algo permits to choice the algorithm: NETGEN or GHS3D - If the optional \a geom parameter is not sets, this algorithm is global. - Otherwise, this algorithm define a submesh based on \a geom subshape. - \param algo values are: smesh.NETGEN, smesh.GHS3D - \param geom If defined, subshape to be meshed - """ ## if Tetrahedron(geom) is called by mistake if ( isinstance( algo, geompy.GEOM._objref_GEOM_Object)): algo, geom = geom, algo pass return Mesh_Tetrahedron(self, algo, geom) + ## Creates a hexahedron 3D algorithm for solids. + # If the optional \a geom parameter is not sets, this algorithm is global. + # Otherwise, this algorithm define a submesh based on \a geom subshape. + # @param geom If defined, subshape to be meshed def Hexahedron(self, geom=0): - """ - Creates a hexahedron 3D algorithm for solids. - If the optional \a geom parameter is not sets, this algorithm is global. - Otherwise, this algorithm define a submesh based on \a geom subshape. - \param geom If defined, subshape to be meshed - """ return Mesh_Hexahedron(self, geom) + ## Creates a NETGEN-based 2D or 3D independent algorithm (i.e. needs no + # discrete boundary). + # If the optional \a geom parameter is not sets, this algorithm is global. + # Otherwise, this algorithm defines a submesh based on \a geom subshape. + # @param is3D If 0 then algorithm is 2D, otherwise 3D + # @param geom If defined, subshape to be meshed def Netgen(self, is3D, geom=0): - """ - Creates a NETGEN-based 2D or 3D independent algorithm (i.e. needs no - discrete boundary). - If the optional \a geom parameter is not sets, this algorithm is global. - Otherwise, this algorithm defines a submesh based on \a geom subshape. - \param is3D If 0 then algorithm is 2D, otherwise 3D - \param geom If defined, subshape to be meshed - """ return Mesh_Netgen(self, is3D, geom) + ## Compute the mesh and return the status of the computation def Compute(self): - """ - Compute the mesh and return the status of the computation - """ ok = smesh.Compute(self.mesh, self.geom) if not ok: errors = smesh.GetAlgoState( self.mesh, self.geom ) @@ -583,11 +503,9 @@ class Mesh: pass return ok + ## Compute tetrahedral mesh using AutomaticLength + MEFISTO + NETGEN + # The parameter \a fineness [0.-1.] defines mesh fineness def AutomaticTetrahedralization(self, fineness=0): - """ - Compute tetrahedral mesh using AutomaticLength + MEFISTO + NETGEN - The parameter \a fineness [0.-1.] defines mesh fineness - """ dim = self.MeshDimension() # assign hypotheses self.RemoveGlobalHypotheses() @@ -600,11 +518,9 @@ class Mesh: pass return self.Compute() + ## Compute hexahedral mesh using AutomaticLength + Quadrangle + Hexahedron + # The parameter \a fineness [0.-1.] defines mesh fineness def AutomaticHexahedralization(self, fineness=0): - """ - Compute hexahedral mesh using AutomaticLength + Quadrangle + Hexahedron - The parameter \a fineness [0.-1.] defines mesh fineness - """ dim = self.MeshDimension() # assign hypotheses self.RemoveGlobalHypotheses() @@ -617,24 +533,20 @@ class Mesh: pass return self.Compute() + ## Removes all global hypotheses def RemoveGlobalHypotheses(self): - """ - Removes all global hypotheses - """ current_hyps = self.mesh.GetHypothesisList( self.geom ) for hyp in current_hyps: self.mesh.RemoveHypothesis( self.geom, hyp ) pass pass + ## Create a mesh group based on geometric object \a grp + # and give a \a name, if this parameter is not defined + # the name is the same as the geometric group name + # @param grp is a geometric group, a vertex, an edge, a face or a solid + # @param name is the name of the mesh group def Group(self, grp, name=""): - """ - Create a mesh group based on geometric object \a grp - and give a \a name, if this parameter is not defined - the name is the same as the geometric group name - \param grp is a geometric group, a vertex, an edge, a face or a solid - \param name is the name of the mesh group - """ if name == "": name = grp.GetName() @@ -670,39 +582,29 @@ class Mesh: else: return self.mesh.CreateGroupFromGEOM(type, name, grp) + ## Export the mesh in a file with the MED format and choice the \a version of MED format + # @param f is the file name + # @param version values are SMESH.MED_V2_1, SMESH.MED_V2_2 def ExportToMED(self, f, version, opt=0): - """ - Export the mesh in a file with the MED format and choice the \a version of MED format - \param f is the file name - \param version values are SMESH.MED_V2_1, SMESH.MED_V2_2 - """ self.mesh.ExportToMED(f, opt, version) + ## Export the mesh in a file with the MED format + # @param f is the file name def ExportMED(self, f, opt=0): - """ - Export the mesh in a file with the MED format - \param f is the file name - """ self.mesh.ExportMED(f, opt) + ## Export the mesh in a file with the DAT format + # @param f is the file name def ExportDAT(self, f): - """ - Export the mesh in a file with the DAT format - \param f is the file name - """ self.mesh.ExportDAT(f) + ## Export the mesh in a file with the UNV format + # @param f is the file name def ExportUNV(self, f): - """ - Export the mesh in a file with the UNV format - \param f is the file name - """ self.mesh.ExportUNV(f) + ## Export the mesh in a file with the STL format + # @param f is the file name + # @param ascii defined the kind of file contents def ExportSTL(self, f, ascii=1): - """ - Export the mesh in a file with the STL format - \param f is the file name - \param ascii defined the kind of file contents - """ self.mesh.ExportSTL(f, ascii) diff --git a/src/StdMeshers/Makefile.in b/src/StdMeshers/Makefile.in index a53d53fd2..b2a3fa7ff 100644 --- a/src/StdMeshers/Makefile.in +++ b/src/StdMeshers/Makefile.in @@ -16,7 +16,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -92,19 +92,19 @@ BIN_SRC = CPPFLAGS+= \ $(OCC_INCLUDES) \ $(BOOST_CPPFLAGS) \ - -I${KERNEL_ROOT_DIR}/include/salome + $(KERNEL_CXXFLAGS) CXXFLAGS+= \ $(OCC_CXXFLAGS) \ - -I${KERNEL_ROOT_DIR}/include/salome \ - -I${GEOM_ROOT_DIR}/include/salome + $(KERNEL_CXXFLAGS) \ + $(GEOM_CXXFLAGS) LDFLAGS+= \ -lSMESHimpl \ -lMEFISTO2D \ $(OCC_LDPATH) \ -lTKAdvTools \ - -L${KERNEL_ROOT_DIR}/lib/salome \ - -L${GEOM_ROOT_DIR}/lib/salome + $(KERNEL_LDFLAGS) \ + $(GEOM_LDFLAGS) @CONCLUDE@ diff --git a/src/StdMeshers/StdMeshers_Arithmetic1D.cxx b/src/StdMeshers/StdMeshers_Arithmetic1D.cxx index b4953a35a..ea72ca004 100644 --- a/src/StdMeshers/StdMeshers_Arithmetic1D.cxx +++ b/src/StdMeshers/StdMeshers_Arithmetic1D.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_Arithmetic1D.hxx b/src/StdMeshers/StdMeshers_Arithmetic1D.hxx index 0f5e2e045..aa132d9fe 100644 --- a/src/StdMeshers/StdMeshers_Arithmetic1D.hxx +++ b/src/StdMeshers/StdMeshers_Arithmetic1D.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_AutomaticLength.cxx b/src/StdMeshers/StdMeshers_AutomaticLength.cxx index 551843523..a91ccebb8 100644 --- a/src/StdMeshers/StdMeshers_AutomaticLength.cxx +++ b/src/StdMeshers/StdMeshers_AutomaticLength.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_AutomaticLength.hxx b/src/StdMeshers/StdMeshers_AutomaticLength.hxx index fcdd63940..c1049345b 100644 --- a/src/StdMeshers/StdMeshers_AutomaticLength.hxx +++ b/src/StdMeshers/StdMeshers_AutomaticLength.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_Deflection1D.cxx b/src/StdMeshers/StdMeshers_Deflection1D.cxx index bc97ab03f..9e0e69171 100644 --- a/src/StdMeshers/StdMeshers_Deflection1D.cxx +++ b/src/StdMeshers/StdMeshers_Deflection1D.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_Deflection1D.hxx b/src/StdMeshers/StdMeshers_Deflection1D.hxx index 8aa7112fe..d1418ad5a 100644 --- a/src/StdMeshers/StdMeshers_Deflection1D.hxx +++ b/src/StdMeshers/StdMeshers_Deflection1D.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_Distribution.cxx b/src/StdMeshers/StdMeshers_Distribution.cxx index 5b0416db6..ca8338d03 100644 --- a/src/StdMeshers/StdMeshers_Distribution.cxx +++ b/src/StdMeshers/StdMeshers_Distribution.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_Distribution.hxx b/src/StdMeshers/StdMeshers_Distribution.hxx index d1eabb5d0..3f9cfd574 100644 --- a/src/StdMeshers/StdMeshers_Distribution.hxx +++ b/src/StdMeshers/StdMeshers_Distribution.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_Hexa_3D.cxx b/src/StdMeshers/StdMeshers_Hexa_3D.cxx index 9bff1bb90..1a2e15e1e 100644 --- a/src/StdMeshers/StdMeshers_Hexa_3D.cxx +++ b/src/StdMeshers/StdMeshers_Hexa_3D.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -265,7 +265,12 @@ bool StdMeshers_Hexa_3D::Compute(SMESH_Mesh & aMesh, aQuads[i]->nbPts[1] != aQuads[i]->nbPts[3]) { MESSAGE("different number of points on the opposite edges of face " << i); // ASSERT(0); - return ClearAndReturn( aQuads, false ); + // \begin{E.A.} + // Try to go into penta algorithm 'cause it has been improved. + // return ClearAndReturn( aQuads, false ); + bool bIsOk = ComputePentahedralMesh(aMesh, aShape); + return ClearAndReturn( aQuads, bIsOk ); + // \end{E.A.} } } diff --git a/src/StdMeshers/StdMeshers_Hexa_3D.hxx b/src/StdMeshers/StdMeshers_Hexa_3D.hxx index 6ee4afb26..98a727b09 100644 --- a/src/StdMeshers/StdMeshers_Hexa_3D.hxx +++ b/src/StdMeshers/StdMeshers_Hexa_3D.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_LengthFromEdges.cxx b/src/StdMeshers/StdMeshers_LengthFromEdges.cxx index 55adccca7..e055a9247 100644 --- a/src/StdMeshers/StdMeshers_LengthFromEdges.cxx +++ b/src/StdMeshers/StdMeshers_LengthFromEdges.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_LengthFromEdges.hxx b/src/StdMeshers/StdMeshers_LengthFromEdges.hxx index c7b20a3b3..27f5b8bc0 100644 --- a/src/StdMeshers/StdMeshers_LengthFromEdges.hxx +++ b/src/StdMeshers/StdMeshers_LengthFromEdges.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_LocalLength.cxx b/src/StdMeshers/StdMeshers_LocalLength.cxx index 90010a213..6fd6bbcf7 100644 --- a/src/StdMeshers/StdMeshers_LocalLength.cxx +++ b/src/StdMeshers/StdMeshers_LocalLength.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_LocalLength.hxx b/src/StdMeshers/StdMeshers_LocalLength.hxx index a48d2859b..c283be121 100644 --- a/src/StdMeshers/StdMeshers_LocalLength.hxx +++ b/src/StdMeshers/StdMeshers_LocalLength.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx b/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx index 3cdff0adf..ca7405ba2 100644 --- a/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx +++ b/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx b/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx index 6a14394ec..5b27addcc 100644 --- a/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx +++ b/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_MaxElementArea.cxx b/src/StdMeshers/StdMeshers_MaxElementArea.cxx index 08c69e68b..f02d21e9e 100644 --- a/src/StdMeshers/StdMeshers_MaxElementArea.cxx +++ b/src/StdMeshers/StdMeshers_MaxElementArea.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_MaxElementArea.hxx b/src/StdMeshers/StdMeshers_MaxElementArea.hxx index 44e8d0921..303ce22d0 100644 --- a/src/StdMeshers/StdMeshers_MaxElementArea.hxx +++ b/src/StdMeshers/StdMeshers_MaxElementArea.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_MaxElementVolume.cxx b/src/StdMeshers/StdMeshers_MaxElementVolume.cxx index c4e58949f..c2e64b426 100644 --- a/src/StdMeshers/StdMeshers_MaxElementVolume.cxx +++ b/src/StdMeshers/StdMeshers_MaxElementVolume.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_MaxElementVolume.hxx b/src/StdMeshers/StdMeshers_MaxElementVolume.hxx index 870aac92a..e8545d9ff 100644 --- a/src/StdMeshers/StdMeshers_MaxElementVolume.hxx +++ b/src/StdMeshers/StdMeshers_MaxElementVolume.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_NotConformAllowed.cxx b/src/StdMeshers/StdMeshers_NotConformAllowed.cxx index 5799cbce6..3e509cbd9 100644 --- a/src/StdMeshers/StdMeshers_NotConformAllowed.cxx +++ b/src/StdMeshers/StdMeshers_NotConformAllowed.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_NotConformAllowed.hxx b/src/StdMeshers/StdMeshers_NotConformAllowed.hxx index 3ffb7b71c..33da8ddd6 100644 --- a/src/StdMeshers/StdMeshers_NotConformAllowed.hxx +++ b/src/StdMeshers/StdMeshers_NotConformAllowed.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx index ba99cb688..76cd67965 100644 --- a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx +++ b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_NumberOfSegments.hxx b/src/StdMeshers/StdMeshers_NumberOfSegments.hxx index 3878330c8..05faf2ed3 100644 --- a/src/StdMeshers/StdMeshers_NumberOfSegments.hxx +++ b/src/StdMeshers/StdMeshers_NumberOfSegments.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_Penta_3D.cxx b/src/StdMeshers/StdMeshers_Penta_3D.cxx index a16f08b99..ec2755317 100644 --- a/src/StdMeshers/StdMeshers_Penta_3D.cxx +++ b/src/StdMeshers/StdMeshers_Penta_3D.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -1130,15 +1130,175 @@ void StdMeshers_Penta_3D::MakeBlock() aFTr = aF; ++iCnt; if (iCnt>1) { - MESSAGE("StdMeshers_Penta_3D::MakeBlock() "); - myErrorStatus=5; // more than one face has triangulation - return; + // \begin{E.A.} + // The current algorithm fails if there is more that one + // face wich contains triangles ... + // In that case, replace return by break to try another + // method (coded in "if (iCnt != 1) { ... }") + // + // MESSAGE("StdMeshers_Penta_3D::MakeBlock() "); + // myErrorStatus=5; // more than one face has triangulation + // return; + break; + // \end{E.A.} } break; // next face } } } } + // + // \begin{E.A.} + // The current algorithm fails if "iCnt != 1", the case "iCnt == 0" + // was not reached 'cause it was not called from Hexa_3D ... Now it + // can occurs and in my opinion, it is the most common case. + // + if (iCnt != 1) { + // The suggested algorithm is the following : + // + // o Check that nb_of_faces == 6 and nb_of_edges == 12 + // then the shape is tologically equivalent to a box + // o In a box, there are three set of four // edges ... + // In the cascade notation, it seems to be the edges + // numbered : + // - 1, 3, 5, 7 + // - 2, 4, 6, 8 + // - 9, 10, 11, 12 + // o For each one of this set, check if the four edges + // have the same number of element. + // o If so, check if the "corresponding" // faces contains + // only quads. It's the faces numbered: + // - 1, 2, 3, 4 + // - 1, 2, 5, 6 + // - 3, 4, 5, 6 + // o If so, check if the opposite edges of each // faces + // have the same number of elements. It is the edges + // numbered : + // - 2 and 4, 6 and 8, 9 and 10, 11 and 12 + // - 1 and 3, 5 and 7, 9 and 11, 10 and 12 + // - 1 and 5, 3 and 7, 4 and 8, 2 and 6 + // o If so, check if the two other faces have the same + // number of elements. It is the faces numbered: + // - 5, 6 + // - 3, 4 + // - 1, 2 + // This test should be improved to test if the nodes + // of the two faces are really "en face". + // o If so, one of the two faces is a candidate to an extrusion, + // It is the faces numbered : + // - 5 + // - 3 + // - 1 + // o Finally, if there is only one candidate, let do the + // extrusion job for the corresponding face + // + int isOK = 0; + // + int iNbF = aM.Extent(); + if (iNbF == 6) { + // + int nb_f1 = pMesh->GetSubMeshContaining(aM(1))->GetSubMeshDS()->NbElements(); + int nb_f2 = pMesh->GetSubMeshContaining(aM(2))->GetSubMeshDS()->NbElements(); + int nb_f3 = pMesh->GetSubMeshContaining(aM(3))->GetSubMeshDS()->NbElements(); + int nb_f4 = pMesh->GetSubMeshContaining(aM(4))->GetSubMeshDS()->NbElements(); + int nb_f5 = pMesh->GetSubMeshContaining(aM(5))->GetSubMeshDS()->NbElements(); + int nb_f6 = pMesh->GetSubMeshContaining(aM(6))->GetSubMeshDS()->NbElements(); + // + int has_only_quad_f1 = 1; + int has_only_quad_f2 = 1; + int has_only_quad_f3 = 1; + int has_only_quad_f4 = 1; + int has_only_quad_f5 = 1; + int has_only_quad_f6 = 1; + // + for (i=1; i<=iNbF; ++i) { + int ok = 1; + const TopoDS_Shape& aF = aM(i); + SMESH_subMesh *aSubMesh = pMesh->GetSubMeshContaining(aF); + SMESHDS_SubMesh *aSM = aSubMesh->GetSubMeshDS(); + SMDS_ElemIteratorPtr itf = aSM->GetElements(); + while(itf->more()) { + const SMDS_MeshElement * pElement = itf->next(); + aElementType = pElement->GetType(); + if (aElementType==SMDSAbs_Face) { + iNbNodes = pElement->NbNodes(); + if ( iNbNodes!=4 ) { + ok = 0; + break ; + } + } + } + if (i==1) has_only_quad_f1 = ok ; + if (i==2) has_only_quad_f2 = ok ; + if (i==3) has_only_quad_f3 = ok ; + if (i==4) has_only_quad_f4 = ok ; + if (i==5) has_only_quad_f5 = ok ; + if (i==6) has_only_quad_f6 = ok ; + } + // + TopTools_IndexedMapOfShape aE; + TopExp::MapShapes(myShape, TopAbs_EDGE, aE); + int iNbE = aE.Extent(); + if (iNbE == 12) { + // + int nb_e01 = pMesh->GetSubMeshContaining(aE(1))->GetSubMeshDS()->NbElements(); + int nb_e02 = pMesh->GetSubMeshContaining(aE(2))->GetSubMeshDS()->NbElements(); + int nb_e03 = pMesh->GetSubMeshContaining(aE(3))->GetSubMeshDS()->NbElements(); + int nb_e04 = pMesh->GetSubMeshContaining(aE(4))->GetSubMeshDS()->NbElements(); + int nb_e05 = pMesh->GetSubMeshContaining(aE(5))->GetSubMeshDS()->NbElements(); + int nb_e06 = pMesh->GetSubMeshContaining(aE(6))->GetSubMeshDS()->NbElements(); + int nb_e07 = pMesh->GetSubMeshContaining(aE(7))->GetSubMeshDS()->NbElements(); + int nb_e08 = pMesh->GetSubMeshContaining(aE(8))->GetSubMeshDS()->NbElements(); + int nb_e09 = pMesh->GetSubMeshContaining(aE(9))->GetSubMeshDS()->NbElements(); + int nb_e10 = pMesh->GetSubMeshContaining(aE(10))->GetSubMeshDS()->NbElements(); + int nb_e11 = pMesh->GetSubMeshContaining(aE(11))->GetSubMeshDS()->NbElements(); + int nb_e12 = pMesh->GetSubMeshContaining(aE(12))->GetSubMeshDS()->NbElements(); + // + int nb_ok = 0 ; + // + if ( (nb_e01==nb_e03) && (nb_e03==nb_e05) && (nb_e05==nb_e07) ) { + if ( has_only_quad_f1 && has_only_quad_f2 && has_only_quad_f3 && has_only_quad_f4 ) { + if ( (nb_e09==nb_e10) && (nb_e08==nb_e06) && (nb_e11==nb_e12) && (nb_e04==nb_e02) ) { + if (nb_f5==nb_f6) { + nb_ok += 1; + aFTr = aM(5); + } + } + } + } + if ( (nb_e02==nb_e04) && (nb_e04==nb_e06) && (nb_e06==nb_e08) ) { + if ( has_only_quad_f1 && has_only_quad_f2 && has_only_quad_f5 && has_only_quad_f6 ) { + if ( (nb_e01==nb_e03) && (nb_e10==nb_e12) && (nb_e05==nb_e07) && (nb_e09==nb_e11) ) { + if (nb_f3==nb_f4) { + nb_ok += 1; + aFTr = aM(3); + } + } + } + } + if ( (nb_e09==nb_e10) && (nb_e10==nb_e11) && (nb_e11==nb_e12) ) { + if ( has_only_quad_f3 && has_only_quad_f4 && has_only_quad_f5 && has_only_quad_f6 ) { + if ( (nb_e01==nb_e05) && (nb_e02==nb_e06) && (nb_e03==nb_e07) && (nb_e04==nb_e08) ) { + if (nb_f1==nb_f2) { + nb_ok += 1; + aFTr = aM(1); + } + } + } + } + // + if ( nb_ok == 1 ) { + isOK = 1; + } + // + } + } + if (!isOK) { + myErrorStatus=5; // more than one face has triangulation + return; + } + } + // \end{E.A.} // // 1. Vetrices V00, V001; // diff --git a/src/StdMeshers/StdMeshers_Penta_3D.hxx b/src/StdMeshers/StdMeshers_Penta_3D.hxx index 274375405..df5aaae0f 100644 --- a/src/StdMeshers/StdMeshers_Penta_3D.hxx +++ b/src/StdMeshers/StdMeshers_Penta_3D.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_Propagation.cxx b/src/StdMeshers/StdMeshers_Propagation.cxx index f2d982bd1..2591d309d 100644 --- a/src/StdMeshers/StdMeshers_Propagation.cxx +++ b/src/StdMeshers/StdMeshers_Propagation.cxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_Propagation.hxx b/src/StdMeshers/StdMeshers_Propagation.hxx index ef750b9ed..40bbdff2d 100644 --- a/src/StdMeshers/StdMeshers_Propagation.hxx +++ b/src/StdMeshers/StdMeshers_Propagation.hxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_QuadranglePreference.cxx b/src/StdMeshers/StdMeshers_QuadranglePreference.cxx index 60dc49499..b16eeb58e 100644 --- a/src/StdMeshers/StdMeshers_QuadranglePreference.cxx +++ b/src/StdMeshers/StdMeshers_QuadranglePreference.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_QuadranglePreference.hxx b/src/StdMeshers/StdMeshers_QuadranglePreference.hxx index ba6eaef5e..553dd756c 100644 --- a/src/StdMeshers/StdMeshers_QuadranglePreference.hxx +++ b/src/StdMeshers/StdMeshers_QuadranglePreference.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx index b035da0dd..e20b1500e 100644 --- a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx +++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx index 82f507d6e..da1a677cd 100644 --- a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx +++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_QuadraticMesh.cxx b/src/StdMeshers/StdMeshers_QuadraticMesh.cxx index 5ac5bd582..2e56a6560 100644 --- a/src/StdMeshers/StdMeshers_QuadraticMesh.cxx +++ b/src/StdMeshers/StdMeshers_QuadraticMesh.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_QuadraticMesh.hxx b/src/StdMeshers/StdMeshers_QuadraticMesh.hxx index 8b88c93db..db601eec8 100644 --- a/src/StdMeshers/StdMeshers_QuadraticMesh.hxx +++ b/src/StdMeshers/StdMeshers_QuadraticMesh.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_Regular_1D.cxx b/src/StdMeshers/StdMeshers_Regular_1D.cxx index 78519c861..f13f1cbce 100644 --- a/src/StdMeshers/StdMeshers_Regular_1D.cxx +++ b/src/StdMeshers/StdMeshers_Regular_1D.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -287,7 +287,8 @@ static bool computeParamByFunc(Adaptor3d_Curve& C3d, double first, double last, int nbSeg, Function& func, list& theParams) { - OSD::SetSignal( true ); + // never do this way + //OSD::SetSignal( true ); if( nbSeg<=0 ) return false; diff --git a/src/StdMeshers/StdMeshers_Regular_1D.hxx b/src/StdMeshers/StdMeshers_Regular_1D.hxx index e2695901b..b820df11b 100644 --- a/src/StdMeshers/StdMeshers_Regular_1D.hxx +++ b/src/StdMeshers/StdMeshers_Regular_1D.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_StartEndLength.cxx b/src/StdMeshers/StdMeshers_StartEndLength.cxx index 46320768f..14563332d 100644 --- a/src/StdMeshers/StdMeshers_StartEndLength.cxx +++ b/src/StdMeshers/StdMeshers_StartEndLength.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers/StdMeshers_StartEndLength.hxx b/src/StdMeshers/StdMeshers_StartEndLength.hxx index 52a8a58b2..ea83724bc 100644 --- a/src/StdMeshers/StdMeshers_StartEndLength.hxx +++ b/src/StdMeshers/StdMeshers_StartEndLength.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshersGUI/Makefile.in b/src/StdMeshersGUI/Makefile.in index 8cb95b44a..5d7689351 100644 --- a/src/StdMeshersGUI/Makefile.in +++ b/src/StdMeshersGUI/Makefile.in @@ -16,7 +16,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -62,12 +62,12 @@ LIB_CLIENT_IDL = \ ## pb in dependencies search LIB_CLIENT_IDL += \ + SALOME_Comm.idl \ SALOMEDS.idl \ SALOME_GenericObj.idl \ SALOME_ContainerManager.idl \ SALOME_Component.idl \ GEOM_Gen.idl \ - SALOME_Comm.idl \ MED.idl LIB_SERVER_IDL = @@ -75,13 +75,13 @@ LIB_SERVER_IDL = # additionnal information to compil and link file CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) \ - -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome \ + $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) $(GEOM_CXXFLAGS) \ $(BOOST_CPPFLAGS) $(QWT_INCLUDES) -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) $(GEOM_CXXFLAGS) LDFLAGS += -lSMESH -lVTKViewer -lSalomeApp -lSMESHObject -lSMESHFiltersSelection $(OCC_KERNEL_LIBS) \ - -lTKBO -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -L${GUI_ROOT_DIR}/lib/salome \ + -lTKBO $(KERNEL_LDFLAGS) $(GEOM_LDFLAGS) $(GUI_LDFLAGS) \ $(QWT_LIBS) @CONCLUDE@ diff --git a/src/StdMeshersGUI/StdMeshersGUI.cxx b/src/StdMeshersGUI/StdMeshersGUI.cxx index a507f6d7b..8de790658 100644 --- a/src/StdMeshersGUI/StdMeshersGUI.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI.cxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx index 4367f4b78..e1a410cba 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "StdMeshersGUI_DistrPreview.h" diff --git a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.h b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.h index b34157c1a..b1401ba86 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.h +++ b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef STD_MESHERS_GUI_DISTR_PREVIEW_HEADER diff --git a/src/StdMeshersGUI/StdMeshersGUI_DistrTable.cxx b/src/StdMeshersGUI/StdMeshersGUI_DistrTable.cxx index 31eeae6fe..3d0d2ae44 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_DistrTable.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_DistrTable.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshersGUI/StdMeshersGUI_DistrTable.h b/src/StdMeshersGUI/StdMeshersGUI_DistrTable.h index a6f7f6106..39cb7448f 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_DistrTable.h +++ b/src/StdMeshersGUI/StdMeshersGUI_DistrTable.h @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx b/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx index fc4370378..02bb83a35 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "StdMeshersGUI_NbSegmentsCreator.h" diff --git a/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.h b/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.h index 5b8ef2967..f1ec2298c 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.h +++ b/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.h @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef NB_SEGMENTS_CREATOR_HEADER diff --git a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx index 03df86b11..e90634cf7 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.h b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.h index bc87917b4..c5c2c8db0 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.h +++ b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.h @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshersGUI/StdMeshers_images.po b/src/StdMeshersGUI/StdMeshers_images.po index b460bd3d9..c7397e2e1 100644 --- a/src/StdMeshersGUI/StdMeshers_images.po +++ b/src/StdMeshersGUI/StdMeshers_images.po @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # This is a Qt message file in .po format. Each msgid starts with # a scope. This scope should *NOT* be translated - eg. "Foo::Bar" diff --git a/src/StdMeshersGUI/StdMeshers_msg_en.po b/src/StdMeshersGUI/StdMeshers_msg_en.po index 563e78fb5..b7d2616da 100644 --- a/src/StdMeshersGUI/StdMeshers_msg_en.po +++ b/src/StdMeshersGUI/StdMeshers_msg_en.po @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # This is a Qt message file in .po format. Each msgid starts with # a scope. This scope should *NOT* be translated - eg. "Foo::Bar" diff --git a/src/StdMeshers_I/Makefile.in b/src/StdMeshers_I/Makefile.in index 0f5cbcd18..2954f9b5e 100644 --- a/src/StdMeshers_I/Makefile.in +++ b/src/StdMeshers_I/Makefile.in @@ -16,7 +16,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -92,13 +92,12 @@ BIN = BIN_SRC = # additionnal information to compil and link file -CPPFLAGS+= $(OCC_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome \ - -I${GEOM_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) -CXXFLAGS+= $(OCC_CXXFLAGS) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome +CPPFLAGS+= $(OCC_INCLUDES) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) \ + $(GEOM_CXXFLAGS) $(BOOST_CPPFLAGS) +CXXFLAGS+= $(OCC_CXXFLAGS) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) $(GEOM_CXXFLAGS) #IDLCXXFLAGS+= -Wbtp -#LDFLAGS+= $(HDF5_LIBS) -lStdMeshers -lSMESHEngine -lSalomeLifeCycleCORBA -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -lSalomeGenericObj -LDFLAGS+= $(HDF5_LIBS) -lStdMeshers -lSMESHEngine -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS+= $(HDF5_LIBS) -lStdMeshers -lSMESHEngine $(KERNEL_LDFLAGS) @CONCLUDE@ diff --git a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx index 1208075f5..a0cbc938d 100644 --- a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.hxx b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.hxx index 090f0a7d2..ede31ba10 100644 --- a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_AutomaticLength_i.cxx b/src/StdMeshers_I/StdMeshers_AutomaticLength_i.cxx index 2f085a7cf..a8605651f 100644 --- a/src/StdMeshers_I/StdMeshers_AutomaticLength_i.cxx +++ b/src/StdMeshers_I/StdMeshers_AutomaticLength_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_AutomaticLength_i.hxx b/src/StdMeshers_I/StdMeshers_AutomaticLength_i.hxx index fcc9876fd..8733b7835 100644 --- a/src/StdMeshers_I/StdMeshers_AutomaticLength_i.hxx +++ b/src/StdMeshers_I/StdMeshers_AutomaticLength_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx b/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx index 72a715d81..cc4ed5ffc 100644 --- a/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_Deflection1D_i.hxx b/src/StdMeshers_I/StdMeshers_Deflection1D_i.hxx index 138b1d9cf..aab9255bd 100644 --- a/src/StdMeshers_I/StdMeshers_Deflection1D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_Deflection1D_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx b/src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx index 0ca4839ba..1c3049518 100644 --- a/src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_Hexa_3D_i.hxx b/src/StdMeshers_I/StdMeshers_Hexa_3D_i.hxx index 91bcabdb8..a2d40a0fe 100644 --- a/src/StdMeshers_I/StdMeshers_Hexa_3D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_Hexa_3D_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx b/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx index 35d871c56..c40f33aba 100644 --- a/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx +++ b/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.hxx b/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.hxx index 1075278d7..f09e63217 100644 --- a/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.hxx +++ b/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx b/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx index deb431fca..8fea4bee9 100644 --- a/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx +++ b/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_LocalLength_i.hxx b/src/StdMeshers_I/StdMeshers_LocalLength_i.hxx index f0b6b21e6..e8210ef7d 100644 --- a/src/StdMeshers_I/StdMeshers_LocalLength_i.hxx +++ b/src/StdMeshers_I/StdMeshers_LocalLength_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx b/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx index efcc37c5c..4f29d8d56 100644 --- a/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.hxx b/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.hxx index d7021df8a..1a486c825 100644 --- a/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx index af8513b7a..223e8769a 100644 --- a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx +++ b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.hxx b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.hxx index 39dde7639..45486800c 100644 --- a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.hxx +++ b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx index 582938b94..eb8322b07 100644 --- a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx +++ b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.hxx b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.hxx index 928fab59a..a497c9b01 100644 --- a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.hxx +++ b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.cxx b/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.cxx index 8940cf7a7..47b87d76a 100644 --- a/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.cxx +++ b/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.hxx b/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.hxx index ceddb3287..dc2867ec9 100644 --- a/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.hxx +++ b/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx index 329b66af4..d36154613 100644 --- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx +++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.hxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.hxx index 1bc5450a3..a0d02bf9c 100644 --- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.hxx +++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_Propagation_i.cxx b/src/StdMeshers_I/StdMeshers_Propagation_i.cxx index 4e038748c..72295061c 100644 --- a/src/StdMeshers_I/StdMeshers_Propagation_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Propagation_i.cxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_Propagation_i.hxx b/src/StdMeshers_I/StdMeshers_Propagation_i.hxx index ca130bc2f..4f127b684 100644 --- a/src/StdMeshers_I/StdMeshers_Propagation_i.hxx +++ b/src/StdMeshers_I/StdMeshers_Propagation_i.hxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.cxx b/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.cxx index a32ded986..77241e490 100644 --- a/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.cxx +++ b/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.hxx b/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.hxx index cfa7968e1..2b0776ef9 100644 --- a/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.hxx +++ b/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx b/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx index 059eac91f..65f084e6d 100644 --- a/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.hxx b/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.hxx index a8c1e281f..739baa48c 100644 --- a/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.cxx b/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.cxx index 7f1818771..80c18738f 100644 --- a/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.cxx +++ b/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.hxx b/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.hxx index c2a3f3f3d..90c74e3d9 100644 --- a/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.hxx +++ b/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx b/src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx index 24f322c58..3aca858e4 100644 --- a/src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_Regular_1D_i.hxx b/src/StdMeshers_I/StdMeshers_Regular_1D_i.hxx index 3231532fd..b372444bd 100644 --- a/src/StdMeshers_I/StdMeshers_Regular_1D_i.hxx +++ b/src/StdMeshers_I/StdMeshers_Regular_1D_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx b/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx index 91d398a99..449db3e86 100644 --- a/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx +++ b/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_StartEndLength_i.hxx b/src/StdMeshers_I/StdMeshers_StartEndLength_i.hxx index d937f9390..45c74af27 100644 --- a/src/StdMeshers_I/StdMeshers_StartEndLength_i.hxx +++ b/src/StdMeshers_I/StdMeshers_StartEndLength_i.hxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/StdMeshers_I/StdMeshers_i.cxx b/src/StdMeshers_I/StdMeshers_i.cxx index a9104ec81..42f4c68fd 100644 --- a/src/StdMeshers_I/StdMeshers_i.cxx +++ b/src/StdMeshers_I/StdMeshers_i.cxx @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // -- 2.30.2