X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fkeyframeset.cpp;h=08519322a3d30cae7733a0cf7625c04aae3edcdd;hb=3d5774e06918f597c71486e3efc3edc712e809a8;hp=a2b2a8477e0032c95d170a6b7c230eb697171e7b;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp index a2b2a84..0851932 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp @@ -2,7 +2,7 @@ /*! \file keyframeset.cpp ** \brief Template File ** -** $Id: keyframeset.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 @@ -53,7 +53,7 @@ ACTION_SET_TASK(Action::KeyframeSet,"set"); ACTION_SET_CATEGORY(Action::KeyframeSet,Action::CATEGORY_KEYFRAME|Action::CATEGORY_HIDDEN); ACTION_SET_PRIORITY(Action::KeyframeSet,0); ACTION_SET_VERSION(Action::KeyframeSet,"0.0"); -ACTION_SET_CVS_ID(Action::KeyframeSet,"$Id: keyframeset.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $"); +ACTION_SET_CVS_ID(Action::KeyframeSet,"$Id$"); /* === G L O B A L S ======================================================= */ @@ -71,7 +71,7 @@ Action::ParamVocab Action::KeyframeSet::get_param_vocab() { ParamVocab ret(Action::CanvasSpecific::get_param_vocab()); - + ret.push_back(ParamDesc("keyframe",Param::TYPE_KEYFRAME) .set_local_name(_("New Keyframe")) .set_desc(_("Keyframe to be added")) @@ -81,9 +81,9 @@ Action::KeyframeSet::get_param_vocab() } bool -Action::KeyframeSet::is_canidate(const ParamList &x) +Action::KeyframeSet::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool @@ -95,7 +95,7 @@ Action::KeyframeSet::set_param(const synfig::String& name, const Action::Param & keyframe=param.get_keyframe(); synfig::info("KeyframeSet::set_param():new_time: %s",keyframe.get_time().get_string().c_str()); synfig::info("KeyframeSet::set_param():get_keyframe(): %s",param.get_keyframe().get_time().get_string().c_str()); - + return true; } @@ -115,19 +115,19 @@ Action::KeyframeSet::prepare() { clear(); guid_set.clear(); - - - - + + + + //synfig::info("new_time: %s",new_time.get_string().c_str()); //synfig::info("old_time: %s",old_time.get_string().c_str()); - + try { if(get_canvas()->keyframe_list().find(new_time)!=get_canvas()->keyframe_list().end()) throw Error(_("A Keyframe already exists at this point in time"));} - catch(...) { } + catch(...) { } - // If the times are different, then we + // If the times are different, then we // will need to romp through the valuenodes // and add actions to update their values. if(new_time!=old_time) @@ -149,10 +149,10 @@ Action::KeyframeSet::scale_activepoints(const synfigapp::ValueDesc& value_desc,c { ValueNode_DynamicList::Handle value_node(ValueNode_DynamicList::Handle::cast_static(value_desc.get_parent_value_node())); ValueNode_DynamicList::ListEntry& list_entry(value_node->list[value_desc.get_index()]); - + std::vector selected; std::vector::iterator iter; - + if(list_entry.find(old_begin,old_end,selected)) { // check to make sure this operation is OK @@ -170,18 +170,18 @@ Action::KeyframeSet::scale_activepoints(const synfigapp::ValueDesc& value_desc,c } catch(Exception::NotFound) { } } - + int ret(0); while(!selected.empty()) { if(selected.back()->get_time()!=old_2_new(selected.back()->get_time())) { Action::Handle action(Action::create("activepoint_set")); - + action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("value_desc",value_desc); - + Activepoint activepoint(*selected.back()); activepoint.set_time(old_2_new(selected.back()->get_time())); @@ -190,8 +190,8 @@ Action::KeyframeSet::scale_activepoints(const synfigapp::ValueDesc& value_desc,c assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - - add_action_front(action); + + add_action_front(action); ret++; } @@ -206,10 +206,10 @@ int Action::KeyframeSet::scale_waypoints(const synfigapp::ValueDesc& value_desc,const Time& old_begin,const Time& old_end,const Time& new_begin,const Time& new_end) { ValueNode_Animated::Handle value_node(ValueNode_Animated::Handle::cast_static(value_desc.get_value_node())); - + std::vector selected; std::vector::iterator iter; - + if(value_node->find(old_begin,old_end,selected)) { // check to make sure this operation is OK @@ -229,18 +229,18 @@ Action::KeyframeSet::scale_waypoints(const synfigapp::ValueDesc& value_desc,cons } catch(Exception::NotFound) { } } - + int ret(0); while(!selected.empty()) { if(selected.back()->get_time()!=old_2_new(selected.back()->get_time())) { Action::Handle action(Action::create("waypoint_set")); - + action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("value_node",ValueNode::Handle::cast_static(value_node)); - + Waypoint waypoint(*selected.back()); waypoint.set_time(old_2_new(selected.back()->get_time())); @@ -249,8 +249,8 @@ Action::KeyframeSet::scale_waypoints(const synfigapp::ValueDesc& value_desc,cons assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - - add_action_front(action); + + add_action_front(action); ret++; } @@ -263,9 +263,9 @@ Action::KeyframeSet::scale_waypoints(const synfigapp::ValueDesc& value_desc,cons void Action::KeyframeSet::process_value_desc(const synfigapp::ValueDesc& value_desc) -{ +{ if(value_desc.is_value_node()) - { + { ValueNode::Handle value_node(value_desc.get_value_node()); //if(guid_set.count(value_node->get_guid())) @@ -275,11 +275,11 @@ Action::KeyframeSet::process_value_desc(const synfigapp::ValueDesc& value_desc) // 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++) { - synfigapp::ValueDesc value_desc(value_node,i); + synfigapp::ValueDesc value_desc(value_node_dynamic,i); if(new_time>keyframe_prev && new_timeset_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("value_desc",value_desc); - + Activepoint activepoint; try { - activepoint=*value_node->list[i].find(old_time); + activepoint=*value_node_dynamic->list[i].find(old_time); activepoint.set_time(new_time); } catch(...) { activepoint.set_time(new_time); - activepoint.set_state(value_node->list[i].status_at_time(old_time)); + activepoint.set_state(value_node_dynamic->list[i].status_at_time(old_time)); activepoint.set_priority(0); } action->set_param("activepoint",activepoint); - + assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - + add_action_front(action); } } @@ -330,31 +330,31 @@ Action::KeyframeSet::process_value_desc(const synfigapp::ValueDesc& value_desc) } //else { - 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)); + 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)); - + action->set_param("value_node",ValueNode::Handle(value_node_animated)); + Waypoint waypoint; try { - waypoint=*value_node->find(old_time); + waypoint=*value_node_animated->find(old_time); waypoint.set_time(new_time); } catch(...) { waypoint.set_time(new_time); - waypoint.set_value((*value_node)(old_time)); + waypoint.set_value((*value_node_animated)(old_time)); } action->set_param("waypoint",waypoint); - + assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - + add_action_front(action); } } @@ -368,13 +368,13 @@ Action::KeyframeSet::perform() old_time=get_canvas()->keyframe_list().find(keyframe)->get_time(); new_time=keyframe.get_time(); - + try { get_canvas()->keyframe_list().find(keyframe);} catch(synfig::Exception::NotFound) { throw Error(_("Unable to find the given keyframe")); - } - + } + // Check for colisions if(old_time!=new_time) { @@ -391,7 +391,7 @@ Action::KeyframeSet::perform() old_keyframe=*get_canvas()->keyframe_list().find(keyframe); *get_canvas()->keyframe_list().find(keyframe)=keyframe; - + get_canvas()->keyframe_list().sync(); try{ @@ -403,7 +403,7 @@ Action::KeyframeSet::perform() get_canvas()->keyframe_list().sync(); throw; } - + // Signal that a layer has been inserted if(get_canvas_interface()) { @@ -420,7 +420,7 @@ Action::KeyframeSet::undo() *get_canvas()->keyframe_list().find(old_keyframe)=old_keyframe; get_canvas()->keyframe_list().sync(); - + // Signal that a layer has been inserted if(get_canvas_interface()) {