clean tuto scenes

SofaDefrost · Oct 7, 2024 · 1c7d597 · 1c7d597
1 parent b0cf1a2
commit 1c7d597
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 96 deletions.
diff --git a/tutorial/tuto_scenes/tuto_1.py b/tutorial/tuto_scenes/tuto_1.py
@@ -1,18 +1,19 @@
 # -*- coding: utf-8 -*-
 
-import Sofa
 
-stiffness_param = 1.0e10
-beam_radius = 1.0
+stiffness_param: float = 1.0e10
+beam_radius: float = 1.0
 
 
-def _add_rigid_base(p_node):
+def _add_rigid_base(p_node, positions=None):
+    if positions is None:
+        positions = [0, 0, 0, 0, 0, 0, 1]
     rigid_base_node = p_node.addChild("rigid_base")
     rigid_base_node.addObject(
         "MechanicalObject",
         template="Rigid3d",
         name="cosserat_base_mo",
-        position="0 0 0  0 0 0. 1",
+        position=positions,
         showObject=1,
         showObjectScale="0.1",
     )
@@ -49,13 +50,13 @@ def _add_cosserat_state(p_node, bending_states, list_sections_length, _radius=2.
 
 
 def _add_cosserat_frame(
-    p_node,
-    _bending_node,
-    framesF,
-    _section_curv_abs,
-    _frame_curv_abs,
-    _radius,
-    _beam_mass=0.0,
+        p_node,
+        _bending_node,
+        framesF,
+        _section_curv_abs,
+        _frame_curv_abs,
+        _radius,
+        _beam_mass=0.0,
 ):
     cosserat_in_Sofa_frame_node = p_node.addChild("cosserat_in_Sofa_frame_node")
 
@@ -91,7 +92,7 @@ def createScene(root_node):
     root_node.addObject("RequiredPlugin", name='Sofa.Component.SolidMechanics.Spring')
     root_node.addObject("RequiredPlugin", name='Sofa.Component.StateContainer')
     root_node.addObject("RequiredPlugin", name='Sofa.Component.Visual')
-    
+
     root_node.addObject(
         "VisualStyle",
         displayFlags="showBehaviorModels showCollisionModels showMechanicalMappings",

diff --git a/tutorial/tuto_scenes/tuto_2.py b/tutorial/tuto_scenes/tuto_2.py
@@ -1,89 +1,9 @@
 # -*- coding: utf-8 -*-
 
-stiffness_param = 1.0e10
-beam_radius = 1.0
+from tuto_1 import _add_rigid_base, _add_cosserat_state, _add_cosserat_frame
 
-
-def _add_rigid_base(p_node):
-    rigid_base_node = p_node.addChild("rigid_base")
-    rigid_base_node.addObject(
-        "MechanicalObject",
-        template="Rigid3d",
-        name="cosserat_base_mo",
-        position="0 0 0  0 0 0. 1",
-        showObject=1,
-        showObjectScale="0.1",
-    )
-    rigid_base_node.addObject(
-        "RestShapeSpringsForceField",
-        name="spring",
-        stiffness=stiffness_param,
-        angularStiffness=stiffness_param,
-        external_points="0",
-        mstate="@cosserat_base_mo",
-        points="0",
-        template="Rigid3d",
-    )
-    return rigid_base_node
-
-
-def _add_cosserat_state(p_node, bending_states, list_sections_length, _radius=2.0):
-    cosserat_coordinate_node = p_node.addChild("cosseratCoordinate")
-    print(f" ===> bendind state : {bending_states}")
-    cosserat_coordinate_node.addObject(
-        "MechanicalObject",
-        template="Vec3d",
-        name="cosserat_state",
-        position=bending_states,
-    )
-    testNode = cosserat_coordinate_node.addObject(
-        "BeamHookeLawForceField",
-        crossSectionShape="circular",
-        length=list_sections_length,
-        radius=_radius,
-        youngModulus=1.0e4,
-        poissonRatio=0.4,
-    )
-    print(f" the dire of node is : {dir(testNode)}")
-    return cosserat_coordinate_node
-
-
-def _add_cosserat_frame(
-    p_node,
-    _bending_node,
-    framesF,
-    _section_curv_abs,
-    _frame_curv_abs,
-    _radius,
-    _beam_mass=0.0,
-):
-    cosserat_in_Sofa_frame_node = p_node.addChild("cosserat_in_Sofa_frame_node")
-
-    _bending_node.addChild(cosserat_in_Sofa_frame_node)
-    frames_mo = cosserat_in_Sofa_frame_node.addObject(
-        "MechanicalObject",
-        template="Rigid3d",
-        name="FramesMO",
-        position=framesF,
-        showIndices=0.0,
-        showObject=0,
-        showObjectScale=0.8,
-    )
-
-    cosserat_in_Sofa_frame_node.addObject("UniformMass", totalMass=_beam_mass)
-
-    cosserat_in_Sofa_frame_node.addObject(
-        "DiscreteCosseratMapping",
-        curv_abs_input=_section_curv_abs,
-        curv_abs_output=_frame_curv_abs,
-        name="cosseratMapping",
-        input1=_bending_node.cosserat_state.getLinkPath(),
-        input2=p_node.cosserat_base_mo.getLinkPath(),
-        output=frames_mo.getLinkPath(),
-        debug=0,
-        radius=_radius,
-    )
-    return cosserat_in_Sofa_frame_node
+stiffness_param: float = 1.e10
+beam_radius: float = 1.
 
 
 def createScene(root_node):