Adding getPresets() and deprecating presets() function.

Lucio Moser · Lucio Moser · commit 5a6a7e1161a7 · 2013-08-26T14:52:07.000-07:00
diff --git a/include/IECore/CompoundParameter.h b/include/IECore/CompoundParameter.h
@@ -71,12 +71,14 @@ class CompoundParameter : public Parameter
 		/// of all the child objects.
 		/// \threading It is not safe to call this from multiple concurrent threads.
 		virtual const Object *defaultValue() const;
+		/// \deprecated Use getPresets instead.
+		virtual const PresetsContainer &presets() const;
 		/// If true was passed to adoptChildPresets at construction, then update the presets
 		/// with the intersection of the presets of all the child parameters, otherwise returns
 		/// an empty container or the presets defined by setPresets(). 
 		/// Please note that the map returned may differ between one call
 		/// to presets() and the next.
-		virtual const PresetsContainer &presets() const;
+		virtual const PresetsContainer &getPresets() const;
 		/// Defines presets for this Parameter.
 		/// Throws an exception if true was passed to adoptChildPresets at construction.
 		virtual void setPresets( const PresetsContainer &presets );
diff --git a/include/IECore/Parameter.h b/include/IECore/Parameter.h
@@ -78,8 +78,10 @@ class Parameter : public RunTimeTyped
 		const std::string &description() const;
 		/// Returns the default value for this parameter.
 		virtual const Object *defaultValue() const;
-		/// Returns the presets for this parameter.
+		/// \deprecated Use getPresets instead.
 		virtual const PresetsContainer &presets() const;
+		/// Returns the presets for this parameter.
+		virtual const PresetsContainer &getPresets() const;
 		/// Overrides the presets for this parameter.
 		virtual void setPresets( const PresetsContainer &presets );
 		/// Returns true if this parameter only accepts
diff --git a/src/IECore/CompoundParameter.cpp b/src/IECore/CompoundParameter.cpp
@@ -73,27 +73,32 @@ const Object *CompoundParameter::defaultValue() const
 }
 
 const Parameter::PresetsContainer &CompoundParameter::presets() const
+{
+	return getPresets();
+}
+
+const Parameter::PresetsContainer &CompoundParameter::getPresets() const
 {
 	if( !m_adoptChildPresets )
 	{
-		return Parameter::presets();
+		return Parameter::getPresets();
 	}
 
 	// naughty? nah! it gives the right semantics to an outside observer
-	PresetsContainer &pr = const_cast<PresetsContainer &>( Parameter::presets() );
+	PresetsContainer &pr = const_cast<PresetsContainer &>( Parameter::getPresets() );
 	pr.clear();
 	if( !m_namesToParameters.size() )
 	{
 		return pr;
 	}
 
 	// get a references for each child preset map.
-	// we only want to call presets() once for
+	// we only want to call getPresets() once for
 	// each child as the map returned may change between calls.
 	vector<const PresetsContainer *> childPresets;
 	for( size_t i=0; i<m_parameters.size(); i++ )
 	{
-		childPresets.push_back( &(m_parameters[i]->presets()) );
+		childPresets.push_back( &(m_parameters[i]->getPresets()) );
 	}
 	
 	// find the intersection of all the child preset names
diff --git a/src/IECore/Parameter.cpp b/src/IECore/Parameter.cpp
@@ -92,6 +92,11 @@ const Object *Parameter::defaultValue() const
 }
 
 const Parameter::PresetsContainer &Parameter::presets() const
+{
+	return getPresets();
+}
+
+const Parameter::PresetsContainer &Parameter::getPresets() const
 {
 	return m_presets;
 }
@@ -150,7 +155,7 @@ bool Parameter::valueValid( const Object *value, std::string *reason ) const
 	{
 		return true;
 	}
-	const PresetsContainer &pr = presets();
+	const PresetsContainer &pr = getPresets();
 	for( PresetsContainer::const_iterator it = pr.begin(); it!=pr.end(); it++ )
 	{
 		if( it->second->isEqualTo( value ) )
@@ -206,7 +211,7 @@ void Parameter::setValidatedValue( ObjectPtr value )
 
 void Parameter::setValue( const std::string &presetName )
 {
-	const PresetsContainer &pr = presets();
+	const PresetsContainer &pr = getPresets();
 	
 	PresetsContainer::const_iterator it;
 	for( it=pr.begin(); it != pr.end(); it++ )
@@ -256,7 +261,7 @@ std::string Parameter::getCurrentPresetName() const
 	// didn't have to do a copy of the value. but that breaks with CompoundParameter
 	// as it builds the value dynamically in getValue().
 	const Object *currentValue = getValue();
-	const PresetsContainer &pr = presets();
+	const PresetsContainer &pr = getPresets();
 	PresetsContainer::const_iterator it;
 	for( it=pr.begin(); it!=pr.end(); it++ )
 	{
diff --git a/src/IECoreMaya/FromMayaMeshConverter.cpp b/src/IECoreMaya/FromMayaMeshConverter.cpp
@@ -601,10 +601,10 @@ IECore::PrimitivePtr FromMayaMeshConverter::doPrimitiveConversion( MFnMesh &fnMe
 			unsigned int interpolationIndex = interpolationPlug.asInt(MDGContext::fsNormal, &st);
 			if ( st )
 			{
-				if ( interpolationIndex < m_interpolation->presets().size() - 1 )
+				if ( interpolationIndex < m_interpolation->getPresets().size() - 1 )
 				{
 					// convert interpolation index to the preset value
-					interpolation = staticPointerCast< StringData >( m_interpolation->presets()[interpolationIndex].second )->readable();
+					interpolation = staticPointerCast< StringData >( m_interpolation->getPresets()[interpolationIndex].second )->readable();
 				}
 				else
 				{
diff --git a/src/IECoreMaya/ToMayaMeshConverter.cpp b/src/IECoreMaya/ToMayaMeshConverter.cpp
@@ -495,7 +495,7 @@ bool ToMayaMeshConverter::setMeshInterpolationAttribute( MObject &object, std::s
 	int interpolationValue = 0;
 
 	FromMayaMeshConverter fromMaya(object);
-	const IECore::Parameter::PresetsContainer &presets = fromMaya.interpolationParameter()->presets();
+	const IECore::Parameter::PresetsContainer &presets = fromMaya.interpolationParameter()->getPresets();
 	IECore::Parameter::PresetsContainer::const_iterator it;
 
 	if ( interpolation != "default" )
diff --git a/src/IECoreNuke/PresetsOnlyParameterHandler.cpp b/src/IECoreNuke/PresetsOnlyParameterHandler.cpp
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////
 //
-//  Copyright (c) 2010-2011, Image Engine Design Inc. All rights reserved.
+//  Copyright (c) 2010-2013, Image Engine Design Inc. All rights reserved.
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are
@@ -49,7 +49,8 @@ void PresetsOnlyParameterHandler::knobs( const IECore::Parameter *parameter, con
 	if( f.makeKnobs() )
 	{
 		m_names.clear();
-		for( Parameter::PresetsContainer::const_iterator it = parameter->presets().begin(); it!=parameter->presets().end(); it++ )
+		const Parameter::PresetsContainer &presets = parameter->getPresets();
+		for( Parameter::PresetsContainer::const_iterator it = presets.begin(); it!=presets.end(); it++ )
 		{
 			if( it->second->isEqualTo( parameter->defaultValue() ) )
 			{
@@ -79,12 +80,12 @@ void PresetsOnlyParameterHandler::setParameterValue( IECore::Parameter *paramete
 	{
 		presetIndex = (int)m_knob->get_value();
 	}
-	parameter->setValue( parameter->presets()[m_storage].second );
+	parameter->setValue( parameter->getPresets()[m_storage].second );
 }
 
 void PresetsOnlyParameterHandler::setKnobValue( const IECore::Parameter *parameter )
 {
-	const Parameter::PresetsContainer &presets = parameter->presets();
+	const Parameter::PresetsContainer &presets = parameter->getPresets();
 	std::string currentPresetName = parameter->getCurrentPresetName();
 	size_t presetIndex = 0;
 	for( Parameter::PresetsContainer::const_iterator it = presets.begin(); it!=presets.end(); it++, presetIndex++ )
diff --git a/src/IECorePython/ParameterBinding.cpp b/src/IECorePython/ParameterBinding.cpp
@@ -75,10 +75,10 @@ static void validate( Parameter &that, ObjectPtr value )
 	that.validate( value.get() );
 }
 
-static dict presets( Parameter &that )
+static dict getPresets( Parameter &that )
 {
 	dict result;
-	const Parameter::PresetsContainer &p = that.presets();
+	const Parameter::PresetsContainer &p = that.getPresets();
 	for( Parameter::PresetsContainer::const_iterator it=p.begin(); it!=p.end(); it++ )
 	{
 		result[it->first] = it->second->copy();
@@ -94,7 +94,7 @@ static void setPresets( Parameter &p, const object &presets )
 static boost::python::tuple presetNames( const Parameter &that )
 {
 	boost::python::list result;
-	const Parameter::PresetsContainer &p = that.presets();
+	const Parameter::PresetsContainer &p = that.getPresets();
 	for( Parameter::PresetsContainer::const_iterator it=p.begin(); it!=p.end(); it++ )
 	{
 		result.append( it->first );
@@ -105,7 +105,7 @@ static boost::python::tuple presetNames( const Parameter &that )
 static boost::python::tuple presetValues( const Parameter &that )
 {
 	boost::python::list result;
-	const Parameter::PresetsContainer &p = that.presets();
+	const Parameter::PresetsContainer &p = that.getPresets();
 	for( Parameter::PresetsContainer::const_iterator it=p.begin(); it!=p.end(); it++ )
 	{
 		result.append( it->second->copy() );
@@ -166,7 +166,8 @@ void bindParameter()
 		.def( "validate", (void (Parameter::*)() const)&Parameter::validate )
 		.def( "validate", &validate )
 		.add_property( "presetsOnly", &Parameter::presetsOnly )
-		.def( "presets", &presets, "Returns a dictionary containing presets for the parameter." )
+		.def( "presets", &getPresets, "Deprecated function. Use getPresets() instead." )
+		.def( "getPresets", &getPresets, "Returns a dictionary containing presets for the parameter." )
 		.def( "setPresets", &setPresets, "Sets the presets for the parameter from a dictionary." )
 		.def( "presetNames", &presetNames, "Returns a tuple containing the names of all presets for the parameter." )
 		.def( "presetValues", &presetValues, "Returns a tuple containing the values of all presets for the parameter." )
diff --git a/test/IECore/CompoundParameterTest.py b/test/IECore/CompoundParameterTest.py
@@ -179,7 +179,7 @@ def testPresets( self ) :
 
 		self.assertEqual( p.presetsOnly, True )
 
-		pr = p.presets()
+		pr = p.getPresets()
 		self.assertEqual( len( pr ), 3 )
 		self.assert_( "one" in pr.keys() )
 		self.assert_( "two" in pr.keys() )
@@ -221,7 +221,7 @@ def testPresets( self ) :
 		)
 
 		self.assertEqual( p.presetsOnly, False )
-		self.assertEqual( len( p.presets() ), 0 )
+		self.assertEqual( len( p.getPresets() ), 0 )
 
 	def testLateValidation( self ) :
 
@@ -347,18 +347,18 @@ def testAddParametersPresets( self ) :
 			members = []
 		)
 
-		self.assertEqual( p.presets(), {} )
+		self.assertEqual( p.getPresets(), {} )
 
 		p.addParameter( IntParameter( name = "i", description = "d", defaultValue = 10, presets = ( ( "one", 1 ), ( "two", 2 ) ) ) )
 
-		self.assertEqual( len( p.presets() ), 2 )
-		self.assertEqual( p.presets(), { "one" : CompoundObject( { "i" : IntData( 1 ) } ), "two" : CompoundObject( { "i" : IntData( 2 ) } ) } )
+		self.assertEqual( len( p.getPresets() ), 2 )
+		self.assertEqual( p.getPresets(), { "one" : CompoundObject( { "i" : IntData( 1 ) } ), "two" : CompoundObject( { "i" : IntData( 2 ) } ) } )
 
 		fParam = FloatParameter( name = "f", description = "d", defaultValue = 20, presets = ( ( "one", 1 ), ) )
 		p.addParameter( fParam )
 
-		self.assertEqual( len( p.presets() ), 1 )
-		self.assertEqual( p.presets(), { "one" : CompoundObject( { "i" : IntData( 1 ), "f" : FloatData( 1 ) } ) } )
+		self.assertEqual( len( p.getPresets() ), 1 )
+		self.assertEqual( p.getPresets(), { "one" : CompoundObject( { "i" : IntData( 1 ), "f" : FloatData( 1 ) } ) } )
 
 		p.insertParameter( IntParameter( name = "x", description = "x", defaultValue = 10 ), fParam )
 		self.assertEqual( p.keys(), [ "i", "x", "f" ] )
@@ -587,7 +587,7 @@ def testAdoptChildPresets( self ) :
 			],
 		)
 		
-		self.assertEqual( len( c.presets() ), 2 )
+		self.assertEqual( len( c.getPresets() ), 2 )
 		self.assertEqual( c.presetsOnly, True )
 		
 		# no adoption of presets
@@ -619,7 +619,7 @@ def testAdoptChildPresets( self ) :
 			adoptChildPresets = False,
 		)
 		
-		self.assertEqual( len( c.presets() ), 0 )
+		self.assertEqual( len( c.getPresets() ), 0 )
 		self.assertEqual( c.presetsOnly, False )
 		
 		# no adoption of presets without use of keyword parameters
@@ -653,7 +653,7 @@ def testAdoptChildPresets( self ) :
 			False,
 		)
 		
-		self.assertEqual( len( c.presets() ), 0 )
+		self.assertEqual( len( c.getPresets() ), 0 )
 		self.assertEqual( c.presetsOnly, False )
 		self.assertEqual( c.userData()["ud"].value, 10 )
 
@@ -672,11 +672,11 @@ def testAdoptChildPresets( self ) :
 				( "p2", p2 ),
 			]
 		)
-		pr = c.presets()
+		pr = c.getPresets()
 		self.assertEqual( len( pr ), 2 )
 		self.assertEqual( pr["p1"], p1 )
 		self.assertEqual( pr["p2"], p2 )
-		self.assertEqual( c.presetNames(), [ "p1", "p2" ] )
+		self.assertEqual( c.presetNames(), ( "p1", "p2" ) )
 		c.setValue("p1")
 		self.assertEqual( c.getValue(), p1 )
 		c.setValue("p2")
diff --git a/test/IECore/EXRImageWriter.py b/test/IECore/EXRImageWriter.py
@@ -223,11 +223,11 @@ def testCompressionParameter( self ):
 		img = r.read()
 
 		w = Writer.create( img, "test/IECore/data/exrFiles/output.exr" )
-		w['compression'].setValue( w['compression'].presets()['zip'] )
+		w['compression'].setValue( w['compression'].getPresets()['zip'] )
 		w.write()
 
 		w = EXRImageWriter()
-		w['compression'].setValue( w['compression'].presets()['zip'] )
+		w['compression'].setValue( w['compression'].getPresets()['zip'] )
 
 	def testBlindDataToHeader( self ) :
 
diff --git a/test/IECore/Parameters.py b/test/IECore/Parameters.py
@@ -98,7 +98,7 @@ def testPresets( self ) :
 			presetsOnly = True,
 		)
 
-		pr = p.presets()
+		pr = p.getPresets()
 		self.assertEqual( len( pr ), 4 )
 		self.assertEqual( pr["p1"], FloatData( 40 ) )
 		self.assertEqual( pr["p2"], IntData( 60 ) )
@@ -127,7 +127,7 @@ def testPresets( self ) :
 			presetsOnly = True,
 		)
 
-		pr = p.presets()
+		pr = p.getPresets()
 		self.assertEqual( len( pr ), 4 )
 		self.assertEqual( pr["p1"], FloatData( 40 ) )
 		self.assertEqual( pr["p2"], IntData( 60 ) )
@@ -137,15 +137,15 @@ def testPresets( self ) :
 		# overriding presets
 
 		p.setPresets( [] )
-		self.assertEqual( p.presets(), dict() )
+		self.assertEqual( p.getPresets(), dict() )
 
 		p.setPresets(
 			[
 				( "p5", FloatData( 40 ) ),
 				( "p1", IntData( 60 ) ),
 			]
 		)
-		pr = p.presets()
+		pr = p.getPresets()
 		self.assertEqual( len( pr ), 2 )
 		self.assertEqual( pr["p5"], FloatData( 40 ) )
 		self.assertEqual( pr["p1"], IntData( 60 ) )
@@ -315,7 +315,7 @@ def testPresets( self ) :
 			)
 		)
 
-		pr = p.presets()
+		pr = p.getPresets()
 		self.assertEqual( len( pr ), 3 )
 		self.assertEqual( pr["one"], IntData( 1 ) )
 		self.assertEqual( pr["two"], IntData( 2 ) )
@@ -328,7 +328,7 @@ def testPresets( self ) :
 				( "one", IntData( 1 ) ),
 			]
 		)
-		pr = p.presets()
+		pr = p.getPresets()
 		self.assertEqual( len( pr ), 2 )
 		self.assertEqual( pr["four"], IntData( 4 ) )
 		self.assertEqual( pr["one"], IntData( 1 ) )
@@ -421,7 +421,7 @@ def testPresets( self ) :
 			presetsOnly = True,
 		)
 
-		pr = p.presets()
+		pr = p.getPresets()
 		self.assertEqual( len( pr ), 3 )
 		self.assertEqual( pr["one"], V3fData( V3f( 1 ) ) )
 		self.assertEqual( pr["two"], V3fData( V3f( 2 ) ) )
@@ -437,7 +437,7 @@ def testPresets( self ) :
 				( "one", V3fData( V3f(1) ) ),
 			]
 		)
-		pr = p.presets()
+		pr = p.getPresets()
 		self.assertEqual( len( pr ), 2 )
 		self.assertEqual( pr["four"], V3fData( V3f(4) ) )
 		self.assertEqual( pr["one"], V3fData( V3f(1) ) )
@@ -585,7 +585,7 @@ def test( self ) :
 		p.setValue( StringData( "100" ) )
 		self.assertEqual( p.getValue(), StringData( "100" ) )
 
-		pr = p.presets()
+		pr = p.getPresets()
 		self.assertEqual( len( pr ), 2 )
 		self.assert_( "100" in pr.keys() )
 		self.assert_( "200" in pr.keys() )
@@ -831,7 +831,7 @@ def testOrderedPresets( self ) :
 				( "one", V3fData( V3f(1) ) ),
 			]
 		)
-		pr = p.presets()
+		pr = p.getPresets()
 		self.assertEqual( len( pr ), 2 )
 		self.assertEqual( pr["four"], V3fData( V3f(4) ) )
 		self.assertEqual( pr["one"], V3fData( V3f(1) ) )
@@ -881,7 +881,7 @@ def testPresets( self ) :
 			presetsOnly = True,
 		)
 
-		pr = p.presets()
+		pr = p.getPresets()
 		self.assertEqual( len( pr ), 3 )
 		self.assertEqual( pr["one"], mesh1 )
 		self.assertEqual( pr["two"], mesh2 )

Original file line number	Diff line number	Diff line change
`@@ -73,27 +73,32 @@ const Object *CompoundParameter::defaultValue() const`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`const Parameter::PresetsContainer &CompoundParameter::presets() const`
	`76`	`+{`
	`77`	`+ return getPresets();`
	`78`	`+}`
	`79`	`+`
	`80`	`+const Parameter::PresetsContainer &CompoundParameter::getPresets() const`
`76`	`81`	`{`
`77`	`82`	`if( !m_adoptChildPresets )`
`78`	`83`	`{`
`79`		`- return Parameter::presets();`
	`84`	`+ return Parameter::getPresets();`
`80`	`85`	`}`
`81`	`86`
`82`	`87`	`// naughty? nah! it gives the right semantics to an outside observer`
`83`		`- PresetsContainer &pr = const_cast<PresetsContainer &>( Parameter::presets() );`
	`88`	`+ PresetsContainer &pr = const_cast<PresetsContainer &>( Parameter::getPresets() );`
`84`	`89`	`pr.clear();`
`85`	`90`	`if( !m_namesToParameters.size() )`
`86`	`91`	`{`
`87`	`92`	`return pr;`
`88`	`93`	`}`
`89`	`94`
`90`	`95`	`// get a references for each child preset map.`
`91`		`- // we only want to call presets() once for`
	`96`	`+ // we only want to call getPresets() once for`
`92`	`97`	`// each child as the map returned may change between calls.`
`93`	`98`	`vector<const PresetsContainer *> childPresets;`
`94`	`99`	`for( size_t i=0; i<m_parameters.size(); i++ )`
`95`	`100`	`{`
`96`		`- childPresets.push_back( &(m_parameters[i]->presets()) );`
	`101`	`+ childPresets.push_back( &(m_parameters[i]->getPresets()) );`
`97`	`102`	`}`
`98`	`103`
`99`	`104`	`// find the intersection of all the child preset names`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,11 @@ const Object *Parameter::defaultValue() const`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`const Parameter::PresetsContainer &Parameter::presets() const`
	`95`	`+{`
	`96`	`+ return getPresets();`
	`97`	`+}`
	`98`	`+`
	`99`	`+const Parameter::PresetsContainer &Parameter::getPresets() const`
`95`	`100`	`{`
`96`	`101`	`return m_presets;`
`97`	`102`	`}`
`@@ -150,7 +155,7 @@ bool Parameter::valueValid( const Object value, std::string reason ) const`
`150`	`155`	`{`
`151`	`156`	`return true;`
`152`	`157`	`}`
`153`		`- const PresetsContainer &pr = presets();`
	`158`	`+ const PresetsContainer &pr = getPresets();`
`154`	`159`	`for( PresetsContainer::const_iterator it = pr.begin(); it!=pr.end(); it++ )`
`155`	`160`	`{`
`156`	`161`	`if( it->second->isEqualTo( value ) )`
`@@ -206,7 +211,7 @@ void Parameter::setValidatedValue( ObjectPtr value )`
`206`	`211`
`207`	`212`	`void Parameter::setValue( const std::string &presetName )`
`208`	`213`	`{`
`209`		`- const PresetsContainer &pr = presets();`
	`214`	`+ const PresetsContainer &pr = getPresets();`
`210`	`215`
`211`	`216`	`PresetsContainer::const_iterator it;`
`212`	`217`	`for( it=pr.begin(); it != pr.end(); it++ )`
`@@ -256,7 +261,7 @@ std::string Parameter::getCurrentPresetName() const`
`256`	`261`	`// didn't have to do a copy of the value. but that breaks with CompoundParameter`
`257`	`262`	`// as it builds the value dynamically in getValue().`
`258`	`263`	`const Object *currentValue = getValue();`
`259`		`- const PresetsContainer &pr = presets();`
	`264`	`+ const PresetsContainer &pr = getPresets();`
`260`	`265`	`PresetsContainer::const_iterator it;`
`261`	`266`	`for( it=pr.begin(); it!=pr.end(); it++ )`
`262`	`267`	`{`
Original file line number	Diff line number	Diff line change
`@@ -601,10 +601,10 @@ IECore::PrimitivePtr FromMayaMeshConverter::doPrimitiveConversion( MFnMesh &fnMe`
`601`	`601`	`unsigned int interpolationIndex = interpolationPlug.asInt(MDGContext::fsNormal, &st);`
`602`	`602`	`if ( st )`
`603`	`603`	`{`
`604`		`- if ( interpolationIndex < m_interpolation->presets().size() - 1 )`
	`604`	`+ if ( interpolationIndex < m_interpolation->getPresets().size() - 1 )`
`605`	`605`	`{`
`606`	`606`	`// convert interpolation index to the preset value`
`607`		`- interpolation = staticPointerCast< StringData >( m_interpolation->presets()[interpolationIndex].second )->readable();`
	`607`	`+ interpolation = staticPointerCast< StringData >( m_interpolation->getPresets()[interpolationIndex].second )->readable();`
`608`	`608`	`}`
`609`	`609`	`else`
`610`	`610`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`//////////////////////////////////////////////////////////////////////////`
`2`	`2`	`//`
`3`		`-// Copyright (c) 2010-2011, Image Engine Design Inc. All rights reserved.`
	`3`	`+// Copyright (c) 2010-2013, Image Engine Design Inc. All rights reserved.`
`4`	`4`	`//`
`5`	`5`	`// Redistribution and use in source and binary forms, with or without`
`6`	`6`	`// modification, are permitted provided that the following conditions are`
`@@ -49,7 +49,8 @@ void PresetsOnlyParameterHandler::knobs( const IECore::Parameter *parameter, con`
`49`	`49`	`if( f.makeKnobs() )`
`50`	`50`	`{`
`51`	`51`	`m_names.clear();`
`52`		`- for( Parameter::PresetsContainer::const_iterator it = parameter->presets().begin(); it!=parameter->presets().end(); it++ )`
	`52`	`+ const Parameter::PresetsContainer &presets = parameter->getPresets();`
	`53`	`+ for( Parameter::PresetsContainer::const_iterator it = presets.begin(); it!=presets.end(); it++ )`
`53`	`54`	`{`
`54`	`55`	`if( it->second->isEqualTo( parameter->defaultValue() ) )`
`55`	`56`	`{`
`@@ -79,12 +80,12 @@ void PresetsOnlyParameterHandler::setParameterValue( IECore::Parameter *paramete`
`79`	`80`	`{`
`80`	`81`	`presetIndex = (int)m_knob->get_value();`
`81`	`82`	`}`
`82`		`- parameter->setValue( parameter->presets()[m_storage].second );`
	`83`	`+ parameter->setValue( parameter->getPresets()[m_storage].second );`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`void PresetsOnlyParameterHandler::setKnobValue( const IECore::Parameter *parameter )`
`86`	`87`	`{`
`87`		`- const Parameter::PresetsContainer &presets = parameter->presets();`
	`88`	`+ const Parameter::PresetsContainer &presets = parameter->getPresets();`
`88`	`89`	`std::string currentPresetName = parameter->getCurrentPresetName();`
`89`	`90`	`size_t presetIndex = 0;`
`90`	`91`	`for( Parameter::PresetsContainer::const_iterator it = presets.begin(); it!=presets.end(); it++, presetIndex++ )`
Original file line number	Diff line number	Diff line change
`@@ -75,10 +75,10 @@ static void validate( Parameter &that, ObjectPtr value )`
`75`	`75`	`that.validate( value.get() );`
`76`	`76`	`}`
`77`	`77`
`78`		`-static dict presets( Parameter &that )`
	`78`	`+static dict getPresets( Parameter &that )`
`79`	`79`	`{`
`80`	`80`	`dict result;`
`81`		`- const Parameter::PresetsContainer &p = that.presets();`
	`81`	`+ const Parameter::PresetsContainer &p = that.getPresets();`
`82`	`82`	`for( Parameter::PresetsContainer::const_iterator it=p.begin(); it!=p.end(); it++ )`
`83`	`83`	`{`
`84`	`84`	`result[it->first] = it->second->copy();`
`@@ -94,7 +94,7 @@ static void setPresets( Parameter &p, const object &presets )`
`94`	`94`	`static boost::python::tuple presetNames( const Parameter &that )`
`95`	`95`	`{`
`96`	`96`	`boost::python::list result;`
`97`		`- const Parameter::PresetsContainer &p = that.presets();`
	`97`	`+ const Parameter::PresetsContainer &p = that.getPresets();`
`98`	`98`	`for( Parameter::PresetsContainer::const_iterator it=p.begin(); it!=p.end(); it++ )`
`99`	`99`	`{`
`100`	`100`	`result.append( it->first );`
`@@ -105,7 +105,7 @@ static boost::python::tuple presetNames( const Parameter &that )`
`105`	`105`	`static boost::python::tuple presetValues( const Parameter &that )`
`106`	`106`	`{`
`107`	`107`	`boost::python::list result;`
`108`		`- const Parameter::PresetsContainer &p = that.presets();`
	`108`	`+ const Parameter::PresetsContainer &p = that.getPresets();`
`109`	`109`	`for( Parameter::PresetsContainer::const_iterator it=p.begin(); it!=p.end(); it++ )`
`110`	`110`	`{`
`111`	`111`	`result.append( it->second->copy() );`
`@@ -166,7 +166,8 @@ void bindParameter()`
`166`	`166`	`.def( "validate", (void (Parameter::*)() const)&Parameter::validate )`
`167`	`167`	`.def( "validate", &validate )`
`168`	`168`	`.add_property( "presetsOnly", &Parameter::presetsOnly )`
`169`		`- .def( "presets", &presets, "Returns a dictionary containing presets for the parameter." )`
	`169`	`+ .def( "presets", &getPresets, "Deprecated function. Use getPresets() instead." )`
	`170`	`+ .def( "getPresets", &getPresets, "Returns a dictionary containing presets for the parameter." )`
`170`	`171`	`.def( "setPresets", &setPresets, "Sets the presets for the parameter from a dictionary." )`
`171`	`172`	`.def( "presetNames", &presetNames, "Returns a tuple containing the names of all presets for the parameter." )`
`172`	`173`	`.def( "presetValues", &presetValues, "Returns a tuple containing the values of all presets for the parameter." )`