From 2a228cfc1139c77343f5bf7f69336ce123f56db3 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 7 May 2010 13:25:17 +0000 Subject: [PATCH] Merge from V5_1_4_BR 07/05/2010 --- GEOM_version.h.in | 3 +- Makefile.am | 6 +- adm_local/Makefile.am | 6 +- adm_local/cmake_files/FindGEOM.cmake | 5 +- adm_local/cmake_files/Makefile.am | 6 +- adm_local/unix/Makefile.am | 6 +- adm_local/unix/config_files/Makefile.am | 6 +- adm_local/unix/config_files/check_GEOM.m4 | 3 +- adm_local/unix/config_files/check_GUI.m4 | 6 +- adm_local/unix/make_common_starter.am | 6 +- bin/Makefile.am | 6 +- bin/geom_setenv.py | 5 +- build_cmake | 6 +- build_cmake.bat | 20 +- build_configure | 3 +- clean_configure | 6 +- configure.ac | 8 +- doc/Makefile.am | 6 +- doc/salome/Makefile.am | 6 +- doc/salome/gui/GEOM/Makefile.am | 6 +- 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/face1.png | Bin 17260 -> 20126 bytes doc/salome/gui/GEOM/images/face2.png | Bin 18664 -> 21334 bytes .../gui/GEOM/input/creating_adv_obj.doc | 2 +- .../gui/GEOM/input/creating_filling.doc | 3 +- .../gui/GEOM/input/creating_primitives.doc | 4 +- .../gui/GEOM/input/creating_squareface.doc | 22 +- .../gui/GEOM/input/tui_advanced_geom_objs.doc | 2 +- .../gui/GEOM/input/tui_basic_geom_objs.doc | 16 +- doc/salome/gui/GEOM/input/tui_primitives.doc | 12 +- doc/salome/gui/GEOM/input/tui_test_others.doc | 6 + doc/salome/gui/GEOM/static/footer.html | 2 +- doc/salome/gui/Makefile.am | 6 +- doc/salome/tui/Makefile.am | 6 +- doc/salome/tui/doxyfile.in | 2 +- doc/salome/tui/static/footer.html | 2 +- idl/GEOM_Gen.idl | 7 +- idl/GEOM_Superv.idl | 5 +- idl/Makefile.am | 6 +- resources/GEOMCatalog.xml.in | 28 +- resources/GEOM_en.xml | 2 +- resources/GEOM_fr.xml | 2 +- resources/Makefile.am | 8 +- resources/SalomeApp.xml | 2 +- src/ARCHIMEDE/ARCHIMEDE.pro | 6 +- src/ARCHIMEDE/Archimede_VolumeSection.cxx | 3 +- src/ARCHIMEDE/Archimede_VolumeSection.hxx | 3 +- src/ARCHIMEDE/Makefile.am | 6 +- src/AdvancedGUI/AdvancedGUI.cxx | 11 +- src/AdvancedGUI/AdvancedGUI.h | 9 +- src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx | 63 +- src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.h | 16 +- src/AdvancedGUI/Makefile.am | 13 +- src/BREPExport/BREPExport.cxx | 3 +- src/BREPExport/BREPExport.pro | 6 +- src/BREPExport/Makefile.am | 6 +- src/BREPImport/BREPImport.cxx | 3 +- src/BREPImport/BREPImport.pro | 6 +- src/BREPImport/Makefile.am | 6 +- src/BasicGUI/BasicGUI.cxx | 3 +- src/BasicGUI/BasicGUI.h | 3 +- src/BasicGUI/BasicGUI.pro | 6 +- src/BasicGUI/BasicGUI_ArcDlg.cxx | 3 +- src/BasicGUI/BasicGUI_ArcDlg.h | 3 +- src/BasicGUI/BasicGUI_CircleDlg.cxx | 3 +- src/BasicGUI/BasicGUI_CircleDlg.h | 3 +- src/BasicGUI/BasicGUI_CurveDlg.cxx | 15 +- src/BasicGUI/BasicGUI_CurveDlg.h | 5 +- src/BasicGUI/BasicGUI_EllipseDlg.cxx | 3 +- src/BasicGUI/BasicGUI_EllipseDlg.h | 3 +- src/BasicGUI/BasicGUI_LineDlg.cxx | 3 +- src/BasicGUI/BasicGUI_LineDlg.h | 3 +- src/BasicGUI/BasicGUI_MarkerDlg.cxx | 3 +- src/BasicGUI/BasicGUI_MarkerDlg.h | 3 +- src/BasicGUI/BasicGUI_PlaneDlg.cxx | 3 +- src/BasicGUI/BasicGUI_PlaneDlg.h | 3 +- src/BasicGUI/BasicGUI_PointDlg.cxx | 5 +- src/BasicGUI/BasicGUI_PointDlg.h | 3 +- src/BasicGUI/BasicGUI_VectorDlg.cxx | 3 +- src/BasicGUI/BasicGUI_VectorDlg.h | 3 +- src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx | 3 +- src/BasicGUI/BasicGUI_WorkingPlaneDlg.h | 3 +- src/BasicGUI/Makefile.am | 6 +- src/BlocksGUI/BlocksGUI.cxx | 3 +- src/BlocksGUI/BlocksGUI.h | 3 +- src/BlocksGUI/BlocksGUI_BlockDlg.cxx | 3 +- src/BlocksGUI/BlocksGUI_BlockDlg.h | 3 +- src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx | 3 +- src/BlocksGUI/BlocksGUI_ExplodeDlg.h | 3 +- src/BlocksGUI/BlocksGUI_PropagateDlg.cxx | 3 +- src/BlocksGUI/BlocksGUI_PropagateDlg.h | 3 +- src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx | 3 +- src/BlocksGUI/BlocksGUI_QuadFaceDlg.h | 3 +- src/BlocksGUI/BlocksGUI_TrsfDlg.cxx | 3 +- src/BlocksGUI/BlocksGUI_TrsfDlg.h | 3 +- src/BlocksGUI/Makefile.am | 6 +- src/BooleanGUI/BooleanGUI.cxx | 3 +- src/BooleanGUI/BooleanGUI.h | 3 +- src/BooleanGUI/BooleanGUI.pro | 6 +- src/BooleanGUI/BooleanGUI_Dialog.cxx | 3 +- src/BooleanGUI/BooleanGUI_Dialog.h | 3 +- src/BooleanGUI/Makefile.am | 6 +- src/BuildGUI/BuildGUI.cxx | 3 +- src/BuildGUI/BuildGUI.h | 3 +- src/BuildGUI/BuildGUI.pro | 6 +- src/BuildGUI/BuildGUI_CompoundDlg.cxx | 3 +- src/BuildGUI/BuildGUI_CompoundDlg.h | 3 +- src/BuildGUI/BuildGUI_EdgeDlg.cxx | 3 +- src/BuildGUI/BuildGUI_EdgeDlg.h | 3 +- src/BuildGUI/BuildGUI_FaceDlg.cxx | 3 +- src/BuildGUI/BuildGUI_FaceDlg.h | 3 +- src/BuildGUI/BuildGUI_ShellDlg.cxx | 3 +- src/BuildGUI/BuildGUI_ShellDlg.h | 3 +- src/BuildGUI/BuildGUI_SolidDlg.cxx | 3 +- src/BuildGUI/BuildGUI_SolidDlg.h | 3 +- src/BuildGUI/BuildGUI_WireDlg.cxx | 5 +- src/BuildGUI/BuildGUI_WireDlg.h | 5 +- src/BuildGUI/Makefile.am | 6 +- src/DisplayGUI/DisplayGUI.cxx | 3 +- src/DisplayGUI/DisplayGUI.h | 3 +- src/DisplayGUI/DisplayGUI.pro | 6 +- src/DisplayGUI/Makefile.am | 6 +- src/DlgRef/DlgRef.cxx | 20 +- src/DlgRef/DlgRef.h | 22 +- src/DlgRef/DlgRef.pro | 6 +- .../DlgRef_PipeTShape_ScrollArea_QTD.ui | 57 - src/DlgRef/Makefile.am | 9 +- src/EntityGUI/EntityGUI.cxx | 3 +- src/EntityGUI/EntityGUI.h | 3 +- src/EntityGUI/EntityGUI.pro | 6 +- src/EntityGUI/EntityGUI_3DSketcherDlg.cxx | 32 +- src/EntityGUI/EntityGUI_3DSketcherDlg.h | 32 +- src/EntityGUI/EntityGUI_SketcherDlg.cxx | 34 +- src/EntityGUI/EntityGUI_SketcherDlg.h | 3 +- src/EntityGUI/EntityGUI_SubShapeDlg.cxx | 3 +- src/EntityGUI/EntityGUI_SubShapeDlg.h | 3 +- src/EntityGUI/EntityGUI_Widgets.cxx | 6 +- src/EntityGUI/EntityGUI_Widgets.h | 6 +- src/EntityGUI/Makefile.am | 6 +- src/GEOM/GEOM.pro | 6 +- src/GEOM/GEOM_Application.cxx | 3 +- src/GEOM/GEOM_Application.hxx | 3 +- src/GEOM/GEOM_Application.ixx | 3 +- src/GEOM/GEOM_Application.jxx | 3 +- ...teratorOfDataMapOfAsciiStringTransient.hxx | 3 +- ...ratorOfDataMapOfAsciiStringTransient_0.cxx | 3 +- ...MapNodeOfDataMapOfAsciiStringTransient.hxx | 3 +- ...pNodeOfDataMapOfAsciiStringTransient_0.cxx | 3 +- .../GEOM_DataMapOfAsciiStringTransient.hxx | 3 +- .../GEOM_DataMapOfAsciiStringTransient_0.cxx | 3 +- src/GEOM/GEOM_Engine.cxx | 3 +- src/GEOM/GEOM_Engine.hxx | 3 +- src/GEOM/GEOM_Function.cxx | 3 +- src/GEOM/GEOM_Function.hxx | 3 +- src/GEOM/GEOM_IOperations.cxx | 3 +- src/GEOM/GEOM_IOperations.hxx | 3 +- src/GEOM/GEOM_ISubShape.hxx | 3 +- src/GEOM/GEOM_Object.cxx | 3 +- src/GEOM/GEOM_Object.hxx | 3 +- src/GEOM/GEOM_PythonDump.cxx | 3 +- src/GEOM/GEOM_PythonDump.hxx | 3 +- src/GEOM/GEOM_Solver.cxx | 3 +- src/GEOM/GEOM_Solver.hxx | 3 +- src/GEOM/GEOM_SubShapeDriver.cxx | 3 +- src/GEOM/GEOM_SubShapeDriver.hxx | 3 +- src/GEOM/Handle_GEOM_Application.hxx | 3 +- ...MapNodeOfDataMapOfAsciiStringTransient.hxx | 3 +- src/GEOM/Makefile.am | 6 +- src/GEOMAlgo/BlockFix.cdl | 8 +- src/GEOMAlgo/BlockFix.cxx | 3 +- src/GEOMAlgo/BlockFix.hxx | 3 +- src/GEOMAlgo/BlockFix.ixx | 3 +- src/GEOMAlgo/BlockFix.jxx | 3 +- src/GEOMAlgo/BlockFix_BlockFixAPI.cdl | 5 +- src/GEOMAlgo/BlockFix_BlockFixAPI.cxx | 5 +- src/GEOMAlgo/BlockFix_BlockFixAPI.hxx | 3 +- src/GEOMAlgo/BlockFix_BlockFixAPI.ixx | 3 +- src/GEOMAlgo/BlockFix_BlockFixAPI.jxx | 3 +- src/GEOMAlgo/BlockFix_BlockFixAPI.lxx | 3 +- src/GEOMAlgo/BlockFix_CheckTool.cdl | 5 +- src/GEOMAlgo/BlockFix_CheckTool.cxx | 5 +- src/GEOMAlgo/BlockFix_CheckTool.hxx | 3 +- src/GEOMAlgo/BlockFix_CheckTool.ixx | 3 +- src/GEOMAlgo/BlockFix_CheckTool.jxx | 3 +- .../BlockFix_PeriodicSurfaceModifier.cdl | 6 +- .../BlockFix_PeriodicSurfaceModifier.cxx | 3 +- .../BlockFix_PeriodicSurfaceModifier.hxx | 3 +- .../BlockFix_PeriodicSurfaceModifier.ixx | 3 +- .../BlockFix_PeriodicSurfaceModifier.jxx | 3 +- src/GEOMAlgo/BlockFix_SphereSpaceModifier.cdl | 6 +- src/GEOMAlgo/BlockFix_SphereSpaceModifier.cxx | 3 +- src/GEOMAlgo/BlockFix_SphereSpaceModifier.hxx | 3 +- src/GEOMAlgo/BlockFix_SphereSpaceModifier.ixx | 3 +- src/GEOMAlgo/BlockFix_SphereSpaceModifier.jxx | 3 +- src/GEOMAlgo/BlockFix_UnionEdges.cdl | 5 +- src/GEOMAlgo/BlockFix_UnionEdges.cxx | 5 +- src/GEOMAlgo/BlockFix_UnionEdges.hxx | 3 +- src/GEOMAlgo/BlockFix_UnionEdges.ixx | 3 +- src/GEOMAlgo/BlockFix_UnionEdges.jxx | 3 +- src/GEOMAlgo/BlockFix_UnionFaces.cdl | 6 +- src/GEOMAlgo/BlockFix_UnionFaces.cxx | 5 +- src/GEOMAlgo/BlockFix_UnionFaces.hxx | 3 +- src/GEOMAlgo/BlockFix_UnionFaces.ixx | 3 +- src/GEOMAlgo/BlockFix_UnionFaces.jxx | 3 +- src/GEOMAlgo/GEOMAlgo.cdl | 3 +- src/GEOMAlgo/GEOMAlgo.pro | 6 +- src/GEOMAlgo/GEOMAlgo_Algo.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_Algo.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_Algo.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_Algo.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_Algo.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_Builder.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_Builder.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_Builder.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_Builder.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_Builder.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderArea.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderArea.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderArea.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderArea.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderArea.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderFace.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderFace.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderFace.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderFace.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderFace.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderShape.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderShape.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderShape.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderShape.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderShape.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderSolid.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderSolid.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderSolid.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderSolid.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderSolid.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderTools.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderTools.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderTools.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderTools.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_BuilderTools.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_Builder_0.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_Builder_1.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_Builder_2.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_Builder_3.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_Builder_4.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_Clsf.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_Clsf.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_Clsf.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_Clsf.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_Clsf.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_ClsfBox.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_ClsfBox.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_ClsfBox.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_ClsfSolid.cdl | 6 +- src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx | 6 +- src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx | 6 +- src/GEOMAlgo/GEOMAlgo_ClsfSolid.ixx | 6 +- src/GEOMAlgo/GEOMAlgo_ClsfSolid.jxx | 6 +- src/GEOMAlgo/GEOMAlgo_ClsfSurf.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_ClsfSurf.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_ClsfSurf.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.jxx | 3 +- ...taMapIteratorOfDataMapOfPassKeyInteger.hxx | 3 +- ...MapIteratorOfDataMapOfPassKeyInteger_0.cxx | 3 +- ...apIteratorOfDataMapOfPassKeyShapeShape.hxx | 6 +- ...IteratorOfDataMapOfPassKeyShapeShape_0.cxx | 6 +- ...aMapIteratorOfDataMapOfRealListOfShape.hxx | 3 +- ...apIteratorOfDataMapOfRealListOfShape_0.cxx | 3 +- ...go_DataMapIteratorOfDataMapOfShapeReal.hxx | 3 +- ..._DataMapIteratorOfDataMapOfShapeReal_0.cxx | 3 +- ...ataMapIteratorOfDataMapOfShapeShapeSet.hxx | 3 +- ...aMapIteratorOfDataMapOfShapeShapeSet_0.cxx | 3 +- ...o_DataMapNodeOfDataMapOfPassKeyInteger.hxx | 3 +- ...DataMapNodeOfDataMapOfPassKeyInteger_0.cxx | 3 +- ...ataMapNodeOfDataMapOfPassKeyShapeShape.hxx | 6 +- ...aMapNodeOfDataMapOfPassKeyShapeShape_0.cxx | 6 +- ..._DataMapNodeOfDataMapOfRealListOfShape.hxx | 3 +- ...ataMapNodeOfDataMapOfRealListOfShape_0.cxx | 3 +- ...OMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx | 3 +- ...Algo_DataMapNodeOfDataMapOfShapeReal_0.cxx | 3 +- ...go_DataMapNodeOfDataMapOfShapeShapeSet.hxx | 3 +- ..._DataMapNodeOfDataMapOfShapeShapeSet_0.cxx | 3 +- .../GEOMAlgo_DataMapOfPassKeyInteger.hxx | 3 +- .../GEOMAlgo_DataMapOfPassKeyInteger_0.cxx | 3 +- .../GEOMAlgo_DataMapOfPassKeyShapeShape.hxx | 6 +- .../GEOMAlgo_DataMapOfPassKeyShapeShape_0.cxx | 6 +- .../GEOMAlgo_DataMapOfRealListOfShape.hxx | 3 +- .../GEOMAlgo_DataMapOfRealListOfShape_0.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx | 3 +- .../GEOMAlgo_DataMapOfShapeReal_0.cxx | 3 +- .../GEOMAlgo_DataMapOfShapeShapeSet.hxx | 3 +- .../GEOMAlgo_DataMapOfShapeShapeSet_0.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_GlueAnalyser.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_GlueAnalyser.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_GlueAnalyser.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_Gluer.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_Gluer.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_Gluer.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_Gluer.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_Gluer.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_Gluer1.cdl | 6 +- src/GEOMAlgo/GEOMAlgo_Gluer1.cxx | 6 +- src/GEOMAlgo/GEOMAlgo_Gluer1.hxx | 6 +- src/GEOMAlgo/GEOMAlgo_Gluer1.ixx | 6 +- src/GEOMAlgo/GEOMAlgo_Gluer1.jxx | 6 +- src/GEOMAlgo/GEOMAlgo_HAlgo.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_HAlgo.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_HAlgo.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_HAlgo.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_HAlgo.jxx | 3 +- ...aMapNodeOfIndexedDataMapOfIntegerShape.hxx | 3 +- ...apNodeOfIndexedDataMapOfIntegerShape_0.cxx | 3 +- ...deOfIndexedDataMapOfPassKeyListOfShape.hxx | 3 +- ...OfIndexedDataMapOfPassKeyListOfShape_0.cxx | 3 +- ...ndexedDataMapOfPassKeyShapeListOfShape.hxx | 3 +- ...exedDataMapOfPassKeyShapeListOfShape_0.cxx | 3 +- ...dDataMapNodeOfIndexedDataMapOfShapeBox.hxx | 3 +- ...ataMapNodeOfIndexedDataMapOfShapeBox_0.cxx | 3 +- ...apNodeOfIndexedDataMapOfShapeShapeInfo.hxx | 6 +- ...NodeOfIndexedDataMapOfShapeShapeInfo_0.cxx | 6 +- ...ataMapNodeOfIndexedDataMapOfShapeState.hxx | 3 +- ...aMapNodeOfIndexedDataMapOfShapeState_0.cxx | 3 +- .../GEOMAlgo_IndexedDataMapOfIntegerShape.hxx | 3 +- ...EOMAlgo_IndexedDataMapOfIntegerShape_0.cxx | 3 +- ...lgo_IndexedDataMapOfPassKeyListOfShape.hxx | 3 +- ...o_IndexedDataMapOfPassKeyListOfShape_0.cxx | 3 +- ...ndexedDataMapOfPassKeyShapeListOfShape.hxx | 3 +- ...exedDataMapOfPassKeyShapeListOfShape_0.cxx | 3 +- .../GEOMAlgo_IndexedDataMapOfShapeBox.hxx | 3 +- .../GEOMAlgo_IndexedDataMapOfShapeBox_0.cxx | 3 +- ...EOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx | 6 +- ...MAlgo_IndexedDataMapOfShapeShapeInfo_0.cxx | 6 +- .../GEOMAlgo_IndexedDataMapOfShapeState.hxx | 3 +- .../GEOMAlgo_IndexedDataMapOfShapeState_0.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_KindOfBounds.hxx | 6 +- src/GEOMAlgo/GEOMAlgo_KindOfClosed.hxx | 6 +- src/GEOMAlgo/GEOMAlgo_KindOfName.hxx | 6 +- src/GEOMAlgo/GEOMAlgo_KindOfShape.hxx | 6 +- ...lgo_ListIteratorOfListOfCoupleOfShapes.hxx | 3 +- ...o_ListIteratorOfListOfCoupleOfShapes_0.cxx | 3 +- .../GEOMAlgo_ListIteratorOfListOfPnt.hxx | 3 +- .../GEOMAlgo_ListIteratorOfListOfPnt_0.cxx | 3 +- ...EOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx | 3 +- ...MAlgo_ListNodeOfListOfCoupleOfShapes_0.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt.hxx | 3 +- .../GEOMAlgo_ListNodeOfListOfPnt_0.cxx | 3 +- .../GEOMAlgo_ListOfCoupleOfShapes.hxx | 3 +- .../GEOMAlgo_ListOfCoupleOfShapes_0.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_ListOfPnt_0.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_PWireEdgeSet.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_PassKey.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_PassKey.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_PassKey.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_PassKey.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_PassKey.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_PassKeyShape.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_PassKeyShape.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_PassKeyShape.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_PassKeyShape.jxx | 3 +- .../GEOMAlgo_PassKeyShapeMapHasher.cdl | 3 +- .../GEOMAlgo_PassKeyShapeMapHasher.cxx | 3 +- .../GEOMAlgo_PassKeyShapeMapHasher.hxx | 3 +- .../GEOMAlgo_PassKeyShapeMapHasher.ixx | 3 +- .../GEOMAlgo_PassKeyShapeMapHasher.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_ShapeAlgo.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_ShapeAlgo.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_ShapeInfo.cdl | 6 +- src/GEOMAlgo/GEOMAlgo_ShapeInfo.cxx | 6 +- src/GEOMAlgo/GEOMAlgo_ShapeInfo.hxx | 6 +- src/GEOMAlgo/GEOMAlgo_ShapeInfo.ixx | 6 +- src/GEOMAlgo/GEOMAlgo_ShapeInfo.jxx | 6 +- src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.cdl | 6 +- src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.cxx | 6 +- src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.hxx | 6 +- src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.ixx | 6 +- src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.jxx | 6 +- src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx | 6 +- src/GEOMAlgo/GEOMAlgo_ShapeSet.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_ShapeSet.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_ShapeSet.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_ShapeSet.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_ShapeSet.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_ShapeSolid.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_ShapeSolid.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_ShapeSolid.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_ShapeSolid.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_ShellSolid.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_ShellSolid.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_ShellSolid.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_ShellSolid.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_SolidSolid.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_SolidSolid.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_SolidSolid.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_Splitter.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_Splitter.cxx | 5 +- src/GEOMAlgo/GEOMAlgo_Splitter.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_Splitter.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_Splitter.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_State.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_StateCollector.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_StateCollector.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_StateCollector.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_StateCollector.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_StateCollector.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_SurfaceTools.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_SurfaceTools.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_SurfaceTools.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_Tools.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_Tools.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_Tools.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_Tools.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_Tools.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_Tools3D.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_Tools3D.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_Tools3D.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_Tools3D.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_Tools3D.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_VertexSolid.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_VertexSolid.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_VertexSolid.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_VertexSolid.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_WESCorrector.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_WESCorrector.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_WESCorrector.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_WESCorrector.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_WESCorrector.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_WireEdgeSet.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_WireEdgeSet.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_WireEdgeSet.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_WireEdgeSet.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_WireEdgeSet.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_WireSolid.cdl | 5 +- src/GEOMAlgo/GEOMAlgo_WireSolid.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_WireSolid.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_WireSolid.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_WireSolid.jxx | 3 +- src/GEOMAlgo/GEOMAlgo_WireSplitter.cdl | 3 +- src/GEOMAlgo/GEOMAlgo_WireSplitter.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_WireSplitter.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_WireSplitter.ixx | 3 +- src/GEOMAlgo/GEOMAlgo_WireSplitter.jxx | 3 +- src/GEOMAlgo/Handle_BlockFix_BlockFixAPI.hxx | 3 +- ...andle_BlockFix_PeriodicSurfaceModifier.hxx | 3 +- .../Handle_BlockFix_SphereSpaceModifier.hxx | 3 +- src/GEOMAlgo/Handle_GEOMAlgo_Clsf.hxx | 3 +- src/GEOMAlgo/Handle_GEOMAlgo_ClsfBox.hxx | 3 +- src/GEOMAlgo/Handle_GEOMAlgo_ClsfSolid.hxx | 6 +- src/GEOMAlgo/Handle_GEOMAlgo_ClsfSurf.hxx | 3 +- ...o_DataMapNodeOfDataMapOfPassKeyInteger.hxx | 3 +- ...ataMapNodeOfDataMapOfPassKeyShapeShape.hxx | 6 +- ..._DataMapNodeOfDataMapOfRealListOfShape.hxx | 3 +- ...OMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx | 3 +- ...go_DataMapNodeOfDataMapOfShapeShapeSet.hxx | 3 +- src/GEOMAlgo/Handle_GEOMAlgo_HAlgo.hxx | 3 +- ...aMapNodeOfIndexedDataMapOfIntegerShape.hxx | 3 +- ...deOfIndexedDataMapOfPassKeyListOfShape.hxx | 3 +- ...ndexedDataMapOfPassKeyShapeListOfShape.hxx | 3 +- ...dDataMapNodeOfIndexedDataMapOfShapeBox.hxx | 3 +- ...apNodeOfIndexedDataMapOfShapeShapeInfo.hxx | 6 +- ...ataMapNodeOfIndexedDataMapOfShapeState.hxx | 3 +- ...EOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx | 3 +- .../Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx | 3 +- src/GEOMAlgo/Makefile.am | 6 +- src/GEOMBase/GEOMBase.cxx | 5 +- src/GEOMBase/GEOMBase.h | 3 +- src/GEOMBase/GEOMBase.pro | 6 +- src/GEOMBase/GEOMBase_Helper.cxx | 5 +- src/GEOMBase/GEOMBase_Helper.h | 3 +- src/GEOMBase/GEOMBase_Skeleton.cxx | 3 +- src/GEOMBase/GEOMBase_Skeleton.h | 3 +- src/GEOMBase/GEOM_GEOMBase.hxx | 3 +- src/GEOMBase/GEOM_Operation.cxx | 3 +- src/GEOMBase/GEOM_Operation.h | 3 +- src/GEOMBase/Makefile.am | 6 +- src/GEOMClient/GEOMClient.pro | 6 +- src/GEOMClient/GEOM_Client.cxx | 5 +- src/GEOMClient/GEOM_Client.hxx | 3 +- src/GEOMClient/Makefile.am | 6 +- .../GEOMFiltersSelection.pro | 6 +- .../GEOM_CompoundFilter.cxx | 6 +- .../GEOM_CompoundFilter.h | 6 +- src/GEOMFiltersSelection/GEOM_EdgeFilter.cxx | 3 +- src/GEOMFiltersSelection/GEOM_EdgeFilter.h | 3 +- src/GEOMFiltersSelection/GEOM_FaceFilter.cxx | 3 +- src/GEOMFiltersSelection/GEOM_FaceFilter.h | 3 +- .../GEOM_LogicalFilter.cxx | 3 +- src/GEOMFiltersSelection/GEOM_LogicalFilter.h | 3 +- src/GEOMFiltersSelection/GEOM_OCCFilter.cxx | 3 +- src/GEOMFiltersSelection/GEOM_OCCFilter.h | 3 +- .../GEOM_PreviewFilter.cxx | 3 +- src/GEOMFiltersSelection/GEOM_PreviewFilter.h | 3 +- .../GEOM_SelectionFilter.cxx | 3 +- .../GEOM_SelectionFilter.h | 3 +- src/GEOMFiltersSelection/GEOM_TypeFilter.cxx | 3 +- src/GEOMFiltersSelection/GEOM_TypeFilter.h | 3 +- src/GEOMFiltersSelection/Makefile.am | 6 +- src/GEOMGUI/GEOMGUI.cxx | 3 +- src/GEOMGUI/GEOMGUI.h | 3 +- src/GEOMGUI/GEOMGUI.pro | 6 +- src/GEOMGUI/GEOMGUI_OCCSelector.cxx | 5 +- src/GEOMGUI/GEOMGUI_OCCSelector.h | 3 +- src/GEOMGUI/GEOMGUI_Selection.cxx | 3 +- src/GEOMGUI/GEOMGUI_Selection.h | 3 +- src/GEOMGUI/GEOM_Displayer.cxx | 3 +- src/GEOMGUI/GEOM_Displayer.h | 3 +- src/GEOMGUI/GEOM_GEOMGUI.hxx | 3 +- src/GEOMGUI/GEOM_images.ts | 4 +- src/GEOMGUI/GEOM_msg_en.ts | 58 +- src/GEOMGUI/GEOM_msg_fr.ts | 2 +- src/GEOMGUI/GeometryGUI.cxx | 33 +- src/GEOMGUI/GeometryGUI.h | 3 +- src/GEOMGUI/GeometryGUI_Operations.h | 9 +- src/GEOMGUI/GeometryGUI_Swig.cxx | 4 +- src/GEOMGUI/GeometryGUI_Swig.hxx | 3 +- src/GEOMGUI/GeometryGUI_Swig.i | 3 +- src/GEOMGUI/Makefile.am | 7 +- src/GEOMImpl/GEOMImpl.pro | 6 +- src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx | 31 +- src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx | 34 +- src/GEOMImpl/GEOMImpl_ArcDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_ArcDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_Block6Explorer.cxx | 3 +- src/GEOMImpl/GEOMImpl_Block6Explorer.hxx | 3 +- src/GEOMImpl/GEOMImpl_BlockDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_BlockDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_BooleanDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_BooleanDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_BoxDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_BoxDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_ChamferDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_ChamferDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_CircleDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_CircleDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_ConeDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_ConeDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_CopyDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_CopyDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_CylinderDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_CylinderDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_DiskDriver.cxx | 6 +- src/GEOMImpl/GEOMImpl_DiskDriver.hxx | 6 +- src/GEOMImpl/GEOMImpl_EllipseDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_EllipseDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_ExportDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_ExportDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_FaceDriver.cxx | 6 +- src/GEOMImpl/GEOMImpl_FaceDriver.hxx | 6 +- src/GEOMImpl/GEOMImpl_Fillet1d.cxx | 34 +- src/GEOMImpl/GEOMImpl_Fillet1d.hxx | 34 +- src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx | 31 +- src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx | 34 +- src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx | 31 +- src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx | 34 +- src/GEOMImpl/GEOMImpl_FilletDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_FilletDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_FillingDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_FillingDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_Gen.cxx | 7 +- src/GEOMImpl/GEOMImpl_Gen.hxx | 3 +- src/GEOMImpl/GEOMImpl_GlueDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_GlueDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_HealingDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_HealingDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx | 3 +- src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_I3DSketcher.hxx | 35 +- src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx | 3696 ++++++++--------- src/GEOMImpl/GEOMImpl_IAdvancedOperations.hxx | 122 +- src/GEOMImpl/GEOMImpl_IArc.hxx | 3 +- src/GEOMImpl/GEOMImpl_IArchimede.hxx | 3 +- src/GEOMImpl/GEOMImpl_IBasicOperations.cxx | 3 +- src/GEOMImpl/GEOMImpl_IBasicOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_IBlockTrsf.hxx | 5 +- src/GEOMImpl/GEOMImpl_IBlocks.hxx | 3 +- src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx | 3 +- src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_IBoolean.hxx | 3 +- src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx | 3 +- src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_IBox.hxx | 3 +- src/GEOMImpl/GEOMImpl_IChamfer.hxx | 3 +- src/GEOMImpl/GEOMImpl_ICircle.hxx | 3 +- src/GEOMImpl/GEOMImpl_ICone.hxx | 3 +- src/GEOMImpl/GEOMImpl_ICopy.hxx | 3 +- src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx | 7 +- src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx | 2 +- src/GEOMImpl/GEOMImpl_ICylinder.hxx | 3 +- src/GEOMImpl/GEOMImpl_IDisk.hxx | 6 +- src/GEOMImpl/GEOMImpl_IEllipse.hxx | 3 +- src/GEOMImpl/GEOMImpl_IFace.hxx | 6 +- src/GEOMImpl/GEOMImpl_IFillet.hxx | 3 +- src/GEOMImpl/GEOMImpl_IFillet1d.hxx | 35 +- src/GEOMImpl/GEOMImpl_IFillet2d.hxx | 35 +- src/GEOMImpl/GEOMImpl_IFilling.hxx | 3 +- src/GEOMImpl/GEOMImpl_IGlue.hxx | 3 +- src/GEOMImpl/GEOMImpl_IGroupOperations.cxx | 3 +- src/GEOMImpl/GEOMImpl_IGroupOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_IHealing.hxx | 3 +- src/GEOMImpl/GEOMImpl_IHealingOperations.cxx | 12 +- src/GEOMImpl/GEOMImpl_IHealingOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_IImportExport.hxx | 3 +- src/GEOMImpl/GEOMImpl_IInsertOperations.cxx | 3 +- src/GEOMImpl/GEOMImpl_IInsertOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_ILine.hxx | 3 +- src/GEOMImpl/GEOMImpl_ILocalOperations.cxx | 3 +- src/GEOMImpl/GEOMImpl_ILocalOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_IMarker.hxx | 3 +- src/GEOMImpl/GEOMImpl_IMeasure.hxx | 3 +- src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx | 3 +- src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_IMirror.hxx | 3 +- src/GEOMImpl/GEOMImpl_IOffset.hxx | 3 +- src/GEOMImpl/GEOMImpl_IPartition.hxx | 3 +- src/GEOMImpl/GEOMImpl_IPipe.hxx | 3 +- src/GEOMImpl/GEOMImpl_IPipeBiNormal.hxx | 6 +- src/GEOMImpl/GEOMImpl_IPipeDiffSect.hxx | 3 +- src/GEOMImpl/GEOMImpl_IPipeShellSect.hxx | 6 +- src/GEOMImpl/GEOMImpl_IPipeTShape.hxx | 6 +- src/GEOMImpl/GEOMImpl_IPlane.hxx | 3 +- src/GEOMImpl/GEOMImpl_IPoint.hxx | 3 +- src/GEOMImpl/GEOMImpl_IPolyline.hxx | 3 +- src/GEOMImpl/GEOMImpl_IPosition.hxx | 3 +- src/GEOMImpl/GEOMImpl_IPrism.hxx | 3 +- src/GEOMImpl/GEOMImpl_IRevolution.hxx | 3 +- src/GEOMImpl/GEOMImpl_IRotate.hxx | 3 +- src/GEOMImpl/GEOMImpl_IScale.hxx | 3 +- src/GEOMImpl/GEOMImpl_IShapes.hxx | 5 +- src/GEOMImpl/GEOMImpl_IShapesOperations.cxx | 27 +- src/GEOMImpl/GEOMImpl_IShapesOperations.hxx | 5 +- src/GEOMImpl/GEOMImpl_ISketcher.hxx | 3 +- src/GEOMImpl/GEOMImpl_ISphere.hxx | 3 +- src/GEOMImpl/GEOMImpl_ISpline.hxx | 5 +- src/GEOMImpl/GEOMImpl_IThruSections.hxx | 3 +- src/GEOMImpl/GEOMImpl_ITorus.hxx | 3 +- .../GEOMImpl_ITransformOperations.cxx | 3 +- .../GEOMImpl_ITransformOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_ITranslate.hxx | 3 +- src/GEOMImpl/GEOMImpl_IVector.hxx | 3 +- src/GEOMImpl/GEOMImpl_ImportDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_ImportDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_LineDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_LineDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_MarkerDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_MarkerDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_MeasureDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_MeasureDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_MirrorDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_MirrorDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_OffsetDriver.cxx | 25 +- src/GEOMImpl/GEOMImpl_OffsetDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_PartitionDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_PartitionDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_PipeDriver.cxx | 29 +- src/GEOMImpl/GEOMImpl_PipeDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_PipeTShapeDriver.cxx | 30 +- src/GEOMImpl/GEOMImpl_PipeTShapeDriver.hxx | 6 +- src/GEOMImpl/GEOMImpl_PlaneDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_PlaneDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_PointDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_PointDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_PolylineDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_PolylineDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_PositionDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_PositionDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_PrismDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_PrismDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_RotateDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_RotateDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_ScaleDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_ScaleDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_ShapeDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_ShapeDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_SketcherDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_SketcherDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_SphereDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_SphereDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_SplineDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_SplineDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_TorusDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_TorusDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_TranslateDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_TranslateDriver.hxx | 3 +- src/GEOMImpl/GEOMImpl_Types.hxx | 6 +- src/GEOMImpl/GEOMImpl_VectorDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_VectorDriver.hxx | 3 +- src/GEOMImpl/GEOM_GEOMImpl.hxx | 3 +- src/GEOMImpl/Makefile.am | 10 +- src/GEOMToolsGUI/GEOMToolsGUI.cxx | 3 +- src/GEOMToolsGUI/GEOMToolsGUI.h | 5 +- src/GEOMToolsGUI/GEOMToolsGUI.pro | 6 +- src/GEOMToolsGUI/GEOMToolsGUI_1.cxx | 5 +- .../GEOMToolsGUI_DeflectionDlg.cxx | 16 +- src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h | 8 +- src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.cxx | 6 +- src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.h | 6 +- src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx | 31 +- src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.h | 31 +- src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx | 3 +- src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h | 3 +- .../GEOMToolsGUI_TransparencyDlg.cxx | 3 +- .../GEOMToolsGUI_TransparencyDlg.h | 3 +- src/GEOMToolsGUI/GEOM_ToolsGUI.hxx | 3 +- src/GEOMToolsGUI/Makefile.am | 6 +- src/GEOM_I/GEOM_DumpPython.cc | 3 +- src/GEOM_I/GEOM_GEOM_I.hxx | 3 +- src/GEOM_I/GEOM_Gen_i.cc | 5 +- src/GEOM_I/GEOM_Gen_i.hh | 3 +- src/GEOM_I/GEOM_I.pro | 6 +- src/GEOM_I/GEOM_I3DPrimOperations_i.cc | 3 +- src/GEOM_I/GEOM_I3DPrimOperations_i.hh | 3 +- src/GEOM_I/GEOM_IAdvancedOperations_i.cc | 9 +- src/GEOM_I/GEOM_IAdvancedOperations_i.hh | 9 +- 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 | 3 +- src/GEOM_I/GEOM_IBooleanOperations_i.hh | 3 +- 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 | 3 +- src/GEOM_I/GEOM_IOperations_i.hh | 3 +- src/GEOM_I/GEOM_IShapesOperations_i.cc | 3 +- src/GEOM_I/GEOM_IShapesOperations_i.hh | 3 +- src/GEOM_I/GEOM_ITransformOperations_i.cc | 3 +- src/GEOM_I/GEOM_ITransformOperations_i.hh | 3 +- src/GEOM_I/GEOM_Object_i.cc | 3 +- src/GEOM_I/GEOM_Object_i.hh | 3 +- src/GEOM_I/Makefile.am | 6 +- src/GEOM_I_Superv/GEOM_List_i.hh | 3 +- src/GEOM_I_Superv/GEOM_Superv_i.cc | 14 +- src/GEOM_I_Superv/GEOM_Superv_i.hh | 35 +- src/GEOM_I_Superv/Makefile.am | 6 +- src/GEOM_SWIG/GEOM_Nut.py | 3 +- src/GEOM_SWIG/GEOM_ObjectInfo.py | 37 +- src/GEOM_SWIG/GEOM_Partition1.py | 3 +- src/GEOM_SWIG/GEOM_Partition2.py | 3 +- src/GEOM_SWIG/GEOM_Partition3.py | 3 +- src/GEOM_SWIG/GEOM_Partition4.py | 3 +- src/GEOM_SWIG/GEOM_Partition5.py | 3 +- src/GEOM_SWIG/GEOM_Sketcher.py | 3 +- src/GEOM_SWIG/GEOM_Spanner.py | 3 +- src/GEOM_SWIG/GEOM_TestAll.py | 4 +- src/GEOM_SWIG/GEOM_TestHealing.py | 3 +- src/GEOM_SWIG/GEOM_TestMeasures.py | 3 +- src/GEOM_SWIG/GEOM_TestOthers.py | 13 +- src/GEOM_SWIG/GEOM_blocks.py | 3 +- src/GEOM_SWIG/GEOM_cyl2complementary.py | 3 +- src/GEOM_SWIG/GEOM_example.py | 3 +- src/GEOM_SWIG/GEOM_example2.py | 3 +- src/GEOM_SWIG/GEOM_example3.py | 3 +- src/GEOM_SWIG/GEOM_example4.py | 3 +- src/GEOM_SWIG/GEOM_example5.py | 3 +- src/GEOM_SWIG/GEOM_example6.py | 6 +- src/GEOM_SWIG/GEOM_example7.py | 8 +- src/GEOM_SWIG/GEOM_moteur.py | 3 +- src/GEOM_SWIG/GEOM_shared_modules.py | 3 +- src/GEOM_SWIG/GEOM_shellSolid.py | 3 +- src/GEOM_SWIG/GEOM_tube_geom.py | 3 +- src/GEOM_SWIG/GEOM_tube_geom_gg2.py | 3 +- src/GEOM_SWIG/GEOM_usinggeom.py | 3 +- src/GEOM_SWIG/Makefile.am | 8 +- src/GEOM_SWIG/PAL_MESH_019_020_geometry.py | 3 +- src/GEOM_SWIG/PAL_MESH_028_geometry.py | 3 +- src/GEOM_SWIG/PAL_MESH_030_geometry.py | 3 +- src/GEOM_SWIG/PAL_MESH_033_geometry.py | 3 +- src/GEOM_SWIG/PAL_MESH_035_geometry.py | 3 +- src/GEOM_SWIG/batchmode_geompy.py | 3 +- src/GEOM_SWIG/geompy.py | 3 +- src/GEOM_SWIG/geompyDC.py | 24 +- src/GEOM_SWIG_WITHIHM/Makefile.am | 6 +- src/GEOM_SWIG_WITHIHM/libGEOM_Swig.i | 6 +- src/GenerationGUI/GenerationGUI.cxx | 3 +- src/GenerationGUI/GenerationGUI.h | 3 +- src/GenerationGUI/GenerationGUI.pro | 6 +- .../GenerationGUI_FillingDlg.cxx | 3 +- src/GenerationGUI/GenerationGUI_FillingDlg.h | 3 +- src/GenerationGUI/GenerationGUI_PipeDlg.cxx | 5 +- src/GenerationGUI/GenerationGUI_PipeDlg.h | 3 +- src/GenerationGUI/GenerationGUI_PrismDlg.cxx | 3 +- src/GenerationGUI/GenerationGUI_PrismDlg.h | 3 +- src/GenerationGUI/GenerationGUI_RevolDlg.cxx | 3 +- src/GenerationGUI/GenerationGUI_RevolDlg.h | 3 +- src/GenerationGUI/Makefile.am | 6 +- src/GroupGUI/GroupGUI.cxx | 3 +- src/GroupGUI/GroupGUI.h | 3 +- src/GroupGUI/GroupGUI_GroupDlg.cxx | 5 +- src/GroupGUI/GroupGUI_GroupDlg.h | 5 +- src/GroupGUI/Makefile.am | 6 +- src/IGESExport/IGESExport.cxx | 3 +- src/IGESExport/IGESExport.pro | 6 +- src/IGESExport/Makefile.am | 6 +- src/IGESImport/IGESImport.cxx | 3 +- src/IGESImport/IGESImport.pro | 6 +- src/IGESImport/Makefile.am | 6 +- src/Makefile.am | 6 +- src/MeasureGUI/Makefile.am | 6 +- src/MeasureGUI/MeasureGUI.cxx | 3 +- src/MeasureGUI/MeasureGUI.h | 3 +- src/MeasureGUI/MeasureGUI_AngleDlg.cxx | 6 +- src/MeasureGUI/MeasureGUI_AngleDlg.h | 6 +- src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx | 3 +- src/MeasureGUI/MeasureGUI_BndBoxDlg.h | 3 +- src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx | 3 +- src/MeasureGUI/MeasureGUI_CenterMassDlg.h | 3 +- .../MeasureGUI_CheckCompoundOfBlocksDlg.cxx | 5 +- .../MeasureGUI_CheckCompoundOfBlocksDlg.h | 3 +- src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx | 3 +- src/MeasureGUI/MeasureGUI_CheckShapeDlg.h | 3 +- src/MeasureGUI/MeasureGUI_DistanceDlg.cxx | 3 +- src/MeasureGUI/MeasureGUI_DistanceDlg.h | 3 +- src/MeasureGUI/MeasureGUI_InertiaDlg.cxx | 3 +- src/MeasureGUI/MeasureGUI_InertiaDlg.h | 3 +- src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx | 3 +- src/MeasureGUI/MeasureGUI_MaxToleranceDlg.h | 3 +- src/MeasureGUI/MeasureGUI_NormaleDlg.cxx | 6 +- src/MeasureGUI/MeasureGUI_NormaleDlg.h | 6 +- src/MeasureGUI/MeasureGUI_PointDlg.cxx | 3 +- src/MeasureGUI/MeasureGUI_PointDlg.h | 3 +- src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx | 3 +- src/MeasureGUI/MeasureGUI_PropertiesDlg.h | 3 +- src/MeasureGUI/MeasureGUI_Skeleton.cxx | 3 +- src/MeasureGUI/MeasureGUI_Skeleton.h | 3 +- src/MeasureGUI/MeasureGUI_WhatisDlg.cxx | 3 +- src/MeasureGUI/MeasureGUI_WhatisDlg.h | 3 +- src/MeasureGUI/MeasureGUI_Widgets.cxx | 6 +- src/MeasureGUI/MeasureGUI_Widgets.h | 6 +- ...aMapNodeOfDataMapOfIntegerMapOfInteger.hxx | 6 +- ...pOfIntegerIndexedDataMapOfShapeInteger.hxx | 3 +- ...aMapNodeOfIndexedDataMapOfIntegerShape.hxx | 3 +- ...apNodeOfIndexedDataMapOfShapeBndSphere.hxx | 34 +- ...dDataMapNodeOfIndexedDataMapOfShapeBox.hxx | 3 +- ...dexedDataMapOfShapeAncestorsSuccessors.hxx | 3 +- .../Handle_NMTDS_ListNodeOfListOfPassKey.hxx | 3 +- ...e_NMTDS_ListNodeOfListOfPassKeyBoolean.hxx | 3 +- .../Handle_NMTDS_StdMapNodeOfMapOfPassKey.hxx | 3 +- ..._NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx | 3 +- src/NMTDS/Makefile.am | 6 +- src/NMTDS/NMTDS.cdl | 3 +- src/NMTDS/NMTDS.pro | 6 +- src/NMTDS/NMTDS_BndSphere.cdl | 11 +- src/NMTDS/NMTDS_BndSphere.cxx | 9 +- src/NMTDS/NMTDS_BndSphere.hxx | 34 +- src/NMTDS/NMTDS_BndSphere.ixx | 34 +- src/NMTDS/NMTDS_BndSphere.jxx | 19 + src/NMTDS/NMTDS_BndSphere.lxx | 9 +- src/NMTDS/NMTDS_BndSphereTree.cxx | 6 +- src/NMTDS/NMTDS_BndSphereTree.hxx | 6 +- src/NMTDS/NMTDS_BoxBndTree.cxx | 3 +- src/NMTDS/NMTDS_BoxBndTree.hxx | 3 +- src/NMTDS/NMTDS_CArray1OfIndexRange.hxx | 3 +- src/NMTDS/NMTDS_CArray1OfIndexRange_0.cxx | 3 +- ...IteratorOfDataMapOfIntegerMapOfInteger.hxx | 6 +- ...eratorOfDataMapOfIntegerMapOfInteger_0.cxx | 6 +- ...aMapNodeOfDataMapOfIntegerMapOfInteger.hxx | 6 +- ...apNodeOfDataMapOfIntegerMapOfInteger_0.cxx | 6 +- .../NMTDS_DataMapOfIntegerMapOfInteger.hxx | 6 +- .../NMTDS_DataMapOfIntegerMapOfInteger_0.cxx | 6 +- src/NMTDS/NMTDS_IndexRange.cdl | 3 +- src/NMTDS/NMTDS_IndexRange.cxx | 3 +- src/NMTDS/NMTDS_IndexRange.hxx | 3 +- src/NMTDS/NMTDS_IndexRange.ixx | 3 +- src/NMTDS/NMTDS_IndexRange.jxx | 3 +- ...pOfIntegerIndexedDataMapOfShapeInteger.hxx | 3 +- ...fIntegerIndexedDataMapOfShapeInteger_0.cxx | 3 +- ...aMapNodeOfIndexedDataMapOfIntegerShape.hxx | 3 +- ...apNodeOfIndexedDataMapOfIntegerShape_0.cxx | 3 +- ...apNodeOfIndexedDataMapOfShapeBndSphere.hxx | 33 +- ...NodeOfIndexedDataMapOfShapeBndSphere_0.cxx | 34 +- ...dDataMapNodeOfIndexedDataMapOfShapeBox.hxx | 3 +- ...ataMapNodeOfIndexedDataMapOfShapeBox_0.cxx | 3 +- ...pOfIntegerIndexedDataMapOfShapeInteger.hxx | 3 +- ...fIntegerIndexedDataMapOfShapeInteger_0.cxx | 3 +- .../NMTDS_IndexedDataMapOfIntegerShape.hxx | 3 +- .../NMTDS_IndexedDataMapOfIntegerShape_0.cxx | 3 +- .../NMTDS_IndexedDataMapOfShapeBndSphere.hxx | 34 +- ...NMTDS_IndexedDataMapOfShapeBndSphere_0.cxx | 34 +- src/NMTDS/NMTDS_IndexedDataMapOfShapeBox.hxx | 3 +- .../NMTDS_IndexedDataMapOfShapeBox_0.cxx | 3 +- src/NMTDS/NMTDS_InterfPool.cdl | 6 +- src/NMTDS/NMTDS_InterfPool.cxx | 6 +- src/NMTDS/NMTDS_InterfPool.hxx | 6 +- src/NMTDS/NMTDS_InterfPool.ixx | 6 +- src/NMTDS/NMTDS_InterfPool.jxx | 6 +- src/NMTDS/NMTDS_InterfType.hxx | 6 +- src/NMTDS/NMTDS_Iterator.cdl | 3 +- src/NMTDS/NMTDS_Iterator.cxx | 3 +- src/NMTDS/NMTDS_Iterator.hxx | 3 +- src/NMTDS/NMTDS_Iterator.ixx | 3 +- src/NMTDS/NMTDS_Iterator.jxx | 3 +- src/NMTDS/NMTDS_IteratorCheckerSI.cdl | 6 +- src/NMTDS/NMTDS_IteratorCheckerSI.cxx | 6 +- src/NMTDS/NMTDS_IteratorCheckerSI.hxx | 6 +- src/NMTDS/NMTDS_IteratorCheckerSI.ixx | 6 +- src/NMTDS/NMTDS_IteratorCheckerSI.jxx | 6 +- ...dexedDataMapOfShapeAncestorsSuccessors.hxx | 3 +- ...xedDataMapOfShapeAncestorsSuccessors_0.cxx | 3 +- .../NMTDS_ListIteratorOfListOfPassKey.hxx | 3 +- ...TDS_ListIteratorOfListOfPassKeyBoolean.hxx | 3 +- ...S_ListIteratorOfListOfPassKeyBoolean_0.cxx | 3 +- .../NMTDS_ListIteratorOfListOfPassKey_0.cxx | 3 +- ...dexedDataMapOfShapeAncestorsSuccessors.hxx | 3 +- ...xedDataMapOfShapeAncestorsSuccessors_0.cxx | 3 +- src/NMTDS/NMTDS_ListNodeOfListOfPassKey.hxx | 3 +- .../NMTDS_ListNodeOfListOfPassKeyBoolean.hxx | 3 +- ...NMTDS_ListNodeOfListOfPassKeyBoolean_0.cxx | 3 +- src/NMTDS/NMTDS_ListNodeOfListOfPassKey_0.cxx | 3 +- ...dexedDataMapOfShapeAncestorsSuccessors.hxx | 3 +- ...xedDataMapOfShapeAncestorsSuccessors_0.cxx | 3 +- src/NMTDS/NMTDS_ListOfPassKey.hxx | 3 +- src/NMTDS/NMTDS_ListOfPassKeyBoolean.hxx | 3 +- src/NMTDS/NMTDS_ListOfPassKeyBoolean_0.cxx | 3 +- src/NMTDS/NMTDS_ListOfPassKey_0.cxx | 3 +- src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey.hxx | 3 +- ...NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx | 3 +- ...TDS_MapIteratorOfMapOfPassKeyBoolean_0.cxx | 37 +- .../NMTDS_MapIteratorOfMapOfPassKey_0.cxx | 37 +- src/NMTDS/NMTDS_MapOfPassKey.hxx | 37 +- src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx | 37 +- src/NMTDS/NMTDS_MapOfPassKeyBoolean_0.cxx | 37 +- src/NMTDS/NMTDS_MapOfPassKey_0.cxx | 37 +- src/NMTDS/NMTDS_PInterfPool.hxx | 6 +- src/NMTDS/NMTDS_PIterator.hxx | 6 +- src/NMTDS/NMTDS_PShapesDataStructure.hxx | 3 +- src/NMTDS/NMTDS_PassKey.cdl | 3 +- src/NMTDS/NMTDS_PassKey.cxx | 3 +- src/NMTDS/NMTDS_PassKey.hxx | 3 +- src/NMTDS/NMTDS_PassKey.ixx | 3 +- src/NMTDS/NMTDS_PassKey.jxx | 3 +- src/NMTDS/NMTDS_PassKeyBoolean.cdl | 3 +- src/NMTDS/NMTDS_PassKeyBoolean.cxx | 3 +- src/NMTDS/NMTDS_PassKeyBoolean.hxx | 3 +- src/NMTDS/NMTDS_PassKeyBoolean.ixx | 3 +- src/NMTDS/NMTDS_PassKeyBoolean.jxx | 3 +- src/NMTDS/NMTDS_PassKeyMapHasher.cdl | 3 +- src/NMTDS/NMTDS_PassKeyMapHasher.cxx | 3 +- src/NMTDS/NMTDS_PassKeyMapHasher.hxx | 3 +- src/NMTDS/NMTDS_PassKeyMapHasher.ixx | 3 +- src/NMTDS/NMTDS_PassKeyMapHasher.jxx | 3 +- src/NMTDS/NMTDS_PassKeyShape.cdl | 6 +- src/NMTDS/NMTDS_PassKeyShape.cxx | 6 +- src/NMTDS/NMTDS_PassKeyShape.hxx | 6 +- src/NMTDS/NMTDS_PassKeyShape.ixx | 6 +- src/NMTDS/NMTDS_PassKeyShape.jxx | 6 +- src/NMTDS/NMTDS_PassKeyShapeMapHasher.cdl | 6 +- src/NMTDS/NMTDS_PassKeyShapeMapHasher.cxx | 6 +- src/NMTDS/NMTDS_PassKeyShapeMapHasher.hxx | 6 +- src/NMTDS/NMTDS_PassKeyShapeMapHasher.ixx | 6 +- src/NMTDS/NMTDS_PassKeyShapeMapHasher.jxx | 6 +- src/NMTDS/NMTDS_ShapesDataStructure.cdl | 3 +- src/NMTDS/NMTDS_ShapesDataStructure.cxx | 3 +- src/NMTDS/NMTDS_ShapesDataStructure.hxx | 3 +- src/NMTDS/NMTDS_ShapesDataStructure.ixx | 3 +- src/NMTDS/NMTDS_ShapesDataStructure.jxx | 3 +- src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey.hxx | 36 +- .../NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx | 36 +- ...MTDS_StdMapNodeOfMapOfPassKeyBoolean_0.cxx | 37 +- .../NMTDS_StdMapNodeOfMapOfPassKey_0.cxx | 37 +- src/NMTDS/NMTDS_Tools.cdl | 6 +- src/NMTDS/NMTDS_Tools.cxx | 6 +- src/NMTDS/NMTDS_Tools.hxx | 6 +- src/NMTDS/NMTDS_Tools.ixx | 6 +- src/NMTDS/NMTDS_Tools.jxx | 6 +- ...pOfIntegerIndexedDataMapOfShapeInteger.hxx | 3 +- ...dexedDataMapOfShapeAncestorsSuccessors.hxx | 3 +- ...pNodeOfDataMapOfIntegerListOfPaveBlock.hxx | 3 +- ...eOfIndexedDataMapOfIndexedMapOfInteger.hxx | 3 +- ...IndexedDataMapOfShapeIndexedMapOfShape.hxx | 3 +- ...apNodeOfIndexedDataMapOfShapePaveBlock.hxx | 3 +- ...e_NMTTools_ListNodeOfListOfCommonBlock.hxx | 3 +- ...NMTTools_ListNodeOfListOfCoupleOfShape.hxx | 3 +- ...le_NMTTools_StdMapNodeOfMapOfPaveBlock.hxx | 3 +- src/NMTTools/Makefile.am | 6 +- src/NMTTools/NMTTools.cdl | 3 +- src/NMTTools/NMTTools.pro | 6 +- src/NMTTools/NMTTools_CheckerSI.cdl | 6 +- src/NMTTools/NMTTools_CheckerSI.cxx | 6 +- src/NMTTools/NMTTools_CheckerSI.hxx | 6 +- src/NMTTools/NMTTools_CheckerSI.ixx | 6 +- src/NMTTools/NMTTools_CheckerSI.jxx | 6 +- src/NMTTools/NMTTools_CheckerSI_1.cxx | 6 +- src/NMTTools/NMTTools_CommonBlock.cdl | 3 +- src/NMTTools/NMTTools_CommonBlock.cxx | 3 +- src/NMTTools/NMTTools_CommonBlock.hxx | 3 +- src/NMTTools/NMTTools_CommonBlock.ixx | 3 +- src/NMTTools/NMTTools_CommonBlock.jxx | 3 +- src/NMTTools/NMTTools_CommonBlockAPI.cdl | 3 +- src/NMTTools/NMTTools_CommonBlockAPI.cxx | 3 +- src/NMTTools/NMTTools_CommonBlockAPI.hxx | 3 +- src/NMTTools/NMTTools_CommonBlockAPI.ixx | 3 +- src/NMTTools/NMTTools_CommonBlockAPI.jxx | 3 +- src/NMTTools/NMTTools_CommonBlockPool.hxx | 3 +- src/NMTTools/NMTTools_CommonBlockPool_0.cxx | 3 +- src/NMTTools/NMTTools_CoupleOfShape.cdl | 3 +- src/NMTTools/NMTTools_CoupleOfShape.cxx | 3 +- src/NMTTools/NMTTools_CoupleOfShape.hxx | 3 +- src/NMTTools/NMTTools_CoupleOfShape.ixx | 3 +- src/NMTTools/NMTTools_CoupleOfShape.jxx | 3 +- src/NMTTools/NMTTools_DEProcessor.cdl | 3 +- src/NMTTools/NMTTools_DEProcessor.cxx | 3 +- src/NMTTools/NMTTools_DEProcessor.hxx | 3 +- src/NMTTools/NMTTools_DEProcessor.ixx | 3 +- src/NMTTools/NMTTools_DEProcessor.jxx | 3 +- src/NMTTools/NMTTools_DSFiller.cdl | 3 +- src/NMTTools/NMTTools_DSFiller.cxx | 3 +- src/NMTTools/NMTTools_DSFiller.hxx | 3 +- src/NMTTools/NMTTools_DSFiller.ixx | 3 +- src/NMTTools/NMTTools_DSFiller.jxx | 3 +- ...ratorOfDataMapOfIntegerListOfPaveBlock.hxx | 3 +- ...torOfDataMapOfIntegerListOfPaveBlock_0.cxx | 3 +- ...pNodeOfDataMapOfIntegerListOfPaveBlock.hxx | 3 +- ...odeOfDataMapOfIntegerListOfPaveBlock_0.cxx | 3 +- ...TTools_DataMapOfIntegerListOfPaveBlock.hxx | 3 +- ...ools_DataMapOfIntegerListOfPaveBlock_0.cxx | 3 +- ...eOfIndexedDataMapOfIndexedMapOfInteger.hxx | 3 +- ...fIndexedDataMapOfIndexedMapOfInteger_0.cxx | 3 +- ...IndexedDataMapOfShapeIndexedMapOfShape.hxx | 3 +- ...dexedDataMapOfShapeIndexedMapOfShape_0.cxx | 3 +- ...apNodeOfIndexedDataMapOfShapePaveBlock.hxx | 3 +- ...NodeOfIndexedDataMapOfShapePaveBlock_0.cxx | 3 +- ...ls_IndexedDataMapOfIndexedMapOfInteger.hxx | 3 +- ..._IndexedDataMapOfIndexedMapOfInteger_0.cxx | 3 +- ...IndexedDataMapOfShapeIndexedMapOfShape.hxx | 3 +- ...dexedDataMapOfShapeIndexedMapOfShape_0.cxx | 3 +- ...MTTools_IndexedDataMapOfShapePaveBlock.hxx | 3 +- ...Tools_IndexedDataMapOfShapePaveBlock_0.cxx | 3 +- .../NMTTools_IteratorOfCoupleOfShape.cdl | 3 +- .../NMTTools_IteratorOfCoupleOfShape.cxx | 3 +- .../NMTTools_IteratorOfCoupleOfShape.hxx | 3 +- .../NMTTools_IteratorOfCoupleOfShape.ixx | 3 +- .../NMTTools_IteratorOfCoupleOfShape.jxx | 3 +- ...TTools_ListIteratorOfListOfCommonBlock.hxx | 3 +- ...ools_ListIteratorOfListOfCommonBlock_0.cxx | 3 +- ...ools_ListIteratorOfListOfCoupleOfShape.hxx | 3 +- ...ls_ListIteratorOfListOfCoupleOfShape_0.cxx | 3 +- .../NMTTools_ListNodeOfListOfCommonBlock.hxx | 3 +- ...NMTTools_ListNodeOfListOfCommonBlock_0.cxx | 3 +- ...NMTTools_ListNodeOfListOfCoupleOfShape.hxx | 3 +- ...TTools_ListNodeOfListOfCoupleOfShape_0.cxx | 3 +- src/NMTTools/NMTTools_ListOfCommonBlock.hxx | 3 +- src/NMTTools/NMTTools_ListOfCommonBlock_0.cxx | 3 +- src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx | 3 +- .../NMTTools_ListOfCoupleOfShape_0.cxx | 3 +- .../NMTTools_MapIteratorOfMapOfPaveBlock.hxx | 3 +- ...NMTTools_MapIteratorOfMapOfPaveBlock_0.cxx | 3 +- src/NMTTools/NMTTools_MapOfPaveBlock.hxx | 3 +- src/NMTTools/NMTTools_MapOfPaveBlock_0.cxx | 3 +- src/NMTTools/NMTTools_PCurveMaker.cdl | 3 +- src/NMTTools/NMTTools_PCurveMaker.cxx | 3 +- src/NMTTools/NMTTools_PCurveMaker.hxx | 3 +- src/NMTTools/NMTTools_PCurveMaker.ixx | 3 +- src/NMTTools/NMTTools_PCurveMaker.jxx | 3 +- src/NMTTools/NMTTools_PDSFiller.hxx | 3 +- src/NMTTools/NMTTools_PPaveFiller.hxx | 3 +- src/NMTTools/NMTTools_PaveFiller.cdl | 3 +- src/NMTTools/NMTTools_PaveFiller.cxx | 3 +- src/NMTTools/NMTTools_PaveFiller.hxx | 37 +- src/NMTTools/NMTTools_PaveFiller.ixx | 3 +- src/NMTTools/NMTTools_PaveFiller.jxx | 3 +- src/NMTTools/NMTTools_PaveFiller_0.cxx | 3 +- src/NMTTools/NMTTools_PaveFiller_1.cxx | 3 +- src/NMTTools/NMTTools_PaveFiller_2.cxx | 20 +- src/NMTTools/NMTTools_PaveFiller_3.cxx | 3 +- src/NMTTools/NMTTools_PaveFiller_4.cxx | 3 +- src/NMTTools/NMTTools_PaveFiller_5.cxx | 3 +- src/NMTTools/NMTTools_PaveFiller_6.cxx | 353 +- src/NMTTools/NMTTools_PaveFiller_7.cxx | 3 +- src/NMTTools/NMTTools_PaveFiller_8.cxx | 3 +- src/NMTTools/NMTTools_PaveFiller_9.cxx | 3 +- .../NMTTools_StdMapNodeOfMapOfPaveBlock.hxx | 3 +- .../NMTTools_StdMapNodeOfMapOfPaveBlock_0.cxx | 3 +- src/NMTTools/NMTTools_Tools.cdl | 3 +- src/NMTTools/NMTTools_Tools.cxx | 3 +- src/NMTTools/NMTTools_Tools.hxx | 3 +- src/NMTTools/NMTTools_Tools.ixx | 3 +- src/NMTTools/NMTTools_Tools.jxx | 3 +- src/OBJECT/GEOM_AISShape.cxx | 3 +- src/OBJECT/GEOM_AISShape.hxx | 3 +- src/OBJECT/GEOM_AISShape.ixx | 3 +- src/OBJECT/GEOM_AISShape.jxx | 3 +- src/OBJECT/GEOM_AISTrihedron.cxx | 3 +- src/OBJECT/GEOM_AISTrihedron.hxx | 3 +- src/OBJECT/GEOM_AISVector.cxx | 3 +- src/OBJECT/GEOM_AISVector.hxx | 3 +- src/OBJECT/GEOM_Actor.cxx | 6 +- src/OBJECT/GEOM_Actor.h | 3 +- src/OBJECT/GEOM_AssemblyBuilder.cxx | 3 +- src/OBJECT/GEOM_AssemblyBuilder.h | 3 +- src/OBJECT/GEOM_DeviceActor.cxx | 6 +- src/OBJECT/GEOM_DeviceActor.h | 6 +- src/OBJECT/GEOM_EdgeSource.cxx | 6 +- src/OBJECT/GEOM_EdgeSource.h | 6 +- src/OBJECT/GEOM_FaceSource.cxx | 6 +- src/OBJECT/GEOM_FaceSource.h | 6 +- src/OBJECT/GEOM_InteractiveObject.cxx | 3 +- src/OBJECT/GEOM_InteractiveObject.hxx | 3 +- src/OBJECT/GEOM_InteractiveObject.ixx | 3 +- src/OBJECT/GEOM_InteractiveObject.jxx | 3 +- src/OBJECT/GEOM_OBJECT_defs.hxx | 3 +- src/OBJECT/GEOM_OCCReader.cxx | 3 +- src/OBJECT/GEOM_OCCReader.h | 3 +- src/OBJECT/GEOM_ShadingFace.cxx | 6 +- src/OBJECT/GEOM_ShadingFace.h | 6 +- src/OBJECT/GEOM_SmartPtr.h | 6 +- src/OBJECT/GEOM_VTKTrihedron.cxx | 3 +- src/OBJECT/GEOM_VTKTrihedron.hxx | 3 +- src/OBJECT/GEOM_VertexSource.cxx | 6 +- src/OBJECT/GEOM_VertexSource.h | 6 +- src/OBJECT/GEOM_WireframeFace.cxx | 6 +- src/OBJECT/GEOM_WireframeFace.h | 6 +- src/OBJECT/Handle_GEOM_AISShape.hxx | 3 +- src/OBJECT/Handle_GEOM_InteractiveObject.hxx | 3 +- src/OBJECT/Makefile.am | 6 +- src/OBJECT/OBJECT.pro | 6 +- src/OperationGUI/Makefile.am | 6 +- src/OperationGUI/OperationGUI.cxx | 3 +- src/OperationGUI/OperationGUI.h | 3 +- .../OperationGUI_ArchimedeDlg.cxx | 3 +- src/OperationGUI/OperationGUI_ArchimedeDlg.h | 3 +- src/OperationGUI/OperationGUI_ChamferDlg.cxx | 3 +- src/OperationGUI/OperationGUI_ChamferDlg.h | 3 +- src/OperationGUI/OperationGUI_ClippingDlg.cxx | 3 +- src/OperationGUI/OperationGUI_ClippingDlg.h | 3 +- .../OperationGUI_Fillet1d2dDlg.cxx | 32 +- src/OperationGUI/OperationGUI_Fillet1d2dDlg.h | 38 +- src/OperationGUI/OperationGUI_FilletDlg.cxx | 3 +- src/OperationGUI/OperationGUI_FilletDlg.h | 3 +- .../OperationGUI_GetShapesOnShapeDlg.cxx | 6 +- .../OperationGUI_GetShapesOnShapeDlg.h | 6 +- src/OperationGUI/OperationGUI_MaterialDlg.cxx | 3 +- src/OperationGUI/OperationGUI_MaterialDlg.h | 3 +- .../OperationGUI_PartitionDlg.cxx | 11 +- src/OperationGUI/OperationGUI_PartitionDlg.h | 3 +- src/PrimitiveGUI/Makefile.am | 6 +- src/PrimitiveGUI/PrimitiveGUI.cxx | 3 +- src/PrimitiveGUI/PrimitiveGUI.h | 3 +- src/PrimitiveGUI/PrimitiveGUI.pro | 6 +- src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx | 3 +- src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h | 3 +- src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx | 3 +- src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h | 3 +- src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx | 3 +- src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h | 3 +- src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx | 6 +- src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h | 6 +- src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx | 8 +- src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h | 6 +- src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx | 3 +- src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h | 3 +- src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx | 3 +- src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h | 3 +- src/RepairGUI/Makefile.am | 6 +- src/RepairGUI/RepairGUI.cxx | 3 +- src/RepairGUI/RepairGUI.h | 3 +- .../RepairGUI_ChangeOrientationDlg.cxx | 3 +- .../RepairGUI_ChangeOrientationDlg.h | 3 +- src/RepairGUI/RepairGUI_CloseContourDlg.cxx | 3 +- src/RepairGUI/RepairGUI_CloseContourDlg.h | 3 +- src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx | 3 +- src/RepairGUI/RepairGUI_DivideEdgeDlg.h | 3 +- src/RepairGUI/RepairGUI_FreeBoundDlg.cxx | 3 +- src/RepairGUI/RepairGUI_FreeBoundDlg.h | 3 +- src/RepairGUI/RepairGUI_FreeFacesDlg.cxx | 3 +- src/RepairGUI/RepairGUI_FreeFacesDlg.h | 3 +- src/RepairGUI/RepairGUI_GlueDlg.cxx | 3 +- src/RepairGUI/RepairGUI_GlueDlg.h | 3 +- .../RepairGUI_RemoveExtraEdgesDlg.cxx | 8 +- src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h | 8 +- src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx | 3 +- src/RepairGUI/RepairGUI_RemoveHolesDlg.h | 3 +- src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx | 3 +- src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h | 3 +- src/RepairGUI/RepairGUI_SewingDlg.cxx | 3 +- src/RepairGUI/RepairGUI_SewingDlg.h | 3 +- src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx | 3 +- src/RepairGUI/RepairGUI_ShapeProcessDlg.h | 3 +- src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx | 5 +- src/RepairGUI/RepairGUI_SuppressFacesDlg.h | 5 +- src/SKETCHER/Makefile.am | 6 +- src/SKETCHER/SKETCHER.pro | 6 +- src/SKETCHER/Sketcher_Profile.cxx | 3 +- src/SKETCHER/Sketcher_Profile.hxx | 3 +- src/STEPExport/Makefile.am | 6 +- src/STEPExport/STEPExport.cxx | 3 +- src/STEPExport/STEPExport.pro | 6 +- src/STEPImport/Makefile.am | 6 +- src/STEPImport/STEPImport.cxx | 3 +- src/STEPImport/STEPImport.pro | 6 +- src/STLExport/Makefile.am | 6 +- src/STLExport/STLExport.cxx | 3 +- src/STLExport/STLExport.pro | 6 +- src/ShHealOper/Makefile.am | 6 +- src/ShHealOper/ShHealOper.pro | 6 +- .../ShHealOper_ChangeOrientation.cxx | 3 +- .../ShHealOper_ChangeOrientation.hxx | 3 +- src/ShHealOper/ShHealOper_CloseContour.cxx | 3 +- src/ShHealOper/ShHealOper_CloseContour.hxx | 3 +- src/ShHealOper/ShHealOper_EdgeDivide.cxx | 3 +- src/ShHealOper/ShHealOper_EdgeDivide.hxx | 3 +- src/ShHealOper/ShHealOper_FillHoles.cxx | 3 +- src/ShHealOper/ShHealOper_FillHoles.hxx | 3 +- src/ShHealOper/ShHealOper_RemoveFace.cxx | 3 +- src/ShHealOper/ShHealOper_RemoveFace.hxx | 3 +- .../ShHealOper_RemoveInternalWires.cxx | 3 +- .../ShHealOper_RemoveInternalWires.hxx | 3 +- src/ShHealOper/ShHealOper_Sewing.cxx | 3 +- src/ShHealOper/ShHealOper_Sewing.hxx | 3 +- src/ShHealOper/ShHealOper_ShapeProcess.cxx | 3 +- src/ShHealOper/ShHealOper_ShapeProcess.hxx | 3 +- src/ShHealOper/ShHealOper_SpiltCurve2d.hxx | 3 +- src/ShHealOper/ShHealOper_SplitCurve2d.cxx | 3 +- src/ShHealOper/ShHealOper_SplitCurve2d.hxx | 3 +- src/ShHealOper/ShHealOper_SplitCurve3d.cxx | 3 +- src/ShHealOper/ShHealOper_SplitCurve3d.hxx | 3 +- src/ShHealOper/ShHealOper_Tool.cxx | 3 +- src/ShHealOper/ShHealOper_Tool.hxx | 3 +- src/TransformationGUI/Makefile.am | 6 +- src/TransformationGUI/TransformationGUI.cxx | 3 +- src/TransformationGUI/TransformationGUI.h | 3 +- src/TransformationGUI/TransformationGUI.pro | 6 +- .../TransformationGUI_MirrorDlg.cxx | 3 +- .../TransformationGUI_MirrorDlg.h | 3 +- .../TransformationGUI_MultiRotationDlg.cxx | 3 +- .../TransformationGUI_MultiRotationDlg.h | 3 +- .../TransformationGUI_MultiTranslationDlg.cxx | 3 +- .../TransformationGUI_MultiTranslationDlg.h | 3 +- .../TransformationGUI_OffsetDlg.cxx | 3 +- .../TransformationGUI_OffsetDlg.h | 3 +- .../TransformationGUI_PositionDlg.cxx | 3 +- .../TransformationGUI_PositionDlg.h | 3 +- .../TransformationGUI_RotationDlg.cxx | 3 +- .../TransformationGUI_RotationDlg.h | 3 +- .../TransformationGUI_ScaleDlg.cxx | 3 +- .../TransformationGUI_ScaleDlg.h | 3 +- .../TransformationGUI_TranslationDlg.cxx | 3 +- .../TransformationGUI_TranslationDlg.h | 3 +- src/src.pro | 6 +- 1300 files changed, 5480 insertions(+), 5158 deletions(-) delete mode 100644 src/DlgRef/DlgRef_PipeTShape_ScrollArea_QTD.ui diff --git a/GEOM_version.h.in b/GEOM_version.h.in index e511ffbba..095303704 100644 --- a/GEOM_version.h.in +++ b/GEOM_version.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -19,6 +19,7 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // File : GEOM_version.h // Author : Vadim SANDLER // Module : SALOME diff --git a/Makefile.am b/Makefile.am index 6c07e7b91..ce1de12db 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # -* Makefile *- # Author : Patrick GOLDBRONN (CEA) # Date : 28/06/2001 diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am index 0b7954458..8c38d3d27 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + include $(top_srcdir)/adm_local/unix/make_common_starter.am SUBDIRS = unix cmake_files diff --git a/adm_local/cmake_files/FindGEOM.cmake b/adm_local/cmake_files/FindGEOM.cmake index c1d8072da..5f138fd7e 100644 --- a/adm_local/cmake_files/FindGEOM.cmake +++ b/adm_local/cmake_files/FindGEOM.cmake @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/adm_local/cmake_files/Makefile.am b/adm_local/cmake_files/Makefile.am index c91a81749..01d6395ba 100644 --- a/adm_local/cmake_files/Makefile.am +++ b/adm_local/cmake_files/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + include $(top_srcdir)/adm_local/unix/make_common_starter.am admlocal_cmakedir = $(admlocaldir)/cmake_files diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am index 5f6d5f753..190640454 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + include $(top_srcdir)/adm_local/unix/make_common_starter.am SUBDIRS = config_files diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am index eb3be6871..a8282652e 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + include $(top_srcdir)/adm_local/unix/make_common_starter.am dist_admlocalm4_DATA = \ diff --git a/adm_local/unix/config_files/check_GEOM.m4 b/adm_local/unix/config_files/check_GEOM.m4 index dd30f1b07..78afb43c6 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-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE dnl dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -19,6 +19,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + # Check availability of Geom binary distribution # # Author : Nicolas REJNERI (OPEN CASCADE, 2003) diff --git a/adm_local/unix/config_files/check_GUI.m4 b/adm_local/unix/config_files/check_GUI.m4 index 931449768..39b2dfd8a 100755 --- a/adm_local/unix/config_files/check_GUI.m4 +++ b/adm_local/unix/config_files/check_GUI.m4 @@ -1,7 +1,4 @@ -dnl Copyright (C) 2007-2008 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 +dnl Copyright (C) 2007-2010 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 @@ -19,6 +16,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + # Check availability of Salome binary distribution # # Author : Marc Tajchman (CEA, 2002) diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index cd851519b..782a8154d 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -24,6 +21,7 @@ # The following is to avoid PACKAGE_... env variable # redefinition compilation warnings # ============================================================ +# AM_CXXFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h diff --git a/bin/Makefile.am b/bin/Makefile.am index 4201a0906..da76a6844 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # -* Makefile *- # Author : Guillaume Boulant (CSSI) # Module : GEOM diff --git a/bin/geom_setenv.py b/bin/geom_setenv.py index 3a696f378..b622ac9dc 100644 --- a/bin/geom_setenv.py +++ b/bin/geom_setenv.py @@ -1,9 +1,6 @@ #! /usr/bin/env python # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/build_cmake b/build_cmake index e2f5b160c..e522a9ffa 100755 --- a/build_cmake +++ b/build_cmake @@ -1,8 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -21,7 +18,6 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # - CURRENT_DIR=`pwd` CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` cd ${CONF_DIR} diff --git a/build_cmake.bat b/build_cmake.bat index 772c3da37..0bf6508dc 100644 --- a/build_cmake.bat +++ b/build_cmake.bat @@ -1,2 +1,20 @@ - +@REM Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +@REM +@REM This library is free software; you can redistribute it and/or +@REM modify it under the terms of the GNU Lesser General Public +@REM License as published by the Free Software Foundation; either +@REM version 2.1 of the License. +@REM +@REM This library is distributed in the hope that it will be useful, +@REM but WITHOUT ANY WARRANTY; without even the implied warranty of +@REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +@REM Lesser General Public License for more details. +@REM +@REM You should have received a copy of the GNU Lesser General Public +@REM License along with this library; if not, write to the Free Software +@REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +@REM +@REM See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +@REM + %PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\am2cmake.py --geom diff --git a/build_configure b/build_configure index 8803fbedf..9f225f5ad 100755 --- a/build_configure +++ b/build_configure @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -20,6 +20,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # Tool for updating list of .in file for the SALOME project # and regenerating configure script # Author : Marc Tajchman - CEA diff --git a/clean_configure b/clean_configure index f57f7b3bf..366520874 100755 --- a/clean_configure +++ b/clean_configure @@ -1,8 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -20,6 +17,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + rm -rf autom4te.cache aclocal.m4 configure make_config find . -name "*~" -print -exec rm {} \; find . -name "*.pyc" -print -exec rm {} \; diff --git a/configure.ac b/configure.ac index 4241570ac..207f596b8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # Author : Marc Tajchman (CEA) # Date : 28/06/2001 # Modified by : Patrick GOLDBRONN (CEA) @@ -26,7 +24,7 @@ # Modified by : Alexander BORODIN (OCN) - autotools usage # Created from configure.in.base # -AC_INIT([Salome2 Project GEOM module], [5.1.3], [webmaster.salome@opencascade.com], [SalomeGEOM]) +AC_INIT([Salome2 Project GEOM module], [5.1.4], [webmaster.salome@opencascade.com], [SalomeGEOM]) AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET diff --git a/doc/Makefile.am b/doc/Makefile.am index 1902d9d21..f40fb81a5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # -* Makefile *- # Author : Patrick GOLDBRONN (CEA) # Date : 30/11/2001 diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am index 5a92861e5..4a09173c6 100644 --- a/doc/salome/Makefile.am +++ b/doc/salome/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # -* Makefile *- # Author : Patrick GOLDBRONN (CEA) # Date : 30/11/2001 diff --git a/doc/salome/gui/GEOM/Makefile.am b/doc/salome/gui/GEOM/Makefile.am index 7acc86edb..245046a1f 100755 --- a/doc/salome/gui/GEOM/Makefile.am +++ b/doc/salome/gui/GEOM/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # File : Makefile.in # Author : Vasily Rusyaev (Open Cascade NN) # Modified by : Alexander BORODIN (OCN) - autotools usage diff --git a/doc/salome/gui/GEOM/doxyfile.in b/doc/salome/gui/GEOM/doxyfile.in index 2f49e2434..cc6155462 100755 --- a/doc/salome/gui/GEOM/doxyfile.in +++ b/doc/salome/gui/GEOM/doxyfile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/doc/salome/gui/GEOM/doxyfile_py.in b/doc/salome/gui/GEOM/doxyfile_py.in index a573c3d1e..b296fa5b7 100755 --- a/doc/salome/gui/GEOM/doxyfile_py.in +++ b/doc/salome/gui/GEOM/doxyfile_py.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/doc/salome/gui/GEOM/doxyfile_tui.in b/doc/salome/gui/GEOM/doxyfile_tui.in index bc081776f..64eca7dcb 100755 --- a/doc/salome/gui/GEOM/doxyfile_tui.in +++ b/doc/salome/gui/GEOM/doxyfile_tui.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/doc/salome/gui/GEOM/images/face1.png b/doc/salome/gui/GEOM/images/face1.png index 2fbea98ae80e03b7fd7649d31142004315f207e4..7347e771057074ac93c9d2cc049433bd7098adbb 100644 GIT binary patch literal 20126 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 literal 17260 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 MJ7a5AZs`&IUrac#Z~y=R literal 18664 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
  • \subpage create_pipetshape_page
    • - + */ diff --git a/doc/salome/gui/GEOM/input/creating_filling.doc b/doc/salome/gui/GEOM/input/creating_filling.doc index ed554c51c..a66bb45f0 100644 --- a/doc/salome/gui/GEOM/input/creating_filling.doc +++ b/doc/salome/gui/GEOM/input/creating_filling.doc @@ -36,8 +36,7 @@ rather complex cases. \n TUI Command: geompy.MakeFilling(Edges, MinDegree, MaxDegree, Tol2D, Tol3D, NbIter) \n Arguments: Name + 1 List of edges + 7 Parameters -(Min. degree, Max. degree, Number of iterations, 2D tolerance, 3D -tolerance, Number of iterations, Method, Approximation). +(Min. degree, Max. degree, 2D tolerance, 3D tolerance, Number of iterations, Method, Approximation). \image html filling.png diff --git a/doc/salome/gui/GEOM/input/creating_primitives.doc b/doc/salome/gui/GEOM/input/creating_primitives.doc index 1800330b5..9a1ab84b1 100644 --- a/doc/salome/gui/GEOM/input/creating_primitives.doc +++ b/doc/salome/gui/GEOM/input/creating_primitives.doc @@ -11,8 +11,8 @@ geometrical objects, such as:
  • \subpage create_sphere_page
  • \subpage create_torus_page
  • \subpage create_cone_page
    • -
  • \subpage create_squareface_page "Face"
    • +
  • \subpage create_squareface_page
  • \subpage create_disk_page
    • -*/ \ No newline at end of file +*/ diff --git a/doc/salome/gui/GEOM/input/creating_squareface.doc b/doc/salome/gui/GEOM/input/creating_squareface.doc index 4267a400f..f10b0e350 100755 --- a/doc/salome/gui/GEOM/input/creating_squareface.doc +++ b/doc/salome/gui/GEOM/input/creating_squareface.doc @@ -1,19 +1,19 @@ /*! -\page create_squareface_page Square Face +\page create_squareface_page Rectangle -A primitive called Square Face is a square plane of certain dimensions and orientation +A primitive called \b Rectangle is a rectangular face of certain dimensions and orientation -To create a \b Square Face in the Main Menu select New Entity - > -Primitives - > Face +To create a \b Rectangle in the Main Menu select New Entity - > +Primitives - > Rectangle -\n There are 2 algorithms to create a \b Square \b Face in the 3D space. +\n There are 2 algorithms to create a \b Rectangle in the 3D space. \n The \b Result of each operation will be a GEOM_Object (Face). -\n Firstly, you can create a \b Face at the origin +\n Firstly, you can create a \b Rectangle at the origin of coordinates defining its boundaries by the height and the width and its axis by the orientation radio buttons (OXY, OYZ or OZX).This -means that the Square Face will lie in "OXY", "OYZ" or "OZX" plane correspondingly. +means that the \b Rectangle will lie in "OXY", "OYZ" or "OZX" plane correspondingly. \n TUI Command: geompy.MakeFaceHW(Height, Width, Orientation) \n Arguments: Name + 3 values (Dimensions at origin: heigth, width and orientation). @@ -21,12 +21,12 @@ orientation). \image html face1.png -\n Secondly, you can define a \b Face by the height and the width sizes and an \b Edge defining the normal to the center of the face. +\n Secondly, you can define a \b Rectangle by the height and the width sizes and an \b Edge defining the normal to the center of the face. \n TUI Command: geompy.MakeFaceObjHW(Vector, Height, Width) \n Arguments: Name + 1 Vector (normal to the center) + 2 doubles (to describe a face sizes). -\n It is also possible to create a Square Face from another selected face. For this, switch the Object Type button +\n It is also possible to create a \b Rectangle from another selected face. For this, switch the Object Type button to \b Face, then select a face object and set the values of Height and Width for the new face. The created face will lie in the plane of the selected face. \n TUI Command: geompy.MakeFaceObjHW(Face, Height, Width) @@ -35,9 +35,9 @@ Height and Width for the new face. The created face will lie in the plane of the \image html face2.png Example: -\image html faces.png "Square face" +\image html faces.png "Rectangle" Our TUI Scripts provide you with useful examples of creating -\ref tui_creation_face "Primitives". +\ref tui_creation_squareface "Primitives". */ diff --git a/doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc b/doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc index 724b2da43..f9f402a7e 100644 --- a/doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc +++ b/doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc @@ -296,5 +296,5 @@ gg.createAndDisplayGO(id_pipetshapefillet_position) \endcode - + */ diff --git a/doc/salome/gui/GEOM/input/tui_basic_geom_objs.doc b/doc/salome/gui/GEOM/input/tui_basic_geom_objs.doc index 5e1f73312..b166081a2 100644 --- a/doc/salome/gui/GEOM/input/tui_basic_geom_objs.doc +++ b/doc/salome/gui/GEOM/input/tui_basic_geom_objs.doc @@ -16,6 +16,7 @@ p100 = geompy.MakeVertexWithRef(p0, 100., 100., 100.) px = geompy.MakeVertex(100., 0., 0.) py = geompy.MakeVertex(0., 100., 0.) pz = geompy.MakeVertex(0., 0., 100.) +p1 = geompy.MakeVertex(50., 50., 30.) # create a curve and a vertices on it Arc = geompy.MakeArc(py, pz, px) @@ -24,11 +25,16 @@ p_on_arc = geompy.MakeVertexOnCurve(Arc, 0.25) #create vertex by point projection p_on_arc2 = geompy.MakeVertexOnCurveByCoord(Arc, 100, -10, 10) +# create 2 lines and make point on its intersection +line_1 = geompy.MakeLineTwoPnt(p0, p100) +line_2 = geompy.MakeLineTwoPnt(p1, pz) +p_inter = geompy.MakeVertexOnLinesIntersection(line_1, line_2) + # create a face and vertices on it Add_line = geompy.MakeLineTwoPnt(px, py) arc_face = geompy.MakeFaceWires([Arc, Add_line], 1) p_on_face1 = geompy.MakeVertexOnSurface(arc_face, 0.5, 0.5) -p_on_face2 = geompy.MakeVertexOnSurfaceByCoord(Face_1, 35, 35, 35) +p_on_face2 = geompy.MakeVertexOnSurfaceByCoord(arc_face, 35, 35, 35) # add objects in the study @@ -38,8 +44,11 @@ id_px = geompy.addToStudy(px, "Vertex X") id_py = geompy.addToStudy(py, "Vertex Y") id_pz = geompy.addToStudy(pz, "Vertex Z") id_Arc = geompy.addToStudy(Arc, "Arc") +id_line_1 = geompy.addToStudy(line_1, "Line 1") +id_line_2 = geompy.addToStudy(line_2, "Line 2") id_p_on_arc = geompy.addToStudy(p_on_arc, "Vertex on Arc by parameter") -id_p_on_arc2 = geompy.addToStudy(p_on_arc, "Vertex on Arc by point projection") +id_p_on_arc2 = geompy.addToStudy(p_on_arc, "Vertex on Arc by point projection") +id_p_inter = geompy.addToStudy(p_inter, "Vertex on Lines Intersection") id_p_on_face1 = geompy.addToStudy(p_on_face1, "Vertex on face by parameter") id_p_on_face2 = geompy.addToStudy(p_on_face2, "Vertex on face by point projection") @@ -47,7 +56,8 @@ id_p_on_face2 = geompy.addToStudy(p_on_face2, "Vertex on face by point projectio gg.createAndDisplayGO(id_p0) gg.createAndDisplayGO(id_p100) gg.createAndDisplayGO(id_Arc) -gg.createAndDisplayGO(id_p_on_arc) +gg.createAndDisplayGO(id_p_inter) +gg.createAndDisplayGO(id_p_on_arc) \endcode \anchor tui_creation_line diff --git a/doc/salome/gui/GEOM/input/tui_primitives.doc b/doc/salome/gui/GEOM/input/tui_primitives.doc index 538067c01..af7670ea8 100644 --- a/doc/salome/gui/GEOM/input/tui_primitives.doc +++ b/doc/salome/gui/GEOM/input/tui_primitives.doc @@ -196,7 +196,7 @@ gg.createAndDisplayGO(id_diks3) \endcode \anchor tui_creation_squareface -

    Creation of a Face

    +

    Creation of a Rectangle

    \code import geompy @@ -210,23 +210,21 @@ py = geompy.MakeVertex(0. , 100., 0. ) # create a vector on two points vxy = geompy.MakeVector(px, py) -# create a face in OXY plane +# create a rectangle in OXY plane face1 = geompy.MakeFaceHW(100, 100, 1) -# create a disk from a point, a vector and a radius +# create a rectangle using normal vector face2 = geompy.MakeFaceObjHW(vxy, 50, 150) -#create a circle from three points +# create a rectangle from other face face3 = geompy.MakeFaceObjHW(face2, 150, 50) # add objects in the study -id_vxy = geompy.addToStudy(vxy, "Vector") id_face1 = geompy.addToStudy(face1,"Face1") id_face2 = geompy.addToStudy(face2,"Face2") id_face3 = geompy.addToStudy(face3,"Face3") -# display disks -gg.createAndDisplayGO(id_vxy) +# display rectangles gg.createAndDisplayGO(id_face1) gg.createAndDisplayGO(id_face2) gg.createAndDisplayGO(id_face3) diff --git a/doc/salome/gui/GEOM/input/tui_test_others.doc b/doc/salome/gui/GEOM/input/tui_test_others.doc index 332f3d58d..443326fea 100644 --- a/doc/salome/gui/GEOM/input/tui_test_others.doc +++ b/doc/salome/gui/GEOM/input/tui_test_others.doc @@ -123,6 +123,12 @@ \anchor swig_GetShapesOnCylinderIDs \until Group of edges +\anchor swig_GetShapesOnCylinderWithLocation +\until Edge out of + +\anchor swig_GetShapesOnCylinderWithLocationIDs +\until Group of edges + \anchor swig_GetShapesOnSphere \until Vertex on Sphere diff --git a/doc/salome/gui/GEOM/static/footer.html b/doc/salome/gui/GEOM/static/footer.html index 012833eac..fdfb138ca 100755 --- a/doc/salome/gui/GEOM/static/footer.html +++ b/doc/salome/gui/GEOM/static/footer.html @@ -6,7 +6,7 @@
    Copyright © 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
    -Copyright © 2003-2010 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
    +Copyright © 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
    diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am index e099a6aee..175ac82c6 100644 --- a/doc/salome/gui/Makefile.am +++ b/doc/salome/gui/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # -* Makefile *- # Author : Patrick GOLDBRONN (CEA) # Date : 30/11/2001 diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am index 391029408..f74bafcd5 100644 --- a/doc/salome/tui/Makefile.am +++ b/doc/salome/tui/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # File : Makefile.in # Author : Vasily Rusyaev (Open Cascade NN) # Module : doc diff --git a/doc/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in index 13603b99a..ab6723a31 100755 --- a/doc/salome/tui/doxyfile.in +++ b/doc/salome/tui/doxyfile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/doc/salome/tui/static/footer.html b/doc/salome/tui/static/footer.html index 512db61fa..53f5a62fe 100755 --- a/doc/salome/tui/static/footer.html +++ b/doc/salome/tui/static/footer.html @@ -7,7 +7,7 @@
    Copyright © 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
    -Copyright © 2003-2010 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
    +Copyright © 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
    diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl index ed22e1e18..baf88a780 100644 --- a/idl/GEOM_Gen.idl +++ b/idl/GEOM_Gen.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -19,9 +19,10 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // File : GEOM_Gen.idl // Author : Sergey RUIN - +// #ifndef __GEOM_GEN__ #define __GEOM_GEN__ @@ -3273,7 +3274,7 @@ module GEOM in double theR2, in double theW2, in double theL2, in double theRF, in boolean theHexMesh, in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3); - /*@@ insert new functions before this line @@*/ + /*@@ insert new functions before this line @@ do not remove this line @@*/ }; /*! diff --git a/idl/GEOM_Superv.idl b/idl/GEOM_Superv.idl index b9e72f51f..9b544281f 100644 --- a/idl/GEOM_Superv.idl +++ b/idl/GEOM_Superv.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -19,6 +19,7 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // File : GEOM_Superv.idl // Author : Lucien PIGNOLONI // @@ -604,6 +605,8 @@ module GEOM in double theR2, in double theW2, in double theL2, in double theRF, in boolean theHexMesh, in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3); + + /*@@ insert new functions before this line @@ do not remove this line @@*/ }; }; diff --git a/idl/Makefile.am b/idl/Makefile.am index e7bf544b5..1a06b7978 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # This Makefile is responsible of generating the client and server # implementation of IDL interfaces for both C++ and python usage. # The building process of the C++ files is in charge of each source diff --git a/resources/GEOMCatalog.xml.in b/resources/GEOMCatalog.xml.in index 024cff426..41bab2a6b 100644 --- a/resources/GEOMCatalog.xml.in +++ b/resources/GEOMCatalog.xml.in @@ -1,6 +1,6 @@ + GetIAdvancedOperations + + + + 1 + + + + theStudyID + long + + + + + + return + GEOM_IAdvancedOperations + + + + + RemoveObject @@ -5201,7 +5225,7 @@ - + diff --git a/resources/GEOM_en.xml b/resources/GEOM_en.xml index eda6f84a0..f93e297a5 100644 --- a/resources/GEOM_en.xml +++ b/resources/GEOM_en.xml @@ -1,7 +1,7 @@ - + diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts index 15cd125ff..b54be9129 100644 --- a/src/GEOMGUI/GEOM_msg_en.ts +++ b/src/GEOMGUI/GEOM_msg_en.ts @@ -1,6 +1,6 @@ + diff --git a/src/GEOMGUI/GEOM_msg_fr.ts b/src/GEOMGUI/GEOM_msg_fr.ts index 557dd3b1a..62dc3b162 100644 --- a/src/GEOMGUI/GEOM_msg_fr.ts +++ b/src/GEOMGUI/GEOM_msg_fr.ts @@ -1,6 +1,6 @@