From bd8f1aee7c78f7d2eb82bd4fec5e08c9e3d280ce Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 1 Apr 2013 13:05:47 +0000 Subject: [PATCH] Merge from V6_main 01/04/2013 --- Makefile.am | 2 +- SMESH_version.h.in | 2 +- adm_local/Makefile.am | 2 +- adm_local/cmake_files/FindSMESH.cmake | 2 +- adm_local/cmake_files/Makefile.am | 2 +- adm_local/unix/Makefile.am | 2 +- adm_local/unix/config_files/Makefile.am | 2 +- adm_local/unix/config_files/check_Platform.m4 | 2 +- adm_local/unix/config_files/check_SMESH.m4 | 2 +- adm_local/unix/config_files/check_cgal.m4 | 2 +- adm_local/unix/config_files/check_cgns.m4 | 2 +- adm_local/unix/config_files/check_f77.m4 | 2 +- adm_local/unix/config_files/check_padder.m4 | 2 +- adm_local/unix/config_files/check_qwt.m4 | 2 +- adm_local/unix/make_common_starter.am | 10 +- bin/Makefile.am | 2 +- bin/smesh_setenv.py | 2 +- build_cmake | 2 +- build_cmake.bat | 2 +- build_configure | 2 +- clean_configure | 2 +- configure.ac | 2 +- doc/Makefile.am | 2 +- doc/docutils/Makefile.am | 2 +- doc/salome/Makefile.am | 2 +- doc/salome/examples/CMakeLists.txt | 2 +- doc/salome/examples/Makefile.am | 2 +- doc/salome/gui/Makefile.am | 2 +- doc/salome/gui/SMESH/CMakeLists.txt | 2 +- doc/salome/gui/SMESH/Makefile.am | 2 +- doc/salome/gui/SMESH/collect_mesh_methods.py | 20 ++ doc/salome/gui/SMESH/doxyfile.in | 2 +- doc/salome/gui/SMESH/doxyfile_py.in | 2 +- .../SMESH/input/adding_nodes_and_elements.doc | 14 +- .../SMESH/input/adding_quadratic_elements.doc | 6 + .../gui/SMESH/input/constructing_meshes.doc | 10 +- doc/salome/gui/SMESH/static/footer.html | 4 +- doc/salome/tui/Makefile.am | 2 +- doc/salome/tui/doxyfile.in | 6 +- doc/salome/tui/static/footer.html | 3 +- idl/Makefile.am | 2 +- idl/SMESH_BasicHypothesis.idl | 2 +- idl/SMESH_Filter.idl | 2 +- idl/SMESH_Gen.idl | 2 +- idl/SMESH_Group.idl | 2 +- idl/SMESH_Hypothesis.idl | 33 +- idl/SMESH_Measurements.idl | 2 +- idl/SMESH_Mesh.idl | 2 +- idl/SMESH_MeshEditor.idl | 2 +- idl/SMESH_Pattern.idl | 2 +- resources/Makefile.am | 2 +- resources/SMESHCatalog.xml.in | 2 +- resources/SalomeApp.xml.in | 12 +- resources/StdMeshers.xml | 2 +- src/Controls/Makefile.am | 2 +- src/Controls/SMESHControls.cxx | 2 +- src/Controls/SMESH_Controls.cxx | 3 +- 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.am | 2 +- src/DriverCGNS/DriverCGNS_Read.cxx | 2 +- src/DriverCGNS/DriverCGNS_Read.hxx | 2 +- src/DriverCGNS/DriverCGNS_Write.cxx | 2 +- src/DriverCGNS/DriverCGNS_Write.hxx | 2 +- src/DriverCGNS/Makefile.am | 2 +- src/DriverCGNS/SMESH_DriverCGNS.hxx | 2 +- src/DriverDAT/DAT_Test.cxx | 2 +- src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx | 2 +- src/DriverDAT/DriverDAT_R_SMDS_Mesh.h | 2 +- src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx | 2 +- src/DriverDAT/DriverDAT_W_SMDS_Mesh.h | 2 +- src/DriverDAT/Makefile.am | 2 +- src/DriverDAT/SMESH_DriverDAT.hxx | 2 +- src/DriverGMF/DriverGMF.cxx | 2 +- src/DriverGMF/DriverGMF.hxx | 2 +- src/DriverGMF/DriverGMF_Read.cxx | 4 +- src/DriverGMF/DriverGMF_Read.hxx | 4 +- src/DriverGMF/DriverGMF_Write.cxx | 2 +- src/DriverGMF/DriverGMF_Write.hxx | 2 +- src/DriverGMF/Makefile.am | 2 +- src/DriverGMF/SMESH_DriverGMF.hxx | 2 +- src/DriverMED/DriverMED_Family.cxx | 2 +- src/DriverMED/DriverMED_Family.h | 2 +- src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx | 3 +- src/DriverMED/DriverMED_R_SMESHDS_Mesh.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.am | 2 +- src/DriverMED/SMESH_DriverMED.hxx | 2 +- 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.am | 2 +- src/DriverSTL/SMESH_DriverSTL.hxx | 2 +- src/DriverSTL/STL_Test.cxx | 2 +- src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx | 2 +- src/DriverUNV/DriverUNV_R_SMDS_Mesh.h | 2 +- src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx | 2 +- src/DriverUNV/DriverUNV_W_SMDS_Mesh.h | 2 +- src/DriverUNV/Makefile.am | 2 +- src/DriverUNV/SMESH_DriverUNV.hxx | 2 +- src/DriverUNV/UNV164_Structure.cxx | 2 +- src/DriverUNV/UNV164_Structure.hxx | 2 +- 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/UNV2420_Structure.cxx | 2 +- src/DriverUNV/UNV2420_Structure.hxx | 2 +- src/DriverUNV/UNV_Test.cxx | 2 +- src/DriverUNV/UNV_Utilities.cxx | 2 +- src/DriverUNV/UNV_Utilities.hxx | 2 +- src/MEFISTO2/Makefile.am | 2 +- src/MEFISTO2/Rn.h | 2 +- src/MEFISTO2/aptrte.cxx | 2 +- src/MEFISTO2/aptrte.h | 2 +- src/MEFISTO2/areteideale.f | 2 +- src/MEFISTO2/trte.f | 2 +- src/Makefile.am | 2 +- src/OBJECT/Makefile.am | 2 +- src/OBJECT/SMESH_Actor.cxx | 3 +- 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_CellLabelActor.cxx | 2 +- src/OBJECT/SMESH_CellLabelActor.h | 2 +- src/OBJECT/SMESH_DeviceActor.cxx | 22 +- src/OBJECT/SMESH_DeviceActor.h | 2 +- src/OBJECT/SMESH_ExtractGeometry.cxx | 2 +- src/OBJECT/SMESH_ExtractGeometry.h | 2 +- src/OBJECT/SMESH_FaceOrientationFilter.cxx | 2 +- src/OBJECT/SMESH_FaceOrientationFilter.h | 2 +- src/OBJECT/SMESH_NodeLabelActor.cxx | 2 +- src/OBJECT/SMESH_NodeLabelActor.h | 2 +- src/OBJECT/SMESH_Object.cxx | 2 +- src/OBJECT/SMESH_Object.h | 2 +- src/OBJECT/SMESH_ObjectDef.h | 2 +- src/OBJECT/SMESH_PreviewActorsCollection.cxx | 2 +- src/OBJECT/SMESH_PreviewActorsCollection.h | 2 +- src/OBJECT/SMESH_SVTKActor.cxx | 2 +- src/OBJECT/SMESH_SVTKActor.h | 2 +- src/OBJECT/SMESH_ScalarBarActor.cxx | 2 +- src/OBJECT/SMESH_ScalarBarActor.h | 2 +- src/PluginUtils/GeomSelectionTools.cxx | 2 +- src/PluginUtils/GeomSelectionTools.h | 2 +- src/PluginUtils/Makefile.am | 2 +- src/SMDS/Makefile.am | 2 +- src/SMDS/ObjectPool.hxx | 2 +- src/SMDS/SMDSAbs_ElementType.hxx | 2 +- src/SMDS/SMDS_BallElement.cxx | 2 +- src/SMDS/SMDS_BallElement.hxx | 2 +- src/SMDS/SMDS_Downward.cxx | 2 +- src/SMDS/SMDS_Downward.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_IteratorOnIterators.hxx | 2 +- src/SMDS/SMDS_LinearEdge.cxx | 2 +- src/SMDS/SMDS_LinearEdge.hxx | 2 +- src/SMDS/SMDS_MemoryLimit.cxx | 2 +- src/SMDS/SMDS_Mesh.cxx | 2 +- src/SMDS/SMDS_Mesh.hxx | 2 +- src/SMDS/SMDS_Mesh0DElement.cxx | 2 +- src/SMDS/SMDS_Mesh0DElement.hxx | 2 +- src/SMDS/SMDS_MeshCell.cxx | 2 +- src/SMDS/SMDS_MeshCell.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_MeshInfo.hxx | 2 +- src/SMDS/SMDS_MeshNode.cxx | 2 +- src/SMDS/SMDS_MeshNode.hxx | 2 +- src/SMDS/SMDS_MeshNodeIDFactory.cxx | 2 +- src/SMDS/SMDS_MeshNodeIDFactory.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_StdIterator.hxx | 2 +- src/SMDS/SMDS_TypeOfPosition.hxx | 2 +- src/SMDS/SMDS_UnstructuredGrid.cxx | 2 +- src/SMDS/SMDS_UnstructuredGrid.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/SMDS/SMDS_VtkCellIterator.cxx | 2 +- src/SMDS/SMDS_VtkCellIterator.hxx | 2 +- src/SMDS/SMDS_VtkEdge.cxx | 2 +- src/SMDS/SMDS_VtkEdge.hxx | 2 +- src/SMDS/SMDS_VtkFace.cxx | 2 +- src/SMDS/SMDS_VtkFace.hxx | 2 +- src/SMDS/SMDS_VtkVolume.cxx | 2 +- src/SMDS/SMDS_VtkVolume.hxx | 2 +- src/SMDS/SMESH_SMDS.hxx | 2 +- src/SMDS/chrono.cxx | 2 +- src/SMDS/chrono.hxx | 2 +- src/SMESH/Makefile.am | 2 +- src/SMESH/SMESH_Algo.cxx | 2 +- src/SMESH/SMESH_Algo.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 +- src/SMESH/SMESH_Mesh.cxx | 2 +- src/SMESH/SMESH_Mesh.hxx | 2 +- src/SMESH/SMESH_MeshEditor.cxx | 3 +- src/SMESH/SMESH_MeshEditor.hxx | 2 +- src/SMESH/SMESH_MesherHelper.cxx | 12 +- src/SMESH/SMESH_MesherHelper.hxx | 2 +- src/SMESH/SMESH_Pattern.cxx | 2 +- src/SMESH/SMESH_Pattern.hxx | 2 +- src/SMESH/SMESH_ProxyMesh.cxx | 2 +- src/SMESH/SMESH_ProxyMesh.hxx | 2 +- src/SMESH/SMESH_SMESH.hxx | 2 +- src/SMESH/SMESH_subMesh.cxx | 5 +- src/SMESH/SMESH_subMesh.hxx | 2 +- src/SMESH/SMESH_subMeshEventListener.hxx | 2 +- src/SMESH/memoire.h | 2 +- src/SMESHClient/Makefile.am | 2 +- src/SMESHClient/SMESHClientBin.cxx | 2 +- src/SMESHClient/SMESH_Client.cxx | 2 +- src/SMESHClient/SMESH_Client.hxx | 2 +- src/SMESHDS/Makefile.am | 2 +- src/SMESHDS/SMESHDS_Command.cxx | 2 +- src/SMESHDS/SMESHDS_Command.hxx | 2 +- src/SMESHDS/SMESHDS_CommandType.hxx | 2 +- src/SMESHDS/SMESHDS_DataMapOfShape.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_GroupOnFilter.cxx | 2 +- src/SMESHDS/SMESHDS_GroupOnFilter.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 | 33 +- src/SMESHDS/SMESHDS_SubMesh.hxx | 2 +- src/SMESHDS/SMESH_Controls.hxx | 2 +- src/SMESHDS/SMESH_SMESHDS.hxx | 2 +- src/SMESHFiltersSelection/Makefile.am | 2 +- .../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 +- src/SMESHGUI/Makefile.am | 2 +- src/SMESHGUI/SMESHGUI.cxx | 4 +- src/SMESHGUI/SMESHGUI.h | 2 +- .../SMESHGUI_Add0DElemsOnAllNodesDlg.cxx | 2 +- .../SMESHGUI_Add0DElemsOnAllNodesDlg.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_BuildCompoundDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h | 2 +- src/SMESHGUI/SMESHGUI_ClippingDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_ClippingDlg.h | 2 +- src/SMESHGUI/SMESHGUI_ComputeDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_ComputeDlg.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_CopyMeshDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_CopyMeshDlg.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_DuplicateNodesDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.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_FileInfoDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_FileInfoDlg.h | 2 +- src/SMESHGUI/SMESHGUI_FileValidator.cxx | 2 +- src/SMESHGUI/SMESHGUI_FileValidator.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_FindElemByPointDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_FindElemByPointDlg.h | 2 +- src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx | 2 +- src/SMESHGUI/SMESHGUI_GEOMGenUtils.h | 2 +- src/SMESHGUI/SMESHGUI_GroupDlg.cxx | 4 +- src/SMESHGUI/SMESHGUI_GroupDlg.h | 2 +- src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.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_Make2DFrom3DOp.cxx | 2 +- src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.h | 2 +- src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.h | 2 +- src/SMESHGUI/SMESHGUI_Measurements.cxx | 2 +- src/SMESHGUI/SMESHGUI_Measurements.h | 2 +- src/SMESHGUI/SMESHGUI_MergeDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_MergeDlg.h | 2 +- src/SMESHGUI/SMESHGUI_MeshDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_MeshDlg.h | 2 +- src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx | 2 +- src/SMESHGUI/SMESHGUI_MeshEditPreview.h | 2 +- src/SMESHGUI/SMESHGUI_MeshInfo.cxx | 2 +- src/SMESHGUI/SMESHGUI_MeshInfo.h | 2 +- src/SMESHGUI/SMESHGUI_MeshInfosBox.cxx | 2 +- src/SMESHGUI/SMESHGUI_MeshInfosBox.h | 2 +- src/SMESHGUI/SMESHGUI_MeshOp.cxx | 2 +- src/SMESHGUI/SMESHGUI_MeshOp.h | 2 +- src/SMESHGUI/SMESHGUI_MeshOrderDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_MeshOrderDlg.h | 2 +- src/SMESHGUI/SMESHGUI_MeshOrderOp.cxx | 2 +- src/SMESHGUI/SMESHGUI_MeshOrderOp.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_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 | 2 +- src/SMESHGUI/SMESHGUI_Operation.h | 2 +- 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_ScalarBarDlg.cxx | 3 +- .../SMESHGUI_Preferences_ScalarBarDlg.h | 2 +- src/SMESHGUI/SMESHGUI_PreviewDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_PreviewDlg.h | 2 +- src/SMESHGUI/SMESHGUI_PropertiesDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_PropertiesDlg.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_ReorientFacesDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_ReorientFacesDlg.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_ScaleDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_ScaleDlg.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 +- 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/SMESH_SMESHGUI.hxx | 2 +- src/SMESHUtils/Makefile.am | 2 +- src/SMESHUtils/SMESH_Block.cxx | 2 +- src/SMESHUtils/SMESH_Block.hxx | 2 +- src/SMESHUtils/SMESH_Comment.hxx | 2 +- src/SMESHUtils/SMESH_ComputeError.hxx | 2 +- src/SMESHUtils/SMESH_File.cxx | 2 +- src/SMESHUtils/SMESH_File.hxx | 2 +- src/SMESHUtils/SMESH_Octree.cxx | 2 +- src/SMESHUtils/SMESH_Octree.hxx | 2 +- src/SMESHUtils/SMESH_OctreeNode.cxx | 2 +- src/SMESHUtils/SMESH_OctreeNode.hxx | 2 +- src/SMESHUtils/SMESH_Quadtree.cxx | 2 +- src/SMESHUtils/SMESH_Quadtree.hxx | 2 +- src/SMESHUtils/SMESH_Tree.hxx | 42 +-- src/SMESHUtils/SMESH_TryCatch.cxx | 3 +- src/SMESHUtils/SMESH_TryCatch.hxx | 2 +- src/SMESHUtils/SMESH_TypeDefs.hxx | 2 +- src/SMESHUtils/SMESH_Utils.hxx | 2 +- src/SMESH_I/Makefile.am | 2 +- src/SMESH_I/SMESH.hxx | 2 +- src/SMESH_I/SMESHEngine.cxx | 2 +- src/SMESH_I/SMESH_0D_Algo_i.cxx | 2 +- src/SMESH_I/SMESH_0D_Algo_i.hxx | 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 | 15 +- 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 | 26 +- src/SMESH_I/SMESH_Filter_i.cxx | 3 +- src/SMESH_I/SMESH_Filter_i.hxx | 3 +- src/SMESH_I/SMESH_Gen_i.cxx | 2 +- src/SMESH_I/SMESH_Gen_i.hxx | 11 +- src/SMESH_I/SMESH_Gen_i_1.cxx | 305 +++++++++++------- src/SMESH_I/SMESH_Group_i.cxx | 2 +- src/SMESH_I/SMESH_Group_i.hxx | 2 +- src/SMESH_I/SMESH_Hypothesis_i.cxx | 25 +- src/SMESH_I/SMESH_Hypothesis_i.hxx | 40 ++- 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_Measurements_i.cxx | 2 +- src/SMESH_I/SMESH_Measurements_i.hxx | 2 +- src/SMESH_I/SMESH_MeshEditor_i.cxx | 2 +- src/SMESH_I/SMESH_MeshEditor_i.hxx | 2 +- src/SMESH_I/SMESH_MeshPartDS.hxx | 2 +- src/SMESH_I/SMESH_Mesh_i.cxx | 11 +- src/SMESH_I/SMESH_Mesh_i.hxx | 2 +- src/SMESH_I/SMESH_NoteBook.cxx | 85 ++++- src/SMESH_I/SMESH_NoteBook.hxx | 15 +- src/SMESH_I/SMESH_Pattern_i.cxx | 2 +- src/SMESH_I/SMESH_Pattern_i.hxx | 2 +- src/SMESH_I/SMESH_PreMeshInfo.cxx | 2 +- src/SMESH_I/SMESH_PreMeshInfo.hxx | 2 +- src/SMESH_I/SMESH_PythonDump.hxx | 4 +- src/SMESH_I/SMESH_subMesh_i.cxx | 2 +- src/SMESH_I/SMESH_subMesh_i.hxx | 2 +- src/SMESH_PY/Makefile.am | 2 +- src/SMESH_PY/__init__.py | 2 +- src/SMESH_PY/smeshstudytools.py | 2 +- src/SMESH_SWIG/Makefile.am | 2 +- 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 | 2 +- src/SMESH_SWIG/SMESH_BelongToGeom.py | 2 +- src/SMESH_SWIG/SMESH_BuildCompound.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 | 103 +----- 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_test1_AndDisplay.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/StdMeshersDC.py | 39 ++- src/SMESH_SWIG/batchmode_mefisto.py | 2 +- src/SMESH_SWIG/batchmode_smesh.py | 2 +- 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/ex21_lamp.py | 2 +- src/SMESH_SWIG/ex24_cylinder.py | 2 +- src/SMESH_SWIG/ex29_refine.py | 2 +- src/SMESH_SWIG/ex30_groupsOp.py | 2 +- src/SMESH_SWIG/ex30_tepal.py | 2 +- src/SMESH_SWIG/ex31_dimGroup.py | 2 +- src/SMESH_SWIG/smesh.py | 2 +- src/SMESH_SWIG/smeshDC.py | 2 +- src/SMESH_SWIG/smesh_algorithm.py | 2 +- src/SMESH_SWIG_WITHIHM/Makefile.am | 2 +- src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx | 2 +- src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h | 2 +- src/SMESH_SWIG_WITHIHM/libSMESH_Swig.i | 2 +- src/StdMeshers/Makefile.am | 2 +- src/StdMeshers/SMESH_StdMeshers.hxx | 2 +- src/StdMeshers/StdMeshers_Arithmetic1D.cxx | 2 +- src/StdMeshers/StdMeshers_Arithmetic1D.hxx | 2 +- src/StdMeshers/StdMeshers_AutomaticLength.cxx | 2 +- src/StdMeshers/StdMeshers_AutomaticLength.hxx | 2 +- .../StdMeshers_CartesianParameters3D.cxx | 2 +- .../StdMeshers_CartesianParameters3D.hxx | 2 +- src/StdMeshers/StdMeshers_Cartesian_3D.cxx | 2 +- src/StdMeshers/StdMeshers_Cartesian_3D.hxx | 2 +- .../StdMeshers_CompositeHexa_3D.cxx | 2 +- .../StdMeshers_CompositeHexa_3D.hxx | 2 +- .../StdMeshers_CompositeSegment_1D.cxx | 2 +- .../StdMeshers_CompositeSegment_1D.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_FaceSide.cxx | 2 +- src/StdMeshers/StdMeshers_FaceSide.hxx | 2 +- src/StdMeshers/StdMeshers_FixedPoints1D.cxx | 2 +- src/StdMeshers/StdMeshers_FixedPoints1D.hxx | 2 +- src/StdMeshers/StdMeshers_HexaFromSkin_3D.cxx | 2 +- src/StdMeshers/StdMeshers_HexaFromSkin_3D.hxx | 2 +- src/StdMeshers/StdMeshers_Hexa_3D.cxx | 2 +- src/StdMeshers/StdMeshers_Hexa_3D.hxx | 2 +- src/StdMeshers/StdMeshers_ImportSource.cxx | 2 +- src/StdMeshers/StdMeshers_ImportSource.hxx | 2 +- src/StdMeshers/StdMeshers_Import_1D.cxx | 2 +- src/StdMeshers/StdMeshers_Import_1D.hxx | 2 +- src/StdMeshers/StdMeshers_Import_1D2D.cxx | 2 +- src/StdMeshers/StdMeshers_Import_1D2D.hxx | 2 +- .../StdMeshers_LayerDistribution.cxx | 2 +- .../StdMeshers_LayerDistribution.hxx | 2 +- .../StdMeshers_LayerDistribution2D.cxx | 2 +- .../StdMeshers_LayerDistribution2D.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 +- src/StdMeshers/StdMeshers_MaxLength.cxx | 2 +- src/StdMeshers/StdMeshers_MaxLength.hxx | 2 +- .../StdMeshers_NotConformAllowed.cxx | 2 +- .../StdMeshers_NotConformAllowed.hxx | 2 +- src/StdMeshers/StdMeshers_NumberOfLayers.cxx | 2 +- src/StdMeshers/StdMeshers_NumberOfLayers.hxx | 2 +- .../StdMeshers_NumberOfLayers2D.cxx | 2 +- .../StdMeshers_NumberOfLayers2D.hxx | 2 +- .../StdMeshers_NumberOfSegments.cxx | 2 +- .../StdMeshers_NumberOfSegments.hxx | 2 +- src/StdMeshers/StdMeshers_Penta_3D.cxx | 2 +- src/StdMeshers/StdMeshers_Penta_3D.hxx | 2 +- src/StdMeshers/StdMeshers_Prism_3D.cxx | 2 +- src/StdMeshers/StdMeshers_Prism_3D.hxx | 2 +- .../StdMeshers_ProjectionSource1D.cxx | 2 +- .../StdMeshers_ProjectionSource1D.hxx | 2 +- .../StdMeshers_ProjectionSource2D.cxx | 2 +- .../StdMeshers_ProjectionSource2D.hxx | 2 +- .../StdMeshers_ProjectionSource3D.cxx | 2 +- .../StdMeshers_ProjectionSource3D.hxx | 2 +- src/StdMeshers/StdMeshers_ProjectionUtils.cxx | 2 +- src/StdMeshers/StdMeshers_ProjectionUtils.hxx | 2 +- src/StdMeshers/StdMeshers_Projection_1D.cxx | 2 +- src/StdMeshers/StdMeshers_Projection_1D.hxx | 2 +- src/StdMeshers/StdMeshers_Projection_1D2D.cxx | 2 +- src/StdMeshers/StdMeshers_Projection_1D2D.hxx | 2 +- src/StdMeshers/StdMeshers_Projection_2D.cxx | 2 +- src/StdMeshers/StdMeshers_Projection_2D.hxx | 2 +- src/StdMeshers/StdMeshers_Projection_3D.cxx | 2 +- src/StdMeshers/StdMeshers_Projection_3D.hxx | 2 +- src/StdMeshers/StdMeshers_Propagation.cxx | 2 +- src/StdMeshers/StdMeshers_Propagation.hxx | 2 +- .../StdMeshers_QuadToTriaAdaptor.cxx | 2 +- .../StdMeshers_QuadToTriaAdaptor.hxx | 2 +- .../StdMeshers_QuadrangleParams.cxx | 2 +- .../StdMeshers_QuadrangleParams.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_RadialPrism_3D.cxx | 2 +- src/StdMeshers/StdMeshers_RadialPrism_3D.hxx | 2 +- .../StdMeshers_RadialQuadrangle_1D2D.cxx | 2 +- .../StdMeshers_RadialQuadrangle_1D2D.hxx | 2 +- src/StdMeshers/StdMeshers_Regular_1D.cxx | 2 +- src/StdMeshers/StdMeshers_Regular_1D.hxx | 2 +- .../StdMeshers_SegmentAroundVertex_0D.cxx | 2 +- .../StdMeshers_SegmentAroundVertex_0D.hxx | 2 +- .../StdMeshers_SegmentLengthAroundVertex.cxx | 2 +- .../StdMeshers_SegmentLengthAroundVertex.hxx | 2 +- src/StdMeshers/StdMeshers_StartEndLength.cxx | 2 +- src/StdMeshers/StdMeshers_StartEndLength.hxx | 2 +- .../StdMeshers_UseExisting_1D2D.cxx | 2 +- .../StdMeshers_UseExisting_1D2D.hxx | 2 +- src/StdMeshers/StdMeshers_ViscousLayers.cxx | 2 +- src/StdMeshers/StdMeshers_ViscousLayers.hxx | 2 +- src/StdMeshers/StdMeshers_ViscousLayers2D.cxx | 2 +- src/StdMeshers/StdMeshers_ViscousLayers2D.hxx | 2 +- src/StdMeshersGUI/Makefile.am | 2 +- src/StdMeshersGUI/SMESH_StdMeshersGUI.hxx | 2 +- src/StdMeshersGUI/StdMeshersGUI.cxx | 2 +- .../StdMeshersGUI_CartesianParamCreator.cxx | 2 +- .../StdMeshersGUI_CartesianParamCreator.h | 2 +- .../StdMeshersGUI_DistrPreview.cxx | 2 +- .../StdMeshersGUI_DistrPreview.h | 2 +- .../StdMeshersGUI_DistrTable.cxx | 2 +- src/StdMeshersGUI/StdMeshersGUI_DistrTable.h | 2 +- .../StdMeshersGUI_FixedPointsParamWdg.cxx | 2 +- .../StdMeshersGUI_FixedPointsParamWdg.h | 2 +- ...tdMeshersGUI_LayerDistributionParamWdg.cxx | 19 +- .../StdMeshersGUI_LayerDistributionParamWdg.h | 10 +- .../StdMeshersGUI_NbSegmentsCreator.cxx | 2 +- .../StdMeshersGUI_NbSegmentsCreator.h | 2 +- .../StdMeshersGUI_ObjectReferenceParamWdg.cxx | 2 +- .../StdMeshersGUI_ObjectReferenceParamWdg.h | 2 +- .../StdMeshersGUI_QuadrangleParamWdg.cxx | 2 +- .../StdMeshersGUI_QuadrangleParamWdg.h | 2 +- .../StdMeshersGUI_StdHypothesisCreator.cxx | 10 +- .../StdMeshersGUI_StdHypothesisCreator.h | 2 +- .../StdMeshersGUI_SubShapeSelectorWdg.cxx | 2 +- .../StdMeshersGUI_SubShapeSelectorWdg.h | 2 +- src/StdMeshers_I/Makefile.am | 2 +- src/StdMeshers_I/SMESH_StdMeshers_I.hxx | 2 +- .../StdMeshers_Arithmetic1D_i.cxx | 2 +- .../StdMeshers_Arithmetic1D_i.hxx | 2 +- .../StdMeshers_AutomaticLength_i.cxx | 2 +- .../StdMeshers_AutomaticLength_i.hxx | 2 +- .../StdMeshers_CartesianParameters3D_i.cxx | 2 +- .../StdMeshers_CartesianParameters3D_i.hxx | 2 +- .../StdMeshers_Cartesian_3D_i.cxx | 2 +- .../StdMeshers_Cartesian_3D_i.hxx | 2 +- .../StdMeshers_CompositeSegment_1D_i.cxx | 2 +- .../StdMeshers_CompositeSegment_1D_i.hxx | 2 +- .../StdMeshers_Deflection1D_i.cxx | 2 +- .../StdMeshers_Deflection1D_i.hxx | 2 +- .../StdMeshers_FixedPoints1D_i.cxx | 2 +- .../StdMeshers_FixedPoints1D_i.hxx | 2 +- src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx | 2 +- src/StdMeshers_I/StdMeshers_Hexa_3D_i.hxx | 2 +- .../StdMeshers_ImportSource1D_i.cxx | 2 +- .../StdMeshers_ImportSource1D_i.hxx | 2 +- .../StdMeshers_ImportSource2D_i.cxx | 2 +- .../StdMeshers_ImportSource2D_i.hxx | 2 +- src/StdMeshers_I/StdMeshers_Import_1D2D_i.cxx | 2 +- src/StdMeshers_I/StdMeshers_Import_1D2D_i.hxx | 2 +- src/StdMeshers_I/StdMeshers_Import_1D_i.cxx | 2 +- src/StdMeshers_I/StdMeshers_Import_1D_i.hxx | 2 +- .../StdMeshers_LayerDistribution2D_i.cxx | 2 +- .../StdMeshers_LayerDistribution2D_i.hxx | 2 +- .../StdMeshers_LayerDistribution_i.cxx | 6 +- .../StdMeshers_LayerDistribution_i.hxx | 3 +- .../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 +- src/StdMeshers_I/StdMeshers_MaxLength_i.cxx | 2 +- src/StdMeshers_I/StdMeshers_MaxLength_i.hxx | 2 +- .../StdMeshers_NotConformAllowed_i.cxx | 2 +- .../StdMeshers_NotConformAllowed_i.hxx | 2 +- .../StdMeshers_NumberOfLayers2D_i.cxx | 2 +- .../StdMeshers_NumberOfLayers2D_i.hxx | 2 +- .../StdMeshers_NumberOfLayers_i.cxx | 2 +- .../StdMeshers_NumberOfLayers_i.hxx | 2 +- .../StdMeshers_NumberOfSegments_i.cxx | 2 +- .../StdMeshers_NumberOfSegments_i.hxx | 2 +- src/StdMeshers_I/StdMeshers_ObjRefUlils.cxx | 2 +- src/StdMeshers_I/StdMeshers_ObjRefUlils.hxx | 2 +- src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx | 2 +- src/StdMeshers_I/StdMeshers_Prism_3D_i.hxx | 2 +- .../StdMeshers_ProjectionSource1D_i.cxx | 2 +- .../StdMeshers_ProjectionSource1D_i.hxx | 2 +- .../StdMeshers_ProjectionSource2D_i.cxx | 2 +- .../StdMeshers_ProjectionSource2D_i.hxx | 2 +- .../StdMeshers_ProjectionSource3D_i.cxx | 2 +- .../StdMeshers_ProjectionSource3D_i.hxx | 2 +- .../StdMeshers_Projection_1D_2D_3D_i.cxx | 2 +- .../StdMeshers_Projection_1D_2D_3D_i.hxx | 2 +- src/StdMeshers_I/StdMeshers_Propagation_i.cxx | 2 +- src/StdMeshers_I/StdMeshers_Propagation_i.hxx | 2 +- .../StdMeshers_QuadrangleParams_i.cxx | 2 +- .../StdMeshers_QuadrangleParams_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 +- .../StdMeshers_RadialQuadrangle_1D2D_i.cxx | 2 +- .../StdMeshers_RadialQuadrangle_1D2D_i.hxx | 2 +- src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx | 2 +- src/StdMeshers_I/StdMeshers_Regular_1D_i.hxx | 2 +- .../StdMeshers_SegmentAroundVertex_0D_i.cxx | 2 +- .../StdMeshers_SegmentAroundVertex_0D_i.hxx | 2 +- ...StdMeshers_SegmentLengthAroundVertex_i.cxx | 2 +- ...StdMeshers_SegmentLengthAroundVertex_i.hxx | 2 +- .../StdMeshers_StartEndLength_i.cxx | 2 +- .../StdMeshers_StartEndLength_i.hxx | 2 +- .../StdMeshers_UseExisting_1D2D_i.cxx | 2 +- .../StdMeshers_UseExisting_1D2D_i.hxx | 2 +- .../StdMeshers_ViscousLayers2D_i.cxx | 2 +- .../StdMeshers_ViscousLayers2D_i.hxx | 2 +- .../StdMeshers_ViscousLayers_i.cxx | 2 +- .../StdMeshers_ViscousLayers_i.hxx | 2 +- src/StdMeshers_I/StdMeshers_i.cxx | 2 +- src/Tools/Makefile.am | 2 +- src/Tools/MeshCut/AUTHORS | 2 +- src/Tools/MeshCut/Makefile.am | 2 +- src/Tools/MeshCut/MeshCut_Carre.cxx | 2 +- src/Tools/MeshCut/MeshCut_Carre.hxx | 2 +- src/Tools/MeshCut/MeshCut_Cas.cxx | 2 +- src/Tools/MeshCut/MeshCut_Cas.hxx | 2 +- src/Tools/MeshCut/MeshCut_Cube.cxx | 2 +- src/Tools/MeshCut/MeshCut_Cube.hxx | 2 +- src/Tools/MeshCut/MeshCut_DC.cxx | 2 +- src/Tools/MeshCut/MeshCut_Fonctions.cxx | 2 +- src/Tools/MeshCut/MeshCut_Fonctions.hxx | 2 +- src/Tools/MeshCut/MeshCut_Globals.hxx | 2 +- src/Tools/MeshCut/MeshCut_Maillage.cxx | 2 +- src/Tools/MeshCut/MeshCut_Maillage.hxx | 2 +- src/Tools/MeshCut/MeshCut_Utils.cxx | 2 +- src/Tools/MeshCut/MeshCut_Utils.hxx | 2 +- src/Tools/MeshCut/meshcut_plugin.py | 2 +- src/Tools/YamsPlug/Makefile.am | 2 +- src/Tools/YamsPlug/monViewText.py | 3 +- src/Tools/YamsPlug/monYamsPlugDialog.py | 3 +- src/Tools/YamsPlug/yamsplug_plugin.py | 2 +- src/Tools/padder/Makefile.am | 2 +- src/Tools/padder/doc/Makefile.am | 2 +- src/Tools/padder/doc/doxyfile.in | 5 +- src/Tools/padder/meshjob/Makefile.am | 2 +- src/Tools/padder/meshjob/idl/MESHJOB.idl | 3 +- src/Tools/padder/meshjob/idl/Makefile.am | 2 +- .../padder/meshjob/idl/SPADDERPluginTest.idl | 3 +- src/Tools/padder/meshjob/impl/Makefile.am | 2 +- .../padder/meshjob/impl/MeshJobManager_i.cxx | 3 +- .../padder/meshjob/impl/MeshJobManager_i.hxx | 3 +- .../meshjob/impl/SPADDERPluginTester_i.cxx | 3 +- .../meshjob/impl/SPADDERPluginTester_i.hxx | 3 +- src/Tools/padder/meshjob/impl/testhelper.hxx | 3 +- src/Tools/padder/resources/Makefile.am | 2 +- .../padder/resources/appligen/Makefile.am | 2 +- .../padder/resources/appligen/appligen.sh.in | 2 +- src/Tools/padder/resources/appligen/genenv.sh | 2 +- .../padder/resources/testdata/Makefile.am | 2 +- .../resources/testdata/buildparticules.py | 2 +- src/Tools/padder/spadderpy/Makefile.am | 2 +- src/Tools/padder/spadderpy/__init__.py | 3 +- src/Tools/padder/spadderpy/configreader.py | 3 +- src/Tools/padder/spadderpy/gui/Makefile.am | 2 +- src/Tools/padder/spadderpy/gui/__init__.py | 2 +- src/Tools/padder/spadderpy/gui/inputdata.py | 2 +- src/Tools/padder/spadderpy/gui/inputdialog.py | 2 +- .../padder/spadderpy/gui/plugindialog.py | 2 +- src/Tools/padder/spadderpy/plugin/Makefile.am | 2 +- .../padder/spadderpy/plugin/envPlugins.sh.in | 2 +- .../padder/spadderpy/plugin/spadderPlugin.py | 2 +- src/Tools/padder/unittests/Makefile.am | 2 +- src/Tools/padder/unittests/__init__.py | 2 +- src/Tools/padder/unittests/autotest.sh.in | 2 +- .../unittests/usecase_meshJobManager.py | 3 +- .../unittests/usecase_spadderPluginTester.py | 3 +- src/Tools/smesh_plugins.py | 2 +- 879 files changed, 1439 insertions(+), 1246 deletions(-) diff --git a/Makefile.am b/Makefile.am index c887e3f82..9893076e7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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/SMESH_version.h.in b/SMESH_version.h.in index 76a669881..fff237511 100644 --- a/SMESH_version.h.in +++ b/SMESH_version.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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/adm_local/Makefile.am b/adm_local/Makefile.am index 6d9ac170c..e642b988c 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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/FindSMESH.cmake b/adm_local/cmake_files/FindSMESH.cmake index b47fb65dc..e764afe5b 100644 --- a/adm_local/cmake_files/FindSMESH.cmake +++ b/adm_local/cmake_files/FindSMESH.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 59484d20f..7f0c58afe 100644 --- a/adm_local/cmake_files/Makefile.am +++ b/adm_local/cmake_files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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/unix/Makefile.am b/adm_local/unix/Makefile.am index 0d5ee76b8..c68bae141 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am index 938083baa..b62b0cd53 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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/unix/config_files/check_Platform.m4 b/adm_local/unix/config_files/check_Platform.m4 index 93c7267e7..21c2baca9 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-2012 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2013 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 diff --git a/adm_local/unix/config_files/check_SMESH.m4 b/adm_local/unix/config_files/check_SMESH.m4 index 9096571c1..b8290a22e 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-2012 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2013 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 diff --git a/adm_local/unix/config_files/check_cgal.m4 b/adm_local/unix/config_files/check_cgal.m4 index 2ec433615..c987b5e38 100644 --- a/adm_local/unix/config_files/check_cgal.m4 +++ b/adm_local/unix/config_files/check_cgal.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2013 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 diff --git a/adm_local/unix/config_files/check_cgns.m4 b/adm_local/unix/config_files/check_cgns.m4 index 4e25e27c6..008301d7e 100644 --- a/adm_local/unix/config_files/check_cgns.m4 +++ b/adm_local/unix/config_files/check_cgns.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2013 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 diff --git a/adm_local/unix/config_files/check_f77.m4 b/adm_local/unix/config_files/check_f77.m4 index 64d3288ab..74fdfa501 100644 --- a/adm_local/unix/config_files/check_f77.m4 +++ b/adm_local/unix/config_files/check_f77.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2013 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 diff --git a/adm_local/unix/config_files/check_padder.m4 b/adm_local/unix/config_files/check_padder.m4 index ab30fecab..2adb6407b 100644 --- a/adm_local/unix/config_files/check_padder.m4 +++ b/adm_local/unix/config_files/check_padder.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2013 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 diff --git a/adm_local/unix/config_files/check_qwt.m4 b/adm_local/unix/config_files/check_qwt.m4 index b15142068..1d9ea498f 100644 --- a/adm_local/unix/config_files/check_qwt.m4 +++ b/adm_local/unix/config_files/check_qwt.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2013 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 diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index 295f19f81..c5c0f0595 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 @@ -64,6 +64,11 @@ docdir = $(datadir)/doc/salome # common rules +# ============================================================ +# Cmake files wildcard (to add then to the distribution) +# ============================================================ +CMAKEFILES = $(notdir $(wildcard $(srcdir)/CMakeLists.txt)) + # meta object implementation files generation (moc) %_moc.cxx: %.h $(MOC) $< -o $@ @@ -82,7 +87,8 @@ ui_%.h: %.ui # extra distributed files EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) \ - $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.ts) + $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.ts) \ + $(CMAKEFILES) # customize clean operation mostlyclean-local: diff --git a/bin/Makefile.am b/bin/Makefile.am index 7e1eea667..449725b4e 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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/bin/smesh_setenv.py b/bin/smesh_setenv.py index a58406c1e..aa78a39f5 100644 --- a/bin/smesh_setenv.py +++ b/bin/smesh_setenv.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 30eeb733d..04e35220f 100755 --- a/build_cmake +++ b/build_cmake @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 38e8e726b..692a22690 100644 --- a/build_cmake.bat +++ b/build_cmake.bat @@ -1,4 +1,4 @@ -@REM Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +@REM Copyright (C) 2007-2013 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 diff --git a/build_configure b/build_configure index ce47d8056..6c9778d7c 100755 --- a/build_configure +++ b/build_configure @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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/clean_configure b/clean_configure index 09bfbd7bd..8cc92efc0 100755 --- a/clean_configure +++ b/clean_configure @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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/configure.ac b/configure.ac index 303d5b812..51b8f4504 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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/doc/Makefile.am b/doc/Makefile.am index 6d2dfb201..1f5027b11 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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/doc/docutils/Makefile.am b/doc/docutils/Makefile.am index 1775115ee..0de1c9d7f 100644 --- a/doc/docutils/Makefile.am +++ b/doc/docutils/Makefile.am @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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/Makefile.am b/doc/salome/Makefile.am index 10bcc3f25..ad542920b 100644 --- a/doc/salome/Makefile.am +++ b/doc/salome/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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/doc/salome/examples/CMakeLists.txt b/doc/salome/examples/CMakeLists.txt index 1a1c79544..25a067cc4 100644 --- a/doc/salome/examples/CMakeLists.txt +++ b/doc/salome/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2013 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/doc/salome/examples/Makefile.am b/doc/salome/examples/Makefile.am index f756654dd..94c233a75 100644 --- a/doc/salome/examples/Makefile.am +++ b/doc/salome/examples/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am index 9582cd97e..6d83072e2 100644 --- a/doc/salome/gui/Makefile.am +++ b/doc/salome/gui/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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/doc/salome/gui/SMESH/CMakeLists.txt b/doc/salome/gui/SMESH/CMakeLists.txt index 2f4f8b280..1d484199e 100644 --- a/doc/salome/gui/SMESH/CMakeLists.txt +++ b/doc/salome/gui/SMESH/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2013 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/doc/salome/gui/SMESH/Makefile.am b/doc/salome/gui/SMESH/Makefile.am index 5b3adb2fb..abf0ce26f 100755 --- a/doc/salome/gui/SMESH/Makefile.am +++ b/doc/salome/gui/SMESH/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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/doc/salome/gui/SMESH/collect_mesh_methods.py b/doc/salome/gui/SMESH/collect_mesh_methods.py index 24fd31880..a50e8e458 100755 --- a/doc/salome/gui/SMESH/collect_mesh_methods.py +++ b/doc/salome/gui/SMESH/collect_mesh_methods.py @@ -1,4 +1,24 @@ #!/usr/bin/env python +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# 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: collect_mesh_methods.py diff --git a/doc/salome/gui/SMESH/doxyfile.in b/doc/salome/gui/SMESH/doxyfile.in index 6b27a0c76..6905d92db 100755 --- a/doc/salome/gui/SMESH/doxyfile.in +++ b/doc/salome/gui/SMESH/doxyfile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 da25d092b..381ed77b3 100755 --- a/doc/salome/gui/SMESH/doxyfile_py.in +++ b/doc/salome/gui/SMESH/doxyfile_py.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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/adding_nodes_and_elements.doc b/doc/salome/gui/SMESH/input/adding_nodes_and_elements.doc index 7f4ff562e..38fb8c590 100644 --- a/doc/salome/gui/SMESH/input/adding_nodes_and_elements.doc +++ b/doc/salome/gui/SMESH/input/adding_nodes_and_elements.doc @@ -19,14 +19,20 @@
  • \ref adding_polyhedrons_anchor "Polyhedrons"
    • +SALOME uses the convention of nodal connectivity of elements of MED library. You +can consult description of the nodal connectivity of elements located +within documentation on MED library or + + here . + To add a node or an element to your mesh:
      -
    1. Select your mesh in the Object Browser or in the 3D viewer.
      2. +
    2. Select your mesh in the Object Browser or in the 3D viewer.
      3. -
    3. From the \b Modification menu choose the \b Add item, the -following associated sub-menu will appear:
      4. +
    4. From the \b Modification menu choose the \b Add item, the + following associated sub-menu will appear:
      5. -\image html image146.png + \image html image146.png From this sub-menu select the type of element which you would like to add to your mesh. diff --git a/doc/salome/gui/SMESH/input/adding_quadratic_elements.doc b/doc/salome/gui/SMESH/input/adding_quadratic_elements.doc index 7f2cf5cf9..1d51daa9a 100644 --- a/doc/salome/gui/SMESH/input/adding_quadratic_elements.doc +++ b/doc/salome/gui/SMESH/input/adding_quadratic_elements.doc @@ -14,6 +14,12 @@ QUAD9). The quadratic hexahedral element can bear 7 additional nodes: at the element center and at centers of sides, then it is referred as tri-quadratic one (or HEXA27). +SALOME uses the convention of nodal connectivity of elements of MED library. You +can consult description of the nodal connectivity of elements located +within documentation on MED library or + + here . + There are several ways you can create quadratic elements in your mesh: - manually create quadratic elements (the way described below); - use \ref quadratic_mesh_anchor "Quadratic Mesh" hypothesis to diff --git a/doc/salome/gui/SMESH/input/constructing_meshes.doc b/doc/salome/gui/SMESH/input/constructing_meshes.doc index bef709906..af5cd24e7 100644 --- a/doc/salome/gui/SMESH/input/constructing_meshes.doc +++ b/doc/salome/gui/SMESH/input/constructing_meshes.doc @@ -5,9 +5,9 @@ \n Construction of a mesh on some geometry consists of: Mesh can be \ref use_existing_anchor "computed using your own meshing algorithms" @@ -172,9 +172,9 @@ These elements can be kept in the mesh. \anchor submesh_order_anchor -

      Changing submesh priority

      +

      Changing sub-mesh priority

      -If the mesh contains concurrent \ref constructing_submeshes_page "submeshes", +If the mesh contains concurrent \ref constructing_submeshes_page "sub-meshes", it is possible to change the priority of their computation, i.e. to change the priority of applying algorithms to the shared sub-shapes of the Mesh shape. diff --git a/doc/salome/gui/SMESH/static/footer.html b/doc/salome/gui/SMESH/static/footer.html index 4c89a2ba1..f89cfbbec 100755 --- a/doc/salome/gui/SMESH/static/footer.html +++ b/doc/salome/gui/SMESH/static/footer.html @@ -3,10 +3,8 @@
      - Copyright © 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
      - Copyright © 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
      + Copyright © 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
      - \ No newline at end of file diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am index 987d26a43..41d793a66 100644 --- a/doc/salome/tui/Makefile.am +++ b/doc/salome/tui/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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/doc/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in index a4143bfee..0cb55fd69 100755 --- a/doc/salome/tui/doxyfile.in +++ b/doc/salome/tui/doxyfile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 @@ -117,8 +117,8 @@ FILTER_SOURCE_FILES = YES #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- -SOURCE_BROWSER = YES -INLINE_SOURCES = YES +SOURCE_BROWSER = NO +INLINE_SOURCES = NO STRIP_CODE_COMMENTS = YES REFERENCED_BY_RELATION = YES REFERENCES_RELATION = YES diff --git a/doc/salome/tui/static/footer.html b/doc/salome/tui/static/footer.html index 5b030c021..3dac8ee89 100755 --- a/doc/salome/tui/static/footer.html +++ b/doc/salome/tui/static/footer.html @@ -6,8 +6,7 @@
      -Copyright © 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
      -Copyright © 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
      +Copyright © 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
      diff --git a/idl/Makefile.am b/idl/Makefile.am index c43e554d3..c43c430ee 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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/idl/SMESH_BasicHypothesis.idl b/idl/SMESH_BasicHypothesis.idl index 2a08129a0..312f17372 100644 --- a/idl/SMESH_BasicHypothesis.idl +++ b/idl/SMESH_BasicHypothesis.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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/idl/SMESH_Filter.idl b/idl/SMESH_Filter.idl index b516d19eb..3355bbe48 100644 --- a/idl/SMESH_Filter.idl +++ b/idl/SMESH_Filter.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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/idl/SMESH_Gen.idl b/idl/SMESH_Gen.idl index 8385a9030..28286ef57 100644 --- a/idl/SMESH_Gen.idl +++ b/idl/SMESH_Gen.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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/idl/SMESH_Group.idl b/idl/SMESH_Group.idl index d00fe0e9d..b648e75f3 100644 --- a/idl/SMESH_Group.idl +++ b/idl/SMESH_Group.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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/idl/SMESH_Hypothesis.idl b/idl/SMESH_Hypothesis.idl index f2e43788e..55848758c 100644 --- a/idl/SMESH_Hypothesis.idl +++ b/idl/SMESH_Hypothesis.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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 @@ -76,33 +76,12 @@ module SMESH string GetVarParameter (in string methodName); /*! - * Set list of parameters - * \param theParameters is a string containing the notebook variables separated by ":" symbol, - * used for Hypothesis creation + * \brief Store a hypothesis wrapping this not published one. + * + * This hyp, which has no own parameters but is published, is used to store variables + * defining parameters of this hypothesis. */ - // void SetParameters (in string theParameters); - - // /*! - // * Return list of notebook variables used for Hypothesis creation separated by ":" symbol - // */ - // string GetParameters(); - - // /*! - // * Return list of last notebook variables used for Hypothesis creation. - // */ - // ListOfParameters GetLastParameters(); - - // /*! - // * Set list of parameters - // * \param theParameters is a string containing the last notebook variables separated by ":" symbol, - // * used for Hypothesis creation - // */ - // void SetLastParameters(in string theParameters); - - // /*! - // * Clear parameters list - // */ - // void ClearParameters(); + void SetHolderHypothesis(in SMESH::SMESH_Hypothesis hyp); /*! * Verify whether hypothesis supports given entity type diff --git a/idl/SMESH_Measurements.idl b/idl/SMESH_Measurements.idl index 6d8d7f545..becc67547 100644 --- a/idl/SMESH_Measurements.idl +++ b/idl/SMESH_Measurements.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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/idl/SMESH_Mesh.idl b/idl/SMESH_Mesh.idl index 33c775e38..a8d82f7d2 100644 --- a/idl/SMESH_Mesh.idl +++ b/idl/SMESH_Mesh.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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/idl/SMESH_MeshEditor.idl b/idl/SMESH_MeshEditor.idl index 956e871c8..f1b2fc82b 100644 --- a/idl/SMESH_MeshEditor.idl +++ b/idl/SMESH_MeshEditor.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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/idl/SMESH_Pattern.idl b/idl/SMESH_Pattern.idl index 85b842f83..0d90e8ae5 100644 --- a/idl/SMESH_Pattern.idl +++ b/idl/SMESH_Pattern.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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/resources/Makefile.am b/resources/Makefile.am index 4cb55e810..851cb3852 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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/resources/SMESHCatalog.xml.in b/resources/SMESHCatalog.xml.in index f65821917..4b5e1a80b 100644 --- a/resources/SMESHCatalog.xml.in +++ b/resources/SMESHCatalog.xml.in @@ -1,6 +1,6 @@ + + - + - + @@ -88,12 +90,12 @@ - + - + diff --git a/resources/StdMeshers.xml b/resources/StdMeshers.xml index 59f620421..af3dd63aa 100644 --- a/resources/StdMeshers.xml +++ b/resources/StdMeshers.xml @@ -1,7 +1,7 @@