X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Factivepointseton.cpp;h=f0384485f24c73cb5fe04534626d877bd0843189;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=75f678f06f75ae813620666daf795372c83d1097;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp index 75f678f..f038448 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp @@ -2,10 +2,11 @@ /*! \file activepointseton.cpp ** \brief Template File ** -** $Id: activepointseton.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $ +** $Id$ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 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 @@ -40,6 +41,8 @@ #include "valuedescconnect.h" #include +#include + #endif using namespace std; @@ -51,13 +54,13 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ActivepointSetOn); -ACTION_SET_NAME(Action::ActivepointSetOn,"activepoint_set_on"); -ACTION_SET_LOCAL_NAME(Action::ActivepointSetOn,_("Mark Activepoint as \"On\"")); +ACTION_SET_NAME(Action::ActivepointSetOn,"ActivepointSetOn"); +ACTION_SET_LOCAL_NAME(Action::ActivepointSetOn,N_("Mark Activepoint as \"On\"")); ACTION_SET_TASK(Action::ActivepointSetOn,"set_on"); ACTION_SET_CATEGORY(Action::ActivepointSetOn,Action::CATEGORY_ACTIVEPOINT|Action::CATEGORY_VALUEDESC); ACTION_SET_PRIORITY(Action::ActivepointSetOn,-10); ACTION_SET_VERSION(Action::ActivepointSetOn,"0.0"); -ACTION_SET_CVS_ID(Action::ActivepointSetOn,"$Id: activepointseton.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $"); +ACTION_SET_CVS_ID(Action::ActivepointSetOn,"$Id$"); /* === G L O B A L S ======================================================= */ @@ -76,7 +79,7 @@ Action::ParamVocab Action::ActivepointSetOn::get_param_vocab() { ParamVocab ret(Action::CanvasSpecific::get_param_vocab()); - + ret.push_back(ParamDesc("value_desc",Param::TYPE_VALUEDESC) .set_local_name(_("ValueDesc")) ); @@ -90,29 +93,29 @@ Action::ActivepointSetOn::get_param_vocab() .set_local_name(_("Time")) .set_optional() ); - + return ret; } bool -Action::ActivepointSetOn::is_canidate(const ParamList &x) +Action::ActivepointSetOn::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) - { - ValueDesc value_desc(x.find("value_desc")->second.get_value_desc()); - if(!value_desc.parent_is_value_node() || !ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node())) - return false; + if (!candidate_check(get_param_vocab(),x)) + return false; - // We are only a canidate if this canvas is animated. - Canvas::Handle canvas(x.find("canvas")->second.get_canvas()); - if(canvas->rend_desc().get_time_start()==canvas->rend_desc().get_time_end()) - return false; + ValueDesc value_desc(x.find("value_desc")->second.get_value_desc()); - // We need either a activepoint or a time. - if(x.count("activepoint") || x.count("time")) - return true; - } - return false; + if (!(value_desc.parent_is_value_node() && + // We need a dynamic list. + ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node()))) + return false; + + Canvas::Handle canvas(x.find("canvas")->second.get_canvas()); + + // We are only a candidate if this canvas is animated. + return (canvas->rend_desc().get_time_start() != canvas->rend_desc().get_time_end() && + // We need either an activepoint or a time. + (x.count("activepoint") || x.count("time"))); } bool @@ -121,26 +124,26 @@ Action::ActivepointSetOn::set_param(const synfig::String& name, const Action::Pa if(name=="value_desc" && param.get_type()==Param::TYPE_VALUEDESC) { value_desc=param.get_value_desc(); - + if(!value_desc.parent_is_value_node()) return false; - + value_node=ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node()); - + if(!value_node) return false; - + index=value_desc.get_index(); - + if(time_set) calc_activepoint(); - + return true; } if(name=="activepoint" && param.get_type()==Param::TYPE_ACTIVEPOINT && !time_set) { activepoint=param.get_activepoint(); - + return true; } if(name=="time" && param.get_type()==Param::TYPE_TIME && activepoint.get_time()==Time::begin()-1) @@ -150,7 +153,7 @@ Action::ActivepointSetOn::set_param(const synfig::String& name, const Action::Pa if(value_node) calc_activepoint(); - + return true; } @@ -165,20 +168,20 @@ Action::ActivepointSetOn::is_ready()const if(activepoint.get_time()==(Time::begin()-1)) synfig::error("Missing activepoint"); - + if(!value_node || activepoint.get_time()==(Time::begin()-1)) return false; return Action::CanvasSpecific::is_ready(); } -// This function is called if a time is specified, but not +// This function is called if a time is specified, but not // a activepoint. In this case, we need to calculate the value // of the activepoint void Action::ActivepointSetOn::calc_activepoint() -{ +{ const Time time(activepoint.get_time()); - + try { activepoint=*value_node->list[index].find(time); } catch(...) { @@ -197,7 +200,7 @@ Action::ActivepointSetOn::prepare() activepoint.set_state(true); Action::Handle action(ActivepointSetSmart::create()); - + action->set_param("edit_mode",get_edit_mode()); action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); @@ -209,5 +212,5 @@ Action::ActivepointSetOn::prepare() throw Error(Error::TYPE_NOTREADY); add_action_front(action); - + }