Used ScenePathPlugValueWidget for all appropriate plugs.

GafferHQ · Apr 22, 2015 · 6ee37e4 · 6ee37e4
1 parent ab03f0a
commit 6ee37e4
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 28 deletions.
diff --git a/python/GafferSceneUI/DuplicateUI.py b/python/GafferSceneUI/DuplicateUI.py
@@ -38,6 +38,7 @@
 import GafferUI
 
 import GafferScene
+import GafferSceneUI
 
 ##########################################################################
 # Metadata
@@ -115,10 +116,7 @@
 GafferUI.PlugValueWidget.registerCreator(
 	GafferScene.Duplicate,
 	"target",
-	lambda plug : GafferUI.PathPlugValueWidget(
-		plug,
-		path = GafferScene.ScenePath( plug.node()["in"], plug.node().scriptNode().context(), "/" ),
-	),
+	GafferSceneUI.ScenePathPlugValueWidget
 )
 
 GafferUI.PlugValueWidget.registerCreator( GafferScene.Duplicate, "transform", GafferUI.TransformPlugValueWidget, collapsed=None )
diff --git a/python/GafferSceneUI/IsolateUI.py b/python/GafferSceneUI/IsolateUI.py
@@ -38,6 +38,7 @@
 import GafferUI
 
 import GafferScene
+import GafferSceneUI
 
 ##########################################################################
 # Metadata
@@ -61,8 +62,5 @@
 GafferUI.PlugValueWidget.registerCreator(
 	GafferScene.Isolate,
 	"from",
-	lambda plug : GafferUI.PathPlugValueWidget(
-		plug,
-		path = GafferScene.ScenePath( plug.node()["in"], plug.node().scriptNode().context(), "/" ),
-	),
+	GafferSceneUI.ScenePathPlugValueWidget
 )
diff --git a/python/GafferSceneUI/MapProjectionUI.py b/python/GafferSceneUI/MapProjectionUI.py
@@ -34,15 +34,27 @@
 #
 ##########################################################################
 
+import IECore
+
 import Gaffer
 import GafferUI
 import GafferScene
+import GafferSceneUI
 
 GafferUI.PlugValueWidget.registerCreator(
 	GafferScene.MapProjection,
 	"camera",
-	lambda plug : GafferUI.PathPlugValueWidget(
-		plug,
-		path = GafferScene.ScenePath( plug.node()["in"], plug.node().scriptNode().context(), "/" ),
-	),
+	GafferSceneUI.ScenePathPlugValueWidget
+)
+
+Gaffer.Metadata.registerPlugValue(
+	GafferScene.MapProjection,
+	"camera",
+	"scenePathPlugValueWidget:setNames", IECore.StringVectorData( [ "__cameras" ] )
 )
+
+Gaffer.Metadata.registerPlugValue(
+	GafferScene.MapProjection,
+	"camera",
+	"scenePathPlugValueWidget:setsLabel", "Show only cameras"
+)
diff --git a/python/GafferSceneUI/SceneNodeUI.py b/python/GafferSceneUI/SceneNodeUI.py
@@ -108,10 +108,7 @@ def __noduleCreator( plug ) :
 GafferUI.PlugValueWidget.registerCreator(
 	GafferScene.BranchCreator,
 	"parent",
-	lambda plug : GafferUI.PathPlugValueWidget(
-		plug,
-		path = GafferScene.ScenePath( plug.node()["in"], plug.node().scriptNode().context(), "/" ),
-	),
+	GafferSceneUI.ScenePathPlugValueWidget
 )
 
 # Group
@@ -124,10 +121,7 @@ def __noduleCreator( plug ) :
 GafferUI.PlugValueWidget.registerCreator(
 	GafferScene.Constraint,
 	"target",
-	lambda plug : GafferUI.PathPlugValueWidget(
-		plug,
-		path = GafferScene.ScenePath( plug.node()["in"], plug.node().scriptNode().context(), "/" ),
-	),
+	GafferSceneUI.ScenePathPlugValueWidget
 )
 
 GafferUI.PlugValueWidget.registerCreator(

diff --git a/python/GafferSceneUI/StandardOptionsUI.py b/python/GafferSceneUI/StandardOptionsUI.py
@@ -34,9 +34,12 @@
 #
 ##########################################################################
 
+import IECore
+
 import Gaffer
 import GafferUI
 import GafferScene
+import GafferSceneUI
 
 ## \todo This is getting used in a few places now - maybe put it in one
 # place? Maybe a static method on NumericWidget?
@@ -122,8 +125,17 @@ def __motionBlurSummary( plug ) :
 GafferUI.PlugValueWidget.registerCreator(
 	GafferScene.StandardOptions,
 	"options.renderCamera.value",
-	lambda plug : GafferUI.PathPlugValueWidget(
-		plug,
-		path = GafferScene.ScenePath( plug.node()["in"], plug.node().scriptNode().context(), "/" ),
-	),
+	GafferSceneUI.ScenePathPlugValueWidget
 )
+
+Gaffer.Metadata.registerPlugValue(
+	GafferScene.StandardOptions,
+	"options.renderCamera.value",
+	"scenePathPlugValueWidget:setNames", IECore.StringVectorData( [ "__cameras" ] )
+)
+
+Gaffer.Metadata.registerPlugValue(
+	GafferScene.StandardOptions,
+	"options.renderCamera.value",
+	"scenePathPlugValueWidget:setsLabel", "Show only cameras"
+)
diff --git a/python/GafferSceneUI/SubTreeUI.py b/python/GafferSceneUI/SubTreeUI.py
@@ -62,8 +62,5 @@
 GafferUI.PlugValueWidget.registerCreator(
 	GafferScene.SubTree,
 	"root",
-	lambda plug : GafferUI.PathPlugValueWidget(
-		plug,
-		path = GafferScene.ScenePath( plug.node()["in"], plug.node().scriptNode().context(), "/" ),
-	),
+	GafferSceneUI.ScenePathPlugValueWidget
 )