From 6650dea1f85dd5c640829d6e0391d703a304a152 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 7 May 2010 15:08:23 +0000 Subject: [PATCH] Merge from V5_1_4_BR 07/05/2010 --- Makefile.am | 6 +- SMESH_version.h.in | 3 +- adm_local/Makefile.am | 6 +- adm_local/cmake_files/FindSMESH.cmake | 5 +- adm_local/cmake_files/Makefile.am | 6 +- adm_local/unix/Makefile.am | 6 +- adm_local/unix/config_files/Makefile.am | 6 +- adm_local/unix/config_files/check_Platform.m4 | 3 +- adm_local/unix/config_files/check_SMESH.m4 | 3 +- adm_local/unix/make_common_starter.am | 6 +- bin/Makefile.am | 6 +- bin/smesh_setenv.py | 5 +- build_cmake | 5 +- build_cmake.bat | 20 +- build_configure | 3 +- clean_configure | 6 +- configure.ac | 8 +- doc/Makefile.am | 6 +- doc/salome/Makefile.am | 6 +- doc/salome/gui/Makefile.am | 6 +- doc/salome/gui/SMESH/Makefile.am | 6 +- doc/salome/gui/SMESH/doxyfile.in | 2 +- doc/salome/gui/SMESH/doxyfile_py.in | 2 +- .../gui/SMESH/input/2d_meshing_hypo.doc | 4 +- .../gui/SMESH/input/constructing_meshes.doc | 12 +- doc/salome/gui/SMESH/input/hexotic_hypo.doc | 6 +- .../gui/SMESH/input/merging_elements.doc | 1 + .../gui/SMESH/input/pattern_mapping.doc | 4 +- doc/salome/gui/SMESH/input/rotation.doc | 2 +- doc/salome/gui/SMESH/input/scale.doc | 13 +- doc/salome/gui/SMESH/input/symmetry.doc | 3 +- doc/salome/gui/SMESH/input/translation.doc | 1 + .../SMESH/input/tui_defining_hypotheses.doc | 30 ++ doc/salome/gui/SMESH/static/footer.html | 2 +- doc/salome/tui/Makefile.am | 6 +- doc/salome/tui/doxyfile.in | 2 +- doc/salome/tui/static/footer.html | 2 +- idl/Makefile.am | 6 +- idl/SMESH_BasicHypothesis.idl | 3 +- idl/SMESH_Filter.idl | 3 +- idl/SMESH_Gen.idl | 5 +- idl/SMESH_Group.idl | 3 +- idl/SMESH_Hypothesis.idl | 3 +- idl/SMESH_Mesh.idl | 4 +- idl/SMESH_MeshEditor.idl | 4 +- idl/SMESH_Pattern.idl | 3 +- resources/Makefile.am | 6 +- resources/SMESHCatalog.xml.in | 2 +- resources/SalomeApp.xml | 2 +- resources/StdMeshers.xml | 2 +- src/Controls/Makefile.am | 6 +- src/Controls/SMESHControls.cxx | 3 +- src/Controls/SMESH_Controls.cxx | 3 +- src/Controls/SMESH_Controls.hxx | 3 +- src/Controls/SMESH_ControlsDef.hxx | 3 +- src/Driver/Driver_Document.cxx | 3 +- src/Driver/Driver_Document.h | 3 +- src/Driver/Driver_Mesh.cxx | 3 +- src/Driver/Driver_Mesh.h | 3 +- src/Driver/Driver_SMDS_Mesh.cxx | 3 +- src/Driver/Driver_SMDS_Mesh.h | 3 +- src/Driver/Driver_SMESHDS_Mesh.cxx | 3 +- src/Driver/Driver_SMESHDS_Mesh.h | 3 +- src/Driver/Makefile.am | 6 +- src/DriverDAT/DAT_Test.cxx | 3 +- src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx | 3 +- src/DriverDAT/DriverDAT_R_SMDS_Mesh.h | 3 +- .../DriverDAT_R_SMESHDS_Document.cxx | 3 +- src/DriverDAT/DriverDAT_R_SMESHDS_Document.h | 3 +- src/DriverDAT/DriverDAT_R_SMESHDS_Mesh.cxx | 3 +- src/DriverDAT/DriverDAT_R_SMESHDS_Mesh.h | 3 +- src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx | 3 +- src/DriverDAT/DriverDAT_W_SMDS_Mesh.h | 3 +- .../DriverDAT_W_SMESHDS_Document.cxx | 3 +- src/DriverDAT/DriverDAT_W_SMESHDS_Document.h | 3 +- src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.cxx | 3 +- src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.h | 3 +- src/DriverDAT/Makefile.am | 6 +- src/DriverDAT/SMESH_DriverDAT.hxx | 3 +- src/DriverMED/DriverMED_Family.cxx | 3 +- src/DriverMED/DriverMED_Family.h | 3 +- src/DriverMED/DriverMED_R_SMDS_Mesh.cxx | 3 +- src/DriverMED/DriverMED_R_SMDS_Mesh.h | 3 +- .../DriverMED_R_SMESHDS_Document.cxx | 3 +- src/DriverMED/DriverMED_R_SMESHDS_Document.h | 3 +- src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx | 3 +- src/DriverMED/DriverMED_R_SMESHDS_Mesh.h | 3 +- src/DriverMED/DriverMED_W_SMDS_Mesh.cxx | 3 +- src/DriverMED/DriverMED_W_SMDS_Mesh.h | 3 +- .../DriverMED_W_SMESHDS_Document.cxx | 3 +- src/DriverMED/DriverMED_W_SMESHDS_Document.h | 3 +- src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx | 3 +- src/DriverMED/DriverMED_W_SMESHDS_Mesh.h | 3 +- src/DriverMED/MED_Test.cxx | 3 +- src/DriverMED/Makefile.am | 6 +- src/DriverMED/SMESH_DriverMED.hxx | 3 +- src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx | 3 +- src/DriverSTL/DriverSTL_R_SMDS_Mesh.h | 3 +- src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx | 3 +- src/DriverSTL/DriverSTL_W_SMDS_Mesh.h | 3 +- src/DriverSTL/Makefile.am | 6 +- src/DriverSTL/SMESH_DriverSTL.hxx | 3 +- src/DriverSTL/STL_Test.cxx | 3 +- src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx | 3 +- src/DriverUNV/DriverUNV_R_SMDS_Mesh.h | 3 +- .../DriverUNV_R_SMESHDS_Document.cxx | 3 +- src/DriverUNV/DriverUNV_R_SMESHDS_Document.h | 3 +- src/DriverUNV/DriverUNV_R_SMESHDS_Mesh.cxx | 3 +- src/DriverUNV/DriverUNV_R_SMESHDS_Mesh.h | 3 +- src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx | 3 +- src/DriverUNV/DriverUNV_W_SMDS_Mesh.h | 3 +- .../DriverUNV_W_SMESHDS_Document.cxx | 3 +- src/DriverUNV/DriverUNV_W_SMESHDS_Document.h | 3 +- src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.cxx | 3 +- src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.h | 3 +- src/DriverUNV/Makefile.am | 6 +- src/DriverUNV/SMESH_DriverUNV.hxx | 3 +- src/DriverUNV/UNV2411_Structure.cxx | 3 +- src/DriverUNV/UNV2411_Structure.hxx | 3 +- src/DriverUNV/UNV2412_Structure.cxx | 3 +- src/DriverUNV/UNV2412_Structure.hxx | 3 +- src/DriverUNV/UNV2417_Structure.cxx | 3 +- src/DriverUNV/UNV2417_Structure.hxx | 3 +- src/DriverUNV/UNV_Test.cxx | 3 +- src/DriverUNV/UNV_Utilities.cxx | 3 +- src/DriverUNV/UNV_Utilities.hxx | 3 +- src/MEFISTO2/Makefile.am | 6 +- src/Makefile.am | 6 +- src/OBJECT/Makefile.am | 6 +- src/OBJECT/SMESH_Actor.cxx | 9 +- src/OBJECT/SMESH_Actor.h | 5 +- src/OBJECT/SMESH_ActorDef.h | 4 +- src/OBJECT/SMESH_ActorUtils.cxx | 3 +- src/OBJECT/SMESH_ActorUtils.h | 3 +- src/OBJECT/SMESH_DeviceActor.cxx | 4 +- src/OBJECT/SMESH_DeviceActor.h | 3 +- src/OBJECT/SMESH_ExtractGeometry.cxx | 3 +- src/OBJECT/SMESH_ExtractGeometry.h | 3 +- src/OBJECT/SMESH_FaceOrientationFilter.cxx | 6 +- src/OBJECT/SMESH_FaceOrientationFilter.h | 6 +- src/OBJECT/SMESH_Object.cxx | 3 +- src/OBJECT/SMESH_Object.h | 3 +- src/OBJECT/SMESH_ObjectDef.h | 3 +- src/OBJECT/SMESH_PreviewActorsCollection.cxx | 7 +- src/OBJECT/SMESH_PreviewActorsCollection.h | 6 +- src/PluginUtils/GeomSelectionTools.cxx | 5 +- src/PluginUtils/GeomSelectionTools.h | 7 +- src/PluginUtils/Makefile.am | 5 +- src/SMDS/Makefile.am | 6 +- src/SMDS/SMDSAbs_ElementType.hxx | 5 +- src/SMDS/SMDS_EdgePosition.cxx | 3 +- src/SMDS/SMDS_EdgePosition.hxx | 3 +- src/SMDS/SMDS_ElemIterator.hxx | 5 +- src/SMDS/SMDS_FaceOfEdges.cxx | 3 +- src/SMDS/SMDS_FaceOfEdges.hxx | 3 +- src/SMDS/SMDS_FaceOfNodes.cxx | 3 +- src/SMDS/SMDS_FaceOfNodes.hxx | 3 +- src/SMDS/SMDS_FacePosition.cxx | 3 +- src/SMDS/SMDS_FacePosition.hxx | 3 +- src/SMDS/SMDS_Iterator.hxx | 3 +- src/SMDS/SMDS_IteratorOfElements.cxx | 3 +- src/SMDS/SMDS_IteratorOfElements.hxx | 3 +- src/SMDS/SMDS_MemoryLimit.cxx | 6 +- src/SMDS/SMDS_Mesh.cxx | 5 +- src/SMDS/SMDS_Mesh.hxx | 5 +- src/SMDS/SMDS_Mesh0DElement.cxx | 8 +- src/SMDS/SMDS_Mesh0DElement.hxx | 8 +- src/SMDS/SMDS_MeshEdge.cxx | 3 +- src/SMDS/SMDS_MeshEdge.hxx | 3 +- src/SMDS/SMDS_MeshElement.cxx | 3 +- src/SMDS/SMDS_MeshElement.hxx | 3 +- src/SMDS/SMDS_MeshElementIDFactory.cxx | 3 +- src/SMDS/SMDS_MeshElementIDFactory.hxx | 3 +- src/SMDS/SMDS_MeshFace.cxx | 3 +- src/SMDS/SMDS_MeshFace.hxx | 3 +- src/SMDS/SMDS_MeshGroup.cxx | 3 +- src/SMDS/SMDS_MeshGroup.hxx | 3 +- src/SMDS/SMDS_MeshIDFactory.cxx | 3 +- src/SMDS/SMDS_MeshIDFactory.hxx | 3 +- src/SMDS/SMDS_MeshInfo.hxx | 6 +- src/SMDS/SMDS_MeshNode.cxx | 3 +- src/SMDS/SMDS_MeshNode.hxx | 3 +- src/SMDS/SMDS_MeshObject.cxx | 3 +- src/SMDS/SMDS_MeshObject.hxx | 3 +- src/SMDS/SMDS_MeshVolume.cxx | 3 +- src/SMDS/SMDS_MeshVolume.hxx | 3 +- src/SMDS/SMDS_PolygonalFaceOfNodes.cxx | 3 +- src/SMDS/SMDS_PolygonalFaceOfNodes.hxx | 3 +- src/SMDS/SMDS_PolyhedralVolumeOfNodes.cxx | 3 +- src/SMDS/SMDS_PolyhedralVolumeOfNodes.hxx | 3 +- src/SMDS/SMDS_Position.cxx | 3 +- src/SMDS/SMDS_Position.hxx | 3 +- src/SMDS/SMDS_QuadraticEdge.cxx | 3 +- src/SMDS/SMDS_QuadraticEdge.hxx | 3 +- src/SMDS/SMDS_QuadraticFaceOfNodes.cxx | 3 +- src/SMDS/SMDS_QuadraticFaceOfNodes.hxx | 3 +- src/SMDS/SMDS_QuadraticVolumeOfNodes.cxx | 3 +- src/SMDS/SMDS_QuadraticVolumeOfNodes.hxx | 3 +- src/SMDS/SMDS_SetIterator.hxx | 3 +- src/SMDS/SMDS_SpacePosition.cxx | 3 +- src/SMDS/SMDS_SpacePosition.hxx | 3 +- src/SMDS/SMDS_StdIterator.hxx | 10 +- src/SMDS/SMDS_TypeOfPosition.hxx | 3 +- src/SMDS/SMDS_VertexPosition.cxx | 3 +- src/SMDS/SMDS_VertexPosition.hxx | 3 +- src/SMDS/SMDS_VolumeOfFaces.cxx | 3 +- src/SMDS/SMDS_VolumeOfFaces.hxx | 3 +- src/SMDS/SMDS_VolumeOfNodes.cxx | 3 +- src/SMDS/SMDS_VolumeOfNodes.hxx | 3 +- src/SMDS/SMDS_VolumeTool.cxx | 3 +- src/SMDS/SMDS_VolumeTool.hxx | 3 +- src/SMDS/SMESH_SMDS.hxx | 3 +- src/SMESH/Makefile.am | 6 +- src/SMESH/SMESH_0D_Algo.cxx | 3 +- src/SMESH/SMESH_0D_Algo.hxx | 3 +- src/SMESH/SMESH_1D_Algo.cxx | 3 +- src/SMESH/SMESH_1D_Algo.hxx | 3 +- src/SMESH/SMESH_2D_Algo.cxx | 3 +- src/SMESH/SMESH_2D_Algo.hxx | 3 +- src/SMESH/SMESH_3D_Algo.cxx | 3 +- src/SMESH/SMESH_3D_Algo.hxx | 3 +- src/SMESH/SMESH_Algo.cxx | 9 +- src/SMESH/SMESH_Algo.hxx | 6 +- src/SMESH/SMESH_Block.cxx | 3 +- src/SMESH/SMESH_Block.hxx | 3 +- src/SMESH/SMESH_Comment.hxx | 6 +- src/SMESH/SMESH_ComputeError.hxx | 6 +- ...MESH_DataMapOfElemPtrSequenceOfElemPtr.hxx | 3 +- src/SMESH/SMESH_File.cxx | 22 +- src/SMESH/SMESH_File.hxx | 9 +- src/SMESH/SMESH_Gen.cxx | 5 +- src/SMESH/SMESH_Gen.hxx | 4 +- src/SMESH/SMESH_Group.cxx | 3 +- src/SMESH/SMESH_Group.hxx | 3 +- src/SMESH/SMESH_HypoFilter.cxx | 3 +- src/SMESH/SMESH_HypoFilter.hxx | 3 +- src/SMESH/SMESH_Hypothesis.cxx | 3 +- src/SMESH/SMESH_Hypothesis.hxx | 4 +- ...IndexedDataMapOfShapeIndexedMapOfShape.hxx | 3 +- src/SMESH/SMESH_Mesh.cxx | 3 +- src/SMESH/SMESH_Mesh.hxx | 8 +- src/SMESH/SMESH_MeshEditor.cxx | 3 +- src/SMESH/SMESH_MeshEditor.hxx | 3 +- src/SMESH/SMESH_MesherHelper.cxx | 296 ++++-------------- src/SMESH/SMESH_MesherHelper.hxx | 3 +- src/SMESH/SMESH_Octree.cxx | 6 +- src/SMESH/SMESH_Octree.hxx | 6 +- src/SMESH/SMESH_OctreeNode.cxx | 6 +- src/SMESH/SMESH_OctreeNode.hxx | 6 +- src/SMESH/SMESH_Pattern.cxx | 3 +- src/SMESH/SMESH_Pattern.hxx | 3 +- src/SMESH/SMESH_SMESH.hxx | 3 +- src/SMESH/SMESH_SequenceOfElemPtr.hxx | 3 +- src/SMESH/SMESH_SequenceOfNode.hxx | 3 +- src/SMESH/SMESH_subMesh.cxx | 3 +- src/SMESH/SMESH_subMesh.hxx | 3 +- src/SMESH/SMESH_subMeshEventListener.hxx | 3 +- src/SMESHClient/Makefile.am | 6 +- src/SMESHClient/SMESHClientBin.cxx | 3 +- src/SMESHClient/SMESH_Client.cxx | 3 +- src/SMESHClient/SMESH_Client.hxx | 3 +- src/SMESHDS/Makefile.am | 6 +- src/SMESHDS/SMESHDS_Command.cxx | 3 +- src/SMESHDS/SMESHDS_Command.hxx | 3 +- src/SMESHDS/SMESHDS_CommandType.hxx | 3 +- src/SMESHDS/SMESHDS_DataMapOfShape.hxx | 3 +- src/SMESHDS/SMESHDS_Document.cxx | 3 +- src/SMESHDS/SMESHDS_Document.hxx | 3 +- src/SMESHDS/SMESHDS_Group.cxx | 3 +- src/SMESHDS/SMESHDS_Group.hxx | 3 +- src/SMESHDS/SMESHDS_GroupBase.cxx | 3 +- src/SMESHDS/SMESHDS_GroupBase.hxx | 3 +- src/SMESHDS/SMESHDS_GroupOnGeom.cxx | 3 +- src/SMESHDS/SMESHDS_GroupOnGeom.hxx | 3 +- src/SMESHDS/SMESHDS_Hypothesis.cxx | 3 +- src/SMESHDS/SMESHDS_Hypothesis.hxx | 3 +- src/SMESHDS/SMESHDS_Mesh.cxx | 3 +- src/SMESHDS/SMESHDS_Mesh.hxx | 3 +- src/SMESHDS/SMESHDS_Script.cxx | 3 +- src/SMESHDS/SMESHDS_Script.hxx | 3 +- src/SMESHDS/SMESHDS_SubMesh.cxx | 3 +- src/SMESHDS/SMESHDS_SubMesh.hxx | 3 +- src/SMESHDS/SMESH_SMESHDS.hxx | 3 +- src/SMESHFiltersSelection/Makefile.am | 6 +- .../SMESH_LogicalFilter.cxx | 3 +- .../SMESH_LogicalFilter.hxx | 3 +- .../SMESH_NumberFilter.cxx | 3 +- .../SMESH_NumberFilter.hxx | 3 +- src/SMESHFiltersSelection/SMESH_Type.h | 3 +- .../SMESH_TypeFilter.cxx | 3 +- .../SMESH_TypeFilter.hxx | 3 +- src/SMESHGUI/Makefile.am | 6 +- src/SMESHGUI/SMESHGUI.cxx | 5 +- src/SMESHGUI/SMESHGUI.h | 3 +- src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx | 90 ++++-- src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h | 6 +- .../SMESHGUI_AddQuadraticElementDlg.cxx | 87 +++-- .../SMESHGUI_AddQuadraticElementDlg.h | 6 +- src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h | 3 +- src/SMESHGUI/SMESHGUI_ClippingDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_ClippingDlg.h | 3 +- src/SMESHGUI/SMESHGUI_ComputeDlg.cxx | 8 +- src/SMESHGUI/SMESHGUI_ComputeDlg.h | 6 +- src/SMESHGUI/SMESHGUI_ConvToQuadDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_ConvToQuadDlg.h | 3 +- src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx | 3 +- src/SMESHGUI/SMESHGUI_ConvToQuadOp.h | 3 +- src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_CreatePatternDlg.h | 3 +- .../SMESHGUI_CreatePolyhedralVolumeDlg.cxx | 89 ++++-- .../SMESHGUI_CreatePolyhedralVolumeDlg.h | 6 +- src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_DeleteGroupDlg.h | 3 +- src/SMESHGUI/SMESHGUI_Dialog.cxx | 3 +- src/SMESHGUI/SMESHGUI_Dialog.h | 3 +- src/SMESHGUI/SMESHGUI_Displayer.cxx | 3 +- src/SMESHGUI/SMESHGUI_Displayer.h | 3 +- src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx | 4 +- src/SMESHGUI/SMESHGUI_EditMeshDlg.h | 3 +- .../SMESHGUI_ExtrusionAlongPathDlg.cxx | 18 +- src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.h | 3 +- src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_ExtrusionDlg.h | 3 +- src/SMESHGUI/SMESHGUI_FileInfoDlg.cxx | 6 +- src/SMESHGUI/SMESHGUI_FileInfoDlg.h | 6 +- src/SMESHGUI/SMESHGUI_FileValidator.cxx | 6 +- src/SMESHGUI/SMESHGUI_FileValidator.h | 6 +- src/SMESHGUI/SMESHGUI_Filter.cxx | 3 +- src/SMESHGUI/SMESHGUI_Filter.h | 3 +- src/SMESHGUI/SMESHGUI_FilterDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_FilterDlg.h | 3 +- src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_FilterLibraryDlg.h | 3 +- src/SMESHGUI/SMESHGUI_FilterUtils.cxx | 3 +- src/SMESHGUI/SMESHGUI_FilterUtils.h | 3 +- src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx | 6 +- src/SMESHGUI/SMESHGUI_FindElemByPointDlg.h | 6 +- src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx | 3 +- src/SMESHGUI/SMESHGUI_GEOMGenUtils.h | 3 +- src/SMESHGUI/SMESHGUI_GroupDlg.cxx | 5 +- src/SMESHGUI/SMESHGUI_GroupDlg.h | 3 +- src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx | 6 +- src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.h | 6 +- src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_GroupOpDlg.h | 3 +- src/SMESHGUI/SMESHGUI_GroupUtils.cxx | 3 +- src/SMESHGUI/SMESHGUI_GroupUtils.h | 3 +- src/SMESHGUI/SMESHGUI_Hypotheses.cxx | 3 +- src/SMESHGUI/SMESHGUI_Hypotheses.h | 3 +- src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx | 5 +- src/SMESHGUI/SMESHGUI_HypothesesUtils.h | 5 +- src/SMESHGUI/SMESHGUI_IdValidator.h | 3 +- src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx | 6 +- src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.h | 6 +- src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.h | 3 +- src/SMESHGUI/SMESHGUI_MeshDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_MeshDlg.h | 3 +- src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx | 3 +- src/SMESHGUI/SMESHGUI_MeshEditPreview.h | 3 +- src/SMESHGUI/SMESHGUI_MeshInfosBox.cxx | 6 +- src/SMESHGUI/SMESHGUI_MeshInfosBox.h | 6 +- src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_MeshInfosDlg.h | 3 +- src/SMESHGUI/SMESHGUI_MeshOp.cxx | 24 +- src/SMESHGUI/SMESHGUI_MeshOp.h | 3 +- src/SMESHGUI/SMESHGUI_MeshOrderDlg.cxx | 6 +- src/SMESHGUI/SMESHGUI_MeshOrderDlg.h | 6 +- src/SMESHGUI/SMESHGUI_MeshOrderOp.cxx | 7 +- src/SMESHGUI/SMESHGUI_MeshOrderOp.h | 7 +- src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_MeshPatternDlg.h | 3 +- src/SMESHGUI/SMESHGUI_MeshUtils.cxx | 3 +- src/SMESHGUI/SMESHGUI_MeshUtils.h | 3 +- src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_MoveNodesDlg.h | 3 +- src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_MultiEditDlg.h | 3 +- src/SMESHGUI/SMESHGUI_NodesDlg.cxx | 86 +++-- src/SMESHGUI/SMESHGUI_NodesDlg.h | 8 +- src/SMESHGUI/SMESHGUI_Operation.cxx | 3 +- src/SMESHGUI/SMESHGUI_Operation.h | 3 +- src/SMESHGUI/SMESHGUI_PatternUtils.cxx | 3 +- src/SMESHGUI/SMESHGUI_PatternUtils.h | 3 +- src/SMESHGUI/SMESHGUI_PatternWidget.cxx | 3 +- src/SMESHGUI/SMESHGUI_PatternWidget.h | 3 +- .../SMESHGUI_Preferences_ColorDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.h | 3 +- .../SMESHGUI_Preferences_ScalarBarDlg.cxx | 3 +- .../SMESHGUI_Preferences_ScalarBarDlg.h | 3 +- src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_RemoveElementsDlg.h | 3 +- src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_RemoveNodesDlg.h | 3 +- src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_RenumberingDlg.h | 3 +- src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx | 5 +- src/SMESHGUI/SMESHGUI_RevolutionDlg.h | 3 +- src/SMESHGUI/SMESHGUI_RotationDlg.cxx | 5 +- src/SMESHGUI/SMESHGUI_RotationDlg.h | 3 +- src/SMESHGUI/SMESHGUI_ScaleDlg.cxx | 8 +- src/SMESHGUI/SMESHGUI_ScaleDlg.h | 6 +- src/SMESHGUI/SMESHGUI_Selection.cxx | 3 +- src/SMESHGUI/SMESHGUI_Selection.h | 3 +- src/SMESHGUI/SMESHGUI_SelectionOp.cxx | 3 +- src/SMESHGUI/SMESHGUI_SelectionOp.h | 3 +- src/SMESHGUI/SMESHGUI_SewingDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_SewingDlg.h | 3 +- src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.h | 3 +- src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_SingleEditDlg.h | 3 +- src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx | 15 +- src/SMESHGUI/SMESHGUI_SmoothingDlg.h | 3 +- src/SMESHGUI/SMESHGUI_SpinBox.cxx | 3 +- src/SMESHGUI/SMESHGUI_SpinBox.h | 3 +- .../SMESHGUI_StandardMeshInfosDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.h | 3 +- src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx | 5 +- src/SMESHGUI/SMESHGUI_SymmetryDlg.h | 3 +- src/SMESHGUI/SMESHGUI_TranslationDlg.cxx | 8 +- src/SMESHGUI/SMESHGUI_TranslationDlg.h | 3 +- src/SMESHGUI/SMESHGUI_TransparencyDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_TransparencyDlg.h | 3 +- src/SMESHGUI/SMESHGUI_Utils.cxx | 8 +- src/SMESHGUI/SMESHGUI_Utils.h | 3 +- src/SMESHGUI/SMESHGUI_VTKUtils.cxx | 3 +- src/SMESHGUI/SMESHGUI_VTKUtils.h | 3 +- src/SMESHGUI/SMESHGUI_WhatIsDlg.cxx | 6 +- src/SMESHGUI/SMESHGUI_WhatIsDlg.h | 6 +- src/SMESHGUI/SMESHGUI_XmlHandler.cxx | 3 +- src/SMESHGUI/SMESHGUI_XmlHandler.h | 3 +- src/SMESHGUI/SMESH_SMESHGUI.hxx | 3 +- src/SMESHGUI/SMESH_images.ts | 2 +- src/SMESHGUI/SMESH_msg_en.ts | 11 +- src/SMESH_I/Makefile.am | 6 +- src/SMESH_I/SMESH.hxx | 3 +- src/SMESH_I/SMESHEngine.cxx | 3 +- src/SMESH_I/SMESH_0D_Algo_i.cxx | 3 +- src/SMESH_I/SMESH_0D_Algo_i.hxx | 3 +- src/SMESH_I/SMESH_1D_Algo_i.cxx | 3 +- src/SMESH_I/SMESH_1D_Algo_i.hxx | 3 +- src/SMESH_I/SMESH_2D_Algo_i.cxx | 3 +- src/SMESH_I/SMESH_2D_Algo_i.hxx | 3 +- src/SMESH_I/SMESH_2smeshpy.cxx | 4 +- src/SMESH_I/SMESH_2smeshpy.hxx | 3 +- src/SMESH_I/SMESH_3D_Algo_i.cxx | 3 +- src/SMESH_I/SMESH_3D_Algo_i.hxx | 3 +- src/SMESH_I/SMESH_Algo_i.cxx | 3 +- src/SMESH_I/SMESH_Algo_i.hxx | 3 +- src/SMESH_I/SMESH_DumpPython.cxx | 3 +- src/SMESH_I/SMESH_Filter_i.cxx | 3 +- src/SMESH_I/SMESH_Filter_i.hxx | 3 +- src/SMESH_I/SMESH_Gen_i.cxx | 5 +- src/SMESH_I/SMESH_Gen_i.hxx | 3 +- src/SMESH_I/SMESH_Gen_i_1.cxx | 3 +- src/SMESH_I/SMESH_Group_i.cxx | 3 +- src/SMESH_I/SMESH_Group_i.hxx | 3 +- src/SMESH_I/SMESH_Hypothesis_i.cxx | 3 +- src/SMESH_I/SMESH_Hypothesis_i.hxx | 3 +- src/SMESH_I/SMESH_MEDFamily_i.cxx | 3 +- src/SMESH_I/SMESH_MEDFamily_i.hxx | 3 +- src/SMESH_I/SMESH_MEDMesh_i.cxx | 3 +- src/SMESH_I/SMESH_MEDMesh_i.hxx | 3 +- src/SMESH_I/SMESH_MEDSupport_i.cxx | 3 +- src/SMESH_I/SMESH_MEDSupport_i.hxx | 3 +- src/SMESH_I/SMESH_MeshEditor_i.cxx | 7 +- src/SMESH_I/SMESH_MeshEditor_i.hxx | 3 +- src/SMESH_I/SMESH_Mesh_i.cxx | 8 +- src/SMESH_I/SMESH_Mesh_i.hxx | 3 +- src/SMESH_I/SMESH_NoteBook.cxx | 30 +- src/SMESH_I/SMESH_NoteBook.hxx | 31 +- src/SMESH_I/SMESH_Pattern_i.cxx | 3 +- src/SMESH_I/SMESH_Pattern_i.hxx | 3 +- src/SMESH_I/SMESH_PythonDump.hxx | 3 +- src/SMESH_I/SMESH_subMesh_i.cxx | 3 +- src/SMESH_I/SMESH_subMesh_i.hxx | 3 +- src/SMESH_I/smeshpy.py | 3 +- src/SMESH_SWIG/Makefile.am | 6 +- src/SMESH_SWIG/PAL_MESH_041_mesh.py | 3 +- src/SMESH_SWIG/PAL_MESH_043_2D.py | 3 +- src/SMESH_SWIG/PAL_MESH_043_3D.py | 3 +- src/SMESH_SWIG/SMESH_AdvancedEditor.py | 3 +- src/SMESH_SWIG/SMESH_BelongToGeom.py | 3 +- src/SMESH_SWIG/SMESH_BuildCompound.py | 6 +- src/SMESH_SWIG/SMESH_GroupFromGeom.py | 3 +- src/SMESH_SWIG/SMESH_GroupFromGeom2.py | 3 +- src/SMESH_SWIG/SMESH_GroupLyingOnGeom.py | 3 +- src/SMESH_SWIG/SMESH_Nut.py | 3 +- src/SMESH_SWIG/SMESH_Partition1_tetra.py | 3 +- src/SMESH_SWIG/SMESH_Sphere.py | 3 +- src/SMESH_SWIG/SMESH_blocks.py | 3 +- src/SMESH_SWIG/SMESH_box.py | 3 +- src/SMESH_SWIG/SMESH_box2_tetra.py | 3 +- src/SMESH_SWIG/SMESH_box3_tetra.py | 3 +- src/SMESH_SWIG/SMESH_box_tetra.py | 3 +- src/SMESH_SWIG/SMESH_controls.py | 3 +- src/SMESH_SWIG/SMESH_demo_hexa2_upd.py | 3 +- src/SMESH_SWIG/SMESH_fixation.py | 3 +- src/SMESH_SWIG/SMESH_fixation_hexa.py | 3 +- src/SMESH_SWIG/SMESH_fixation_netgen.py | 3 +- src/SMESH_SWIG/SMESH_fixation_tetra.py | 3 +- src/SMESH_SWIG/SMESH_flight_skin.py | 3 +- src/SMESH_SWIG/SMESH_freebord.py | 3 +- src/SMESH_SWIG/SMESH_hexaedre.py | 3 +- src/SMESH_SWIG/SMESH_mechanic.py | 3 +- src/SMESH_SWIG/SMESH_mechanic_editor.py | 3 +- src/SMESH_SWIG/SMESH_mechanic_netgen.py | 3 +- src/SMESH_SWIG/SMESH_mechanic_tetra.py | 3 +- src/SMESH_SWIG/SMESH_reg.py | 3 +- src/SMESH_SWIG/SMESH_shared_modules.py | 3 +- src/SMESH_SWIG/SMESH_test.py | 3 +- src/SMESH_SWIG/SMESH_test0.py | 3 +- src/SMESH_SWIG/SMESH_test1.py | 3 +- src/SMESH_SWIG/SMESH_test1_AndDisplay.py | 3 +- src/SMESH_SWIG/SMESH_test2.py | 3 +- src/SMESH_SWIG/SMESH_test3.py | 3 +- src/SMESH_SWIG/SMESH_test4.py | 3 +- src/SMESH_SWIG/SMESH_test5.py | 3 +- src/SMESH_SWIG/batchmode_mefisto.py | 3 +- src/SMESH_SWIG/batchmode_smesh.py | 3 +- src/SMESH_SWIG/ex00_all.py | 3 +- src/SMESH_SWIG/ex01_cube2build.py | 3 +- src/SMESH_SWIG/ex02_cube2primitive.py | 3 +- src/SMESH_SWIG/ex03_cube2partition.py | 3 +- src/SMESH_SWIG/ex04_cube5tetraHexa.py | 3 +- src/SMESH_SWIG/ex05_hole1build.py | 3 +- src/SMESH_SWIG/ex06_hole1boolean.py | 3 +- src/SMESH_SWIG/ex07_hole1partition.py | 3 +- src/SMESH_SWIG/ex08_hole2build.py | 3 +- src/SMESH_SWIG/ex09_grid4build.py | 3 +- src/SMESH_SWIG/ex10_grid4geometry.py | 3 +- src/SMESH_SWIG/ex11_grid3partition.py | 3 +- src/SMESH_SWIG/ex12_grid17partition.py | 3 +- src/SMESH_SWIG/ex13_hole1partial.py | 3 +- src/SMESH_SWIG/ex14_cyl1holed.py | 3 +- src/SMESH_SWIG/ex15_cyl2geometry.py | 5 +- src/SMESH_SWIG/ex16_cyl2complementary.py | 3 +- src/SMESH_SWIG/ex17_dome1.py | 3 +- src/SMESH_SWIG/ex18_dome2.py | 3 +- src/SMESH_SWIG/ex19_sphereINcube.py | 3 +- src/SMESH_SWIG/ex21_lamp.py | 3 +- src/SMESH_SWIG/ex24_cylinder.py | 6 +- src/SMESH_SWIG/ex29_refine.py | 6 +- src/SMESH_SWIG/ex30_groupsOp.py | 18 ++ src/SMESH_SWIG/ex30_tepal.py | 22 +- src/SMESH_SWIG/ex31_dimGroup.py | 18 ++ src/SMESH_SWIG/smesh.py | 3 +- src/SMESH_SWIG/smeshDC.py | 70 ++++- src/SMESH_SWIG_WITHIHM/Makefile.am | 6 +- src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx | 6 +- src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h | 6 +- src/SMESH_SWIG_WITHIHM/libSMESH_Swig.i | 6 +- src/StdMeshers/Makefile.am | 6 +- src/StdMeshers/SMESH_StdMeshers.hxx | 3 +- src/StdMeshers/StdMeshers_Arithmetic1D.cxx | 3 +- src/StdMeshers/StdMeshers_Arithmetic1D.hxx | 3 +- src/StdMeshers/StdMeshers_AutomaticLength.cxx | 3 +- src/StdMeshers/StdMeshers_AutomaticLength.hxx | 5 +- .../StdMeshers_CompositeHexa_3D.cxx | 39 ++- .../StdMeshers_CompositeHexa_3D.hxx | 37 +-- .../StdMeshers_CompositeSegment_1D.cxx | 31 +- .../StdMeshers_CompositeSegment_1D.hxx | 3 +- src/StdMeshers/StdMeshers_Deflection1D.cxx | 3 +- src/StdMeshers/StdMeshers_Deflection1D.hxx | 4 +- src/StdMeshers/StdMeshers_Distribution.cxx | 3 +- src/StdMeshers/StdMeshers_Distribution.hxx | 3 +- src/StdMeshers/StdMeshers_FaceSide.cxx | 168 +++++----- src/StdMeshers/StdMeshers_FaceSide.hxx | 15 +- src/StdMeshers/StdMeshers_FixedPoints1D.cxx | 6 +- src/StdMeshers/StdMeshers_FixedPoints1D.hxx | 6 +- src/StdMeshers/StdMeshers_HexaFromSkin_3D.hxx | 9 +- src/StdMeshers/StdMeshers_Hexa_3D.cxx | 3 +- src/StdMeshers/StdMeshers_Hexa_3D.hxx | 3 +- .../StdMeshers_LayerDistribution.cxx | 3 +- .../StdMeshers_LayerDistribution.hxx | 3 +- .../StdMeshers_LayerDistribution2D.cxx | 6 +- .../StdMeshers_LayerDistribution2D.hxx | 6 +- src/StdMeshers/StdMeshers_LengthFromEdges.cxx | 3 +- src/StdMeshers/StdMeshers_LengthFromEdges.hxx | 4 +- src/StdMeshers/StdMeshers_LocalLength.cxx | 4 +- src/StdMeshers/StdMeshers_LocalLength.hxx | 4 +- src/StdMeshers/StdMeshers_MEFISTO_2D.cxx | 6 +- src/StdMeshers/StdMeshers_MEFISTO_2D.hxx | 3 +- src/StdMeshers/StdMeshers_MaxElementArea.cxx | 4 +- src/StdMeshers/StdMeshers_MaxElementArea.hxx | 3 +- .../StdMeshers_MaxElementVolume.cxx | 3 +- .../StdMeshers_MaxElementVolume.hxx | 5 +- src/StdMeshers/StdMeshers_MaxLength.cxx | 39 ++- src/StdMeshers/StdMeshers_MaxLength.hxx | 39 ++- .../StdMeshers_NotConformAllowed.cxx | 3 +- .../StdMeshers_NotConformAllowed.hxx | 3 +- src/StdMeshers/StdMeshers_NumberOfLayers.cxx | 3 +- src/StdMeshers/StdMeshers_NumberOfLayers.hxx | 3 +- .../StdMeshers_NumberOfLayers2D.cxx | 7 +- .../StdMeshers_NumberOfLayers2D.hxx | 6 +- .../StdMeshers_NumberOfSegments.cxx | 3 +- .../StdMeshers_NumberOfSegments.hxx | 3 +- src/StdMeshers/StdMeshers_Penta_3D.cxx | 3 +- src/StdMeshers/StdMeshers_Penta_3D.hxx | 3 +- src/StdMeshers/StdMeshers_Prism_3D.cxx | 126 ++++++-- src/StdMeshers/StdMeshers_Prism_3D.hxx | 3 +- .../StdMeshers_ProjectionSource1D.cxx | 3 +- .../StdMeshers_ProjectionSource1D.hxx | 3 +- .../StdMeshers_ProjectionSource2D.cxx | 5 +- .../StdMeshers_ProjectionSource2D.hxx | 5 +- .../StdMeshers_ProjectionSource3D.cxx | 5 +- .../StdMeshers_ProjectionSource3D.hxx | 5 +- src/StdMeshers/StdMeshers_ProjectionUtils.cxx | 3 +- src/StdMeshers/StdMeshers_ProjectionUtils.hxx | 3 +- src/StdMeshers/StdMeshers_Projection_1D.cxx | 3 +- src/StdMeshers/StdMeshers_Projection_1D.hxx | 3 +- src/StdMeshers/StdMeshers_Projection_2D.hxx | 3 +- src/StdMeshers/StdMeshers_Projection_3D.cxx | 3 +- src/StdMeshers/StdMeshers_Projection_3D.hxx | 3 +- src/StdMeshers/StdMeshers_Propagation.cxx | 5 +- src/StdMeshers/StdMeshers_Propagation.hxx | 5 +- .../StdMeshers_QuadToTriaAdaptor.cxx | 6 +- .../StdMeshers_QuadToTriaAdaptor.hxx | 6 +- .../StdMeshers_QuadrangleParams.cxx | 6 +- .../StdMeshers_QuadrangleParams.hxx | 6 +- .../StdMeshers_QuadranglePreference.cxx | 5 +- .../StdMeshers_QuadranglePreference.hxx | 5 +- src/StdMeshers/StdMeshers_Quadrangle_2D.cxx | 3 +- src/StdMeshers/StdMeshers_Quadrangle_2D.hxx | 3 +- src/StdMeshers/StdMeshers_QuadraticMesh.cxx | 5 +- src/StdMeshers/StdMeshers_QuadraticMesh.hxx | 5 +- src/StdMeshers/StdMeshers_RadialPrism_3D.cxx | 3 +- src/StdMeshers/StdMeshers_RadialPrism_3D.hxx | 3 +- .../StdMeshers_RadialQuadrangle_1D2D.cxx | 6 +- .../StdMeshers_RadialQuadrangle_1D2D.hxx | 6 +- src/StdMeshers/StdMeshers_Regular_1D.cxx | 7 +- src/StdMeshers/StdMeshers_Regular_1D.hxx | 5 +- .../StdMeshers_SegmentAroundVertex_0D.cxx | 3 +- .../StdMeshers_SegmentAroundVertex_0D.hxx | 3 +- .../StdMeshers_SegmentLengthAroundVertex.cxx | 5 +- .../StdMeshers_SegmentLengthAroundVertex.hxx | 5 +- src/StdMeshers/StdMeshers_StartEndLength.cxx | 5 +- src/StdMeshers/StdMeshers_StartEndLength.hxx | 5 +- .../StdMeshers_TrianglePreference.cxx | 8 +- .../StdMeshers_TrianglePreference.hxx | 8 +- .../StdMeshers_UseExisting_1D2D.cxx | 6 +- .../StdMeshers_UseExisting_1D2D.hxx | 6 +- src/StdMeshersGUI/Makefile.am | 9 +- src/StdMeshersGUI/SMESH_StdMeshersGUI.hxx | 3 +- src/StdMeshersGUI/StdMeshersGUI.cxx | 3 +- .../StdMeshersGUI_DistrPreview.cxx | 3 +- .../StdMeshersGUI_DistrPreview.h | 3 +- .../StdMeshersGUI_DistrTable.cxx | 3 +- src/StdMeshersGUI/StdMeshersGUI_DistrTable.h | 3 +- .../StdMeshersGUI_FixedPointsParamWdg.cxx | 6 +- .../StdMeshersGUI_FixedPointsParamWdg.h | 6 +- ...tdMeshersGUI_LayerDistributionParamWdg.cxx | 3 +- .../StdMeshersGUI_LayerDistributionParamWdg.h | 3 +- .../StdMeshersGUI_NbSegmentsCreator.cxx | 3 +- .../StdMeshersGUI_NbSegmentsCreator.h | 3 +- .../StdMeshersGUI_ObjectReferenceParamWdg.cxx | 3 +- .../StdMeshersGUI_ObjectReferenceParamWdg.h | 3 +- .../StdMeshersGUI_StdHypothesisCreator.cxx | 17 +- .../StdMeshersGUI_StdHypothesisCreator.h | 3 +- .../StdMeshersGUI_SubShapeSelectorWdg.cxx | 123 ++++---- .../StdMeshersGUI_SubShapeSelectorWdg.h | 6 +- src/StdMeshersGUI/StdMeshers_images.ts | 2 +- src/StdMeshersGUI/StdMeshers_msg_en.ts | 2 +- src/StdMeshers_I/Makefile.am | 8 +- src/StdMeshers_I/SMESH_StdMeshers_I.hxx | 3 +- .../StdMeshers_Arithmetic1D_i.cxx | 3 +- .../StdMeshers_Arithmetic1D_i.hxx | 3 +- .../StdMeshers_AutomaticLength_i.cxx | 3 +- .../StdMeshers_AutomaticLength_i.hxx | 3 +- .../StdMeshers_CompositeSegment_1D_i.cxx | 3 +- .../StdMeshers_CompositeSegment_1D_i.hxx | 3 +- .../StdMeshers_Deflection1D_i.cxx | 3 +- .../StdMeshers_Deflection1D_i.hxx | 3 +- .../StdMeshers_FixedPoints1D_i.cxx | 6 +- .../StdMeshers_FixedPoints1D_i.hxx | 6 +- src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx | 3 +- src/StdMeshers_I/StdMeshers_Hexa_3D_i.hxx | 3 +- .../StdMeshers_LayerDistribution2D_i.cxx | 6 +- .../StdMeshers_LayerDistribution2D_i.hxx | 6 +- .../StdMeshers_LayerDistribution_i.cxx | 3 +- .../StdMeshers_LayerDistribution_i.hxx | 3 +- .../StdMeshers_LengthFromEdges_i.cxx | 3 +- .../StdMeshers_LengthFromEdges_i.hxx | 3 +- src/StdMeshers_I/StdMeshers_LocalLength_i.cxx | 3 +- src/StdMeshers_I/StdMeshers_LocalLength_i.hxx | 3 +- src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx | 3 +- src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.hxx | 3 +- .../StdMeshers_MaxElementArea_i.cxx | 3 +- .../StdMeshers_MaxElementArea_i.hxx | 3 +- .../StdMeshers_MaxElementVolume_i.cxx | 3 +- .../StdMeshers_MaxElementVolume_i.hxx | 3 +- src/StdMeshers_I/StdMeshers_MaxLength_i.cxx | 39 ++- src/StdMeshers_I/StdMeshers_MaxLength_i.hxx | 39 ++- .../StdMeshers_NotConformAllowed_i.cxx | 3 +- .../StdMeshers_NotConformAllowed_i.hxx | 3 +- .../StdMeshers_NumberOfLayers2D_i.cxx | 6 +- .../StdMeshers_NumberOfLayers2D_i.hxx | 6 +- .../StdMeshers_NumberOfLayers_i.cxx | 3 +- .../StdMeshers_NumberOfLayers_i.hxx | 3 +- .../StdMeshers_NumberOfSegments_i.cxx | 3 +- .../StdMeshers_NumberOfSegments_i.hxx | 3 +- src/StdMeshers_I/StdMeshers_ObjRefUlils.cxx | 3 +- src/StdMeshers_I/StdMeshers_ObjRefUlils.hxx | 3 +- src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx | 3 +- src/StdMeshers_I/StdMeshers_Prism_3D_i.hxx | 3 +- .../StdMeshers_ProjectionSource1D_i.cxx | 3 +- .../StdMeshers_ProjectionSource1D_i.hxx | 3 +- .../StdMeshers_ProjectionSource2D_i.cxx | 3 +- .../StdMeshers_ProjectionSource2D_i.hxx | 3 +- .../StdMeshers_ProjectionSource3D_i.cxx | 3 +- .../StdMeshers_ProjectionSource3D_i.hxx | 3 +- .../StdMeshers_Projection_1D_2D_3D_i.cxx | 3 +- .../StdMeshers_Projection_1D_2D_3D_i.hxx | 3 +- src/StdMeshers_I/StdMeshers_Propagation_i.cxx | 3 +- src/StdMeshers_I/StdMeshers_Propagation_i.hxx | 3 +- .../StdMeshers_QuadrangleParams_i.cxx | 6 +- .../StdMeshers_QuadrangleParams_i.hxx | 6 +- .../StdMeshers_QuadranglePreference_i.cxx | 3 +- .../StdMeshers_QuadranglePreference_i.hxx | 3 +- .../StdMeshers_Quadrangle_2D_i.cxx | 3 +- .../StdMeshers_Quadrangle_2D_i.hxx | 3 +- .../StdMeshers_QuadraticMesh_i.cxx | 3 +- .../StdMeshers_QuadraticMesh_i.hxx | 3 +- .../StdMeshers_RadialQuadrangle_1D2D_i.cxx | 6 +- .../StdMeshers_RadialQuadrangle_1D2D_i.hxx | 6 +- src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx | 3 +- src/StdMeshers_I/StdMeshers_Regular_1D_i.hxx | 3 +- .../StdMeshers_SegmentAroundVertex_0D_i.cxx | 3 +- .../StdMeshers_SegmentAroundVertex_0D_i.hxx | 3 +- ...StdMeshers_SegmentLengthAroundVertex_i.cxx | 3 +- ...StdMeshers_SegmentLengthAroundVertex_i.hxx | 3 +- .../StdMeshers_StartEndLength_i.cxx | 3 +- .../StdMeshers_StartEndLength_i.hxx | 3 +- .../StdMeshers_TrianglePreference_i.cxx | 6 +- .../StdMeshers_TrianglePreference_i.hxx | 6 +- .../StdMeshers_UseExisting_1D2D_i.cxx | 6 +- .../StdMeshers_UseExisting_1D2D_i.hxx | 6 +- src/StdMeshers_I/StdMeshers_i.cxx | 5 +- 740 files changed, 2478 insertions(+), 1882 deletions(-) diff --git a/Makefile.am b/Makefile.am index f6395e9bd..8b479765a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # -* Makefile *- # Author : Patrick GOLDBRONN (CEA) # Date : 28/06/2001 diff --git a/SMESH_version.h.in b/SMESH_version.h.in index d9b835afa..64d31df91 100644 --- a/SMESH_version.h.in +++ b/SMESH_version.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -19,6 +19,7 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // File : SMESH_version.h // Author : Vadim SANDLER // Module : SALOME diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am index 0b7954458..8c38d3d27 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + include $(top_srcdir)/adm_local/unix/make_common_starter.am SUBDIRS = unix cmake_files diff --git a/adm_local/cmake_files/FindSMESH.cmake b/adm_local/cmake_files/FindSMESH.cmake index 6ff985550..cd7b4c55a 100644 --- a/adm_local/cmake_files/FindSMESH.cmake +++ b/adm_local/cmake_files/FindSMESH.cmake @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/adm_local/cmake_files/Makefile.am b/adm_local/cmake_files/Makefile.am index 95246b897..8d4db5e06 100644 --- a/adm_local/cmake_files/Makefile.am +++ b/adm_local/cmake_files/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + include $(top_srcdir)/adm_local/unix/make_common_starter.am admlocal_cmakedir = $(admlocaldir)/cmake_files diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am index 5f6d5f753..190640454 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + include $(top_srcdir)/adm_local/unix/make_common_starter.am SUBDIRS = config_files diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am index 71a28582a..ef0b61dd0 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + include $(top_srcdir)/adm_local/unix/make_common_starter.am dist_admlocalm4_DATA = \ diff --git a/adm_local/unix/config_files/check_Platform.m4 b/adm_local/unix/config_files/check_Platform.m4 index ff6606562..6262fbfaf 100755 --- a/adm_local/unix/config_files/check_Platform.m4 +++ b/adm_local/unix/config_files/check_Platform.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE dnl dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -19,6 +19,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + AC_DEFUN([CHECK_PLATFORM],[ AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_CPP])dnl diff --git a/adm_local/unix/config_files/check_SMESH.m4 b/adm_local/unix/config_files/check_SMESH.m4 index 4c0cdb6e4..6a704081e 100644 --- a/adm_local/unix/config_files/check_SMESH.m4 +++ b/adm_local/unix/config_files/check_SMESH.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE dnl dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -19,6 +19,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + # Check availability of SMesh binary distribution # # Author : Nicolas REJNERI (OPEN CASCADE, 2003) diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index cd851519b..782a8154d 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -24,6 +21,7 @@ # The following is to avoid PACKAGE_... env variable # redefinition compilation warnings # ============================================================ +# AM_CXXFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h diff --git a/bin/Makefile.am b/bin/Makefile.am index db97f629b..35df158eb 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # -* Makefile *- # Author : Guillaume Boulant (CSSI) # Module : SMESH diff --git a/bin/smesh_setenv.py b/bin/smesh_setenv.py index a25e5180b..6cf6a3233 100644 --- a/bin/smesh_setenv.py +++ b/bin/smesh_setenv.py @@ -1,9 +1,6 @@ #!/usr/bin/env python # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/build_cmake b/build_cmake index c7ead0ce7..a0e084b95 100755 --- a/build_cmake +++ b/build_cmake @@ -1,8 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/build_cmake.bat b/build_cmake.bat index c763d56e4..8de3956bf 100644 --- a/build_cmake.bat +++ b/build_cmake.bat @@ -1,2 +1,20 @@ - +@REM Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +@REM +@REM This library is free software; you can redistribute it and/or +@REM modify it under the terms of the GNU Lesser General Public +@REM License as published by the Free Software Foundation; either +@REM version 2.1 of the License. +@REM +@REM This library is distributed in the hope that it will be useful, +@REM but WITHOUT ANY WARRANTY; without even the implied warranty of +@REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +@REM Lesser General Public License for more details. +@REM +@REM You should have received a copy of the GNU Lesser General Public +@REM License along with this library; if not, write to the Free Software +@REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +@REM +@REM See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +@REM + %PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\am2cmake.py --smesh diff --git a/build_configure b/build_configure index b8ae5440a..607c2558b 100755 --- a/build_configure +++ b/build_configure @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -20,6 +20,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # Tool for updating list of .in file for the SALOME project # and regenerating configure script # Author : Marc Tajchman - CEA diff --git a/clean_configure b/clean_configure index f57f7b3bf..366520874 100755 --- a/clean_configure +++ b/clean_configure @@ -1,8 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -20,6 +17,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + rm -rf autom4te.cache aclocal.m4 configure make_config find . -name "*~" -print -exec rm {} \; find . -name "*.pyc" -print -exec rm {} \; diff --git a/configure.ac b/configure.ac index dec84ee7a..0cfcd12fa 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # Author : Marc Tajchman (CEA) # Date : 28/06/2001 # Modified by : Patrick GOLDBRONN (CEA) @@ -26,7 +24,7 @@ # Modified by : Alexander BORODIN (OCN) - autotools usage # Created from configure.in.base # -AC_INIT([Salome2 Project SMESH module], [5.1.3], [webmaster.salome@opencascade.com], [SalomeSMESH]) +AC_INIT([Salome2 Project SMESH module], [5.1.4], [webmaster.salome@opencascade.com], [SalomeSMESH]) AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET diff --git a/doc/Makefile.am b/doc/Makefile.am index 1902d9d21..f40fb81a5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # -* Makefile *- # Author : Patrick GOLDBRONN (CEA) # Date : 30/11/2001 diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am index 5a92861e5..4a09173c6 100644 --- a/doc/salome/Makefile.am +++ b/doc/salome/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # -* Makefile *- # Author : Patrick GOLDBRONN (CEA) # Date : 30/11/2001 diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am index 0e41ee5ff..f2e7362f1 100644 --- a/doc/salome/gui/Makefile.am +++ b/doc/salome/gui/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # File : Makefile.in # Author : Vasily Rusyaev (Open Cascade NN) # Modified by : Alexander BORODIN (OCN) - autotools usage diff --git a/doc/salome/gui/SMESH/Makefile.am b/doc/salome/gui/SMESH/Makefile.am index 8c4ce2003..187295302 100755 --- a/doc/salome/gui/SMESH/Makefile.am +++ b/doc/salome/gui/SMESH/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # File : Makefile.in # Author : Vasily Rusyaev (Open Cascade NN) # Modified by : Alexander BORODIN (OCN) - autotools usage diff --git a/doc/salome/gui/SMESH/doxyfile.in b/doc/salome/gui/SMESH/doxyfile.in index 3d0d32e39..ce268972f 100755 --- a/doc/salome/gui/SMESH/doxyfile.in +++ b/doc/salome/gui/SMESH/doxyfile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/doc/salome/gui/SMESH/doxyfile_py.in b/doc/salome/gui/SMESH/doxyfile_py.in index eaa18aeef..6d45aa6b5 100755 --- a/doc/salome/gui/SMESH/doxyfile_py.in +++ b/doc/salome/gui/SMESH/doxyfile_py.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/doc/salome/gui/SMESH/input/2d_meshing_hypo.doc b/doc/salome/gui/SMESH/input/2d_meshing_hypo.doc index 38ef6b327..8e789536f 100644 --- a/doc/salome/gui/SMESH/input/2d_meshing_hypo.doc +++ b/doc/salome/gui/SMESH/input/2d_meshing_hypo.doc @@ -66,7 +66,9 @@ shows the good (left) and the bad (right) results of meshing. \image html hypo_quad_params_res_2.png "The resulting meshes" -
+See Also a sample TUI Script of a +\ref tui_quadrangle_parameters "Quadrangle Parameters" hypothesis. + \anchor quadrangle_preference_anchor

Quadrangle Preference

diff --git a/doc/salome/gui/SMESH/input/constructing_meshes.doc b/doc/salome/gui/SMESH/input/constructing_meshes.doc index bd57d80f0..042b66320 100644 --- a/doc/salome/gui/SMESH/input/constructing_meshes.doc +++ b/doc/salome/gui/SMESH/input/constructing_meshes.doc @@ -197,8 +197,8 @@ is: The submeshes can become concurrent if their algorithms leads to mesh shared subshape with different algorithms (or different algorithms parameters, i.e. hypothesises). -In fact, we have three submeshes with concurrent algorithms, becase -they has different hypothesises assigned to them. +In fact, we have three submeshes with concurrent algorithms, because +they have different hypothesises assigned to them. The first mesh computation made with: \image html mesh_order_123.png @@ -219,8 +219,8 @@ And the last mesh computation with:
"Result mesh with order SubMesh_3, SubMesh_2, SubMesh_1 "
As we can see each mesh computation has different number of result -elements and different mesh descretisation on shared edges (edges, -that shared between Face_1, Face_2 and Face_3) +elements and different mesh discretisation on shared edges (edges +that are shared between Face_1, Face_2 and Face_3) Additionally, submesh priority (order of algorithms to be applied) can be modified not only in separate dialog box, but in Preview @@ -229,11 +229,11 @@ order. \image html mesh_order_preview.png
"Preview with submesh priority list box"
-If no concurrent submeshes under Mesh object user will see the +If there are no concurrent submeshes under Mesh object, then user will see the following information dialog box \image html mesh_order_no_concurrent.png
"No concurrent submeshes detected"
-and no mesh order list box appear in Preview dialog box. +and no mesh order list box will appear in Preview dialog box. diff --git a/doc/salome/gui/SMESH/input/hexotic_hypo.doc b/doc/salome/gui/SMESH/input/hexotic_hypo.doc index 68231b865..902b93ac5 100644 --- a/doc/salome/gui/SMESH/input/hexotic_hypo.doc +++ b/doc/salome/gui/SMESH/input/hexotic_hypo.doc @@ -11,10 +11,10 @@ algorithm. This algorithm is a commercial software.
  • Name - allows to define the name of the hypothesis (Hexotic Parameters by default).
    • -
  • Nb. Hexes Max Level - allows defining the maximal level of recursive partitioning on the initial octree cube.
    • -
  • Nb. Hexes Min Level - allows defining the minimal level of recursive partitioning on the initial octree cube.
    • +
  • Nb. Hexes Max Level - allows defining the maximal level of recursive partitioning on the initial octree cube.
    • +
  • Salome Quadrangles - not documented.
  • Generate smooth meshes no ridges - specifies that the mesher can ignore ridges. A ridge is a geometrical entity (a sharp edge). The resulting meshes will have better quality elements, at the price of "smoothing" out the geometry. @@ -25,6 +25,6 @@ Parameters by default).
  • Sharp angle threshold in degrees - specifies the angle between two triangles above which the hex mesher will consider the edge common to these two triangles as being a "ridge". A ridge is a geometrical entity (a sharp edge) which has to be kept as it is in the final hex mesh.The default value is 60 (degrees).
    If you raise this value, the hex mesher will detect less ridges, and the final solid mesh will therefore be smoother. On the other hand, if you reduce this value, more ridges will be detected and the algorithm will face harder situations to conform to.
    • - + */ diff --git a/doc/salome/gui/SMESH/input/merging_elements.doc b/doc/salome/gui/SMESH/input/merging_elements.doc index 9efb6ff39..d677e179e 100644 --- a/doc/salome/gui/SMESH/input/merging_elements.doc +++ b/doc/salome/gui/SMESH/input/merging_elements.doc @@ -56,6 +56,7 @@ one.
  • To confirm your choice click \b Apply or Apply and Close button.
    • + In this picture you see a triangle which coincides with one of the diff --git a/doc/salome/gui/SMESH/input/pattern_mapping.doc b/doc/salome/gui/SMESH/input/pattern_mapping.doc index cf556d51b..db4be4144 100644 --- a/doc/salome/gui/SMESH/input/pattern_mapping.doc +++ b/doc/salome/gui/SMESH/input/pattern_mapping.doc @@ -71,7 +71,7 @@ having a mesh built on it. Mesh nodes lying on face vertices become key-points. Additionally, you may choose the way of getting nodes coordinates by projecting nodes on the face instead of using "positions on face" generated by mesher (if there is any). Faces -having a seam edge can?t be used for automatic pattern creation. +having a seam edge can't be used for automatic pattern creation. When creating a pattern from an existing mesh, there are two possible cases: @@ -132,4 +132,4 @@ isolines.
    See Also a sample TUI Script of a \ref tui_pattern_mapping "Pattern Mapping" operation. -*/ \ No newline at end of file +*/ diff --git a/doc/salome/gui/SMESH/input/rotation.doc b/doc/salome/gui/SMESH/input/rotation.doc index 79d27d7c1..d93473eda 100644 --- a/doc/salome/gui/SMESH/input/rotation.doc +++ b/doc/salome/gui/SMESH/input/rotation.doc @@ -63,7 +63,7 @@ name in the adjacent box);
  • Click \b Apply or Apply and Close button to confirm the operation.
    • - + diff --git a/doc/salome/gui/SMESH/input/scale.doc b/doc/salome/gui/SMESH/input/scale.doc index 706544ed4..5b10fb5a5 100644 --- a/doc/salome/gui/SMESH/input/scale.doc +++ b/doc/salome/gui/SMESH/input/scale.doc @@ -16,7 +16,7 @@ One of the following dialogs will appear: With one scale factor: \image html scale01.png -Or with different scale factors for axises: +Or with different scale factors for axes: \image html scale02.png @@ -62,11 +62,12 @@ name in the adjacent box);
  • Click \b Apply or Apply and Close button to confirm the operation.
    • + -Examle of using: +Example of using: 1. Create quandrangle mesh 3x3 on simple planar face (200x200) @@ -78,7 +79,7 @@ and union 3 face (along axis Z) to group "gr_faces" -2. Perform scale opration for whole mesh with creation of new mesh: +2. Perform scale operation for whole mesh with creation of new mesh: \image html scale03.png @@ -98,7 +99,7 @@ result after operation: -4. Perform scale opration for group of faces with copy of elements: +4. Perform scale operation for group of faces with copy of elements: \image html scale06.png @@ -108,7 +109,7 @@ result after operation: -5. Perform scale opration for two edges with moving of elements: +5. Perform scale operation for two edges with moving of elements: \image html scale07.png @@ -118,7 +119,7 @@ result after operation: -6. Perform scale opration for one face with moving of elements: +6. Perform scale operation for one face with moving of elements: \image html scale09.png diff --git a/doc/salome/gui/SMESH/input/symmetry.doc b/doc/salome/gui/SMESH/input/symmetry.doc index 967fff2c1..9daebe39e 100644 --- a/doc/salome/gui/SMESH/input/symmetry.doc +++ b/doc/salome/gui/SMESH/input/symmetry.doc @@ -5,7 +5,7 @@ \n This geometrical operation allows to perform a symmetrical copy of your mesh or some of its elements. -To create a symmtrical copy of the mesh: +To create a symmetrical copy of the mesh:
    1. From the \b Modification menu choose \b Transformation -> \b Symmetry item or click @@ -76,6 +76,7 @@ name in the adjacent box);
    2. Click \b Apply or Apply and Close button to confirm the operation.
      3. +
    diff --git a/doc/salome/gui/SMESH/input/translation.doc b/doc/salome/gui/SMESH/input/translation.doc index 2f0f0743e..b5e338094 100644 --- a/doc/salome/gui/SMESH/input/translation.doc +++ b/doc/salome/gui/SMESH/input/translation.doc @@ -65,6 +65,7 @@ name in the adjacent box);
  • Click \b Apply or Apply and Close button to confirm the operation.
    • +
    See Also a sample TUI Script of a \ref tui_translation "Translation" operation. diff --git a/doc/salome/gui/SMESH/input/tui_defining_hypotheses.doc b/doc/salome/gui/SMESH/input/tui_defining_hypotheses.doc index 3780cd8d2..80944666e 100644 --- a/doc/salome/gui/SMESH/input/tui_defining_hypotheses.doc +++ b/doc/salome/gui/SMESH/input/tui_defining_hypotheses.doc @@ -547,6 +547,36 @@ radial_Quad_algo.NumberOfLayers( 4 ) mesh.Compute() \endcode +\anchor tui_quadrangle_parameters +

    Quadrangle Parameters example

    +\code +import geompy +import smesh +import StdMeshers + +# Get 1/4 part from the disk face. +Box_1 = geompy.MakeBoxDXDYDZ(100, 100, 100) +Disk_1 = geompy.MakeDiskR(100, 1) +Common_1 = geompy.MakeCommon(Disk_1, Box_1) +geompy.addToStudy( Disk_1, "Disk_1" ) +geompy.addToStudy( Box_1, "Box_1" ) +geompy.addToStudy( Common_1, "Common_1" ) + +# Set the Geometry for meshing +Mesh_1 = smesh.Mesh(Common_1) + +# Create Quadrangle parameters and define the Base Vertex. +Quadrangle_Parameters_1 = smesh.CreateHypothesis('QuadrangleParams') +Quadrangle_Parameters_1.SetTriaVertex( 8 ) + +# Define 1D hypothesis and cmpute the mesh +Regular_1D = Mesh_1.Segment() +Nb_Segments_1 = Regular_1D.NumberOfSegments(10) +Nb_Segments_1.SetDistrType( 0 ) +status = Mesh_1.AddHypothesis(Quadrangle_Parameters_1) +Quadrangle_2D = Mesh_1.Quadrangle() +Mesh_1.Compute() +\endcode \n Other meshing algorithms: diff --git a/doc/salome/gui/SMESH/static/footer.html b/doc/salome/gui/SMESH/static/footer.html index 012833eac..fdfb138ca 100755 --- a/doc/salome/gui/SMESH/static/footer.html +++ b/doc/salome/gui/SMESH/static/footer.html @@ -6,7 +6,7 @@
    Copyright © 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
    -Copyright © 2003-2010 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
    +Copyright © 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
    diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am index ee9c91150..7cc0f4a8f 100644 --- a/doc/salome/tui/Makefile.am +++ b/doc/salome/tui/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # File : Makefile.in # Author : Vasily Rusyaev (Open Cascade NN) # Module : doc diff --git a/doc/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in index 89d26a1ed..2279c3fc5 100755 --- a/doc/salome/tui/doxyfile.in +++ b/doc/salome/tui/doxyfile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/doc/salome/tui/static/footer.html b/doc/salome/tui/static/footer.html index 512db61fa..53f5a62fe 100755 --- a/doc/salome/tui/static/footer.html +++ b/doc/salome/tui/static/footer.html @@ -7,7 +7,7 @@
    Copyright © 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
    -Copyright © 2003-2010 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
    +Copyright © 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
    diff --git a/idl/Makefile.am b/idl/Makefile.am index 03486bd07..5a88808b3 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # This Makefile is responsible of generating the client and server # implementation of IDL interfaces for both C++ and python usage. # The building process of the C++ files is in charge of each source diff --git a/idl/SMESH_BasicHypothesis.idl b/idl/SMESH_BasicHypothesis.idl index 59b3a8a2c..871f07714 100644 --- a/idl/SMESH_BasicHypothesis.idl +++ b/idl/SMESH_BasicHypothesis.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -19,6 +19,7 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // File : SMESH_BasicHypothesis.idl // Author : Paul RASCLE, EDF // diff --git a/idl/SMESH_Filter.idl b/idl/SMESH_Filter.idl index 83c1d43d2..56f2cdce2 100644 --- a/idl/SMESH_Filter.idl +++ b/idl/SMESH_Filter.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -19,6 +19,7 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // File : SMESH_Filter.idl // Author : Alexey Petrov, OCC // diff --git a/idl/SMESH_Gen.idl b/idl/SMESH_Gen.idl index 4bec6e9d8..14527a9b3 100644 --- a/idl/SMESH_Gen.idl +++ b/idl/SMESH_Gen.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -19,9 +19,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // File : SMESH_Gen.idl // Author : Paul RASCLE, EDF - +// #ifndef _SMESH_GEN_IDL_ #define _SMESH_GEN_IDL_ diff --git a/idl/SMESH_Group.idl b/idl/SMESH_Group.idl index aa9cee125..c0bb54bc9 100644 --- a/idl/SMESH_Group.idl +++ b/idl/SMESH_Group.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -19,6 +19,7 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // File : SMESH_Group.idl // Author : Sergey ANIKIN, OCC // $Header$ diff --git a/idl/SMESH_Hypothesis.idl b/idl/SMESH_Hypothesis.idl index 56ae48b0c..443f7e75a 100644 --- a/idl/SMESH_Hypothesis.idl +++ b/idl/SMESH_Hypothesis.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -19,6 +19,7 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // File : SMESH_Hypothesis.idl // Author : Paul RASCLE, EDF // $Header$ diff --git a/idl/SMESH_Mesh.idl b/idl/SMESH_Mesh.idl index 5812506c2..4f5639fb1 100644 --- a/idl/SMESH_Mesh.idl +++ b/idl/SMESH_Mesh.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -19,10 +19,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // File : SMESH_Mesh.idl // Author : Paul RASCLE, EDF // - #ifndef _SMESH_MESH_IDL_ #define _SMESH_MESH_IDL_ diff --git a/idl/SMESH_MeshEditor.idl b/idl/SMESH_MeshEditor.idl index 5c7f9e3c1..983b2f486 100644 --- a/idl/SMESH_MeshEditor.idl +++ b/idl/SMESH_MeshEditor.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -19,9 +19,9 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // File : SMESH_MeshEditor.idl // - #ifndef _SMESH_MESHEDITOR_IDL_ #define _SMESH_MESHEDITOR_IDL_ diff --git a/idl/SMESH_Pattern.idl b/idl/SMESH_Pattern.idl index 4f0bcfaa6..c00ab3a07 100644 --- a/idl/SMESH_Pattern.idl +++ b/idl/SMESH_Pattern.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -19,6 +19,7 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // File : SMESH_Pattern.idl // Created : Mon Aug 2 10:48:36 2004 // Author : Edward AGAPOV (eap) diff --git a/resources/Makefile.am b/resources/Makefile.am index 58a1f9294..ca671b982 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # -* Makefile *- # Author : Patrick GOLDBRONN (CEA) # Date : 28/06/2001 diff --git a/resources/SMESHCatalog.xml.in b/resources/SMESHCatalog.xml.in index c47ba6c68..5a5a88879 100644 --- a/resources/SMESHCatalog.xml.in +++ b/resources/SMESHCatalog.xml.in @@ -1,6 +1,6 @@