X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluenodedynamiclistinsertsmart.cpp;h=893a765f9cbcfdcc210748c8b446360b9d163a43;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=6413c1816db250afe7d9eadf3b51c54bbfb625c3;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp index 6413c18..893a765 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp @@ -2,10 +2,11 @@ /*! \file valuenodedynamiclistinsertsmart.cpp ** \brief Template File ** -** $Id: valuenodedynamiclistinsertsmart.cpp,v 1.3 2005/01/17 05:20:08 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 @@ -33,6 +34,8 @@ #include "valuenodedynamiclistinsert.h" #include +#include + #endif using namespace std; @@ -44,13 +47,13 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ValueNodeDynamicListInsertSmart); -ACTION_SET_NAME(Action::ValueNodeDynamicListInsertSmart,"value_node_dynamic_list_insert_smart"); -ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListInsertSmart,"Insert Item (Smart)"); +ACTION_SET_NAME(Action::ValueNodeDynamicListInsertSmart,"ValueNodeDynamicListInsertSmart"); +ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListInsertSmart,N_("Insert Item (Smart)")); ACTION_SET_TASK(Action::ValueNodeDynamicListInsertSmart,"insert"); ACTION_SET_CATEGORY(Action::ValueNodeDynamicListInsertSmart,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::ValueNodeDynamicListInsertSmart,-20); ACTION_SET_VERSION(Action::ValueNodeDynamicListInsertSmart,"0.0"); -ACTION_SET_CVS_ID(Action::ValueNodeDynamicListInsertSmart,"$Id: valuenodedynamiclistinsertsmart.cpp,v 1.3 2005/01/17 05:20:08 darco Exp $"); +ACTION_SET_CVS_ID(Action::ValueNodeDynamicListInsertSmart,"$Id$"); /* === G L O B A L S ======================================================= */ @@ -70,7 +73,7 @@ Action::ParamVocab Action::ValueNodeDynamicListInsertSmart::get_param_vocab() { ParamVocab ret(Action::CanvasSpecific::get_param_vocab()); - + ret.push_back(ParamDesc("value_desc",Param::TYPE_VALUEDESC) .set_local_name(_("ValueDesc")) ); @@ -87,17 +90,16 @@ Action::ValueNodeDynamicListInsertSmart::get_param_vocab() } bool -Action::ValueNodeDynamicListInsertSmart::is_canidate(const ParamList &x) +Action::ValueNodeDynamicListInsertSmart::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; - 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())); } bool @@ -106,29 +108,29 @@ Action::ValueNodeDynamicListInsertSmart::set_param(const synfig::String& name, c if(name=="value_desc" && param.get_type()==Param::TYPE_VALUEDESC) { 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(); - + return true; } if(name=="time" && param.get_type()==Param::TYPE_TIME) { time=param.get_time(); - + return true; } if(name=="origin" && param.get_type()==Param::TYPE_REAL) { origin=param.get_real(); - + return true; } @@ -145,12 +147,12 @@ Action::ValueNodeDynamicListInsertSmart::is_ready()const void Action::ValueNodeDynamicListInsertSmart::prepare() -{ +{ //clear(); // HACK if(!first_time()) return; - + // If we are in animate editing mode if(get_edit_mode()&MODE_ANIMATE) { @@ -161,89 +163,89 @@ Action::ValueNodeDynamicListInsertSmart::prepare() // turn on. If not, then we need to go ahead and create one. synfig::info("ValueNodeDynamicListInsertSmart: index=%d",index); synfig::info("ValueNodeDynamicListInsertSmart: value_node->list.size()=%d",value_node->list.size()); - if(value_node->list.size()<=index && index>0) + if(int(value_node->list.size())<=index && index>0) synfig::info("ValueNodeDynamicListInsertSmart: value_node->list[index-1].status_at_time(time)=%d",value_node->list[index-1].status_at_time(time)); - - if(value_node->list.size()>=index && index>0 && !value_node->list[index-1].status_at_time(time)) + + if(int(value_node->list.size())>=index && index>0 && !value_node->list[index-1].status_at_time(time)) { // Ok, we do not have to create a new - // entry in the dynamic list after all. + // entry in the dynamic list after all. // However, we do need to set the // position and tangent of this point. ValueNode_DynamicList::ListEntry list_entry(value_node->create_list_entry(index,time,origin)); ValueBase value((*list_entry.value_node)(time)); index--; - + ValueDesc item_value_desc(value_node,index); - Action::Handle action(Action::create("value_desc_set")); - + Action::Handle action(Action::create("ValueDescSet")); + if(!action) - throw Error(_("Unable to find action value_desc_set (bug)")); - + throw Error(_("Unable to find action ValueDescSet (bug)")); + action->set_param("edit_mode",get_edit_mode()); action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("time",time); action->set_param("new_value",value); action->set_param("value_desc",ValueDesc(value_node,index)); - + if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - - add_action(action); + + add_action(action); } else { // Ok, not a big deal, we just need to // add a new item - Action::Handle action(Action::create("value_node_dynamic_list_insert")); - + Action::Handle action(Action::create("ValueNodeDynamicListInsert")); + if(!action) throw Error(_("Unable to find action (bug)")); - + action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("time",time); action->set_param("origin",origin); action->set_param("value_desc",ValueDesc(value_node,index)); - + if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - + add_action(action); - - action=Action::create("activepoint_set_off"); - + + action=Action::create("ActivepointSetOff"); + if(!action) - throw Error(_("Unable to find action \"activepoint_set_off\"")); - + throw Error(_("Unable to find action \"ActivepointSetOff\"")); + action->set_param("edit_mode",MODE_ANIMATE); action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("time",Time::begin()); action->set_param("origin",origin); action->set_param("value_desc",ValueDesc(value_node,index)); - + if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - + add_action(action); } - + // Now we set the activepoint up and then we'll be done - Action::Handle action(Action::create("activepoint_set_on")); + Action::Handle action(Action::create("ActivepointSetOn")); if(!action) - throw Error(_("Unable to find action \"activepoint_set_on\"")); - + throw Error(_("Unable to find action \"ActivepointSetOn\"")); + action->set_param("edit_mode",get_edit_mode()); action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("time",time); action->set_param("origin",origin); action->set_param("value_desc",ValueDesc(value_node,index)); - + if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); @@ -251,20 +253,20 @@ Action::ValueNodeDynamicListInsertSmart::prepare() } else { - Action::Handle action(Action::create("value_node_dynamic_list_insert")); + Action::Handle action(Action::create("ValueNodeDynamicListInsert")); if(!action) throw Error(_("Unable to find action (bug)")); - + action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("time",time); action->set_param("origin",origin); action->set_param("value_desc",ValueDesc(value_node,index)); - + if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - add_action(action); + add_action(action); } }