Skip to content

Commit

Permalink
Merge pull request #6053 from murraystevenson/docsCameraTweaksUpdate
Browse files Browse the repository at this point in the history 
Docs : Account for new `ignoreMissing` plug on CameraTweaks
  • Loading branch information
@johnhaddon
johnhaddon authored Sep 20, 2024
2 parents a003d5d + bbaaa8a commit cd9e06b
Showing 1 changed file with 17 additions and 35 deletions.
52 changes: 17 additions & 35 deletions .../WorkingWithTheNodeGraph/SpreadsheetNode/scripts/taskSpreadsheetNodeAddPlugTweak_edit.gfr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import IECore
import imath

Gaffer.Metadata.registerValue( parent, "serialiser:milestoneVersion", 1, persistent=False )
Gaffer.Metadata.registerValue( parent, "serialiser:majorVersion", 4, persistent=False )
Gaffer.Metadata.registerValue( parent, "serialiser:minorVersion", 7, persistent=False )
Gaffer.Metadata.registerValue( parent, "serialiser:majorVersion", 5, persistent=False )
Gaffer.Metadata.registerValue( parent, "serialiser:minorVersion", 0, persistent=False )
Gaffer.Metadata.registerValue( parent, "serialiser:patchVersion", 0, persistent=False )

__children = {}
Expand All @@ -25,9 +25,7 @@ parent.addChild( __children["ImageReader_Mouse"] )
__children["ImageReader_Mouse"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
__children["Merge"] = GafferImage.Merge( "Merge" )
parent.addChild( __children["Merge"] )
__children["Merge"]["in"].addChild( GafferImage.ImagePlug( "in2", flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
__children["Merge"]["in"].addChild( GafferImage.ImagePlug( "in3", flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
__children["Merge"]["in"].addChild( GafferImage.ImagePlug( "in4", flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
__children["Merge"]["in"].resize( 5 )
__children["Merge"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
__children["ImageWriter"] = GafferImage.ImageWriter( "ImageWriter" )
parent.addChild( __children["ImageWriter"] )
Expand All @@ -38,7 +36,7 @@ __children["Dot"].setup( GafferImage.ImagePlug( "in", ) )
__children["Dot"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
__children["Merge1"] = GafferImage.Merge( "Merge1" )
parent.addChild( __children["Merge1"] )
__children["Merge1"]["in"].addChild( GafferImage.ImagePlug( "in2", flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
__children["Merge1"]["in"].resize( 3 )
__children["Merge1"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
__children["Constant"] = GafferImage.Constant( "Constant" )
parent.addChild( __children["Constant"] )
Expand Down Expand Up @@ -85,7 +83,7 @@ parent.addChild( __children["ImageReader_Submenu"] )
__children["ImageReader_Submenu"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
__children["Merge_Submenu"] = GafferImage.Merge( "Merge_Submenu" )
parent.addChild( __children["Merge_Submenu"] )
__children["Merge_Submenu"]["in"].addChild( GafferImage.ImagePlug( "in2", flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
__children["Merge_Submenu"]["in"].resize( 3 )
__children["Merge_Submenu"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
__children["Dot1"] = Gaffer.Dot( "Dot1" )
parent.addChild( __children["Dot1"] )
Expand Down Expand Up @@ -140,18 +138,11 @@ parent.addChild( __children["Expression"] )
__children["Expression"]["__in"].addChild( Gaffer.IntPlug( "p0", defaultValue = 0, flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
__children["Expression"]["__out"].addChild( Gaffer.FloatPlug( "p0", direction = Gaffer.Plug.Direction.Out, defaultValue = 1910.0, flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
__children["Expression"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
__children["Expression3"] = Gaffer.Expression( "Expression3" )
parent.addChild( __children["Expression3"] )
__children["Expression3"]["__out"].addChild( Gaffer.FloatPlug( "p0", direction = Gaffer.Plug.Direction.Out, defaultValue = 100.0, flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
__children["Expression3"]["__out"].addChild( Gaffer.FloatPlug( "p1", direction = Gaffer.Plug.Direction.Out, defaultValue = 0.0, flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
__children["Expression3"]["__out"].addChild( Gaffer.FloatPlug( "p2", direction = Gaffer.Plug.Direction.Out, defaultValue = 100.0, flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
__children["Expression3"]["__out"].addChild( Gaffer.FloatPlug( "p3", direction = Gaffer.Plug.Direction.Out, defaultValue = 0.0, flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
__children["Expression3"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
__children["FormatQuery1"] = GafferImage.FormatQuery( "FormatQuery1" )
parent.addChild( __children["FormatQuery1"] )
__children["FormatQuery1"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
parent["frame"].setValue( 67.0 )
parent["variables"]["imageCataloguePort"]["value"].setValue( 34165 )
parent["variables"]["imageCataloguePort"]["value"].setValue( 37483 )
Gaffer.Metadata.registerValue( parent["variables"]["imageCataloguePort"], 'readOnly', True )
Gaffer.Metadata.registerValue( parent["variables"]["projectName"]["name"], 'readOnly', True )
Gaffer.Metadata.registerValue( parent["variables"]["projectRootDirectory"]["name"], 'readOnly', True )
Expand Down Expand Up @@ -183,7 +174,7 @@ __children["Constant"]["color"]["g"].setInput( __children["Constant"]["color"]["
__children["Constant"]["color"]["b"].setInput( __children["Constant"]["color"]["r"] )
__children["Constant"]["__uiPosition"].setValue( imath.V2f( 5.42433834, 46.3921852 ) )
__children["ImageTransform"]["in"].setInput( __children["Constant"]["out"] )
__children["ImageTransform"]["transform"]["translate"].setValue( imath.V2f( 155, 268 ) )
__children["ImageTransform"]["transform"]["translate"].setValue( imath.V2f( 155, 248 ) )
__children["ImageTransform"]["__uiPosition"].setValue( imath.V2f( 5.42433834, 38.2281227 ) )
Gaffer.Metadata.registerValue( __children["RectangleDashed_Target"], 'noduleLayout:customGadget:addButtonLeft:visible', False )
Gaffer.Metadata.registerValue( __children["RectangleDashed_Target"], 'noduleLayout:customGadget:addButtonRight:visible', False )
Expand All @@ -196,58 +187,52 @@ Gaffer.Metadata.registerValue( __children["RectangleDashed_Target"], 'documentat
__children["RectangleDashed_Target"]["in"].setInput( __children["Merge1"]["out"] )
__children["RectangleDashed_Target"]["color"].setValue( imath.Color4f( 0.964699984, 0.57249999, 0.114, 0.5 ) )
__children["RectangleDashed_Target"]["dashLength"].setValue( 12.0 )
__children["RectangleDashed_Target"]["area"]["min"].setValue( imath.V2f( 8, 292 ) )
__children["RectangleDashed_Target"]["area"]["max"]["y"].setValue( 320.0 )
__children["RectangleDashed_Target"]["area"]["min"].setValue( imath.V2f( 8, 270 ) )
__children["RectangleDashed_Target"]["area"]["max"]["y"].setValue( 297.0 )
__children["RectangleDashed_Target"]["area"]["max"]["x"].setInput( __children["Expression"]["__out"]["p0"] )
__children["RectangleDashed_Target"]["lineWidth"].setValue( 2.0 )
__children["RectangleDashed_Target"]["__uiPosition"].setValue( imath.V2f( -5.8894825, 21.732029 ) )
__children["Rectangle_LineTarget"]["in"].setInput( __children["RectangleDashed_Target"]["out"] )
__children["Rectangle_LineTarget"]["color"].setValue( imath.Color4f( 0.964699984, 0.57249999, 0.114, 0.5 ) )
__children["Rectangle_LineTarget"]["area"].setValue( imath.Box2f( imath.V2f( 0, 0 ), imath.V2f( 57, 0 ) ) )
__children["Rectangle_LineTarget"]["lineWidth"].setValue( 2.0 )
__children["Rectangle_LineTarget"]["transform"]["translate"].setValue( imath.V2f( 39, 237 ) )
__children["Rectangle_LineTarget"]["transform"]["translate"].setValue( imath.V2f( 39, 217 ) )
__children["Rectangle_LineTarget"]["transform"]["rotate"].setValue( 120.0 )
__children["Rectangle_LineTarget"]["__uiPosition"].setValue( imath.V2f( -5.89711523, 13.3999977 ) )
__children["Text_Target"]["in"].setInput( __children["Rectangle_LineTarget"]["out"] )
__children["Text_Target"]["color"].setValue( imath.Color4f( 0.964699984, 0.57249999, 0.114, 1 ) )
__children["Text_Target"]["text"].setValue( 'Resolution tweak plug' )
__children["Text_Target"]["size"].setValue( imath.V2i( 12, 12 ) )
__children["Text_Target"]["area"].setValue( imath.Box2i( imath.V2i( 0, 0 ), imath.V2i( 200, 100 ) ) )
__children["Text_Target"]["transform"]["translate"].setValue( imath.V2f( 36, 134 ) )
__children["Text_Target"]["transform"]["translate"].setValue( imath.V2f( 36, 114 ) )
__children["Text_Target"]["__uiPosition"].setValue( imath.V2f( -5.89711571, 5.23593521 ) )
__children["Rectangle_NamePlug"]["in"].setInput( __children["Text_Target"]["out"] )
__children["Rectangle_NamePlug"]["color"].setValue( imath.Color4f( 0, 0.862699986, 0, 1 ) )
__children["Rectangle_NamePlug"]["area"].setValue( imath.Box2f( imath.V2f( 10, 296 ), imath.V2f( 160, 315 ) ) )
__children["Rectangle_NamePlug"]["area"].setValue( imath.Box2f( imath.V2f( 10, 274 ), imath.V2f( 160, 294 ) ) )
__children["Rectangle_NamePlug"]["lineWidth"].setValue( 2.0 )
__children["Rectangle_NamePlug"]["cornerRadius"].setValue( 4.0 )
__children["Rectangle_NamePlug"]["__uiPosition"].setValue( imath.V2f( -5.89711571, -2.92812729 ) )
__children["Rectangle_SwitchPlug"]["in"].setInput( __children["Rectangle_NamePlug"]["out"] )
__children["Rectangle_SwitchPlug"]["color"].setValue( imath.Color4f( 0, 0.862699986, 0, 1 ) )
__children["Rectangle_SwitchPlug"]["area"].setValue( imath.Box2f( imath.V2f( 165, 294 ), imath.V2f( 186, 316 ) ) )
__children["Rectangle_SwitchPlug"]["area"].setValue( imath.Box2f( imath.V2f( 165, 274 ), imath.V2f( 186, 294 ) ) )
__children["Rectangle_SwitchPlug"]["lineWidth"].setValue( 2.0 )
__children["Rectangle_SwitchPlug"]["cornerRadius"].setValue( 4.0 )
__children["Rectangle_SwitchPlug"]["__uiPosition"].setValue( imath.V2f( -5.89711666, -11.0921898 ) )
__children["Rectangle_ModePlug"]["in"].setInput( __children["Rectangle_SwitchPlug"]["out"] )
__children["Rectangle_ModePlug"]["color"].setValue( imath.Color4f( 0, 0.862699986, 0, 1 ) )
__children["Rectangle_ModePlug"]["area"].setValue( imath.Box2f( imath.V2f( 195, 296 ), imath.V2f( 297, 315 ) ) )
__children["Rectangle_ModePlug"]["area"].setValue( imath.Box2f( imath.V2f( 195, 274 ), imath.V2f( 297, 294 ) ) )
__children["Rectangle_ModePlug"]["lineWidth"].setValue( 2.0 )
__children["Rectangle_ModePlug"]["cornerRadius"].setValue( 4.0 )
__children["Rectangle_ModePlug"]["__uiPosition"].setValue( imath.V2f( -5.89711666, -19.2562523 ) )
__children["Rectangle_xPlug"]["in"].setInput( __children["Rectangle_ModePlug"]["out"] )
__children["Rectangle_xPlug"]["color"].setValue( imath.Color4f( 0, 0.862699986, 0, 1 ) )
__children["Rectangle_xPlug"]["area"]["min"]["y"].setValue( 296.0 )
__children["Rectangle_xPlug"]["area"]["max"]["y"].setValue( 315.0 )
__children["Rectangle_xPlug"]["area"]["min"]["x"].setInput( __children["Expression3"]["__out"]["p1"] )
__children["Rectangle_xPlug"]["area"]["max"]["x"].setInput( __children["Expression3"]["__out"]["p0"] )
__children["Rectangle_xPlug"]["area"].setValue( imath.Box2f( imath.V2f( 303, 274 ), imath.V2f( 382, 294 ) ) )
__children["Rectangle_xPlug"]["lineWidth"].setValue( 2.0 )
__children["Rectangle_xPlug"]["cornerRadius"].setValue( 4.0 )
__children["Rectangle_xPlug"]["__uiPosition"].setValue( imath.V2f( -5.89711475, -27.4203148 ) )
__children["Rectangle_yPlug"]["in"].setInput( __children["Rectangle_xPlug"]["out"] )
__children["Rectangle_yPlug"]["color"].setValue( imath.Color4f( 0, 0.862699986, 0, 1 ) )
__children["Rectangle_yPlug"]["area"]["min"]["y"].setValue( 296.0 )
__children["Rectangle_yPlug"]["area"]["max"]["y"].setValue( 315.0 )
__children["Rectangle_yPlug"]["area"]["min"]["x"].setInput( __children["Expression3"]["__out"]["p3"] )
__children["Rectangle_yPlug"]["area"]["max"]["x"].setInput( __children["Expression3"]["__out"]["p2"] )
__children["Rectangle_yPlug"]["area"].setValue( imath.Box2f( imath.V2f( 387, 274 ), imath.V2f( 466, 294 ) ) )
__children["Rectangle_yPlug"]["lineWidth"].setValue( 2.0 )
__children["Rectangle_yPlug"]["cornerRadius"].setValue( 4.0 )
__children["Rectangle_yPlug"]["__uiPosition"].setValue( imath.V2f( -5.89711571, -35.5843773 ) )
Expand All @@ -261,7 +246,7 @@ __children["Text_Mouse"]["area"].setValue( imath.Box2i( imath.V2i( 0, 0 ), imath
__children["Text_Mouse"]["transform"]["translate"].setValue( imath.V2f( 34, -10 ) )
__children["Text_Mouse"]["__uiPosition"].setValue( imath.V2f( 19.9692574, 17.7932549 ) )
__children["ImageTransform_Mouse"]["in"].setInput( __children["Text_Mouse"]["out"] )
__children["ImageTransform_Mouse"]["transform"]["translate"].setValue( imath.V2f( 245, 273 ) )
__children["ImageTransform_Mouse"]["transform"]["translate"].setValue( imath.V2f( 245, 253 ) )
__children["ImageTransform_Mouse"]["__uiPosition"].setValue( imath.V2f( 19.9692574, 9.62919235 ) )
__children["ImageReader_Menu"]["colorSpace"].setValue( 'scene_linear' )
__children["ImageReader_Menu"]["__uiPosition"].setValue( imath.V2f( 37.2813721, 12.4466572 ) )
Expand Down Expand Up @@ -326,15 +311,12 @@ __children["FormatQuery"]["image"].setInput( __children["ImageReader_Editor"]["o
__children["FormatQuery"]["__uiPosition"].setValue( imath.V2f( -23.0343342, 38.6640587 ) )
__children["Expression"]["__in"]["p0"].setInput( __children["FormatQuery"]["size"]["x"] )
__children["Expression"]["__uiPosition"].setValue( imath.V2f( -19.5150433, 21.8856544 ) )
__children["Expression3"]["__uiPosition"].setValue( imath.V2f( -16.9547501, -31.2469463 ) )
__children["FormatQuery1"]["image"].setInput( __children["ImageReader_Menu"]["out"] )
__children["FormatQuery1"]["__uiPosition"].setValue( imath.V2f( 47.2975578, 4.28259468 ) )
__children["Expression2"]["__engine"].setValue( 'python' )
__children["Expression2"]["__expression"].setValue( 'import imath\n\ndisplayWindow = parent["__in"]["p1"]\nfullDisplayWindow = parent["__in"]["p0"]\n\noffset = 64\nx = ( fullDisplayWindow.width() ) + offset\ny = ( fullDisplayWindow.height() - displayWindow.height() ) / 2\n\nparent["__out"]["p0"] = imath.V2f( x, y )' )
__children["Expression"]["__engine"].setValue( 'OSL' )
__children["Expression"]["__expression"].setValue( 'int width = parent.__in.p0;\nparent.__out.p0 = width - 7;\n_disconnectedFloat = width - 11;' )
__children["Expression3"]["__engine"].setValue( 'python' )
__children["Expression3"]["__expression"].setValue( 'import sys\n\nplugWidth = 79 if sys.platform == "win32" else 89\nxPlugX = 303\nparent["__out"]["p1"] = xPlugX\nparent["__out"]["p0"] = xPlugX + plugWidth\n\nyPlugX = xPlugX + plugWidth + 5\nparent["__out"]["p3"] = yPlugX\nparent["__out"]["p2"] = yPlugX + plugWidth' )


del __children
Expand Down

0 comments on commit cd9e06b

Please sign in to comment.