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

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

diff --git a/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp b/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp
index 8e2356f..a187568 100644 (file)
--- a/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp
@@ -1,12 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!    \file valuenode_radialcomposite.cpp
-**     \brief Template File
+**     \brief Implementation of the "Radial Composite" valuenode conversion.
 **
 **     $Id$
 **
 **     \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
@@ -35,6 +35,7 @@
 #include <stdexcept>
 #include "general.h"
 #include "color.h"
+#include "savecanvas.h"
 #endif
 
 /* === U S I N G =========================================================== */
@@ -71,7 +72,7 @@ synfig::ValueNode_RadialComposite::ValueNode_RadialComposite(const ValueBase &va
                        break;
                default:
                        assert(0);
-                       throw Exception::BadType(ValueBase::type_name(get_type()));
+                       throw Exception::BadType(ValueBase::type_local_name(get_type()));
        }
 }
 
@@ -141,8 +142,7 @@ ValueNode_RadialComposite::link_count()const
 bool
 ValueNode_RadialComposite::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))
        {
@@ -153,7 +153,6 @@ ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
        switch(get_type())
        {
                case ValueBase::TYPE_VECTOR:
-                       assert(i<2);
                        if(i==0 && x->get_type()!=ValueBase::TYPE_REAL)
                                return false;
                        if(i==1 && x->get_type()!=ValueBase::TYPE_ANGLE)
@@ -163,7 +162,6 @@ ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
                        break;
 
                case ValueBase::TYPE_COLOR:
-                       assert(i<4);
                        if((i==0 || i==1 || i==3) && x->get_type()!=ValueBase::TYPE_REAL)
                                return false;
                        if((i==2) && x->get_type()!=ValueBase::TYPE_ANGLE)
@@ -182,14 +180,16 @@ ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
 ValueNode::LooseHandle
 ValueNode_RadialComposite::get_link_vfunc(int i)const
 {
-       assert(i>=0 && i<6);
+       assert(i>=0 && i<link_count());
+
        return components[i];
 }
 
 String
 ValueNode_RadialComposite::link_local_name(int i)const
 {
-       assert(i>=0 && i<6);
+       assert(i>=0 && i<link_count());
+
        switch(get_type())
        {
                case ValueBase::TYPE_VECTOR:
@@ -214,14 +214,48 @@ ValueNode_RadialComposite::link_local_name(int i)const
                        break;
        }
 
-       return etl::strprintf(_("C%d"),i+1);
+       assert(0);
+       // notice that Composite counts from 1 and Radial Composite counts
+       // from 0!  we need to keep it like that to correctly load old
+       // animations, but let's not save "c%d" format link names in future
+       return etl::strprintf(_("C%d"),i);
 }
 
 
 String
 ValueNode_RadialComposite::link_name(int i)const
 {
-       assert(i>=0 && i<5);
+       assert(i>=0 && i<link_count());
+
+       if (get_file_version() < RELEASE_VERSION_0_61_08)
+               return strprintf("c%d",i);
+
+       switch(get_type())
+       {
+       case ValueBase::TYPE_COLOR:
+               switch(i)
+               {
+               case 0: return "y_luma"; // the 'luma' attribute is recognised by the fact that it starts with a 'y'
+               case 1: return "saturation";
+               case 2: return "hue";
+               case 3: return "alpha";
+               }
+               break;
+       case ValueBase::TYPE_VECTOR:
+               switch(i)
+               {
+               case 0: return "radius";
+               case 1: return "theta";
+               }
+               break;
+       default:
+               break;
+       }
+
+       assert(0);
+       // notice that Composite counts from 1 and Radial Composite counts
+       // from 0!  we need to keep it like that to correctly load old
+       // animations, but let's not save "c%d" format link names in future
        return strprintf("c%d",i);
 }
 
@@ -231,7 +265,7 @@ ValueNode_RadialComposite::get_link_index_from_name(const String &name)const
        if(name.empty())
                throw Exception::BadLinkName(name);
 
-       if(name[0]=='c')
+       if(name[0]=='c' && name.size() == 2 && name[1]-'0' >= 0 && name[1]-'0' < link_count())
                return name[1]-'0';
 
        switch(get_type())