From: Carlos Lopez Date: Fri, 3 Sep 2010 17:10:04 +0000 (+0200) Subject: New Value Description Smart Link action. It doesn't perform anything yet. X-Git-Url: https://git.pterodactylus.net/?p=synfig.git;a=commitdiff_plain;h=a0d50c5a21f848f31af8dbf6c920c2c3fe235d22 New Value Description Smart Link action. It doesn't perform anything yet. --- diff --git a/synfig-studio/src/synfigapp/Makefile.am b/synfig-studio/src/synfigapp/Makefile.am index 40d466c..ddf38b0 100644 --- a/synfig-studio/src/synfigapp/Makefile.am +++ b/synfig-studio/src/synfigapp/Makefile.am @@ -46,6 +46,7 @@ VALUEDESC_ACTION_HH = \ actions/valuedescdisconnect.h \ actions/valuedescexport.h \ actions/valuedesclink.h \ + actions/valuedescsmartlink.h \ actions/valuedescblinelink.h \ actions/valuedescset.h @@ -55,6 +56,7 @@ 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 21d5f0c..f35d9a1 100644 --- a/synfig-studio/src/synfigapp/action.cpp +++ b/synfig-studio/src/synfigapp/action.cpp @@ -72,6 +72,7 @@ #include "actions/valuedescconnect.h" #include "actions/valuedescdisconnect.h" #include "actions/valuedesclink.h" +#include "actions/valuedescsmartlink.h" #include "actions/valuedescblinelink.h" #include "actions/waypointadd.h" @@ -196,6 +197,7 @@ Action::Main::Main() ADD_ACTION(Action::ValueDescConnect); ADD_ACTION(Action::ValueDescDisconnect); ADD_ACTION(Action::ValueDescLink); + ADD_ACTION(Action::ValueDescSmartLink); ADD_ACTION(Action::ValueDescBLineLink); ADD_ACTION(Action::WaypointAdd); diff --git a/synfig-studio/src/synfigapp/actions/valuedescsmartlink.cpp b/synfig-studio/src/synfigapp/actions/valuedescsmartlink.cpp new file mode 100644 index 0000000..9955984 --- /dev/null +++ b/synfig-studio/src/synfigapp/actions/valuedescsmartlink.cpp @@ -0,0 +1,319 @@ +/* === 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_VALUEDESC); +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) +{ +} + +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; + // If the size of the List of Param is not two + + // If both value desc aren't Linkable Value Nodes children + ParamList::const_iterator iter; + int counter=0; + Param params[2]; + for(iter=x.begin(); iter!=x.end(); iter++) + { + if(iter->first == "value_desc") + { + params[counter]=iter->second; + counter++; + } + if (counter>2) + return false; + } + Param pfront(params[0]); + Param pback(params[1]); + if(!pfront.get_value_desc().parent_is_linkable_value_node() || + !pback.get_value_desc().parent_is_linkable_value_node()) + return false; + // If both don't have opposite scalars. + if(!((pback.get_value_desc().get_scalar()< 0 && pfront.get_value_desc().get_scalar()> 0) + || + (pback.get_value_desc().get_scalar()> 0 && pfront.get_value_desc().get_scalar()< 0)) + ) + return false; + + //We have reached two 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(); + 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(); + } + 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(); + } + 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(); + } + 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(); + } + 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."); + } + } + // 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(); + } + 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()!=2) + 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(value_desc_list.size()!=2) + throw Error(Error::TYPE_BUG); + + ValueDesc& value_desc_t1(value_desc_list.front()); + ValueDesc& value_desc_t2(value_desc_list.back()); + t1 = value_desc_t1.get_value_node(); + t2 = value_desc_t2.get_value_node(); + + if(!link_value_node) + { + throw Error(Error::TYPE_BUG); + } + + //Study the particular case of two tangents of a bline being linked. + ValueDesc& toconvert; + if(t1==link_value_node) + { + // Convert t2 + synfig::info("converting t2"); + toconvert=value_desc_t2; + } + else if(t2==link_value_node) + { + //Convert t1 + synfig::info("converting t1"); + toconvert=value_desc_t1; + } + else { synfig::info("error"); } + + + Action::Handle action(Action::create("ValueDescConvert")); + action->set_param("canvas",get_canvas()); + action->set_param("canvas_interface",get_canvas_interface()); + action->set_param("time",time); + action->set_param("type","scalar"); + action->set_param("value_desc",toconvert); + 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 new file mode 100644 index 0000000..3904793 --- /dev/null +++ b/synfig-studio/src/synfigapp/actions/valuedescsmartlink.h @@ -0,0 +1,80 @@ +/* === 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; + +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