Added copyright lines for files I've edited this year.

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

diff --git a/synfig-core/trunk/src/synfig/valuenode_linear.cpp b/synfig-core/trunk/src/synfig/valuenode_linear.cpp
index 9c1788f..2b7fd35 100644 (file)
--- a/synfig-core/trunk/src/synfig/valuenode_linear.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_linear.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!    \file valuenode_linear.cpp
-**     \brief Template File
+**     \brief Implementation of the "Linear" 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
@@ -33,6 +34,7 @@
 #include "valuenode_const.h"
 #include "general.h"
 #include "color.h"
+#include <ETL/misc>
 
 #endif
 
@@ -80,7 +82,7 @@ ValueNode_Linear::ValueNode_Linear(const ValueBase &value):
                set_link("offset",ValueNode_Const::create(value.get(Vector())));
                break;
        default:
-               throw Exception::BadType(ValueBase::type_name(get_type()));
+               throw Exception::BadType(ValueBase::type_local_name(get_type()));
        }
 
        DCAST_HACK_ENABLE();
@@ -113,11 +115,7 @@ ValueNode_Linear::operator()(Time t)const
        case ValueBase::TYPE_COLOR:
                return (*m_)(t).get( Color())*t+(*b_)(t).get( Color());
        case ValueBase::TYPE_INTEGER:
-       {
-               Real ret = (*m_)(t).get(int())*t+(*b_)(t).get(int()) + 0.5f;
-               if (ret < 0) return static_cast<int>(ret-1);
-               return static_cast<int>(ret);
-       }
+               return round_to_int((*m_)(t).get(int())*t+(*b_)(t).get(int()));
        case ValueBase::TYPE_REAL:
                return (*m_)(t).get(  Real())*t+(*b_)(t).get(  Real());
        case ValueBase::TYPE_TIME:
@@ -157,20 +155,14 @@ ValueNode_Linear::check_type(ValueBase::Type type)
 }
 
 bool
-ValueNode_Linear::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_Linear::set_link_vfunc(int i,ValueNode::Handle value)
 {
-       assert(i==0 || i==1);
-       if(i==0)
-       {
-               m_=x;
-               signal_child_changed()(i);signal_value_changed()();
-               return true;
-       }
-       if(i==1)
+       assert(i>=0 && i<link_count());
+
+       switch(i)
        {
-               b_=x;
-               signal_child_changed()(i);signal_value_changed()();
-               return true;
+       case 0: CHECK_TYPE_AND_SET_VALUE(m_, get_type());
+       case 1: CHECK_TYPE_AND_SET_VALUE(b_, get_type());
        }
        return false;
 }
@@ -178,7 +170,8 @@ ValueNode_Linear::set_link_vfunc(int i,ValueNode::Handle x)
 ValueNode::LooseHandle
 ValueNode_Linear::get_link_vfunc(int i)const
 {
-       assert(i==0 || i==1);
+       assert(i>=0 && i<link_count());
+
        if(i==0) return m_;
        if(i==1) return b_;
        return 0;
@@ -193,7 +186,8 @@ ValueNode_Linear::link_count()const
 String
 ValueNode_Linear::link_name(int i)const
 {
-       assert(i==0 || i==1);
+       assert(i>=0 && i<link_count());
+
        if(i==0) return "slope";
        if(i==1) return "offset";
        return String();
@@ -202,7 +196,8 @@ ValueNode_Linear::link_name(int i)const
 String
 ValueNode_Linear::link_local_name(int i)const
 {
-       assert(i==0 || i==1);
+       assert(i>=0 && i<link_count());
+
        if(i==0)
                switch(get_type())
                {