Module: synfig/synfig Branch: genete_width_outline Commit: e39649af52b327a5e010d35531bbf246e207fb37 URL: http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig/synfig;a=commit;h=e39649af52b327a5e010d35531bbf246e207fb37
Author: Carlos Lopez <[email protected]> Date: Sun Jan 9 18:19:33 2011 +0100 Make loadcanvas and savecanvas understand ValueNode_WPList class --- synfig-core/src/synfig/loadcanvas.cpp | 22 ++++++++++++++++++++-- synfig-core/src/synfig/savecanvas.cpp | 9 +++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/synfig-core/src/synfig/loadcanvas.cpp b/synfig-core/src/synfig/loadcanvas.cpp index 47dccdb..7621dcb 100644 --- a/synfig-core/src/synfig/loadcanvas.cpp +++ b/synfig-core/src/synfig/loadcanvas.cpp @@ -57,6 +57,7 @@ #include "valuenode_segcalctangent.h" #include "valuenode_segcalcvertex.h" #include "valuenode_bline.h" +#include "valuenode_wplist.h" #include "layer.h" #include "string.h" @@ -1423,7 +1424,9 @@ CanvasParser::parse_linkable_value_node(xmlpp::Element *element,Canvas::Handle c handle<ValueNode_DynamicList> CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas) { - assert(element->get_name()=="dynamic_list" || element->get_name()=="bline"); + assert(element->get_name()=="dynamic_list" || + element->get_name()=="bline" || + element->get_name()=="wplist"); const float fps(canvas?canvas->rend_desc().get_frame_rate():0); @@ -1443,6 +1446,7 @@ CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas) handle<ValueNode_DynamicList> value_node; handle<ValueNode_BLine> bline_value_node; + handle<ValueNode_WPList> wplist_value_node; if(element->get_name()=="bline") { @@ -1455,7 +1459,18 @@ CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas) else bline_value_node->set_loop(false); } - + } + else if(element->get_name()=="wplist") + { + value_node=wplist_value_node=ValueNode_WPList::create(); + if(element->get_attribute("loop")) + { + String loop=element->get_attribute("loop")->get_value(); + if(loop=="true" || loop=="1" || loop=="TRUE" || loop=="True") + wplist_value_node->set_loop(true); + else + wplist_value_node->set_loop(false); + } } else value_node=ValueNode_DynamicList::create(type); @@ -1678,6 +1693,9 @@ CanvasParser::parse_value_node(xmlpp::Element *element,Canvas::Handle canvas) if(element->get_name()=="bline") // This is not a typo. The dynamic list parser will parse a bline. value_node=parse_dynamic_list(element,canvas); else + if(element->get_name()=="wplist") // This is not a typo. The dynamic list parser will parse a wplist. + value_node=parse_dynamic_list(element,canvas); + else if(LinkableValueNode::book().count(element->get_name())) { value_node=parse_linkable_value_node(element,canvas); diff --git a/synfig-core/src/synfig/savecanvas.cpp b/synfig-core/src/synfig/savecanvas.cpp index 34f3fbd..8cd9cc9 100644 --- a/synfig-core/src/synfig/savecanvas.cpp +++ b/synfig-core/src/synfig/savecanvas.cpp @@ -42,6 +42,7 @@ #include "valuenode_dynamiclist.h" #include "valuenode_reference.h" #include "valuenode_bline.h" +#include "valuenode_wplist.h" #include "time.h" #include "keyframe.h" #include "layer.h" @@ -362,6 +363,7 @@ xmlpp::Element* encode_dynamic_list(xmlpp::Element* root,ValueNode_DynamicList:: vector<ValueNode_DynamicList::ListEntry>::const_iterator iter; ValueNode_BLine::ConstHandle bline_value_node(ValueNode_BLine::ConstHandle::cast_dynamic(value_node)); + ValueNode_BLine::ConstHandle wplist_value_node(ValueNode_WPList::ConstHandle::cast_dynamic(value_node)); if(bline_value_node) { @@ -370,6 +372,13 @@ xmlpp::Element* encode_dynamic_list(xmlpp::Element* root,ValueNode_DynamicList:: else root->set_attribute("loop","false"); } + if(wplist_value_node) + { + if(wplist_value_node->get_loop()) + root->set_attribute("loop","true"); + else + root->set_attribute("loop","false"); + } for(iter=value_node->list.begin();iter!=value_node->list.end();++iter) { ------------------------------------------------------------------------------ Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl _______________________________________________ Synfig-devl mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/synfig-devl
