X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_twotone.cpp;h=714850237537db0dc9091af67b975cd53bf6ebf8;hb=3c84217d4e5701c51c796df7c745ad39d90903a8;hp=b03ec01ec6b49609702f4539f059639b82390277;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_twotone.cpp b/synfig-core/trunk/src/synfig/valuenode_twotone.cpp
index b03ec01..7148502 100644
--- a/synfig-core/trunk/src/synfig/valuenode_twotone.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_twotone.cpp
@@ -1,20 +1,22 @@
-/* === S I N F G =========================================================== */
-/*!	\file valuenode_subtract.cpp
-**	\brief Template File
+/* === S Y N F I G ========================================================= */
+/*!	\file valuenode_twotone.cpp
+**	\brief Implementation of the "Two-Tone" valuenode conversion.
 **
-**	$Id: valuenode_twotone.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2008 Chris Moore
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -41,7 +43,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
@@ -51,88 +53,62 @@ using namespace sinfg;
 
 /* === M E T H O D S ======================================================= */
 
-sinfg::ValueNode_TwoTone::ValueNode_TwoTone():LinkableValueNode(sinfg::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("sinfg::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);
 }
 
-sinfg::ValueNode_TwoTone::~ValueNode_TwoTone()
+synfig::ValueNode_TwoTone::~ValueNode_TwoTone()
 {
 	unlink_all();
 }
 
-bool
-sinfg::ValueNode_TwoTone::set_lhs(ValueNode::Handle a)
-{
-	if(a->get_type()!=ValueBase::TYPE_COLOR)
-		return false;
-
-	ref_a=a;
-
-	return true;
-}
-
-bool
-sinfg::ValueNode_TwoTone::set_rhs(ValueNode::Handle b)
-{
-	if(b->get_type()!=ValueBase::TYPE_COLOR)
-		return false;
-	ref_b=b;
-	return true;
-}
-
-sinfg::ValueBase
-sinfg::ValueNode_TwoTone::operator()(Time t)const
+synfig::ValueBase
+synfig::ValueNode_TwoTone::operator()(Time t)const
 {
 	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:
@@ -152,30 +128,34 @@ 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
 ValueNode_TwoTone::get_link_index_from_name(const String &name)const