feat(ViewNode): Return the node in addMissingNode

Kitware · Apr 11, 2024 · 82e8728 · 82e8728
1 parent 6d8c2ff
commit 82e8728
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 27 deletions.
diff --git a/Sources/Rendering/SceneGraph/ViewNode/index.d.ts b/Sources/Rendering/SceneGraph/ViewNode/index.d.ts
@@ -20,10 +20,12 @@ export interface IViewNodeInitialValues {
 export interface vtkViewNode extends vtkObject {
 
 	/**
-	 * 
+	 * Add a child view node to this node, created from the renderable given as argument
+	 * If the node creation fails or the argument is falsy, returns undefined
+	 * Otherwise, returns the newly created node or the existing node
 	 * @param dobj 
 	 */
-	addMissingNode(dobj: any): void;
+	addMissingNode(dobj: any): vtkViewNode | undefined;
 
 	/**
 	 * 

diff --git a/Sources/Rendering/SceneGraph/ViewNode/index.js b/Sources/Rendering/SceneGraph/ViewNode/index.js
@@ -88,22 +88,27 @@ function vtkViewNode(publicAPI, model) {
   // be called only in between prepareNodes and removeUnusedNodes
   publicAPI.addMissingNode = (dobj) => {
     if (!dobj) {
-      return;
+      return undefined;
     }
-    const result = model._renderableChildMap.get(dobj);
+
     // if found just mark as visited
+    const result = model._renderableChildMap.get(dobj);
     if (result !== undefined) {
       result.setVisited(true);
-    } else {
-      // otherwise create a node
-      const newNode = publicAPI.createViewNode(dobj);
-      if (newNode) {
-        newNode.setParent(publicAPI);
-        newNode.setVisited(true);
-        model._renderableChildMap.set(dobj, newNode);
-        model.children.push(newNode);
-      }
+      return result;
+    }
+
+    // otherwise create a node
+    const newNode = publicAPI.createViewNode(dobj);
+    if (newNode) {
+      newNode.setParent(publicAPI);
+      newNode.setVisited(true);
+      model._renderableChildMap.set(dobj, newNode);
+      model.children.push(newNode);
+      return newNode;
     }
+
+    return undefined;
   };
 
   // add missing nodes/children for the passed in renderables. This should
@@ -115,20 +120,7 @@ function vtkViewNode(publicAPI, model) {
 
     for (let index = 0; index < dataObjs.length; ++index) {
       const dobj = dataObjs[index];
-      const result = model._renderableChildMap.get(dobj);
-      // if found just mark as visited
-      if (result !== undefined) {
-        result.setVisited(true);
-      } else {
-        // otherwise create a node
-        const newNode = publicAPI.createViewNode(dobj);
-        if (newNode) {
-          newNode.setParent(publicAPI);
-          newNode.setVisited(true);
-          model._renderableChildMap.set(dobj, newNode);
-          model.children.push(newNode);
-        }
-      }
+      publicAPI.addMissingNode(dobj);
     }
   };