From c00bd1f476c613125e5c4d90d64d1656e185c6e4 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 24 Jul 2009 13:38:16 +0000 Subject: [PATCH] Issue 0020001: EDF 813 GEOM : PArtition , argument to get subshapes Additional changes: fix bugs, update documentation --- doc/salome/gui/GEOM/input/transforming_geom_objs.doc | 2 +- doc/salome/gui/GEOM/input/tui_basic_operations.doc | 1 + idl/GEOM_Gen.idl | 2 +- src/GEOM_SWIG/GEOM_TestAll.py | 9 ++++++++- src/GEOM_SWIG/geompyDC.py | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/doc/salome/gui/GEOM/input/transforming_geom_objs.doc b/doc/salome/gui/GEOM/input/transforming_geom_objs.doc index adab40078..cee84090a 100644 --- a/doc/salome/gui/GEOM/input/transforming_geom_objs.doc +++ b/doc/salome/gui/GEOM/input/transforming_geom_objs.doc @@ -22,7 +22,7 @@ special case of \b Explode operation.
  • Operations with \subpage blocks_operations_page "Blocks".
    • -
  • \subpage restore_presentation_parameters_page "Restore presentation pareameters". +
  • \subpage restore_presentation_parameters_page "Restore presentation parameters". This cross-operation functionality allows the resulting shape to inherit colors and subshapes from its parent shapes.
    • diff --git a/doc/salome/gui/GEOM/input/tui_basic_operations.doc b/doc/salome/gui/GEOM/input/tui_basic_operations.doc index 1250c128d..50c8a7c3d 100644 --- a/doc/salome/gui/GEOM/input/tui_basic_operations.doc +++ b/doc/salome/gui/GEOM/input/tui_basic_operations.doc @@ -85,6 +85,7 @@ gg.setDisplayMode(id_archimede,1) \code import geompy import GEOM +import SALOMEDS # create a box and a cylinder box = geompy.MakeBoxDXDYDZ(200, 200, 200) diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl index 439e6f438..62e06e217 100644 --- a/idl/GEOM_Gen.idl +++ b/idl/GEOM_Gen.idl @@ -2989,7 +2989,7 @@ module GEOM * operations, where only the first argument has to be considered. * If theObject has only one argument shape, this flag is automatically * considered as True, not regarding really passed value. - * \return True in case of success, False otherwise. + * \return list of published sub-shapes */ ListOfGO RestoreSubShapesO (in SALOMEDS::Study theStudy, in GEOM_Object theObject, diff --git a/src/GEOM_SWIG/GEOM_TestAll.py b/src/GEOM_SWIG/GEOM_TestAll.py index 0a2983b40..a278b54a9 100644 --- a/src/GEOM_SWIG/GEOM_TestAll.py +++ b/src/GEOM_SWIG/GEOM_TestAll.py @@ -30,7 +30,8 @@ # ! documentation generation to identify certain places of this file # def TestAll (geompy, math): - + import GEOM + #Create base Variables nbtimes1 = 5 #Short nbtimes2 = 5 @@ -451,4 +452,10 @@ def TestAll (geompy, math): if ind_e != ind: print "Error in GetSubShape or GetSubShapeID" + # RestoreSubShapes + geompy.RestoreSubShapes(Copy) + geompy.RestoreSubShapes(RotatPnt, [], GEOM.FSM_Transformed) + geompy.RestoreSubShapes(Partition, [Box]) + geompy.RestoreSubShapes(Partition1) + print "DONE" diff --git a/src/GEOM_SWIG/geompyDC.py b/src/GEOM_SWIG/geompyDC.py index e6e7b8dd2..8cf504f7b 100644 --- a/src/GEOM_SWIG/geompyDC.py +++ b/src/GEOM_SWIG/geompyDC.py @@ -305,7 +305,7 @@ class geompyDC(GEOM._objref_GEOM_Gen): # operations, where only the first argument has to be considered. # If theObject has only one argument shape, this flag is automatically # considered as True, not regarding really passed value. - # \return True in case of success, False otherwise. + # \return list of published sub-shapes # # @ref tui_restore_prs_params "Example" def RestoreSubShapes (self, theObject, theArgs=[], -- 2.39.2