From 931eae170071e6e4c559bc1ba59247f960b220cd Mon Sep 17 00:00:00 2001 From: Eric Mehl Date: Wed, 2 Oct 2024 12:52:19 -0400 Subject: [PATCH] fixup! ColorChooser : Maintain options state per-session --- python/GafferUITest/ColorChooserTest.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/python/GafferUITest/ColorChooserTest.py b/python/GafferUITest/ColorChooserTest.py index d00150dbed..4ae67649d1 100644 --- a/python/GafferUITest/ColorChooserTest.py +++ b/python/GafferUITest/ColorChooserTest.py @@ -132,6 +132,7 @@ def testMetadata( self ) : script["node"]["rgbPlug2"] = Gaffer.Color3fPlug( flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic ) widget = GafferUI.ColorPlugValueWidget( script["node"]["rgbPlug1"] ) + widget.setColorChooserVisible( True ) # Default state @@ -171,6 +172,7 @@ def testMetadata( self ) : del widget widget = GafferUI.ColorPlugValueWidget( script["node"]["rgbPlug1"] ) + widget.setColorChooserVisible( True ) for c in "rgbtmi" : self.assertTrue( self.__sliderFromWidget( widget, c ).getVisible() ) @@ -183,6 +185,7 @@ def testMetadata( self ) : # gets the original defaults. widget2 = GafferUI.ColorPlugValueWidget( script["node"]["rgbPlug2"] ) + widget2.setColorChooserVisible( True ) for c in "rgbhsvtmi" : self.assertTrue( self.__sliderFromWidget( widget2, c ).getVisible() ) @@ -202,6 +205,7 @@ def testMetadata( self ) : script2.execute( script.serialise() ) widget = GafferUI.ColorPlugValueWidget( script2["node"]["rgbPlug1"] ) + widget.setColorChooserVisible( True ) for c in "rgbhsvtmi" : self.assertTrue( self.__sliderFromWidget( widget, c ).getVisible() ) @@ -223,7 +227,9 @@ def testSaveDefaultOptions( self ) : script["node"]["rgbaPlug"].setValue( imath.Color4f( 0.1 ) ) rgbWidget = GafferUI.ColorPlugValueWidget( script["node"]["rgbPlug"] ) + rgbWidget.setColorChooserVisible( True ) rgbaWidget = GafferUI.ColorPlugValueWidget( script["node"]["rgbaPlug"] ) + rgbaWidget.setColorChooserVisible( True ) GafferUITest.PlugValueWidgetTest.waitForUpdate( rgbWidget._ColorPlugValueWidget__colorChooser ) GafferUITest.PlugValueWidgetTest.waitForUpdate( rgbaWidget._ColorPlugValueWidget__colorChooser ) @@ -253,7 +259,9 @@ def testSaveDefaultOptions( self ) : # Both color types get the same value rgbWidget = GafferUI.ColorPlugValueWidget( script["node"]["rgbPlug"] ) + rgbWidget.setColorChooserVisible( True ) rgbaWidget = GafferUI.ColorPlugValueWidget( script["node"]["rgbaPlug"] ) + rgbaWidget.setColorChooserVisible( True ) GafferUITest.PlugValueWidgetTest.waitForUpdate( rgbWidget._ColorPlugValueWidget__colorChooser ) GafferUITest.PlugValueWidgetTest.waitForUpdate( rgbaWidget._ColorPlugValueWidget__colorChooser )