X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fkeyframewaypointset.cpp;h=b587397d3de55a69f19ae300c72eacb624a59359;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=a85b70e771f8e694f9d2348950fd20f76192a4c6;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.cpp index a85b70e..b587397 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.cpp @@ -1,8 +1,8 @@ /* === S Y N F I G ========================================================= */ -/*! \file keyframeset.cpp +/*! \file keyframewaypointset.cpp ** \brief Template File ** -** $Id: keyframewaypointset.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 @@ -36,6 +36,8 @@ #include "activepointsetsmart.h" #include "waypointsetsmart.h" +#include + #endif using namespace std; @@ -47,13 +49,13 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::KeyframeWaypointSet); -ACTION_SET_NAME(Action::KeyframeWaypointSet,"keyframe_waypoint_set"); -ACTION_SET_LOCAL_NAME(Action::KeyframeWaypointSet,"Set Waypoints at Keyframe"); +ACTION_SET_NAME(Action::KeyframeWaypointSet,"KeyframeWaypointSet"); +ACTION_SET_LOCAL_NAME(Action::KeyframeWaypointSet,N_("Set Waypoints at Keyframe")); ACTION_SET_TASK(Action::KeyframeWaypointSet,"set"); ACTION_SET_CATEGORY(Action::KeyframeWaypointSet,Action::CATEGORY_KEYFRAME); ACTION_SET_PRIORITY(Action::KeyframeWaypointSet,0); ACTION_SET_VERSION(Action::KeyframeWaypointSet,"0.0"); -ACTION_SET_CVS_ID(Action::KeyframeWaypointSet,"$Id: keyframewaypointset.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $"); +ACTION_SET_CVS_ID(Action::KeyframeWaypointSet,"$Id$"); /* === G L O B A L S ======================================================= */ @@ -71,7 +73,7 @@ Action::ParamVocab Action::KeyframeWaypointSet::get_param_vocab() { ParamVocab ret(Action::CanvasSpecific::get_param_vocab()); - + ret.push_back(ParamDesc("keyframe",Param::TYPE_KEYFRAME) .set_local_name(_("Keyframe")) ); @@ -84,9 +86,9 @@ Action::KeyframeWaypointSet::get_param_vocab() } bool -Action::KeyframeWaypointSet::is_canidate(const ParamList &x) +Action::KeyframeWaypointSet::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool @@ -95,13 +97,13 @@ Action::KeyframeWaypointSet::set_param(const synfig::String& name, const Action: if(name=="keyframe" && param.get_type()==Param::TYPE_KEYFRAME) { keyframe=param.get_keyframe(); - + return true; } if(name=="model" && param.get_type()==Param::TYPE_WAYPOINTMODEL) { waypoint_model=param.get_waypoint_model(); - + return true; } @@ -125,7 +127,7 @@ Action::KeyframeWaypointSet::prepare() catch(synfig::Exception::NotFound) { throw Error(_("Unable to find the given keyframe")); - } + } { std::vector value_desc_list; @@ -140,19 +142,19 @@ Action::KeyframeWaypointSet::prepare() void Action::KeyframeWaypointSet::process_value_desc(const synfigapp::ValueDesc& value_desc) -{ +{ if(value_desc.is_value_node()) { ValueNode_Animated::Handle value_node(ValueNode_Animated::Handle::cast_dynamic(value_desc.get_value_node())); - + if(value_node) - { + { Action::Handle action(WaypointSetSmart::create()); - + action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("value_node",ValueNode::Handle(value_node)); - + Waypoint waypoint; try { @@ -164,14 +166,14 @@ Action::KeyframeWaypointSet::process_value_desc(const synfigapp::ValueDesc& valu waypoint.set_value((*value_node)(keyframe.get_time())); } waypoint.apply_model(waypoint_model); - + 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); } } }