X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fkeyframeremove.cpp;h=47cd2f209b8d0845cd1256355cc63cd66b15b1f8;hb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;hp=280c7c2cd12d114a51914fff84a94a6455e1f2a0;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp index 280c7c2..47cd2f2 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp @@ -5,16 +5,17 @@ ** $Id: keyframeremove.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** -** 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 */ /* ========================================================================= */ @@ -70,7 +71,7 @@ Action::ParamVocab Action::KeyframeRemove::get_param_vocab() { ParamVocab ret(Action::CanvasSpecific::get_param_vocab()); - + ret.push_back(ParamDesc("keyframe",Param::TYPE_KEYFRAME) .set_local_name(_("Keyframe")) .set_desc(_("Keyframe to be removed")) @@ -80,9 +81,9 @@ Action::KeyframeRemove::get_param_vocab() } bool -Action::KeyframeRemove::is_canidate(const ParamList &x) +Action::KeyframeRemove::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool @@ -91,7 +92,7 @@ Action::KeyframeRemove::set_param(const synfig::String& name, const Action::Para if(name=="keyframe" && param.get_type()==Param::TYPE_KEYFRAME) { keyframe=param.get_keyframe(); - + return true; } @@ -115,9 +116,9 @@ Action::KeyframeRemove::prepare() catch(synfig::Exception::NotFound) { throw Error(_("Unable to find the given keyframe")); - } + } + - { std::vector value_desc_list; get_canvas_interface()->find_important_value_descs(value_desc_list); @@ -131,28 +132,28 @@ Action::KeyframeRemove::prepare() void Action::KeyframeRemove::process_value_desc(const synfigapp::ValueDesc& value_desc) -{ +{ const synfig::Time time(keyframe.get_time()); if(value_desc.is_value_node()) { ValueNode::Handle value_node(value_desc.get_value_node()); - + // If we are a dynamic list, then we need to update the ActivePoints if(ValueNode_DynamicList::Handle::cast_dynamic(value_node)) { - ValueNode_DynamicList::Handle value_node(ValueNode_DynamicList::Handle::cast_dynamic(value_node)); + ValueNode_DynamicList::Handle value_node_dynamic(ValueNode_DynamicList::Handle::cast_dynamic(value_node)); int i; - for(i=0;ilink_count();i++) + for(i=0;ilink_count();i++) try { Activepoint activepoint; - activepoint=*value_node->list[i].find(time); + activepoint=*value_node_dynamic->list[i].find(time); - synfigapp::ValueDesc value_desc(value_node,i); + synfigapp::ValueDesc value_desc(value_node_dynamic,i); Action::Handle action(ActivepointRemove::create()); - + action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("value_desc",value_desc); @@ -161,8 +162,8 @@ Action::KeyframeRemove::process_value_desc(const synfigapp::ValueDesc& value_des assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - - add_action_front(action); + + add_action_front(action); } catch(...) { @@ -171,23 +172,23 @@ Action::KeyframeRemove::process_value_desc(const synfigapp::ValueDesc& value_des else if(ValueNode_Animated::Handle::cast_dynamic(value_node)) try { - ValueNode_Animated::Handle value_node(ValueNode_Animated::Handle::cast_dynamic(value_node)); + ValueNode_Animated::Handle value_node_animated(ValueNode_Animated::Handle::cast_dynamic(value_node)); Waypoint waypoint; - waypoint=*value_node->find(time); + waypoint=*value_node_animated->find(time); assert(waypoint.get_time()==time); - + Action::Handle action(WaypointRemove::create()); - + action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); - action->set_param("value_node",ValueNode::Handle(value_node)); + action->set_param("value_node",ValueNode::Handle(value_node_animated)); action->set_param("waypoint",waypoint); - + assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - - add_action_front(action); + + add_action_front(action); } catch(...) { @@ -200,29 +201,29 @@ void Action::KeyframeRemove::perform() { Action::Super::perform(); - + if(get_canvas_interface()) { get_canvas_interface()->signal_keyframe_removed()(keyframe); } else synfig::warning("CanvasInterface not set on action"); - get_canvas()->keyframe_list().erase(keyframe); + get_canvas()->keyframe_list().erase(keyframe); } void Action::KeyframeRemove::undo() { try { get_canvas()->keyframe_list().find(keyframe.get_time()); throw Error(_("A Keyframe already exists at this point in time"));} - catch(synfig::Exception::NotFound) { } + catch(synfig::Exception::NotFound) { } try { get_canvas()->keyframe_list().find(keyframe); throw Error(_("This keyframe is already in the ValueNode"));} - catch(synfig::Exception::NotFound) { } + catch(synfig::Exception::NotFound) { } Action::Super::undo(); - + get_canvas()->keyframe_list().add(keyframe); - + if(get_canvas_interface()) { get_canvas_interface()->signal_keyframe_added()(keyframe);