Salome HOME
Merge from V6_main (04/10/2012) V7_0_0 V7_0_0rc1
authorvsr <vsr@opencascade.com>
Mon, 8 Oct 2012 11:16:36 +0000 (11:16 +0000)
committervsr <vsr@opencascade.com>
Mon, 8 Oct 2012 11:16:36 +0000 (11:16 +0000)
commit8180539548a5038e52445454e88c1a170ee64e56
treedcb6e81c1d0a037203377eef70e1815abfdb089c
parentf115d16e436356dcc8463dac6c0567624adda40e
Merge from V6_main (04/10/2012)
119 files changed:
doc/salome/gui/GEOM/doxyfile_py.in
doc/salome/gui/GEOM/images/3dsketch2.png
doc/salome/gui/GEOM/images/bool1.png
doc/salome/gui/GEOM/images/bool2.png
doc/salome/gui/GEOM/images/bool3.png
doc/salome/gui/GEOM/images/divided_disk_PntVecR_dlg.png
doc/salome/gui/GEOM/images/divided_disk_dlg.png
doc/salome/gui/GEOM/images/dividedcylinder_dlg.png
doc/salome/gui/GEOM/images/groups_cut_dlg.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/groups_intersect_dlg.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/groups_union_dlg.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/measures2.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/neo-section.png
doc/salome/gui/GEOM/images/ob_popup_menu.png
doc/salome/gui/GEOM/images/partition1.png
doc/salome/gui/GEOM/images/partition2.png
doc/salome/gui/GEOM/input/creating_3dsketcher.doc
doc/salome/gui/GEOM/input/creating_dividedcylinder.doc
doc/salome/gui/GEOM/input/creating_divideddisk.doc
doc/salome/gui/GEOM/input/creating_point.doc
doc/salome/gui/GEOM/input/get_non_blocks.doc [new file with mode: 0644]
doc/salome/gui/GEOM/input/tui_3dsketcher.doc
doc/salome/gui/GEOM/input/tui_basic_geom_objs.doc
doc/salome/gui/GEOM/input/tui_get_non_blocks.doc [new file with mode: 0644]
doc/salome/gui/GEOM/input/tui_measurement_tools.doc
doc/salome/gui/GEOM/input/tui_test_all.doc
doc/salome/gui/GEOM/input/tui_test_others.doc
doc/salome/gui/GEOM/input/tui_test_spanner.doc
doc/salome/gui/GEOM/input/tui_working_with_groups.doc
doc/salome/gui/GEOM/input/using_measurement_tools.doc
doc/salome/gui/GEOM/input/viewing_geom_obj.doc
doc/salome/gui/GEOM/input/working_with_groups.doc
idl/GEOM_Gen.idl
resources/Makefile.am
resources/SalomeApp.xml.in
resources/get_non_blocks.png [new file with mode: 0644]
src/BooleanGUI/BooleanGUI_Dialog.cxx
src/DisplayGUI/DisplayGUI.cxx
src/DisplayGUI/DisplayGUI.h
src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
src/EntityGUI/EntityGUI_3DSketcherDlg.h
src/EntityGUI/EntityGUI_Controls_QTD.ui
src/EntityGUI/EntityGUI_SketcherDlg.cxx
src/GEOM/GEOM_Engine.cxx
src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.cxx
src/GEOMGUI/GEOMGUI_Selection.cxx
src/GEOMGUI/GEOMGUI_Selection.h
src/GEOMGUI/GEOM_Displayer.cxx
src/GEOMGUI/GEOM_Displayer.h
src/GEOMGUI/GEOM_images.ts
src/GEOMGUI/GEOM_msg_en.ts
src/GEOMGUI/GeometryGUI.cxx
src/GEOMGUI/GeometryGUI_Operations.h
src/GEOMGUI/GeometryGUI_Swig.cxx [deleted file]
src/GEOMGUI/GeometryGUI_Swig.hxx [deleted file]
src/GEOMGUI/GeometryGUI_Swig.i [deleted file]
src/GEOMGUI/Makefile.am
src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx
src/GEOMImpl/GEOMImpl_BlockDriver.cxx
src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx
src/GEOMImpl/GEOMImpl_I3DSketcher.hxx
src/GEOMImpl/GEOMImpl_IBasicOperations.cxx
src/GEOMImpl/GEOMImpl_IBasicOperations.hxx
src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx
src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx
src/GEOMImpl/GEOMImpl_IGroupOperations.cxx
src/GEOMImpl/GEOMImpl_IGroupOperations.hxx
src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
src/GEOMImpl/GEOMImpl_IInsertOperations.hxx
src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
src/GEOMImpl/GEOMImpl_ImportDriver.cxx
src/GEOMImpl/GEOMImpl_ImportDriver.hxx
src/GEOMImpl/GEOMImpl_PipeDriver.cxx
src/GEOMImpl/GEOMImpl_PointDriver.cxx
src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
src/GEOMImpl/GEOMImpl_Types.hxx
src/GEOMToolsGUI/GEOMToolsGUI.cxx
src/GEOMToolsGUI/GEOMToolsGUI.h
src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
src/GEOM_I/GEOM_IBasicOperations_i.cc
src/GEOM_I/GEOM_IBasicOperations_i.hh
src/GEOM_I/GEOM_IBlocksOperations_i.cc
src/GEOM_I/GEOM_IBlocksOperations_i.hh
src/GEOM_I/GEOM_ICurvesOperations_i.cc
src/GEOM_I/GEOM_ICurvesOperations_i.hh
src/GEOM_I/GEOM_IGroupOperations_i.cc
src/GEOM_I/GEOM_IGroupOperations_i.hh
src/GEOM_I/GEOM_IInsertOperations_i.cc
src/GEOM_I/GEOM_IInsertOperations_i.hh
src/GEOM_SWIG/GEOM_Spanner.py
src/GEOM_SWIG/GEOM_TestAll.py
src/GEOM_SWIG/GEOM_TestOthers.py
src/GEOM_SWIG/Makefile.am
src/GEOM_SWIG/geompy.py
src/GEOM_SWIG/geompyDC.py
src/GEOM_SWIG/gsketcher.py [new file with mode: 0644]
src/GEOM_SWIG_WITHIHM/Makefile.am
src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx [new file with mode: 0644]
src/GEOM_SWIG_WITHIHM/libGEOM_Swig.h [new file with mode: 0644]
src/GEOM_SWIG_WITHIHM/libGEOM_Swig.i
src/GroupGUI/GroupGUI.cxx
src/GroupGUI/GroupGUI_BooleanDlg.cxx [new file with mode: 0644]
src/GroupGUI/GroupGUI_BooleanDlg.h [new file with mode: 0644]
src/GroupGUI/Makefile.am
src/IGESImport/IGESImport.cxx
src/MeasureGUI/Makefile.am
src/MeasureGUI/MeasureGUI.cxx
src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx
src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx
src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx
src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.cxx [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.h [new file with mode: 0644]
src/OBJECT/GEOM_AISShape.cxx
src/OBJECT/GEOM_TopWireframeShape.cxx
src/OBJECT/GEOM_TopWireframeShape.hxx
src/OperationGUI/OperationGUI_PartitionDlg.cxx
src/STEPImport/STEPImport.cxx