fixup! ColorChooser : Maintain options state per-session

python/GafferUI/ColorChooser.py

@@ -567,9 +567,9 @@ def __init__( self, color=imath.Color3f( 1 ), **kw ) :
 				self.__colorSwatch._qtWidget().setFixedHeight( 40 )
 
 		self.__colorChangedSignal = Gaffer.Signals.Signal2()
-		self.__visibleComponentsChangedSignal = Gaffer.Signals.Signal2()
-		self.__staticComponentChangedSignal = Gaffer.Signals.Signal2()
-		self.__colorFieldVisibleChangedSignal = Gaffer.Signals.Signal2()
+		self.__visibleComponentsChangedSignal = Gaffer.Signals.Signal1()
+		self.__staticComponentChangedSignal = Gaffer.Signals.Signal1()
+		self.__colorFieldVisibleChangedSignal = Gaffer.Signals.Signal1()
 
 		self.__updateUIFromColor()
 		self.__activateComponentIcons()
@@ -636,7 +636,7 @@ def setColorFieldStaticComponent( self, component ) :
 		if self.__colorField.getVisible() :
 			self.__activateComponentIcons()
 
-		self.__staticComponentChangedSignal( self, component )
+		self.__staticComponentChangedSignal( self )
 
 	def getColorFieldStaticComponent( self ) :
 
@@ -661,23 +661,23 @@ def colorChangedSignal( self ) :
 		return self.__colorChangedSignal
 
 	## A signal emitted whenever the visible components are changed. Slots
-	# should have the signature slot( ColorChooser, visibleComponents ).
+	# should have the signature slot( ColorChooser ).
 	# `visibleComponents` is a string representing the components currently
 	# visible.
 	def visibleComponentsChangedSignal( self ) :
 
 		return self.__visibleComponentsChangedSignal
 
 	## A signal emitted whenver the static component is changed. Slots
-	# should have the signature slot( ColorChooser, staticComponent ).
+	# should have the signature slot( ColorChooser ).
 	# `staticComponent` is a single character string representing the
 	# current static component.
 	def staticComponentChangedSignal( self ) :
 
 		return self.__staticComponentChangedSignal
 
 	## A signal emitted whenever the visibility of the color field changes.
-	# Slots should have the signature slot( ColorChooser, visible ).
+	# Slots should have the signature slot( ColorChooser ).
 	# `visible` is a boolean representing the current visibility.
 	def colorFieldVisibleChangedSignal( self ) :
 
@@ -1003,7 +1003,7 @@ def __setVisibleComponentsInternal( self, components ) :
 			self.__numericWidgets[c].setVisible( visible )
 			self.__sliders[c].setVisible( visible )
 
-		self.__visibleComponentsChangedSignal( self, components )
+		self.__visibleComponentsChangedSignal( self )
 
 	def __setColorFieldVisibleInternal( self, visible ) :
 
@@ -1017,4 +1017,4 @@ def __setColorFieldVisibleInternal( self, visible ) :
 		else :
 			self.__clearComponentIcons()
 
-		self.__colorFieldVisibleChangedSignal( self, visible )
+		self.__colorFieldVisibleChangedSignal( self )

python/GafferUI/ColorChooserPlugValueWidget.py

@@ -69,22 +69,13 @@ def __init__( self, plugs, **kw ) :
 		)
 
 		self.__colorChooser.visibleComponentsChangedSignal().connect(
-			functools.partial(
-				Gaffer.WeakMethod( self.__colorChooserOptionChanged ),
-				key = "visibleComponents"
-			)
+			functools.partial( Gaffer.WeakMethod( self.__colorChooserVisibleComponentsChanged ) )
 		)
 		self.__colorChooser.staticComponentChangedSignal().connect(
-			functools.partial(
-				Gaffer.WeakMethod( self.__colorChooserOptionChanged ),
-				key = "staticComponent"
-			)
+			functools.partial( Gaffer.WeakMethod( self.__colorChooserStaticComponentChanged ) )
 		)
 		self.__colorChooser.colorFieldVisibleChangedSignal().connect(
-			functools.partial(
-				Gaffer.WeakMethod( self.__colorChooserOptionChanged ),
-				key = "colorFieldVisible"
-			)
+			functools.partial( Gaffer.WeakMethod( self.__colorChooserColorFieldVisibleChanged ) )
 		)
 
 		self.__lastChangedReason = None
@@ -123,7 +114,7 @@ def __colorChanged( self, colorChooser, reason ) :
 				for plug in self.getPlugs() :
 					plug.setValue( self.__colorChooser.getColor() )
 
-	def __colorChooserOptionChanged( self, colorChooser, value, key ) :
+	def __colorChooserOptionChanged( self, value, key ) :
 
 		if Gaffer.Metadata.value( "colorChooser:inlineOptions", "userDefault" ) is None :
 			sessionOptions = Gaffer.Metadata.value( "colorChooser:inlineOptions", "sessionDefault" )
@@ -141,6 +132,18 @@ def __colorChooserOptionChanged( self, colorChooser, value, key ) :
 
 			plugOptions.update( { key: value } )
 
+	def __colorChooserVisibleComponentsChanged( self, colorChooser ) :
+
+		self.__colorChooserOptionChanged( colorChooser.getVisibleComponents(), "visibleComponents" )
+
+	def __colorChooserStaticComponentChanged( self, colorChooser ) :
+
+		self.__colorChooserOptionChanged( colorChooser.getColorFieldStaticComponent(), "staticComponent" )
+
+	def __colorChooserColorFieldVisibleChanged( self, colorChooser ) :
+
+		self.__colorChooserOptionChanged( colorChooser.getColorFieldVisible(), "colorFieldVisible" )
+
 	def __colorChooserOptions( self ) :
 
 		v = sole( Gaffer.Metadata.value( p, "colorChooser:inlineOptions" ) for p in self.getPlugs() )

python/GafferUI/ColorSwatchPlugValueWidget.py

@@ -138,22 +138,13 @@ def __init__( self, plugs, parentWindow ) :
 		self.__colorChangedConnection = self.colorChooser().colorChangedSignal().connect( Gaffer.WeakMethod( self.__colorChanged ) )
 
 		self.colorChooser().visibleComponentsChangedSignal().connect(
-			functools.partial(
-				Gaffer.WeakMethod( self.__colorChooserOptionChanged ),
-				key = "visibleComponents"
-			)
+			functools.partial( Gaffer.WeakMethod( self.__colorChooserVisibleComponentsChanged ) )
 		)
 		self.colorChooser().staticComponentChangedSignal().connect(
-			functools.partial(
-				Gaffer.WeakMethod( self.__colorChooserOptionChanged ),
-				key = "staticComponent"
-			)
+			functools.partial( Gaffer.WeakMethod( self.__colorChooserStaticComponentChanged ) )
 		)
 		self.colorChooser().colorFieldVisibleChangedSignal().connect(
-			functools.partial(
-				Gaffer.WeakMethod( self.__colorChooserOptionChanged ),
-				key = "colorFieldVisible"
-			)
+			functools.partial( Gaffer.WeakMethod( self.__colorChooserColorFieldVisibleChanged ) )
 		)
 
 		self.confirmButton.clickedSignal().connect( Gaffer.WeakMethod( self.__buttonClicked ) )
@@ -253,7 +244,7 @@ def __destroy( self, *unused ) :
 	# \todo Extract these two methods to share with `ColorChooserPlugValueWidget` which has
 	# an almost identical implementation.
 
-	def __colorChooserOptionChanged( self, colorChooser, value, key ) :
+	def __colorChooserOptionChanged( self, value, key ) :
 
 		if Gaffer.Metadata.value( "colorChooser:dialogueOptions", "userDefault" ) is None :
 			sessionOptions = Gaffer.Metadata.value( "colorChooser:dialogueOptions", "sessionDefault" )
@@ -271,6 +262,18 @@ def __colorChooserOptionChanged( self, colorChooser, value, key ) :
 
 			plugOptions.update( { key: value } )
 
+	def __colorChooserVisibleComponentsChanged( self, colorChooser ) :
+
+		self.__colorChooserOptionChanged( colorChooser.getVisibleComponents(), "visibleComponents" )
+
+	def __colorChooserStaticComponentChanged( self, colorChooser ) :
+
+		self.__colorChooserOptionChanged( colorChooser.getColorFieldStaticComponent(), "staticComponent" )
+
+	def __colorChooserColorFieldVisibleChanged( self, colorChooser ) :
+
+		self.__colorChooserOptionChanged( colorChooser.getColorFieldVisible(), "colorFieldVisible" )
+
 	def __colorChooserOptions( self ) :
 
 		v = sole( Gaffer.Metadata.value( p, "colorChooser:dialogueOptions" ) for p in self.__plugs )