mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2025-02-21 23:05:38 +05:00
Fix merging pb.
This commit is contained in:
parent
156546ac91
commit
588cdb9462
@ -1096,10 +1096,10 @@ class geompyDC(GEOM._objref_GEOM_Gen):
|
|||||||
# @return Group of all found sub-shapes or a single found sub-shape.
|
# @return Group of all found sub-shapes or a single found sub-shape.
|
||||||
#
|
#
|
||||||
# Example: see GEOM_TestOthers.py
|
# Example: see GEOM_TestOthers.py
|
||||||
def GetInPlaceByHistory(theShapeWhere, theShapeWhat):
|
def GetInPlaceByHistory(self, theShapeWhere, theShapeWhat):
|
||||||
anObj = ShapesOp.GetInPlaceByHistory(theShapeWhere, theShapeWhat)
|
anObj = self.ShapesOp.GetInPlaceByHistory(theShapeWhere, theShapeWhat)
|
||||||
if ShapesOp.IsDone() == 0:
|
if self.ShapesOp.IsDone() == 0:
|
||||||
print "GetInPlace : ", ShapesOp.GetErrorCode()
|
print "GetInPlace : ", self.ShapesOp.GetErrorCode()
|
||||||
return anObj
|
return anObj
|
||||||
|
|
||||||
## Get sub-shape of theShapeWhere, which is
|
## Get sub-shape of theShapeWhere, which is
|
||||||
@ -1393,8 +1393,8 @@ class geompyDC(GEOM._objref_GEOM_Gen):
|
|||||||
# @return New GEOM_Object, containing a copy of theShape without coincident faces.
|
# @return New GEOM_Object, containing a copy of theShape without coincident faces.
|
||||||
#
|
#
|
||||||
# Example: see GEOM_Spanner.py
|
# Example: see GEOM_Spanner.py
|
||||||
def MakeGlueFaces(theShape, theTolerance, doKeepNonSolids=True):
|
def MakeGlueFaces(self, theShape, theTolerance, doKeepNonSolids=True):
|
||||||
anObj = ShapesOp.MakeGlueFaces(theShape, theTolerance, doKeepNonSolids)
|
anObj = self.ShapesOp.MakeGlueFaces(theShape, theTolerance, doKeepNonSolids)
|
||||||
if self.ShapesOp.IsDone() == 0:
|
if self.ShapesOp.IsDone() == 0:
|
||||||
print "MakeGlueFaces : ", self.ShapesOp.GetErrorCode()
|
print "MakeGlueFaces : ", self.ShapesOp.GetErrorCode()
|
||||||
return anObj
|
return anObj
|
||||||
@ -1426,8 +1426,8 @@ class geompyDC(GEOM._objref_GEOM_Gen):
|
|||||||
# without some faces.
|
# without some faces.
|
||||||
#
|
#
|
||||||
# Example: see GEOM_Spanner.py
|
# Example: see GEOM_Spanner.py
|
||||||
def MakeGlueFacesByList(theShape, theTolerance, theFaces, doKeepNonSolids=True):
|
def MakeGlueFacesByList(self, theShape, theTolerance, theFaces, doKeepNonSolids=True):
|
||||||
anObj = ShapesOp.MakeGlueFacesByList(theShape, theTolerance, theFaces, doKeepNonSolids)
|
anObj = self.ShapesOp.MakeGlueFacesByList(theShape, theTolerance, theFaces, doKeepNonSolids)
|
||||||
if self.ShapesOp.IsDone() == 0:
|
if self.ShapesOp.IsDone() == 0:
|
||||||
print "MakeGlueFacesByList : ", self.ShapesOp.GetErrorCode()
|
print "MakeGlueFacesByList : ", self.ShapesOp.GetErrorCode()
|
||||||
return anObj
|
return anObj
|
||||||
@ -1502,7 +1502,7 @@ class geompyDC(GEOM._objref_GEOM_Gen):
|
|||||||
# @return New GEOM_Object, containing the result shapes.
|
# @return New GEOM_Object, containing the result shapes.
|
||||||
#
|
#
|
||||||
# Example: see GEOM_TestAll.py
|
# Example: see GEOM_TestAll.py
|
||||||
def MakePartition(self,ListShapes, ListTools=[], ListKeepInside=[], ListRemoveInside=[],
|
def MakePartition(self, ListShapes, ListTools=[], ListKeepInside=[], ListRemoveInside=[],
|
||||||
Limit=ShapeType["SHAPE"], RemoveWebs=0, ListMaterials=[],
|
Limit=ShapeType["SHAPE"], RemoveWebs=0, ListMaterials=[],
|
||||||
KeepNonlimitShapes=0):
|
KeepNonlimitShapes=0):
|
||||||
anObj = self.BoolOp.MakePartition(ListShapes, ListTools,
|
anObj = self.BoolOp.MakePartition(ListShapes, ListTools,
|
||||||
@ -1525,7 +1525,7 @@ class geompyDC(GEOM._objref_GEOM_Gen):
|
|||||||
#
|
#
|
||||||
# @return New GEOM_Object, containing the result shapes.
|
# @return New GEOM_Object, containing the result shapes.
|
||||||
#
|
#
|
||||||
def MakePartitionNonSelfIntersectedShape(ListShapes, ListTools=[],
|
def MakePartitionNonSelfIntersectedShape(self, ListShapes, ListTools=[],
|
||||||
ListKeepInside=[], ListRemoveInside=[],
|
ListKeepInside=[], ListRemoveInside=[],
|
||||||
Limit=ShapeType["SHAPE"], RemoveWebs=0,
|
Limit=ShapeType["SHAPE"], RemoveWebs=0,
|
||||||
ListMaterials=[], KeepNonlimitShapes=0):
|
ListMaterials=[], KeepNonlimitShapes=0):
|
||||||
@ -1540,7 +1540,7 @@ class geompyDC(GEOM._objref_GEOM_Gen):
|
|||||||
## Shortcut to MakePartition()
|
## Shortcut to MakePartition()
|
||||||
#
|
#
|
||||||
# Example: see GEOM_TestOthers.py
|
# Example: see GEOM_TestOthers.py
|
||||||
def Partition(self,ListShapes, ListTools=[], ListKeepInside=[], ListRemoveInside=[],
|
def Partition(self, ListShapes, ListTools=[], ListKeepInside=[], ListRemoveInside=[],
|
||||||
Limit=ShapeType["SHAPE"], RemoveWebs=0, ListMaterials=[],
|
Limit=ShapeType["SHAPE"], RemoveWebs=0, ListMaterials=[],
|
||||||
KeepNonlimitShapes=0):
|
KeepNonlimitShapes=0):
|
||||||
anObj = self.MakePartition(ListShapes, ListTools,
|
anObj = self.MakePartition(ListShapes, ListTools,
|
||||||
|
Loading…
Reference in New Issue
Block a user