From 427a0c586f95523b477df4346394f639368298c0 Mon Sep 17 00:00:00 2001 From: Carlos Lopez Date: Mon, 13 Sep 2010 19:01:24 +0200 Subject: [PATCH] Remove Smart Link action code, add a new action for Link Opposite and document a bit the code. Now things works like this: Link: All tangents of same colour, straight link Link: Some tangents of different colour, smart link (scale by -1 when needed) Link Opposite: two tangents of the same colour, scale by -1 before link Link Opposite: two tangents of different colour, straight link Link Opposite: more than two tangents, action is not candidate. --- synfig-studio/src/synfigapp/Makefile.am | 2 - synfig-studio/src/synfigapp/action.cpp | 3 +- .../src/synfigapp/actions/valuedesclink.cpp | 94 ++++- .../src/synfigapp/actions/valuedesclink.h | 34 +- .../src/synfigapp/actions/valuedescsmartlink.cpp | 421 --------------------- .../src/synfigapp/actions/valuedescsmartlink.h | 81 ---- 6 files changed, 119 insertions(+), 516 deletions(-) delete mode 100644 synfig-studio/src/synfigapp/actions/valuedescsmartlink.cpp delete mode 100644 synfig-studio/src/synfigapp/actions/valuedescsmartlink.h diff --git a/synfig-studio/src/synfigapp/Makefile.am b/synfig-studio/src/synfigapp/Makefile.am index ddf38b0..40d466c 100644 --- a/synfig-studio/src/synfigapp/Makefile.am +++ b/synfig-studio/src/synfigapp/Makefile.am @@ -46,7 +46,6 @@ VALUEDESC_ACTION_HH = \ actions/valuedescdisconnect.h \ actions/valuedescexport.h \ actions/valuedesclink.h \ - actions/valuedescsmartlink.h \ actions/valuedescblinelink.h \ actions/valuedescset.h @@ -56,7 +55,6 @@ VALUEDESC_ACTION_CC = \ actions/valuedescdisconnect.cpp \ actions/valuedescexport.cpp \ actions/valuedesclink.cpp \ - actions/valuedescsmartlink.cpp \ actions/valuedescblinelink.cpp \ actions/valuedescset.cpp diff --git a/synfig-studio/src/synfigapp/action.cpp b/synfig-studio/src/synfigapp/action.cpp index f35d9a1..4b89c3e 100644 --- a/synfig-studio/src/synfigapp/action.cpp +++ b/synfig-studio/src/synfigapp/action.cpp @@ -72,7 +72,6 @@ #include "actions/valuedescconnect.h" #include "actions/valuedescdisconnect.h" #include "actions/valuedesclink.h" -#include "actions/valuedescsmartlink.h" #include "actions/valuedescblinelink.h" #include "actions/waypointadd.h" @@ -197,7 +196,7 @@ Action::Main::Main() ADD_ACTION(Action::ValueDescConnect); ADD_ACTION(Action::ValueDescDisconnect); ADD_ACTION(Action::ValueDescLink); - ADD_ACTION(Action::ValueDescSmartLink); + ADD_ACTION(Action::ValueDescLinkOpposite); ADD_ACTION(Action::ValueDescBLineLink); ADD_ACTION(Action::WaypointAdd); diff --git a/synfig-studio/src/synfigapp/actions/valuedesclink.cpp b/synfig-studio/src/synfigapp/actions/valuedesclink.cpp index 2f473ee..6afde69 100644 --- a/synfig-studio/src/synfigapp/actions/valuedesclink.cpp +++ b/synfig-studio/src/synfigapp/actions/valuedesclink.cpp @@ -58,6 +58,15 @@ ACTION_SET_PRIORITY(Action::ValueDescLink,0); ACTION_SET_VERSION(Action::ValueDescLink,"0.0"); ACTION_SET_CVS_ID(Action::ValueDescLink,"$Id$"); +ACTION_INIT(Action::ValueDescLinkOpposite); +ACTION_SET_NAME(Action::ValueDescLinkOpposite,"ValueDescLinkOpposite"); +ACTION_SET_LOCAL_NAME(Action::ValueDescLinkOpposite,N_("Link Opposite")); +ACTION_SET_TASK(Action::ValueDescLinkOpposite,"connect"); +ACTION_SET_CATEGORY(Action::ValueDescLinkOpposite,Action::CATEGORY_VALUEDESC); +ACTION_SET_PRIORITY(Action::ValueDescLinkOpposite,0); +ACTION_SET_VERSION(Action::ValueDescLinkOpposite,"0.0"); +ACTION_SET_CVS_ID(Action::ValueDescLinkOpposite,"$Id$"); + /* === G L O B A L S ======================================================= */ /* === P R O C E D U R E S ================================================= */ @@ -65,7 +74,7 @@ ACTION_SET_CVS_ID(Action::ValueDescLink,"$Id$"); /* === M E T H O D S ======================================================= */ Action::ValueDescLink::ValueDescLink(): -poison(false), status_level(0), link_scalar(0.0) +poison(false), status_level(0), link_scalar(0.0), link_opposite(false) { } @@ -306,7 +315,8 @@ Action::ValueDescLink::prepare() } std::list::iterator iter; - Real current_scalar(1.0); + // Gets the scalar value of the current value node + Real current_scalar(value_desc_list.begin()->get_scalar()); bool found_inverse(false); // Check if we are dealing the case of linking differnt types of tangents for(iter=value_desc_list.begin();iter!=value_desc_list.end();++iter) @@ -327,13 +337,13 @@ Action::ValueDescLink::prepare() current_scalar=iter_scalar; } } - else + else // link doesn't describe a tangent { found_inverse=false; break; } } - else + else // parent is not a linkable value node { found_inverse=false; break; @@ -352,13 +362,18 @@ Action::ValueDescLink::prepare() // Don't link the selected to itself (maybe it is redundant with the previous check) if(value_desc.get_value_node() == link_value_node) continue; - // If we found inverse means that all they are tangents and some are differnt scalar (different colors) - if(found_inverse) + // found_inverse xor link_opposite + // If found_inverse and not link_opposite then scale by -1 first (smart link) + // If found inverse and link_opposite then do a direct link instead + // If not found_inverse and not link_opposite then do a direct link instead + // If not found_inverse and link_opposite then scale by -1 first (smart link) + if((found_inverse && !link_opposite) || (!found_inverse && link_opposite)) { //Check if the current value node has opposite scalar than the link // value node to convert to scale -1.0 before connect. // Check also if the link value node is NOT also a scale -1 - if( (value_desc.get_scalar()*link_scalar<0) && (link_is_scaled==false) ) + // And check also if we are linking opposite + if( (value_desc.get_scalar()*link_scalar<0 || link_opposite) && (link_is_scaled==false)) { //Let's create a Scale Value Node synfig::ValueNode::Handle scale_value_node=synfig::LinkableValueNode::create("scale",iter->get_value(time)); @@ -407,7 +422,7 @@ Action::ValueDescLink::prepare() throw Error(Error::TYPE_NOTREADY); add_action_front(action3); } - else if((iter->get_scalar()*link_scalar<0) && (link_is_scaled==true) ) + else if((iter->get_scalar()*link_scalar<0 || link_opposite) && (link_is_scaled==true)) { //Let's connect the link value node -> link to the value node // There is not needed conversion to scale of the value node @@ -457,8 +472,69 @@ Action::ValueDescLink::prepare() add_action_front(action); } - } synfig::info("http://synfig.org/Linking#Tier_%d : %s", status_level, status_message.c_str()); } + + +Action::ValueDescLinkOpposite::ValueDescLinkOpposite() +{ +} + +Action::ParamVocab +Action::ValueDescLinkOpposite::get_param_vocab() +{ + return Action::ValueDescLink::get_param_vocab(); +} + +bool +Action::ValueDescLinkOpposite::is_candidate(const ParamList &x) +{ + // If action parameters are not Value Desc + if(!candidate_check(get_param_vocab(),x)) + return false; + + int total_tangents=0; + ParamList::const_iterator iter; + //Search thru all the Param and pick up the value descriptions + for(iter=x.begin(); iter!=x.end(); iter++) + { + if(iter->first == "value_desc") + { + ValueDesc v_desc(iter->second.get_value_desc()); + // if the value description parent is linkable value node, continue + if(!v_desc.parent_is_linkable_value_node()) + return false; + // if the link describe to any tangent (index 4 or 5), continue + if(v_desc.get_index() != 4 && v_desc.get_index() != 5) + return false; + total_tangents++; + } + } + // If we found two tangents then continue + if(total_tangents!=2) + return false; + // We have reached exactly two tangents + return true; +} + +bool +Action::ValueDescLinkOpposite::set_param(const synfig::String& name, const Action::Param ¶m) +{ + return Action::ValueDescLink::set_param(name,param); +} + +bool +Action::ValueDescLinkOpposite::is_ready()const +{ + return Action::ValueDescLink::is_ready(); +} + +void +Action::ValueDescLinkOpposite::prepare() +{ + // prepare to do a opposite link and reuse the code from ValueDescLink + link_opposite=true; + ValueDescLink::prepare(); +} diff --git a/synfig-studio/src/synfigapp/actions/valuedesclink.h b/synfig-studio/src/synfigapp/actions/valuedesclink.h index b32d442..e7c4ba6 100644 --- a/synfig-studio/src/synfigapp/actions/valuedesclink.h +++ b/synfig-studio/src/synfigapp/actions/valuedesclink.h @@ -7,6 +7,7 @@ ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** Copyright (c) 2007 Chris Moore +** Copyright (c) 2010 Carlos López ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -46,14 +47,27 @@ class ValueDescLink : public Super { private: - + friend class ValueDescLinkOpposite; + //! List of Value Descriptions retrieved from the action Parameters list + //! to be linked std::list value_desc_list; + //! Selected value node from the Value Descriptions (maybe none) + //! to which the others would link synfig::ValueNode::Handle link_value_node; + //! If poison is true then Link is not possible (two exported value nodes found) bool poison; + //! Used to monitorize the tie decision when selecting the link value node int status_level; + //! Message to inform the status of the tie decision when selecting the link value node synfig::String status_message; + //! Time where the value nodes are evaluated synfig::Time time; + //! Scalar value of the link value node. It is used for linking tangents. + //! In the synfig::ParamDesc list there is a value used to draw the tangents on the + //! canvas that is called scalar synfig::Real link_scalar; + //! If true then link opposite is being called. + bool link_opposite; public: ValueDescLink(); @@ -69,6 +83,24 @@ public: ACTION_MODULE_EXT }; +class ValueDescLinkOpposite : + public ValueDescLink +{ +public: + + ValueDescLinkOpposite(); + + static ParamVocab get_param_vocab(); + static bool is_candidate(const ParamList &x); + + virtual bool set_param(const synfig::String& name, const Param &); + virtual bool is_ready()const; + + virtual void prepare(); + + ACTION_MODULE_EXT +}; + }; // END of namespace action }; // END of namespace studio diff --git a/synfig-studio/src/synfigapp/actions/valuedescsmartlink.cpp b/synfig-studio/src/synfigapp/actions/valuedescsmartlink.cpp deleted file mode 100644 index 3114f5b..0000000 --- a/synfig-studio/src/synfigapp/actions/valuedescsmartlink.cpp +++ /dev/null @@ -1,421 +0,0 @@ -/* === S Y N F I G ========================================================= */ -/*! \file valuedescsmartlink.cpp -** \brief Template File -** -** $Id$ -** -** \legal -** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley -** 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 -** published by the Free Software Foundation; either version 2 of -** the License, or (at your option) any later version. -** -** 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 -*/ -/* ========================================================================= */ - -/* === H E A D E R S ======================================================= */ - -#ifdef USING_PCH -# include "pch.h" -#else -#ifdef HAVE_CONFIG_H -# include -#endif - -#include "valuedescsmartlink.h" - -#include -#include -#include - -#include - -#endif - -using namespace std; -using namespace etl; -using namespace synfig; -using namespace synfigapp; -using namespace Action; - -/* === M A C R O S ========================================================= */ - -ACTION_INIT(Action::ValueDescSmartLink); -ACTION_SET_NAME(Action::ValueDescSmartLink,"ValueDescSmartLink"); -ACTION_SET_LOCAL_NAME(Action::ValueDescSmartLink,N_("Smart Link")); -ACTION_SET_TASK(Action::ValueDescSmartLink,"connect"); -ACTION_SET_CATEGORY(Action::ValueDescSmartLink,Action::CATEGORY_HIDDEN); -ACTION_SET_PRIORITY(Action::ValueDescSmartLink,0); -ACTION_SET_VERSION(Action::ValueDescSmartLink,"0.0"); -ACTION_SET_CVS_ID(Action::ValueDescSmartLink,"$Id$"); - -/* === G L O B A L S ======================================================= */ - -/* === P R O C E D U R E S ================================================= */ - -/* === M E T H O D S ======================================================= */ - -Action::ValueDescSmartLink::ValueDescSmartLink(): -poison(false), status_level(0), link_scalar(0.0) -{ -} - -Action::ParamVocab -Action::ValueDescSmartLink::get_param_vocab() -{ - ParamVocab ret(Action::CanvasSpecific::get_param_vocab()); - - ret.push_back(ParamDesc("value_desc",Param::TYPE_VALUEDESC) - .set_local_name(_("ValueDesc to smart link")) - .set_requires_multiple() - ); - - return ret; -} - -bool -Action::ValueDescSmartLink::is_candidate(const ParamList &x) -{ - // If action parameters are not Value Desc - if(!candidate_check(get_param_vocab(),x)) - return false; - - Real current_scalar(1.0); - bool found_inverse(false); - - ParamList::const_iterator iter; - //Search thru all the Param and pick up the value descriptions - for(iter=x.begin(); iter!=x.end(); iter++) - { - if(iter->first == "value_desc") - { - ValueDesc v_desc(iter->second.get_value_desc()); - // if the value description parent is linkable value node, continue - if(!v_desc.parent_is_linkable_value_node()) - return false; - // if the link describe to any tangent (index 4 or 5), continue - if(v_desc.get_index() != 4 && v_desc.get_index() != 5) - return false; - synfig::Real iter_scalar=v_desc.get_scalar(); - // Let's compare the sign of scalar of the value node witht the current one - // and remember if a change of sign is seen. - if(iter_scalar*current_scalar < 0) // if they have different signs - { - found_inverse=true; - current_scalar=iter_scalar; - } - } - } - // If we found two inverse tangents then continue - if(!found_inverse) - return false; - // We have reached two or more opposite tangents - return true; -} - -bool -Action::ValueDescSmartLink::set_param(const synfig::String& name, const Action::Param ¶m) -{ - if(name=="time" && param.get_type()==Param::TYPE_TIME) - { - time=param.get_time(); - return true; - } - - // don't bother looking for the best value to use if there's already been an error - if (poison==true) return false; - - if(name=="value_desc" && param.get_type()==Param::TYPE_VALUEDESC) - { - ValueDesc value_desc(param.get_value_desc()); - - if(value_desc.is_value_node() && value_desc.get_value_node()->is_exported()) - { - if(link_value_node==value_desc.get_value_node()) - return true; - - if(link_value_node && link_value_node->is_exported()) - { - poison=true; - status_message = (_("Cannot link two different exported values ('") + - value_desc.get_value_node()->get_id() + _("' and '") + - link_value_node->get_id()) + _("')"); - return false; - } - - link_value_node=value_desc.get_value_node(); - link_scalar=value_desc.get_scalar(); - status_message = _("Used exported ValueNode ('") + link_value_node->get_id() + _("')."); - } - else if(value_desc.is_value_node()) - { - if(!link_value_node) - { - status_level = 1; - status_message = _("Using the only available ValueNode."); - link_value_node=value_desc.get_value_node(); - link_scalar=value_desc.get_scalar(); - } - else if(link_value_node->is_exported()) - { - // we've already seen an exported value, so use that rather than the current value - } - // Use the one that is referenced more - else if(link_value_node->rcount()!=value_desc.get_value_node()->rcount()) - { - if(link_value_node->rcount()rcount()) - { - status_level = 2; - status_message = _("Using the most referenced ValueNode."); - link_value_node=value_desc.get_value_node(); - link_scalar=value_desc.get_scalar(); - } - else if (status_level <= 2) - { - status_level = 2; - status_message = _("Using the most referenced ValueNode."); - } - } - // If the current link value node is a constant and - // this one isn't, then give preference to the exotic - else if(ValueNode_Const::Handle::cast_dynamic(link_value_node) && !ValueNode_Const::Handle::cast_dynamic(value_desc.get_value_node())) - { - status_level = 3; - status_message = _("There's a tie for most referenced; using the animated ValueNode."); - link_value_node=value_desc.get_value_node(); - link_scalar=value_desc.get_scalar(); - } - else if(ValueNode_Const::Handle::cast_dynamic(value_desc.get_value_node()) && !ValueNode_Const::Handle::cast_dynamic(link_value_node)) - { - if (status_level <= 3) - { - status_level = 3; - status_message = _("There's a tie for most referenced; using the animated ValueNode."); - } - } - // If both are animated, and this one has more waypoints, then use the one with more waypoints - else if(ValueNode_Animated::Handle::cast_dynamic(link_value_node) && - ValueNode_Animated::Handle::cast_dynamic(value_desc.get_value_node()) && - ValueNode_Animated::Handle::cast_dynamic(link_value_node)->waypoint_list().size() != - ValueNode_Animated::Handle::cast_dynamic(value_desc.get_value_node())->waypoint_list().size()) - { - if (ValueNode_Animated::Handle::cast_dynamic(link_value_node)->waypoint_list().size() < - ValueNode_Animated::Handle::cast_dynamic(value_desc.get_value_node())->waypoint_list().size()) - { - status_level = 4; - status_message = _("There's a tie for most referenced, and both are animated; using the one with the most waypoints."); - link_value_node=value_desc.get_value_node(); - link_scalar=value_desc.get_scalar(); - } - else if (status_level <= 4) - { - status_level = 4; - status_message = _("There's a tie for most referenced, and both are animated; using the one with the most waypoints."); - } - } - // If both are Linkable Value Nodes and has waypoint in its children, use the one with more waypoints - else if(LinkableValueNode::Handle::cast_dynamic(link_value_node) && - LinkableValueNode::Handle::cast_dynamic(value_desc.get_value_node()) && - LinkableValueNode::Handle::cast_dynamic(link_value_node)->get_times().size() != - LinkableValueNode::Handle::cast_dynamic(value_desc.get_value_node())->get_times().size()) - { - if(LinkableValueNode::Handle::cast_dynamic(link_value_node)->get_times().size() < - LinkableValueNode::Handle::cast_dynamic(value_desc.get_value_node())->get_times().size()) - { - status_level = 4; - status_message = _("There's a tie for most referenced, and both are linkable value node animated; using the one with the most waypoints."); - link_value_node=value_desc.get_value_node(); - link_scalar=value_desc.get_scalar(); - } - else if (status_level <= 4) - { - status_level = 4; - status_message = _("There's a tie for most referenced, and both are linkable value node animated; using the one with the most waypoints."); - } - } - // Use the one that was least recently changed - else if(link_value_node->get_time_last_changed()!=value_desc.get_value_node()->get_time_last_changed()) - { - if(link_value_node->get_time_last_changed()>value_desc.get_value_node()->get_time_last_changed()) - { - status_level = 5; - status_message = _("Everything is tied; using the least recently modified value."); - link_value_node=value_desc.get_value_node(); - link_scalar=value_desc.get_scalar(); - } - else if (status_level <= 5) - { - status_level = 5; - status_message = _("Everything is tied; using the least recently modified value."); - } - } - else - { - status_level = 6; - status_message = _("Absolutely everything is tied."); - } - } - - if(value_desc_list.size() && value_desc.get_value_type()!=value_desc_list.front().get_value_type()) - { - // Everything must be of the same type - poison=true; - status_message = (strprintf(_("Cannot link two values of different types ('%s' and '%s')"), - ValueBase::type_local_name(value_desc.get_value_type()).c_str(), - ValueBase::type_local_name(value_desc_list.front().get_value_type()).c_str())); - return false; - } - - value_desc_list.push_back(value_desc); - - return true; - } - - return Action::CanvasSpecific::set_param(name,param); -} - -bool -Action::ValueDescSmartLink::is_ready()const -{ - if(poison) - return true; - if(value_desc_list.size()<=1) - return false; - return Action::CanvasSpecific::is_ready(); -} - -void -Action::ValueDescSmartLink::prepare() -{ - if(poison) - throw Error(status_message.c_str()); - - if(value_desc_list.empty()) - throw Error(Error::TYPE_NOTREADY); - - clear(); - - if(!link_value_node) - { - // we should have a value node selected because is_candidate() - // should have checked it before - throw Error(Error::TYPE_BUG); - } - - // Check if the selected link value node is already a scale -1.0 Linkable Value Node - bool link_is_scaled(false); - if(synfig::ValueNode_Scale::Handle::cast_dynamic(link_value_node)) - { - synfig::ValueNode_Const::Handle scale_vn( - synfig::ValueNode_Const::Handle::cast_dynamic( - synfig::ValueNode_Scale::Handle::cast_dynamic(link_value_node)->get_link(1) - ) - ); - if(scale_vn) - if((*scale_vn)(synfig::Time(0))==synfig::ValueBase(Real(-1.0))) - link_is_scaled=true; - } - - //See what is the tangent selected to convert. - std::list::const_iterator vd_iter; - for(vd_iter=value_desc_list.begin(); vd_iter!=value_desc_list.end(); vd_iter++) - { - // Don't link the selected to itself - if(vd_iter->get_value_node() == link_value_node) - continue; - //Check if the current value node has opposite scalar than the link - // value node to convert to scale -1.0 before connect. - // Check also if the link value node is NOT also a scale -1 - if( (vd_iter->get_scalar()*link_scalar<0) && (link_is_scaled==false) ) - { - //Let's create a Scale Value Node - synfig::ValueNode::Handle scale_value_node=synfig::LinkableValueNode::create("scale",vd_iter->get_value(time)); - if(!scale_value_node) - throw Error(Error::TYPE_BUG); - scale_value_node->set_parent_canvas(get_canvas()); - //Let's connect the new Scale Value Node to the value node - Action::Handle action1(Action::create("ValueDescConnect")); - if(!action1) - throw Error(Error::TYPE_CRITICAL); - action1->set_param("canvas",get_canvas()); - action1->set_param("canvas_interface",get_canvas_interface()); - action1->set_param("dest",*vd_iter); - action1->set_param("src",scale_value_node); - assert(action1->is_ready()); - if(!action1->is_ready()) - throw Error(Error::TYPE_NOTREADY); - add_action_front(action1); - - //Let's Connect the link value node to the scale value node link subparam - Action::Handle action2(Action::create("ValueNodeLinkConnect")); - if(!action2) - throw Error(Error::TYPE_CRITICAL); - - action2->set_param("canvas",get_canvas()); - action2->set_param("canvas_interface",get_canvas_interface()); - action2->set_param("parent_value_node",scale_value_node); - action2->set_param("index",0); - action2->set_param("value_node",link_value_node); - assert(action2->is_ready()); - if(!action2->is_ready()) - throw Error(Error::TYPE_NOTREADY); - add_action_front(action2); - - //Let's Set the scale to -1 - Action::Handle action3(Action::create("ValueNodeConstSet")); - if(!action3) - throw Error(Error::TYPE_CRITICAL); - - action3->set_param("canvas",get_canvas()); - action3->set_param("canvas_interface",get_canvas_interface()); - action3->set_param("value_node",synfig::LinkableValueNode::Handle::cast_dynamic(scale_value_node)->get_link(1)); - action3->set_param("new_value",synfig::ValueBase(Real(-1.0))); - assert(action3->is_ready()); - if(!action3->is_ready()) - throw Error(Error::TYPE_NOTREADY); - add_action_front(action3); - } - else if((vd_iter->get_scalar()*link_scalar<0) && (link_is_scaled==true) ) - { - synfig::info("adding action4"); - //Let's connect the link value node -> link to the value node - // There is not needed conversion to scale of the value node - // because the link value node is already a scale -1 - Action::Handle action4(Action::create("ValueDescConnect")); - if(!action4) - throw Error(Error::TYPE_CRITICAL); - action4->set_param("canvas",get_canvas()); - action4->set_param("canvas_interface",get_canvas_interface()); - action4->set_param("dest",*vd_iter); - action4->set_param("src",synfig::ValueNode_Scale::Handle::cast_dynamic(link_value_node)->get_link(0)); - assert(action4->is_ready()); - if(!action4->is_ready()) - throw Error(Error::TYPE_NOTREADY); - add_action_front(action4); - } - else - { - //Let's connect the link value node to the value node - Action::Handle action(Action::create("ValueDescConnect")); - if(!action) - throw Error(Error::TYPE_CRITICAL); - action->set_param("canvas",get_canvas()); - action->set_param("canvas_interface",get_canvas_interface()); - action->set_param("dest",*vd_iter); - action->set_param("src",link_value_node); - assert(action->is_ready()); - if(!action->is_ready()) - throw Error(Error::TYPE_NOTREADY); - add_action_front(action); - } - } - synfig::info("http://synfig.org/Linking#Tier_%d : %s", status_level, status_message.c_str()); -} diff --git a/synfig-studio/src/synfigapp/actions/valuedescsmartlink.h b/synfig-studio/src/synfigapp/actions/valuedescsmartlink.h deleted file mode 100644 index 69c01ea..0000000 --- a/synfig-studio/src/synfigapp/actions/valuedescsmartlink.h +++ /dev/null @@ -1,81 +0,0 @@ -/* === S Y N F I G ========================================================= */ -/*! \file valuedescsmartlink.h -** \brief Template File -** -** $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 -** published by the Free Software Foundation; either version 2 of -** the License, or (at your option) any later version. -** -** 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 -*/ -/* ========================================================================= */ - -/* === S T A R T =========================================================== */ - -#ifndef __SYNFIG_APP_ACTION_VALUEDESCSMARTLINK_H -#define __SYNFIG_APP_ACTION_VALUEDESCSMARTLINK_H - -/* === H E A D E R S ======================================================= */ - -#include -#include -#include - -/* === M A C R O S ========================================================= */ - -/* === T Y P E D E F S ===================================================== */ - -/* === C L A S S E S & S T R U C T S ======================================= */ - -namespace synfigapp { - -namespace Action { - -class ValueDescSmartLink : - public Super -{ -private: - - std::list value_desc_list; - synfig::ValueNode::Handle t1; - synfig::ValueNode::Handle t2; - synfig::ValueNode::Handle link_value_node; - - bool poison; - int status_level; - synfig::String status_message; - synfig::Time time; - synfig::Real link_scalar; - -public: - - ValueDescSmartLink(); - - static ParamVocab get_param_vocab(); - static bool is_candidate(const ParamList &x); - - virtual bool set_param(const synfig::String& name, const Param &); - virtual bool is_ready()const; - - virtual void prepare(); - - ACTION_MODULE_EXT -}; - -}; // END of namespace action -}; // END of namespace studio - -/* === E N D =============================================================== */ - -#endif -- 2.7.4