Removed a bunch more DEBUGPOINT()s.
[synfig.git] / synfig-core / trunk / src / synfig / valuenode.cpp
index 9f4e627..81a9fa2 100644 (file)
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
-/*!    \file value_node.cpp
-**     \brief Template File
+/*!    \file valuenode.cpp
+**     \brief Implementation of the "Placeholder" valuenode conversion.
 **
-**     $Id: valuenode.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $
+**     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007 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
 #include "valuenode_composite.h"
 #include "valuenode_reference.h"
 #include "valuenode_scale.h"
+#include "valuenode_blinecalctangent.h"
+#include "valuenode_blinecalcvertex.h"
+#include "valuenode_blinereversetangent.h"
 #include "valuenode_segcalctangent.h"
 #include "valuenode_segcalcvertex.h"
+#include "valuenode_repeat_gradient.h"
 #include "valuenode_stripes.h"
+#include "valuenode_range.h"
+#include "valuenode_add.h"
 #include "valuenode_subtract.h"
 #include "valuenode_timedswap.h"
 #include "valuenode_twotone.h"
 #include "valuenode_radialcomposite.h"
 #include "valuenode_gradientrotate.h"
 #include "valuenode_sine.h"
+#include "valuenode_cos.h"
+#include "valuenode_atan2.h"
+#include "valuenode_exp.h"
+#include "valuenode_switch.h"
+#include "valuenode_timeloop.h"
+#include "valuenode_reciprocal.h"
+#include "valuenode_duplicate.h"
+#include "valuenode_integer.h"
 
 #include "layer.h"
 
@@ -88,26 +103,49 @@ ValueNode::subsys_init()
 {
        book_=new LinkableValueNode::Book();
 
-#define ADD_VALUENODE(c,n) (*book_)[n].factory=reinterpret_cast<LinkableValueNode::Factory>(&c::create); (*book_)[n].check_type=&c::check_type;(*book_)[n].local_name=n
-#define ADD_VALUENODE2(c,n) (*book_)[n].factory=reinterpret_cast<LinkableValueNode::Factory>(&c::create_from); (*book_)[n].check_type=&c::check_type;(*book_)[n].local_name=n
-
-       ADD_VALUENODE(ValueNode_Linear,"linear");
-       ADD_VALUENODE(ValueNode_Composite,"composite");
-       ADD_VALUENODE(ValueNode_RadialComposite,"radial_composite");
-       ADD_VALUENODE(ValueNode_Reference,"reference");
-       ADD_VALUENODE(ValueNode_Scale,"scale");
-       ADD_VALUENODE(ValueNode_SegCalcTangent,"segcalctangent");
-       ADD_VALUENODE(ValueNode_SegCalcVertex,"segcalcvertex");
-       ADD_VALUENODE(ValueNode_Stripes,"stripes");
-       ADD_VALUENODE(ValueNode_Subtract,"subtract");
-       //ADD_VALUENODE(ValueNode_TimedSwap,"timed_swap");
-       ADD_VALUENODE(ValueNode_TwoTone,"twotone");
-       ADD_VALUENODE(ValueNode_BLine,"bline");
-       ADD_VALUENODE2(ValueNode_DynamicList,"dynamic_list");
-       ADD_VALUENODE(ValueNode_GradientRotate,"gradient_rotate");
-       ADD_VALUENODE(ValueNode_Sine,"sine");
-       
+#define ADD_VALUENODE(class,name,local)                                                                                                                        \
+       (*book_)[name].factory=reinterpret_cast<LinkableValueNode::Factory>(&class::create);            \
+       (*book_)[name].check_type=&class::check_type;                                                                                           \
+       (*book_)[name].local_name=local
+
+#define ADD_VALUENODE2(class,name,local)                                                                                                               \
+       (*book_)[name].factory=reinterpret_cast<LinkableValueNode::Factory>(&class::create_from);       \
+       (*book_)[name].check_type=&class::check_type;                                                                                           \
+       (*book_)[name].local_name=local
+
+       ADD_VALUENODE(ValueNode_Linear,                 "linear",                       _("Linear")                             );
+       ADD_VALUENODE(ValueNode_Composite,              "composite",            _("Composite")                  );
+       ADD_VALUENODE(ValueNode_RadialComposite,"radial_composite",     _("Radial Composite")   );
+       ADD_VALUENODE(ValueNode_Reference,              "reference",            _("Reference")                  );
+       ADD_VALUENODE(ValueNode_Repeat_Gradient,"repeat_gradient",      _("Repeat Gradient")    );
+       ADD_VALUENODE(ValueNode_Scale,                  "scale",                        _("Scale")                              );
+       ADD_VALUENODE(ValueNode_BLineCalcTangent,"blinecalctangent",_("BLine Tangent")          );
+       ADD_VALUENODE(ValueNode_BLineCalcVertex,"blinecalcvertex",      _("BLine Vertex")               );
+       ADD_VALUENODE(ValueNode_BLineRevTangent,"blinerevtangent",      _("Reverse Tangent")    );
+       ADD_VALUENODE(ValueNode_SegCalcTangent, "segcalctangent",       _("Segment Tangent")    );
+       ADD_VALUENODE(ValueNode_SegCalcVertex,  "segcalcvertex",        _("Segment Vertex")             );
+       ADD_VALUENODE(ValueNode_Stripes,                "stripes",                      _("Stripes")                    );
+       ADD_VALUENODE(ValueNode_Range,                  "range",                        _("Range")                              );
+       ADD_VALUENODE(ValueNode_Add,                    "add",                          _("Add")                                );
+       ADD_VALUENODE(ValueNode_Subtract,               "subtract",                     _("Subtract")                   );
+       ADD_VALUENODE(ValueNode_TimedSwap,              "timed_swap",           _("Timed Swap")                 );
+       ADD_VALUENODE(ValueNode_TwoTone,                "twotone",                      _("Two-Tone")                   );
+       ADD_VALUENODE(ValueNode_BLine,                  "bline",                        _("BLine")                              );
+       ADD_VALUENODE2(ValueNode_DynamicList,   "dynamic_list",         _("Dynamic List")               );
+       ADD_VALUENODE(ValueNode_GradientRotate, "gradient_rotate",      _("Gradient Rotate")    );
+       ADD_VALUENODE(ValueNode_Sine,                   "sine",                         _("Sine")                               );
+       ADD_VALUENODE(ValueNode_Cos,                    "cos",                          _("Cos")                                );
+       ADD_VALUENODE(ValueNode_Atan2,                  "atan2",                        _("aTan2")                              );
+       ADD_VALUENODE(ValueNode_Exp,                    "exp",                          _("Exponential")                );
+       ADD_VALUENODE(ValueNode_Switch,                 "switch",                       _("Switch")                             );
+       ADD_VALUENODE(ValueNode_TimeLoop,               "timeloop",                     _("Time Loop")                  );
+       ADD_VALUENODE(ValueNode_Reciprocal,             "reciprocal",           _("Reciprocal")                 );
+       ADD_VALUENODE(ValueNode_Duplicate,              "duplicate",            _("Duplicate")                  );
+       ADD_VALUENODE(ValueNode_Integer,                "fromint",                      _("From Integer")               );
+
 #undef ADD_VALUENODE
+#undef ADD_VALUENODE2
+
        return true;
 }
 
@@ -122,24 +160,24 @@ ValueNode::subsys_stop()
 
                if(global_value_node_map.size()!=value_node_count)
                        synfig::error("value node count mismatch! map.size()!=value_node_count (%d!=%d)",global_value_node_map.size(),value_node_count);
-               
-               GlobalValueNodeMap::iterator iter;              
+
+               GlobalValueNodeMap::iterator iter;
                for(iter=global_value_node_map.begin();iter!=global_value_node_map.end();++iter)
                {
                        if(!iter->second->is_exported())
-                               synfig::info("%s: count:%d name:%s type:%s",
+                               synfig::info(_("%s: count:%d name:%s type:%s"),
                                        iter->first.get_string().c_str(),
                                        iter->second->count(),
                                        iter->second->get_name().c_str(),
-                                       ValueBase::type_name(iter->second->get_type()).c_str()
+                                       ValueBase::type_local_name(iter->second->get_type()).c_str()
                                );
                        else
-                               synfig::info("%s: id:%s count:%d name:%s type:%s",
+                               synfig::info(_("%s: id:%s count:%d name:%s type:%s"),
                                        iter->first.get_string().c_str(),
                                        iter->second->get_id().c_str(),
                                        iter->second->count(),
                                        iter->second->get_name().c_str(),
-                                       ValueBase::type_name(iter->second->get_type()).c_str()
+                                       ValueBase::type_local_name(iter->second->get_type()).c_str()
                                );
                }
        }
@@ -178,13 +216,13 @@ bool
 LinkableValueNode::set_link(int i,ValueNode::Handle x)
 {
        ValueNode::Handle previous(get_link(i));
-       
+
        if(set_link_vfunc(i,x))
        {
                if(previous)
                        remove_child(previous.get());
                add_child(x.get());
-               
+
                if(!x->is_exported() && get_parent_canvas())
                {
                        x->set_parent_canvas(get_parent_canvas());
@@ -215,20 +253,21 @@ LinkableValueNode::unlink_all()
 ValueNode::~ValueNode()
 {
        value_node_count--;
-       
-       begin_delete();
 
-       //DEBUGPOINT();
+       begin_delete();
 }
 
 void
 ValueNode::on_changed()
 {
-       if(get_parent_canvas())
-               get_parent_canvas()->signal_value_node_changed()(this);
-       else if(get_root_canvas() && get_parent_canvas())
+       etl::loose_handle<Canvas> parent_canvas = get_parent_canvas();
+       if(parent_canvas)
+               do                                              // signal to all the ancestor canvases
+                       parent_canvas->signal_value_node_changed()(this);
+               while (parent_canvas = parent_canvas->parent());
+       else if(get_root_canvas())
                get_root_canvas()->signal_value_node_changed()(this);
-       
+
        Node::on_changed();
 }
 
@@ -237,7 +276,7 @@ ValueNode::replace(etl::handle<ValueNode> x)
 {
        if(x.get()==this)
                return 0;
-       
+
        while(parent_set.size())
        {
                (*parent_set.begin())->add_child(x.get());
@@ -318,9 +357,9 @@ ValueNodeList::surefind(const String &id)
 {
        if(id.empty())
                throw Exception::IDNotFound("Empty ID");
-       
+
        ValueNode::Handle value_node;
-       
+
        try
        {
                value_node=find(id);
@@ -375,11 +414,11 @@ ValueNodeList::add(ValueNode::Handle value_node)
                return false;
        }
        catch(Exception::IDNotFound)
-       {       
+       {
                push_back(value_node);
                return true;
        }
-       
+
        return false;
 }
 
@@ -421,7 +460,7 @@ PlaceholderValueNode::create(ValueBase::Type type)
 }
 
 ValueBase
-PlaceholderValueNode::operator()(Time t)const
+PlaceholderValueNode::operator()(Time /*t*/)const
 {
        assert(0);
        return ValueBase();
@@ -435,12 +474,17 @@ PlaceholderValueNode::PlaceholderValueNode(ValueBase::Type type):
 ValueNode*
 LinkableValueNode::clone(const GUID& deriv_guid)const
 {
-       { ValueNode* x(find_value_node(get_guid()^deriv_guid).get()); if(x)return x; }
+       // printf("%s:%d clone()\n", __FILE__, __LINE__);
+       { ValueNode* x(find_value_node(get_guid()^deriv_guid).get()); if(x)
+                                                                                                                                 {
+                                                                                                                                         printf("VALUENODE FOUND VALUENODE\n");
+                                                                                                                                         return x;
+                                                                                                                                 }}
 
        int i;
        LinkableValueNode *ret=create_new();
        ret->set_guid(get_guid()^deriv_guid);
-       
+
        for(i=0;i<link_count();i++)
        {
                ValueNode::Handle link=get_link_vfunc(i);
@@ -463,10 +507,10 @@ ValueNode::get_relative_id(etl::loose_handle<const Canvas> x)const
 {
        assert(is_exported());
        assert(canvas_);
-       
+
        if(x.get()==canvas_.get())
                return get_id();
-       
+
        return canvas_->_get_relative_id(x)+':'+get_id();
 }
 
@@ -485,9 +529,9 @@ ValueNode::set_root_canvas(etl::loose_handle<Canvas> x)
 void LinkableValueNode::get_times_vfunc(Node::time_set &set) const
 {
        ValueNode::LooseHandle  h;
-       
+
        int size = link_count();
-               
+
        //just add it to the set...
        for(int i=0; i < size; ++i)
        {