Tidying.

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

diff --git a/synfig-core/trunk/src/synfig/valuenode_stripes.cpp b/synfig-core/trunk/src/synfig/valuenode_stripes.cpp
index 4849f30..a1a34f8 100644 (file)
--- a/synfig-core/trunk/src/synfig/valuenode_stripes.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_stripes.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
-/*!    \file valuenode_subtract.cpp
+/* === S Y N F I G ========================================================= */
+/*!    \file valuenode_stripes.cpp
 **     \brief Template File
 **
-**     $Id: valuenode_stripes.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
 */
 /* ========================================================================= */
@@ -41,7 +42,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
@@ -51,7 +52,7 @@ using namespace sinfg;
 
 /* === M E T H O D S ======================================================= */
 
-sinfg::ValueNode_Stripes::ValueNode_Stripes():LinkableValueNode(sinfg::ValueBase::TYPE_GRADIENT)
+synfig::ValueNode_Stripes::ValueNode_Stripes():LinkableValueNode(synfig::ValueBase::TYPE_GRADIENT)
 {
        set_link("color1",ValueNode_Const::create(Color::alpha()));
        set_link("color2",ValueNode_Const::create(Color::black()));
@@ -69,27 +70,27 @@ ValueNode_Stripes*
 ValueNode_Stripes::create(const ValueBase& x)
 {
        ValueBase::Type id(x.get_type());
-       
+
        if(id!=ValueBase::TYPE_GRADIENT)
        {
                assert(0);
-               throw runtime_error("sinfg::ValueNode_Stripes:Bad type "+ValueBase::type_name(id));                     
-       }               
+               throw runtime_error("synfig::ValueNode_Stripes:Bad type "+ValueBase::type_name(id));
+       }
 
        ValueNode_Stripes* value_node=new ValueNode_Stripes();
 
        assert(value_node->get_type()==id);
-       
+
        return value_node;
 }
 
-sinfg::ValueNode_Stripes::~ValueNode_Stripes()
+synfig::ValueNode_Stripes::~ValueNode_Stripes()
 {
        unlink_all();
 }
 
 bool
-sinfg::ValueNode_Stripes::set_color1(ValueNode::Handle a)
+synfig::ValueNode_Stripes::set_color1(ValueNode::Handle a)
 {
        if(a->get_type()!=ValueBase::TYPE_COLOR)
                return false;
@@ -100,7 +101,7 @@ sinfg::ValueNode_Stripes::set_color1(ValueNode::Handle a)
 }
 
 bool
-sinfg::ValueNode_Stripes::set_color2(ValueNode::Handle a)
+synfig::ValueNode_Stripes::set_color2(ValueNode::Handle a)
 {
        if(a->get_type()!=ValueBase::TYPE_COLOR)
                return false;
@@ -111,7 +112,7 @@ sinfg::ValueNode_Stripes::set_color2(ValueNode::Handle a)
 }
 
 bool
-sinfg::ValueNode_Stripes::set_width(ValueNode::Handle x)
+synfig::ValueNode_Stripes::set_width(ValueNode::Handle x)
 {
        if(x->get_type()!=ValueBase::TYPE_REAL)
                return false;
@@ -122,7 +123,7 @@ sinfg::ValueNode_Stripes::set_width(ValueNode::Handle x)
 }
 
 bool
-sinfg::ValueNode_Stripes::set_stripes(ValueNode::Handle b)
+synfig::ValueNode_Stripes::set_stripes(ValueNode::Handle b)
 {
        if(b->get_type()!=ValueBase::TYPE_INTEGER)
                return false;
@@ -130,10 +131,10 @@ sinfg::ValueNode_Stripes::set_stripes(ValueNode::Handle b)
        return true;
 }
 
-sinfg::ValueBase
-sinfg::ValueNode_Stripes::operator()(Time t)const
+synfig::ValueBase
+synfig::ValueNode_Stripes::operator()(Time t)const
 {
-       const int total((*stripes_)(t).get(int()));             
+       const int total((*stripes_)(t).get(int()));
        int i;
        Gradient ret;
 
@@ -143,10 +144,10 @@ sinfg::ValueNode_Stripes::operator()(Time t)const
        const Color color1((*color1_)(t).get(Color()));
        const Color color2((*color2_)(t).get(Color()));
        const float width(max(0.0,min(1.0,(*width_)(t).get(Real()))));
-       
+
        const float stripe_width_a(width/total);
        const float stripe_width_b((1.0-width)/total);
-       
+
        for(i=0;i<total;i++)
        {
                float pos(float(i)/total+stripe_width_b/2);
@@ -220,9 +221,10 @@ ValueNode_Stripes::link_local_name(int i)const
                        return _("Stripe Count");
                case 3:
                        return _("Width");
+               default:
+                       return String();
        }
-       return String();
-}      
+}
 
 String
 ValueNode_Stripes::link_name(int i)const
@@ -240,7 +242,7 @@ ValueNode_Stripes::link_name(int i)const
                        return "width";
        }
        return String();
-}      
+}
 
 int
 ValueNode_Stripes::get_link_index_from_name(const String &name)const