/* === 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
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);
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;
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_;
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");
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";