X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_range.cpp;h=c45f369aba1eff6a935ce37ed234237e3f58c5fd;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=21193d407227c4cc3face678d392dc83aae396eb;hpb=6c3dfccdf0d1fab1a47dc5f4b0351261f2287622;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_range.cpp b/synfig-core/trunk/src/synfig/valuenode_range.cpp
index 21193d4..c45f369 100644
--- a/synfig-core/trunk/src/synfig/valuenode_range.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_range.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_range.cpp
-**	\brief Template File
+**	\brief Implementation of the "Range" valuenode conversion.
 **
 **	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 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
@@ -82,7 +83,7 @@ synfig::ValueNode_Range::ValueNode_Range(const ValueBase &value):
 		break;
 	default:
 		assert(0);
-		throw runtime_error("synfig::ValueNode_Range:Bad type "+ValueBase::type_name(id));
+		throw runtime_error(get_local_name()+_(":Bad type ")+ValueBase::type_local_name(id));
 	}
 
 	assert(min_->get_type()==id);
@@ -110,26 +111,38 @@ synfig::ValueNode_Range::~ValueNode_Range()
 	unlink_all();
 }
 
-#define min(x,y) (x>y ? y : x)
-#define max(x,y) (x>y ? x : y)
-#define range(low,high,input) (min(high,max(low,input)))
-
 synfig::ValueBase
 synfig::ValueNode_Range::operator()(Time t)const
 {
+	if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+		printf("%s:%d operator()\n", __FILE__, __LINE__);
+
 	if(!min_ || !max_ || !link_)
 		throw runtime_error(strprintf("ValueNode_Range: %s",_("Some of my parameters aren't set!")));
 
 	switch(get_type())
 	{
 	case ValueBase::TYPE_ANGLE:
-		return range((*min_)(t).get(Angle()), (*max_)(t).get(Angle()), (*link_)(t).get(Angle()));
+	{
+		Angle minimum = (* min_)(t).get(Angle());
+		Angle maximum = (* max_)(t).get(Angle());
+		Angle link    = (*link_)(t).get(Angle());
+
+		// if link is between min and max, use it
+		if (Angle::deg((link-minimum).mod()).get() < Angle::deg((maximum-minimum).mod()).get())
+			return link;
+		// otherwise use whichever of min and max is closest to link
+		else if (link.dist(minimum).abs() < link.dist(maximum).abs())
+			return minimum;
+		else
+			return maximum;
+	}
 	case ValueBase::TYPE_INTEGER:
-		return range((*min_)(t).get(int()),   (*max_)(t).get(int()),   (*link_)(t).get(int()));
+		return std::max((*min_)(t).get(int()),  std::min((*max_)(t).get(int()),  (*link_)(t).get(int())));
 	case ValueBase::TYPE_REAL:
-		return range((*min_)(t).get(Real()),  (*max_)(t).get(Real()),  (*link_)(t).get(Real()));
+		return std::max((*min_)(t).get(Real()), std::min((*max_)(t).get(Real()), (*link_)(t).get(Real())));
 	case ValueBase::TYPE_TIME:
-		return range((*min_)(t).get(Time()),  (*max_)(t).get(Time()),  (*link_)(t).get(Time()));
+		return std::max((*min_)(t).get(Time()), std::min((*max_)(t).get(Time()), (*link_)(t).get(Time())));
 	default:
 		assert(0);
 		break;
@@ -140,30 +153,22 @@ synfig::ValueNode_Range::operator()(Time t)const
 bool
 ValueNode_Range::set_link_vfunc(int i,ValueNode::Handle value)
 {
-	assert(i>=0 && i<3);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
-		case 0:
-			min_=value;
-			signal_child_changed()(i);signal_value_changed()();
-			return true;
-		case 1:
-			max_=value;
-			signal_child_changed()(i);signal_value_changed()();
-			return true;
-		case 2:
-			link_=value;
-			signal_child_changed()(i);signal_value_changed()();
-			return true;
+	case 0: CHECK_TYPE_AND_SET_VALUE(min_,  get_type());
+	case 1: CHECK_TYPE_AND_SET_VALUE(max_,  get_type());
+	case 2: CHECK_TYPE_AND_SET_VALUE(link_, get_type());
 	}
-
 	return false;
 }
 
 ValueNode::LooseHandle
 ValueNode_Range::get_link_vfunc(int i)const
 {
-	assert(i>=0 && i<3);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0: return min_;
@@ -182,7 +187,8 @@ ValueNode_Range::link_count()const
 String
 ValueNode_Range::link_local_name(int i)const
 {
-	assert(i>=0 && i<3);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0: return _("Min");
@@ -195,7 +201,8 @@ ValueNode_Range::link_local_name(int i)const
 String
 ValueNode_Range::link_name(int i)const
 {
-	assert(i>=0 && i<3);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0: return "min";
@@ -208,7 +215,6 @@ ValueNode_Range::link_name(int i)const
 int
 ValueNode_Range::get_link_index_from_name(const String &name)const
 {
-	printf("%s:%d link_index_from_name\n", __FILE__, __LINE__);
 	if(name=="min") return 0;
 	if(name=="max") return 1;
 	if(name=="link") return 2;