Change data name (#195)

Author: bakpaul

examples/3instruments_collis.scn

@@ -109,8 +109,8 @@
 				<EdgeSetTopologyModifier   name="colliseEdgeModifier" />
 				<MechanicalObject name="CollisionDOFs"/>
 				<MultiAdaptiveBeamMapping  name="collisMap"  controller="../IRController" useCurvAbs="1" printLog="0"/> 
-				<LineCollisionModel proximity="0.0" group="1"/>
-				<PointCollisionModel proximity="0.0" group="1"/>
+				<LineCollisionModel contactDistance="0.0" group="1"/>
+				<PointCollisionModel contactDistance="0.0" group="1"/>
 		</Node>	
 
 		<Node name="VisuCatheter" activated="true">

examples/SingleBeamDeploymentCollision.scn

@@ -66,8 +66,8 @@
             <EdgeSetTopologyModifier name="colliseEdgeModifier" />
             <MechanicalObject name="CollisionDOFs" />
             <MultiAdaptiveBeamMapping controller="../DeployController" useCurvAbs="1" printLog="0" name="collisMap" />
-            <LineCollisionModel proximity="0.0" />
-            <PointCollisionModel proximity="0.0" />
+            <LineCollisionModel contactDistance="0.0" />
+            <PointCollisionModel contactDistance="0.0" />
         </Node>
     </Node>  
 

examples/python3/SingleBeamDeploymentCollision.py

@@ -63,8 +63,8 @@ def createScene(rootNode):
     BeamCollis.addObject('EdgeSetTopologyModifier', name='colliseEdgeModifier')
     BeamCollis.addObject('MechanicalObject', name='CollisionDOFs')
     BeamCollis.addObject('MultiAdaptiveBeamMapping', controller='../DeployController', useCurvAbs=True, printLog=False, name='collisMap')
-    BeamCollis.addObject('LineCollisionModel', proximity=0.0)
-    BeamCollis.addObject('PointCollisionModel', proximity=0.0)
+    BeamCollis.addObject('LineCollisionModel', contactDistance=0.0)
+    BeamCollis.addObject('PointCollisionModel', contactDistance=0.0)
 
     Carotids = rootNode.addChild('Carotids')
     Carotids.addObject('MeshSTLLoader', filename='../mesh/carotids.stl', flipNormals=False, triangulate=True, name='meshLoader', rotation=[10.0, 0.0, -90.0])

examples/python3/beamadapter/parts/instrument.py

@@ -101,8 +101,8 @@ def createInstrumentsCombined(node, xtip=[1, 0, 0], instruments=['guide'],
     Collis.addObject('MechanicalObject', name='CollisionDOFs')
     Collis.addObject('MultiAdaptiveBeamMapping', controller='../m_ircontroller', 
                         useCurvAbs=True, printLog=False, name='collisMap')
-    Collis.addObject('LineCollisionModel', proximity=0.0, group=1)
-    Collis.addObject('PointCollisionModel', proximity=0.0, group=1)
+    Collis.addObject('LineCollisionModel', contactDistance=0.0, group=1)
+    Collis.addObject('PointCollisionModel', contactDistance=0.0, group=1)
 
     # Visualization Guide
     VisuGuide = InstrumentCombined.addChild('VisuGuide')
@@ -142,8 +142,8 @@ def createInstrumentsCombinedXRay(node, xtip=[1, 0, 0], instruments=['guide'],
     Collis.addObject('MechanicalObject', name='CollisionDOFs')
     Collis.addObject('MultiAdaptiveBeamMapping', controller='../m_ircontroller', 
                         useCurvAbs=True, printLog=False, name='collisMap')
-    Collis.addObject('LineCollisionModel', proximity=0.0, group=1)
-    Collis.addObject('PointCollisionModel', proximity=0.0, group=1)
+    Collis.addObject('LineCollisionModel', contactDistance=0.0, group=1)
+    Collis.addObject('PointCollisionModel', contactDistance=0.0, group=1)
 
     # Visualization Guide
     VisuGuide = InstrumentCombined.addChild('VisuGuide')