X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fwaypointsetsmart.cpp;h=eb403aca59f3cc5eb0c28c00d72c3490b38d5ff4;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=03c943172b7da0b8cb484fc6f26e1ddeb1fdda0c;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp index 03c9431..eb403ac 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp @@ -2,10 +2,11 @@ /*! \file waypointsetsmart.cpp ** \brief Template File ** -** $Id: waypointsetsmart.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) 2007 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 @@ -41,6 +42,8 @@ #include #include +#include + #endif using namespace std; @@ -52,20 +55,14 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::WaypointSetSmart); -ACTION_SET_NAME(Action::WaypointSetSmart,"waypoint_set_smart"); -ACTION_SET_LOCAL_NAME(Action::WaypointSetSmart,"Connect"); +ACTION_SET_NAME(Action::WaypointSetSmart,"WaypointSetSmart"); +ACTION_SET_LOCAL_NAME(Action::WaypointSetSmart,N_("Add Waypoint")); ACTION_SET_TASK(Action::WaypointSetSmart,"set"); ACTION_SET_CATEGORY(Action::WaypointSetSmart,Action::CATEGORY_WAYPOINT|Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::WaypointSetSmart,0); ACTION_SET_VERSION(Action::WaypointSetSmart,"0.0"); -ACTION_SET_CVS_ID(Action::WaypointSetSmart,"$Id: waypointsetsmart.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $"); - +ACTION_SET_CVS_ID(Action::WaypointSetSmart,"$Id$"); -/*#ifdef DEBUGPOINT -#undef DEBUGPOINT -#endif -#define DEBUGPOINT() -*/ /* === G L O B A L S ======================================================= */ /* === P R O C E D U R E S ================================================= */ @@ -83,7 +80,7 @@ Action::ParamVocab Action::WaypointSetSmart::get_param_vocab() { ParamVocab ret(Action::CanvasSpecific::get_param_vocab()); - + ret.push_back(ParamDesc("value_node",Param::TYPE_VALUENODE) .set_local_name(_("Destination ValueNode (Animated)")) ); @@ -104,23 +101,18 @@ Action::WaypointSetSmart::get_param_vocab() .set_desc(_("Time where waypoint is to be added")) .set_optional() ); - + return ret; } bool -Action::WaypointSetSmart::is_canidate(const ParamList &x) +Action::WaypointSetSmart::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),x)) - { - if(!ValueNode_Animated::Handle::cast_dynamic(x.find("value_node")->second.get_value_node())) - return false; - // We need either a waypoint or a time. - if(x.count("waypoint") || x.count("time")) - return true; - return false; - } - return false; + return (candidate_check(get_param_vocab(),x) && + // We need an animated valuenode. + ValueNode_Animated::Handle::cast_dynamic(x.find("value_node")->second.get_value_node()) && + // We need either a waypoint or a time. + (x.count("waypoint") || x.count("time"))); } bool @@ -129,17 +121,15 @@ Action::WaypointSetSmart::set_param(const synfig::String& name, const Action::Pa if(name=="value_node" && param.get_type()==Param::TYPE_VALUENODE) { value_node=ValueNode_Animated::Handle::cast_dynamic(param.get_value_node()); - DEBUGPOINT(); if(time_set) calc_waypoint(); - + return static_cast(value_node); } if(name=="waypoint" && param.get_type()==Param::TYPE_WAYPOINT && !time_set) { waypoint=param.get_waypoint(); - DEBUGPOINT(); - + return true; } @@ -150,8 +140,7 @@ Action::WaypointSetSmart::set_param(const synfig::String& name, const Action::Pa if(value_node) calc_waypoint(); - DEBUGPOINT(); - + return true; } @@ -161,7 +150,7 @@ Action::WaypointSetSmart::set_param(const synfig::String& name, const Action::Pa calc_waypoint(); waypoint.apply_model(param.get_waypoint_model()); - + return true; } @@ -176,20 +165,19 @@ Action::WaypointSetSmart::is_ready()const if(waypoint.get_time()==(Time::begin()-1)) synfig::error("Missing waypoint"); - + if(!value_node || waypoint.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 waypoint. In this case, we need to calculate the value // of the waypoint void Action::WaypointSetSmart::calc_waypoint() { - DEBUGPOINT(); - Time time=waypoint.get_time(); + Time time=waypoint.get_time(); try { // Trivial case, we are sitting on a waypoint @@ -197,7 +185,7 @@ Action::WaypointSetSmart::calc_waypoint() } catch(...) { - waypoint=value_node->new_waypoint_at_time(time); + waypoint=value_node->new_waypoint_at_time(time); waypoint.set_before(synfigapp::Main::get_interpolation()); waypoint.set_after(synfigapp::Main::get_interpolation()); } @@ -205,7 +193,7 @@ Action::WaypointSetSmart::calc_waypoint() Time time=waypoint.get_time(); ValueNode_Animated::WaypointList &waypoint_list(value_node->waypoint_list()); ValueNode_Animated::WaypointList::iterator iter; - + if(waypoint_list.empty()) { waypoint.set_value((*value_node)(time)); @@ -213,7 +201,7 @@ Action::WaypointSetSmart::calc_waypoint() } ValueNode_Animated::WaypointList::iterator closest=waypoint_list.begin(); - + for(iter=waypoint_list.begin();iter!=waypoint_list.end();++iter) { const Real dist(abs(iter->get_time()-time)); @@ -230,21 +218,19 @@ Action::WaypointSetSmart::calc_waypoint() void Action::WaypointSetSmart::enclose_waypoint(const synfig::Waypoint& waypoint) { - times.insert(waypoint.get_time()); - + times.insert(waypoint.get_time()); + try { times.insert(value_node->find(waypoint)->get_time()); // synfig::info(__FILE__":%d: value_node->find(waypoint)->get_time()=%s",__LINE__,value_node->find(waypoint)->get_time().get_string().c_str()); -// DEBUGPOINT(); }catch (...) { } - -// DEBUGPOINT(); - // First we need to to add any waypoints necessary to - // maintain the integrity of the keyframes. + + // First we need to add any waypoints necessary to + // maintain the integrity of the keyframes. if(get_edit_mode()&MODE_ANIMATE_PAST) try { Time curr_time(waypoint.get_time()); - + //while(value_node->waypoint_list().front().get_time()<=curr_time) { // Try to find prev keyframe @@ -253,21 +239,17 @@ Action::WaypointSetSmart::enclose_waypoint(const synfig::Waypoint& waypoint) // synfig::info(__FILE__":%d: prev_keyframe->time=%s",__LINE__,keyframe.get_time().get_string().c_str()); // synfig::info(__FILE__":%d: waypoint->time=%s",__LINE__,waypoint.get_time().get_string().c_str()); - -// DEBUGPOINT(); + if(times.count(keyframe.get_time())) { -// DEBUGPOINT(); throw int(); } if(waypoint.get_time().is_equal(keyframe.get_time())) { -// DEBUGPOINT(); throw int(); } - times.insert(keyframe.get_time()); -// DEBUGPOINT(); + times.insert(keyframe.get_time()); try { value_node->find(keyframe.get_time()); @@ -276,139 +258,131 @@ Action::WaypointSetSmart::enclose_waypoint(const synfig::Waypoint& waypoint) catch(synfig::Exception::NotFound) { Action::Handle action(WaypointAdd::create()); - + action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("value_node",ValueNode::Handle(value_node)); - + if(!value_node->waypoint_list().empty()) - { + { action->set_param("time",keyframe.get_time()); } else { synfig::Waypoint tmp; - + tmp.set_value(waypoint.get_value()); tmp.set_time(keyframe.get_time()); action->set_param("waypoint",tmp); } - + assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - + add_action(action); - } - } + } + } } catch(Error x) { throw x; } - catch(synfig::Exception::NotFound) { DEBUGPOINT(); } - catch(int) { DEBUGPOINT(); } - catch(...) { DEBUGPOINT(); } - //DEBUGPOINT(); + catch(synfig::Exception::NotFound) { } + catch(int) { } + catch(...) { } - //DEBUGPOINT(); if(get_edit_mode()&MODE_ANIMATE_FUTURE)try { Time curr_time(waypoint.get_time()); - + //while(value_node->waypoint_list().back().get_time()>=curr_time) { - - //DEBUGPOINT(); + // Try to find next keyframe //synfig::info("FUTURE waypoint.get_time()=%s",waypoint.get_time().get_string().c_str()); Keyframe keyframe(*get_canvas()->keyframe_list().find_next(curr_time)); //synfig::info("FUTURE keyframe.get_time()=%s",keyframe.get_time().get_string().c_str()); curr_time=keyframe.get_time(); - - //DEBUGPOINT(); + if(times.count(keyframe.get_time())|| waypoint.get_time().is_equal(keyframe.get_time())) throw int(); else - times.insert(keyframe.get_time()); - //DEBUGPOINT(); - + times.insert(keyframe.get_time()); + try { value_node->find(keyframe.get_time()); synfig::info(__FILE__":%d: time=%s",__LINE__,keyframe.get_time().get_string().c_str()); synfig::info(__FILE__":%d: waypointtime=%s",__LINE__,value_node->find(keyframe.get_time())->get_time().get_string().c_str()); - + } catch(synfig::Exception::NotFound) { Action::Handle action(WaypointAdd::create()); - + action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("value_node",ValueNode::Handle(value_node)); - + if(!value_node->waypoint_list().empty()) - { + { action->set_param("time",keyframe.get_time()); } else { synfig::Waypoint tmp; - + tmp.set_value(waypoint.get_value()); tmp.set_time(keyframe.get_time()); action->set_param("waypoint",tmp); } - + assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - + add_action(action); } } - //DEBUGPOINT(); } catch(Error x) { throw x; } - catch(synfig::Exception::NotFound) { DEBUGPOINT(); } - catch(int) { DEBUGPOINT(); } - catch(...) { DEBUGPOINT(); } - //DEBUGPOINT(); + catch(synfig::Exception::NotFound) { } + catch(int) { } + catch(...) { } } void Action::WaypointSetSmart::prepare() { - //DEBUGPOINT(); clear(); times.clear(); - - // First we need to to add any waypoints necessary to - // maintain the integrity of the keyframes. + + // First we need to add any waypoints necessary to + // maintain the integrity of the keyframes. enclose_waypoint(waypoint); try { //synfig::info("WaypointSetSmart: Move/Update?"); - // Lets try to replace the old waypoint, if it exists + // Let's try to replace the old waypoint, if it exists WaypointList::iterator iter(value_node->find(waypoint)); - + if(iter == value_node->waypoint_list().end()) throw int(); - + enclose_waypoint(*iter); Action::Handle action(WaypointSet::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("waypoint",waypoint); - + assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - + add_action(action); - + return; } catch(synfig::Exception::NotFound){ } catch(int){ } @@ -416,53 +390,51 @@ Action::WaypointSetSmart::prepare() try { //synfig::info("WaypointSetSmart: Replace?"); - //DEBUGPOINT(); // Check to see if a waypoint exists at this point in time WaypointList::iterator iter=value_node->find(waypoint.get_time()); - + waypoint.mimic(*iter); enclose_waypoint(*iter); - + Action::Handle action(WaypointSet::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("waypoint",waypoint); - + assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - + add_action(action); - + return; } catch(synfig::Exception::NotFound){ } catch(int){ } - + try { //synfig::info("WaypointSetSmart: Add?"); - //DEBUGPOINT(); // At this point we know that the old waypoint doesn't exist, // so we need to create it. Action::Handle action(WaypointAdd::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("waypoint",waypoint); - + assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - + add_action(action); - + return; } catch(synfig::Exception::NotFound){ } catch(int){ } - throw Error(_("Unable to determine how to procede. This is a bug.")); + throw Error(_("Unable to determine how to proceed. This is a bug.")); }