Made all the assert() lines which check the valuenode sub-parameter index range the...

[synfig.git] / synfig-core / trunk / src / synfig / valuenode_range.cpp

diff --git a/synfig-core/trunk/src/synfig/valuenode_range.cpp b/synfig-core/trunk/src/synfig/valuenode_range.cpp
index 712c974..86fea4b 100644 (file)
--- 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 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
@@ -110,10 +111,6 @@ 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
 {
@@ -123,13 +120,26 @@ synfig::ValueNode_Range::operator()(Time t)const
        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,7 +150,8 @@ 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:
@@ -163,7 +174,8 @@ ValueNode_Range::set_link_vfunc(int i,ValueNode::Handle value)
 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 +194,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 +208,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";