Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-core/trunk/src/synfig/valuenode_integer.cpp b/synfig-core/trunk/src/synfig/valuenode_integer.cpp
index e0d5057..38cd082 100644 (file)
--- a/synfig-core/trunk/src/synfig/valuenode_integer.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_integer.cpp
@@ -6,7 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**     Copyright (c) 2007 Chris Moore
+**     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
@@ -75,7 +75,7 @@ ValueNode_Integer::ValueNode_Integer(const ValueBase &x):
                break;
        default:
                assert(0);
-               throw runtime_error("synfig::ValueNode_Integer:Bad type "+ValueBase::type_name(x.get_type()));
+               throw runtime_error(get_local_name()+_(":Bad type ")+ValueBase::type_local_name(x.get_type()));
        }
 }
 
@@ -97,24 +97,22 @@ ValueNode_Integer::~ValueNode_Integer()
 }
 
 bool
-ValueNode_Integer::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_Integer::set_link_vfunc(int i,ValueNode::Handle value)
 {
-       assert(i >= 0 && i < link_count());
+       assert(i>=0 && i<link_count());
+
        switch(i)
        {
-       case 0:  integer_ = x; break;
-       default: return false;
+       case 0: CHECK_TYPE_AND_SET_VALUE(integer_, get_type());
        }
-
-       signal_child_changed()(i);
-       signal_value_changed()();
-       return true;
+       return false;
 }
 
 ValueNode::LooseHandle
 ValueNode_Integer::get_link_vfunc(int i)const
 {
-       assert(i >= 0 && i < link_count());
+       assert(i>=0 && i<link_count());
+
        if(i==0) return integer_;
 
        return 0;
@@ -129,7 +127,8 @@ ValueNode_Integer::link_count()const
 String
 ValueNode_Integer::link_local_name(int i)const
 {
-       assert(i >= 0 && i < link_count());
+       assert(i>=0 && i<link_count());
+
        if(i==0) return _("Integer");
        return String();
 }
@@ -137,7 +136,8 @@ ValueNode_Integer::link_local_name(int i)const
 String
 ValueNode_Integer::link_name(int i)const
 {
-       assert(i >= 0 && i < link_count());
+       assert(i>=0 && i<link_count());
+
        if(i==0) return "integer";
        return String();
 }
@@ -153,6 +153,9 @@ ValueNode_Integer::get_link_index_from_name(const String &name)const
 ValueBase
 ValueNode_Integer::operator()(Time t)const
 {
+       if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+               printf("%s:%d operator()\n", __FILE__, __LINE__);
+
        int integer = (*integer_)(t).get(int());
 
        switch (get_type())
@@ -167,7 +170,7 @@ ValueNode_Integer::operator()(Time t)const
                return Time(integer);
        default:
                assert(0);
-               throw runtime_error("synfig::ValueNode_Integer:Bad type "+ValueBase::type_name(get_type()));
+               throw runtime_error(get_local_name()+_(":Bad type ")+ValueBase::type_local_name(get_type()));
        }
 }
 
@@ -183,12 +186,14 @@ ValueNode_Integer::get_local_name()const
        return _("From Integer");
 }
 
+// don't show this to the user at the moment - maybe it's not very useful
 bool
-ValueNode_Integer::check_type(ValueBase::Type type)
+ValueNode_Integer::check_type(ValueBase::Type type __attribute__ ((unused)))
 {
-       return
-               type==ValueBase::TYPE_ANGLE ||
-               type==ValueBase::TYPE_BOOL  ||
-               type==ValueBase::TYPE_REAL  ||
-               type==ValueBase::TYPE_TIME;
+       return false;
+//     return
+//             type==ValueBase::TYPE_ANGLE ||
+//             type==ValueBase::TYPE_BOOL  ||
+//             type==ValueBase::TYPE_REAL  ||
+//             type==ValueBase::TYPE_TIME;
 }