ImageWriter: Added Expression node to control colorspace plug.

lucienfostier · Apr 4, 2017 · 7e8ad35 · johnhaddon · Apr 4, 2017 · johnhaddon
1 parent 89c5b18
commit 7e8ad35
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/include/GafferImage/ImageWriter.h b/include/GafferImage/ImageWriter.h
@@ -37,6 +37,8 @@
 #ifndef GAFFERIMAGE_IMAGEWRITER_H
 #define GAFFERIMAGE_IMAGEWRITER_H
 
+#include "Gaffer/Expression.h"
+
 #include "GafferDispatch/TaskNode.h"
 
 #include "GafferImage/TypeIds.h"
@@ -102,6 +104,9 @@ class ImageWriter : public GafferDispatch::TaskNode
 		ColorSpace *colorSpace();
 		const ColorSpace *colorSpace() const;
 
+		Gaffer::Expression *expr();
+		const Gaffer::Expression *expr() const;
+
 		void createFileFormatOptionsPlugs();
 
 		static size_t g_firstPlugIndex;

diff --git a/src/GafferImage/ImageWriter.cpp b/src/GafferImage/ImageWriter.cpp
@@ -53,6 +53,7 @@ OIIO_NAMESPACE_USING
 #include "Gaffer/Context.h"
 #include "Gaffer/ScriptNode.h"
 #include "Gaffer/StringPlug.h"
+#include "Gaffer/Expression.h"
 
 #include "GafferImage/FormatPlug.h"
 #include "GafferImage/ImageAlgo.h"
@@ -863,6 +864,10 @@ ImageWriter::ImageWriter( const std::string &name )
 	outPlug()->setInput( inPlug() );
 
 	createFileFormatOptionsPlugs();
+
+	ExpressionPtr expression = new Expression( "__expression" );
+	addChild( expression );
+	//expression->setExpression( string( "parent[\"__colorSpace\"][\"outputSpace\"] =  context.get(\"gaffer:colorspace\", \"linear\") " ), string( "python" ) );
 }
 
 ImageWriter::~ImageWriter()
@@ -990,6 +995,16 @@ const GafferImage::ImagePlug *ImageWriter::outPlug() const
 	return getChild<ImagePlug>( g_firstPlugIndex+5 );
 }
 
+Expression *ImageWriter::expr()
+{
+	return getChild<Expression>( g_firstPlugIndex+6 );
+}
+
+const Expression *ImageWriter::expr() const
+{
+	return getChild<Expression>( g_firstPlugIndex+6 );
+}
+
 Gaffer::ValuePlug *ImageWriter::fileFormatSettingsPlug( const std::string &fileFormat )
 {
 	return getChild<ValuePlug>( fileFormat );
@@ -1062,6 +1077,9 @@ void ImageWriter::execute() const
 	Context * c = const_cast<Context *>( Context::current() );
 	c->set( "gaffer:colorspace", defaultColorSpace()( currentFileFormat() ) );
 
+	Expression * expression = const_cast<Expression *>( expr() );
+	expression->setExpression( string( "parent[\"__colorSpace\"][\"outputSpace\"] = context.get(\"gaffer:colorspace\", \"\") " ), string( "python" ) );
+
 	if( !inPlug()->getInput<ImagePlug>() )
 	{
 		throw IECore::Exception( "No input image." );