Revert changes made to extract

Author: bakpaul

stlib/geometries/__geometry__.py

@@ -1,5 +1,5 @@
 from stlib.core.basePrefab import BasePrefab
-from stlib.core.baseParameters import BaseParameters, Optional, dataclasses, Any, Callable
+from stlib.core.baseParameters import BaseParameters, Optional, dataclasses, Any
 from splib.topology.dynamic import addDynamicTopology
 from splib.topology.static import addStaticTopology
 from splib.core.enum_types import ElementType
@@ -35,10 +35,6 @@ class GeometryParameters(BaseParameters):
 
     dynamicTopology : bool = False
 
-
-    def postInitExec(self, node):
-        pass
-
     def Data(self):
         return InternalDataProvider()
 
@@ -83,6 +79,4 @@ def init(self):
                                 "quads": self.parameters.data.quads,
                                 "tetrahedra": self.parameters.data.tetrahedra,
                                 "hexahedra": self.parameters.data.hexahedra
-                              })
-
-        self.parameters.postInitExec(self)
+                              })

stlib/geometries/extract.py

@@ -6,49 +6,65 @@
 
 import Sofa
 from Sofa.Core import Node
-from functools import partial
 
 
 class ExtractInternalDataProvider(InternalDataProvider):
+    destinationType : ElementType
+    sourceType : ElementType
+    sourceName : str
 
-    def __init__(self):
-        super().__init__()
+    def __init__(self, destinationType : ElementType, sourceType : ElementType, sourceName : str):
+        self.destinationType = destinationType
+        self.sourceType = sourceType
+        self.sourceName = sourceName
 
-    def generateAttribute(self, parent : Geometry):
-        self.position = parent.parents[0].parents[0].getChild("Geometry").container.position.linkpath
+    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 generateAttribute(self, parent : Geometry):
+        node = parent.addChild("ExtractedGeometry")
 
-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.")
+        #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.")
 
+        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
 
 
 
 class ExtractParameters(GeometryParameters):
-    def __init__(self,
-                 sourceParameters : GeometryParameters,
-                 destinationType : ElementType,
-                 dynamicTopology : bool = False):
+    def __init__(self, 
+                 sourceParameters : GeometryParameters, 
+                 destinationType : ElementType,):
         GeometryParameters.__init__(self,
-                                    data = ExtractInternalDataProvider(),
-                                    dynamicTopology = dynamicTopology,
+                                    data = ExtractInternalDataProvider(destinationType = destinationType, 
+                                                                       sourceType = sourceParameters.elementType,
+                                                                       sourceName = sourceParameters.name), 
+                                    dynamicTopology = True,
                                     elementType = destinationType)
-
-        self.postInitExec = 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'")
-
+