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

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

diff --git a/synfig-core/trunk/src/synfig/valuenode_composite.cpp b/synfig-core/trunk/src/synfig/valuenode_composite.cpp
index 3e03ed6..0acc79c 100644 (file)
--- a/synfig-core/trunk/src/synfig/valuenode_composite.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_composite.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file valuenode_composite.cpp
-**     \brief Template File
+**     \brief Implementation of the "Composite" valuenode conversion.
 **
-**     $Id: valuenode_composite.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $
+**     $Id$
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**     This software and associated documentation
-**     are CONFIDENTIAL and PROPRIETARY property of
-**     the above-mentioned copyright holder.
+**     This package is free software; you can redistribute it and/or
+**     modify it under the terms of the GNU General Public License as
+**     published by the Free Software Foundation; either version 2 of
+**     the License, or (at your option) any later version.
 **
-**     You may not copy, print, publish, or in any
-**     other way distribute this software without
-**     a prior written agreement with
-**     the copyright holder.
+**     This package is distributed in the hope that it will be useful,
+**     but WITHOUT ANY WARRANTY; without even the implied warranty of
+**     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**     General Public License for more details.
 **     \endlegal
 */
 /* ========================================================================= */
@@ -43,7 +44,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
@@ -53,7 +54,7 @@ using namespace sinfg;
 
 /* === M E T H O D S ======================================================= */
 
-sinfg::ValueNode_Composite::ValueNode_Composite(const ValueBase &value):
+synfig::ValueNode_Composite::ValueNode_Composite(const ValueBase &value):
        LinkableValueNode(value.get_type())
 {
        switch(get_type())
@@ -87,7 +88,7 @@ sinfg::ValueNode_Composite::ValueNode_Composite(const ValueBase &value):
                }
                default:
                        assert(0);
-                       throw Exception::BadType(ValueBase::type_name(get_type()));                     
+                       throw Exception::BadType(ValueBase::type_name(get_type()));
        }
 }
 
@@ -101,7 +102,7 @@ ValueNode_Composite::create(const ValueBase &value)
 {
        return new ValueNode_Composite(value);
 }
-       
+
 LinkableValueNode*
 ValueNode_Composite::create_new()const
 {
@@ -109,7 +110,7 @@ ValueNode_Composite::create_new()const
 }
 
 ValueBase
-sinfg::ValueNode_Composite::operator()(Time t)const
+synfig::ValueNode_Composite::operator()(Time t)const
 {
        switch(get_type())
        {
@@ -155,7 +156,7 @@ sinfg::ValueNode_Composite::operator()(Time t)const
                        return ret;
                }
                default:
-                       sinfg::error(string("ValueNode_Composite::operator():")+_("Bad type for composite"));
+                       synfig::error(string("ValueNode_Composite::operator():")+_("Bad type for composite"));
                        assert(components[0]);
                        return (*components[0])(t);
        }
@@ -175,7 +176,7 @@ ValueNode_Composite::link_count()const
        case ValueBase::TYPE_BLINEPOINT:
                return 6;
        default:
-               sinfg::warning(string("ValueNode_Composite::component_count():")+_("Bad type for composite"));
+               synfig::warning(string("ValueNode_Composite::component_count():")+_("Bad type for composite"));
                return 1;
        }
 }
@@ -183,9 +184,8 @@ ValueNode_Composite::link_count()const
 bool
 ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
 {
-       assert(i>=0);
-       assert(i<6);
-       
+       assert(i>=0 && i<link_count());
+
        if(PlaceholderValueNode::Handle::cast_dynamic(x))
        {
                components[i]=x;
@@ -195,7 +195,6 @@ ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
        switch(get_type())
        {
                case ValueBase::TYPE_VECTOR:
-                       assert(i<2);
                        if(x->get_type()==ValueBase(Real()).get_type() || PlaceholderValueNode::Handle::cast_dynamic(x))
                        {
                                components[i]=x;
@@ -204,16 +203,14 @@ ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
                        break;
 
                case ValueBase::TYPE_COLOR:
-                       assert(i<4);
                        if(x->get_type()==ValueBase(Real()).get_type() || PlaceholderValueNode::Handle::cast_dynamic(x))
                        {
                                components[i]=x;
                                return true;
                        }
                        break;
-                       
+
                case ValueBase::TYPE_SEGMENT:
-                       assert(i<4);
                        if(x->get_type()==ValueBase(Point()).get_type() || PlaceholderValueNode::Handle::cast_dynamic(x))
                        {
                                components[i]=x;
@@ -222,7 +219,6 @@ ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
                        break;
 
                case ValueBase::TYPE_BLINEPOINT:
-                       assert(i<6);
                        if((i==0 || i==4 || i==5) && x->get_type()==ValueBase(Point()).get_type())
                        {
                                components[i]=x;
@@ -239,24 +235,26 @@ ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
                                return true;
                        }
                        break;
-                       
+
                default:
                        break;
        }
-       return false;   
+       return false;
 }
 
 ValueNode::LooseHandle
 ValueNode_Composite::get_link_vfunc(int i)const
 {
-       assert(i>=0 && i<6);
+       assert(i>=0 && i<link_count());
+
        return components[i];
 }
 
 String
 ValueNode_Composite::link_local_name(int i)const
 {
-       assert(i>=0 && i<6);
+       assert(i>=0 && i<link_count());
+
        switch(get_type())
        {
                case ValueBase::TYPE_VECTOR:
@@ -271,7 +269,7 @@ ValueNode_Composite::link_local_name(int i)const
                                return _("Blue");
                        else if(i==3)
                                return _("Alpha");
-                       
+
                case ValueBase::TYPE_SEGMENT:
                        if(i==0)
                                return _("Vertex 1");
@@ -297,18 +295,19 @@ ValueNode_Composite::link_local_name(int i)const
                                return _("Tangent 2");
 
                default:
-                       break;
+                       return etl::strprintf(_("C%d"),i+1);
        }
-       return etl::strprintf(_("C%d"),i+1);    
-}      
+}
 
 
 String
 ValueNode_Composite::link_name(int i)const
 {
-       assert(i>=0 && i<5);
+       assert(i>=0 && i<link_count());
+
+       printf("!!! link_name(%d)\n", i);
        return strprintf("c%d",i);
-}      
+}
 
 int
 ValueNode_Composite::get_link_index_from_name(const String &name)const
@@ -359,7 +358,7 @@ ValueNode_Composite::get_link_index_from_name(const String &name)const
                        return 4;
                if(name=="t2")
                        return 5;
-       default:                        
+       default:
                break;
        }