Merged work (#1472, #1475)

qLab · Nov 27, 2024 · 6138be1 · 6138be1
2 parents 1704dcb + 304c25f
commit 6138be1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/gallery/qLib--TOP--regex_attribs_from_string.gal b/gallery/qLib--TOP--regex_attribs_from_string.gal
diff --git a/gallery/qLib--TOP--regex_shot_and_frame_range_example.gal b/gallery/qLib--TOP--regex_shot_and_frame_range_example.gal
diff --git a/toolbar/qLib-PDG.shelf b/toolbar/qLib-PDG.shelf
@@ -153,7 +153,21 @@ shift = kwargs['shiftclick']
 ctrl  = kwargs['ctrlclick']
 alt   = kwargs['altclick']
 
-sel = [ n.getPDGNode() for n in hou.selectedNodes() if hasattr(n, "getPDGNode") ]
+# try to find a top node selection first
+sel = [ tp for n in hou.selectedNodes() if hasattr(n, "getPDGNode") and (tp:=n.getPDGNode()) ]
+
+# try finding non-top nodes with a linkage to a top node
+if len(sel)==0:
+    print("SEL 2")
+    sel = [ tp for n in hou.selectedNodes() \
+        if (p:=n.parm("targettopnetwork")) and (t:=p.evalAsNode()) and (tp:=t.getPDGNode()) ]
+
+# try finding a topnet container node
+if len(sel)==0:
+    print("SEL 3")
+    sel = [ n.outputNode().getPDGNode() for n in hou.selectedNodes() \
+        if hasattr(n, "getPDGGraphContext") and hasattr(n, "outputNode") ]
+
 items = [ len(n.workItems) for n in sel if hasattr(n, "workItems") ]
 
 if len(items)>0 or ctrl: