Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into V9_3_BR
[modules/geom.git]
/
src
/
GEOM_I
/
GEOM_ITransformOperations_i.cc
diff --git
a/src/GEOM_I/GEOM_ITransformOperations_i.cc
b/src/GEOM_I/GEOM_ITransformOperations_i.cc
index 55aa0eb3f945891a8c6679f1e3ac598eaf41bd30..b570172ca2b226db4c277a19fc33c5877b142df3 100644
(file)
--- a/
src/GEOM_I/GEOM_ITransformOperations_i.cc
+++ b/
src/GEOM_I/GEOM_ITransformOperations_i.cc
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-609,9
+609,10
@@
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorPointCopy
* OffsetShape
*/
//=============================================================================
* OffsetShape
*/
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::OffsetShape
- (GEOM::GEOM_Object_ptr theObject,
- CORBA::Double theOffset)
+GEOM::GEOM_Object_ptr
+GEOM_ITransformOperations_i::OffsetShape (GEOM::GEOM_Object_ptr theObject,
+ CORBA::Double theOffset,
+ CORBA::Boolean theJoinByPipes)
{
GEOM::GEOM_Object_var aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
{
GEOM::GEOM_Object_var aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
@@
-631,7
+632,7
@@
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::OffsetShape
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Create the offset shape
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Create the offset shape
- GetOperations()->OffsetShape(
aBasicObject, theOffset
);
+ GetOperations()->OffsetShape(
aBasicObject, theOffset, theJoinByPipes
);
// Update GUI.
UpdateGUIForObject(theObject);
// Update GUI.
UpdateGUIForObject(theObject);
@@
-644,9
+645,10
@@
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::OffsetShape
* OffsetShapeCopy
*/
//=============================================================================
* OffsetShapeCopy
*/
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::OffsetShapeCopy
- (GEOM::GEOM_Object_ptr theObject,
- CORBA::Double theOffset)
+GEOM::GEOM_Object_ptr
+GEOM_ITransformOperations_i::OffsetShapeCopy (GEOM::GEOM_Object_ptr theObject,
+ CORBA::Double theOffset,
+ CORBA::Boolean theJoinByPipes)
{
GEOM::GEOM_Object_var aGEOMObject;
{
GEOM::GEOM_Object_var aGEOMObject;
@@
-658,7
+660,8
@@
GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::OffsetShapeCopy
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Create the offset shape
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Create the offset shape
- Handle(::GEOM_Object) anObject = GetOperations()->OffsetShapeCopy(aBasicObject, theOffset);
+ Handle(::GEOM_Object) anObject =
+ GetOperations()->OffsetShapeCopy(aBasicObject, theOffset, theJoinByPipes);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();