From 5b3622aa2363853841fd5b4205c78a715bfee4a4 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 1 Apr 2013 12:25:01 +0000 Subject: [PATCH] Merge from V6_main 01/04/2013 --- GEOM_version.h.in | 2 +- Makefile.am | 2 +- adm_local/Makefile.am | 2 +- adm_local/cmake_files/FindGEOM.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_GEOM.m4 | 2 +- adm_local/unix/config_files/check_GUI.m4 | 2 +- adm_local/unix/config_files/check_OpenCV.m4 | 2 +- adm_local/unix/make_common_starter.am | 10 ++++-- bin/Makefile.am | 2 +- bin/addvars2notebook_GEOM.py | 2 +- bin/geom_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/examples/testme.py | 19 +++++++++++ doc/salome/gui/GEOM/Makefile.am | 2 +- doc/salome/gui/GEOM/doxyfile.in | 2 +- doc/salome/gui/GEOM/doxyfile_py.in | 2 +- doc/salome/gui/GEOM/doxyfile_tui.in | 2 +- doc/salome/gui/GEOM/images/extrusion1.png | Bin 36871 -> 29496 bytes doc/salome/gui/GEOM/images/extrusion2.png | Bin 36061 -> 28599 bytes doc/salome/gui/GEOM/images/extrusion3.png | Bin 36985 -> 29331 bytes .../gui/GEOM/input/creating_extrusion.doc | 25 +++++++++++--- doc/salome/gui/GEOM/static/footer.html | 4 +-- doc/salome/gui/Makefile.am | 2 +- doc/salome/tui/Makefile.am | 2 +- doc/salome/tui/doxyfile.in | 2 +- doc/salome/tui/static/footer.html | 3 +- idl/GEOM_Gen.idl | 2 +- idl/GEOM_Superv.idl | 2 +- idl/Makefile.am | 2 +- resources/GEOMCatalog.xml.in | 2 +- resources/GEOM_en.xml | 2 +- resources/GEOM_fr.xml | 2 +- resources/Makefile.am | 2 +- resources/SalomeApp.xml.in | 24 +++++++------- src/ARCHIMEDE/Archimede_VolumeSection.cxx | 2 +- src/ARCHIMEDE/Archimede_VolumeSection.hxx | 2 +- src/ARCHIMEDE/Makefile.am | 2 +- src/AdvancedGUI/AdvancedGUI.cxx | 2 +- src/AdvancedGUI/AdvancedGUI.h | 2 +- .../AdvancedGUI_DividedCylinderDlg.cxx | 31 +++++++++--------- .../AdvancedGUI_DividedCylinderDlg.h | 31 +++++++++--------- .../AdvancedGUI_DividedDiskDlg.cxx | 31 +++++++++--------- src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.h | 31 +++++++++--------- src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx | 3 +- src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.h | 3 +- src/AdvancedGUI/Makefile.am | 2 +- src/BREPExport/BREPExport.cxx | 2 +- src/BREPExport/Makefile.am | 2 +- src/BREPImport/BREPImport.cxx | 2 +- src/BREPImport/Makefile.am | 2 +- src/BasicGUI/BasicGUI.cxx | 2 +- src/BasicGUI/BasicGUI.h | 2 +- src/BasicGUI/BasicGUI_ArcDlg.cxx | 2 +- src/BasicGUI/BasicGUI_ArcDlg.h | 2 +- src/BasicGUI/BasicGUI_CircleDlg.cxx | 2 +- src/BasicGUI/BasicGUI_CircleDlg.h | 2 +- src/BasicGUI/BasicGUI_CurveDlg.cxx | 3 +- src/BasicGUI/BasicGUI_CurveDlg.h | 3 +- src/BasicGUI/BasicGUI_EllipseDlg.cxx | 2 +- src/BasicGUI/BasicGUI_EllipseDlg.h | 2 +- src/BasicGUI/BasicGUI_LineDlg.cxx | 2 +- src/BasicGUI/BasicGUI_LineDlg.h | 2 +- src/BasicGUI/BasicGUI_MarkerDlg.cxx | 2 +- src/BasicGUI/BasicGUI_MarkerDlg.h | 2 +- src/BasicGUI/BasicGUI_ParamCurveWidget.cxx | 2 +- src/BasicGUI/BasicGUI_ParamCurveWidget.h | 2 +- src/BasicGUI/BasicGUI_PlaneDlg.cxx | 2 +- src/BasicGUI/BasicGUI_PlaneDlg.h | 2 +- src/BasicGUI/BasicGUI_PointDlg.cxx | 2 +- src/BasicGUI/BasicGUI_PointDlg.h | 2 +- src/BasicGUI/BasicGUI_VectorDlg.cxx | 2 +- src/BasicGUI/BasicGUI_VectorDlg.h | 2 +- src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx | 2 +- src/BasicGUI/BasicGUI_WorkingPlaneDlg.h | 2 +- src/BasicGUI/Makefile.am | 2 +- src/BlockFix/BlockFix.cxx | 3 +- src/BlockFix/BlockFix.hxx | 3 +- src/BlockFix/BlockFix_BlockFixAPI.cxx | 3 +- src/BlockFix/BlockFix_BlockFixAPI.hxx | 3 +- src/BlockFix/BlockFix_CheckTool.cxx | 3 +- src/BlockFix/BlockFix_CheckTool.hxx | 3 +- .../BlockFix_PeriodicSurfaceModifier.cxx | 3 +- .../BlockFix_PeriodicSurfaceModifier.hxx | 3 +- src/BlockFix/BlockFix_SphereSpaceModifier.cxx | 3 +- src/BlockFix/BlockFix_SphereSpaceModifier.hxx | 3 +- src/BlockFix/BlockFix_UnionEdges.cxx | 3 +- src/BlockFix/BlockFix_UnionEdges.hxx | 3 +- src/BlockFix/BlockFix_UnionFaces.cxx | 3 +- src/BlockFix/BlockFix_UnionFaces.hxx | 3 +- src/BlockFix/Makefile.am | 3 +- src/BlocksGUI/BlocksGUI.cxx | 2 +- src/BlocksGUI/BlocksGUI.h | 2 +- src/BlocksGUI/BlocksGUI_BlockDlg.cxx | 2 +- src/BlocksGUI/BlocksGUI_BlockDlg.h | 2 +- src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx | 2 +- src/BlocksGUI/BlocksGUI_ExplodeDlg.h | 2 +- src/BlocksGUI/BlocksGUI_PropagateDlg.cxx | 2 +- src/BlocksGUI/BlocksGUI_PropagateDlg.h | 2 +- src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx | 2 +- src/BlocksGUI/BlocksGUI_QuadFaceDlg.h | 2 +- src/BlocksGUI/BlocksGUI_TrsfDlg.cxx | 2 +- src/BlocksGUI/BlocksGUI_TrsfDlg.h | 2 +- src/BlocksGUI/Makefile.am | 2 +- src/BooleanGUI/BooleanGUI.cxx | 2 +- src/BooleanGUI/BooleanGUI.h | 2 +- src/BooleanGUI/BooleanGUI_Dialog.cxx | 2 +- src/BooleanGUI/BooleanGUI_Dialog.h | 2 +- src/BooleanGUI/Makefile.am | 2 +- src/BuildGUI/BuildGUI.cxx | 2 +- src/BuildGUI/BuildGUI.h | 2 +- src/BuildGUI/BuildGUI_CompoundDlg.cxx | 2 +- src/BuildGUI/BuildGUI_CompoundDlg.h | 2 +- src/BuildGUI/BuildGUI_EdgeDlg.cxx | 2 +- src/BuildGUI/BuildGUI_EdgeDlg.h | 2 +- src/BuildGUI/BuildGUI_FaceDlg.cxx | 2 +- src/BuildGUI/BuildGUI_FaceDlg.h | 2 +- src/BuildGUI/BuildGUI_ShellDlg.cxx | 2 +- src/BuildGUI/BuildGUI_ShellDlg.h | 2 +- src/BuildGUI/BuildGUI_SolidDlg.cxx | 2 +- src/BuildGUI/BuildGUI_SolidDlg.h | 2 +- src/BuildGUI/BuildGUI_WireDlg.cxx | 2 +- src/BuildGUI/BuildGUI_WireDlg.h | 2 +- src/BuildGUI/Makefile.am | 2 +- src/DisplayGUI/DisplayGUI.cxx | 3 +- src/DisplayGUI/DisplayGUI.h | 3 +- src/DisplayGUI/Makefile.am | 2 +- src/DlgRef/DlgRef.cxx | 3 +- src/DlgRef/DlgRef.h | 3 +- src/DlgRef/Makefile.am | 3 +- src/EntityGUI/EntityGUI.cxx | 2 +- src/EntityGUI/EntityGUI.h | 2 +- src/EntityGUI/EntityGUI_3DSketcherDlg.cxx | 3 +- src/EntityGUI/EntityGUI_3DSketcherDlg.h | 3 +- .../EntityGUI_FeatureDetectorDlg.cxx | 2 +- src/EntityGUI/EntityGUI_FeatureDetectorDlg.h | 2 +- src/EntityGUI/EntityGUI_PictureImportDlg.cxx | 2 +- src/EntityGUI/EntityGUI_PictureImportDlg.h | 2 +- src/EntityGUI/EntityGUI_SketcherDlg.cxx | 2 +- src/EntityGUI/EntityGUI_SketcherDlg.h | 2 +- src/EntityGUI/EntityGUI_SubShapeDlg.cxx | 2 +- src/EntityGUI/EntityGUI_SubShapeDlg.h | 2 +- src/EntityGUI/EntityGUI_Widgets.cxx | 2 +- src/EntityGUI/EntityGUI_Widgets.h | 2 +- src/EntityGUI/Makefile.am | 2 +- src/GEOM/GEOM_Application.cxx | 2 +- src/GEOM/GEOM_Application.hxx | 2 +- src/GEOM/GEOM_Application.ixx | 2 +- src/GEOM/GEOM_Application.jxx | 2 +- ...teratorOfDataMapOfAsciiStringTransient.hxx | 2 +- ...ratorOfDataMapOfAsciiStringTransient_0.cxx | 2 +- ...MapNodeOfDataMapOfAsciiStringTransient.hxx | 2 +- ...pNodeOfDataMapOfAsciiStringTransient_0.cxx | 2 +- .../GEOM_DataMapOfAsciiStringTransient.hxx | 2 +- .../GEOM_DataMapOfAsciiStringTransient_0.cxx | 2 +- src/GEOM/GEOM_Engine.cxx | 2 +- src/GEOM/GEOM_Engine.hxx | 2 +- src/GEOM/GEOM_Function.cxx | 2 +- src/GEOM/GEOM_Function.hxx | 2 +- src/GEOM/GEOM_IOperations.cxx | 2 +- src/GEOM/GEOM_IOperations.hxx | 2 +- src/GEOM/GEOM_ISubShape.hxx | 2 +- src/GEOM/GEOM_Object.cxx | 2 +- src/GEOM/GEOM_Object.hxx | 2 +- src/GEOM/GEOM_PythonDump.cxx | 2 +- src/GEOM/GEOM_PythonDump.hxx | 2 +- src/GEOM/GEOM_Solver.cxx | 2 +- src/GEOM/GEOM_Solver.hxx | 2 +- src/GEOM/GEOM_SubShapeDriver.cxx | 2 +- src/GEOM/GEOM_SubShapeDriver.hxx | 2 +- src/GEOM/Handle_GEOM_Application.hxx | 2 +- ...MapNodeOfDataMapOfAsciiStringTransient.hxx | 2 +- src/GEOM/Makefile.am | 2 +- src/GEOMAlgo/GEOMAlgo.cdl | 2 +- src/GEOMAlgo/GEOMAlgo_Algo.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Algo.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_Builder.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Builder.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_BuilderArea.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_BuilderArea.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_BuilderFace.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_BuilderFace.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_BuilderShape.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_BuilderShape.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_BuilderSolid.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_BuilderSolid.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_BuilderTools.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_BuilderTools.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_Builder_0.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Builder_1.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Builder_2.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Builder_3.cxx | 13 ++++---- src/GEOMAlgo/GEOMAlgo_Builder_4.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Clsf.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Clsf.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.hxx | 2 +- ...pIteratorOfDataMapOfOrientedShapeShape.hxx | 2 +- ...taMapIteratorOfDataMapOfPassKeyInteger.hxx | 2 +- ...apIteratorOfDataMapOfPassKeyShapeShape.hxx | 2 +- ...aMapIteratorOfDataMapOfRealListOfShape.hxx | 2 +- ...aMapIteratorOfDataMapOfShapeMapOfShape.hxx | 2 +- ...lgo_DataMapIteratorOfDataMapOfShapePnt.hxx | 2 +- ...go_DataMapIteratorOfDataMapOfShapeReal.hxx | 2 +- ...ataMapIteratorOfDataMapOfShapeShapeSet.hxx | 2 +- .../GEOMAlgo_DataMapOfOrientedShapeShape.hxx | 2 +- .../GEOMAlgo_DataMapOfPassKeyInteger.hxx | 2 +- .../GEOMAlgo_DataMapOfPassKeyShapeShape.hxx | 2 +- .../GEOMAlgo_DataMapOfRealListOfShape.hxx | 2 +- .../GEOMAlgo_DataMapOfShapeMapOfShape.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_DataMapOfShapePnt.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx | 2 +- .../GEOMAlgo_DataMapOfShapeShapeSet.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_GetInPlace.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_GetInPlace.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_GetInPlace_1.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_GetInPlace_2.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_GetInPlace_3.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_GlueAnalyser.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_GlueDetector.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_Gluer.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Gluer.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_Gluer2.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Gluer2.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_Gluer2_1.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Gluer2_2.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_HAlgo.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_HAlgo.hxx | 2 +- .../GEOMAlgo_IndexedDataMapOfIntegerShape.hxx | 2 +- ...ndexedDataMapOfPassKeyShapeListOfShape.hxx | 2 +- .../GEOMAlgo_IndexedDataMapOfShapeBox.hxx | 2 +- ...EOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx | 2 +- .../GEOMAlgo_IndexedDataMapOfShapeState.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_KindOfBounds.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_KindOfClosed.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_KindOfName.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_KindOfShape.hxx | 3 +- ...lgo_ListIteratorOfListOfCoupleOfShapes.hxx | 2 +- .../GEOMAlgo_ListIteratorOfListOfPnt.hxx | 2 +- .../GEOMAlgo_ListOfCoupleOfShapes.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_PWireEdgeSet.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_PassKey.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_PassKey.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_PassKeyShape.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx | 2 +- .../GEOMAlgo_PassKeyShapeMapHasher.cxx | 2 +- .../GEOMAlgo_PassKeyShapeMapHasher.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_ShapeInfo.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_ShapeInfo.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_ShapeSet.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_ShapeSet.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_ShapeSolid.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_ShellSolid.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_Splitter.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Splitter.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_State.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_StateCollector.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_StateCollector.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_Tools.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Tools.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_Tools3D.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Tools3D.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_Tools_1.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_VertexSolid.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_WESCorrector.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_WESCorrector.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_WESScaler.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_WESScaler.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_WireEdgeSet.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_WireEdgeSet.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_WireSolid.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_WireSolid.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_WireSplitter.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_WireSplitter.hxx | 2 +- src/GEOMAlgo/Makefile.am | 3 +- src/GEOMBase/GEOMBase.cxx | 2 +- src/GEOMBase/GEOMBase.h | 2 +- src/GEOMBase/GEOMBase_Helper.cxx | 3 +- src/GEOMBase/GEOMBase_Helper.h | 3 +- src/GEOMBase/GEOMBase_Skeleton.cxx | 3 +- src/GEOMBase/GEOMBase_Skeleton.h | 3 +- src/GEOMBase/GEOM_GEOMBase.hxx | 2 +- src/GEOMBase/GEOM_GenericObjPtr.cxx | 2 +- src/GEOMBase/GEOM_GenericObjPtr.h | 2 +- src/GEOMBase/GEOM_Operation.cxx | 2 +- src/GEOMBase/GEOM_Operation.h | 2 +- src/GEOMBase/Makefile.am | 2 +- src/GEOMClient/GEOM_Client.cxx | 2 +- src/GEOMClient/GEOM_Client.hxx | 2 +- src/GEOMClient/Makefile.am | 2 +- .../GEOM_CompoundFilter.cxx | 2 +- .../GEOM_CompoundFilter.h | 2 +- src/GEOMFiltersSelection/GEOM_EdgeFilter.cxx | 2 +- src/GEOMFiltersSelection/GEOM_EdgeFilter.h | 2 +- src/GEOMFiltersSelection/GEOM_FaceFilter.cxx | 2 +- src/GEOMFiltersSelection/GEOM_FaceFilter.h | 2 +- .../GEOM_LogicalFilter.cxx | 2 +- src/GEOMFiltersSelection/GEOM_LogicalFilter.h | 2 +- src/GEOMFiltersSelection/GEOM_OCCFilter.cxx | 2 +- src/GEOMFiltersSelection/GEOM_OCCFilter.h | 2 +- .../GEOM_PreviewFilter.cxx | 2 +- src/GEOMFiltersSelection/GEOM_PreviewFilter.h | 2 +- .../GEOM_SelectionFilter.cxx | 2 +- .../GEOM_SelectionFilter.h | 2 +- src/GEOMFiltersSelection/GEOM_TypeFilter.cxx | 2 +- src/GEOMFiltersSelection/GEOM_TypeFilter.h | 2 +- src/GEOMFiltersSelection/Makefile.am | 2 +- src/GEOMGUI/GEOMGUI.cxx | 2 +- src/GEOMGUI/GEOMGUI.h | 2 +- src/GEOMGUI/GEOMGUI_OCCSelector.cxx | 2 +- src/GEOMGUI/GEOMGUI_OCCSelector.h | 2 +- src/GEOMGUI/GEOMGUI_Selection.cxx | 3 +- src/GEOMGUI/GEOMGUI_Selection.h | 3 +- src/GEOMGUI/GEOM_Displayer.cxx | 2 +- src/GEOMGUI/GEOM_Displayer.h | 2 +- src/GEOMGUI/GEOM_GEOMGUI.hxx | 2 +- src/GEOMGUI/GEOM_msg_en.ts | 19 +++++++++++ src/GEOMGUI/GEOM_msg_fr.ts | 19 +++++++++++ src/GEOMGUI/GeometryGUI.cxx | 2 +- src/GEOMGUI/GeometryGUI.h | 2 +- src/GEOMGUI/GeometryGUI_Operations.h | 2 +- src/GEOMGUI/Makefile.am | 2 +- src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_ArcDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_ArcDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_Block6Explorer.cxx | 2 +- src/GEOMImpl/GEOMImpl_Block6Explorer.hxx | 2 +- src/GEOMImpl/GEOMImpl_BlockDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_BlockDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_BooleanDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_BooleanDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_BoxDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_BoxDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_ChamferDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_ChamferDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_CircleDriver.cxx | 6 ++-- src/GEOMImpl/GEOMImpl_CircleDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_ConeDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_ConeDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_CopyDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_CopyDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_CylinderDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_CylinderDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_DiskDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_DiskDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_DividedDiskDriver.cxx | 31 +++++++++--------- src/GEOMImpl/GEOMImpl_DividedDiskDriver.hxx | 31 +++++++++--------- src/GEOMImpl/GEOMImpl_EllipseDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_EllipseDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_ExportDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_ExportDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_FaceDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_FaceDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_Fillet1d.cxx | 3 +- src/GEOMImpl/GEOMImpl_Fillet1d.hxx | 3 +- src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_FilletDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_FilletDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_FillingDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_FillingDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_Gen.cxx | 3 +- src/GEOMImpl/GEOMImpl_Gen.hxx | 2 +- src/GEOMImpl/GEOMImpl_GlueDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_GlueDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_HealingDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_HealingDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx | 3 +- src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_I3DSketcher.hxx | 3 +- src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx | 2 +- src/GEOMImpl/GEOMImpl_IAdvancedOperations.hxx | 2 +- src/GEOMImpl/GEOMImpl_IArc.hxx | 2 +- src/GEOMImpl/GEOMImpl_IArchimede.hxx | 2 +- src/GEOMImpl/GEOMImpl_IBasicOperations.cxx | 3 +- src/GEOMImpl/GEOMImpl_IBasicOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_IBlockTrsf.hxx | 2 +- src/GEOMImpl/GEOMImpl_IBlocks.hxx | 2 +- src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx | 3 +- src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_IBoolean.hxx | 2 +- src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx | 2 +- src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx | 2 +- src/GEOMImpl/GEOMImpl_IBox.hxx | 2 +- src/GEOMImpl/GEOMImpl_IChamfer.hxx | 2 +- src/GEOMImpl/GEOMImpl_ICircle.hxx | 2 +- src/GEOMImpl/GEOMImpl_ICone.hxx | 2 +- src/GEOMImpl/GEOMImpl_ICopy.hxx | 2 +- src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx | 3 +- src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_ICylinder.hxx | 2 +- src/GEOMImpl/GEOMImpl_IDisk.hxx | 2 +- src/GEOMImpl/GEOMImpl_IDividedDisk.hxx | 31 +++++++++--------- src/GEOMImpl/GEOMImpl_IEllipse.hxx | 2 +- src/GEOMImpl/GEOMImpl_IFace.hxx | 2 +- src/GEOMImpl/GEOMImpl_IFillet.hxx | 2 +- src/GEOMImpl/GEOMImpl_IFillet1d.hxx | 3 +- src/GEOMImpl/GEOMImpl_IFillet2d.hxx | 2 +- src/GEOMImpl/GEOMImpl_IFilling.hxx | 2 +- src/GEOMImpl/GEOMImpl_IGlue.hxx | 2 +- src/GEOMImpl/GEOMImpl_IGroupOperations.cxx | 3 +- src/GEOMImpl/GEOMImpl_IGroupOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_IHealing.hxx | 3 +- src/GEOMImpl/GEOMImpl_IHealingOperations.cxx | 2 +- src/GEOMImpl/GEOMImpl_IHealingOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_IImportExport.hxx | 2 +- src/GEOMImpl/GEOMImpl_IInsertOperations.cxx | 3 +- src/GEOMImpl/GEOMImpl_IInsertOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_ILine.hxx | 2 +- src/GEOMImpl/GEOMImpl_ILocalOperations.cxx | 3 +- src/GEOMImpl/GEOMImpl_ILocalOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_IMarker.hxx | 2 +- src/GEOMImpl/GEOMImpl_IMeasure.hxx | 2 +- src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx | 3 +- src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_IMirror.hxx | 2 +- src/GEOMImpl/GEOMImpl_IOffset.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPartition.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPipe.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPipeBiNormal.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPipeDiffSect.hxx | 3 +- src/GEOMImpl/GEOMImpl_IPipePath.hxx | 3 +- src/GEOMImpl/GEOMImpl_IPipeShellSect.hxx | 3 +- src/GEOMImpl/GEOMImpl_IPipeTShape.hxx | 3 +- src/GEOMImpl/GEOMImpl_IPlane.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPoint.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPolyline.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPosition.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPrism.hxx | 2 +- src/GEOMImpl/GEOMImpl_IRevolution.hxx | 2 +- src/GEOMImpl/GEOMImpl_IRotate.hxx | 2 +- src/GEOMImpl/GEOMImpl_IScale.hxx | 2 +- src/GEOMImpl/GEOMImpl_IShapes.hxx | 2 +- src/GEOMImpl/GEOMImpl_IShapesOperations.cxx | 5 +-- src/GEOMImpl/GEOMImpl_IShapesOperations.hxx | 2 +- src/GEOMImpl/GEOMImpl_ISketcher.hxx | 2 +- src/GEOMImpl/GEOMImpl_ISphere.hxx | 2 +- src/GEOMImpl/GEOMImpl_ISpline.hxx | 3 +- src/GEOMImpl/GEOMImpl_IThruSections.hxx | 2 +- src/GEOMImpl/GEOMImpl_ITorus.hxx | 2 +- .../GEOMImpl_ITransformOperations.cxx | 3 +- .../GEOMImpl_ITransformOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_ITranslate.hxx | 2 +- src/GEOMImpl/GEOMImpl_IVector.hxx | 2 +- src/GEOMImpl/GEOMImpl_ImportDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_ImportDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_LineDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_LineDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_MarkerDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_MarkerDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_MeasureDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_MeasureDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_MirrorDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_MirrorDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_OffsetDriver.cxx | 24 +++++++++++++- src/GEOMImpl/GEOMImpl_OffsetDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_PartitionDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_PartitionDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_PipeDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_PipeDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_PipePathDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_PipePathDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_PipeTShapeDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_PipeTShapeDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_PlaneDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_PlaneDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_PointDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_PointDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_PolylineDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_PolylineDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_PositionDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_PositionDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_PrismDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_PrismDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_RotateDriver.cxx | 12 ++++--- src/GEOMImpl/GEOMImpl_RotateDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_ScaleDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_ScaleDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_ShapeDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_ShapeDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_SketcherDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_SketcherDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_SphereDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_SphereDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_SplineDriver.cxx | 8 +++-- src/GEOMImpl/GEOMImpl_SplineDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_TorusDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_TorusDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_TranslateDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_TranslateDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_Types.hxx | 3 +- src/GEOMImpl/GEOMImpl_VectorDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_VectorDriver.hxx | 2 +- src/GEOMImpl/GEOM_GEOMImpl.hxx | 2 +- src/GEOMImpl/Makefile.am | 3 +- src/GEOMToolsGUI/GEOMToolsGUI.cxx | 2 +- src/GEOMToolsGUI/GEOMToolsGUI.h | 2 +- src/GEOMToolsGUI/GEOMToolsGUI_1.cxx | 2 +- .../GEOMToolsGUI_DeflectionDlg.cxx | 2 +- src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h | 2 +- src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.cxx | 2 +- src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.h | 2 +- .../GEOMToolsGUI_LineWidthDlg.cxx | 2 +- src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.h | 2 +- src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx | 2 +- src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.h | 2 +- .../GEOMToolsGUI_MaterialPropertiesDlg.cxx | 2 +- .../GEOMToolsGUI_MaterialPropertiesDlg.h | 2 +- src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx | 2 +- src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h | 2 +- src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx | 2 +- src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.h | 2 +- .../GEOMToolsGUI_TransparencyDlg.cxx | 2 +- .../GEOMToolsGUI_TransparencyDlg.h | 2 +- src/GEOMToolsGUI/GEOM_ToolsGUI.hxx | 2 +- src/GEOMToolsGUI/Makefile.am | 2 +- src/GEOMUtils/GEOMUtils.cxx | 8 +++-- src/GEOMUtils/GEOMUtils.hxx | 11 +++++-- src/GEOMUtils/Makefile.am | 3 +- src/GEOM_I/GEOM_DumpPython.cc | 2 +- src/GEOM_I/GEOM_GEOM_I.hxx | 2 +- src/GEOM_I/GEOM_Gen_i.cc | 2 +- src/GEOM_I/GEOM_Gen_i.hh | 2 +- src/GEOM_I/GEOM_I3DPrimOperations_i.cc | 3 +- src/GEOM_I/GEOM_I3DPrimOperations_i.hh | 3 +- src/GEOM_I/GEOM_IAdvancedOperations_i.cc | 3 +- src/GEOM_I/GEOM_IAdvancedOperations_i.hh | 3 +- src/GEOM_I/GEOM_IBasicOperations_i.cc | 3 +- src/GEOM_I/GEOM_IBasicOperations_i.hh | 3 +- src/GEOM_I/GEOM_IBlocksOperations_i.cc | 3 +- src/GEOM_I/GEOM_IBlocksOperations_i.hh | 3 +- src/GEOM_I/GEOM_IBooleanOperations_i.cc | 2 +- src/GEOM_I/GEOM_IBooleanOperations_i.hh | 2 +- src/GEOM_I/GEOM_ICurvesOperations_i.cc | 3 +- src/GEOM_I/GEOM_ICurvesOperations_i.hh | 3 +- src/GEOM_I/GEOM_IGroupOperations_i.cc | 3 +- src/GEOM_I/GEOM_IGroupOperations_i.hh | 3 +- src/GEOM_I/GEOM_IHealingOperations_i.cc | 3 +- src/GEOM_I/GEOM_IHealingOperations_i.hh | 3 +- src/GEOM_I/GEOM_IInsertOperations_i.cc | 3 +- src/GEOM_I/GEOM_IInsertOperations_i.hh | 3 +- src/GEOM_I/GEOM_ILocalOperations_i.cc | 3 +- src/GEOM_I/GEOM_ILocalOperations_i.hh | 3 +- src/GEOM_I/GEOM_IMeasureOperations_i.cc | 3 +- src/GEOM_I/GEOM_IMeasureOperations_i.hh | 3 +- src/GEOM_I/GEOM_IOperations_i.cc | 2 +- src/GEOM_I/GEOM_IOperations_i.hh | 2 +- src/GEOM_I/GEOM_IShapesOperations_i.cc | 2 +- src/GEOM_I/GEOM_IShapesOperations_i.hh | 2 +- src/GEOM_I/GEOM_ITransformOperations_i.cc | 3 +- src/GEOM_I/GEOM_ITransformOperations_i.hh | 3 +- src/GEOM_I/GEOM_Object_i.cc | 2 +- src/GEOM_I/GEOM_Object_i.hh | 2 +- src/GEOM_I/GEOM_wrap.hxx | 2 +- src/GEOM_I/Makefile.am | 2 +- src/GEOM_I_Superv/GEOM_I_Superv.hxx | 2 +- src/GEOM_I_Superv/GEOM_List_i.hh | 2 +- src/GEOM_I_Superv/GEOM_Superv_i.cc | 3 +- src/GEOM_I_Superv/GEOM_Superv_i.hh | 2 +- src/GEOM_I_Superv/Makefile.am | 2 +- src/GEOM_PY/Makefile.am | 2 +- src/GEOM_PY/__init__.py | 3 +- src/GEOM_PY/geomtools.py | 2 +- src/GEOM_PY/sketcher.py | 2 +- src/GEOM_PY/structelem/Makefile.am | 2 +- src/GEOM_PY/structelem/__init__.py | 2 +- src/GEOM_PY/structelem/orientation.py | 2 +- src/GEOM_PY/structelem/parts.py | 2 +- src/GEOM_SWIG/GEOM_Nut.py | 2 +- src/GEOM_SWIG/GEOM_ObjectInfo.py | 2 +- src/GEOM_SWIG/GEOM_Partition1.py | 2 +- src/GEOM_SWIG/GEOM_Partition2.py | 2 +- src/GEOM_SWIG/GEOM_Partition3.py | 2 +- src/GEOM_SWIG/GEOM_Partition4.py | 2 +- src/GEOM_SWIG/GEOM_Partition5.py | 2 +- src/GEOM_SWIG/GEOM_Sketcher.py | 2 +- src/GEOM_SWIG/GEOM_Spanner.py | 3 +- src/GEOM_SWIG/GEOM_TestAll.py | 3 +- src/GEOM_SWIG/GEOM_TestHealing.py | 3 +- src/GEOM_SWIG/GEOM_TestMeasures.py | 3 +- src/GEOM_SWIG/GEOM_TestOthers.py | 2 +- src/GEOM_SWIG/GEOM_blocks.py | 2 +- src/GEOM_SWIG/GEOM_cyl2complementary.py | 2 +- src/GEOM_SWIG/GEOM_example.py | 2 +- src/GEOM_SWIG/GEOM_example2.py | 2 +- src/GEOM_SWIG/GEOM_example3.py | 2 +- src/GEOM_SWIG/GEOM_example4.py | 2 +- src/GEOM_SWIG/GEOM_example5.py | 2 +- src/GEOM_SWIG/GEOM_example6.py | 2 +- src/GEOM_SWIG/GEOM_example7.py | 2 +- src/GEOM_SWIG/GEOM_moteur.py | 2 +- src/GEOM_SWIG/GEOM_shared_modules.py | 2 +- src/GEOM_SWIG/GEOM_shellSolid.py | 2 +- src/GEOM_SWIG/GEOM_tube_geom.py | 2 +- src/GEOM_SWIG/GEOM_tube_geom_gg2.py | 2 +- src/GEOM_SWIG/GEOM_usinggeom.py | 2 +- src/GEOM_SWIG/Makefile.am | 2 +- src/GEOM_SWIG/PAL_MESH_019_020_geometry.py | 2 +- src/GEOM_SWIG/PAL_MESH_028_geometry.py | 2 +- src/GEOM_SWIG/PAL_MESH_030_geometry.py | 2 +- src/GEOM_SWIG/PAL_MESH_033_geometry.py | 2 +- src/GEOM_SWIG/PAL_MESH_035_geometry.py | 2 +- src/GEOM_SWIG/batchmode_geompy.py | 2 +- src/GEOM_SWIG/geompy.py | 2 +- src/GEOM_SWIG/geompyDC.py | 2 +- src/GEOM_SWIG/gsketcher.py | 2 +- src/GEOM_SWIG_WITHIHM/Makefile.am | 2 +- src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx | 2 +- src/GEOM_SWIG_WITHIHM/libGEOM_Swig.h | 2 +- src/GEOM_SWIG_WITHIHM/libGEOM_Swig.i | 2 +- src/GenerationGUI/GenerationGUI.cxx | 3 +- src/GenerationGUI/GenerationGUI.h | 2 +- .../GenerationGUI_FillingDlg.cxx | 3 +- src/GenerationGUI/GenerationGUI_FillingDlg.h | 2 +- src/GenerationGUI/GenerationGUI_PipeDlg.cxx | 2 +- src/GenerationGUI/GenerationGUI_PipeDlg.h | 2 +- .../GenerationGUI_PipePathDlg.cxx | 3 +- src/GenerationGUI/GenerationGUI_PipePathDlg.h | 3 +- src/GenerationGUI/GenerationGUI_PrismDlg.cxx | 21 ++++++------ src/GenerationGUI/GenerationGUI_PrismDlg.h | 2 +- src/GenerationGUI/GenerationGUI_RevolDlg.cxx | 2 +- src/GenerationGUI/GenerationGUI_RevolDlg.h | 2 +- src/GenerationGUI/Makefile.am | 3 +- src/GroupGUI/GroupGUI.cxx | 3 +- src/GroupGUI/GroupGUI.h | 2 +- src/GroupGUI/GroupGUI_BooleanDlg.cxx | 3 +- src/GroupGUI/GroupGUI_BooleanDlg.h | 3 +- src/GroupGUI/GroupGUI_GroupDlg.cxx | 2 +- src/GroupGUI/GroupGUI_GroupDlg.h | 2 +- src/GroupGUI/Makefile.am | 3 +- src/IGESExport/IGESExport.cxx | 2 +- src/IGESExport/Makefile.am | 2 +- src/IGESImport/IGESImport.cxx | 2 +- src/IGESImport/Makefile.am | 2 +- src/Makefile.am | 3 +- src/Material/Makefile.am | 2 +- src/Material/Material.h | 2 +- src/Material/Material_Model.cxx | 2 +- src/Material/Material_Model.h | 2 +- src/Material/Material_ResourceMgr.cxx | 7 +++- src/Material/Material_ResourceMgr.h | 2 +- src/Material/resources/SalomeMaterial.xml | 23 ++++++++++++- src/MeasureGUI/Makefile.am | 3 +- src/MeasureGUI/MeasureGUI.cxx | 3 +- src/MeasureGUI/MeasureGUI.h | 2 +- src/MeasureGUI/MeasureGUI_AngleDlg.cxx | 2 +- src/MeasureGUI/MeasureGUI_AngleDlg.h | 2 +- src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx | 3 +- src/MeasureGUI/MeasureGUI_BndBoxDlg.h | 3 +- src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx | 2 +- src/MeasureGUI/MeasureGUI_CenterMassDlg.h | 2 +- .../MeasureGUI_CheckCompoundOfBlocksDlg.cxx | 2 +- .../MeasureGUI_CheckCompoundOfBlocksDlg.h | 2 +- .../MeasureGUI_CheckSelfIntersectionsDlg.cxx | 3 +- .../MeasureGUI_CheckSelfIntersectionsDlg.h | 2 +- src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx | 2 +- src/MeasureGUI/MeasureGUI_CheckShapeDlg.h | 2 +- src/MeasureGUI/MeasureGUI_DistanceDlg.cxx | 3 +- src/MeasureGUI/MeasureGUI_DistanceDlg.h | 3 +- src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.cxx | 3 +- src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.h | 3 +- src/MeasureGUI/MeasureGUI_InertiaDlg.cxx | 2 +- src/MeasureGUI/MeasureGUI_InertiaDlg.h | 2 +- src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx | 2 +- src/MeasureGUI/MeasureGUI_MaxToleranceDlg.h | 2 +- src/MeasureGUI/MeasureGUI_NormaleDlg.cxx | 2 +- src/MeasureGUI/MeasureGUI_NormaleDlg.h | 2 +- src/MeasureGUI/MeasureGUI_PointDlg.cxx | 2 +- src/MeasureGUI/MeasureGUI_PointDlg.h | 2 +- src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx | 2 +- src/MeasureGUI/MeasureGUI_PropertiesDlg.h | 2 +- src/MeasureGUI/MeasureGUI_Skeleton.cxx | 2 +- src/MeasureGUI/MeasureGUI_Skeleton.h | 2 +- src/MeasureGUI/MeasureGUI_WhatisDlg.cxx | 2 +- src/MeasureGUI/MeasureGUI_WhatisDlg.h | 2 +- src/MeasureGUI/MeasureGUI_Widgets.cxx | 3 +- src/MeasureGUI/MeasureGUI_Widgets.h | 3 +- src/NMTDS/Makefile.am | 3 +- src/NMTDS/NMTDS.cdl | 2 +- src/NMTDS/NMTDS_BndSphere.cxx | 2 +- src/NMTDS/NMTDS_BndSphere.hxx | 2 +- src/NMTDS/NMTDS_BndSphere.lxx | 2 +- src/NMTDS/NMTDS_BndSphereTree.cxx | 2 +- src/NMTDS/NMTDS_BndSphereTree.hxx | 2 +- src/NMTDS/NMTDS_BoxBndTree.cxx | 2 +- src/NMTDS/NMTDS_BoxBndTree.hxx | 2 +- src/NMTDS/NMTDS_CArray1OfIndexRange.cxx | 2 +- src/NMTDS/NMTDS_CArray1OfIndexRange.hxx | 2 +- ...IteratorOfDataMapOfIntegerMapOfInteger.hxx | 2 +- .../NMTDS_DataMapOfIntegerMapOfInteger.hxx | 2 +- src/NMTDS/NMTDS_IndexRange.cxx | 2 +- src/NMTDS/NMTDS_IndexRange.hxx | 2 +- .../NMTDS_IndexedDataMapOfIntegerShape.hxx | 2 +- .../NMTDS_IndexedDataMapOfShapeBndSphere.hxx | 2 +- src/NMTDS/NMTDS_IndexedDataMapOfShapeBox.hxx | 2 +- src/NMTDS/NMTDS_InterfPool.cxx | 2 +- src/NMTDS/NMTDS_InterfPool.hxx | 2 +- src/NMTDS/NMTDS_InterfType.hxx | 2 +- src/NMTDS/NMTDS_Iterator.cxx | 2 +- src/NMTDS/NMTDS_Iterator.hxx | 2 +- src/NMTDS/NMTDS_IteratorCheckerSI.cxx | 2 +- src/NMTDS/NMTDS_IteratorCheckerSI.hxx | 2 +- ...dexedDataMapOfShapeAncestorsSuccessors.hxx | 2 +- src/NMTDS/NMTDS_ListIteratorOfListOfPair.hxx | 2 +- .../NMTDS_ListIteratorOfListOfPairBoolean.hxx | 2 +- .../NMTDS_ListIteratorOfListOfPassKey.hxx | 2 +- ...TDS_ListIteratorOfListOfPassKeyBoolean.hxx | 2 +- ...dexedDataMapOfShapeAncestorsSuccessors.hxx | 2 +- src/NMTDS/NMTDS_ListOfPair.hxx | 2 +- src/NMTDS/NMTDS_ListOfPairBoolean.hxx | 2 +- src/NMTDS/NMTDS_ListOfPassKey.hxx | 2 +- src/NMTDS/NMTDS_ListOfPassKeyBoolean.hxx | 2 +- .../NMTDS_MapIteratorOfMapOfPairBoolean.hxx | 2 +- src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey.hxx | 2 +- ...NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx | 2 +- src/NMTDS/NMTDS_MapOfPairBoolean.hxx | 2 +- src/NMTDS/NMTDS_MapOfPassKey.hxx | 2 +- src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx | 2 +- src/NMTDS/NMTDS_PInterfPool.hxx | 2 +- src/NMTDS/NMTDS_PIterator.hxx | 2 +- src/NMTDS/NMTDS_PShapesDataStructure.hxx | 2 +- src/NMTDS/NMTDS_Pair.cxx | 2 +- src/NMTDS/NMTDS_Pair.hxx | 2 +- src/NMTDS/NMTDS_PairBoolean.cxx | 2 +- src/NMTDS/NMTDS_PairBoolean.hxx | 2 +- src/NMTDS/NMTDS_PairMapHasher.cxx | 2 +- src/NMTDS/NMTDS_PairMapHasher.hxx | 2 +- src/NMTDS/NMTDS_PassKey.cxx | 2 +- src/NMTDS/NMTDS_PassKey.hxx | 2 +- src/NMTDS/NMTDS_PassKeyBoolean.cxx | 2 +- src/NMTDS/NMTDS_PassKeyBoolean.hxx | 2 +- src/NMTDS/NMTDS_PassKeyMapHasher.cxx | 2 +- src/NMTDS/NMTDS_PassKeyMapHasher.hxx | 2 +- src/NMTDS/NMTDS_PassKeyShape.cxx | 2 +- src/NMTDS/NMTDS_PassKeyShape.hxx | 2 +- src/NMTDS/NMTDS_PassKeyShapeMapHasher.cxx | 2 +- src/NMTDS/NMTDS_PassKeyShapeMapHasher.hxx | 2 +- src/NMTDS/NMTDS_ShapesDataStructure.cxx | 2 +- src/NMTDS/NMTDS_ShapesDataStructure.hxx | 2 +- src/NMTDS/NMTDS_Tools.cxx | 2 +- src/NMTDS/NMTDS_Tools.hxx | 2 +- src/NMTTools/Makefile.am | 2 +- src/NMTTools/NMTTools.cdl | 2 +- src/NMTTools/NMTTools_CheckerSI.cxx | 2 +- src/NMTTools/NMTTools_CheckerSI.hxx | 2 +- src/NMTTools/NMTTools_CheckerSI_1.cxx | 2 +- src/NMTTools/NMTTools_CommonBlock.cxx | 2 +- src/NMTTools/NMTTools_CommonBlock.hxx | 2 +- src/NMTTools/NMTTools_CommonBlockAPI.cxx | 2 +- src/NMTTools/NMTTools_CommonBlockAPI.hxx | 2 +- src/NMTTools/NMTTools_CommonBlockPool.cxx | 2 +- src/NMTTools/NMTTools_CommonBlockPool.hxx | 2 +- src/NMTTools/NMTTools_CoupleOfShape.cxx | 2 +- src/NMTTools/NMTTools_CoupleOfShape.hxx | 2 +- src/NMTTools/NMTTools_DEProcessor.cxx | 2 +- src/NMTTools/NMTTools_DEProcessor.hxx | 2 +- ...aMapIteratorOfDataMapOfIntegerFaceInfo.hxx | 2 +- ...ratorOfDataMapOfIntegerListOfPaveBlock.hxx | 2 +- .../NMTTools_DataMapOfIntegerFaceInfo.hxx | 2 +- ...TTools_DataMapOfIntegerListOfPaveBlock.hxx | 2 +- src/NMTTools/NMTTools_FaceInfo.cxx | 2 +- src/NMTTools/NMTTools_FaceInfo.hxx | 2 +- src/NMTTools/NMTTools_FaceInfo.lxx | 2 +- ...ls_IndexedDataMapOfIndexedMapOfInteger.hxx | 2 +- ...IndexedDataMapOfShapeIndexedMapOfShape.hxx | 2 +- ...MTTools_IndexedDataMapOfShapePaveBlock.hxx | 2 +- ...TTools_ListIteratorOfListOfCommonBlock.hxx | 2 +- ...ools_ListIteratorOfListOfCoupleOfShape.hxx | 2 +- src/NMTTools/NMTTools_ListOfCommonBlock.hxx | 2 +- src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx | 2 +- .../NMTTools_MapIteratorOfMapOfPaveBlock.hxx | 2 +- src/NMTTools/NMTTools_MapOfPaveBlock.hxx | 2 +- src/NMTTools/NMTTools_PPaveFiller.hxx | 2 +- src/NMTTools/NMTTools_PaveFiller.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller.hxx | 2 +- src/NMTTools/NMTTools_PaveFiller_0.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller_1.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller_2.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller_3.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller_4.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller_5.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller_6.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller_7.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller_8.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller_9.cxx | 2 +- src/NMTTools/NMTTools_Tools.cxx | 2 +- src/NMTTools/NMTTools_Tools.hxx | 2 +- src/OBJECT/GEOM_AISShape.cxx | 2 +- src/OBJECT/GEOM_AISShape.hxx | 2 +- src/OBJECT/GEOM_AISShape.ixx | 2 +- src/OBJECT/GEOM_AISShape.jxx | 2 +- src/OBJECT/GEOM_AISTrihedron.cxx | 2 +- src/OBJECT/GEOM_AISTrihedron.hxx | 2 +- src/OBJECT/GEOM_AISVector.cxx | 2 +- src/OBJECT/GEOM_AISVector.hxx | 2 +- src/OBJECT/GEOM_Actor.cxx | 2 +- src/OBJECT/GEOM_Actor.h | 2 +- src/OBJECT/GEOM_Constants.cxx | 2 +- src/OBJECT/GEOM_Constants.h | 2 +- src/OBJECT/GEOM_DeviceActor.cxx | 2 +- src/OBJECT/GEOM_DeviceActor.h | 2 +- src/OBJECT/GEOM_InteractiveObject.cxx | 2 +- src/OBJECT/GEOM_InteractiveObject.hxx | 2 +- src/OBJECT/GEOM_InteractiveObject.ixx | 2 +- src/OBJECT/GEOM_InteractiveObject.jxx | 2 +- src/OBJECT/GEOM_OBJECT_defs.hxx | 2 +- src/OBJECT/GEOM_OCCReader.cxx | 2 +- src/OBJECT/GEOM_OCCReader.h | 2 +- src/OBJECT/GEOM_PainterPolyDataMapper.cxx | 2 +- src/OBJECT/GEOM_PainterPolyDataMapper.h | 2 +- src/OBJECT/GEOM_SmartPtr.h | 2 +- src/OBJECT/GEOM_TopWireframeShape.cxx | 2 +- src/OBJECT/GEOM_TopWireframeShape.hxx | 2 +- src/OBJECT/GEOM_TopWireframeShape.ixx | 2 +- src/OBJECT/GEOM_TopWireframeShape.jxx | 2 +- src/OBJECT/GEOM_VTKPropertyMaterial.cxx | 2 +- src/OBJECT/GEOM_VTKPropertyMaterial.hxx | 2 +- src/OBJECT/GEOM_VTKTrihedron.cxx | 2 +- src/OBJECT/GEOM_VTKTrihedron.hxx | 2 +- src/OBJECT/Handle_GEOM_AISShape.hxx | 2 +- src/OBJECT/Handle_GEOM_InteractiveObject.hxx | 2 +- src/OBJECT/Handle_GEOM_TopWireframeShape.hxx | 2 +- src/OBJECT/Makefile.am | 2 +- src/OCC2VTK/GEOM_EdgeSource.cxx | 2 +- src/OCC2VTK/GEOM_EdgeSource.h | 2 +- src/OCC2VTK/GEOM_FaceSource.cxx | 2 +- src/OCC2VTK/GEOM_FaceSource.h | 2 +- src/OCC2VTK/GEOM_ShadingFace.cxx | 2 +- src/OCC2VTK/GEOM_ShadingFace.h | 2 +- src/OCC2VTK/GEOM_VertexSource.cxx | 2 +- src/OCC2VTK/GEOM_VertexSource.h | 2 +- src/OCC2VTK/GEOM_WireframeFace.cxx | 2 +- src/OCC2VTK/GEOM_WireframeFace.h | 2 +- src/OCC2VTK/Makefile.am | 2 +- src/OCC2VTK/OCC2VTK.h | 2 +- src/OCC2VTK/OCC2VTK_Tools.cxx | 2 +- src/OCC2VTK/OCC2VTK_Tools.h | 2 +- src/OperationGUI/Makefile.am | 2 +- src/OperationGUI/OperationGUI.cxx | 2 +- src/OperationGUI/OperationGUI.h | 2 +- .../OperationGUI_ArchimedeDlg.cxx | 2 +- src/OperationGUI/OperationGUI_ArchimedeDlg.h | 2 +- src/OperationGUI/OperationGUI_ChamferDlg.cxx | 2 +- src/OperationGUI/OperationGUI_ChamferDlg.h | 2 +- src/OperationGUI/OperationGUI_ClippingDlg.cxx | 2 +- src/OperationGUI/OperationGUI_ClippingDlg.h | 2 +- .../OperationGUI_ExtrudedFeatureDlg.cxx | 2 +- .../OperationGUI_ExtrudedFeatureDlg.h | 2 +- .../OperationGUI_Fillet1d2dDlg.cxx | 3 +- src/OperationGUI/OperationGUI_Fillet1d2dDlg.h | 3 +- src/OperationGUI/OperationGUI_FilletDlg.cxx | 2 +- src/OperationGUI/OperationGUI_FilletDlg.h | 2 +- .../OperationGUI_GetShapesOnShapeDlg.cxx | 2 +- .../OperationGUI_GetShapesOnShapeDlg.h | 2 +- .../OperationGUI_GetSharedShapesDlg.cxx | 2 +- .../OperationGUI_GetSharedShapesDlg.h | 2 +- src/OperationGUI/OperationGUI_MaterialDlg.cxx | 2 +- src/OperationGUI/OperationGUI_MaterialDlg.h | 2 +- .../OperationGUI_PartitionDlg.cxx | 2 +- src/OperationGUI/OperationGUI_PartitionDlg.h | 2 +- src/PrimitiveGUI/Makefile.am | 2 +- src/PrimitiveGUI/PrimitiveGUI.cxx | 2 +- src/PrimitiveGUI/PrimitiveGUI.h | 2 +- src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx | 2 +- src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h | 2 +- src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx | 2 +- src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h | 2 +- src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx | 2 +- src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h | 2 +- src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx | 2 +- src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h | 2 +- src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx | 2 +- src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h | 2 +- src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx | 2 +- src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h | 2 +- src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx | 2 +- src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h | 2 +- src/RepairGUI/Makefile.am | 3 +- src/RepairGUI/RepairGUI.cxx | 2 +- src/RepairGUI/RepairGUI.h | 2 +- .../RepairGUI_ChangeOrientationDlg.cxx | 2 +- .../RepairGUI_ChangeOrientationDlg.h | 2 +- src/RepairGUI/RepairGUI_CloseContourDlg.cxx | 2 +- src/RepairGUI/RepairGUI_CloseContourDlg.h | 2 +- src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx | 2 +- src/RepairGUI/RepairGUI_DivideEdgeDlg.h | 2 +- src/RepairGUI/RepairGUI_FreeBoundDlg.cxx | 3 +- src/RepairGUI/RepairGUI_FreeBoundDlg.h | 3 +- src/RepairGUI/RepairGUI_FreeFacesDlg.cxx | 2 +- src/RepairGUI/RepairGUI_FreeFacesDlg.h | 2 +- src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx | 3 +- src/RepairGUI/RepairGUI_FuseEdgesDlg.h | 3 +- src/RepairGUI/RepairGUI_GlueDlg.cxx | 2 +- src/RepairGUI/RepairGUI_GlueDlg.h | 2 +- src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx | 2 +- src/RepairGUI/RepairGUI_LimitToleranceDlg.h | 2 +- .../RepairGUI_RemoveExtraEdgesDlg.cxx | 2 +- src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h | 2 +- src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx | 2 +- src/RepairGUI/RepairGUI_RemoveHolesDlg.h | 2 +- src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx | 2 +- src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h | 2 +- src/RepairGUI/RepairGUI_SewingDlg.cxx | 2 +- src/RepairGUI/RepairGUI_SewingDlg.h | 2 +- src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx | 2 +- src/RepairGUI/RepairGUI_ShapeProcessDlg.h | 2 +- src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx | 2 +- src/RepairGUI/RepairGUI_SuppressFacesDlg.h | 2 +- src/SKETCHER/Makefile.am | 2 +- src/SKETCHER/Sketcher_Profile.cxx | 2 +- src/SKETCHER/Sketcher_Profile.hxx | 2 +- src/STEPExport/Makefile.am | 2 +- src/STEPExport/STEPExport.cxx | 3 +- src/STEPImport/Makefile.am | 2 +- src/STEPImport/STEPImport.cxx | 3 +- src/STLExport/Makefile.am | 2 +- src/STLExport/STLExport.cxx | 2 +- src/ShHealOper/Makefile.am | 2 +- .../ShHealOper_ChangeOrientation.cxx | 2 +- .../ShHealOper_ChangeOrientation.hxx | 2 +- src/ShHealOper/ShHealOper_CloseContour.cxx | 2 +- src/ShHealOper/ShHealOper_CloseContour.hxx | 2 +- src/ShHealOper/ShHealOper_EdgeDivide.cxx | 2 +- src/ShHealOper/ShHealOper_EdgeDivide.hxx | 2 +- src/ShHealOper/ShHealOper_FillHoles.cxx | 2 +- src/ShHealOper/ShHealOper_FillHoles.hxx | 2 +- src/ShHealOper/ShHealOper_RemoveFace.cxx | 2 +- src/ShHealOper/ShHealOper_RemoveFace.hxx | 2 +- .../ShHealOper_RemoveInternalWires.cxx | 2 +- .../ShHealOper_RemoveInternalWires.hxx | 2 +- src/ShHealOper/ShHealOper_Sewing.cxx | 2 +- src/ShHealOper/ShHealOper_Sewing.hxx | 2 +- src/ShHealOper/ShHealOper_ShapeProcess.cxx | 2 +- src/ShHealOper/ShHealOper_ShapeProcess.hxx | 2 +- src/ShHealOper/ShHealOper_SpiltCurve2d.hxx | 2 +- src/ShHealOper/ShHealOper_SplitCurve2d.cxx | 2 +- src/ShHealOper/ShHealOper_SplitCurve2d.hxx | 2 +- src/ShHealOper/ShHealOper_SplitCurve3d.cxx | 2 +- src/ShHealOper/ShHealOper_SplitCurve3d.hxx | 2 +- src/ShHealOper/ShHealOper_Tool.cxx | 2 +- src/ShHealOper/ShHealOper_Tool.hxx | 2 +- src/ShapeRecognition/Makefile.am | 2 +- .../ShapeRec_FeatureDetector.cxx | 2 +- .../ShapeRec_FeatureDetector.hxx | 2 +- src/TransformationGUI/Makefile.am | 2 +- src/TransformationGUI/TransformationGUI.cxx | 2 +- src/TransformationGUI/TransformationGUI.h | 2 +- .../TransformationGUI_MirrorDlg.cxx | 2 +- .../TransformationGUI_MirrorDlg.h | 2 +- .../TransformationGUI_MultiRotationDlg.cxx | 2 +- .../TransformationGUI_MultiRotationDlg.h | 3 +- .../TransformationGUI_MultiTranslationDlg.cxx | 2 +- .../TransformationGUI_MultiTranslationDlg.h | 2 +- .../TransformationGUI_OffsetDlg.cxx | 2 +- .../TransformationGUI_OffsetDlg.h | 2 +- .../TransformationGUI_PositionDlg.cxx | 2 +- .../TransformationGUI_PositionDlg.h | 2 +- .../TransformationGUI_ProjectionDlg.cxx | 2 +- .../TransformationGUI_ProjectionDlg.h | 2 +- .../TransformationGUI_RotationDlg.cxx | 2 +- .../TransformationGUI_RotationDlg.h | 2 +- .../TransformationGUI_ScaleDlg.cxx | 2 +- .../TransformationGUI_ScaleDlg.h | 2 +- .../TransformationGUI_TranslationDlg.cxx | 2 +- .../TransformationGUI_TranslationDlg.h | 2 +- src/VTKExport/Makefile.am | 2 +- src/VTKExport/VTKExport.cxx | 2 +- 1023 files changed, 1463 insertions(+), 1160 deletions(-) diff --git a/GEOM_version.h.in b/GEOM_version.h.in index ce1af35af..9d6a2951c 100644 --- a/GEOM_version.h.in +++ b/GEOM_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/Makefile.am b/Makefile.am index 863140fa7..5f690493b 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/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/FindGEOM.cmake b/adm_local/cmake_files/FindGEOM.cmake index 6703e076a..217f94034 100644 --- a/adm_local/cmake_files/FindGEOM.cmake +++ b/adm_local/cmake_files/FindGEOM.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 3135a765d..7d044ddf7 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 7a5c9953e..2d5efa587 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_GEOM.m4 b/adm_local/unix/config_files/check_GEOM.m4 index eeb81bb79..9e94a9387 100644 --- a/adm_local/unix/config_files/check_GEOM.m4 +++ b/adm_local/unix/config_files/check_GEOM.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_GUI.m4 b/adm_local/unix/config_files/check_GUI.m4 index de8c71769..c235e88a7 100755 --- a/adm_local/unix/config_files/check_GUI.m4 +++ b/adm_local/unix/config_files/check_GUI.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 This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public diff --git a/adm_local/unix/config_files/check_OpenCV.m4 b/adm_local/unix/config_files/check_OpenCV.m4 index b70ddd91e..3d7351eeb 100644 --- a/adm_local/unix/config_files/check_OpenCV.m4 +++ b/adm_local/unix/config_files/check_OpenCV.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 This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index 4f70a7077..782d75ce3 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 @@ -58,6 +58,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 $@ @@ -76,7 +81,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 95a26d150..6883d1d92 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/addvars2notebook_GEOM.py b/bin/addvars2notebook_GEOM.py index 76bc4a012..b4ce04160 100644 --- a/bin/addvars2notebook_GEOM.py +++ b/bin/addvars2notebook_GEOM.py @@ -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/geom_setenv.py b/bin/geom_setenv.py index dfe3ecab1..4d3702913 100644 --- a/bin/geom_setenv.py +++ b/bin/geom_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 7acc570e5..af371a6fc 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 6b14a8ade..c28ffbaef 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 dca23c575..6f895b447 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 6fc5b4f83..189307676 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 841ff86fc..f735ef2df 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 8f3319cec..0cf99ebd0 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 a1dd57ced..e2c50f2a3 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 18bd13960..f60548c1f 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 1e4a02716..5fe690c65 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) 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/Makefile.am b/doc/salome/examples/Makefile.am index e7137ed7e..506afc7af 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/examples/testme.py b/doc/salome/examples/testme.py index f6c5e7837..17122a3f8 100755 --- a/doc/salome/examples/testme.py +++ b/doc/salome/examples/testme.py @@ -1,3 +1,22 @@ +# 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 +# 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 +# + #!/usr/bin/env python import unittest, sys, os diff --git a/doc/salome/gui/GEOM/Makefile.am b/doc/salome/gui/GEOM/Makefile.am index 3b96e0abd..4f3011e40 100755 --- a/doc/salome/gui/GEOM/Makefile.am +++ b/doc/salome/gui/GEOM/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/GEOM/doxyfile.in b/doc/salome/gui/GEOM/doxyfile.in index 35639edb0..708dea17f 100755 --- a/doc/salome/gui/GEOM/doxyfile.in +++ b/doc/salome/gui/GEOM/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/GEOM/doxyfile_py.in b/doc/salome/gui/GEOM/doxyfile_py.in index bd50daa50..6da7b1512 100755 --- a/doc/salome/gui/GEOM/doxyfile_py.in +++ b/doc/salome/gui/GEOM/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/GEOM/doxyfile_tui.in b/doc/salome/gui/GEOM/doxyfile_tui.in index 516f87b16..5ccde0142 100755 --- a/doc/salome/gui/GEOM/doxyfile_tui.in +++ b/doc/salome/gui/GEOM/doxyfile_tui.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/GEOM/images/extrusion1.png b/doc/salome/gui/GEOM/images/extrusion1.png index 1d3bc40daf45d70fa8596da53085739a79883aed..467d812767743b260f972465797e4d3e4acfc4b2 100755 GIT binary patch literal 29496 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 literal 36871 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 literal 36061 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 WP$h*s>mdsMDJiJQzn8rq{Qm%62YrSB diff --git a/doc/salome/gui/GEOM/images/extrusion3.png b/doc/salome/gui/GEOM/images/extrusion3.png index 47cd7226071422cc9a50cd21cb117391e53c062a..a462de17da156daeec7c950e256770fae8e89db8 100644 GIT binary patch literal 29331 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�P?!4Vxy{u7 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 L3Z_uT@Y(+WR}}#v literal 36985 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 diff --git a/doc/salome/gui/GEOM/input/creating_extrusion.doc b/doc/salome/gui/GEOM/input/creating_extrusion.doc index 104b7a286..81384e7ba 100644 --- a/doc/salome/gui/GEOM/input/creating_extrusion.doc +++ b/doc/salome/gui/GEOM/input/creating_extrusion.doc @@ -5,6 +5,14 @@ \n To generate an \b Extrusion on an object in the Main Menu select New Entity - > Generation - > Extrusion +Examples: + +\image html prisms_basessn.png +Base Shape + +\image html prismssn.png +Prisms + \n There are 3 algorithms for creation of an \b Extrusion (Prism). \n The \b Result of the operation will be a GEOM_Object (edge, face, shell solid or compsolid). @@ -56,13 +64,20 @@ the opposite base). \image html extrusion3.png -Examples: + Add thickness -\image html prisms_basessn.png -
Base Shape
+\n For all three ways of creation of a prism it is possible to add a thickness +to the created prism (only when extruding an edge or wire). -\image html prismssn.png -
Prisms
+\image html prism_with_thickness.png + +You can choose the \b Thickness and the direction of the thickening. By default the material is added on +the outside of the generated pipe. + +\image html extrusion4.png + +\n TUI Command: geompy.Thicken(Shape, Thickness) +\n Arguments: A shape (shell or face only) and a thickness Our TUI Scripts provide you with useful examples of creation of \ref tui_creation_prism "Complex Geometric Objects". diff --git a/doc/salome/gui/GEOM/static/footer.html b/doc/salome/gui/GEOM/static/footer.html index 4c89a2ba1..f89cfbbec 100755 --- a/doc/salome/gui/GEOM/static/footer.html +++ b/doc/salome/gui/GEOM/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/gui/Makefile.am b/doc/salome/gui/Makefile.am index fff0e9b64..83135c395 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/tui/Makefile.am b/doc/salome/tui/Makefile.am index bf44e17b2..0a1e65736 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 8b7feba7a..daed3873d 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 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/GEOM_Gen.idl b/idl/GEOM_Gen.idl index 1e3a7c076..b3b95cedb 100644 --- a/idl/GEOM_Gen.idl +++ b/idl/GEOM_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/GEOM_Superv.idl b/idl/GEOM_Superv.idl index 36c204b1d..b7cf4f735 100644 --- a/idl/GEOM_Superv.idl +++ b/idl/GEOM_Superv.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/Makefile.am b/idl/Makefile.am index 170e93658..e41fed90f 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/resources/GEOMCatalog.xml.in b/resources/GEOMCatalog.xml.in index e4c33f0de..6e13a9fe4 100644 --- a/resources/GEOMCatalog.xml.in +++ b/resources/GEOMCatalog.xml.in @@ -1,6 +1,6 @@ - - - + + + - + - + - + - - - + + + - - + + diff --git a/src/ARCHIMEDE/Archimede_VolumeSection.cxx b/src/ARCHIMEDE/Archimede_VolumeSection.cxx index 2d62cdc5e..93bcf329e 100644 --- a/src/ARCHIMEDE/Archimede_VolumeSection.cxx +++ b/src/ARCHIMEDE/Archimede_VolumeSection.cxx @@ -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/src/ARCHIMEDE/Archimede_VolumeSection.hxx b/src/ARCHIMEDE/Archimede_VolumeSection.hxx index 158a26d15..1b65af5da 100644 --- a/src/ARCHIMEDE/Archimede_VolumeSection.hxx +++ b/src/ARCHIMEDE/Archimede_VolumeSection.hxx @@ -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/src/ARCHIMEDE/Makefile.am b/src/ARCHIMEDE/Makefile.am index 35fcf539d..1400fb9b5 100644 --- a/src/ARCHIMEDE/Makefile.am +++ b/src/ARCHIMEDE/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/src/AdvancedGUI/AdvancedGUI.cxx b/src/AdvancedGUI/AdvancedGUI.cxx index 2c478e469..e56434e83 100644 --- a/src/AdvancedGUI/AdvancedGUI.cxx +++ b/src/AdvancedGUI/AdvancedGUI.cxx @@ -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/src/AdvancedGUI/AdvancedGUI.h b/src/AdvancedGUI/AdvancedGUI.h index 710bb39ff..2ee00afc9 100644 --- a/src/AdvancedGUI/AdvancedGUI.h +++ b/src/AdvancedGUI/AdvancedGUI.h @@ -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/src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.cxx b/src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.cxx index 1d6d55edb..e87bf882a 100644 --- a/src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.cxx +++ b/src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.cxx @@ -1,23 +1,24 @@ -// Copyright (C) 2007-2008 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 +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. +// This library is 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. +// 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 +// 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 // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "AdvancedGUI_DividedCylinderDlg.h" diff --git a/src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.h b/src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.h index 6cbf0363e..694fd114a 100644 --- a/src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.h +++ b/src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.h @@ -1,23 +1,24 @@ -// Copyright (C) 2007-2008 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 +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. +// This library is 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. +// 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 +// 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 // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef ADVANCEDGUI_DIVIDEDCYLINDERDLG_H #define ADVANCEDGUI_DIVIDEDCYLINDERDLG_H diff --git a/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.cxx b/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.cxx index 85a4d099d..ecf1f1325 100644 --- a/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.cxx +++ b/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.cxx @@ -1,23 +1,24 @@ -// Copyright (C) 2007-2008 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 +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. +// This library is 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. +// 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 +// 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 // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "AdvancedGUI_DividedDiskDlg.h" diff --git a/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.h b/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.h index 6e1ceb599..9dff567ae 100644 --- a/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.h +++ b/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.h @@ -1,23 +1,24 @@ -// Copyright (C) 2007-2008 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 +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. +// This library is 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. +// 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 +// 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 // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef ADVANCEDGUI_DIVIDEDDISKDLG_H #define ADVANCEDGUI_DIVIDEDDISKDLG_H diff --git a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx index 3c2ede934..7b010f484 100644 --- a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx +++ b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx @@ -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 @@ -15,6 +15,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include "AdvancedGUI_PipeTShapeDlg.h" diff --git a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.h b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.h index 670c2f9d0..1308f04c0 100644 --- a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.h +++ b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.h @@ -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 @@ -15,6 +15,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef ADVANCEDGUI_PIPETSHAPEDLG_H #define ADVANCEDGUI_PIPETSHAPEDLG_H diff --git a/src/AdvancedGUI/Makefile.am b/src/AdvancedGUI/Makefile.am index 9301bd4ca..d12fece0c 100644 --- a/src/AdvancedGUI/Makefile.am +++ b/src/AdvancedGUI/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/src/BREPExport/BREPExport.cxx b/src/BREPExport/BREPExport.cxx index 7bd879a3a..96d84c0b4 100644 --- a/src/BREPExport/BREPExport.cxx +++ b/src/BREPExport/BREPExport.cxx @@ -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/src/BREPExport/Makefile.am b/src/BREPExport/Makefile.am index 675fe466e..14c49dfab 100644 --- a/src/BREPExport/Makefile.am +++ b/src/BREPExport/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/src/BREPImport/BREPImport.cxx b/src/BREPImport/BREPImport.cxx index 287564270..7064f3c13 100644 --- a/src/BREPImport/BREPImport.cxx +++ b/src/BREPImport/BREPImport.cxx @@ -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/src/BREPImport/Makefile.am b/src/BREPImport/Makefile.am index 083bc7dc0..c3349b39a 100644 --- a/src/BREPImport/Makefile.am +++ b/src/BREPImport/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/src/BasicGUI/BasicGUI.cxx b/src/BasicGUI/BasicGUI.cxx index 10ae19e27..e40b013bf 100644 --- a/src/BasicGUI/BasicGUI.cxx +++ b/src/BasicGUI/BasicGUI.cxx @@ -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/src/BasicGUI/BasicGUI.h b/src/BasicGUI/BasicGUI.h index 203eb3599..aa4efc994 100644 --- a/src/BasicGUI/BasicGUI.h +++ b/src/BasicGUI/BasicGUI.h @@ -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/src/BasicGUI/BasicGUI_ArcDlg.cxx b/src/BasicGUI/BasicGUI_ArcDlg.cxx index abbcc3910..ae3a4fac9 100644 --- a/src/BasicGUI/BasicGUI_ArcDlg.cxx +++ b/src/BasicGUI/BasicGUI_ArcDlg.cxx @@ -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/src/BasicGUI/BasicGUI_ArcDlg.h b/src/BasicGUI/BasicGUI_ArcDlg.h index 31ab4d73d..aca64f545 100644 --- a/src/BasicGUI/BasicGUI_ArcDlg.h +++ b/src/BasicGUI/BasicGUI_ArcDlg.h @@ -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/src/BasicGUI/BasicGUI_CircleDlg.cxx b/src/BasicGUI/BasicGUI_CircleDlg.cxx index 90488fa74..a89e4ee5b 100644 --- a/src/BasicGUI/BasicGUI_CircleDlg.cxx +++ b/src/BasicGUI/BasicGUI_CircleDlg.cxx @@ -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/src/BasicGUI/BasicGUI_CircleDlg.h b/src/BasicGUI/BasicGUI_CircleDlg.h index 3e0f3e58d..9621c7640 100644 --- a/src/BasicGUI/BasicGUI_CircleDlg.h +++ b/src/BasicGUI/BasicGUI_CircleDlg.h @@ -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/src/BasicGUI/BasicGUI_CurveDlg.cxx b/src/BasicGUI/BasicGUI_CurveDlg.cxx index 14b23a858..4cd535b4d 100644 --- a/src/BasicGUI/BasicGUI_CurveDlg.cxx +++ b/src/BasicGUI/BasicGUI_CurveDlg.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // GEOM GEOMGUI : GUI for Geometry component // File : BasicGUI_CurveDlg.cxx diff --git a/src/BasicGUI/BasicGUI_CurveDlg.h b/src/BasicGUI/BasicGUI_CurveDlg.h index 8d6751b5e..735b136eb 100644 --- a/src/BasicGUI/BasicGUI_CurveDlg.h +++ b/src/BasicGUI/BasicGUI_CurveDlg.h @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // GEOM GEOMGUI : GUI for Geometry component // File : BasicGUI_CurveDlg.h diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.cxx b/src/BasicGUI/BasicGUI_EllipseDlg.cxx index b480b74b6..39ec531fe 100644 --- a/src/BasicGUI/BasicGUI_EllipseDlg.cxx +++ b/src/BasicGUI/BasicGUI_EllipseDlg.cxx @@ -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/src/BasicGUI/BasicGUI_EllipseDlg.h b/src/BasicGUI/BasicGUI_EllipseDlg.h index 303cc5348..48dc687bc 100644 --- a/src/BasicGUI/BasicGUI_EllipseDlg.h +++ b/src/BasicGUI/BasicGUI_EllipseDlg.h @@ -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/src/BasicGUI/BasicGUI_LineDlg.cxx b/src/BasicGUI/BasicGUI_LineDlg.cxx index 42895f074..6afb9bdd4 100644 --- a/src/BasicGUI/BasicGUI_LineDlg.cxx +++ b/src/BasicGUI/BasicGUI_LineDlg.cxx @@ -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/src/BasicGUI/BasicGUI_LineDlg.h b/src/BasicGUI/BasicGUI_LineDlg.h index 5de775ed8..257be9414 100644 --- a/src/BasicGUI/BasicGUI_LineDlg.h +++ b/src/BasicGUI/BasicGUI_LineDlg.h @@ -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/src/BasicGUI/BasicGUI_MarkerDlg.cxx b/src/BasicGUI/BasicGUI_MarkerDlg.cxx index 98c22720a..bf010fcf8 100644 --- a/src/BasicGUI/BasicGUI_MarkerDlg.cxx +++ b/src/BasicGUI/BasicGUI_MarkerDlg.cxx @@ -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/src/BasicGUI/BasicGUI_MarkerDlg.h b/src/BasicGUI/BasicGUI_MarkerDlg.h index 9219db234..1b9e0d266 100644 --- a/src/BasicGUI/BasicGUI_MarkerDlg.h +++ b/src/BasicGUI/BasicGUI_MarkerDlg.h @@ -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/src/BasicGUI/BasicGUI_ParamCurveWidget.cxx b/src/BasicGUI/BasicGUI_ParamCurveWidget.cxx index ecdbd3467..655ce8ddc 100644 --- a/src/BasicGUI/BasicGUI_ParamCurveWidget.cxx +++ b/src/BasicGUI/BasicGUI_ParamCurveWidget.cxx @@ -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/src/BasicGUI/BasicGUI_ParamCurveWidget.h b/src/BasicGUI/BasicGUI_ParamCurveWidget.h index c941be550..5ab7ff71b 100644 --- a/src/BasicGUI/BasicGUI_ParamCurveWidget.h +++ b/src/BasicGUI/BasicGUI_ParamCurveWidget.h @@ -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/src/BasicGUI/BasicGUI_PlaneDlg.cxx b/src/BasicGUI/BasicGUI_PlaneDlg.cxx index ec6f72235..deb308e03 100644 --- a/src/BasicGUI/BasicGUI_PlaneDlg.cxx +++ b/src/BasicGUI/BasicGUI_PlaneDlg.cxx @@ -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/src/BasicGUI/BasicGUI_PlaneDlg.h b/src/BasicGUI/BasicGUI_PlaneDlg.h index 602dbdaec..a8053776b 100644 --- a/src/BasicGUI/BasicGUI_PlaneDlg.h +++ b/src/BasicGUI/BasicGUI_PlaneDlg.h @@ -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/src/BasicGUI/BasicGUI_PointDlg.cxx b/src/BasicGUI/BasicGUI_PointDlg.cxx index 48682704b..bee8d70eb 100644 --- a/src/BasicGUI/BasicGUI_PointDlg.cxx +++ b/src/BasicGUI/BasicGUI_PointDlg.cxx @@ -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/src/BasicGUI/BasicGUI_PointDlg.h b/src/BasicGUI/BasicGUI_PointDlg.h index 092a491b7..b733aa611 100644 --- a/src/BasicGUI/BasicGUI_PointDlg.h +++ b/src/BasicGUI/BasicGUI_PointDlg.h @@ -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/src/BasicGUI/BasicGUI_VectorDlg.cxx b/src/BasicGUI/BasicGUI_VectorDlg.cxx index 847e06c16..cedeebcc7 100644 --- a/src/BasicGUI/BasicGUI_VectorDlg.cxx +++ b/src/BasicGUI/BasicGUI_VectorDlg.cxx @@ -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/src/BasicGUI/BasicGUI_VectorDlg.h b/src/BasicGUI/BasicGUI_VectorDlg.h index 0b60c6346..a16c9bc54 100644 --- a/src/BasicGUI/BasicGUI_VectorDlg.h +++ b/src/BasicGUI/BasicGUI_VectorDlg.h @@ -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/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx index 7ea8228af..ed3ac2759 100644 --- a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx +++ b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx @@ -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/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h index bc43c0151..adb0a3440 100644 --- a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h +++ b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h @@ -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/src/BasicGUI/Makefile.am b/src/BasicGUI/Makefile.am index 8c008f59f..1d680c9e2 100644 --- a/src/BasicGUI/Makefile.am +++ b/src/BasicGUI/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/src/BlockFix/BlockFix.cxx b/src/BlockFix/BlockFix.cxx index 0e4f9bb21..1479148d9 100644 --- a/src/BlockFix/BlockFix.cxx +++ b/src/BlockFix/BlockFix.cxx @@ -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 @@ -18,6 +18,7 @@ // 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: BlockFix.cxx // Created: Tue Dec 7 11:59:05 2004 diff --git a/src/BlockFix/BlockFix.hxx b/src/BlockFix/BlockFix.hxx index 70d37df65..5d914a82c 100644 --- a/src/BlockFix/BlockFix.hxx +++ b/src/BlockFix/BlockFix.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _BlockFix_HeaderFile #define _BlockFix_HeaderFile diff --git a/src/BlockFix/BlockFix_BlockFixAPI.cxx b/src/BlockFix/BlockFix_BlockFixAPI.cxx index 376632b4f..9c725b903 100644 --- a/src/BlockFix/BlockFix_BlockFixAPI.cxx +++ b/src/BlockFix/BlockFix_BlockFixAPI.cxx @@ -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 @@ -18,6 +18,7 @@ // 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: BlockFix_BlockFixAPI.cxx // Created: Tue Dec 7 11:59:05 2004 diff --git a/src/BlockFix/BlockFix_BlockFixAPI.hxx b/src/BlockFix/BlockFix_BlockFixAPI.hxx index 84140aff5..9dd100a53 100644 --- a/src/BlockFix/BlockFix_BlockFixAPI.hxx +++ b/src/BlockFix/BlockFix_BlockFixAPI.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _BlockFix_BlockFixAPI_HeaderFile #define _BlockFix_BlockFixAPI_HeaderFile diff --git a/src/BlockFix/BlockFix_CheckTool.cxx b/src/BlockFix/BlockFix_CheckTool.cxx index ba1c5c6af..dccb0784c 100644 --- a/src/BlockFix/BlockFix_CheckTool.cxx +++ b/src/BlockFix/BlockFix_CheckTool.cxx @@ -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 @@ -18,6 +18,7 @@ // 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: BlockFix_CheckTool.cxx // Created: 17.12.04 11:15:25 diff --git a/src/BlockFix/BlockFix_CheckTool.hxx b/src/BlockFix/BlockFix_CheckTool.hxx index 9378b25d1..f91e88b0b 100644 --- a/src/BlockFix/BlockFix_CheckTool.hxx +++ b/src/BlockFix/BlockFix_CheckTool.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _BlockFix_CheckTool_HeaderFile #define _BlockFix_CheckTool_HeaderFile diff --git a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx index 3894c353f..3f736e3d9 100644 --- a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx +++ b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx @@ -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 @@ -18,6 +18,7 @@ // 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: BlockFix_PeriodicSurfaceModifier.cxx // Created: 15.12.04 10:08:50 diff --git a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.hxx b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.hxx index 0223b25e2..467bf6c50 100644 --- a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.hxx +++ b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _BlockFix_PeriodicSurfaceModifier_HeaderFile #define _BlockFix_PeriodicSurfaceModifier_HeaderFile diff --git a/src/BlockFix/BlockFix_SphereSpaceModifier.cxx b/src/BlockFix/BlockFix_SphereSpaceModifier.cxx index 4a984cd45..3d50660bd 100644 --- a/src/BlockFix/BlockFix_SphereSpaceModifier.cxx +++ b/src/BlockFix/BlockFix_SphereSpaceModifier.cxx @@ -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 @@ -18,6 +18,7 @@ // 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: BlockFix.cxx // Created: Tue Dec 7 11:59:05 2004 diff --git a/src/BlockFix/BlockFix_SphereSpaceModifier.hxx b/src/BlockFix/BlockFix_SphereSpaceModifier.hxx index fa620b4e3..0c46af150 100644 --- a/src/BlockFix/BlockFix_SphereSpaceModifier.hxx +++ b/src/BlockFix/BlockFix_SphereSpaceModifier.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _BlockFix_SphereSpaceModifier_HeaderFile #define _BlockFix_SphereSpaceModifier_HeaderFile diff --git a/src/BlockFix/BlockFix_UnionEdges.cxx b/src/BlockFix/BlockFix_UnionEdges.cxx index 531d30a5a..bd99ab2b1 100644 --- a/src/BlockFix/BlockFix_UnionEdges.cxx +++ b/src/BlockFix/BlockFix_UnionEdges.cxx @@ -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 @@ -18,6 +18,7 @@ // 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: BlockFix_UnionEdges.cxx // Created: 07.12.04 15:27:30 diff --git a/src/BlockFix/BlockFix_UnionEdges.hxx b/src/BlockFix/BlockFix_UnionEdges.hxx index b63f5c7e2..9142f44d8 100644 --- a/src/BlockFix/BlockFix_UnionEdges.hxx +++ b/src/BlockFix/BlockFix_UnionEdges.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _BlockFix_UnionEdges_HeaderFile #define _BlockFix_UnionEdges_HeaderFile diff --git a/src/BlockFix/BlockFix_UnionFaces.cxx b/src/BlockFix/BlockFix_UnionFaces.cxx index aae28cab6..962a776ec 100644 --- a/src/BlockFix/BlockFix_UnionFaces.cxx +++ b/src/BlockFix/BlockFix_UnionFaces.cxx @@ -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 @@ -18,6 +18,7 @@ // 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: BlockFix_UnionFaces.cxx // Created: Tue Dec 7 17:15:42 2004 diff --git a/src/BlockFix/BlockFix_UnionFaces.hxx b/src/BlockFix/BlockFix_UnionFaces.hxx index 83140b08b..bb167b69a 100644 --- a/src/BlockFix/BlockFix_UnionFaces.hxx +++ b/src/BlockFix/BlockFix_UnionFaces.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _BlockFix_UnionFaces_HeaderFile #define _BlockFix_UnionFaces_HeaderFile diff --git a/src/BlockFix/Makefile.am b/src/BlockFix/Makefile.am index a3b37223d..16ecd1fc1 100644 --- a/src/BlockFix/Makefile.am +++ b/src/BlockFix/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 @@ -15,6 +15,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# # GEOM BlockFix : tools for Blocks algorithms # File : Makefile.am diff --git a/src/BlocksGUI/BlocksGUI.cxx b/src/BlocksGUI/BlocksGUI.cxx index 0722f01f5..1194a7b82 100644 --- a/src/BlocksGUI/BlocksGUI.cxx +++ b/src/BlocksGUI/BlocksGUI.cxx @@ -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/src/BlocksGUI/BlocksGUI.h b/src/BlocksGUI/BlocksGUI.h index 200268590..118bbdccf 100644 --- a/src/BlocksGUI/BlocksGUI.h +++ b/src/BlocksGUI/BlocksGUI.h @@ -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/src/BlocksGUI/BlocksGUI_BlockDlg.cxx b/src/BlocksGUI/BlocksGUI_BlockDlg.cxx index 8c74aa391..96e24133d 100644 --- a/src/BlocksGUI/BlocksGUI_BlockDlg.cxx +++ b/src/BlocksGUI/BlocksGUI_BlockDlg.cxx @@ -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/src/BlocksGUI/BlocksGUI_BlockDlg.h b/src/BlocksGUI/BlocksGUI_BlockDlg.h index 035894f28..352ffec68 100644 --- a/src/BlocksGUI/BlocksGUI_BlockDlg.h +++ b/src/BlocksGUI/BlocksGUI_BlockDlg.h @@ -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/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx b/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx index c50811b82..e8e79234b 100644 --- a/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx +++ b/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx @@ -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/src/BlocksGUI/BlocksGUI_ExplodeDlg.h b/src/BlocksGUI/BlocksGUI_ExplodeDlg.h index 1f396ccc5..9b97b73ad 100644 --- a/src/BlocksGUI/BlocksGUI_ExplodeDlg.h +++ b/src/BlocksGUI/BlocksGUI_ExplodeDlg.h @@ -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/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx b/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx index 6b07b7afb..5609c5b85 100644 --- a/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx +++ b/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx @@ -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/src/BlocksGUI/BlocksGUI_PropagateDlg.h b/src/BlocksGUI/BlocksGUI_PropagateDlg.h index 72d9cd64a..79b8b29b3 100644 --- a/src/BlocksGUI/BlocksGUI_PropagateDlg.h +++ b/src/BlocksGUI/BlocksGUI_PropagateDlg.h @@ -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/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx index e78e01111..7e027bbdc 100644 --- a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx +++ b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx @@ -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/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h index 0375551df..44b63aa5d 100644 --- a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h +++ b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h @@ -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/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx b/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx index 9ba4e363d..7fffa0b63 100644 --- a/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx +++ b/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx @@ -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/src/BlocksGUI/BlocksGUI_TrsfDlg.h b/src/BlocksGUI/BlocksGUI_TrsfDlg.h index 605b2a07e..0f4e2133b 100644 --- a/src/BlocksGUI/BlocksGUI_TrsfDlg.h +++ b/src/BlocksGUI/BlocksGUI_TrsfDlg.h @@ -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/src/BlocksGUI/Makefile.am b/src/BlocksGUI/Makefile.am index 864a6c8b9..381217f31 100644 --- a/src/BlocksGUI/Makefile.am +++ b/src/BlocksGUI/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/src/BooleanGUI/BooleanGUI.cxx b/src/BooleanGUI/BooleanGUI.cxx index 5db2a56a9..2185a4f92 100644 --- a/src/BooleanGUI/BooleanGUI.cxx +++ b/src/BooleanGUI/BooleanGUI.cxx @@ -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/src/BooleanGUI/BooleanGUI.h b/src/BooleanGUI/BooleanGUI.h index 4bd9f53bf..0052b7f58 100644 --- a/src/BooleanGUI/BooleanGUI.h +++ b/src/BooleanGUI/BooleanGUI.h @@ -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/src/BooleanGUI/BooleanGUI_Dialog.cxx b/src/BooleanGUI/BooleanGUI_Dialog.cxx index 94143574e..1ee191665 100644 --- a/src/BooleanGUI/BooleanGUI_Dialog.cxx +++ b/src/BooleanGUI/BooleanGUI_Dialog.cxx @@ -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/src/BooleanGUI/BooleanGUI_Dialog.h b/src/BooleanGUI/BooleanGUI_Dialog.h index d51d4250e..4601cc97d 100644 --- a/src/BooleanGUI/BooleanGUI_Dialog.h +++ b/src/BooleanGUI/BooleanGUI_Dialog.h @@ -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/src/BooleanGUI/Makefile.am b/src/BooleanGUI/Makefile.am index 45ffc15e5..91f11a877 100644 --- a/src/BooleanGUI/Makefile.am +++ b/src/BooleanGUI/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/src/BuildGUI/BuildGUI.cxx b/src/BuildGUI/BuildGUI.cxx index 9964b2428..c0ef24d6c 100644 --- a/src/BuildGUI/BuildGUI.cxx +++ b/src/BuildGUI/BuildGUI.cxx @@ -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/src/BuildGUI/BuildGUI.h b/src/BuildGUI/BuildGUI.h index 5cbaaf3b1..214f73206 100644 --- a/src/BuildGUI/BuildGUI.h +++ b/src/BuildGUI/BuildGUI.h @@ -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/src/BuildGUI/BuildGUI_CompoundDlg.cxx b/src/BuildGUI/BuildGUI_CompoundDlg.cxx index b604e63c1..848afd845 100644 --- a/src/BuildGUI/BuildGUI_CompoundDlg.cxx +++ b/src/BuildGUI/BuildGUI_CompoundDlg.cxx @@ -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/src/BuildGUI/BuildGUI_CompoundDlg.h b/src/BuildGUI/BuildGUI_CompoundDlg.h index 8ab58a83f..d237974aa 100644 --- a/src/BuildGUI/BuildGUI_CompoundDlg.h +++ b/src/BuildGUI/BuildGUI_CompoundDlg.h @@ -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/src/BuildGUI/BuildGUI_EdgeDlg.cxx b/src/BuildGUI/BuildGUI_EdgeDlg.cxx index 7f596761b..6c6a3d649 100644 --- a/src/BuildGUI/BuildGUI_EdgeDlg.cxx +++ b/src/BuildGUI/BuildGUI_EdgeDlg.cxx @@ -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/src/BuildGUI/BuildGUI_EdgeDlg.h b/src/BuildGUI/BuildGUI_EdgeDlg.h index c0f955079..f907eae0b 100644 --- a/src/BuildGUI/BuildGUI_EdgeDlg.h +++ b/src/BuildGUI/BuildGUI_EdgeDlg.h @@ -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/src/BuildGUI/BuildGUI_FaceDlg.cxx b/src/BuildGUI/BuildGUI_FaceDlg.cxx index 72bf40bbf..9d33eccb6 100644 --- a/src/BuildGUI/BuildGUI_FaceDlg.cxx +++ b/src/BuildGUI/BuildGUI_FaceDlg.cxx @@ -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/src/BuildGUI/BuildGUI_FaceDlg.h b/src/BuildGUI/BuildGUI_FaceDlg.h index f0ca76acd..d9efcae12 100644 --- a/src/BuildGUI/BuildGUI_FaceDlg.h +++ b/src/BuildGUI/BuildGUI_FaceDlg.h @@ -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/src/BuildGUI/BuildGUI_ShellDlg.cxx b/src/BuildGUI/BuildGUI_ShellDlg.cxx index 6555f45b9..e4b12199c 100644 --- a/src/BuildGUI/BuildGUI_ShellDlg.cxx +++ b/src/BuildGUI/BuildGUI_ShellDlg.cxx @@ -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/src/BuildGUI/BuildGUI_ShellDlg.h b/src/BuildGUI/BuildGUI_ShellDlg.h index e7814d38e..ed963ee09 100644 --- a/src/BuildGUI/BuildGUI_ShellDlg.h +++ b/src/BuildGUI/BuildGUI_ShellDlg.h @@ -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/src/BuildGUI/BuildGUI_SolidDlg.cxx b/src/BuildGUI/BuildGUI_SolidDlg.cxx index e8f4f63fc..168ade461 100644 --- a/src/BuildGUI/BuildGUI_SolidDlg.cxx +++ b/src/BuildGUI/BuildGUI_SolidDlg.cxx @@ -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/src/BuildGUI/BuildGUI_SolidDlg.h b/src/BuildGUI/BuildGUI_SolidDlg.h index dda578c38..db8678041 100644 --- a/src/BuildGUI/BuildGUI_SolidDlg.h +++ b/src/BuildGUI/BuildGUI_SolidDlg.h @@ -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/src/BuildGUI/BuildGUI_WireDlg.cxx b/src/BuildGUI/BuildGUI_WireDlg.cxx index 89c18a189..c90ff84ab 100644 --- a/src/BuildGUI/BuildGUI_WireDlg.cxx +++ b/src/BuildGUI/BuildGUI_WireDlg.cxx @@ -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/src/BuildGUI/BuildGUI_WireDlg.h b/src/BuildGUI/BuildGUI_WireDlg.h index 2b5521ab2..f70282245 100644 --- a/src/BuildGUI/BuildGUI_WireDlg.h +++ b/src/BuildGUI/BuildGUI_WireDlg.h @@ -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/src/BuildGUI/Makefile.am b/src/BuildGUI/Makefile.am index ad254d831..95fc4c37d 100644 --- a/src/BuildGUI/Makefile.am +++ b/src/BuildGUI/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/src/DisplayGUI/DisplayGUI.cxx b/src/DisplayGUI/DisplayGUI.cxx index 15f9a2396..fee7c9787 100644 --- a/src/DisplayGUI/DisplayGUI.cxx +++ b/src/DisplayGUI/DisplayGUI.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // GEOM GEOMGUI : GUI for Geometry component // File : DisplayGUI.cxx diff --git a/src/DisplayGUI/DisplayGUI.h b/src/DisplayGUI/DisplayGUI.h index 74de0e22f..f4c838365 100644 --- a/src/DisplayGUI/DisplayGUI.h +++ b/src/DisplayGUI/DisplayGUI.h @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // GEOM GEOMGUI : GUI for Geometry component // File : DisplayGUI.h diff --git a/src/DisplayGUI/Makefile.am b/src/DisplayGUI/Makefile.am index a361cdb10..d4f00dbd1 100644 --- a/src/DisplayGUI/Makefile.am +++ b/src/DisplayGUI/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/src/DlgRef/DlgRef.cxx b/src/DlgRef/DlgRef.cxx index 80e6c0c5a..eada5f0f2 100644 --- a/src/DlgRef/DlgRef.cxx +++ b/src/DlgRef/DlgRef.cxx @@ -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 @@ -15,6 +15,7 @@ // 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 : DlgRef.cxx // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) diff --git a/src/DlgRef/DlgRef.h b/src/DlgRef/DlgRef.h index 6bda15434..66b9650f5 100644 --- a/src/DlgRef/DlgRef.h +++ b/src/DlgRef/DlgRef.h @@ -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 @@ -15,6 +15,7 @@ // 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 : DlgRef.h // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) diff --git a/src/DlgRef/Makefile.am b/src/DlgRef/Makefile.am index 774ba9b8d..baf6b899a 100644 --- a/src/DlgRef/Makefile.am +++ b/src/DlgRef/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 @@ -15,6 +15,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# # File : Makefile.am # Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) diff --git a/src/EntityGUI/EntityGUI.cxx b/src/EntityGUI/EntityGUI.cxx index eded6c0c9..705138e36 100644 --- a/src/EntityGUI/EntityGUI.cxx +++ b/src/EntityGUI/EntityGUI.cxx @@ -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/src/EntityGUI/EntityGUI.h b/src/EntityGUI/EntityGUI.h index 7ab56f090..1b84b2901 100644 --- a/src/EntityGUI/EntityGUI.h +++ b/src/EntityGUI/EntityGUI.h @@ -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/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx index 073969747..c0ad5d1bb 100755 --- a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx @@ -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 @@ -15,6 +15,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // GEOM GEOMGUI : GUI for Geometry component // File : EntityGUI_3DSketcherDlg.cxx diff --git a/src/EntityGUI/EntityGUI_3DSketcherDlg.h b/src/EntityGUI/EntityGUI_3DSketcherDlg.h index a4b4d98af..fc87e79f5 100755 --- a/src/EntityGUI/EntityGUI_3DSketcherDlg.h +++ b/src/EntityGUI/EntityGUI_3DSketcherDlg.h @@ -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 @@ -15,6 +15,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // GEOM GEOMGUI : GUI for Geometry component // File : EntityGUI_3DSketcherDlg.h diff --git a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx index d5f11d235..a6ad98775 100644 --- a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx +++ b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx @@ -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/src/EntityGUI/EntityGUI_FeatureDetectorDlg.h b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.h index 2595142b9..cdbced647 100644 --- a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.h +++ b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.h @@ -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/src/EntityGUI/EntityGUI_PictureImportDlg.cxx b/src/EntityGUI/EntityGUI_PictureImportDlg.cxx index 774e2c2b1..3feaf26ad 100644 --- a/src/EntityGUI/EntityGUI_PictureImportDlg.cxx +++ b/src/EntityGUI/EntityGUI_PictureImportDlg.cxx @@ -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/src/EntityGUI/EntityGUI_PictureImportDlg.h b/src/EntityGUI/EntityGUI_PictureImportDlg.h index 4fc9fb09b..1019d4eb9 100644 --- a/src/EntityGUI/EntityGUI_PictureImportDlg.h +++ b/src/EntityGUI/EntityGUI_PictureImportDlg.h @@ -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/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx index b884d9067..ea4a4a677 100644 --- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx @@ -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/src/EntityGUI/EntityGUI_SketcherDlg.h b/src/EntityGUI/EntityGUI_SketcherDlg.h index d8bed62f3..0f8048d10 100644 --- a/src/EntityGUI/EntityGUI_SketcherDlg.h +++ b/src/EntityGUI/EntityGUI_SketcherDlg.h @@ -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/src/EntityGUI/EntityGUI_SubShapeDlg.cxx b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx index 3de5f8e89..cc1224f7d 100644 --- a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx +++ b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx @@ -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/src/EntityGUI/EntityGUI_SubShapeDlg.h b/src/EntityGUI/EntityGUI_SubShapeDlg.h index 816059e86..f8bc4c6f9 100644 --- a/src/EntityGUI/EntityGUI_SubShapeDlg.h +++ b/src/EntityGUI/EntityGUI_SubShapeDlg.h @@ -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/src/EntityGUI/EntityGUI_Widgets.cxx b/src/EntityGUI/EntityGUI_Widgets.cxx index 0c59c7345..51e0140d8 100644 --- a/src/EntityGUI/EntityGUI_Widgets.cxx +++ b/src/EntityGUI/EntityGUI_Widgets.cxx @@ -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/src/EntityGUI/EntityGUI_Widgets.h b/src/EntityGUI/EntityGUI_Widgets.h index 2668b91a8..982b0b624 100644 --- a/src/EntityGUI/EntityGUI_Widgets.h +++ b/src/EntityGUI/EntityGUI_Widgets.h @@ -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/src/EntityGUI/Makefile.am b/src/EntityGUI/Makefile.am index e6082ead5..37f0e6f46 100644 --- a/src/EntityGUI/Makefile.am +++ b/src/EntityGUI/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/src/GEOM/GEOM_Application.cxx b/src/GEOM/GEOM_Application.cxx index ab56603f6..aed67b2db 100644 --- a/src/GEOM/GEOM_Application.cxx +++ b/src/GEOM/GEOM_Application.cxx @@ -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/src/GEOM/GEOM_Application.hxx b/src/GEOM/GEOM_Application.hxx index 079d9dca3..c5e3f9a84 100644 --- a/src/GEOM/GEOM_Application.hxx +++ b/src/GEOM/GEOM_Application.hxx @@ -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/src/GEOM/GEOM_Application.ixx b/src/GEOM/GEOM_Application.ixx index 4e27bad7c..23b81f4f7 100644 --- a/src/GEOM/GEOM_Application.ixx +++ b/src/GEOM/GEOM_Application.ixx @@ -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/src/GEOM/GEOM_Application.jxx b/src/GEOM/GEOM_Application.jxx index 30bce69d1..e94787860 100644 --- a/src/GEOM/GEOM_Application.jxx +++ b/src/GEOM/GEOM_Application.jxx @@ -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/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx b/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx index 963dd1bd0..3961b5ee4 100644 --- a/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx +++ b/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx @@ -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/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx b/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx index 31390b070..bda63a0c5 100644 --- a/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx +++ b/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx @@ -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/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx b/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx index 011dc9fbc..af0b416c2 100644 --- a/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx +++ b/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx @@ -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/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx b/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx index ecd72b16f..38d5ec40c 100644 --- a/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx +++ b/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx @@ -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/src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx b/src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx index c2a3e3ce3..98923841d 100644 --- a/src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx +++ b/src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx @@ -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/src/GEOM/GEOM_DataMapOfAsciiStringTransient_0.cxx b/src/GEOM/GEOM_DataMapOfAsciiStringTransient_0.cxx index d83dfa587..033a41e20 100644 --- a/src/GEOM/GEOM_DataMapOfAsciiStringTransient_0.cxx +++ b/src/GEOM/GEOM_DataMapOfAsciiStringTransient_0.cxx @@ -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/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index 501909d7a..88d5dec98 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -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/src/GEOM/GEOM_Engine.hxx b/src/GEOM/GEOM_Engine.hxx index 4ae37dfec..07684af88 100644 --- a/src/GEOM/GEOM_Engine.hxx +++ b/src/GEOM/GEOM_Engine.hxx @@ -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/src/GEOM/GEOM_Function.cxx b/src/GEOM/GEOM_Function.cxx index 146863614..0c6ac9cc6 100644 --- a/src/GEOM/GEOM_Function.cxx +++ b/src/GEOM/GEOM_Function.cxx @@ -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/src/GEOM/GEOM_Function.hxx b/src/GEOM/GEOM_Function.hxx index a9633386d..cc83441ae 100644 --- a/src/GEOM/GEOM_Function.hxx +++ b/src/GEOM/GEOM_Function.hxx @@ -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/src/GEOM/GEOM_IOperations.cxx b/src/GEOM/GEOM_IOperations.cxx index d7a381c16..8f491950d 100644 --- a/src/GEOM/GEOM_IOperations.cxx +++ b/src/GEOM/GEOM_IOperations.cxx @@ -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/src/GEOM/GEOM_IOperations.hxx b/src/GEOM/GEOM_IOperations.hxx index 14363f4cf..2ab160ecd 100644 --- a/src/GEOM/GEOM_IOperations.hxx +++ b/src/GEOM/GEOM_IOperations.hxx @@ -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/src/GEOM/GEOM_ISubShape.hxx b/src/GEOM/GEOM_ISubShape.hxx index fe6996741..e398a4220 100644 --- a/src/GEOM/GEOM_ISubShape.hxx +++ b/src/GEOM/GEOM_ISubShape.hxx @@ -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/src/GEOM/GEOM_Object.cxx b/src/GEOM/GEOM_Object.cxx index 88ca1b7b1..2cecf7bb4 100644 --- a/src/GEOM/GEOM_Object.cxx +++ b/src/GEOM/GEOM_Object.cxx @@ -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/src/GEOM/GEOM_Object.hxx b/src/GEOM/GEOM_Object.hxx index a913fb4f7..4f2effb3c 100644 --- a/src/GEOM/GEOM_Object.hxx +++ b/src/GEOM/GEOM_Object.hxx @@ -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/src/GEOM/GEOM_PythonDump.cxx b/src/GEOM/GEOM_PythonDump.cxx index 70022fc99..ce5038c70 100644 --- a/src/GEOM/GEOM_PythonDump.cxx +++ b/src/GEOM/GEOM_PythonDump.cxx @@ -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/src/GEOM/GEOM_PythonDump.hxx b/src/GEOM/GEOM_PythonDump.hxx index b9b83a7ea..a8f66c258 100644 --- a/src/GEOM/GEOM_PythonDump.hxx +++ b/src/GEOM/GEOM_PythonDump.hxx @@ -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/src/GEOM/GEOM_Solver.cxx b/src/GEOM/GEOM_Solver.cxx index 81e97403b..5fe91ccfa 100644 --- a/src/GEOM/GEOM_Solver.cxx +++ b/src/GEOM/GEOM_Solver.cxx @@ -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/src/GEOM/GEOM_Solver.hxx b/src/GEOM/GEOM_Solver.hxx index fc3d6caeb..d7c04ad97 100644 --- a/src/GEOM/GEOM_Solver.hxx +++ b/src/GEOM/GEOM_Solver.hxx @@ -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/src/GEOM/GEOM_SubShapeDriver.cxx b/src/GEOM/GEOM_SubShapeDriver.cxx index fa2d4cdca..af50b2340 100644 --- a/src/GEOM/GEOM_SubShapeDriver.cxx +++ b/src/GEOM/GEOM_SubShapeDriver.cxx @@ -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/src/GEOM/GEOM_SubShapeDriver.hxx b/src/GEOM/GEOM_SubShapeDriver.hxx index f5646b839..850b5c2d8 100644 --- a/src/GEOM/GEOM_SubShapeDriver.hxx +++ b/src/GEOM/GEOM_SubShapeDriver.hxx @@ -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/src/GEOM/Handle_GEOM_Application.hxx b/src/GEOM/Handle_GEOM_Application.hxx index 7a3b00bcc..35960a1d9 100644 --- a/src/GEOM/Handle_GEOM_Application.hxx +++ b/src/GEOM/Handle_GEOM_Application.hxx @@ -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/src/GEOM/Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx b/src/GEOM/Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx index 74e7f3d12..5c034d0c6 100644 --- a/src/GEOM/Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx +++ b/src/GEOM/Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx @@ -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/src/GEOM/Makefile.am b/src/GEOM/Makefile.am index 98fcfe532..868732e3d 100644 --- a/src/GEOM/Makefile.am +++ b/src/GEOM/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/src/GEOMAlgo/GEOMAlgo.cdl b/src/GEOMAlgo/GEOMAlgo.cdl index d2fbf9770..4a1bd9c84 100755 --- a/src/GEOMAlgo/GEOMAlgo.cdl +++ b/src/GEOMAlgo/GEOMAlgo.cdl @@ -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/src/GEOMAlgo/GEOMAlgo_Algo.cxx b/src/GEOMAlgo/GEOMAlgo_Algo.cxx index f159c1a57..b777149af 100755 --- a/src/GEOMAlgo/GEOMAlgo_Algo.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Algo.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_Algo.hxx b/src/GEOMAlgo/GEOMAlgo_Algo.hxx index b82398fe1..7a4e5fc6a 100644 --- a/src/GEOMAlgo/GEOMAlgo_Algo.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Algo.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_Builder.cxx b/src/GEOMAlgo/GEOMAlgo_Builder.cxx index 669274cfa..91c9ea539 100755 --- a/src/GEOMAlgo/GEOMAlgo_Builder.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Builder.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_Builder.hxx b/src/GEOMAlgo/GEOMAlgo_Builder.hxx index 47d175564..dd9e6c3c4 100644 --- a/src/GEOMAlgo/GEOMAlgo_Builder.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Builder.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_BuilderArea.cxx b/src/GEOMAlgo/GEOMAlgo_BuilderArea.cxx index d2dbd991b..51b044ea6 100755 --- a/src/GEOMAlgo/GEOMAlgo_BuilderArea.cxx +++ b/src/GEOMAlgo/GEOMAlgo_BuilderArea.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_BuilderArea.hxx b/src/GEOMAlgo/GEOMAlgo_BuilderArea.hxx index 670517f32..351d74f5f 100644 --- a/src/GEOMAlgo/GEOMAlgo_BuilderArea.hxx +++ b/src/GEOMAlgo/GEOMAlgo_BuilderArea.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_BuilderFace.cxx b/src/GEOMAlgo/GEOMAlgo_BuilderFace.cxx index afae9cee4..99e977a18 100755 --- a/src/GEOMAlgo/GEOMAlgo_BuilderFace.cxx +++ b/src/GEOMAlgo/GEOMAlgo_BuilderFace.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_BuilderFace.hxx b/src/GEOMAlgo/GEOMAlgo_BuilderFace.hxx index 595436cda..0347ac96a 100644 --- a/src/GEOMAlgo/GEOMAlgo_BuilderFace.hxx +++ b/src/GEOMAlgo/GEOMAlgo_BuilderFace.hxx @@ -1,5 +1,5 @@ -// 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/src/GEOMAlgo/GEOMAlgo_BuilderShape.cxx b/src/GEOMAlgo/GEOMAlgo_BuilderShape.cxx index 5abac4efc..8d6cfba3d 100755 --- a/src/GEOMAlgo/GEOMAlgo_BuilderShape.cxx +++ b/src/GEOMAlgo/GEOMAlgo_BuilderShape.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_BuilderShape.hxx b/src/GEOMAlgo/GEOMAlgo_BuilderShape.hxx index 2ae67470c..1304e063b 100644 --- a/src/GEOMAlgo/GEOMAlgo_BuilderShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_BuilderShape.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_BuilderSolid.cxx b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.cxx index cd8c54625..fce765fc8 100755 --- a/src/GEOMAlgo/GEOMAlgo_BuilderSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_BuilderSolid.hxx b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.hxx index 650528fa7..935a7c169 100644 --- a/src/GEOMAlgo/GEOMAlgo_BuilderSolid.hxx +++ b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_BuilderTools.cxx b/src/GEOMAlgo/GEOMAlgo_BuilderTools.cxx index a40c07a37..8acee04ec 100755 --- a/src/GEOMAlgo/GEOMAlgo_BuilderTools.cxx +++ b/src/GEOMAlgo/GEOMAlgo_BuilderTools.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_BuilderTools.hxx b/src/GEOMAlgo/GEOMAlgo_BuilderTools.hxx index b0d13c9fe..7a19831d4 100644 --- a/src/GEOMAlgo/GEOMAlgo_BuilderTools.hxx +++ b/src/GEOMAlgo/GEOMAlgo_BuilderTools.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_Builder_0.cxx b/src/GEOMAlgo/GEOMAlgo_Builder_0.cxx index b0fe28966..8395f38d5 100644 --- a/src/GEOMAlgo/GEOMAlgo_Builder_0.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Builder_0.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_Builder_1.cxx b/src/GEOMAlgo/GEOMAlgo_Builder_1.cxx index aa4f7ef53..65f6929a0 100755 --- a/src/GEOMAlgo/GEOMAlgo_Builder_1.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Builder_1.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_Builder_2.cxx b/src/GEOMAlgo/GEOMAlgo_Builder_2.cxx index 0272529f9..d699f1dc8 100755 --- a/src/GEOMAlgo/GEOMAlgo_Builder_2.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Builder_2.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_Builder_3.cxx b/src/GEOMAlgo/GEOMAlgo_Builder_3.cxx index 066cc9c7d..0ad7153ec 100755 --- a/src/GEOMAlgo/GEOMAlgo_Builder_3.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Builder_3.cxx @@ -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 @@ -282,9 +282,7 @@ void GEOMAlgo_Builder::BuildDraftSolid (const TopoDS_Shape& theSolid, else { //aMS.Add(aShell); TopExp::MapShapes(aShell, TopAbs_FACE, aMS); - //modified by NIZNHY-PKV Fri Dec 03 11:18:45 2010f TopExp::MapShapes(aShell, TopAbs_EDGE, aMS); - //modified by NIZNHY-PKV Fri Dec 03 11:18:51 2010t TopExp::MapShapesAndAncestors(aShell, TopAbs_EDGE, TopAbs_FACE, aMEF); } } @@ -513,11 +511,9 @@ void GEOMAlgo_Builder::BuildDraftSolid (const TopoDS_Shape& theSolid, } const TopTools_ListOfShape& aSFS1=aSSi.GetSet(); aNbSFS=aSFS1.Extent(); - //modified by NIZNHY-PKV Wed Oct 27 09:53:15 2010f if (!aNbSFS) { continue; } - //modified by NIZNHY-PKV Wed Oct 27 09:53:18 2010t // // 1.3 Build new solids aSB.SetContext(aCtx); @@ -695,7 +691,12 @@ void GEOMAlgo_Builder::BuildDraftSolid (const TopoDS_Shape& theSolid, const TopTools_ListOfShape &aLSx=aMSx.FindFromKey(aSI); aNbSx=aLSx.Extent(); if (aNbSx) { - aMSI.Remove(aSI); + //modified by NIZNHY-PKV Wed Mar 27 11:39:15 2013f + //aMSI.Remove(aSI); + if (aMSI.Remove(aSI)) { + aItM.Initialize(aMSI); + } + //modified by NIZNHY-PKV Wed Mar 27 11:39:18 2013t } } } diff --git a/src/GEOMAlgo/GEOMAlgo_Builder_4.cxx b/src/GEOMAlgo/GEOMAlgo_Builder_4.cxx index 5672fe1fd..789d5326b 100755 --- a/src/GEOMAlgo/GEOMAlgo_Builder_4.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Builder_4.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_Clsf.cxx b/src/GEOMAlgo/GEOMAlgo_Clsf.cxx index 9f3fe0acb..b164ac0c5 100644 --- a/src/GEOMAlgo/GEOMAlgo_Clsf.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Clsf.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_Clsf.hxx b/src/GEOMAlgo/GEOMAlgo_Clsf.hxx index 017578386..306b6ea55 100644 --- a/src/GEOMAlgo/GEOMAlgo_Clsf.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Clsf.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx b/src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx index dbc3eec1c..202c0d403 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx index dc635f52b..4a35dcb62 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx index 35bb725ef..c46ce1bf5 100755 --- a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx index 1715d88db..7b066866d 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx index cdc66dd14..f01c2e2fc 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx index e0dd97395..76ea7ca72 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cxx b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cxx index 0055a8228..7ce902420 100644 --- a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cxx +++ b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.hxx b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.hxx index 7e346aa8d..16f90d878 100644 --- a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.hxx +++ b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx index ed169e1c5..61497898b 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx index 2ea6a30ad..bf9628d8c 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx index bda2348e2..ef00b3ed9 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx index 9bce78862..c572630b1 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx index 5b19a5aeb..f51e2c7ff 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx index 0eed7b26d..ce6ffea08 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx index 4fa86a84f..aaf0d6bb1 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx index fad39a60b..413056ac9 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape.hxx index 3126d0e4a..aea60012f 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx index 6ba58447b..76edfb3a1 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx index c9a030daa..d410d2ae7 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx index 179402f9e..757dab3cc 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeMapOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeMapOfShape.hxx index 510f4373c..66d99621e 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeMapOfShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeMapOfShape.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_DataMapOfShapePnt.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapePnt.hxx index c552d1c81..204dcf708 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapePnt.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapePnt.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx index cc20d7e16..34d9f7baa 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet.hxx index 4430717c3..3498b1c99 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx index 4708ce554..76b6b40d5 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx index a05b902b9..09caf37e2 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx @@ -1,5 +1,5 @@ -// 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/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx index 9c943ac43..71c531e4d 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx index 90995d9a2..264ff6425 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx index 5f3641cf3..721d1c29f 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx index a70d04e2c..60291c365 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx index c8b331334..839e78bcb 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx index e2239123b..36dd6022b 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_GetInPlace.cxx b/src/GEOMAlgo/GEOMAlgo_GetInPlace.cxx index 852f600e5..5b60f0091 100644 --- a/src/GEOMAlgo/GEOMAlgo_GetInPlace.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GetInPlace.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_GetInPlace.hxx b/src/GEOMAlgo/GEOMAlgo_GetInPlace.hxx index a8ff2a558..e0f763a82 100644 --- a/src/GEOMAlgo/GEOMAlgo_GetInPlace.hxx +++ b/src/GEOMAlgo/GEOMAlgo_GetInPlace.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_GetInPlace_1.cxx b/src/GEOMAlgo/GEOMAlgo_GetInPlace_1.cxx index 25f418db4..914a1bccc 100644 --- a/src/GEOMAlgo/GEOMAlgo_GetInPlace_1.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GetInPlace_1.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_GetInPlace_2.cxx b/src/GEOMAlgo/GEOMAlgo_GetInPlace_2.cxx index 3114f3688..a4f4d2aa5 100644 --- a/src/GEOMAlgo/GEOMAlgo_GetInPlace_2.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GetInPlace_2.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_GetInPlace_3.cxx b/src/GEOMAlgo/GEOMAlgo_GetInPlace_3.cxx index f409c17fc..793cb306f 100644 --- a/src/GEOMAlgo/GEOMAlgo_GetInPlace_3.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GetInPlace_3.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cxx b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cxx index 1d5b99e36..f17598527 100644 --- a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.hxx b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.hxx index 359407edb..551d84cdf 100644 --- a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.hxx +++ b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx b/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx index 14a7ed5d5..f9bdf1358 100644 --- a/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_GlueDetector.hxx b/src/GEOMAlgo/GEOMAlgo_GlueDetector.hxx index dc588eacd..36b581287 100644 --- a/src/GEOMAlgo/GEOMAlgo_GlueDetector.hxx +++ b/src/GEOMAlgo/GEOMAlgo_GlueDetector.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_Gluer.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer.cxx index 322d1ba31..fbb560ab9 100755 --- a/src/GEOMAlgo/GEOMAlgo_Gluer.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_Gluer.hxx b/src/GEOMAlgo/GEOMAlgo_Gluer.hxx index 406004e7c..f8d74f7ff 100644 --- a/src/GEOMAlgo/GEOMAlgo_Gluer.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer.hxx @@ -1,5 +1,5 @@ -// 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/src/GEOMAlgo/GEOMAlgo_Gluer2.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer2.cxx index 0a7b969bf..21a810e7c 100644 --- a/src/GEOMAlgo/GEOMAlgo_Gluer2.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer2.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_Gluer2.hxx b/src/GEOMAlgo/GEOMAlgo_Gluer2.hxx index f380802b9..d2015b7b4 100644 --- a/src/GEOMAlgo/GEOMAlgo_Gluer2.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer2.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_Gluer2_1.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer2_1.cxx index bcc94c5fd..76f87b6e1 100644 --- a/src/GEOMAlgo/GEOMAlgo_Gluer2_1.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer2_1.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_Gluer2_2.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer2_2.cxx index 375036bfc..8a218d4d1 100644 --- a/src/GEOMAlgo/GEOMAlgo_Gluer2_2.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer2_2.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx index 5ccb17521..f2a8845f3 100644 --- a/src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx index fe6f82a2c..24b680085 100644 --- a/src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx index 97f9b9ad1..172940a3e 100644 --- a/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx +++ b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx b/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx index b07876a31..eebc67d5f 100644 --- a/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx +++ b/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx b/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx index 52340ed2e..2915128aa 100644 --- a/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx +++ b/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx index 125122452..b480d6464 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx index 5c22084a6..3b5076b12 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx index 7cd8010fe..ac7ca6484 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx index 09be03fe8..33581c1df 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx index 35f5d3650..b11597b5b 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_KindOfBounds.hxx b/src/GEOMAlgo/GEOMAlgo_KindOfBounds.hxx index 83646c9ef..07096ea3d 100644 --- a/src/GEOMAlgo/GEOMAlgo_KindOfBounds.hxx +++ b/src/GEOMAlgo/GEOMAlgo_KindOfBounds.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_KindOfClosed.hxx b/src/GEOMAlgo/GEOMAlgo_KindOfClosed.hxx index fecd41494..14d316106 100644 --- a/src/GEOMAlgo/GEOMAlgo_KindOfClosed.hxx +++ b/src/GEOMAlgo/GEOMAlgo_KindOfClosed.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_KindOfName.hxx b/src/GEOMAlgo/GEOMAlgo_KindOfName.hxx index 8c4241edd..3daa9d028 100644 --- a/src/GEOMAlgo/GEOMAlgo_KindOfName.hxx +++ b/src/GEOMAlgo/GEOMAlgo_KindOfName.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_KindOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_KindOfShape.hxx index 8642b2231..038c1a1a2 100644 --- a/src/GEOMAlgo/GEOMAlgo_KindOfShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_KindOfShape.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOMAlgo_KindOfShape_HeaderFile #define _GEOMAlgo_KindOfShape_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx index 8c19aa07e..1d945d314 100644 --- a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx index ff1f10c7e..dafb123b2 100644 --- a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx b/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx index 53954a6a8..d2bca1b0d 100644 --- a/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx b/src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx index 385ebee9d..d584df0c6 100644 --- a/src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_PWireEdgeSet.hxx b/src/GEOMAlgo/GEOMAlgo_PWireEdgeSet.hxx index f803f847f..4b88b8802 100644 --- a/src/GEOMAlgo/GEOMAlgo_PWireEdgeSet.hxx +++ b/src/GEOMAlgo/GEOMAlgo_PWireEdgeSet.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_PassKey.cxx b/src/GEOMAlgo/GEOMAlgo_PassKey.cxx index 8f6f949e4..3dbbb8788 100755 --- a/src/GEOMAlgo/GEOMAlgo_PassKey.cxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKey.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_PassKey.hxx b/src/GEOMAlgo/GEOMAlgo_PassKey.hxx index 9a992f205..888540471 100644 --- a/src/GEOMAlgo/GEOMAlgo_PassKey.hxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKey.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cxx b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cxx index 32e62875c..828bce4ae 100755 --- a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx index 0b3039f1e..8bcb31efe 100644 --- a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_PassKeyShape.cxx b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.cxx index 3aa4f4b04..512e3e305 100755 --- a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.cxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx index 1f886be33..fecb08417 100644 --- a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx @@ -1,5 +1,5 @@ -// 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/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.cxx b/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.cxx index d90110080..c053a69ea 100644 --- a/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.cxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.hxx b/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.hxx index 41f15bf3e..7cb5d41e9 100644 --- a/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.hxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx index b24f71b7a..0fbf85497 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx index 98a8c0b3f..5d05b913b 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_ShapeInfo.cxx b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.cxx index 991e4c0a6..ee1a2d845 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.cxx @@ -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 @@ -15,6 +15,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.hxx b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.hxx index 3f8323ecd..2e07c2cca 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.cxx b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.cxx index 5bfdb55cb..9aed767ff 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.cxx @@ -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 @@ -15,6 +15,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.hxx b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.hxx index ddf0786c3..01cd82ea1 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.hxx @@ -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 @@ -15,6 +15,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOMAlgo_ShapeInfoFiller_HeaderFile #define _GEOMAlgo_ShapeInfoFiller_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx index ec0b27c00..a1dd6c08e 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx @@ -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 @@ -15,6 +15,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSet.cxx b/src/GEOMAlgo/GEOMAlgo_ShapeSet.cxx index 3e84aa098..9379035f7 100755 --- a/src/GEOMAlgo/GEOMAlgo_ShapeSet.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeSet.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_ShapeSet.hxx b/src/GEOMAlgo/GEOMAlgo_ShapeSet.hxx index b304a8bba..63bba80b9 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeSet.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeSet.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_ShapeSolid.cxx b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.cxx index 04f69b29a..b007b3a4b 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx index 47e3edac7..9db5918ab 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx index c032c1111..b40fef887 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_ShellSolid.hxx b/src/GEOMAlgo/GEOMAlgo_ShellSolid.hxx index 941405861..45299b547 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx index 31ea5d161..3082261dd 100644 --- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx b/src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx index 5a49654e4..5e5f08f40 100644 --- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx +++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_Splitter.cxx b/src/GEOMAlgo/GEOMAlgo_Splitter.cxx index 7411dce89..0abb0f7e8 100755 --- a/src/GEOMAlgo/GEOMAlgo_Splitter.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Splitter.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_Splitter.hxx b/src/GEOMAlgo/GEOMAlgo_Splitter.hxx index 469080fe6..e5488393b 100644 --- a/src/GEOMAlgo/GEOMAlgo_Splitter.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Splitter.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_State.hxx b/src/GEOMAlgo/GEOMAlgo_State.hxx index 423d494b2..dd3c7bfca 100644 --- a/src/GEOMAlgo/GEOMAlgo_State.hxx +++ b/src/GEOMAlgo/GEOMAlgo_State.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_StateCollector.cxx b/src/GEOMAlgo/GEOMAlgo_StateCollector.cxx index 5e593541f..2b8e42986 100644 --- a/src/GEOMAlgo/GEOMAlgo_StateCollector.cxx +++ b/src/GEOMAlgo/GEOMAlgo_StateCollector.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_StateCollector.hxx b/src/GEOMAlgo/GEOMAlgo_StateCollector.hxx index 5ac5a96cf..05a43d60b 100644 --- a/src/GEOMAlgo/GEOMAlgo_StateCollector.hxx +++ b/src/GEOMAlgo/GEOMAlgo_StateCollector.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx index f9d0f036b..f8ade1562 100644 --- a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx +++ b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx index 565a95172..0d88c9fce 100644 --- a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx +++ b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_Tools.cxx b/src/GEOMAlgo/GEOMAlgo_Tools.cxx index 8ae8a8e8f..df84202c9 100644 --- a/src/GEOMAlgo/GEOMAlgo_Tools.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Tools.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_Tools.hxx b/src/GEOMAlgo/GEOMAlgo_Tools.hxx index d4345eec7..8ed8d2471 100644 --- a/src/GEOMAlgo/GEOMAlgo_Tools.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Tools.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_Tools3D.cxx b/src/GEOMAlgo/GEOMAlgo_Tools3D.cxx index 81d7b75e1..664f59dfa 100755 --- a/src/GEOMAlgo/GEOMAlgo_Tools3D.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Tools3D.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_Tools3D.hxx b/src/GEOMAlgo/GEOMAlgo_Tools3D.hxx index d23d73b60..6dd63c8d0 100644 --- a/src/GEOMAlgo/GEOMAlgo_Tools3D.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Tools3D.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_Tools_1.cxx b/src/GEOMAlgo/GEOMAlgo_Tools_1.cxx index 5dc71b41c..e855335d2 100644 --- a/src/GEOMAlgo/GEOMAlgo_Tools_1.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Tools_1.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx index 76d087cff..d16b84fa6 100644 --- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_VertexSolid.hxx b/src/GEOMAlgo/GEOMAlgo_VertexSolid.hxx index 5e10a6060..8a812e545 100644 --- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.hxx +++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_WESCorrector.cxx b/src/GEOMAlgo/GEOMAlgo_WESCorrector.cxx index 83fea18f7..ed5c94ac0 100755 --- a/src/GEOMAlgo/GEOMAlgo_WESCorrector.cxx +++ b/src/GEOMAlgo/GEOMAlgo_WESCorrector.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_WESCorrector.hxx b/src/GEOMAlgo/GEOMAlgo_WESCorrector.hxx index 8348935fc..33b725214 100644 --- a/src/GEOMAlgo/GEOMAlgo_WESCorrector.hxx +++ b/src/GEOMAlgo/GEOMAlgo_WESCorrector.hxx @@ -1,5 +1,5 @@ -// 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/src/GEOMAlgo/GEOMAlgo_WESScaler.cxx b/src/GEOMAlgo/GEOMAlgo_WESScaler.cxx index aea8c7fad..622288d65 100644 --- a/src/GEOMAlgo/GEOMAlgo_WESScaler.cxx +++ b/src/GEOMAlgo/GEOMAlgo_WESScaler.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_WESScaler.hxx b/src/GEOMAlgo/GEOMAlgo_WESScaler.hxx index bd1d1d5ee..7048a303f 100644 --- a/src/GEOMAlgo/GEOMAlgo_WESScaler.hxx +++ b/src/GEOMAlgo/GEOMAlgo_WESScaler.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.cxx b/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.cxx index 5a39f0e10..2687adf89 100755 --- a/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.cxx +++ b/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.hxx b/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.hxx index 97708870e..e511e5d74 100644 --- a/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.hxx +++ b/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx b/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx index 3acfda53c..95a4f81fb 100644 --- a/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_WireSolid.hxx b/src/GEOMAlgo/GEOMAlgo_WireSolid.hxx index 93a5463ed..ff3532338 100644 --- a/src/GEOMAlgo/GEOMAlgo_WireSolid.hxx +++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.hxx @@ -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/src/GEOMAlgo/GEOMAlgo_WireSplitter.cxx b/src/GEOMAlgo/GEOMAlgo_WireSplitter.cxx index b9a452053..c0ca486e1 100755 --- a/src/GEOMAlgo/GEOMAlgo_WireSplitter.cxx +++ b/src/GEOMAlgo/GEOMAlgo_WireSplitter.cxx @@ -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/src/GEOMAlgo/GEOMAlgo_WireSplitter.hxx b/src/GEOMAlgo/GEOMAlgo_WireSplitter.hxx index cbfc9ff05..2105fae4d 100644 --- a/src/GEOMAlgo/GEOMAlgo_WireSplitter.hxx +++ b/src/GEOMAlgo/GEOMAlgo_WireSplitter.hxx @@ -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/src/GEOMAlgo/Makefile.am b/src/GEOMAlgo/Makefile.am index f54398d11..2f42fb179 100644 --- a/src/GEOMAlgo/Makefile.am +++ b/src/GEOMAlgo/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 @@ -15,6 +15,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# # GEOM GEOMAlgo : tools for Glue Faces algorithm # File : Makefile.am diff --git a/src/GEOMBase/GEOMBase.cxx b/src/GEOMBase/GEOMBase.cxx index fb56bdeaf..2d0cd2bd7 100644 --- a/src/GEOMBase/GEOMBase.cxx +++ b/src/GEOMBase/GEOMBase.cxx @@ -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/src/GEOMBase/GEOMBase.h b/src/GEOMBase/GEOMBase.h index 84ab6ee14..f771609b7 100644 --- a/src/GEOMBase/GEOMBase.h +++ b/src/GEOMBase/GEOMBase.h @@ -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/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx index 4d3358874..56282b716 100755 --- a/src/GEOMBase/GEOMBase_Helper.cxx +++ b/src/GEOMBase/GEOMBase_Helper.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // GEOM GEOMGUI : GUI for Geometry component // File : GEOMBase_Helper.cxx diff --git a/src/GEOMBase/GEOMBase_Helper.h b/src/GEOMBase/GEOMBase_Helper.h index 0a1ae7b6d..ab5249e1e 100755 --- a/src/GEOMBase/GEOMBase_Helper.h +++ b/src/GEOMBase/GEOMBase_Helper.h @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // GEOM GEOMGUI : GUI for Geometry component // File : GEOMBase_Helper.h diff --git a/src/GEOMBase/GEOMBase_Skeleton.cxx b/src/GEOMBase/GEOMBase_Skeleton.cxx index d6f286425..df5b463b9 100644 --- a/src/GEOMBase/GEOMBase_Skeleton.cxx +++ b/src/GEOMBase/GEOMBase_Skeleton.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // GEOM GEOMGUI : GUI for Geometry component // File : GEOMBase_Skeleton.cxx diff --git a/src/GEOMBase/GEOMBase_Skeleton.h b/src/GEOMBase/GEOMBase_Skeleton.h index 73bf0d2a2..e2bcd90c5 100644 --- a/src/GEOMBase/GEOMBase_Skeleton.h +++ b/src/GEOMBase/GEOMBase_Skeleton.h @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // GEOM GEOMGUI : GUI for Geometry component // File : GEOMBase_Skeleton.h diff --git a/src/GEOMBase/GEOM_GEOMBase.hxx b/src/GEOMBase/GEOM_GEOMBase.hxx index 343fc4d39..f6d0f515f 100755 --- a/src/GEOMBase/GEOM_GEOMBase.hxx +++ b/src/GEOMBase/GEOM_GEOMBase.hxx @@ -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/src/GEOMBase/GEOM_GenericObjPtr.cxx b/src/GEOMBase/GEOM_GenericObjPtr.cxx index 11d483133..6443763d3 100644 --- a/src/GEOMBase/GEOM_GenericObjPtr.cxx +++ b/src/GEOMBase/GEOM_GenericObjPtr.cxx @@ -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/src/GEOMBase/GEOM_GenericObjPtr.h b/src/GEOMBase/GEOM_GenericObjPtr.h index aec0ee23e..0cb831b0f 100644 --- a/src/GEOMBase/GEOM_GenericObjPtr.h +++ b/src/GEOMBase/GEOM_GenericObjPtr.h @@ -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/src/GEOMBase/GEOM_Operation.cxx b/src/GEOMBase/GEOM_Operation.cxx index da43f6770..ccdd83d8f 100644 --- a/src/GEOMBase/GEOM_Operation.cxx +++ b/src/GEOMBase/GEOM_Operation.cxx @@ -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/src/GEOMBase/GEOM_Operation.h b/src/GEOMBase/GEOM_Operation.h index bc33e9d60..e9837d9a7 100644 --- a/src/GEOMBase/GEOM_Operation.h +++ b/src/GEOMBase/GEOM_Operation.h @@ -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/src/GEOMBase/Makefile.am b/src/GEOMBase/Makefile.am index c66a80519..087203851 100644 --- a/src/GEOMBase/Makefile.am +++ b/src/GEOMBase/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/src/GEOMClient/GEOM_Client.cxx b/src/GEOMClient/GEOM_Client.cxx index 52e007c28..b2104d683 100644 --- a/src/GEOMClient/GEOM_Client.cxx +++ b/src/GEOMClient/GEOM_Client.cxx @@ -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/src/GEOMClient/GEOM_Client.hxx b/src/GEOMClient/GEOM_Client.hxx index 717efb331..9c74d00a1 100644 --- a/src/GEOMClient/GEOM_Client.hxx +++ b/src/GEOMClient/GEOM_Client.hxx @@ -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/src/GEOMClient/Makefile.am b/src/GEOMClient/Makefile.am index d2775005a..c5c21a750 100644 --- a/src/GEOMClient/Makefile.am +++ b/src/GEOMClient/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/src/GEOMFiltersSelection/GEOM_CompoundFilter.cxx b/src/GEOMFiltersSelection/GEOM_CompoundFilter.cxx index ee6b3a6ce..0a98f3848 100644 --- a/src/GEOMFiltersSelection/GEOM_CompoundFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_CompoundFilter.cxx @@ -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/src/GEOMFiltersSelection/GEOM_CompoundFilter.h b/src/GEOMFiltersSelection/GEOM_CompoundFilter.h index 8a4ad1173..e3c739639 100644 --- a/src/GEOMFiltersSelection/GEOM_CompoundFilter.h +++ b/src/GEOMFiltersSelection/GEOM_CompoundFilter.h @@ -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/src/GEOMFiltersSelection/GEOM_EdgeFilter.cxx b/src/GEOMFiltersSelection/GEOM_EdgeFilter.cxx index 1217b7363..2f714fcc7 100644 --- a/src/GEOMFiltersSelection/GEOM_EdgeFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_EdgeFilter.cxx @@ -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/src/GEOMFiltersSelection/GEOM_EdgeFilter.h b/src/GEOMFiltersSelection/GEOM_EdgeFilter.h index 305043d38..276bc5c4d 100644 --- a/src/GEOMFiltersSelection/GEOM_EdgeFilter.h +++ b/src/GEOMFiltersSelection/GEOM_EdgeFilter.h @@ -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/src/GEOMFiltersSelection/GEOM_FaceFilter.cxx b/src/GEOMFiltersSelection/GEOM_FaceFilter.cxx index a7e517850..eb24d6b88 100644 --- a/src/GEOMFiltersSelection/GEOM_FaceFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_FaceFilter.cxx @@ -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/src/GEOMFiltersSelection/GEOM_FaceFilter.h b/src/GEOMFiltersSelection/GEOM_FaceFilter.h index ff493286b..fb323a4e9 100644 --- a/src/GEOMFiltersSelection/GEOM_FaceFilter.h +++ b/src/GEOMFiltersSelection/GEOM_FaceFilter.h @@ -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/src/GEOMFiltersSelection/GEOM_LogicalFilter.cxx b/src/GEOMFiltersSelection/GEOM_LogicalFilter.cxx index 152ed3328..4b2c9e097 100644 --- a/src/GEOMFiltersSelection/GEOM_LogicalFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_LogicalFilter.cxx @@ -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/src/GEOMFiltersSelection/GEOM_LogicalFilter.h b/src/GEOMFiltersSelection/GEOM_LogicalFilter.h index f4e2708f4..6f052e2c4 100644 --- a/src/GEOMFiltersSelection/GEOM_LogicalFilter.h +++ b/src/GEOMFiltersSelection/GEOM_LogicalFilter.h @@ -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/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx b/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx index d4a5b43db..c08e8d2f8 100644 --- a/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx @@ -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/src/GEOMFiltersSelection/GEOM_OCCFilter.h b/src/GEOMFiltersSelection/GEOM_OCCFilter.h index 12eb978b4..dad15602c 100644 --- a/src/GEOMFiltersSelection/GEOM_OCCFilter.h +++ b/src/GEOMFiltersSelection/GEOM_OCCFilter.h @@ -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/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx b/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx index ed3f34777..9cafd067d 100644 --- a/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx @@ -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/src/GEOMFiltersSelection/GEOM_PreviewFilter.h b/src/GEOMFiltersSelection/GEOM_PreviewFilter.h index 8054810b3..a4ddedd6a 100644 --- a/src/GEOMFiltersSelection/GEOM_PreviewFilter.h +++ b/src/GEOMFiltersSelection/GEOM_PreviewFilter.h @@ -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/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx b/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx index 35fc57020..67d0542f8 100644 --- a/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx @@ -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/src/GEOMFiltersSelection/GEOM_SelectionFilter.h b/src/GEOMFiltersSelection/GEOM_SelectionFilter.h index d05a19fd3..36e33b8d9 100644 --- a/src/GEOMFiltersSelection/GEOM_SelectionFilter.h +++ b/src/GEOMFiltersSelection/GEOM_SelectionFilter.h @@ -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/src/GEOMFiltersSelection/GEOM_TypeFilter.cxx b/src/GEOMFiltersSelection/GEOM_TypeFilter.cxx index d1e6821cf..37e48c258 100644 --- a/src/GEOMFiltersSelection/GEOM_TypeFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_TypeFilter.cxx @@ -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/src/GEOMFiltersSelection/GEOM_TypeFilter.h b/src/GEOMFiltersSelection/GEOM_TypeFilter.h index 67fac3498..dc2cef6f4 100644 --- a/src/GEOMFiltersSelection/GEOM_TypeFilter.h +++ b/src/GEOMFiltersSelection/GEOM_TypeFilter.h @@ -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/src/GEOMFiltersSelection/Makefile.am b/src/GEOMFiltersSelection/Makefile.am index ff104eef4..2d587d2af 100644 --- a/src/GEOMFiltersSelection/Makefile.am +++ b/src/GEOMFiltersSelection/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/src/GEOMGUI/GEOMGUI.cxx b/src/GEOMGUI/GEOMGUI.cxx index 2e1021de3..2f0ea6a28 100644 --- a/src/GEOMGUI/GEOMGUI.cxx +++ b/src/GEOMGUI/GEOMGUI.cxx @@ -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/src/GEOMGUI/GEOMGUI.h b/src/GEOMGUI/GEOMGUI.h index eac15283a..3d8df7b81 100644 --- a/src/GEOMGUI/GEOMGUI.h +++ b/src/GEOMGUI/GEOMGUI.h @@ -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/src/GEOMGUI/GEOMGUI_OCCSelector.cxx b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx index e2008bfa8..9b3923096 100644 --- a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx +++ b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx @@ -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/src/GEOMGUI/GEOMGUI_OCCSelector.h b/src/GEOMGUI/GEOMGUI_OCCSelector.h index d082d4e86..758ac631d 100644 --- a/src/GEOMGUI/GEOMGUI_OCCSelector.h +++ b/src/GEOMGUI/GEOMGUI_OCCSelector.h @@ -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/src/GEOMGUI/GEOMGUI_Selection.cxx b/src/GEOMGUI/GEOMGUI_Selection.cxx index 4d7a490b0..100b5270e 100644 --- a/src/GEOMGUI/GEOMGUI_Selection.cxx +++ b/src/GEOMGUI/GEOMGUI_Selection.cxx @@ -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 @@ -18,6 +18,7 @@ // 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 : GEOMGUI_Selection.cxx // Author : Alexander SOLOVYOV, Open CASCADE S.A.S. (alexander.solovyov@opencascade.com) diff --git a/src/GEOMGUI/GEOMGUI_Selection.h b/src/GEOMGUI/GEOMGUI_Selection.h index acef7e196..8e367b1c3 100644 --- a/src/GEOMGUI/GEOMGUI_Selection.h +++ b/src/GEOMGUI/GEOMGUI_Selection.h @@ -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 @@ -18,6 +18,7 @@ // 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 : GEOMGUI_Selection.h // Author : Alexander SOLOVYOV, Open CASCADE S.A.S. (alexander.solovyov@opencascade.com) diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index 4b362a702..d4b40cb5c 100644 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -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/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h index 8cd96e5d1..cb177d736 100644 --- a/src/GEOMGUI/GEOM_Displayer.h +++ b/src/GEOMGUI/GEOM_Displayer.h @@ -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/src/GEOMGUI/GEOM_GEOMGUI.hxx b/src/GEOMGUI/GEOM_GEOMGUI.hxx index 4017f21be..c398d3ac5 100755 --- a/src/GEOMGUI/GEOM_GEOMGUI.hxx +++ b/src/GEOMGUI/GEOM_GEOMGUI.hxx @@ -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/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts index 28275e13c..8024ed9cb 100644 --- a/src/GEOMGUI/GEOM_msg_en.ts +++ b/src/GEOMGUI/GEOM_msg_en.ts @@ -2106,6 +2106,10 @@ Please, select face, shell or solid and try again GEOM_SplitContinuity SplitContinuity + + GEOM_THICKNESS + Thickness + GEOM_TOLERANCE Tolerance @@ -5267,6 +5271,21 @@ Number of sketch points too small Please, select one or more sub-shapes + + GenerationGUI_PrismDlg + + GEOM_THICKENING + Thickening + + + GEOM_ADD_THICKNESS + Add thickness (edges or wires only) + + + GEOM_TOWARDS_INSIDE + Thicken towards the inside + + GroupGUI diff --git a/src/GEOMGUI/GEOM_msg_fr.ts b/src/GEOMGUI/GEOM_msg_fr.ts index 70fb7487d..7d6ae22cb 100644 --- a/src/GEOMGUI/GEOM_msg_fr.ts +++ b/src/GEOMGUI/GEOM_msg_fr.ts @@ -2090,6 +2090,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau GEOM_SplitContinuity Séparer continuité + + GEOM_THICKNESS + Epaisseur + GEOM_TOLERANCE Tolérance @@ -5250,6 +5254,21 @@ Le nombre de points n'est pas suffisant Choisissez un ou plusieurs sous-objets + + GenerationGUI_PrismDlg + + GEOM_THICKENING + Epaississement + + + GEOM_ADD_THICKNESS + Epaissir (arêtes ou contours uniquement) + + + GEOM_TOWARDS_INSIDE + Epaissir vers l'intérieur + + GroupGUI diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index e23e3f185..de3a7b815 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -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/src/GEOMGUI/GeometryGUI.h b/src/GEOMGUI/GeometryGUI.h index 34c19c6b2..167876789 100644 --- a/src/GEOMGUI/GeometryGUI.h +++ b/src/GEOMGUI/GeometryGUI.h @@ -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/src/GEOMGUI/GeometryGUI_Operations.h b/src/GEOMGUI/GeometryGUI_Operations.h index cea4c9048..d170eec02 100644 --- a/src/GEOMGUI/GeometryGUI_Operations.h +++ b/src/GEOMGUI/GeometryGUI_Operations.h @@ -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/src/GEOMGUI/Makefile.am b/src/GEOMGUI/Makefile.am index 71f187ae0..54bc852bd 100644 --- a/src/GEOMGUI/Makefile.am +++ b/src/GEOMGUI/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/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx index 3b2255a1f..b44e43ce3 100755 --- a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx @@ -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 @@ -15,6 +15,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx index 0bf85bd21..44372bb5b 100755 --- a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_ArcDriver.cxx b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx index 77ec4b0ba..5d8f15211 100644 --- a/src/GEOMImpl/GEOMImpl_ArcDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_ArcDriver.hxx b/src/GEOMImpl/GEOMImpl_ArcDriver.hxx index ccd0f06d5..1e4a6fef8 100644 --- a/src/GEOMImpl/GEOMImpl_ArcDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ArcDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx index 33ac44dcc..ceb145712 100644 --- a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx index 881ab28b3..190117df3 100644 --- a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx b/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx index 93af8d28b..8ed3d1cc0 100644 --- a/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx +++ b/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx @@ -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/src/GEOMImpl/GEOMImpl_Block6Explorer.hxx b/src/GEOMImpl/GEOMImpl_Block6Explorer.hxx index 9684e465d..984c27bd3 100644 --- a/src/GEOMImpl/GEOMImpl_Block6Explorer.hxx +++ b/src/GEOMImpl/GEOMImpl_Block6Explorer.hxx @@ -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/src/GEOMImpl/GEOMImpl_BlockDriver.cxx b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx index d50d24858..b0838a1b0 100644 --- a/src/GEOMImpl/GEOMImpl_BlockDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_BlockDriver.hxx b/src/GEOMImpl/GEOMImpl_BlockDriver.hxx index 49d78409b..0f5a07832 100644 --- a/src/GEOMImpl/GEOMImpl_BlockDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_BlockDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx index 78d277f2a..a0af1efd6 100644 --- a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include #include diff --git a/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx index 0ed0fb6b5..80e57116c 100644 --- a/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_BoxDriver.cxx b/src/GEOMImpl/GEOMImpl_BoxDriver.cxx index 5c0b20a6a..40dffa9f8 100644 --- a/src/GEOMImpl/GEOMImpl_BoxDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BoxDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_BoxDriver.hxx b/src/GEOMImpl/GEOMImpl_BoxDriver.hxx index e719958d1..fdb50a03e 100644 --- a/src/GEOMImpl/GEOMImpl_BoxDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_BoxDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx b/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx index d24bce73e..d0aff9a4f 100644 --- a/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx b/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx index 9c1f9ac04..b52356811 100644 --- a/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_CircleDriver.cxx b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx index e0c33a478..0cf7a12c3 100644 --- a/src/GEOMImpl/GEOMImpl_CircleDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include @@ -97,7 +98,8 @@ Standard_Integer GEOMImpl_CircleDriver::Execute(TFunction_Logbook& log) const Handle(GEOM_Function) aRefVector = aCI.GetVector(); if (!aRefVector.IsNull()) { TopoDS_Shape aShapeVec = aRefVector->GetValue(); - aV = GEOMUtils::GetVector(aShapeVec); + // take orientation of edge into account to avoid regressions, as it was implemented so + aV = GEOMUtils::GetVector(aShapeVec, Standard_True); } // Axes gp_Ax2 anAxes (aP, aV); diff --git a/src/GEOMImpl/GEOMImpl_CircleDriver.hxx b/src/GEOMImpl/GEOMImpl_CircleDriver.hxx index e16f9941f..d07441c46 100644 --- a/src/GEOMImpl/GEOMImpl_CircleDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_CircleDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_ConeDriver.cxx b/src/GEOMImpl/GEOMImpl_ConeDriver.cxx index 551bb904f..d75bb5212 100644 --- a/src/GEOMImpl/GEOMImpl_ConeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ConeDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_ConeDriver.hxx b/src/GEOMImpl/GEOMImpl_ConeDriver.hxx index 35a772838..811bd7707 100644 --- a/src/GEOMImpl/GEOMImpl_ConeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ConeDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_CopyDriver.cxx b/src/GEOMImpl/GEOMImpl_CopyDriver.cxx index 5d9f31591..b34279823 100644 --- a/src/GEOMImpl/GEOMImpl_CopyDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_CopyDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_CopyDriver.hxx b/src/GEOMImpl/GEOMImpl_CopyDriver.hxx index 8fd0f4d69..94fb0e69a 100644 --- a/src/GEOMImpl/GEOMImpl_CopyDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_CopyDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx b/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx index e381da9c9..f9a39ea9f 100644 --- a/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx b/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx index 055679c2e..e3d601023 100644 --- a/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_DiskDriver.cxx b/src/GEOMImpl/GEOMImpl_DiskDriver.cxx index 8876bc45f..49a004a67 100755 --- a/src/GEOMImpl/GEOMImpl_DiskDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_DiskDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_DiskDriver.hxx b/src/GEOMImpl/GEOMImpl_DiskDriver.hxx index d595e219d..19a758833 100755 --- a/src/GEOMImpl/GEOMImpl_DiskDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_DiskDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_DividedDiskDriver.cxx b/src/GEOMImpl/GEOMImpl_DividedDiskDriver.cxx index 105fa28b5..c1d0da36f 100644 --- a/src/GEOMImpl/GEOMImpl_DividedDiskDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_DividedDiskDriver.cxx @@ -1,23 +1,24 @@ -// Copyright (C) 2007-2008 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 +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. +// This library is 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. +// 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 +// 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 // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMImpl/GEOMImpl_DividedDiskDriver.hxx b/src/GEOMImpl/GEOMImpl_DividedDiskDriver.hxx index ef6f08f7c..bb2810329 100644 --- a/src/GEOMImpl/GEOMImpl_DividedDiskDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_DividedDiskDriver.hxx @@ -1,23 +1,24 @@ -// Copyright (C) 2007-2008 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 +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. +// This library is 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. +// 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 +// 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 // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMImpl_DividedDiskDriver_HXX #define _GEOMImpl_DividedDiskDriver_HXX diff --git a/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx b/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx index 90aa414da..beb4ef111 100644 --- a/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx b/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx index fda0a9273..47fdf0212 100644 --- a/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_ExportDriver.cxx b/src/GEOMImpl/GEOMImpl_ExportDriver.cxx index 27c5f8bb4..d1c5eab3b 100644 --- a/src/GEOMImpl/GEOMImpl_ExportDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ExportDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_ExportDriver.hxx b/src/GEOMImpl/GEOMImpl_ExportDriver.hxx index 806437da9..d1dd9b98a 100644 --- a/src/GEOMImpl/GEOMImpl_ExportDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ExportDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_FaceDriver.cxx b/src/GEOMImpl/GEOMImpl_FaceDriver.cxx index 708f8f450..197a03764 100755 --- a/src/GEOMImpl/GEOMImpl_FaceDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FaceDriver.cxx @@ -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 @@ -15,6 +15,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_FaceDriver.hxx b/src/GEOMImpl/GEOMImpl_FaceDriver.hxx index 0a1aee235..499b50e0f 100755 --- a/src/GEOMImpl/GEOMImpl_FaceDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FaceDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_Fillet1d.cxx b/src/GEOMImpl/GEOMImpl_Fillet1d.cxx index 0a648ad2c..18b1b31c8 100644 --- a/src/GEOMImpl/GEOMImpl_Fillet1d.cxx +++ b/src/GEOMImpl/GEOMImpl_Fillet1d.cxx @@ -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 @@ -15,6 +15,7 @@ // 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 : GEOMImpl_Fillet1d.cxx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_Fillet1d.hxx b/src/GEOMImpl/GEOMImpl_Fillet1d.hxx index 679e3fc70..86464d67a 100644 --- a/src/GEOMImpl/GEOMImpl_Fillet1d.hxx +++ b/src/GEOMImpl/GEOMImpl_Fillet1d.hxx @@ -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 @@ -15,6 +15,7 @@ // 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 : GEOMImpl_Fillet1d.hxx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx index 38a0ba318..657d8a205 100644 --- a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx @@ -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 @@ -15,6 +15,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx index dc8b9da89..b5f96467c 100644 --- a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx @@ -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 @@ -15,6 +15,7 @@ // 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 : GEOMImpl_Fillet1dDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx index 76049a6f4..f107de8e6 100755 --- a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx index c3ba4df28..1a24255cb 100755 --- a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_FilletDriver.cxx b/src/GEOMImpl/GEOMImpl_FilletDriver.cxx index 01d1dcd2b..dad8f968e 100644 --- a/src/GEOMImpl/GEOMImpl_FilletDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FilletDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_FilletDriver.hxx b/src/GEOMImpl/GEOMImpl_FilletDriver.hxx index b1ba69bb2..f85583b3b 100644 --- a/src/GEOMImpl/GEOMImpl_FilletDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FilletDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_FillingDriver.cxx b/src/GEOMImpl/GEOMImpl_FillingDriver.cxx index 0b47281ec..1907c7e53 100644 --- a/src/GEOMImpl/GEOMImpl_FillingDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FillingDriver.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_FillingDriver.hxx b/src/GEOMImpl/GEOMImpl_FillingDriver.hxx index 0fb90d0aa..c5ddff99d 100644 --- a/src/GEOMImpl/GEOMImpl_FillingDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FillingDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_Gen.cxx b/src/GEOMImpl/GEOMImpl_Gen.cxx index f8f02247d..131e8d451 100644 --- a/src/GEOMImpl/GEOMImpl_Gen.cxx +++ b/src/GEOMImpl/GEOMImpl_Gen.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifdef WNT #pragma warning( disable:4786 ) diff --git a/src/GEOMImpl/GEOMImpl_Gen.hxx b/src/GEOMImpl/GEOMImpl_Gen.hxx index 8378dbe55..ed9e7752d 100644 --- a/src/GEOMImpl/GEOMImpl_Gen.hxx +++ b/src/GEOMImpl/GEOMImpl_Gen.hxx @@ -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/src/GEOMImpl/GEOMImpl_GlueDriver.cxx b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx index 8de926b7c..bd4ca1b1b 100644 --- a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_GlueDriver.hxx b/src/GEOMImpl/GEOMImpl_GlueDriver.hxx index 9337f2782..cc5ede3e2 100644 --- a/src/GEOMImpl/GEOMImpl_GlueDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_GlueDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_HealingDriver.cxx b/src/GEOMImpl/GEOMImpl_HealingDriver.cxx index 7771033fb..75107e9ea 100644 --- a/src/GEOMImpl/GEOMImpl_HealingDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_HealingDriver.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_HealingDriver.hxx b/src/GEOMImpl/GEOMImpl_HealingDriver.hxx index f1d740d6f..c13caf83b 100644 --- a/src/GEOMImpl/GEOMImpl_HealingDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_HealingDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx index 2698619b1..27a6efcc9 100644 --- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx index 3ce36cd27..6dfddf29f 100644 --- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOMImpl_I3DPrimOperations_HXX_ #define _GEOMImpl_I3DPrimOperations_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_I3DSketcher.hxx b/src/GEOMImpl/GEOMImpl_I3DSketcher.hxx index 4f4c9664d..4f6ec101a 100755 --- a/src/GEOMImpl/GEOMImpl_I3DSketcher.hxx +++ b/src/GEOMImpl/GEOMImpl_I3DSketcher.hxx @@ -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 @@ -15,6 +15,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// //NOTE: This is an interface to a function for the Sketcher creation. diff --git a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx index 58e8f837e..594dd255b 100644 --- a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx @@ -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/src/GEOMImpl/GEOMImpl_IAdvancedOperations.hxx b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.hxx index 5611824cb..401ab372d 100644 --- a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.hxx @@ -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/src/GEOMImpl/GEOMImpl_IArc.hxx b/src/GEOMImpl/GEOMImpl_IArc.hxx index 7927ef77b..d5702eec6 100644 --- a/src/GEOMImpl/GEOMImpl_IArc.hxx +++ b/src/GEOMImpl/GEOMImpl_IArc.hxx @@ -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/src/GEOMImpl/GEOMImpl_IArchimede.hxx b/src/GEOMImpl/GEOMImpl_IArchimede.hxx index 68721becf..3dba418c6 100644 --- a/src/GEOMImpl/GEOMImpl_IArchimede.hxx +++ b/src/GEOMImpl/GEOMImpl_IArchimede.hxx @@ -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/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx b/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx index ae1d5959f..8629a1ea4 100644 --- a/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_IBasicOperations.hxx b/src/GEOMImpl/GEOMImpl_IBasicOperations.hxx index 736e8afc0..4463de850 100644 --- a/src/GEOMImpl/GEOMImpl_IBasicOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IBasicOperations.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOMImpl_IBasicOperations_HXX_ #define _GEOMImpl_IBasicOperations_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_IBlockTrsf.hxx b/src/GEOMImpl/GEOMImpl_IBlockTrsf.hxx index 5505f3c20..30785f4c7 100644 --- a/src/GEOMImpl/GEOMImpl_IBlockTrsf.hxx +++ b/src/GEOMImpl/GEOMImpl_IBlockTrsf.hxx @@ -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/src/GEOMImpl/GEOMImpl_IBlocks.hxx b/src/GEOMImpl/GEOMImpl_IBlocks.hxx index c237641d5..ae9454195 100644 --- a/src/GEOMImpl/GEOMImpl_IBlocks.hxx +++ b/src/GEOMImpl/GEOMImpl_IBlocks.hxx @@ -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/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx index 27d432337..274c82e00 100644 --- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifdef WNT #pragma warning( disable:4786 ) diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx index 8a34d5510..1ede9b6db 100644 --- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOMImpl_IBlocksOperations_HXX_ #define _GEOMImpl_IBlocksOperations_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_IBoolean.hxx b/src/GEOMImpl/GEOMImpl_IBoolean.hxx index 39696d85c..54c246740 100644 --- a/src/GEOMImpl/GEOMImpl_IBoolean.hxx +++ b/src/GEOMImpl/GEOMImpl_IBoolean.hxx @@ -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/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx b/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx index 3be15dbeb..3db2537ec 100644 --- a/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx @@ -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/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx b/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx index 75a094544..ff93dcc89 100644 --- a/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx @@ -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/src/GEOMImpl/GEOMImpl_IBox.hxx b/src/GEOMImpl/GEOMImpl_IBox.hxx index 006900598..ecd9d7ed2 100644 --- a/src/GEOMImpl/GEOMImpl_IBox.hxx +++ b/src/GEOMImpl/GEOMImpl_IBox.hxx @@ -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/src/GEOMImpl/GEOMImpl_IChamfer.hxx b/src/GEOMImpl/GEOMImpl_IChamfer.hxx index a06d14f48..9a50b5695 100644 --- a/src/GEOMImpl/GEOMImpl_IChamfer.hxx +++ b/src/GEOMImpl/GEOMImpl_IChamfer.hxx @@ -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/src/GEOMImpl/GEOMImpl_ICircle.hxx b/src/GEOMImpl/GEOMImpl_ICircle.hxx index 12f1b5c2b..c05ccb3d9 100644 --- a/src/GEOMImpl/GEOMImpl_ICircle.hxx +++ b/src/GEOMImpl/GEOMImpl_ICircle.hxx @@ -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/src/GEOMImpl/GEOMImpl_ICone.hxx b/src/GEOMImpl/GEOMImpl_ICone.hxx index 351e18f45..d3708088d 100644 --- a/src/GEOMImpl/GEOMImpl_ICone.hxx +++ b/src/GEOMImpl/GEOMImpl_ICone.hxx @@ -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/src/GEOMImpl/GEOMImpl_ICopy.hxx b/src/GEOMImpl/GEOMImpl_ICopy.hxx index 8d7b218cb..cac5f3763 100644 --- a/src/GEOMImpl/GEOMImpl_ICopy.hxx +++ b/src/GEOMImpl/GEOMImpl_ICopy.hxx @@ -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/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx index 60983a177..017967785 100644 --- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifdef WNT // E.A. : On windows with python 2.6, there is a conflict diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx index f3e93170d..8bdd6c239 100644 --- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOMImpl_ICurvesOperations_HXX_ #define _GEOMImpl_ICurvesOperations_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_ICylinder.hxx b/src/GEOMImpl/GEOMImpl_ICylinder.hxx index 236eabdc9..3ff581553 100644 --- a/src/GEOMImpl/GEOMImpl_ICylinder.hxx +++ b/src/GEOMImpl/GEOMImpl_ICylinder.hxx @@ -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/src/GEOMImpl/GEOMImpl_IDisk.hxx b/src/GEOMImpl/GEOMImpl_IDisk.hxx index 94d4ad96c..ede4ff0ac 100755 --- a/src/GEOMImpl/GEOMImpl_IDisk.hxx +++ b/src/GEOMImpl/GEOMImpl_IDisk.hxx @@ -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/src/GEOMImpl/GEOMImpl_IDividedDisk.hxx b/src/GEOMImpl/GEOMImpl_IDividedDisk.hxx index 8a934bff5..3d2be4a4f 100644 --- a/src/GEOMImpl/GEOMImpl_IDividedDisk.hxx +++ b/src/GEOMImpl/GEOMImpl_IDividedDisk.hxx @@ -1,23 +1,24 @@ -// Copyright (C) 2007-2008 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 +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. +// This library is 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. +// 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 +// 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 // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMImpl_IDividedDisk_HXX_ #define _GEOMImpl_IDividedDisk_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_IEllipse.hxx b/src/GEOMImpl/GEOMImpl_IEllipse.hxx index a77b7b8e4..2e8374f83 100644 --- a/src/GEOMImpl/GEOMImpl_IEllipse.hxx +++ b/src/GEOMImpl/GEOMImpl_IEllipse.hxx @@ -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/src/GEOMImpl/GEOMImpl_IFace.hxx b/src/GEOMImpl/GEOMImpl_IFace.hxx index 11e9e5d7f..7973d1ad9 100755 --- a/src/GEOMImpl/GEOMImpl_IFace.hxx +++ b/src/GEOMImpl/GEOMImpl_IFace.hxx @@ -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/src/GEOMImpl/GEOMImpl_IFillet.hxx b/src/GEOMImpl/GEOMImpl_IFillet.hxx index 8bcea7c67..7233e6f90 100644 --- a/src/GEOMImpl/GEOMImpl_IFillet.hxx +++ b/src/GEOMImpl/GEOMImpl_IFillet.hxx @@ -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/src/GEOMImpl/GEOMImpl_IFillet1d.hxx b/src/GEOMImpl/GEOMImpl_IFillet1d.hxx index eb3ef0ee6..e8a03e429 100644 --- a/src/GEOMImpl/GEOMImpl_IFillet1d.hxx +++ b/src/GEOMImpl/GEOMImpl_IFillet1d.hxx @@ -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 @@ -15,6 +15,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// //NOTE: This is an interface to a function for the Fillet1d and creation. diff --git a/src/GEOMImpl/GEOMImpl_IFillet2d.hxx b/src/GEOMImpl/GEOMImpl_IFillet2d.hxx index 5f68d9425..9b8f30f69 100755 --- a/src/GEOMImpl/GEOMImpl_IFillet2d.hxx +++ b/src/GEOMImpl/GEOMImpl_IFillet2d.hxx @@ -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/src/GEOMImpl/GEOMImpl_IFilling.hxx b/src/GEOMImpl/GEOMImpl_IFilling.hxx index b08de436e..e6584675f 100644 --- a/src/GEOMImpl/GEOMImpl_IFilling.hxx +++ b/src/GEOMImpl/GEOMImpl_IFilling.hxx @@ -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/src/GEOMImpl/GEOMImpl_IGlue.hxx b/src/GEOMImpl/GEOMImpl_IGlue.hxx index ef53547e0..a2fcdb4f1 100644 --- a/src/GEOMImpl/GEOMImpl_IGlue.hxx +++ b/src/GEOMImpl/GEOMImpl_IGlue.hxx @@ -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/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx index 49675b0ad..b5dceb10c 100644 --- a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_IGroupOperations.hxx b/src/GEOMImpl/GEOMImpl_IGroupOperations.hxx index 6b8d485ec..66f688324 100644 --- a/src/GEOMImpl/GEOMImpl_IGroupOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IGroupOperations.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOMImpl_IGroupOperations_HXX_ #define _GEOMImpl_IGroupOperations_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_IHealing.hxx b/src/GEOMImpl/GEOMImpl_IHealing.hxx index 2ee387908..1de1ca5b2 100755 --- a/src/GEOMImpl/GEOMImpl_IHealing.hxx +++ b/src/GEOMImpl/GEOMImpl_IHealing.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include "GEOM_Function.hxx" diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx index 3db0e6a93..8d47e67b3 100644 --- a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx @@ -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/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx index 7434d937c..b946861ee 100644 --- a/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOMImpl_IHealingOperations_HXX_ #define _GEOMImpl_IHealingOperations_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_IImportExport.hxx b/src/GEOMImpl/GEOMImpl_IImportExport.hxx index 282bab97d..ee34d182f 100644 --- a/src/GEOMImpl/GEOMImpl_IImportExport.hxx +++ b/src/GEOMImpl/GEOMImpl_IImportExport.hxx @@ -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/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx index 4fecfbca9..39ca36f16 100644 --- a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx index 56ea89d42..2b75ab840 100644 --- a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOMImpl_IInsertOperations_HXX_ #define _GEOMImpl_IInsertOperations_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_ILine.hxx b/src/GEOMImpl/GEOMImpl_ILine.hxx index 2bb7fdf91..da3a64ccb 100644 --- a/src/GEOMImpl/GEOMImpl_ILine.hxx +++ b/src/GEOMImpl/GEOMImpl_ILine.hxx @@ -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/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx index 76b8f0563..d68a404a1 100644 --- a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx index e3877b63b..d88c1e8c6 100644 --- a/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOMImpl_ILocalOperations_HXX_ #define _GEOMImpl_ILocalOperations_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_IMarker.hxx b/src/GEOMImpl/GEOMImpl_IMarker.hxx index a756a94ca..fccafd7c9 100644 --- a/src/GEOMImpl/GEOMImpl_IMarker.hxx +++ b/src/GEOMImpl/GEOMImpl_IMarker.hxx @@ -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/src/GEOMImpl/GEOMImpl_IMeasure.hxx b/src/GEOMImpl/GEOMImpl_IMeasure.hxx index a58ffcbb5..2390a5d91 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasure.hxx +++ b/src/GEOMImpl/GEOMImpl_IMeasure.hxx @@ -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/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx index b81e5c7ab..78825e1f1 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx index 1a9071838..dd85841ee 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOMImpl_IMeasureOperations_HXX_ #define _GEOMImpl_IMeasureOperations_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_IMirror.hxx b/src/GEOMImpl/GEOMImpl_IMirror.hxx index 569f95f96..d9219563b 100644 --- a/src/GEOMImpl/GEOMImpl_IMirror.hxx +++ b/src/GEOMImpl/GEOMImpl_IMirror.hxx @@ -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/src/GEOMImpl/GEOMImpl_IOffset.hxx b/src/GEOMImpl/GEOMImpl_IOffset.hxx index f70a2a1d2..6f014c400 100644 --- a/src/GEOMImpl/GEOMImpl_IOffset.hxx +++ b/src/GEOMImpl/GEOMImpl_IOffset.hxx @@ -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/src/GEOMImpl/GEOMImpl_IPartition.hxx b/src/GEOMImpl/GEOMImpl_IPartition.hxx index ae2dd72be..14f08e695 100644 --- a/src/GEOMImpl/GEOMImpl_IPartition.hxx +++ b/src/GEOMImpl/GEOMImpl_IPartition.hxx @@ -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/src/GEOMImpl/GEOMImpl_IPipe.hxx b/src/GEOMImpl/GEOMImpl_IPipe.hxx index fe349157a..208d349eb 100644 --- a/src/GEOMImpl/GEOMImpl_IPipe.hxx +++ b/src/GEOMImpl/GEOMImpl_IPipe.hxx @@ -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/src/GEOMImpl/GEOMImpl_IPipeBiNormal.hxx b/src/GEOMImpl/GEOMImpl_IPipeBiNormal.hxx index 14a86dba0..c5eddceb2 100644 --- a/src/GEOMImpl/GEOMImpl_IPipeBiNormal.hxx +++ b/src/GEOMImpl/GEOMImpl_IPipeBiNormal.hxx @@ -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/src/GEOMImpl/GEOMImpl_IPipeDiffSect.hxx b/src/GEOMImpl/GEOMImpl_IPipeDiffSect.hxx index 393e65a47..fcfaa3b91 100644 --- a/src/GEOMImpl/GEOMImpl_IPipeDiffSect.hxx +++ b/src/GEOMImpl/GEOMImpl_IPipeDiffSect.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// //NOTE: This is an intreface to a function for the Pipe creation. diff --git a/src/GEOMImpl/GEOMImpl_IPipePath.hxx b/src/GEOMImpl/GEOMImpl_IPipePath.hxx index 7b2ccd40a..cf7e45ad2 100644 --- a/src/GEOMImpl/GEOMImpl_IPipePath.hxx +++ b/src/GEOMImpl/GEOMImpl_IPipePath.hxx @@ -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 @@ -15,6 +15,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // NOTE: This is an interface to the function RestorePath. diff --git a/src/GEOMImpl/GEOMImpl_IPipeShellSect.hxx b/src/GEOMImpl/GEOMImpl_IPipeShellSect.hxx index 3061153f0..d8a963fca 100644 --- a/src/GEOMImpl/GEOMImpl_IPipeShellSect.hxx +++ b/src/GEOMImpl/GEOMImpl_IPipeShellSect.hxx @@ -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 @@ -15,6 +15,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// //NOTE: This is an intreface to a function for the Pipe creation. diff --git a/src/GEOMImpl/GEOMImpl_IPipeTShape.hxx b/src/GEOMImpl/GEOMImpl_IPipeTShape.hxx index 981280427..8d9b60a5b 100644 --- a/src/GEOMImpl/GEOMImpl_IPipeTShape.hxx +++ b/src/GEOMImpl/GEOMImpl_IPipeTShape.hxx @@ -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 @@ -15,6 +15,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOMImpl_IPipeTShape_HXX_ #define _GEOMImpl_IPipeTShape_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_IPlane.hxx b/src/GEOMImpl/GEOMImpl_IPlane.hxx index ebdca4a7b..2f64fcf5f 100644 --- a/src/GEOMImpl/GEOMImpl_IPlane.hxx +++ b/src/GEOMImpl/GEOMImpl_IPlane.hxx @@ -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/src/GEOMImpl/GEOMImpl_IPoint.hxx b/src/GEOMImpl/GEOMImpl_IPoint.hxx index 85267e0ec..e3d1a8ed2 100755 --- a/src/GEOMImpl/GEOMImpl_IPoint.hxx +++ b/src/GEOMImpl/GEOMImpl_IPoint.hxx @@ -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/src/GEOMImpl/GEOMImpl_IPolyline.hxx b/src/GEOMImpl/GEOMImpl_IPolyline.hxx index 3375e8721..044db5e0d 100644 --- a/src/GEOMImpl/GEOMImpl_IPolyline.hxx +++ b/src/GEOMImpl/GEOMImpl_IPolyline.hxx @@ -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/src/GEOMImpl/GEOMImpl_IPosition.hxx b/src/GEOMImpl/GEOMImpl_IPosition.hxx index ccfc0505b..363cd6e93 100644 --- a/src/GEOMImpl/GEOMImpl_IPosition.hxx +++ b/src/GEOMImpl/GEOMImpl_IPosition.hxx @@ -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/src/GEOMImpl/GEOMImpl_IPrism.hxx b/src/GEOMImpl/GEOMImpl_IPrism.hxx index 0e28b29ac..cc20ef6cc 100644 --- a/src/GEOMImpl/GEOMImpl_IPrism.hxx +++ b/src/GEOMImpl/GEOMImpl_IPrism.hxx @@ -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/src/GEOMImpl/GEOMImpl_IRevolution.hxx b/src/GEOMImpl/GEOMImpl_IRevolution.hxx index ffca037bb..3452ae300 100644 --- a/src/GEOMImpl/GEOMImpl_IRevolution.hxx +++ b/src/GEOMImpl/GEOMImpl_IRevolution.hxx @@ -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/src/GEOMImpl/GEOMImpl_IRotate.hxx b/src/GEOMImpl/GEOMImpl_IRotate.hxx index cbe19f34a..2f114e870 100644 --- a/src/GEOMImpl/GEOMImpl_IRotate.hxx +++ b/src/GEOMImpl/GEOMImpl_IRotate.hxx @@ -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/src/GEOMImpl/GEOMImpl_IScale.hxx b/src/GEOMImpl/GEOMImpl_IScale.hxx index 54731b8bf..e7a119c3b 100644 --- a/src/GEOMImpl/GEOMImpl_IScale.hxx +++ b/src/GEOMImpl/GEOMImpl_IScale.hxx @@ -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/src/GEOMImpl/GEOMImpl_IShapes.hxx b/src/GEOMImpl/GEOMImpl_IShapes.hxx index e3238cb79..ac106ed74 100644 --- a/src/GEOMImpl/GEOMImpl_IShapes.hxx +++ b/src/GEOMImpl/GEOMImpl_IShapes.hxx @@ -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/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx index fd1771a6a..8f31e75a2 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx @@ -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 @@ -18,6 +18,7 @@ // 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 : GEOMImpl_IShapesOperations.cxx // Created : @@ -1177,7 +1178,7 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::GetExistingSubO for (; anIt.More(); anIt.Next()) { TCollection_ExtendedString anEntry = anIt.Value(); Standard_Integer aStrLen = anEntry.LengthOfCString(); - char* anEntryStr = new char[aStrLen]; + char* anEntryStr = new char[aStrLen+1]; anEntry.ToUTF8CString(anEntryStr); Handle(GEOM_Object) anObj = GetEngine()->GetObject(GetDocID(), anEntryStr, false); if (!anObj.IsNull()) { diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx index 745142c8c..72a5de5ff 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx @@ -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/src/GEOMImpl/GEOMImpl_ISketcher.hxx b/src/GEOMImpl/GEOMImpl_ISketcher.hxx index 0918083a5..2139f6486 100644 --- a/src/GEOMImpl/GEOMImpl_ISketcher.hxx +++ b/src/GEOMImpl/GEOMImpl_ISketcher.hxx @@ -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/src/GEOMImpl/GEOMImpl_ISphere.hxx b/src/GEOMImpl/GEOMImpl_ISphere.hxx index d5bcf07ee..a53e0fe20 100644 --- a/src/GEOMImpl/GEOMImpl_ISphere.hxx +++ b/src/GEOMImpl/GEOMImpl_ISphere.hxx @@ -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/src/GEOMImpl/GEOMImpl_ISpline.hxx b/src/GEOMImpl/GEOMImpl_ISpline.hxx index e7f8b076a..20ab3030d 100644 --- a/src/GEOMImpl/GEOMImpl_ISpline.hxx +++ b/src/GEOMImpl/GEOMImpl_ISpline.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // NOTE: This is an interface to a function for the Spline creation. diff --git a/src/GEOMImpl/GEOMImpl_IThruSections.hxx b/src/GEOMImpl/GEOMImpl_IThruSections.hxx index b78157131..415334e65 100644 --- a/src/GEOMImpl/GEOMImpl_IThruSections.hxx +++ b/src/GEOMImpl/GEOMImpl_IThruSections.hxx @@ -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/src/GEOMImpl/GEOMImpl_ITorus.hxx b/src/GEOMImpl/GEOMImpl_ITorus.hxx index 3c0c7b212..b28a6fed4 100644 --- a/src/GEOMImpl/GEOMImpl_ITorus.hxx +++ b/src/GEOMImpl/GEOMImpl_ITorus.hxx @@ -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/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx index c296d9c58..0c0714371 100644 --- a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx b/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx index a003f0fb9..a6c6a9714 100644 --- a/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOMImpl_ITransformOperations_HXX_ #define _GEOMImpl_ITransformOperations_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_ITranslate.hxx b/src/GEOMImpl/GEOMImpl_ITranslate.hxx index 4abbdcc86..50d09ea58 100755 --- a/src/GEOMImpl/GEOMImpl_ITranslate.hxx +++ b/src/GEOMImpl/GEOMImpl_ITranslate.hxx @@ -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/src/GEOMImpl/GEOMImpl_IVector.hxx b/src/GEOMImpl/GEOMImpl_IVector.hxx index 02a8dc8a9..cbe71f66c 100644 --- a/src/GEOMImpl/GEOMImpl_IVector.hxx +++ b/src/GEOMImpl/GEOMImpl_IVector.hxx @@ -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/src/GEOMImpl/GEOMImpl_ImportDriver.cxx b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx index 748a5a735..2122e643e 100644 --- a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_ImportDriver.hxx b/src/GEOMImpl/GEOMImpl_ImportDriver.hxx index 265e5ac4c..b1ba6dc72 100644 --- a/src/GEOMImpl/GEOMImpl_ImportDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ImportDriver.hxx @@ -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 @@ -18,6 +18,7 @@ // 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 : GEOMImpl_ImportDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_LineDriver.cxx b/src/GEOMImpl/GEOMImpl_LineDriver.cxx index 0ec1efec4..73d6bbb95 100644 --- a/src/GEOMImpl/GEOMImpl_LineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_LineDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_LineDriver.hxx b/src/GEOMImpl/GEOMImpl_LineDriver.hxx index 01d24c309..d68092215 100644 --- a/src/GEOMImpl/GEOMImpl_LineDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_LineDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx b/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx index 604d65da1..266ad0bd6 100644 --- a/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx b/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx index eafcc60ef..1ca7b7fdf 100644 --- a/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx b/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx index 33ead5986..54989d8e2 100644 --- a/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx b/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx index aa49703b1..8a7702931 100644 --- a/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx b/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx index 3c08295b9..3a7c98f91 100644 --- a/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx b/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx index c9d7cf497..3f6e10141 100644 --- a/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx index 63d945549..2c870d03c 100644 --- a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx @@ -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 @@ -35,6 +35,8 @@ #include #include +#include + #include #include @@ -45,6 +47,8 @@ #include #include +#include "utilities.h" + //======================================================================= //function : GetID //purpose : @@ -117,6 +121,15 @@ Standard_Integer GEOMImpl_OffsetDriver::Execute(TFunction_Logbook& log) const } else if (aType == OFFSET_THICKENING || aType == OFFSET_THICKENING_COPY) { + BRepClass3d_SolidClassifier aClassifier = BRepClass3d_SolidClassifier(aShapeBase); + aClassifier.PerformInfinitePoint(Precision::Confusion()); + if (aClassifier.State()==TopAbs_IN) + { + // If the generated pipe faces normals are oriented towards the inside, the offset is negative + // so that the thickening is still towards outside + anOffset=-anOffset; + } + BRepOffset_MakeOffset myOffsetShape(aShapeBase, anOffset, aTol, BRepOffset_Skin, Standard_False, Standard_False, GeomAbs_Intersection, Standard_True); @@ -125,6 +138,15 @@ Standard_Integer GEOMImpl_OffsetDriver::Execute(TFunction_Logbook& log) const StdFail_NotDone::Raise("Thickening construction failed"); } aShape = myOffsetShape.Shape(); + + // Control the solid orientation. This is mostly done to fix a bug in case of extrusion + // of a circle. The built solid is then badly oriented + BRepClass3d_SolidClassifier anotherClassifier = BRepClass3d_SolidClassifier(aShape); + anotherClassifier.PerformInfinitePoint(Precision::Confusion()); + if (anotherClassifier.State()==TopAbs_IN) + { + aShape.Reverse(); + } } if (aShape.IsNull()) return 0; diff --git a/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx b/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx index 3d9c2974e..056bfe44b 100644 --- a/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx index 72c03e5bb..04363aba5 100644 --- a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx b/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx index 10b250455..2c2d7c60e 100644 --- a/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_PipeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx index c03d62d5c..50160d3bc 100644 --- a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.hxx b/src/GEOMImpl/GEOMImpl_PipeDriver.hxx index 829072875..38975b64b 100644 --- a/src/GEOMImpl/GEOMImpl_PipeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PipeDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx b/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx index 5acf28f12..91962183d 100644 --- a/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx b/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx index 36bf36314..3cefc6ff5 100644 --- a/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx @@ -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 @@ -18,6 +18,7 @@ // 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 : GEOMImpl_PipePathDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_PipeTShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeTShapeDriver.cxx index 700c1163c..7a36593ca 100644 --- a/src/GEOMImpl/GEOMImpl_PipeTShapeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PipeTShapeDriver.cxx @@ -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 @@ -15,6 +15,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_PipeTShapeDriver.hxx b/src/GEOMImpl/GEOMImpl_PipeTShapeDriver.hxx index 19196fedf..0179b9121 100644 --- a/src/GEOMImpl/GEOMImpl_PipeTShapeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PipeTShapeDriver.hxx @@ -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 @@ -15,6 +15,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOMImpl_PipeTShapeDriver_HXX #define _GEOMImpl_PipeTShapeDriver_HXX diff --git a/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx b/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx index 8fc83e24e..16878565c 100644 --- a/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx b/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx index c5cc4678e..54baf0982 100644 --- a/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_PointDriver.cxx b/src/GEOMImpl/GEOMImpl_PointDriver.cxx index 832fdc15c..e08547a8e 100644 --- a/src/GEOMImpl/GEOMImpl_PointDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PointDriver.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_PointDriver.hxx b/src/GEOMImpl/GEOMImpl_PointDriver.hxx index 44841b5e2..132307c87 100644 --- a/src/GEOMImpl/GEOMImpl_PointDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PointDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx b/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx index abeac9b21..c2c893879 100644 --- a/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx b/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx index 690c9489d..b14bbc84d 100644 --- a/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_PositionDriver.cxx b/src/GEOMImpl/GEOMImpl_PositionDriver.cxx index 73aed0fa2..63ab02291 100644 --- a/src/GEOMImpl/GEOMImpl_PositionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PositionDriver.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_PositionDriver.hxx b/src/GEOMImpl/GEOMImpl_PositionDriver.hxx index debb73126..0b774ed61 100644 --- a/src/GEOMImpl/GEOMImpl_PositionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PositionDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_PrismDriver.cxx b/src/GEOMImpl/GEOMImpl_PrismDriver.cxx index ae25ae0b8..ca12bbc66 100644 --- a/src/GEOMImpl/GEOMImpl_PrismDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PrismDriver.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_PrismDriver.hxx b/src/GEOMImpl/GEOMImpl_PrismDriver.hxx index b7adffaf3..c900fca38 100644 --- a/src/GEOMImpl/GEOMImpl_PrismDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PrismDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx b/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx index 9cb803d7a..7fa97753a 100644 --- a/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx b/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx index 5243d47ad..9ee1d9407 100644 --- a/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx b/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx index 44e68d973..8b3b25827 100644 --- a/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx b/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx index 35d392778..296d87e3e 100644 --- a/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_RotateDriver.cxx b/src/GEOMImpl/GEOMImpl_RotateDriver.cxx index 036538018..fc6c7ebda 100644 --- a/src/GEOMImpl/GEOMImpl_RotateDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_RotateDriver.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include @@ -98,7 +99,8 @@ Standard_Integer GEOMImpl_RotateDriver::Execute(TFunction_Logbook& log) const Handle(GEOM_Function) anAxis = RI.GetAxis(); if (anAxis.IsNull()) return 0; TopoDS_Shape A = anAxis->GetValue(); - gp_Vec aV = GEOMUtils::GetVector(A); + // do not take into account edge orientation (it is correct) + gp_Vec aV = GEOMUtils::GetVector(A, Standard_False); TopoDS_Edge anEdge = TopoDS::Edge(A); gp_Pnt aP1 = BRep_Tool::Pnt(TopExp::FirstVertex(anEdge)); gp_Dir aDir (aV); @@ -160,7 +162,8 @@ Standard_Integer GEOMImpl_RotateDriver::Execute(TFunction_Logbook& log) const Handle(GEOM_Function) anAxis = RI.GetAxis(); if (!anAxis.IsNull()) { TopoDS_Shape A = anAxis->GetValue(); - gp_Vec aV = GEOMUtils::GetVector(A); + // do not take into account edge orientation (it is correct) + gp_Vec aV = GEOMUtils::GetVector(A, Standard_False); TopoDS_Edge anEdge = TopoDS::Edge(A); aP1 = BRep_Tool::Pnt(TopExp::FirstVertex(anEdge)); D = gp_Dir(aV); @@ -206,7 +209,8 @@ Standard_Integer GEOMImpl_RotateDriver::Execute(TFunction_Logbook& log) const Handle(GEOM_Function) anAxis = RI.GetAxis(); if (!anAxis.IsNull()) { TopoDS_Shape A = anAxis->GetValue(); - gp_Vec aV = GEOMUtils::GetVector(A); + // do not take into account edge orientation (it is correct) + gp_Vec aV = GEOMUtils::GetVector(A, Standard_False); TopoDS_Edge anEdge = TopoDS::Edge(A); aP1 = BRep_Tool::Pnt(TopExp::FirstVertex(anEdge)); D = gp_Dir(aV); diff --git a/src/GEOMImpl/GEOMImpl_RotateDriver.hxx b/src/GEOMImpl/GEOMImpl_RotateDriver.hxx index c770afd6c..38907c425 100644 --- a/src/GEOMImpl/GEOMImpl_RotateDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_RotateDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx b/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx index b5fe870a1..667d36767 100644 --- a/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx b/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx index b71827c74..1fd8280d5 100644 --- a/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx index 12962ffc7..6dee4254b 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx index 87c55c501..7c1fcd1de 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx @@ -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 @@ -18,6 +18,7 @@ // 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 : GEOMImpl_ShapeDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx index 0ebe757d0..428377ca3 100644 --- a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx b/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx index 13acfcbeb..e824610ea 100644 --- a/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_SphereDriver.cxx b/src/GEOMImpl/GEOMImpl_SphereDriver.cxx index daacff0ac..d00ba25ef 100644 --- a/src/GEOMImpl/GEOMImpl_SphereDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_SphereDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_SphereDriver.hxx b/src/GEOMImpl/GEOMImpl_SphereDriver.hxx index 8e7f66c40..d9e239d26 100644 --- a/src/GEOMImpl/GEOMImpl_SphereDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_SphereDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_SplineDriver.cxx b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx index a94f0a279..af164fe7f 100644 --- a/src/GEOMImpl/GEOMImpl_SplineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include @@ -241,8 +242,9 @@ Standard_Integer GEOMImpl_SplineDriver::Execute(TFunction_Logbook& log) const TopoDS_Shape aVec1Sh = aVec1Ref->GetValue(); TopoDS_Shape aVec2Sh = aVec2Ref->GetValue(); - gp_Vec aV1 = GEOMUtils::GetVector(aVec1Sh); - gp_Vec aV2 = GEOMUtils::GetVector(aVec2Sh); + // take orientation of edge into account to avoid regressions, as it was implemented so + gp_Vec aV1 = GEOMUtils::GetVector(aVec1Sh, Standard_True); + gp_Vec aV2 = GEOMUtils::GetVector(aVec2Sh, Standard_True); GBC.Load(aV1, aV2, /*Scale*/Standard_True); } diff --git a/src/GEOMImpl/GEOMImpl_SplineDriver.hxx b/src/GEOMImpl/GEOMImpl_SplineDriver.hxx index 28202814a..9413dcaaa 100644 --- a/src/GEOMImpl/GEOMImpl_SplineDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_SplineDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx index 2ea0ccd27..3a63ca30c 100644 --- a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx index d750b63ff..d6dc91730 100644 --- a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_TorusDriver.cxx b/src/GEOMImpl/GEOMImpl_TorusDriver.cxx index 434135a84..cf77d8d52 100644 --- a/src/GEOMImpl/GEOMImpl_TorusDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_TorusDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_TorusDriver.hxx b/src/GEOMImpl/GEOMImpl_TorusDriver.hxx index a3947304d..40cf9f5b5 100644 --- a/src/GEOMImpl/GEOMImpl_TorusDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_TorusDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx b/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx index 1f6de2170..a76af8900 100644 --- a/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx b/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx index 687f21925..eb8ca0efe 100644 --- a/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx @@ -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/src/GEOMImpl/GEOMImpl_Types.hxx b/src/GEOMImpl/GEOMImpl_Types.hxx index a11558920..8f85c2ac4 100755 --- a/src/GEOMImpl/GEOMImpl_Types.hxx +++ b/src/GEOMImpl/GEOMImpl_Types.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // GEOM_Object types diff --git a/src/GEOMImpl/GEOMImpl_VectorDriver.cxx b/src/GEOMImpl/GEOMImpl_VectorDriver.cxx index 8e8cd9705..f691fdfa3 100644 --- a/src/GEOMImpl/GEOMImpl_VectorDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_VectorDriver.cxx @@ -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/src/GEOMImpl/GEOMImpl_VectorDriver.hxx b/src/GEOMImpl/GEOMImpl_VectorDriver.hxx index 8210bf0d7..cb3c535a4 100644 --- a/src/GEOMImpl/GEOMImpl_VectorDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_VectorDriver.hxx @@ -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/src/GEOMImpl/GEOM_GEOMImpl.hxx b/src/GEOMImpl/GEOM_GEOMImpl.hxx index 413561cbe..b019221ac 100755 --- a/src/GEOMImpl/GEOM_GEOMImpl.hxx +++ b/src/GEOMImpl/GEOM_GEOMImpl.hxx @@ -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/src/GEOMImpl/Makefile.am b/src/GEOMImpl/Makefile.am index f456551ce..9e22ef68d 100644 --- a/src/GEOMImpl/Makefile.am +++ b/src/GEOMImpl/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 @@ -15,6 +15,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# # GEOM GEOM : implementaion of GEOM_Gen.idl # File : Makefile.in diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx index 95b4507e8..9d6c00c1a 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx @@ -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/src/GEOMToolsGUI/GEOMToolsGUI.h b/src/GEOMToolsGUI/GEOMToolsGUI.h index 6e7e2f9b4..05f1a1708 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI.h @@ -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/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx index 1d87448c4..1c4f1c156 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx @@ -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/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx index 48cfb2b0b..7286cdffc 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx @@ -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/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h index 99778e9a5..ef20e2909 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h @@ -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/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.cxx index f6e065984..fd1ca3d63 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.cxx @@ -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/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.h index 8db7d4c27..def878ace 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.h @@ -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/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx index 478cc5710..c45fed176 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx @@ -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/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.h index 5efa2e25a..bf50239ad 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.h @@ -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/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx index 7a1952ad6..5ec94e274 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx @@ -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/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.h index b550ee235..873056dc3 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.h @@ -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/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx index 61c7c763d..6423f3e1c 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx @@ -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/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.h index c9f20598e..9423e5de8 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.h @@ -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/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx index 3e8b8ec1d..e4504d925 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx @@ -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/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h index 5ee0c90fa..bb4cd7d27 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h @@ -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/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx index 5d16cbe7b..a41be5949 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx @@ -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/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.h index 65d460d69..59091e67d 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.h @@ -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/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx index 55f7c92d2..e2f9f60fe 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx @@ -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/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h index 8a3debd2c..174890958 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h @@ -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/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx b/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx index b35820b28..892419680 100755 --- a/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx +++ b/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx @@ -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/src/GEOMToolsGUI/Makefile.am b/src/GEOMToolsGUI/Makefile.am index e77822def..437e43deb 100644 --- a/src/GEOMToolsGUI/Makefile.am +++ b/src/GEOMToolsGUI/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/src/GEOMUtils/GEOMUtils.cxx b/src/GEOMUtils/GEOMUtils.cxx index 0b02a04a6..f2c53523f 100644 --- a/src/GEOMUtils/GEOMUtils.cxx +++ b/src/GEOMUtils/GEOMUtils.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include @@ -143,7 +144,8 @@ gp_Ax3 GEOMUtils::GetPosition (const TopoDS_Shape& theShape) //function : GetVector //purpose : //======================================================================= -gp_Vec GEOMUtils::GetVector (const TopoDS_Shape& theShape) +gp_Vec GEOMUtils::GetVector (const TopoDS_Shape& theShape, + Standard_Boolean doConsiderOrientation) { if (theShape.IsNull()) Standard_NullObject::Raise("Null shape is given for a vector"); @@ -154,7 +156,7 @@ gp_Vec GEOMUtils::GetVector (const TopoDS_Shape& theShape) TopoDS_Edge anE = TopoDS::Edge(theShape); TopoDS_Vertex V1, V2; - TopExp::Vertices(anE, V1, V2, Standard_True); + TopExp::Vertices(anE, V1, V2, doConsiderOrientation); if (V1.IsNull() || V2.IsNull()) Standard_NullObject::Raise("Invalid edge is given, it must have two points"); diff --git a/src/GEOMUtils/GEOMUtils.hxx b/src/GEOMUtils/GEOMUtils.hxx index 37e06bbf9..64c34bd85 100644 --- a/src/GEOMUtils/GEOMUtils.hxx +++ b/src/GEOMUtils/GEOMUtils.hxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOMUtils_HXX_ #define _GEOMUtils_HXX_ @@ -55,8 +56,14 @@ class GEOMUtils { /*! * \brief Get vector, defined by the given edge. + * \param theShape The edge. + * \param doConsiderOrientation If True, take into account the edge orientation. + * \note It is recommended to use doConsiderOrientation=Standard_False, because + * the same edge can have different orientation depending on the way it was + * extracted from a shape. */ - Standard_EXPORT static gp_Vec GetVector (const TopoDS_Shape& theShape); + Standard_EXPORT static gp_Vec GetVector (const TopoDS_Shape& theShape, + Standard_Boolean doConsiderOrientation); /*! * \brief Sort shapes in the list by their coordinates. diff --git a/src/GEOMUtils/Makefile.am b/src/GEOMUtils/Makefile.am index 844ac94f2..73c1ebda4 100644 --- a/src/GEOMUtils/Makefile.am +++ b/src/GEOMUtils/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 @@ -15,6 +15,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# # GEOMUtils : implementaion of some common methods for GEOMImpl package # File : Makefile.am diff --git a/src/GEOM_I/GEOM_DumpPython.cc b/src/GEOM_I/GEOM_DumpPython.cc index 4661de78e..54d374521 100644 --- a/src/GEOM_I/GEOM_DumpPython.cc +++ b/src/GEOM_I/GEOM_DumpPython.cc @@ -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/src/GEOM_I/GEOM_GEOM_I.hxx b/src/GEOM_I/GEOM_GEOM_I.hxx index d57cf9de3..f1477c9d4 100755 --- a/src/GEOM_I/GEOM_GEOM_I.hxx +++ b/src/GEOM_I/GEOM_GEOM_I.hxx @@ -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/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index b034757f7..34ef37119 100644 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -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/src/GEOM_I/GEOM_Gen_i.hh b/src/GEOM_I/GEOM_Gen_i.hh index 0f45c54fe..35fc9ad75 100644 --- a/src/GEOM_I/GEOM_Gen_i.hh +++ b/src/GEOM_I/GEOM_Gen_i.hh @@ -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/src/GEOM_I/GEOM_I3DPrimOperations_i.cc b/src/GEOM_I/GEOM_I3DPrimOperations_i.cc index ee9ee2e4b..35382def5 100644 --- a/src/GEOM_I/GEOM_I3DPrimOperations_i.cc +++ b/src/GEOM_I/GEOM_I3DPrimOperations_i.cc @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOM_I/GEOM_I3DPrimOperations_i.hh b/src/GEOM_I/GEOM_I3DPrimOperations_i.hh index 6a03d8d42..9396cba3a 100644 --- a/src/GEOM_I/GEOM_I3DPrimOperations_i.hh +++ b/src/GEOM_I/GEOM_I3DPrimOperations_i.hh @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOM_I3DPrimOperations_i_HeaderFile #define _GEOM_I3DPrimOperations_i_HeaderFile diff --git a/src/GEOM_I/GEOM_IAdvancedOperations_i.cc b/src/GEOM_I/GEOM_IAdvancedOperations_i.cc index 9897b9785..3c39480c8 100644 --- a/src/GEOM_I/GEOM_IAdvancedOperations_i.cc +++ b/src/GEOM_I/GEOM_IAdvancedOperations_i.cc @@ -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 @@ -15,6 +15,7 @@ // 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 : GEOM_IAdvancedOperations.cc // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) diff --git a/src/GEOM_I/GEOM_IAdvancedOperations_i.hh b/src/GEOM_I/GEOM_IAdvancedOperations_i.hh index b341a9fed..2077bfb23 100644 --- a/src/GEOM_I/GEOM_IAdvancedOperations_i.hh +++ b/src/GEOM_I/GEOM_IAdvancedOperations_i.hh @@ -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 @@ -15,6 +15,7 @@ // 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 : GEOM_IAdvancedOperations.hh // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) diff --git a/src/GEOM_I/GEOM_IBasicOperations_i.cc b/src/GEOM_I/GEOM_IBasicOperations_i.cc index b5d674b7f..e5ce813cf 100644 --- a/src/GEOM_I/GEOM_IBasicOperations_i.cc +++ b/src/GEOM_I/GEOM_IBasicOperations_i.cc @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOM_I/GEOM_IBasicOperations_i.hh b/src/GEOM_I/GEOM_IBasicOperations_i.hh index 7861a06bc..8c974d574 100644 --- a/src/GEOM_I/GEOM_IBasicOperations_i.hh +++ b/src/GEOM_I/GEOM_IBasicOperations_i.hh @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOM_IBasicOperations_i_HeaderFile #define _GEOM_IBasicOperations_i_HeaderFile diff --git a/src/GEOM_I/GEOM_IBlocksOperations_i.cc b/src/GEOM_I/GEOM_IBlocksOperations_i.cc index c71432528..b25c0d164 100644 --- a/src/GEOM_I/GEOM_IBlocksOperations_i.cc +++ b/src/GEOM_I/GEOM_IBlocksOperations_i.cc @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOM_I/GEOM_IBlocksOperations_i.hh b/src/GEOM_I/GEOM_IBlocksOperations_i.hh index 6f5765092..a66e64458 100644 --- a/src/GEOM_I/GEOM_IBlocksOperations_i.hh +++ b/src/GEOM_I/GEOM_IBlocksOperations_i.hh @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOM_IBlocksOperations_i_HeaderFile #define _GEOM_IBlocksOperations_i_HeaderFile diff --git a/src/GEOM_I/GEOM_IBooleanOperations_i.cc b/src/GEOM_I/GEOM_IBooleanOperations_i.cc index d6ae76235..6afade797 100644 --- a/src/GEOM_I/GEOM_IBooleanOperations_i.cc +++ b/src/GEOM_I/GEOM_IBooleanOperations_i.cc @@ -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/src/GEOM_I/GEOM_IBooleanOperations_i.hh b/src/GEOM_I/GEOM_IBooleanOperations_i.hh index 3a31252b7..81885d879 100644 --- a/src/GEOM_I/GEOM_IBooleanOperations_i.hh +++ b/src/GEOM_I/GEOM_IBooleanOperations_i.hh @@ -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/src/GEOM_I/GEOM_ICurvesOperations_i.cc b/src/GEOM_I/GEOM_ICurvesOperations_i.cc index 88e381681..1a802dc52 100644 --- a/src/GEOM_I/GEOM_ICurvesOperations_i.cc +++ b/src/GEOM_I/GEOM_ICurvesOperations_i.cc @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOM_I/GEOM_ICurvesOperations_i.hh b/src/GEOM_I/GEOM_ICurvesOperations_i.hh index 07f4ce2a0..f91e7c41c 100644 --- a/src/GEOM_I/GEOM_ICurvesOperations_i.hh +++ b/src/GEOM_I/GEOM_ICurvesOperations_i.hh @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOM_ICurvesOperations_i_HeaderFile #define _GEOM_ICurvesOperations_i_HeaderFile diff --git a/src/GEOM_I/GEOM_IGroupOperations_i.cc b/src/GEOM_I/GEOM_IGroupOperations_i.cc index c129da936..7f9abfeda 100644 --- a/src/GEOM_I/GEOM_IGroupOperations_i.cc +++ b/src/GEOM_I/GEOM_IGroupOperations_i.cc @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOM_I/GEOM_IGroupOperations_i.hh b/src/GEOM_I/GEOM_IGroupOperations_i.hh index f213e8be2..937c9b6e6 100644 --- a/src/GEOM_I/GEOM_IGroupOperations_i.hh +++ b/src/GEOM_I/GEOM_IGroupOperations_i.hh @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOM_IGroupOperations_i_HeaderFile #define _GEOM_IGroupOperations_i_HeaderFile diff --git a/src/GEOM_I/GEOM_IHealingOperations_i.cc b/src/GEOM_I/GEOM_IHealingOperations_i.cc index 9a064b3d0..449e73302 100644 --- a/src/GEOM_I/GEOM_IHealingOperations_i.cc +++ b/src/GEOM_I/GEOM_IHealingOperations_i.cc @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOM_I/GEOM_IHealingOperations_i.hh b/src/GEOM_I/GEOM_IHealingOperations_i.hh index bdbaf8689..53a498a89 100644 --- a/src/GEOM_I/GEOM_IHealingOperations_i.hh +++ b/src/GEOM_I/GEOM_IHealingOperations_i.hh @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOM_IHealingOperations_i_HeaderFile #define _GEOM_IHealingOperations_i_HeaderFile diff --git a/src/GEOM_I/GEOM_IInsertOperations_i.cc b/src/GEOM_I/GEOM_IInsertOperations_i.cc index 57a20c3b3..af72b8764 100644 --- a/src/GEOM_I/GEOM_IInsertOperations_i.cc +++ b/src/GEOM_I/GEOM_IInsertOperations_i.cc @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifdef WNT #pragma warning( disable:4786 ) diff --git a/src/GEOM_I/GEOM_IInsertOperations_i.hh b/src/GEOM_I/GEOM_IInsertOperations_i.hh index 97ca19c70..68e0f2e28 100644 --- a/src/GEOM_I/GEOM_IInsertOperations_i.hh +++ b/src/GEOM_I/GEOM_IInsertOperations_i.hh @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOM_IInsertOperations_i_HeaderFile #define _GEOM_IInsertOperations_i_HeaderFile diff --git a/src/GEOM_I/GEOM_ILocalOperations_i.cc b/src/GEOM_I/GEOM_ILocalOperations_i.cc index 954778614..21345f43f 100644 --- a/src/GEOM_I/GEOM_ILocalOperations_i.cc +++ b/src/GEOM_I/GEOM_ILocalOperations_i.cc @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOM_I/GEOM_ILocalOperations_i.hh b/src/GEOM_I/GEOM_ILocalOperations_i.hh index 764f8e5cb..4584a3d51 100644 --- a/src/GEOM_I/GEOM_ILocalOperations_i.hh +++ b/src/GEOM_I/GEOM_ILocalOperations_i.hh @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOM_ILocalOperations_i_HeaderFile #define _GEOM_ILocalOperations_i_HeaderFile diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.cc b/src/GEOM_I/GEOM_IMeasureOperations_i.cc index b6132132c..9035dc9ca 100644 --- a/src/GEOM_I/GEOM_IMeasureOperations_i.cc +++ b/src/GEOM_I/GEOM_IMeasureOperations_i.cc @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.hh b/src/GEOM_I/GEOM_IMeasureOperations_i.hh index e8269bd22..b5bc384c3 100644 --- a/src/GEOM_I/GEOM_IMeasureOperations_i.hh +++ b/src/GEOM_I/GEOM_IMeasureOperations_i.hh @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOM_IMeasureOperations_i_HeaderFile #define _GEOM_IMeasureOperations_i_HeaderFile diff --git a/src/GEOM_I/GEOM_IOperations_i.cc b/src/GEOM_I/GEOM_IOperations_i.cc index aecbee269..090bf8e82 100644 --- a/src/GEOM_I/GEOM_IOperations_i.cc +++ b/src/GEOM_I/GEOM_IOperations_i.cc @@ -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/src/GEOM_I/GEOM_IOperations_i.hh b/src/GEOM_I/GEOM_IOperations_i.hh index 9c1ea32b2..8fa579842 100644 --- a/src/GEOM_I/GEOM_IOperations_i.hh +++ b/src/GEOM_I/GEOM_IOperations_i.hh @@ -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/src/GEOM_I/GEOM_IShapesOperations_i.cc b/src/GEOM_I/GEOM_IShapesOperations_i.cc index cd3aac8aa..71438d5a3 100644 --- a/src/GEOM_I/GEOM_IShapesOperations_i.cc +++ b/src/GEOM_I/GEOM_IShapesOperations_i.cc @@ -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/src/GEOM_I/GEOM_IShapesOperations_i.hh b/src/GEOM_I/GEOM_IShapesOperations_i.hh index 41def03a9..2bc2d335e 100644 --- a/src/GEOM_I/GEOM_IShapesOperations_i.hh +++ b/src/GEOM_I/GEOM_IShapesOperations_i.hh @@ -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/src/GEOM_I/GEOM_ITransformOperations_i.cc b/src/GEOM_I/GEOM_ITransformOperations_i.cc index 27a3893bf..fec39291e 100644 --- a/src/GEOM_I/GEOM_ITransformOperations_i.cc +++ b/src/GEOM_I/GEOM_ITransformOperations_i.cc @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include diff --git a/src/GEOM_I/GEOM_ITransformOperations_i.hh b/src/GEOM_I/GEOM_ITransformOperations_i.hh index 7f7964ce4..831ec80d5 100644 --- a/src/GEOM_I/GEOM_ITransformOperations_i.hh +++ b/src/GEOM_I/GEOM_ITransformOperations_i.hh @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef _GEOM_ITransformOperations_i_HeaderFile #define _GEOM_ITransformOperations_i_HeaderFile diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc index 649e2fa2e..3e206690d 100644 --- a/src/GEOM_I/GEOM_Object_i.cc +++ b/src/GEOM_I/GEOM_Object_i.cc @@ -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/src/GEOM_I/GEOM_Object_i.hh b/src/GEOM_I/GEOM_Object_i.hh index d52baa1c8..c903c61aa 100644 --- a/src/GEOM_I/GEOM_Object_i.hh +++ b/src/GEOM_I/GEOM_Object_i.hh @@ -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/src/GEOM_I/GEOM_wrap.hxx b/src/GEOM_I/GEOM_wrap.hxx index 71fbbf773..b46b8a1de 100644 --- a/src/GEOM_I/GEOM_wrap.hxx +++ b/src/GEOM_I/GEOM_wrap.hxx @@ -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/src/GEOM_I/Makefile.am b/src/GEOM_I/Makefile.am index 16383a10c..a64d9537e 100644 --- a/src/GEOM_I/Makefile.am +++ b/src/GEOM_I/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/src/GEOM_I_Superv/GEOM_I_Superv.hxx b/src/GEOM_I_Superv/GEOM_I_Superv.hxx index a32e932bf..8458fc405 100755 --- a/src/GEOM_I_Superv/GEOM_I_Superv.hxx +++ b/src/GEOM_I_Superv/GEOM_I_Superv.hxx @@ -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/src/GEOM_I_Superv/GEOM_List_i.hh b/src/GEOM_I_Superv/GEOM_List_i.hh index beea9ee4b..26bee1e34 100644 --- a/src/GEOM_I_Superv/GEOM_List_i.hh +++ b/src/GEOM_I_Superv/GEOM_List_i.hh @@ -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/src/GEOM_I_Superv/GEOM_Superv_i.cc b/src/GEOM_I_Superv/GEOM_Superv_i.cc index b3c2cf038..38e2011fa 100644 --- a/src/GEOM_I_Superv/GEOM_Superv_i.cc +++ b/src/GEOM_I_Superv/GEOM_Superv_i.cc @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include "GEOM_Superv_i.hh" #include "SALOME_LifeCycleCORBA.hxx" diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.hh b/src/GEOM_I_Superv/GEOM_Superv_i.hh index 7a9014af8..a0ac0cc30 100644 --- a/src/GEOM_I_Superv/GEOM_Superv_i.hh +++ b/src/GEOM_I_Superv/GEOM_Superv_i.hh @@ -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/src/GEOM_I_Superv/Makefile.am b/src/GEOM_I_Superv/Makefile.am index ef8ef7aff..812e2dd43 100644 --- a/src/GEOM_I_Superv/Makefile.am +++ b/src/GEOM_I_Superv/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/src/GEOM_PY/Makefile.am b/src/GEOM_PY/Makefile.am index d22a74031..40993daea 100644 --- a/src/GEOM_PY/Makefile.am +++ b/src/GEOM_PY/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/src/GEOM_PY/__init__.py b/src/GEOM_PY/__init__.py index 7d1d2dd2d..08f0ead20 100644 --- a/src/GEOM_PY/__init__.py +++ b/src/GEOM_PY/__init__.py @@ -1,5 +1,6 @@ # -*- 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/src/GEOM_PY/geomtools.py b/src/GEOM_PY/geomtools.py index 5a2062330..439da20ef 100644 --- a/src/GEOM_PY/geomtools.py +++ b/src/GEOM_PY/geomtools.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# 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/src/GEOM_PY/sketcher.py b/src/GEOM_PY/sketcher.py index aeba6b43b..47210959a 100644 --- a/src/GEOM_PY/sketcher.py +++ b/src/GEOM_PY/sketcher.py @@ -1,6 +1,6 @@ # -*- 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/src/GEOM_PY/structelem/Makefile.am b/src/GEOM_PY/structelem/Makefile.am index de334fe4f..6008b17ea 100644 --- a/src/GEOM_PY/structelem/Makefile.am +++ b/src/GEOM_PY/structelem/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/src/GEOM_PY/structelem/__init__.py b/src/GEOM_PY/structelem/__init__.py index be6557887..f9a9e737b 100644 --- a/src/GEOM_PY/structelem/__init__.py +++ b/src/GEOM_PY/structelem/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# 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/src/GEOM_PY/structelem/orientation.py b/src/GEOM_PY/structelem/orientation.py index bbedb37e3..1bc68d186 100644 --- a/src/GEOM_PY/structelem/orientation.py +++ b/src/GEOM_PY/structelem/orientation.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# 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/src/GEOM_PY/structelem/parts.py b/src/GEOM_PY/structelem/parts.py index 4530b830a..63c9819be 100644 --- a/src/GEOM_PY/structelem/parts.py +++ b/src/GEOM_PY/structelem/parts.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# 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/src/GEOM_SWIG/GEOM_Nut.py b/src/GEOM_SWIG/GEOM_Nut.py index 66ff092f3..c5d020658 100755 --- a/src/GEOM_SWIG/GEOM_Nut.py +++ b/src/GEOM_SWIG/GEOM_Nut.py @@ -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/src/GEOM_SWIG/GEOM_ObjectInfo.py b/src/GEOM_SWIG/GEOM_ObjectInfo.py index fb2ab3e15..c5efc0b20 100644 --- a/src/GEOM_SWIG/GEOM_ObjectInfo.py +++ b/src/GEOM_SWIG/GEOM_ObjectInfo.py @@ -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 # # 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/src/GEOM_SWIG/GEOM_Partition1.py b/src/GEOM_SWIG/GEOM_Partition1.py index c99748582..84109b4fb 100755 --- a/src/GEOM_SWIG/GEOM_Partition1.py +++ b/src/GEOM_SWIG/GEOM_Partition1.py @@ -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/src/GEOM_SWIG/GEOM_Partition2.py b/src/GEOM_SWIG/GEOM_Partition2.py index 838693dbb..d8a39da37 100755 --- a/src/GEOM_SWIG/GEOM_Partition2.py +++ b/src/GEOM_SWIG/GEOM_Partition2.py @@ -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/src/GEOM_SWIG/GEOM_Partition3.py b/src/GEOM_SWIG/GEOM_Partition3.py index 7fcbc8019..924ecbac7 100755 --- a/src/GEOM_SWIG/GEOM_Partition3.py +++ b/src/GEOM_SWIG/GEOM_Partition3.py @@ -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/src/GEOM_SWIG/GEOM_Partition4.py b/src/GEOM_SWIG/GEOM_Partition4.py index b0240a5e7..18842cbe0 100755 --- a/src/GEOM_SWIG/GEOM_Partition4.py +++ b/src/GEOM_SWIG/GEOM_Partition4.py @@ -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/src/GEOM_SWIG/GEOM_Partition5.py b/src/GEOM_SWIG/GEOM_Partition5.py index 8c22f0db4..bcd888fef 100755 --- a/src/GEOM_SWIG/GEOM_Partition5.py +++ b/src/GEOM_SWIG/GEOM_Partition5.py @@ -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/src/GEOM_SWIG/GEOM_Sketcher.py b/src/GEOM_SWIG/GEOM_Sketcher.py index ade5407af..4c084eed2 100644 --- a/src/GEOM_SWIG/GEOM_Sketcher.py +++ b/src/GEOM_SWIG/GEOM_Sketcher.py @@ -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/src/GEOM_SWIG/GEOM_Spanner.py b/src/GEOM_SWIG/GEOM_Spanner.py index 7c17db76a..d87ec98c5 100644 --- a/src/GEOM_SWIG/GEOM_Spanner.py +++ b/src/GEOM_SWIG/GEOM_Spanner.py @@ -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 @@ -20,7 +20,6 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# GEOM GEOM_SWIG : binding of C++ implementaion with Python # File : GEOM_Spanner.py # Author : Julia DOROVSKIKH # Module : GEOM diff --git a/src/GEOM_SWIG/GEOM_TestAll.py b/src/GEOM_SWIG/GEOM_TestAll.py index 467463400..179c572cc 100644 --- a/src/GEOM_SWIG/GEOM_TestAll.py +++ b/src/GEOM_SWIG/GEOM_TestAll.py @@ -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 @@ -19,6 +19,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# # GEOM GEOM_SWIG : binding of C++ omplementaion with Python # File : GEOM_usinggeom.py diff --git a/src/GEOM_SWIG/GEOM_TestHealing.py b/src/GEOM_SWIG/GEOM_TestHealing.py index abe4a9810..e503ab297 100644 --- a/src/GEOM_SWIG/GEOM_TestHealing.py +++ b/src/GEOM_SWIG/GEOM_TestHealing.py @@ -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 @@ -19,6 +19,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# # GEOM_SWIG : binding of C++ implementaion with Python # File : GEOM_TestHealing.py diff --git a/src/GEOM_SWIG/GEOM_TestMeasures.py b/src/GEOM_SWIG/GEOM_TestMeasures.py index cd9c07dd0..83371ce16 100644 --- a/src/GEOM_SWIG/GEOM_TestMeasures.py +++ b/src/GEOM_SWIG/GEOM_TestMeasures.py @@ -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 @@ -19,6 +19,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# def TestMeasureOperations (geompy, math): diff --git a/src/GEOM_SWIG/GEOM_TestOthers.py b/src/GEOM_SWIG/GEOM_TestOthers.py index 5ed4cbaab..3c711e92a 100644 --- a/src/GEOM_SWIG/GEOM_TestOthers.py +++ b/src/GEOM_SWIG/GEOM_TestOthers.py @@ -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/src/GEOM_SWIG/GEOM_blocks.py b/src/GEOM_SWIG/GEOM_blocks.py index 6ad689eb0..edbf635af 100644 --- a/src/GEOM_SWIG/GEOM_blocks.py +++ b/src/GEOM_SWIG/GEOM_blocks.py @@ -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/src/GEOM_SWIG/GEOM_cyl2complementary.py b/src/GEOM_SWIG/GEOM_cyl2complementary.py index 07ff303bb..7c78caa02 100755 --- a/src/GEOM_SWIG/GEOM_cyl2complementary.py +++ b/src/GEOM_SWIG/GEOM_cyl2complementary.py @@ -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/src/GEOM_SWIG/GEOM_example.py b/src/GEOM_SWIG/GEOM_example.py index b4b66046e..a88a848bf 100644 --- a/src/GEOM_SWIG/GEOM_example.py +++ b/src/GEOM_SWIG/GEOM_example.py @@ -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/src/GEOM_SWIG/GEOM_example2.py b/src/GEOM_SWIG/GEOM_example2.py index accb3eb6d..4287539a3 100644 --- a/src/GEOM_SWIG/GEOM_example2.py +++ b/src/GEOM_SWIG/GEOM_example2.py @@ -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/src/GEOM_SWIG/GEOM_example3.py b/src/GEOM_SWIG/GEOM_example3.py index 2537a9fe5..61896e107 100644 --- a/src/GEOM_SWIG/GEOM_example3.py +++ b/src/GEOM_SWIG/GEOM_example3.py @@ -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/src/GEOM_SWIG/GEOM_example4.py b/src/GEOM_SWIG/GEOM_example4.py index 701d40b72..684482650 100755 --- a/src/GEOM_SWIG/GEOM_example4.py +++ b/src/GEOM_SWIG/GEOM_example4.py @@ -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/src/GEOM_SWIG/GEOM_example5.py b/src/GEOM_SWIG/GEOM_example5.py index 767596185..6071e470c 100644 --- a/src/GEOM_SWIG/GEOM_example5.py +++ b/src/GEOM_SWIG/GEOM_example5.py @@ -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/src/GEOM_SWIG/GEOM_example6.py b/src/GEOM_SWIG/GEOM_example6.py index e168d341c..e1202c35f 100755 --- a/src/GEOM_SWIG/GEOM_example6.py +++ b/src/GEOM_SWIG/GEOM_example6.py @@ -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 # # 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/src/GEOM_SWIG/GEOM_example7.py b/src/GEOM_SWIG/GEOM_example7.py index fa7179665..323403fdf 100644 --- a/src/GEOM_SWIG/GEOM_example7.py +++ b/src/GEOM_SWIG/GEOM_example7.py @@ -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/src/GEOM_SWIG/GEOM_moteur.py b/src/GEOM_SWIG/GEOM_moteur.py index 436030004..661abfebb 100644 --- a/src/GEOM_SWIG/GEOM_moteur.py +++ b/src/GEOM_SWIG/GEOM_moteur.py @@ -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/src/GEOM_SWIG/GEOM_shared_modules.py b/src/GEOM_SWIG/GEOM_shared_modules.py index cd25ebeec..3154dc720 100644 --- a/src/GEOM_SWIG/GEOM_shared_modules.py +++ b/src/GEOM_SWIG/GEOM_shared_modules.py @@ -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/src/GEOM_SWIG/GEOM_shellSolid.py b/src/GEOM_SWIG/GEOM_shellSolid.py index bc935d538..5413e8513 100755 --- a/src/GEOM_SWIG/GEOM_shellSolid.py +++ b/src/GEOM_SWIG/GEOM_shellSolid.py @@ -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/src/GEOM_SWIG/GEOM_tube_geom.py b/src/GEOM_SWIG/GEOM_tube_geom.py index fe81b8419..b8f6e9e0d 100755 --- a/src/GEOM_SWIG/GEOM_tube_geom.py +++ b/src/GEOM_SWIG/GEOM_tube_geom.py @@ -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/src/GEOM_SWIG/GEOM_tube_geom_gg2.py b/src/GEOM_SWIG/GEOM_tube_geom_gg2.py index ee57b7b6c..821101af3 100755 --- a/src/GEOM_SWIG/GEOM_tube_geom_gg2.py +++ b/src/GEOM_SWIG/GEOM_tube_geom_gg2.py @@ -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/src/GEOM_SWIG/GEOM_usinggeom.py b/src/GEOM_SWIG/GEOM_usinggeom.py index b62e7ce75..e26c9fd15 100644 --- a/src/GEOM_SWIG/GEOM_usinggeom.py +++ b/src/GEOM_SWIG/GEOM_usinggeom.py @@ -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/src/GEOM_SWIG/Makefile.am b/src/GEOM_SWIG/Makefile.am index c9742d239..545b2d8be 100644 --- a/src/GEOM_SWIG/Makefile.am +++ b/src/GEOM_SWIG/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/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py b/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py index 72a71c35e..c18422a1f 100755 --- a/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py @@ -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/src/GEOM_SWIG/PAL_MESH_028_geometry.py b/src/GEOM_SWIG/PAL_MESH_028_geometry.py index d6815151e..66fb2f9be 100755 --- a/src/GEOM_SWIG/PAL_MESH_028_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_028_geometry.py @@ -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/src/GEOM_SWIG/PAL_MESH_030_geometry.py b/src/GEOM_SWIG/PAL_MESH_030_geometry.py index 8480121c3..c3c36a4b6 100755 --- a/src/GEOM_SWIG/PAL_MESH_030_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_030_geometry.py @@ -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/src/GEOM_SWIG/PAL_MESH_033_geometry.py b/src/GEOM_SWIG/PAL_MESH_033_geometry.py index d624639c6..ae81c04b8 100755 --- a/src/GEOM_SWIG/PAL_MESH_033_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_033_geometry.py @@ -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/src/GEOM_SWIG/PAL_MESH_035_geometry.py b/src/GEOM_SWIG/PAL_MESH_035_geometry.py index 9b3a28054..a1672f9c3 100755 --- a/src/GEOM_SWIG/PAL_MESH_035_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_035_geometry.py @@ -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/src/GEOM_SWIG/batchmode_geompy.py b/src/GEOM_SWIG/batchmode_geompy.py index 0dfacfaaf..9dce44513 100644 --- a/src/GEOM_SWIG/batchmode_geompy.py +++ b/src/GEOM_SWIG/batchmode_geompy.py @@ -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/src/GEOM_SWIG/geompy.py b/src/GEOM_SWIG/geompy.py index 5b7926670..6978afed4 100644 --- a/src/GEOM_SWIG/geompy.py +++ b/src/GEOM_SWIG/geompy.py @@ -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/src/GEOM_SWIG/geompyDC.py b/src/GEOM_SWIG/geompyDC.py index 937c2b27e..01e17c1eb 100644 --- a/src/GEOM_SWIG/geompyDC.py +++ b/src/GEOM_SWIG/geompyDC.py @@ -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 # # 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/src/GEOM_SWIG/gsketcher.py b/src/GEOM_SWIG/gsketcher.py index f0354e8c3..19b10c5e0 100644 --- a/src/GEOM_SWIG/gsketcher.py +++ b/src/GEOM_SWIG/gsketcher.py @@ -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 # # 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/src/GEOM_SWIG_WITHIHM/Makefile.am b/src/GEOM_SWIG_WITHIHM/Makefile.am index 710d23be6..34bb62c8d 100644 --- a/src/GEOM_SWIG_WITHIHM/Makefile.am +++ b/src/GEOM_SWIG_WITHIHM/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/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx b/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx index 80623324f..ceda0060a 100644 --- a/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx +++ b/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx @@ -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/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.h b/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.h index 8580c87c9..133221d4d 100644 --- a/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.h +++ b/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.h @@ -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/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.i b/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.i index 7504d783f..33673d182 100644 --- a/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.i +++ b/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.i @@ -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/src/GenerationGUI/GenerationGUI.cxx b/src/GenerationGUI/GenerationGUI.cxx index 3f94071ec..03615263c 100644 --- a/src/GenerationGUI/GenerationGUI.cxx +++ b/src/GenerationGUI/GenerationGUI.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // GEOM GEOMGUI : GUI for Geometry component // File : GenerationGUI.cxx diff --git a/src/GenerationGUI/GenerationGUI.h b/src/GenerationGUI/GenerationGUI.h index 90514bd76..079ded0a4 100644 --- a/src/GenerationGUI/GenerationGUI.h +++ b/src/GenerationGUI/GenerationGUI.h @@ -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/src/GenerationGUI/GenerationGUI_FillingDlg.cxx b/src/GenerationGUI/GenerationGUI_FillingDlg.cxx index cee8cec19..ae4828de1 100644 --- a/src/GenerationGUI/GenerationGUI_FillingDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_FillingDlg.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // GEOM GEOMGUI : GUI for Geometry component // File : GenerationGUI_FillingDlg.cxx diff --git a/src/GenerationGUI/GenerationGUI_FillingDlg.h b/src/GenerationGUI/GenerationGUI_FillingDlg.h index b9b02eaf8..c49127bd0 100644 --- a/src/GenerationGUI/GenerationGUI_FillingDlg.h +++ b/src/GenerationGUI/GenerationGUI_FillingDlg.h @@ -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/src/GenerationGUI/GenerationGUI_PipeDlg.cxx b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx index 42abb189e..9054ce7a6 100644 --- a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx @@ -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/src/GenerationGUI/GenerationGUI_PipeDlg.h b/src/GenerationGUI/GenerationGUI_PipeDlg.h index eb69a3196..c776cc359 100644 --- a/src/GenerationGUI/GenerationGUI_PipeDlg.h +++ b/src/GenerationGUI/GenerationGUI_PipeDlg.h @@ -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/src/GenerationGUI/GenerationGUI_PipePathDlg.cxx b/src/GenerationGUI/GenerationGUI_PipePathDlg.cxx index b2d2d8d6b..5da059ad2 100644 --- a/src/GenerationGUI/GenerationGUI_PipePathDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_PipePathDlg.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // GEOM GEOMGUI : GUI for Geometry component // File : GenerationGUI_PipePathDlg.cxx diff --git a/src/GenerationGUI/GenerationGUI_PipePathDlg.h b/src/GenerationGUI/GenerationGUI_PipePathDlg.h index 2c900bbc3..5f88127bb 100644 --- a/src/GenerationGUI/GenerationGUI_PipePathDlg.h +++ b/src/GenerationGUI/GenerationGUI_PipePathDlg.h @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // GEOM GEOMGUI : GUI for Geometry component // File : GenerationGUI_PipePathDlg.h diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx index c14903c94..c86cdf592 100644 --- a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx @@ -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 @@ -111,10 +111,10 @@ GenerationGUI_PrismDlg::GenerationGUI_PrismDlg (GeometryGUI* theGeometryGUI, QWi GroupDXDYDZ->CheckBox2->setText(tr("GEOM_SCALE_PRISM")); GroupThickening = new DlgRef_1Check1Spin1Check(centralWidget()); - GroupThickening->GroupBox1->setTitle("Thickening"); - GroupThickening->checkButton1->setText("Add thickness (edges or wires only)"); - GroupThickening->checkButton2->setText("Thicken towards outside"); - GroupThickening->TextLabel1->setText("Thickness"); + GroupThickening->GroupBox1->setTitle(tr("GEOM_THICKENING")); + GroupThickening->checkButton1->setText(tr("GEOM_ADD_THICKNESS")); // "Add thickness (edges or wires only)" + GroupThickening->checkButton2->setText(tr("GEOM_TOWARDS_INSIDE")); // "Thicken towards the inside" + GroupThickening->TextLabel1->setText(tr("GEOM_THICKNESS")); QVBoxLayout* layout = new QVBoxLayout(centralWidget()); layout->setMargin(0); layout->setSpacing(6); @@ -716,12 +716,11 @@ bool GenerationGUI_PrismDlg::execute (ObjectList& objects) if(GroupThickening->checkButton1->isChecked()) { - double aThickness = 0.0; - - if(GroupThickening->checkButton2->isChecked() ^ GroupVecH->CheckBox2->isChecked()) // if "towards outside" XOR "reversed" is checked - aThickness = -1.0*(GroupThickening->SpinBox_DX->value()); // change the offset sign to negative - else - aThickness = GroupThickening->SpinBox_DX->value(); + double aThickness = GroupThickening->SpinBox_DX->value(); + if (GroupThickening->checkButton2->isChecked()) + { + aThickness = -aThickness; + } anObj = anotherOper->MakeThickening(anObj, aThickness, /*copy=*/false); } diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.h b/src/GenerationGUI/GenerationGUI_PrismDlg.h index 01f3deff8..0286b2258 100644 --- a/src/GenerationGUI/GenerationGUI_PrismDlg.h +++ b/src/GenerationGUI/GenerationGUI_PrismDlg.h @@ -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/src/GenerationGUI/GenerationGUI_RevolDlg.cxx b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx index 5e1e3f022..a2f263013 100644 --- a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx @@ -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/src/GenerationGUI/GenerationGUI_RevolDlg.h b/src/GenerationGUI/GenerationGUI_RevolDlg.h index e39eff4a0..2fcb831c8 100644 --- a/src/GenerationGUI/GenerationGUI_RevolDlg.h +++ b/src/GenerationGUI/GenerationGUI_RevolDlg.h @@ -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/src/GenerationGUI/Makefile.am b/src/GenerationGUI/Makefile.am index cda0fad02..53dc5bc6b 100644 --- a/src/GenerationGUI/Makefile.am +++ b/src/GenerationGUI/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 @@ -15,6 +15,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# # GEOM GENERATIONGUI : # File : Makefile.am diff --git a/src/GroupGUI/GroupGUI.cxx b/src/GroupGUI/GroupGUI.cxx index d8f92294f..e99b0e808 100644 --- a/src/GroupGUI/GroupGUI.cxx +++ b/src/GroupGUI/GroupGUI.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // GEOM GEOMGUI : GUI for Geometry component // File : GroupGUI.cxx diff --git a/src/GroupGUI/GroupGUI.h b/src/GroupGUI/GroupGUI.h index 8cb96b913..b484b110d 100644 --- a/src/GroupGUI/GroupGUI.h +++ b/src/GroupGUI/GroupGUI.h @@ -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/src/GroupGUI/GroupGUI_BooleanDlg.cxx b/src/GroupGUI/GroupGUI_BooleanDlg.cxx index 3c227e0c7..31ff0ba09 100644 --- a/src/GroupGUI/GroupGUI_BooleanDlg.cxx +++ b/src/GroupGUI/GroupGUI_BooleanDlg.cxx @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // GEOM GEOMGUI : GUI for Geometry component // File : GroupGUI_BooleanDlg.cxx diff --git a/src/GroupGUI/GroupGUI_BooleanDlg.h b/src/GroupGUI/GroupGUI_BooleanDlg.h index 467130eec..b29846121 100644 --- a/src/GroupGUI/GroupGUI_BooleanDlg.h +++ b/src/GroupGUI/GroupGUI_BooleanDlg.h @@ -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 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // GEOM GEOMGUI : GUI for Geometry component // File : GroupGUI_BooleanDlg.h diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx index 8cd1ae6a7..dfe16cfb7 100644 --- a/src/GroupGUI/GroupGUI_GroupDlg.cxx +++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx @@ -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/src/GroupGUI/GroupGUI_GroupDlg.h b/src/GroupGUI/GroupGUI_GroupDlg.h index 84618bf4b..cc78d137f 100644 --- a/src/GroupGUI/GroupGUI_GroupDlg.h +++ b/src/GroupGUI/GroupGUI_GroupDlg.h @@ -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/src/GroupGUI/Makefile.am b/src/GroupGUI/Makefile.am index 78e540589..505f4be94 100755 --- a/src/GroupGUI/Makefile.am +++ b/src/GroupGUI/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 @@ -15,6 +15,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# # File : Makefile.am # Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) diff --git a/src/IGESExport/IGESExport.cxx b/src/IGESExport/IGESExport.cxx index 1349b8a96..00371ec5b 100644 --- a/src/IGESExport/IGESExport.cxx +++ b/src/IGESExport/IGESExport.cxx @@ -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/src/IGESExport/Makefile.am b/src/IGESExport/Makefile.am index 9fed32fdb..efbd56277 100644 --- a/src/IGESExport/Makefile.am +++ b/src/IGESExport/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/src/IGESImport/IGESImport.cxx b/src/IGESImport/IGESImport.cxx index 3eba47108..94d77caf9 100644 --- a/src/IGESImport/IGESImport.cxx +++ b/src/IGESImport/IGESImport.cxx @@ -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/src/IGESImport/Makefile.am b/src/IGESImport/Makefile.am index ebecee851..ea9e6b01b 100644 --- a/src/IGESImport/Makefile.am +++ b/src/IGESImport/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/src/Makefile.am b/src/Makefile.am index e81e3bfd9..1c2ba31d1 100644 --- a/src/Makefile.am +++ b/src/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 @@ -15,6 +15,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# # File : Makefile.am # Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) diff --git a/src/Material/Makefile.am b/src/Material/Makefile.am index e87bf9360..165b4e06a 100644 --- a/src/Material/Makefile.am +++ b/src/Material/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/src/Material/Material.h b/src/Material/Material.h index c7ec1339d..9d44dc060 100644 --- a/src/Material/Material.h +++ b/src/Material/Material.h @@ -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/src/Material/Material_Model.cxx b/src/Material/Material_Model.cxx index 949d7d2b0..467e12874 100644 --- a/src/Material/Material_Model.cxx +++ b/src/Material/Material_Model.cxx @@ -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/src/Material/Material_Model.h b/src/Material/Material_Model.h index d27ad1236..2b0562d61 100644 --- a/src/Material/Material_Model.h +++ b/src/Material/Material_Model.h @@ -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/src/Material/Material_ResourceMgr.cxx b/src/Material/Material_ResourceMgr.cxx index eef31d76d..59ca3b65f 100644 --- a/src/Material/Material_ResourceMgr.cxx +++ b/src/Material/Material_ResourceMgr.cxx @@ -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 @@ -140,6 +140,11 @@ QStringList Material_ResourceMgr::materials( MaterialType theType, bool theSort qSort( slglobal ); qSort( sluser ); } + // special processing for default material (to make it first in the list) + if ( slglobal.contains( "[ Default ]" ) ) { + slglobal.removeAll( "[ Default ]" ); + slglobal.prepend( "[ Default ]" ); + } // combine the materials to obtain result list QStringList result; diff --git a/src/Material/Material_ResourceMgr.h b/src/Material/Material_ResourceMgr.h index de71b1028..91e4abda4 100644 --- a/src/Material/Material_ResourceMgr.h +++ b/src/Material/Material_ResourceMgr.h @@ -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/src/Material/resources/SalomeMaterial.xml b/src/Material/resources/SalomeMaterial.xml index 6cdcb94a5..7cf7a8638 100644 --- a/src/Material/resources/SalomeMaterial.xml +++ b/src/Material/resources/SalomeMaterial.xml @@ -1,5 +1,5 @@