Add default name

Author: bakpaul

examples/stlib/node_modifier.py

@@ -84,18 +84,17 @@ def createScene(root):
     S = ModelsNode.add(Entity, parameters = SParams)
 
     #TODO make the name automatically match the modifier type if none is given
-    root.add(NodeModifier, on = [ModelsNode], parameters = SimulationSolversParameters(name = "SimulationSolvers",
-                                                                                     constantSparsity=False))
+    root.add(NodeModifier, on = [ModelsNode], parameters = SimulationSolversParameters(constantSparsity=False))
 
-    root.add(NodeModifier, on = [root], parameters = SimulationSettingsParameters(name = "SimulationSettings",
-                                                                                  displayFlags = ["showVisualModels", "showInteractionForceFields"],
+    root.add(NodeModifier, on = [root], parameters = SimulationSettingsParameters(displayFlags = ["showVisualModels", "showInteractionForceFields"],
                                                                                   enableCollisionDetection = True,
                                                                                   useLagrangian = True,
                                                                                   parallelComputing = False,
                                                                                   alarmDistance=0.3, contactDistance=0.02,
                                                                                   frictionCoef=0.5, tolerance=1.0e-4, maxIterations=20))
 
-    Logo.add(NodeModifier, on = [Logo], parameters = FixConstraintParameters(name = "FixConstraintParameters", boxROIs=[[-1, -2, -13, 3, 2, -7]]))
+    Logo.add(NodeModifier, on = [Logo], parameters = FixConstraintParameters( boxROIs=[[-1, -2, -13, 3, 2, -7]]))
+    Logo.add(NodeModifier, on = [Logo], parameters = FixConstraintParameters( boxROIs=[[-100, -2, -13, -300, 2, -7]]))
     ModelsNode.add(NodeModifier, on = [S, Logo], parameters = AttachmentConstraintParameters(name = "AttachmentConstraintParameters", indices1=[26,20,119,121], indices2=[722,732,574,573], stiffness=0.5, damping=0.0,
                                                                                              length=[((9.43-9.35)**2 + (-.44-0.48)**2 + (-6.01+6.56)**2)**(0.5) ]))
 

stlib/geometries/extract.py

@@ -6,54 +6,33 @@
 
 import Sofa
 from Sofa.Core import Node
+from functools import partial
 
 
 class ExtractInternalDataProvider(InternalDataProvider):
-    destinationType : ElementType
-    sourceType : ElementType
-    sourceName : str
 
-    def __init__(self, destinationType : ElementType, sourceType : ElementType, sourceName : str):
-        self.destinationType = destinationType
-        self.sourceType = sourceType
-        self.sourceName = sourceName
-
-    def __post_init__(self):
-        if(not (self.sourceType == ElementType.TETRAHEDRA and self.destinationType == ElementType.TRIANGLES)
-           and not (self.sourceType == ElementType.HEXAHEDRA and self.destinationType == ElementType.QUADS) ):
-            raise ValueError("Only configuration possible are 'Tetrahedra to Triangles' and 'Hexahedra to Quads'")
-
-        InternalDataProvider.__init__(self)
+    def __init__(self):
+        super().__init__()
 
     def generateAttribute(self, parent : Geometry):
-        node = parent.addChild("ExtractedGeometry")
+        self.position = parent.parents[0].parents[0].getChild("Geometry").container.position.linkpath
+
 
-        #TODO: Specify somewhere in the doc that this should only be used for mapped topologies that extract parent topology surface
-        # fromLink = parent.parents[0].parents[0].getChild(self.SourceName).container.linkpath
-        # TODO: the line above cannot work if the nodes and objects are not added to the graph prior the end of __init__() call
-        # !!! also, on a fail, nothing is added to the graph, which makes things harder to debug
-        # !!! also, does not work because of the function canCreate(), which checks the input (not yet created?)
-        # this is all related
-        fromLink = "@../../../Geometry/container" # TODO: can we do better than this?
-        addDynamicTopology(node, elementType=self.destinationType, container={"position" : fromLink + ".position"})
-        if self.sourceType == ElementType.TETRAHEDRA:
-            node.addObject("Tetra2TriangleTopologicalMapping", input=fromLink, output=node.container.linkpath)
-        elif self.sourceType == ElementType.HEXAHEDRA:
-            node.addObject("Hexa2QuadTopologicalMapping", input=fromLink, output=node.container.linkpath)
-        else:
-            Sofa.msg_error("[stlib/geometry/exctrat.py]", "Element type: " + str(self.sourceType) + " not supported.")
+def extractGeometry(sourceType : ElementType, parent : Geometry):
+    #TODO: Specify somewhere in the doc that this should only be used for mapped topologies that extract parent topology surface
+    # fromLink = parent.parents[0].parents[0].getChild(self.SourceName).container.linkpath
+    # TODO: the line above cannot work if the nodes and objects are not added to the graph prior the end of __init__() call
+    # !!! also, on a fail, nothing is added to the graph, which makes things harder to debug
+    # !!! also, does not work because of the function canCreate(), which checks the input (not yet created?)
+    # this is all related
+    fromLink = parent.parents[0].parents[0].getChild("Geometry").container.linkpath # TODO: can we do better than this?
+    if sourceType == ElementType.TETRAHEDRA:
+        parent.addObject("Tetra2TriangleTopologicalMapping", input=fromLink, output=parent.container.linkpath)
+    elif sourceType == ElementType.HEXAHEDRA:
+        parent.addObject("Hexa2QuadTopologicalMapping", input=fromLink, output=parent.container.linkpath)
+    else:
+        Sofa.msg_error("[stlib/geometry/exctrat.py]", "Element type: " + str(sourceType) + " not supported.")
 
-        self.position = node.container.position.linkpath
-        if node.container.findData("edges") is not None:
-            self.edges = node.container.edges.linkpath
-        if node.container.findData("triangles") is not None:
-            self.triangles = node.container.triangles.linkpath
-        if node.container.findData("quads") is not None:
-            self.quads = node.container.quads.linkpath
-        if node.container.findData("hexahedra") is not None:
-            self.hexahedra = node.container.hexahedra.linkpath
-        if node.container.findData("tetras") is not None:
-            self.tetrahedra = node.container.tetras.linkpath
 
 
 
@@ -68,9 +47,6 @@ def __init__(self,
 
         self.postInit = partial(extractGeometry, sourceParameters.elementType)
 
-
         if(not (sourceParameters.elementType == ElementType.TETRAHEDRA and destinationType == ElementType.TRIANGLES)
-            and not (sourceParameters.elementType == ElementType.HEXAHEDRA and destinationType == ElementType.QUADS) ):
-            raise ValueError("Only configuration possible are 'Tetrahedra to Triangles' and 'Hexahedra to Quads'")
-
-
+                and not (sourceParameters.elementType == ElementType.HEXAHEDRA and destinationType == ElementType.QUADS) ):
+            raise ValueError("Only configuration possible are 'Tetrahedra to Triangles' and 'Hexahedra to Quads'")

stlib/node_modifiers/__node_modifier__.py

@@ -26,9 +26,18 @@ def wrapper(*args, **kwargs):
 
 @dataclasses.dataclass
 class BaseNodeModifierParameters(object):
-    name : str = "NodeModifier"
+    name : str = None
     kwargs : dict = dataclasses.field(default_factory=dict)
 
+    def __post_init__(self):
+        #Give parameter type name as default name
+        if self.name is None:
+            self.name = type(self).__name__
+            pId = self.name.find("Parameters")
+            if pId > 0:
+                self.name = self.name[0:pId]
+
+
     @AffectedNodes(0)
     def modify(self, owner, node : list[Node]) -> list[Node] :
         return []
@@ -50,6 +59,7 @@ def __init__(self, parameters : BaseNodeModifierParameters):
         Sofa.Core.Component.__init__(self, **(parameters.toDict()))
         self.parameters = parameters
 
+
     def register( self, owner, nodes : list[Node]) :
         if len(nodes) == 0:
             raise ValueError(f"No node seems to have been modified by the node modifier {self.parameters.name}. Make sure the \"modify\" method of the used parameter type returns the list of nodes modified by this modifier.")