X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_twotone.cpp;h=3c18ce0c01f5273c184335c0e69f33bd3b889115;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=b07e38231489695958af9d6fb68191773bbb826b;hpb=cc54c38609ee9745ad678e5e9b9d7d2912be9c95;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_twotone.cpp b/synfig-core/trunk/src/synfig/valuenode_twotone.cpp
index b07e382..3c18ce0 100644
--- a/synfig-core/trunk/src/synfig/valuenode_twotone.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_twotone.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_twotone.cpp
-**	\brief Template File
+**	\brief Implementation of the "Two-Tone" valuenode conversion.
 **
 **	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2008 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -52,34 +53,31 @@ using namespace synfig;
 
 /* === M E T H O D S ======================================================= */
 
-synfig::ValueNode_TwoTone::ValueNode_TwoTone():LinkableValueNode(synfig::ValueBase::TYPE_GRADIENT)
+synfig::ValueNode_TwoTone::ValueNode_TwoTone(const ValueBase &value):LinkableValueNode(synfig::ValueBase::TYPE_GRADIENT)
 {
-	set_link("color1",ValueNode_Const::create(Color::black()));
-	set_link("color2",ValueNode_Const::create(Color::white()));
+	switch(value.get_type())
+	{
+	case ValueBase::TYPE_GRADIENT:
+		set_link("color1",ValueNode_Const::create(value.get(Gradient())(0)));
+		set_link("color2",ValueNode_Const::create(value.get(Gradient())(1)));
+		break;
+	default:
+		throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
+	}
+
 	DCAST_HACK_ENABLE();
 }
 
 LinkableValueNode*
 ValueNode_TwoTone::create_new()const
 {
-	return new ValueNode_TwoTone();
+	return new ValueNode_TwoTone(get_type());
 }
 
 ValueNode_TwoTone*
 ValueNode_TwoTone::create(const ValueBase& x)
 {
-	ValueBase::Type id(x.get_type());
-	if(id!=ValueBase::TYPE_GRADIENT)
-	{
-		assert(0);
-		throw runtime_error("synfig::ValueNode_TwoTone:Bad type "+ValueBase::type_name(id));
-	}
-
-	ValueNode_TwoTone* value_node=new ValueNode_TwoTone();
-
-	assert(value_node->get_type()==id);
-
-	return value_node;
+	return new ValueNode_TwoTone(x);
 }
 
 synfig::ValueNode_TwoTone::~ValueNode_TwoTone()
@@ -87,53 +85,33 @@ synfig::ValueNode_TwoTone::~ValueNode_TwoTone()
 	unlink_all();
 }
 
-bool
-synfig::ValueNode_TwoTone::set_lhs(ValueNode::Handle a)
-{
-	if(a->get_type()!=ValueBase::TYPE_COLOR)
-		return false;
-
-	ref_a=a;
-
-	return true;
-}
-
-bool
-synfig::ValueNode_TwoTone::set_rhs(ValueNode::Handle b)
-{
-	if(b->get_type()!=ValueBase::TYPE_COLOR)
-		return false;
-	ref_b=b;
-	return true;
-}
-
 synfig::ValueBase
 synfig::ValueNode_TwoTone::operator()(Time t)const
 {
+	if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+		printf("%s:%d operator()\n", __FILE__, __LINE__);
+
 	return Gradient((*ref_a)(t).get(Color()),(*ref_b)(t).get(Color()));
 }
 
 bool
-ValueNode_TwoTone::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_TwoTone::set_link_vfunc(int i,ValueNode::Handle value)
 {
-	assert(i>=0 && i<3);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
-		case 0:
-			if(set_lhs(x)) { signal_child_changed()(i);signal_value_changed()(); return true; }
-			else { return false; }
-		case 1:
-			if(set_rhs(x)) { signal_child_changed()(i);signal_value_changed()(); return true; }
-			else { return false; }
+	case 0: CHECK_TYPE_AND_SET_VALUE(ref_a, ValueBase::TYPE_COLOR);
+	case 1: CHECK_TYPE_AND_SET_VALUE(ref_b, ValueBase::TYPE_COLOR);
 	}
-
 	return false;
 }
 
 ValueNode::LooseHandle
 ValueNode_TwoTone::get_link_vfunc(int i)const
 {
-	assert(i>=0 && i<3);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0:
@@ -153,29 +131,33 @@ ValueNode_TwoTone::link_count()const
 String
 ValueNode_TwoTone::link_local_name(int i)const
 {
-	assert(i>=0 && i<2);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0:
 			return _("Color1");
 		case 1:
 			return _("Color2");
+		default:
+			return String();
 	}
-	return String();
 }
 
 String
 ValueNode_TwoTone::link_name(int i)const
 {
-	assert(i>=0 && i<2);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0:
 			return "color1";
 		case 1:
 			return "color2";
+		default:
+			return String();
 	}
-	return String();
 }
 
 int