ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-10 07:13:07 +05:00
Code Issues Packages Projects Releases Wiki Activity

22792: EDF 8159 SMESH: Multi-dimensional extrusion/extrusion along a path/revolution

Browse Source 
Fix regressions
This commit is contained in:
eap 2015-03-18 19:07:40 +03:00
parent 6fd64f7678
commit 09705577d1
4 changed files with 53 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SMESH_I/SMESH_2smeshpy.cxx
View File

@ -2404,7 +2404,7 @@ void _pyMeshEditor::Process( const Handle(_pyCommand)& theCommand)
"ConvertToQuadratic","ConvertFromQuadratic","RenumberNodes","RenumberElements", "ConvertToQuadratic","ConvertFromQuadratic","RenumberNodes","RenumberElements",
"RotationSweep","RotationSweepObject","RotationSweepObject1D","RotationSweepObject2D", "RotationSweep","RotationSweepObject","RotationSweepObject1D","RotationSweepObject2D",
"ExtrusionSweep","AdvancedExtrusion","ExtrusionSweepObject","ExtrusionSweepObject1D", "ExtrusionSweep","AdvancedExtrusion","ExtrusionSweepObject","ExtrusionSweepObject1D",
"ExtrusionSweepObject2D","ExtrusionAlongPath","ExtrusionAlongPathObject", "ExtrusionByNormal", "ExtrusionSweepObject2D","ExtrusionAlongPath","ExtrusionAlongPathObject",
"ExtrusionAlongPathX","ExtrusionAlongPathObject1D","ExtrusionAlongPathObject2D", "ExtrusionAlongPathX","ExtrusionAlongPathObject1D","ExtrusionAlongPathObject2D",
"ExtrusionSweepObjects","RotationSweepObjects","ExtrusionAlongPathObjects", "ExtrusionSweepObjects","RotationSweepObjects","ExtrusionAlongPathObjects",
"Mirror","MirrorObject","Translate","TranslateObject","Rotate","RotateObject", "Mirror","MirrorObject","Translate","TranslateObject","Rotate","RotateObject",

1
src/SMESH_I/SMESH_MeshEditor_i.cxx
View File

@ -2607,6 +2607,7 @@ SMESH_MeshEditor_i::ExtrusionByNormal(const SMESH::ListOfIDSources& objects,
<< ", " << TVar( stepSize ) << ", " << TVar( stepSize )
<< ", " << TVar( nbOfSteps ) << ", " << TVar( nbOfSteps )
<< ", " << byAverageNormal << ", " << byAverageNormal
<< ", " << useInputElemsOnly
<< ", " << makeGroups << ", " << makeGroups
<< ", " << dim << ", " << dim
<< " )"; << " )";

2
src/SMESH_I/SMESH_Mesh_i.cxx
View File

@ -1097,7 +1097,7 @@ void SMESH_Mesh_i::RemoveGroupWithContents( SMESH::SMESH_GroupBase_ptr theGroup
while ( nIt->more() ) while ( nIt->more() )
nodeIds.push_back( nIt->next()->GetID() ); nodeIds.push_back( nIt->next()->GetID() );
_impl->GetMeshDS()->RemoveElement( elemIt->next() ); _impl->GetMeshDS()->RemoveElement( e );
} }
// Remove free nodes // Remove free nodes

221
src/SMESH_SWIG/smeshBuilder.py
View File

@ -3554,7 +3554,7 @@ class Mesh:
faces = self._getIdSourceList( faces, SMESH.FACE, unRegister ) faces = self._getIdSourceList( faces, SMESH.FACE, unRegister )
if isinstance( Axis, geomBuilder.GEOM._objref_GEOM_Object): if isinstance( Axis, geomBuilder.GEOM._objref_GEOM_Object):
Axis = self.smeshpyD.GetDirStruct( Axis ) Axis = self.smeshpyD.GetAxisStruct( Axis )
if isinstance( Axis, list ): if isinstance( Axis, list ):
Axis = SMESH.AxisStruct( *Axis ) Axis = SMESH.AxisStruct( *Axis )
@ -3581,24 +3581,9 @@ class Mesh:
# @ingroup l2_modif_extrurev # @ingroup l2_modif_extrurev
def RotationSweep(self, IDsOfElements, Axis, AngleInRadians, NbOfSteps, Tolerance, def RotationSweep(self, IDsOfElements, Axis, AngleInRadians, NbOfSteps, Tolerance,
MakeGroups=False, TotalAngle=False): MakeGroups=False, TotalAngle=False):
unRegister = genObjUnRegister() return self.RotationSweepObjects([], IDsOfElements, IDsOfElements, Axis,
if IDsOfElements == []: AngleInRadians, NbOfSteps, Tolerance,
IDsOfElements = self.mesh MakeGroups, TotalAngle)
if IDsOfElements and \
isinstance( IDsOfElements, list ) and \
isinstance( IDsOfElements[0], int ):
IDsOfElements = self.GetIDSource( IDsOfElements, SMESH.ALL )
unRegister.set( IDsOfElements )
if isinstance( Axis, geomBuilder.GEOM._objref_GEOM_Object):
Axis = self.smeshpyD.GetAxisStruct(Axis)
AngleInRadians,AngleParameters,hasVars = ParseAngles(AngleInRadians)
NbOfSteps,Tolerance,Parameters,hasVars = ParseParameters(NbOfSteps,Tolerance)
Parameters = Axis.parameters + var_separator + AngleParameters + var_separator + Parameters
self.mesh.SetParameters(Parameters)
if TotalAngle and NbOfSteps:
AngleInRadians /= NbOfSteps
return self.editor.RotationSweepObjects([],[IDsOfElements],[IDsOfElements], Axis,
AngleInRadians, NbOfSteps, Tolerance, MakeGroups)
## Generates new elements by rotation of the elements of object around the axis ## Generates new elements by rotation of the elements of object around the axis
# @param theObject object which elements should be sweeped. # @param theObject object which elements should be sweeped.
@ -3614,18 +3599,9 @@ class Mesh:
# @ingroup l2_modif_extrurev # @ingroup l2_modif_extrurev
def RotationSweepObject(self, theObject, Axis, AngleInRadians, NbOfSteps, Tolerance, def RotationSweepObject(self, theObject, Axis, AngleInRadians, NbOfSteps, Tolerance,
MakeGroups=False, TotalAngle=False): MakeGroups=False, TotalAngle=False):
if isinstance( theObject, Mesh ): return self.RotationSweepObjects( [], theObject, theObject, Axis,
theObject = theObject.GetMesh() AngleInRadians, NbOfSteps, Tolerance,
if isinstance( Axis, geomBuilder.GEOM._objref_GEOM_Object): MakeGroups, TotalAngle )
Axis = self.smeshpyD.GetAxisStruct(Axis)
AngleInRadians,AngleParameters,hasVars = ParseAngles(AngleInRadians)
NbOfSteps,Tolerance,Parameters,hasVars = ParseParameters(NbOfSteps,Tolerance)
Parameters = Axis.parameters + var_separator + AngleParameters + var_separator + Parameters
self.mesh.SetParameters(Parameters)
if TotalAngle and NbOfSteps:
AngleInRadians /= NbOfSteps
return self.editor.RotationSweepObjects([],[theObject],[theObject], Axis,
AngleInRadians, NbOfSteps, Tolerance )
## Generates new elements by rotation of the elements of object around the axis ## Generates new elements by rotation of the elements of object around the axis
# @param theObject object which elements should be sweeped. # @param theObject object which elements should be sweeped.
@ -3641,18 +3617,9 @@ class Mesh:
# @ingroup l2_modif_extrurev # @ingroup l2_modif_extrurev
def RotationSweepObject1D(self, theObject, Axis, AngleInRadians, NbOfSteps, Tolerance, def RotationSweepObject1D(self, theObject, Axis, AngleInRadians, NbOfSteps, Tolerance,
MakeGroups=False, TotalAngle=False): MakeGroups=False, TotalAngle=False):
if isinstance( theObject, Mesh ): return self.RotationSweepObjects([],theObject,[], Axis,
theObject = theObject.GetMesh() AngleInRadians, NbOfSteps, Tolerance,
if isinstance( Axis, geomBuilder.GEOM._objref_GEOM_Object): MakeGroups, TotalAngle)
Axis = self.smeshpyD.GetAxisStruct(Axis)
AngleInRadians,AngleParameters,hasVars = ParseAngles(AngleInRadians)
NbOfSteps,Tolerance,Parameters,hasVars = ParseParameters(NbOfSteps,Tolerance)
Parameters = Axis.parameters + var_separator + AngleParameters + var_separator + Parameters
self.mesh.SetParameters(Parameters)
if TotalAngle and NbOfSteps:
AngleInRadians /= NbOfSteps
return self.editor.RotationSweepObjects([],[theObject],[], Axis,
AngleInRadians, NbOfSteps, Tolerance)
## Generates new elements by rotation of the elements of object around the axis ## Generates new elements by rotation of the elements of object around the axis
# @param theObject object which elements should be sweeped. # @param theObject object which elements should be sweeped.
@ -3668,18 +3635,8 @@ class Mesh:
# @ingroup l2_modif_extrurev # @ingroup l2_modif_extrurev
def RotationSweepObject2D(self, theObject, Axis, AngleInRadians, NbOfSteps, Tolerance, def RotationSweepObject2D(self, theObject, Axis, AngleInRadians, NbOfSteps, Tolerance,
MakeGroups=False, TotalAngle=False): MakeGroups=False, TotalAngle=False):
if isinstance( theObject, Mesh ): return self.RotationSweepObjects([],[],theObject, Axis, AngleInRadians,
theObject = theObject.GetMesh() NbOfSteps, Tolerance, MakeGroups, TotalAngle)
if isinstance( Axis, geomBuilder.GEOM._objref_GEOM_Object):
Axis = self.smeshpyD.GetAxisStruct(Axis)
AngleInRadians,AngleParameters,hasVars = ParseAngles(AngleInRadians)
NbOfSteps,Tolerance,Parameters,hasVars = ParseParameters(NbOfSteps,Tolerance)
Parameters = Axis.parameters + var_separator + AngleParameters + var_separator + Parameters
self.mesh.SetParameters(Parameters)
if TotalAngle and NbOfSteps:
AngleInRadians /= NbOfSteps
return self.editor.RotationSweepObjects([],[],[theObject], Axis, AngleInRadians,
NbOfSteps, Tolerance)
## Generates new elements by extrusion of the given elements and nodes ## Generates new elements by extrusion of the given elements and nodes
# @param nodes - nodes to extrude: a list including ids, groups, sub-meshes or a mesh # @param nodes - nodes to extrude: a list including ids, groups, sub-meshes or a mesh
@ -3707,7 +3664,8 @@ class Mesh:
Parameters = StepVector.PS.parameters + var_separator + Parameters Parameters = StepVector.PS.parameters + var_separator + Parameters
self.mesh.SetParameters(Parameters) self.mesh.SetParameters(Parameters)
return self.editor.ExtrusionSweepObjects( nodes, edges, faces, StepVector, NbOfSteps, MakeGroups) return self.editor.ExtrusionSweepObjects( nodes, edges, faces,
StepVector, NbOfSteps, MakeGroups)
## Generates new elements by extrusion of the elements with given ids ## Generates new elements by extrusion of the elements with given ids
@ -3721,25 +3679,10 @@ class Mesh:
# @return the list of created groups (SMESH_GroupBase) if MakeGroups=True, empty list otherwise # @return the list of created groups (SMESH_GroupBase) if MakeGroups=True, empty list otherwise
# @ingroup l2_modif_extrurev # @ingroup l2_modif_extrurev
def ExtrusionSweep(self, IDsOfElements, StepVector, NbOfSteps, MakeGroups=False, IsNodes = False): def ExtrusionSweep(self, IDsOfElements, StepVector, NbOfSteps, MakeGroups=False, IsNodes = False):
if IDsOfElements == []:
IDsOfElements = self.mesh
unRegister = genObjUnRegister()
if IDsOfElements and \
isinstance( IDsOfElements, list ) and \
isinstance( IDsOfElements[0], int ):
IDsOfElements = self.GetIDSource( IDsOfElements, SMESH.ALL )
unRegister.set( IDsOfElements )
if isinstance( StepVector, geomBuilder.GEOM._objref_GEOM_Object):
StepVector = self.smeshpyD.GetDirStruct(StepVector)
if isinstance( StepVector, list ):
StepVector = self.smeshpyD.MakeDirStruct(*StepVector)
NbOfSteps,Parameters,hasVars = ParseParameters(NbOfSteps)
Parameters = StepVector.PS.parameters + var_separator + Parameters
self.mesh.SetParameters(Parameters)
n,e,f = [],[],[] n,e,f = [],[],[]
if IsNodes: n = [IDsOfElements] if IsNodes: n = IDsOfElements
else : e,f, = [IDsOfElements],[IDsOfElements] else : e,f, = IDsOfElements,IDsOfElements
return self.editor.ExtrusionSweepObjects(n,e,f, StepVector, NbOfSteps, MakeGroups) return self.ExtrusionSweepObjects(n,e,f, StepVector, NbOfSteps, MakeGroups)
## Generates new elements by extrusion along the normal to a discretized surface or wire ## Generates new elements by extrusion along the normal to a discretized surface or wire
# @param Elements elements to extrude - a list including ids, groups, sub-meshes or a mesh # @param Elements elements to extrude - a list including ids, groups, sub-meshes or a mesh
@ -3772,12 +3715,12 @@ class Mesh:
if isinstance( Elements[0], int ): if isinstance( Elements[0], int ):
Elements = self.GetIDSource( Elements, SMESH.ALL ) Elements = self.GetIDSource( Elements, SMESH.ALL )
unRegister.set( Elements ) unRegister.set( Elements )
else: if not isinstance( Elements, list ):
Elements = [ Elements ] Elements = [ Elements ]
StepSize,NbOfSteps,Parameters,hasVars = ParseParameters(StepSize,NbOfSteps) StepSize,NbOfSteps,Parameters,hasVars = ParseParameters(StepSize,NbOfSteps)
self.mesh.SetParameters(Parameters) self.mesh.SetParameters(Parameters)
return self.editor.ExtrusionByNormal(Elements, StepSize, NbOfSteps, return self.editor.ExtrusionByNormal(Elements, StepSize, NbOfSteps,
UseInputElemsOnly, ByAverageNormal, MakeGroups, Dim) ByAverageNormal, UseInputElemsOnly, MakeGroups, Dim)
## Generates new elements by extrusion of the elements which belong to the object ## Generates new elements by extrusion of the elements which belong to the object
# @param theObject the object which elements should be processed. # @param theObject the object which elements should be processed.
@ -3791,19 +3734,10 @@ class Mesh:
# @return list of created groups (SMESH_GroupBase) if MakeGroups=True, empty list otherwise # @return list of created groups (SMESH_GroupBase) if MakeGroups=True, empty list otherwise
# @ingroup l2_modif_extrurev # @ingroup l2_modif_extrurev
def ExtrusionSweepObject(self, theObject, StepVector, NbOfSteps, MakeGroups=False, IsNodes=False): def ExtrusionSweepObject(self, theObject, StepVector, NbOfSteps, MakeGroups=False, IsNodes=False):
if isinstance( theObject, Mesh ):
theObject = theObject.GetMesh()
if isinstance( StepVector, geomBuilder.GEOM._objref_GEOM_Object):
StepVector = self.smeshpyD.GetDirStruct(StepVector)
if isinstance( StepVector, list ):
StepVector = self.smeshpyD.MakeDirStruct(*StepVector)
NbOfSteps,Parameters,hasVars = ParseParameters(NbOfSteps)
Parameters = StepVector.PS.parameters + var_separator + Parameters
self.mesh.SetParameters(Parameters)
n,e,f = [],[],[] n,e,f = [],[],[]
if IsNodes: n = [theObject] if IsNodes: n = theObject
else : e,f, = [theObject],[theObject] else : e,f, = theObject,theObject
return self.editor.ExtrusionSweepObjects(n,e,f, StepVector, NbOfSteps, MakeGroups) return self.ExtrusionSweepObjects(n,e,f, StepVector, NbOfSteps, MakeGroups)
## Generates new elements by extrusion of the elements which belong to the object ## Generates new elements by extrusion of the elements which belong to the object
# @param theObject object which elements should be processed. # @param theObject object which elements should be processed.
@ -3816,17 +3750,7 @@ class Mesh:
# @return list of created groups (SMESH_GroupBase) if MakeGroups=True, empty list otherwise # @return list of created groups (SMESH_GroupBase) if MakeGroups=True, empty list otherwise
# @ingroup l2_modif_extrurev # @ingroup l2_modif_extrurev
def ExtrusionSweepObject1D(self, theObject, StepVector, NbOfSteps, MakeGroups=False): def ExtrusionSweepObject1D(self, theObject, StepVector, NbOfSteps, MakeGroups=False):
if ( isinstance( theObject, Mesh )): return self.ExtrusionSweepObjects([],theObject,[], StepVector, NbOfSteps, MakeGroups)
theObject = theObject.GetMesh()
if ( isinstance( StepVector, geomBuilder.GEOM._objref_GEOM_Object)):
StepVector = self.smeshpyD.GetDirStruct(StepVector)
if isinstance( StepVector, list ):
StepVector = self.smeshpyD.MakeDirStruct(*StepVector)
NbOfSteps,Parameters,hasVars = ParseParameters(NbOfSteps)
Parameters = StepVector.PS.parameters + var_separator + Parameters
self.mesh.SetParameters(Parameters)
return self.editor.ExtrusionSweepObjects([],[theObject],[],
StepVector, NbOfSteps, MakeGroups)
## Generates new elements by extrusion of the elements which belong to the object ## Generates new elements by extrusion of the elements which belong to the object
# @param theObject object which elements should be processed. # @param theObject object which elements should be processed.
@ -3839,17 +3763,7 @@ class Mesh:
# @return list of created groups (SMESH_GroupBase) if MakeGroups=True, empty list otherwise # @return list of created groups (SMESH_GroupBase) if MakeGroups=True, empty list otherwise
# @ingroup l2_modif_extrurev # @ingroup l2_modif_extrurev
def ExtrusionSweepObject2D(self, theObject, StepVector, NbOfSteps, MakeGroups=False): def ExtrusionSweepObject2D(self, theObject, StepVector, NbOfSteps, MakeGroups=False):
if ( isinstance( theObject, Mesh )): return self.ExtrusionSweepObjects([],[],theObject, StepVector, NbOfSteps, MakeGroups)
theObject = theObject.GetMesh()
if ( isinstance( StepVector, geomBuilder.GEOM._objref_GEOM_Object)):
StepVector = self.smeshpyD.GetDirStruct(StepVector)
if isinstance( StepVector, list ):
StepVector = self.smeshpyD.MakeDirStruct(*StepVector)
NbOfSteps,Parameters,hasVars = ParseParameters(NbOfSteps)
Parameters = StepVector.PS.parameters + var_separator + Parameters
self.mesh.SetParameters(Parameters)
return self.editor.ExtrusionSweepObjects([],[],[theObject],
StepVector, NbOfSteps, MakeGroups)
## Generates new elements by extrusion of the elements with given ids ## Generates new elements by extrusion of the elements with given ids
# @param IDsOfElements is ids of elements # @param IDsOfElements is ids of elements
@ -3937,41 +3851,15 @@ class Mesh:
def ExtrusionAlongPathX(self, Base, Path, NodeStart, def ExtrusionAlongPathX(self, Base, Path, NodeStart,
HasAngles, Angles, LinearVariation, HasAngles, Angles, LinearVariation,
HasRefPoint, RefPoint, MakeGroups, ElemType): HasRefPoint, RefPoint, MakeGroups, ElemType):
if isinstance( RefPoint, geomBuilder.GEOM._objref_GEOM_Object):
RefPoint = self.smeshpyD.GetPointStruct(RefPoint)
pass
elif isinstance( RefPoint, list ):
RefPoint = PointStruct(*RefPoint)
pass
Angles,AnglesParameters,hasVars = ParseAngles(Angles)
Parameters = AnglesParameters + var_separator + RefPoint.parameters
self.mesh.SetParameters(Parameters)
if isinstance(Path, Mesh): Path = Path.GetMesh()
unRegister = genObjUnRegister()
if isinstance(Base, list):
if Base:
Base = self.GetIDSource( Base, ElemType )
unRegister.set( Base )
else:
Base = self.mesh
else:
if isinstance(Base, Mesh):
Base = Base.GetMesh()
if isinstance(Base, SMESH._objref_SMESH_IDSource):
n,e,f = [],[],[] n,e,f = [],[],[]
if ElemType == SMESH.NODE: n = [Base] if ElemType == SMESH.NODE: n = Base
if ElemType == SMESH.EDGE: e = [Base] if ElemType == SMESH.EDGE: e = Base
if ElemType == SMESH.FACE: f = [Base] if ElemType == SMESH.FACE: f = Base
gr,er = self.editor.ExtrusionAlongPathObjects(n,e,f, Path, None, NodeStart, gr,er = self.ExtrusionAlongPathObjects(n,e,f, Path, None, NodeStart,
HasAngles, Angles, LinearVariation, HasAngles, Angles, LinearVariation,
HasRefPoint, RefPoint, MakeGroups) HasRefPoint, RefPoint, MakeGroups)
if MakeGroups: return gr,er if MakeGroups: return gr,er
return er return er
else:
raise RuntimeError, "Invalid Base for ExtrusionAlongPathX"
## Generates new elements by extrusion of the given elements ## Generates new elements by extrusion of the given elements
# The path of extrusion must be a meshed edge. # The path of extrusion must be a meshed edge.
@ -3994,18 +3882,8 @@ class Mesh:
def ExtrusionAlongPath(self, IDsOfElements, PathMesh, PathShape, NodeStart, def ExtrusionAlongPath(self, IDsOfElements, PathMesh, PathShape, NodeStart,
HasAngles, Angles, HasRefPoint, RefPoint, HasAngles, Angles, HasRefPoint, RefPoint,
MakeGroups=False, LinearVariation=False): MakeGroups=False, LinearVariation=False):
if IDsOfElements == []: n,e,f = [],IDsOfElements,IDsOfElements
IDsOfElements = self.GetElementsId() gr,er = self.ExtrusionAlongPathObjects(n,e,f, PathMesh, PathShape,
if isinstance( RefPoint, geomBuilder.GEOM._objref_GEOM_Object):
RefPoint = self.smeshpyD.GetPointStruct(RefPoint)
pass
if isinstance( PathMesh, Mesh ):
PathMesh = PathMesh.GetMesh()
Angles,AnglesParameters,hasVars = ParseAngles(Angles)
Parameters = AnglesParameters + var_separator + RefPoint.parameters
self.mesh.SetParameters(Parameters)
n,e,f = [],[IDsOfElements],[IDsOfElements]
gr,er = self.editor.ExtrusionAlongPathObjects(n,e,f, PathMesh, PathShape,
NodeStart, HasAngles, Angles, NodeStart, HasAngles, Angles,
LinearVariation, LinearVariation,
HasRefPoint, RefPoint, MakeGroups) HasRefPoint, RefPoint, MakeGroups)
@ -4034,17 +3912,8 @@ class Mesh:
def ExtrusionAlongPathObject(self, theObject, PathMesh, PathShape, NodeStart, def ExtrusionAlongPathObject(self, theObject, PathMesh, PathShape, NodeStart,
HasAngles, Angles, HasRefPoint, RefPoint, HasAngles, Angles, HasRefPoint, RefPoint,
MakeGroups=False, LinearVariation=False): MakeGroups=False, LinearVariation=False):
if isinstance( theObject, Mesh ): n,e,f = [],theObject,theObject
theObject = theObject.GetMesh() gr,er = self.ExtrusionAlongPathObjects(n,e,f, PathMesh, PathShape, NodeStart,
if isinstance( RefPoint, geomBuilder.GEOM._objref_GEOM_Object):
RefPoint = self.smeshpyD.GetPointStruct(RefPoint)
if isinstance( PathMesh, Mesh ):
PathMesh = PathMesh.GetMesh()
Angles,AnglesParameters,hasVars = ParseAngles(Angles)
Parameters = AnglesParameters + var_separator + RefPoint.parameters
self.mesh.SetParameters(Parameters)
n,e,f = [],[theObject],[theObject]
gr,er = self.editor.ExtrusionAlongPathObjects(n,e,f, PathMesh, PathShape, NodeStart,
HasAngles, Angles, LinearVariation, HasAngles, Angles, LinearVariation,
HasRefPoint, RefPoint, MakeGroups) HasRefPoint, RefPoint, MakeGroups)
if MakeGroups: return gr,er if MakeGroups: return gr,er
@ -4072,17 +3941,8 @@ class Mesh:
def ExtrusionAlongPathObject1D(self, theObject, PathMesh, PathShape, NodeStart, def ExtrusionAlongPathObject1D(self, theObject, PathMesh, PathShape, NodeStart,
HasAngles, Angles, HasRefPoint, RefPoint, HasAngles, Angles, HasRefPoint, RefPoint,
MakeGroups=False, LinearVariation=False): MakeGroups=False, LinearVariation=False):
if isinstance( theObject, Mesh ): n,e,f = [],theObject,[]
theObject = theObject.GetMesh() gr,er = self.ExtrusionAlongPathObjects(n,e,f, PathMesh, PathShape, NodeStart,
if isinstance( RefPoint, geomBuilder.GEOM._objref_GEOM_Object):
RefPoint = self.smeshpyD.GetPointStruct(RefPoint)
if isinstance( PathMesh, Mesh ):
PathMesh = PathMesh.GetMesh()
Angles,AnglesParameters,hasVars = ParseAngles(Angles)
Parameters = AnglesParameters + var_separator + RefPoint.parameters
self.mesh.SetParameters(Parameters)
n,e,f = [],[theObject],[]
gr,er = self.editor.ExtrusionAlongPathObjects(n,e,f, PathMesh, PathShape, NodeStart,
HasAngles, Angles, LinearVariation, HasAngles, Angles, LinearVariation,
HasRefPoint, RefPoint, MakeGroups) HasRefPoint, RefPoint, MakeGroups)
if MakeGroups: return gr,er if MakeGroups: return gr,er
@ -4110,17 +3970,8 @@ class Mesh:
def ExtrusionAlongPathObject2D(self, theObject, PathMesh, PathShape, NodeStart, def ExtrusionAlongPathObject2D(self, theObject, PathMesh, PathShape, NodeStart,
HasAngles, Angles, HasRefPoint, RefPoint, HasAngles, Angles, HasRefPoint, RefPoint,
MakeGroups=False, LinearVariation=False): MakeGroups=False, LinearVariation=False):
if ( isinstance( theObject, Mesh )): n,e,f = [],[],theObject
theObject = theObject.GetMesh() gr,er = self.ExtrusionAlongPathObjects(n,e,f, PathMesh, PathShape, NodeStart,
if ( isinstance( RefPoint, geomBuilder.GEOM._objref_GEOM_Object)):
RefPoint = self.smeshpyD.GetPointStruct(RefPoint)
if ( isinstance( PathMesh, Mesh )):
PathMesh = PathMesh.GetMesh()
Angles,AnglesParameters,hasVars = ParseAngles(Angles)
Parameters = AnglesParameters + var_separator + RefPoint.parameters
self.mesh.SetParameters(Parameters)
n,e,f = [],[],[theObject]
gr,er = self.editor.ExtrusionAlongPathObjects(n,e,f, PathMesh, PathShape, NodeStart,
HasAngles, Angles, LinearVariation, HasAngles, Angles, LinearVariation,
HasRefPoint, RefPoint, MakeGroups) HasRefPoint, RefPoint, MakeGroups)
if MakeGroups: return gr,er if MakeGroups: return gr,er