Skip to content

Commit

Permalink
[scenes] Fix warning in python scenes
Browse files Browse the repository at this point in the history
  • Loading branch information
epernod committed Jul 15, 2024
1 parent 6dad552 commit c2cf701
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def createScene(rootNode):

InstrumentCombined.addObject('MechanicalObject', template="Rigid3d", name="DOFs" )
InstrumentCombined.addObject('InterventionalRadiologyController', template="Rigid3d", name="m_ircontroller", printLog=False, xtip="0.1",speed ='4', step="0.1", rotationInstrument="0", controlledInstrument="0", startingPos="@../RefStartingPos/ReferencePos.position", instruments="InterpolCatheter")
InstrumentCombined.addObject('WireBeamInterpolation', name="InterpolCatheter", WireRestShape="@../topoLines_cath/catheterRestShape", radius="3.0", printLog=False)
InstrumentCombined.addObject('WireBeamInterpolation', name="InterpolCatheter", WireRestShape="@../topoLines_cath/catheterRestShape", printLog=False)
InstrumentCombined.addObject('AdaptiveBeamForceFieldAndMass', name="CatheterForceField", massDensity="0.000005", interpolation="@InterpolCatheter", printLog=False)
InstrumentCombined.addObject('LinearSolverConstraintCorrection', printLog=False, wire_optimization="true")
InstrumentCombined.addObject("FixedProjectiveConstraint", indices="0")
Expand Down
7 changes: 3 additions & 4 deletions examples/python3/SingleBeamDeployment.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ def createScene(rootNode):

topoLines = rootNode.addChild('EdgeTopology')
topoLines.addObject('RodStraightSection', name='StraightSection',
length=980.0, radius=1,
length=980.0, radius=0.9,
nbEdgesCollis=30, nbEdgesVisu=196,
youngModulus=20000)

topoLines.addObject('RodSpireSection', name='SpireSection',
length=20.0, radius=1,
length=20.0, radius=0.9,
nbEdgesCollis=5, nbEdgesVisu=4,
spireDiameter=25, spireHeight=0,
youngModulus=20000)
Expand All @@ -38,8 +38,7 @@ def createScene(rootNode):
xmax=0.0, xmin=0.0, ymin=0, ymax=0, zmax=0, zmin=0,
p0=[0,0,0])
BeamMechanics.addObject('MechanicalObject', showIndices=False, name='DOFs Container', template='Rigid3d', ry=-90)
BeamMechanics.addObject('WireBeamInterpolation', name='BeamInterpolation', WireRestShape='@../EdgeTopology/BeamRestShape',
radius=0.9, printLog=False)
BeamMechanics.addObject('WireBeamInterpolation', name='BeamInterpolation', WireRestShape='@../EdgeTopology/BeamRestShape', printLog=False)
BeamMechanics.addObject('AdaptiveBeamForceFieldAndMass', name='BeamForceField', massDensity=0.00000155, interpolation='@BeamInterpolation')
BeamMechanics.addObject('InterventionalRadiologyController', name='DeployController', template='Rigid3d', instruments='BeamInterpolation',
startingPos=[0, 0, 0, 0, 0, 0, 1], xtip=[0, 0, 0], printLog=True,
Expand Down
7 changes: 3 additions & 4 deletions examples/python3/SingleBeamDeploymentCollision.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ def createScene(rootNode):

topoLines = rootNode.addChild('EdgeTopology')
topoLines.addObject('RodStraightSection', name='StraightSection',
length=980.0, radius=1,
length=980.0, radius=0.9,
nbEdgesCollis=50, nbEdgesVisu=200,
youngModulus=20000, massDensity=0.1, poissonRatio=0.3)

topoLines.addObject('RodSpireSection', name='SpireSection',
length=20.0, radius=1,
length=20.0, radius=0.9,
nbEdgesCollis=10, nbEdgesVisu=200,
spireDiameter=25, spireHeight=0,
youngModulus=20000, massDensity=0.1, poissonRatio=0.3)
Expand All @@ -46,8 +46,7 @@ def createScene(rootNode):
xmax=0.0, xmin=0.0, ymin=0, ymax=0, zmax=0, zmin=0,
p0=[0,0,0])
BeamMechanics.addObject('MechanicalObject', showIndices=False, name='DOFs', template='Rigid3d', ry=-90)
BeamMechanics.addObject('WireBeamInterpolation', name='BeamInterpolation', WireRestShape='@../EdgeTopology/BeamRestShape',
radius=0.9, printLog=False)
BeamMechanics.addObject('WireBeamInterpolation', name='BeamInterpolation', WireRestShape='@../EdgeTopology/BeamRestShape', printLog=False)
BeamMechanics.addObject('AdaptiveBeamForceFieldAndMass', name='BeamForceField', massDensity=0.00000155, interpolation='@BeamInterpolation')
BeamMechanics.addObject('InterventionalRadiologyController', name='DeployController', template='Rigid3d', instruments='BeamInterpolation',
startingPos=[0, 0, 0, 0, 0, 0, 1], xtip=[0, 0, 0], printLog=True,
Expand Down

0 comments on commit c2cf701

Please sign in to comment.