ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-18 16:00:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021522: EDF 573 SMESH: Regression in RotationSweep

Browse Source 
-        MaxAngle,Parameters = ParseAngles(MaxAngle)
+        MaxAngle,Parameters,hasVars = ParseAngles(MaxAngle)
This commit is contained in:
eap 2012-03-19 14:55:51 +00:00
parent 6d6fc57a7f
commit bf4cd9150f
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/SMESH_SWIG/smeshDC.py
View File

@ -2547,7 +2547,7 @@ class Mesh:
flag = False flag = False
if isinstance(MaxAngle,str): if isinstance(MaxAngle,str):
flag = True flag = True
MaxAngle,Parameters = ParseAngles(MaxAngle) MaxAngle,Parameters,hasVars = ParseAngles(MaxAngle)
self.mesh.SetParameters(Parameters) self.mesh.SetParameters(Parameters)
if not IDsOfElements: if not IDsOfElements:
IDsOfElements = self.GetElementsId() IDsOfElements = self.GetElementsId()
@ -2566,7 +2566,7 @@ class Mesh:
# @return TRUE in case of success, FALSE otherwise. # @return TRUE in case of success, FALSE otherwise.
# @ingroup l2_modif_unitetri # @ingroup l2_modif_unitetri
def TriToQuadObject (self, theObject, theCriterion, MaxAngle): def TriToQuadObject (self, theObject, theCriterion, MaxAngle):
MaxAngle,Parameters = ParseAngles(MaxAngle) MaxAngle,Parameters,hasVars = ParseAngles(MaxAngle)
self.mesh.SetParameters(Parameters) self.mesh.SetParameters(Parameters)
if ( isinstance( theObject, Mesh )): if ( isinstance( theObject, Mesh )):
theObject = theObject.GetMesh() theObject = theObject.GetMesh()
@ -2953,7 +2953,7 @@ class Mesh:
IDsOfElements = self.GetElementsId() IDsOfElements = self.GetElementsId()
if ( isinstance( Axis, geompyDC.GEOM._objref_GEOM_Object)): if ( isinstance( Axis, geompyDC.GEOM._objref_GEOM_Object)):
Axis = self.smeshpyD.GetAxisStruct(Axis) Axis = self.smeshpyD.GetAxisStruct(Axis)
AngleInRadians,AngleParameters = ParseAngles(AngleInRadians) AngleInRadians,AngleParameters,hasVars = ParseAngles(AngleInRadians)
NbOfSteps,Tolerance,Parameters,hasVars = ParseParameters(NbOfSteps,Tolerance) NbOfSteps,Tolerance,Parameters,hasVars = ParseParameters(NbOfSteps,Tolerance)
Parameters = Axis.parameters + var_separator + AngleParameters + var_separator + Parameters Parameters = Axis.parameters + var_separator + AngleParameters + var_separator + Parameters
self.mesh.SetParameters(Parameters) self.mesh.SetParameters(Parameters)
@ -2983,7 +2983,7 @@ class Mesh:
theObject = theObject.GetMesh() theObject = theObject.GetMesh()
if ( isinstance( Axis, geompyDC.GEOM._objref_GEOM_Object)): if ( isinstance( Axis, geompyDC.GEOM._objref_GEOM_Object)):
Axis = self.smeshpyD.GetAxisStruct(Axis) Axis = self.smeshpyD.GetAxisStruct(Axis)
AngleInRadians,AngleParameters = ParseAngles(AngleInRadians) AngleInRadians,AngleParameters,hasVars = ParseAngles(AngleInRadians)
NbOfSteps,Tolerance,Parameters,hasVars = ParseParameters(NbOfSteps,Tolerance) NbOfSteps,Tolerance,Parameters,hasVars = ParseParameters(NbOfSteps,Tolerance)
Parameters = Axis.parameters + var_separator + AngleParameters + var_separator + Parameters Parameters = Axis.parameters + var_separator + AngleParameters + var_separator + Parameters
self.mesh.SetParameters(Parameters) self.mesh.SetParameters(Parameters)
@ -3013,7 +3013,7 @@ class Mesh:
theObject = theObject.GetMesh() theObject = theObject.GetMesh()
if ( isinstance( Axis, geompyDC.GEOM._objref_GEOM_Object)): if ( isinstance( Axis, geompyDC.GEOM._objref_GEOM_Object)):
Axis = self.smeshpyD.GetAxisStruct(Axis) Axis = self.smeshpyD.GetAxisStruct(Axis)
AngleInRadians,AngleParameters = ParseAngles(AngleInRadians) AngleInRadians,AngleParameters,hasVars = ParseAngles(AngleInRadians)
NbOfSteps,Tolerance,Parameters,hasVars = ParseParameters(NbOfSteps,Tolerance) NbOfSteps,Tolerance,Parameters,hasVars = ParseParameters(NbOfSteps,Tolerance)
Parameters = Axis.parameters + var_separator + AngleParameters + var_separator + Parameters Parameters = Axis.parameters + var_separator + AngleParameters + var_separator + Parameters
self.mesh.SetParameters(Parameters) self.mesh.SetParameters(Parameters)
@ -3043,7 +3043,7 @@ class Mesh:
theObject = theObject.GetMesh() theObject = theObject.GetMesh()
if ( isinstance( Axis, geompyDC.GEOM._objref_GEOM_Object)): if ( isinstance( Axis, geompyDC.GEOM._objref_GEOM_Object)):
Axis = self.smeshpyD.GetAxisStruct(Axis) Axis = self.smeshpyD.GetAxisStruct(Axis)
AngleInRadians,AngleParameters = ParseAngles(AngleInRadians) AngleInRadians,AngleParameters,hasVars = ParseAngles(AngleInRadians)
NbOfSteps,Tolerance,Parameters,hasVars = ParseParameters(NbOfSteps,Tolerance) NbOfSteps,Tolerance,Parameters,hasVars = ParseParameters(NbOfSteps,Tolerance)
Parameters = Axis.parameters + var_separator + AngleParameters + var_separator + Parameters Parameters = Axis.parameters + var_separator + AngleParameters + var_separator + Parameters
self.mesh.SetParameters(Parameters) self.mesh.SetParameters(Parameters)
@ -3199,7 +3199,7 @@ class Mesh:
if ( isinstance( RefPoint, geompyDC.GEOM._objref_GEOM_Object)): if ( isinstance( RefPoint, geompyDC.GEOM._objref_GEOM_Object)):
RefPoint = self.smeshpyD.GetPointStruct(RefPoint) RefPoint = self.smeshpyD.GetPointStruct(RefPoint)
pass pass
Angles,AnglesParameters = ParseAngles(Angles) Angles,AnglesParameters,hasVars = ParseAngles(Angles)
Parameters = AnglesParameters + var_separator + RefPoint.parameters Parameters = AnglesParameters + var_separator + RefPoint.parameters
self.mesh.SetParameters(Parameters) self.mesh.SetParameters(Parameters)
@ -3250,7 +3250,7 @@ class Mesh:
pass pass
if ( isinstance( PathMesh, Mesh )): if ( isinstance( PathMesh, Mesh )):
PathMesh = PathMesh.GetMesh() PathMesh = PathMesh.GetMesh()
Angles,AnglesParameters = ParseAngles(Angles) Angles,AnglesParameters,hasVars = ParseAngles(Angles)
Parameters = AnglesParameters + var_separator + RefPoint.parameters Parameters = AnglesParameters + var_separator + RefPoint.parameters
self.mesh.SetParameters(Parameters) self.mesh.SetParameters(Parameters)
if HasAngles and Angles and LinearVariation: if HasAngles and Angles and LinearVariation:
@ -3291,7 +3291,7 @@ class Mesh:
RefPoint = self.smeshpyD.GetPointStruct(RefPoint) RefPoint = self.smeshpyD.GetPointStruct(RefPoint)
if ( isinstance( PathMesh, Mesh )): if ( isinstance( PathMesh, Mesh )):
PathMesh = PathMesh.GetMesh() PathMesh = PathMesh.GetMesh()
Angles,AnglesParameters = ParseAngles(Angles) Angles,AnglesParameters,hasVars = ParseAngles(Angles)
Parameters = AnglesParameters + var_separator + RefPoint.parameters Parameters = AnglesParameters + var_separator + RefPoint.parameters
self.mesh.SetParameters(Parameters) self.mesh.SetParameters(Parameters)
if HasAngles and Angles and LinearVariation: if HasAngles and Angles and LinearVariation:
@ -3333,7 +3333,7 @@ class Mesh:
RefPoint = self.smeshpyD.GetPointStruct(RefPoint) RefPoint = self.smeshpyD.GetPointStruct(RefPoint)
if ( isinstance( PathMesh, Mesh )): if ( isinstance( PathMesh, Mesh )):
PathMesh = PathMesh.GetMesh() PathMesh = PathMesh.GetMesh()
Angles,AnglesParameters = ParseAngles(Angles) Angles,AnglesParameters,hasVars = ParseAngles(Angles)
Parameters = AnglesParameters + var_separator + RefPoint.parameters Parameters = AnglesParameters + var_separator + RefPoint.parameters
self.mesh.SetParameters(Parameters) self.mesh.SetParameters(Parameters)
if HasAngles and Angles and LinearVariation: if HasAngles and Angles and LinearVariation:
@ -3375,7 +3375,7 @@ class Mesh:
RefPoint = self.smeshpyD.GetPointStruct(RefPoint) RefPoint = self.smeshpyD.GetPointStruct(RefPoint)
if ( isinstance( PathMesh, Mesh )): if ( isinstance( PathMesh, Mesh )):
PathMesh = PathMesh.GetMesh() PathMesh = PathMesh.GetMesh()
Angles,AnglesParameters = ParseAngles(Angles) Angles,AnglesParameters,hasVars = ParseAngles(Angles)
Parameters = AnglesParameters + var_separator + RefPoint.parameters Parameters = AnglesParameters + var_separator + RefPoint.parameters
self.mesh.SetParameters(Parameters) self.mesh.SetParameters(Parameters)
if HasAngles and Angles and LinearVariation: if HasAngles and Angles and LinearVariation:
@ -3592,7 +3592,7 @@ class Mesh:
IDsOfElements = self.GetElementsId() IDsOfElements = self.GetElementsId()
if ( isinstance( Axis, geompyDC.GEOM._objref_GEOM_Object)): if ( isinstance( Axis, geompyDC.GEOM._objref_GEOM_Object)):
Axis = self.smeshpyD.GetAxisStruct(Axis) Axis = self.smeshpyD.GetAxisStruct(Axis)
AngleInRadians,Parameters = ParseAngles(AngleInRadians) AngleInRadians,Parameters,hasVars = ParseAngles(AngleInRadians)
Parameters = Axis.parameters + var_separator + Parameters Parameters = Axis.parameters + var_separator + Parameters
self.mesh.SetParameters(Parameters) self.mesh.SetParameters(Parameters)
if Copy and MakeGroups: if Copy and MakeGroups:
@ -3613,7 +3613,7 @@ class Mesh:
IDsOfElements = self.GetElementsId() IDsOfElements = self.GetElementsId()
if ( isinstance( Axis, geompyDC.GEOM._objref_GEOM_Object)): if ( isinstance( Axis, geompyDC.GEOM._objref_GEOM_Object)):
Axis = self.smeshpyD.GetAxisStruct(Axis) Axis = self.smeshpyD.GetAxisStruct(Axis)
AngleInRadians,Parameters = ParseAngles(AngleInRadians) AngleInRadians,Parameters,hasVars = ParseAngles(AngleInRadians)
Parameters = Axis.parameters + var_separator + Parameters Parameters = Axis.parameters + var_separator + Parameters
self.mesh.SetParameters(Parameters) self.mesh.SetParameters(Parameters)
mesh = self.editor.RotateMakeMesh(IDsOfElements, Axis, AngleInRadians, mesh = self.editor.RotateMakeMesh(IDsOfElements, Axis, AngleInRadians,
@ -3633,7 +3633,7 @@ class Mesh:
theObject = theObject.GetMesh() theObject = theObject.GetMesh()
if (isinstance(Axis, geompyDC.GEOM._objref_GEOM_Object)): if (isinstance(Axis, geompyDC.GEOM._objref_GEOM_Object)):
Axis = self.smeshpyD.GetAxisStruct(Axis) Axis = self.smeshpyD.GetAxisStruct(Axis)
AngleInRadians,Parameters = ParseAngles(AngleInRadians) AngleInRadians,Parameters,hasVars = ParseAngles(AngleInRadians)
Parameters = Axis.parameters + ":" + Parameters Parameters = Axis.parameters + ":" + Parameters
self.mesh.SetParameters(Parameters) self.mesh.SetParameters(Parameters)
if Copy and MakeGroups: if Copy and MakeGroups:
@ -3654,7 +3654,7 @@ class Mesh:
theObject = theObject.GetMesh() theObject = theObject.GetMesh()
if (isinstance(Axis, geompyDC.GEOM._objref_GEOM_Object)): if (isinstance(Axis, geompyDC.GEOM._objref_GEOM_Object)):
Axis = self.smeshpyD.GetAxisStruct(Axis) Axis = self.smeshpyD.GetAxisStruct(Axis)
AngleInRadians,Parameters = ParseAngles(AngleInRadians) AngleInRadians,Parameters,hasVars = ParseAngles(AngleInRadians)
Parameters = Axis.parameters + ":" + Parameters Parameters = Axis.parameters + ":" + Parameters
mesh = self.editor.RotateObjectMakeMesh(theObject, Axis, AngleInRadians, mesh = self.editor.RotateObjectMakeMesh(theObject, Axis, AngleInRadians,
MakeGroups, NewMeshName) MakeGroups, NewMeshName)