From 4905a23be05d377bfabc79225cd02da09bfe4635 Mon Sep 17 00:00:00 2001 From: jfa Date: Wed, 14 Aug 2024 12:03:43 +0100 Subject: [PATCH] Change order of arguments for MakeOffsetPartial --- doc/salome/examples/transformation_operations_ex06.py | 2 +- doc/salome/gui/GEOM/input/offset_operation.doc | 6 +++--- idl/GEOM_Gen.idl | 6 +++--- src/GEOMImpl/GEOMImpl_ITransformOperations.cxx | 4 ++-- src/GEOM_I/GEOM_ITransformOperations_i.cc | 4 ++-- src/GEOM_I/GEOM_ITransformOperations_i.hh | 4 ++-- src/GEOM_SWIG/geomBuilder.py | 10 +++++----- src/TransformationGUI/TransformationGUI_OffsetDlg.cxx | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/doc/salome/examples/transformation_operations_ex06.py b/doc/salome/examples/transformation_operations_ex06.py index 3fad9ed38..3e2ca023d 100644 --- a/doc/salome/examples/transformation_operations_ex06.py +++ b/doc/salome/examples/transformation_operations_ex06.py @@ -13,7 +13,7 @@ box = geompy.MakeBox(20, 20, 20, 200, 200, 200) # create a new object as offset of the given object offset = geompy.MakeOffset(box, 70.) offset2 = geompy.MakeOffsetIntersectionJoin(box, 70.) -offset3 = geompy.MakeOffsetPartial(box, [13, 33], 70.) +offset3 = geompy.MakeOffsetPartial(box, 70., [13, 33]) # add objects in the study id_box = geompy.addToStudy(box, "Box") diff --git a/doc/salome/gui/GEOM/input/offset_operation.doc b/doc/salome/gui/GEOM/input/offset_operation.doc index 949f3cfb7..e75fc12e8 100644 --- a/doc/salome/gui/GEOM/input/offset_operation.doc +++ b/doc/salome/gui/GEOM/input/offset_operation.doc @@ -47,11 +47,11 @@ the offset. \n \ref restore_presentation_parameters_page "Advanced options". \n TUI Command: -- geompy.MakeOffsetPartial(Shape, ListOfFacesIDs, Offset), +- geompy.MakeOffsetPartial(Shape, Offset, ListOfFacesIDs), where \b Shape is a shape(s) which has to be an offset, - \b ListOfFacesIDs is a list of integer IDs of sub-faces and - \b Offset is a value of the offset. + \b Offset is a value of the offset, + \b ListOfFacesIDs is a list of integer IDs of sub-faces. Our TUI Scripts provide you with useful examples of the use of \ref tui_offset "Transformation Operations". diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl index f3fcb98e6..1d6abe8c3 100644 --- a/idl/GEOM_Gen.idl +++ b/idl/GEOM_Gen.idl @@ -1349,13 +1349,13 @@ module GEOM * \brief Create new object as offset of the given one. * Only indexed faces are offset, others keep they original location. * \param theObject The base object for the offset. - * \param theFacesIDs The list of face IDs indicating faces to be offset. * \param theOffset Offset value. + * \param theFacesIDs The list of face IDs indicating faces to be offset. * \return New GEOM_Object, containing the offset object. */ GEOM_Object OffsetShapePartialCopy (in GEOM_Object theObject, - in ListOfLong theFacesIDs, - in double theOffset); + in double theOffset, + in ListOfLong theFacesIDs); /*! * \brief Create new object as projection of the given one on a 2D surface. diff --git a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx index 6581d5224..26d3f6005 100644 --- a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx @@ -1148,14 +1148,14 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::OffsetShapeCopy else { GEOM::TPythonDump pd (aFunction); pd << aCopy << " = geompy.MakeOffsetPartial(" - << theObject << ", ["; + << theObject << ", " << theOffset << ", ["; // Dump faces IDs. for (Standard_Integer i = theFacesIDs->Lower(); i <= theFacesIDs->Upper(); ++i) { pd << theFacesIDs->Value(i) << ((i == theFacesIDs->Upper()) ? "" : ", "); } - pd << "], " << theOffset << ")"; + pd << "])"; } SetErrorCode(OK); diff --git a/src/GEOM_I/GEOM_ITransformOperations_i.cc b/src/GEOM_I/GEOM_ITransformOperations_i.cc index 9e8b0b034..c0476d415 100644 --- a/src/GEOM_I/GEOM_ITransformOperations_i.cc +++ b/src/GEOM_I/GEOM_ITransformOperations_i.cc @@ -675,8 +675,8 @@ GEOM_ITransformOperations_i::OffsetShapeCopy (GEOM::GEOM_Object_ptr theObject, //============================================================================= GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::OffsetShapePartialCopy (GEOM::GEOM_Object_ptr theObject, - const GEOM::ListOfLong& theFacesIDs, - CORBA::Double theOffset) + CORBA::Double theOffset, + const GEOM::ListOfLong& theFacesIDs) { GEOM::GEOM_Object_var aGEOMObject; diff --git a/src/GEOM_I/GEOM_ITransformOperations_i.hh b/src/GEOM_I/GEOM_ITransformOperations_i.hh index ccadb550c..66f9983da 100644 --- a/src/GEOM_I/GEOM_ITransformOperations_i.hh +++ b/src/GEOM_I/GEOM_ITransformOperations_i.hh @@ -143,8 +143,8 @@ class GEOM_I_EXPORT GEOM_ITransformOperations_i : CORBA::Boolean theJoinByPipes); GEOM::GEOM_Object_ptr OffsetShapePartialCopy (GEOM::GEOM_Object_ptr theObject, - const GEOM::ListOfLong& theFacesIDs, - CORBA::Double theOffset); + CORBA::Double theOffset, + const GEOM::ListOfLong& theFacesIDs); GEOM::GEOM_Object_ptr ProjectShapeCopy (GEOM::GEOM_Object_ptr theSource, GEOM::GEOM_Object_ptr theTarget); diff --git a/src/GEOM_SWIG/geomBuilder.py b/src/GEOM_SWIG/geomBuilder.py index e442cf195..e9cf78b47 100644 --- a/src/GEOM_SWIG/geomBuilder.py +++ b/src/GEOM_SWIG/geomBuilder.py @@ -9628,8 +9628,8 @@ class geomBuilder(GEOM._objref_GEOM_Gen): # Gap between adjacent offset surfaces is filled # by extending and intersecting them. # @param theObject The base object for the offset. - # @param theFacesIDs The list of face IDs indicating faces to be offset. # @param theOffset Offset value. + # @param theFacesIDs The list of face IDs indicating faces to be offset. # @param theName Object name; when specified, this parameter is used # for result publication in the study. Otherwise, if automatic # publication is switched on, default value is used for result name. @@ -9638,7 +9638,7 @@ class geomBuilder(GEOM._objref_GEOM_Gen): # # @ref tui_offset "Example" @ManageTransactions("TrsfOp") - def MakeOffsetPartial(self, theObject, theFacesIDs, theOffset, theName=None): + def MakeOffsetPartial(self, theObject, theOffset, theFacesIDs, theName=None): """ Create new object as partial offset of the given one. Only indexed faces are offset, others keep they original location. @@ -9647,8 +9647,8 @@ class geomBuilder(GEOM._objref_GEOM_Gen): Parameters: theObject The base object for the offset. - theFacesIDs The list of face IDs indicating faces to be offset. theOffset Offset value. + theFacesIDs The list of face IDs indicating faces to be offset. theName Object name; when specified, this parameter is used for result publication in the study. Otherwise, if automatic publication is switched on, default value is used for result name. @@ -9659,10 +9659,10 @@ class geomBuilder(GEOM._objref_GEOM_Gen): Example of usage: box = geompy.MakeBox(20, 20, 20, 200, 200, 200) # create a new object from the box, offsetting its top and front faces - offset = geompy.MakeOffsetPartial(box, [13, 33], 70.) + offset = geompy.MakeOffsetPartial(box, 70., [13, 33]) """ theOffset, Parameters = ParseParameters(theOffset) - anObj = self.TrsfOp.OffsetShapePartialCopy(theObject, theFacesIDs, theOffset) + anObj = self.TrsfOp.OffsetShapePartialCopy(theObject, theOffset, theFacesIDs) RaiseIfFailed("OffsetShapePartialCopy", self.TrsfOp) anObj.SetParameters(Parameters) self._autoPublish(anObj, theName, "offset") diff --git a/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx b/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx index 16327d448..35a98c08d 100644 --- a/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx @@ -401,7 +401,7 @@ bool TransformationGUI_OffsetDlg::execute( ObjectList& objects ) } anObj = anOper->OffsetShapePartialCopy - (myObjects[0].get(), aFacesIDsList, GetOffset()); + (myObjects[0].get(), GetOffset(), aFacesIDsList); if (!anObj->_is_nil()) { if (!IsPreview()) { anObj->SetParameters(GroupPoints->SpinBox_DX->text().toUtf8().constData());