X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Factivepointsetsmart.cpp;h=66d511723e79daa7863bbe6654a6b4feec9204fe;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=6a1c9a6d079bdc879762b1dd3bcbd0a6845ef4ba;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp index 6a1c9a6..66d5117 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp @@ -2,19 +2,21 @@ /*! \file activepointsetsmart.cpp ** \brief Template File ** -** $Id: activepointsetsmart.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $ +** $Id$ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2008 Chris Moore ** -** 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 */ /* ========================================================================= */ @@ -38,6 +40,8 @@ #include "valuedescconnect.h" #include +#include + #endif using namespace std; @@ -49,13 +53,13 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ActivepointSetSmart); -ACTION_SET_NAME(Action::ActivepointSetSmart,"activepoint_set_smart"); -ACTION_SET_LOCAL_NAME(Action::ActivepointSetSmart,_("Set Activepoint (Smart)")); +ACTION_SET_NAME(Action::ActivepointSetSmart,"ActivepointSetSmart"); +ACTION_SET_LOCAL_NAME(Action::ActivepointSetSmart,N_("Set Activepoint (Smart)")); ACTION_SET_TASK(Action::ActivepointSetSmart,"set"); ACTION_SET_CATEGORY(Action::ActivepointSetSmart,Action::CATEGORY_ACTIVEPOINT); ACTION_SET_PRIORITY(Action::ActivepointSetSmart,0); ACTION_SET_VERSION(Action::ActivepointSetSmart,"0.0"); -ACTION_SET_CVS_ID(Action::ActivepointSetSmart,"$Id: activepointsetsmart.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $"); +ACTION_SET_CVS_ID(Action::ActivepointSetSmart,"$Id$"); /* === G L O B A L S ======================================================= */ @@ -74,7 +78,7 @@ Action::ParamVocab Action::ActivepointSetSmart::get_param_vocab() { ParamVocab ret(Action::CanvasSpecific::get_param_vocab()); - + ret.push_back(ParamDesc("value_desc",Param::TYPE_VALUEDESC) .set_local_name(_("ValueDesc")) ); @@ -90,24 +94,23 @@ Action::ActivepointSetSmart::get_param_vocab() .set_desc(_("Time where activepoint is to be added")) .set_optional() ); - + return ret; } bool -Action::ActivepointSetSmart::is_canidate(const ParamList &x) +Action::ActivepointSetSmart::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 need either a activepoint or a time. - if(x.count("activepoint") || x.count("time")) - return true; - } - return false; + ValueDesc value_desc(x.find("value_desc")->second.get_value_desc()); + + return (value_desc.parent_is_value_node() && + // We need a dynamic list. + ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node()) && + // We need either an activepoint or a time. + (x.count("activepoint") || x.count("time"))); } bool @@ -116,26 +119,26 @@ Action::ActivepointSetSmart::set_param(const synfig::String& name, const Action: 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) @@ -145,7 +148,7 @@ Action::ActivepointSetSmart::set_param(const synfig::String& name, const Action: if(value_node) calc_activepoint(); - + return true; } @@ -162,18 +165,18 @@ Action::ActivepointSetSmart::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::ActivepointSetSmart::calc_activepoint() -{ +{ /* const Time time(activepoint.get_time()); activepoint.set_state(value_node->list[index].status_at_time(time)); @@ -190,7 +193,7 @@ Action::ActivepointSetSmart::calc_activepoint() void Action::ActivepointSetSmart::enclose_activepoint(const synfig::Activepoint& activepoint) { - times.insert(activepoint.get_time()); + times.insert(activepoint.get_time()); if(get_edit_mode()&MODE_ANIMATE_PAST) try { @@ -200,25 +203,25 @@ Action::ActivepointSetSmart::enclose_activepoint(const synfig::Activepoint& acti if(times.count(keyframe.get_time())) throw int(); else - times.insert(keyframe.get_time()); - + times.insert(keyframe.get_time()); + try { value_node->list[index].find(keyframe.get_time()); } catch(synfig::Exception::NotFound) { Action::Handle action(ActivepointAdd::create()); - + action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("value_desc",value_desc); - + if(!value_node->list[index].timing_info.empty()) - { + { action->set_param("time",keyframe.get_time()); } else { synfig::Activepoint tmp; - + tmp.set_state(true); tmp.set_time(keyframe.get_time()); action->set_param("activepoint",tmp); @@ -227,9 +230,9 @@ Action::ActivepointSetSmart::enclose_activepoint(const synfig::Activepoint& acti assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - + add_action_front(action); - } + } } catch(int) { } catch(synfig::Exception::NotFound) { } @@ -242,25 +245,25 @@ Action::ActivepointSetSmart::enclose_activepoint(const synfig::Activepoint& acti if(times.count(keyframe.get_time())) throw int(); else - times.insert(keyframe.get_time()); - + times.insert(keyframe.get_time()); + try { value_node->list[index].find(keyframe.get_time()); } catch(synfig::Exception::NotFound) { Action::Handle action(ActivepointAdd::create()); - + action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("value_desc",value_desc); - + if(!value_node->list[index].timing_info.empty()) - { + { action->set_param("time",keyframe.get_time()); } else { synfig::Activepoint tmp; - + tmp.set_state(true); tmp.set_time(keyframe.get_time()); action->set_param("activepoint",tmp); @@ -269,9 +272,9 @@ Action::ActivepointSetSmart::enclose_activepoint(const synfig::Activepoint& acti assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - + add_action_front(action); - } + } } catch(int) { } catch(synfig::Exception::NotFound) { } @@ -282,32 +285,32 @@ Action::ActivepointSetSmart::prepare() { clear(); times.clear(); - - // First, we need to to add any activepoints necessary to + + // First, we need to add any activepoints necessary to // maintain the integrity of the keyframes. enclose_activepoint(activepoint); - + try { if(value_node->list[index].find(activepoint)==value_node->list[index].timing_info.end()) throw int(); - - // Then, lets try to replace the old activepoint, if it exists + + // Then, let's try to replace the old activepoint, if it exists enclose_activepoint(*value_node->list[index].find(activepoint)); Action::Handle action(ActivepointSet::create()); - + action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("value_desc",value_desc); action->set_param("activepoint",activepoint); - + assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - + add_action_front(action); - + return; } catch(int){} @@ -319,46 +322,46 @@ Action::ActivepointSetSmart::prepare() activepoint.mimic(*value_node->list[index].find(activepoint.get_time())); enclose_activepoint(*value_node->list[index].find(activepoint.get_time())); - + Action::Handle action(ActivepointSet::create()); - + action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("value_desc",value_desc); action->set_param("activepoint",activepoint); - + assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - + add_action_front(action); - + return; } catch(int){} catch(Exception::NotFound){} - + try { // At this point we know that the old activepoint doesn't exist, // so we need to create it. Action::Handle action(ActivepointAdd::create()); - + action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("value_desc",value_desc); action->set_param("activepoint",activepoint); - + assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - + add_action_front(action); - + return; } catch(int){} catch(Exception::NotFound){} - - throw Error(_("Unable to determine how to procede. This is a bug.")); + + throw Error(_("Unable to determine how to proceed. This is a bug.")); }