X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Floadcanvas.cpp;h=199a6096e32593d2e0be5eeb2389faf17c7b181e;hb=63e709f66d50c124cc0ece2325f4773ac4ae7b20;hp=9a02faac92d4c38c390e6e21672fa4825c7ed2a7;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/loadcanvas.cpp b/synfig-core/trunk/src/synfig/loadcanvas.cpp index 9a02faa..199a609 100644 --- a/synfig-core/trunk/src/synfig/loadcanvas.cpp +++ b/synfig-core/trunk/src/synfig/loadcanvas.cpp @@ -2,19 +2,21 @@ /*! \file loadcanvas.cpp ** \brief writeme ** -** $Id: loadcanvas.cpp,v 1.3 2005/01/04 23:40:44 darco Exp $ +** $Id$ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007 Chris Moore ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. ** \endlegal */ /* ========================================================================= */ @@ -82,7 +84,7 @@ public: int test_class::bleh(0); test_class test_class_instance; -*/ +*/ /* === M A C R O S ========================================================= */ @@ -104,7 +106,7 @@ static void _remove_from_open_canvas_map(Canvas *x) { get_open_canvas_map().eras static void _canvas_file_name_changed(Canvas *x) { std::map >::iterator iter; - + for(iter=get_open_canvas_map().begin();iter!=get_open_canvas_map().end();++iter) if(iter->second==x) break; @@ -113,7 +115,7 @@ static void _canvas_file_name_changed(Canvas *x) return; get_open_canvas_map().erase(iter->first); get_open_canvas_map()[etl::absolute_path(x->get_file_name())]=x; - + } Canvas::Handle @@ -127,7 +129,7 @@ synfig::open_canvas(const String &filename) if(parser.error_count()) return Canvas::Handle(); - + return canvas; } @@ -142,7 +144,7 @@ synfig::open_canvas_as(const String &filename,const String &as) if(parser.error_count()) return Canvas::Handle(); - + return canvas; } @@ -216,24 +218,24 @@ CanvasParser::parse_keyframe(xmlpp::Element *element,Canvas::Handle canvas) error(element,strprintf(_("<%s> is missing \"%s\" attribute"),"real","time")); return Keyframe(); } - + Keyframe ret(Time(element->get_attribute("time")->get_value(),canvas->rend_desc().get_frame_rate())); if(element->get_children().empty()) return ret; - + if(element->get_child_text()->get_content().empty()) return ret; - + ret.set_description(element->get_child_text()->get_content()); - return ret; + return ret; } Real -CanvasParser::parse_real(xmlpp::Element *element,Canvas::Handle canvas) +CanvasParser::parse_real(xmlpp::Element *element) { assert(element->get_name()=="real"); @@ -271,7 +273,7 @@ CanvasParser::parse_time(xmlpp::Element *element,Canvas::Handle canvas) } int -CanvasParser::parse_integer(xmlpp::Element *element,Canvas::Handle canvas) +CanvasParser::parse_integer(xmlpp::Element *element) { assert(element->get_name()=="integer"); @@ -289,8 +291,17 @@ CanvasParser::parse_integer(xmlpp::Element *element,Canvas::Handle canvas) return atoi(val.c_str()); } +// see 'minor hack' at the end of parse_vector() below +// making this 'static' to give it file local scope +// stops it working (where working means working around +// bug #1509627) +Vector &canvas_parser_vector_id(Vector &vector) +{ + return vector; +} + Vector -CanvasParser::parse_vector(xmlpp::Element *element,Canvas::Handle canvas) +CanvasParser::parse_vector(xmlpp::Element *element) { assert(element->get_name()=="vector"); @@ -316,13 +327,7 @@ CanvasParser::parse_vector(xmlpp::Element *element,Canvas::Handle canvas) error(element, "Undefined value in "); return Vector(); } - xmlpp::TextNode *text=dynamic_cast(child->get_children().front()); - if(!text) - { - error(element,"I need a number, not an element!"); - return Vector(); - } - vect[0]=atof(text->get_content().c_str()); + vect[0]=atof(child->get_child_text()->get_content().c_str()); } else if(child->get_name()=="y") @@ -332,22 +337,21 @@ CanvasParser::parse_vector(xmlpp::Element *element,Canvas::Handle canvas) error(element, "Undefined value in "); return Vector(); } - xmlpp::TextNode *text=dynamic_cast(child->get_children().front()); - if(!text) - { - error(element,"I need a number, not an element!"); - return Vector(); - } - vect[1]=atof(text->get_content().c_str()); + vect[1]=atof(child->get_child_text()->get_content().c_str()); } else error_unexpected_element(child,child->get_name()); } - return vect; + // Minor hack - gcc 4.1.2 and earlier think that we're not using + // 'vect' and optimize it out at -O2 and higher. This convinces + // them that we are really using it. + return canvas_parser_vector_id(vect); + // When the bug is fixed, we can just do this instead: + // return vect; } Color -CanvasParser::parse_color(xmlpp::Element *element,Canvas::Handle canvas) +CanvasParser::parse_color(xmlpp::Element *element) { assert(element->get_name()=="color"); @@ -357,7 +361,7 @@ CanvasParser::parse_color(xmlpp::Element *element,Canvas::Handle canvas) return Color(); } - Color color; + Color color(0); xmlpp::Element::NodeList list = element->get_children(); for(xmlpp::Element::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter) @@ -413,7 +417,7 @@ CanvasParser::parse_color(xmlpp::Element *element,Canvas::Handle canvas) } synfig::String -CanvasParser::parse_string(xmlpp::Element *element,Canvas::Handle canvas) +CanvasParser::parse_string(xmlpp::Element *element) { assert(element->get_name()=="string"); @@ -422,18 +426,18 @@ CanvasParser::parse_string(xmlpp::Element *element,Canvas::Handle canvas) warning(element, "Undefined value in "); return synfig::String(); } - + if(element->get_child_text()->get_content().empty()) { warning(element, "Content element of appears to be empty"); return synfig::String(); } - + return element->get_child_text()->get_content(); } bool -CanvasParser::parse_bool(xmlpp::Element *element,Canvas::Handle canvas) +CanvasParser::parse_bool(xmlpp::Element *element) { assert(element->get_name()=="bool"); @@ -454,16 +458,16 @@ CanvasParser::parse_bool(xmlpp::Element *element,Canvas::Handle canvas) return false; error(element,strprintf(_("Bad value \"%s\" in <%s>"),val.c_str(),"bool")); - + return false; } Gradient -CanvasParser::parse_gradient(xmlpp::Element *node,Canvas::Handle canvas) +CanvasParser::parse_gradient(xmlpp::Element *node) { assert(node->get_name()=="gradient"); Gradient ret; - + xmlpp::Element::NodeList list = node->get_children(); for(xmlpp::Element::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter) { @@ -473,7 +477,7 @@ CanvasParser::parse_gradient(xmlpp::Element *node,Canvas::Handle canvas) else { Gradient::CPoint cpoint; - cpoint.color=parse_color(child,canvas); + cpoint.color=parse_color(child); if(!child->get_attribute("pos")) { @@ -482,7 +486,7 @@ CanvasParser::parse_gradient(xmlpp::Element *node,Canvas::Handle canvas) } cpoint.pos=atof(child->get_attribute("pos")->get_value().c_str()); - + ret.push_back(cpoint); } } @@ -516,7 +520,7 @@ CanvasParser::parse_list(xmlpp::Element *element,Canvas::Handle canvas) } Segment -CanvasParser::parse_segment(xmlpp::Element *element,Canvas::Handle canvas) +CanvasParser::parse_segment(xmlpp::Element *element) { assert(element->get_name()=="segment"); @@ -556,7 +560,7 @@ CanvasParser::parse_segment(xmlpp::Element *element,Canvas::Handle canvas) continue; } - seg.p1=parse_vector(dynamic_cast(*iter),canvas); + seg.p1=parse_vector(dynamic_cast(*iter)); } else if(child->get_name()=="t1") @@ -580,7 +584,7 @@ CanvasParser::parse_segment(xmlpp::Element *element,Canvas::Handle canvas) continue; } - seg.t1=parse_vector(dynamic_cast(*iter),canvas); + seg.t1=parse_vector(dynamic_cast(*iter)); } else if(child->get_name()=="p2") @@ -604,7 +608,7 @@ CanvasParser::parse_segment(xmlpp::Element *element,Canvas::Handle canvas) continue; } - seg.p2=parse_vector(dynamic_cast(*iter),canvas); + seg.p2=parse_vector(dynamic_cast(*iter)); } else if(child->get_name()=="t2") @@ -628,7 +632,7 @@ CanvasParser::parse_segment(xmlpp::Element *element,Canvas::Handle canvas) continue; } - seg.t2=parse_vector(dynamic_cast(*iter),canvas); + seg.t2=parse_vector(dynamic_cast(*iter)); } else error_unexpected_element(child,child->get_name()); @@ -637,7 +641,7 @@ CanvasParser::parse_segment(xmlpp::Element *element,Canvas::Handle canvas) } BLinePoint -CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas) +CanvasParser::parse_bline_point(xmlpp::Element *element) { assert(element->get_name()=="bline_point"); if(element->get_children().empty()) @@ -678,10 +682,10 @@ CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas) continue; } - ret.set_vertex(parse_vector(dynamic_cast(*iter),canvas)); + ret.set_vertex(parse_vector(dynamic_cast(*iter))); } else - // Tangent 1 + // Tangent 1 if(child->get_name()=="t1" || child->get_name()=="tangent") { xmlpp::Element::NodeList list = child->get_children(); @@ -703,10 +707,10 @@ CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas) continue; } - ret.set_tangent1(parse_vector(dynamic_cast(*iter),canvas)); + ret.set_tangent1(parse_vector(dynamic_cast(*iter))); } else - // Tangent 2 + // Tangent 2 if(child->get_name()=="t2") { xmlpp::Element::NodeList list = child->get_children(); @@ -728,7 +732,7 @@ CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas) continue; } - ret.set_tangent2(parse_vector(dynamic_cast(*iter),canvas)); + ret.set_tangent2(parse_vector(dynamic_cast(*iter))); ret.set_split_tangent_flag(true); } else @@ -754,7 +758,7 @@ CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas) continue; } - ret.set_width(parse_real(dynamic_cast(*iter),canvas)); + ret.set_width(parse_real(dynamic_cast(*iter))); } else // origin @@ -779,7 +783,7 @@ CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas) continue; } - ret.set_origin(parse_real(dynamic_cast(*iter),canvas)); + ret.set_origin(parse_real(dynamic_cast(*iter))); } else error_unexpected_element(child,child->get_name()); @@ -788,7 +792,7 @@ CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas) } Angle -CanvasParser::parse_angle(xmlpp::Element *element,Canvas::Handle canvas) +CanvasParser::parse_angle(xmlpp::Element *element) { assert(element->get_name()=="angle"); @@ -810,51 +814,48 @@ ValueBase CanvasParser::parse_value(xmlpp::Element *element,Canvas::Handle canvas) { if(element->get_name()=="real") - return parse_real(element,canvas); + return parse_real(element); else if(element->get_name()=="time") return parse_time(element,canvas); else if(element->get_name()=="integer") - return parse_integer(element,canvas); + return parse_integer(element); else if(element->get_name()=="string") - return parse_string(element,canvas); + return parse_string(element); else if(element->get_name()=="vector") - { - return parse_vector(element,canvas); - } + return parse_vector(element); else if(element->get_name()=="color") - return parse_color(element,canvas); + return parse_color(element); else if(element->get_name()=="segment") - return parse_segment(element,canvas); + return parse_segment(element); else if(element->get_name()=="list") return parse_list(element,canvas); else if(element->get_name()=="gradient") - return parse_gradient(element,canvas); + return parse_gradient(element); else if(element->get_name()=="bool") - return parse_bool(element,canvas); + return parse_bool(element); else //if(element->get_name()=="canvas") // return parse_canvas(element,canvas,true); // inline canvas //else if(element->get_name()=="angle" || element->get_name()=="degrees" || element->get_name()=="radians" || element->get_name()=="rotations") - return parse_angle(element,canvas); + return parse_angle(element); else if(element->get_name()=="bline_point") - return parse_bline_point(element,canvas); + return parse_bline_point(element); else if(element->get_name()=="canvas") return ValueBase(parse_canvas(element,canvas,true)); else { - DEBUGPOINT(); error_unexpected_element(element,element->get_name()); } @@ -882,12 +883,12 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas) error(element,"Bad type in "); return ValueNode_Animated::Handle(); } - + ValueNode_Animated::Handle value_node=ValueNode_Animated::create(type); if(!value_node) { - error(element,strprintf(_("Unable to create with type \"%s\""),ValueBase::type_name(type).c_str())); + error(element,strprintf(_("Unable to create with type \"%s\""),ValueBase::type_local_name(type).c_str())); return ValueNode_Animated::Handle(); } @@ -910,12 +911,24 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas) Time time(child->get_attribute("time")->get_value(),canvas->rend_desc().get_frame_rate()); - + ValueNode::Handle waypoint_value_node; - + xmlpp::Element::NodeList list = child->get_children(); + if(child->get_attribute("use")) { - waypoint_value_node=canvas->surefind_value_node(child->get_attribute("use")->get_value()); + if(!list.empty()) + warning(child,_("Found \"use\" attribute for , but it wasn't empty. Ignoring contents...")); + + // the waypoint might look like this, in which case we won't find "mycanvas" in the list of valuenodes, 'cos it's a canvas + // + // + // + // + if (type==ValueBase::TYPE_CANVAS) + waypoint_value_node=ValueNode_Const::create(canvas->surefind_canvas(child->get_attribute("use")->get_value())); + else + waypoint_value_node=canvas->surefind_value_node(child->get_attribute("use")->get_value()); } else { @@ -924,25 +937,24 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas) error(child, strprintf(_("<%s> is missing its data"),"waypoint")); continue; } - - xmlpp::Element::NodeList list = child->get_children(); + xmlpp::Element::NodeList::iterator iter; - + // Search for the first non-text XML element for(iter = list.begin(); iter != list.end(); ++iter) if(dynamic_cast(*iter)) break; - + if(iter==list.end()) { error(child, strprintf(_("<%s> is missing its data"),"waypoint")); continue; } - + waypoint_value_node=parse_value_node(dynamic_cast(*iter),canvas); - + /* ValueBase data=parse_value(dynamic_cast(*iter),canvas); - + if(!data.is_valid()) { error(child,_("Bad data for ")); @@ -954,7 +966,7 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas) error(child,_("Bad data for ")); continue; } - + /*! HACK -- This is a temporary fix to help repair some ** weirdness that is currently going on (10-21-2004). ** This short circuits the linking of waypoints, @@ -962,7 +974,7 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas) ** away with something like this pretty easily. */ waypoint_value_node=waypoint_value_node->clone(); - + // Warn if there is trash after the param value for(iter++; iter != list.end(); ++iter) if(dynamic_cast(*iter)) @@ -1010,7 +1022,7 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas) else error(child,strprintf(_("\"%s\" not a valid value for attribute \"%s\" in <%s>"),val.c_str(),"before","waypoint")); } - + if(child->get_attribute("after")) { string val=child->get_attribute("after")->get_value(); @@ -1038,220 +1050,47 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas) else error_unexpected_element(child,child->get_name()); } - value_node->changed(); - return value_node; -} -// This function is a phase-out hack for the timed swap value node -etl::handle -CanvasParser::parse_timedswap(xmlpp::Element *node,Canvas::Handle canvas) -{ - ValueNode_TimedSwap::Handle timed_swap(parse_linkable_value_node(node,canvas)); - - assert(timed_swap); - - ValueNode_Animated::Handle animated(ValueNode_Animated::create(timed_swap->get_type())); - - animated->set_root_canvas(canvas->get_root()); - - assert(animated); - - Time swap_time, swap_length; - (*timed_swap->get_swap_time())(0).put(&swap_time); - (*timed_swap->get_swap_length())(0).put(&swap_length); - - animated->new_waypoint(swap_time-swap_length,timed_swap->get_before()); - animated->new_waypoint(swap_time,timed_swap->get_after()); - - return animated; -} + // in canvas version 0.1, angles used to wrap, so to get from -179 + // degrees to 180 degrees meant a 1 degree change + // in canvas version 0.2 they don't, so that's a 359 degree change - -handle -CanvasParser::parse_subtract(xmlpp::Element *element,Canvas::Handle canvas) -{ - assert(element->get_name()=="subtract"); - - handle value_node; - handle lhs,rhs,scalar; - - if(element->get_attribute("type")) + // when loading a version 0.1 canvas, modify constant angle + // waypoints to that they are within 180 degrees of the previous + // waypoint's value + if (type == ValueBase::TYPE_ANGLE) { - ValueBase::Type type=ValueBase::ident_type(element->get_attribute("type")->get_value()); + Canvas::Handle parent = canvas; + while (!parent->is_root()) + parent = parent->parent(); - if(!type) + if (parent->get_version() == "0.1") { - error(element,"Bad type in "); - return ValueNode_Subtract::Handle(); - } - value_node=ValueNode_Subtract::create(type); - } - else - value_node=ValueNode_Subtract::create(); - - if(!value_node) - { - error(element,strprintf(_("Unable to create "))); - return handle(); - } - - //if(element->get_attribute("scalar")) - //{ - // value_node->set_scalar(atof(element->get_attribute("scalar")->get_value().c_str())); - //} - - try - { - if(element->get_attribute("scalar")) - { - // This is for compatibility with older versions of the file format - String value(element->get_attribute("scalar")->get_value()); - if((value[0]<='9' && value[0]>='0') || value[0]=='-') - { - warning(element, _("Use of a real value where the ID should be is deprecated")); - value_node->set_scalar(atof(value.c_str())); - } - else - value_node->set_scalar(canvas->surefind_value_node(value)); - scalar=value_node->get_scalar(); - } - - if(element->get_attribute("lhs")) - { - lhs=canvas->surefind_value_node(element->get_attribute("lhs")->get_value()); - value_node->set_lhs(lhs); - } - - if(element->get_attribute("rhs")) - { - rhs=canvas->surefind_value_node(element->get_attribute("rhs")->get_value()); - value_node->set_rhs(rhs); - } - } - catch (Exception::IDNotFound) - { - error(element,"attribute in references unknown ID"); - } - catch (Exception::FileNotFound) - { - error(element,"Unable to open external file referenced in ID"); - } - - xmlpp::Element::NodeList list = element->get_children(); - for(xmlpp::Element::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter) - { - xmlpp::Element *child(dynamic_cast(*iter)); - if(!child) - continue; - else - if(child->get_name()=="lhs") - { - if(lhs) - { - error(child,"LHS component of already defined!"); - continue; - } - - xmlpp::Element::NodeList list = child->get_children(); - xmlpp::Element::NodeList::iterator iter; - - // Search for the first non-text XML element - for(iter = list.begin(); iter != list.end(); ++iter) - if(dynamic_cast(*iter)) break; - - if(iter==list.end()) - { - error(child,_(" is missing its contents")); - continue; - } - - lhs=parse_value_node(dynamic_cast(*iter),canvas); - - if(lhs) - value_node->set_lhs(lhs); - else - { - error((*iter),"Parse of LHS ValueNode failed"); - } - - // \todo do a search for more elements and warn if they are found - } - else - if(child->get_name()=="rhs") - { - if(rhs) - { - error(child,"RHS component of already defined!"); - continue; - } - - xmlpp::Element::NodeList list = child->get_children(); - xmlpp::Element::NodeList::iterator iter; - - // Search for the first non-text XML element - for(iter = list.begin(); iter != list.end(); ++iter) - if(dynamic_cast(*iter)) break; - - if(iter==list.end()) - { - error(child,_(" is missing its contents")); - continue; - } - - rhs=parse_value_node(dynamic_cast(*iter),canvas); - - if(rhs) - value_node->set_rhs(rhs); - else - { - error((*iter),"Parse of RHS ValueNode failed"); - } - - // \todo do a search for more elements and warn if they are found - } - else - if(child->get_name()=="scalar") - { - if(scalar) - { - error(child,"scalar component of already defined!"); - continue; - } - - xmlpp::Element::NodeList list = child->get_children(); - xmlpp::Element::NodeList::iterator iter; - - // Search for the first non-text XML element - for(iter = list.begin(); iter != list.end(); ++iter) - if(dynamic_cast(*iter)) break; - - if(iter==list.end()) - { - error(child,_(" is missing its contents")); - continue; - } - - scalar=parse_value_node(dynamic_cast(*iter),canvas); - - if(scalar) - value_node->set_scalar(scalar); - else - { - error((*iter),"Parse of scalar ValueNode failed"); + bool first = true; + Real angle, prev = 0; + WaypointList &wl = value_node->waypoint_list(); + for (WaypointList::iterator iter = wl.begin(); iter != wl.end(); iter++) + { + angle = Angle::deg(iter->get_value(iter->get_time()).get(Angle())).get(); + if (first) + first = false; + else if (iter->get_value_node()->get_name() == "constant") + if (angle - prev > 180) + { + while (angle - prev > 180) angle -= 360; + iter->set_value(Angle::deg(angle)); + } + else if (prev - angle > 180) + { + while (prev - angle > 180) angle += 360; + iter->set_value(Angle::deg(angle)); + } + prev = angle; } - - // \todo do a search for more elements and warn if they are found } - else - error_unexpected_element(child,child->get_name()); } - if(!value_node->get_rhs() || !value_node->get_lhs() || !value_node->get_scalar()) - error(element," is missing LHS, RHS, or SCALAR"); - - if(value_node->get_rhs() == value_node->get_lhs()) - warning(element,"LHS is equal to RHS in , so this value_node will always be zero!"); - + value_node->changed(); return value_node; } @@ -1260,7 +1099,7 @@ CanvasParser::parse_linkable_value_node(xmlpp::Element *element,Canvas::Handle c { handle value_node; ValueBase::Type type; - + // Determine the type if(element->get_attribute("type")) { @@ -1279,18 +1118,18 @@ CanvasParser::parse_linkable_value_node(xmlpp::Element *element,Canvas::Handle c } value_node=LinkableValueNode::create(element->get_name(),type); - + if(!value_node) { error(element,"Unknown ValueNode type "+element->get_name()); return 0; - } + } if(value_node->get_type()!=type) { error(element,"ValueNode did not accept type"); return 0; - } + } value_node->set_root_canvas(canvas->get_root()); @@ -1300,13 +1139,13 @@ CanvasParser::parse_linkable_value_node(xmlpp::Element *element,Canvas::Handle c if(element->get_attribute(value_node->link_name(i))) try { String id(element->get_attribute(value_node->link_name(i))->get_value()); - + if(!value_node->set_link(i, canvas->surefind_value_node( id ) ) - ) error(element,strprintf(_("Unable to set link \"%s\" to ValueNode \"%s\" (link #%d in \"%s\")"),value_node->link_name(i).c_str(),id.c_str(),i,value_node->get_name().c_str())); + ) error(element,strprintf(_("Unable to set link \"%s\" to ValueNode \"%s\" (link #%d in \"%s\")"),value_node->link_name(i).c_str(),id.c_str(),i,value_node->get_name().c_str())); } catch(Exception::IDNotFound) { @@ -1322,8 +1161,8 @@ CanvasParser::parse_linkable_value_node(xmlpp::Element *element,Canvas::Handle c element->get_attribute(value_node->link_name(i))->get_value().c_str())); throw; } - } - + } + xmlpp::Element::NodeList list = element->get_children(); @@ -1358,12 +1197,12 @@ CanvasParser::parse_linkable_value_node(xmlpp::Element *element,Canvas::Handle c else if(!value_node->set_link(index,link)) { - //error(dynamic_cast(*iter),strprintf("Unable to connect value node ('%s' of type '%s') to link %d",link->get_name().c_str(),ValueBase::type_name(link->get_type()).c_str(),index)); - error(element,strprintf("Unable to connect value node ('%s' of type '%s') to link %d",link->get_name().c_str(),ValueBase::type_name(link->get_type()).c_str(),index)); + //error(dynamic_cast(*iter),strprintf(_("Unable to connect value node ('%s' of type '%s') to link %d"),link->get_name().c_str(),ValueBase::type_local_name(link->get_type()).c_str(),index)); + error(element,strprintf(_("Unable to connect value node ('%s' of type '%s') to link %d"),link->get_name().c_str(),ValueBase::type_local_name(link->get_type()).c_str(),index)); } // \todo do a search for more elements and warn if they are found - + } catch(Exception::BadLinkName) { @@ -1475,7 +1314,7 @@ CanvasParser::parse_composite(xmlpp::Element *element,Canvas::Handle canvas) { error(child,strprintf(_("<%s> has a bad value"),name.c_str())); break; - } + } // \todo do a search for more elements and warn if they are found break; @@ -1524,7 +1363,7 @@ handle CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas) { assert(element->get_name()=="dynamic_list" || element->get_name()=="bline"); - + const float fps(canvas?canvas->rend_desc().get_frame_rate():0); if(!element->get_attribute("type")) @@ -1555,8 +1394,8 @@ CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas) else bline_value_node->set_loop(false); } - - } + + } else value_node=ValueNode_DynamicList::create(type); @@ -1578,7 +1417,7 @@ CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas) if(child->get_name()=="entry") { ValueNode_DynamicList::ListEntry list_entry; - + // Parse begin/end waypoints { typedef synfig::ValueNode_DynamicList::ListEntry::Activepoint Activepoint; @@ -1586,9 +1425,9 @@ CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas) String begin_sequence; String end_sequence; - + ActivepointList &timing_info(list_entry.timing_info); - + if(child->get_attribute("begin")) begin_sequence=child->get_attribute("begin")->get_value(); @@ -1600,18 +1439,22 @@ CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas) if(child->get_attribute("off")) end_sequence=child->get_attribute("off")->get_value(); - + // clear out any auto-start if(!begin_sequence.empty()) timing_info.clear(); - + //! \optimize while(!begin_sequence.empty()) { String::iterator iter(find(begin_sequence.begin(),begin_sequence.end(),',')); - String timecode(begin_sequence.begin(), iter); + String timecode(begin_sequence.begin(), iter); int priority=0; - + + // skip whitespace before checking for a priority + while (isspace(timecode[0])) + timecode=timecode.substr(1); + // If there is a priority, then grab it and remove // it from the timecode if(timecode[0]=='p') @@ -1623,7 +1466,7 @@ CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas) timecode=String(timecode.begin()+space+1,timecode.end()); //synfig::info("priority: %d timecode: %s",priority,timecode.c_str()); } - + timing_info.push_back( Activepoint( Time( @@ -1634,7 +1477,7 @@ CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas) priority ) ); - + if(iter==begin_sequence.end()) begin_sequence.clear(); else @@ -1645,9 +1488,13 @@ CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas) while(!end_sequence.empty()) { String::iterator iter(find(end_sequence.begin(),end_sequence.end(),',')); - String timecode(end_sequence.begin(), iter); + String timecode(end_sequence.begin(), iter); int priority=0; - + + // skip whitespace before checking for a priority + while (isspace(timecode[0])) + timecode=timecode.substr(1); + // If there is a priority, then grab it and remove // it from the timecode if(timecode[0]=='p') @@ -1659,7 +1506,7 @@ CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas) timecode=String(timecode.begin()+space+1,timecode.end()); //synfig::info("priority: %d timecode: %s",priority,timecode.c_str()); } - + timing_info.push_back( Activepoint( Time( @@ -1675,12 +1522,13 @@ CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas) else end_sequence=String(iter+1,end_sequence.end()); } - + timing_info.sort(); } if(child->get_attribute("use")) { + // \todo does this need to be able to read 'use="canvas"', like waypoints can now? (see 'surefind_canvas' in this file) string id=child->get_attribute("use")->get_value(); try { @@ -1730,9 +1578,9 @@ CanvasParser::parse_value_node(xmlpp::Element *element,Canvas::Handle canvas) { handle value_node; assert(element); - + GUID guid; - + if(element->get_attribute("guid")) { guid=GUID(element->get_attribute("guid")->get_value())^canvas->get_root()->get_guid(); @@ -1740,10 +1588,10 @@ CanvasParser::parse_value_node(xmlpp::Element *element,Canvas::Handle canvas) if(value_node) return value_node; } - - // If ValueBase::ident_type() recognises the name, then we know it's a ValueBase + + // If ValueBase::ident_type() recognizes the name, then we know it's a ValueBase if(element->get_name()!="canvas" && ValueBase::ident_type(element->get_name())) - { + { ValueBase data=parse_value(element,canvas); if(!data.is_valid()) @@ -1763,9 +1611,6 @@ CanvasParser::parse_value_node(xmlpp::Element *element,Canvas::Handle canvas) if(element->get_name()=="hermite" || element->get_name()=="animated") value_node=parse_animated(element,canvas); else - if(element->get_name()=="subtract") - value_node=parse_subtract(element,canvas); - else if(element->get_name()=="composite") value_node=parse_composite(element,canvas); else @@ -1775,10 +1620,7 @@ 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()=="timed_swap") - value_node=parse_timedswap(element,canvas); - else - if(LinkableValueNode::book().count(element->get_name())) + if(LinkableValueNode::book().count(element->get_name())) value_node=parse_linkable_value_node(element,canvas); else if(element->get_name()=="canvas") @@ -1787,12 +1629,13 @@ CanvasParser::parse_value_node(xmlpp::Element *element,Canvas::Handle canvas) { error_unexpected_element(element,element->get_name()); error(element, "Expected a ValueNode"); + value_node=PlaceholderValueNode::create(); } - + value_node->set_root_canvas(canvas->get_root()); - - + + // If we were successful, and our element has // an ID attribute, go ahead and add it to the // value_node list @@ -1808,7 +1651,7 @@ CanvasParser::parse_value_node(xmlpp::Element *element,Canvas::Handle canvas) catch(Exception::BadLinkName) { warning(element,strprintf(_("Bad ID \"%s\""),id.c_str())); - return value_node; + return value_node; } catch(Exception::IDAlreadyExists) { @@ -1846,7 +1689,7 @@ CanvasParser::parse_canvas_defs(xmlpp::Element *element,Canvas::Handle canvas) Layer::Handle CanvasParser::parse_layer(xmlpp::Element *element,Canvas::Handle canvas) { - + assert(element->get_name()=="layer"); Layer::Handle layer; @@ -1871,7 +1714,7 @@ CanvasParser::parse_layer(xmlpp::Element *element,Canvas::Handle canvas) { String version(element->get_attribute("version")->get_value()); if(version>layer->get_version()) - warning(element,_("Installed layer version is larger than layer version in file")); + warning(element,_("Installed layer version is smaller than layer version in file")); if(version!=layer->get_version()) layer->set_version(version); } @@ -1879,7 +1722,7 @@ CanvasParser::parse_layer(xmlpp::Element *element,Canvas::Handle canvas) // Handle the description if(element->get_attribute("desc")) layer->set_description(element->get_attribute("desc")->get_value()); - + if(element->get_attribute("active")) layer->set_active(element->get_attribute("active")->get_value()=="false"?false:true); @@ -1953,7 +1796,7 @@ CanvasParser::parse_layer(xmlpp::Element *element,Canvas::Handle canvas) continue; } - // If we recognise the element name as a + // If we recognize the element name as a // ValueBase, then treat is at one if(/*(*iter)->get_name()!="canvas" && */ValueBase::ident_type((*iter)->get_name()) && !dynamic_cast(*iter)->get_attribute("guid")) { @@ -1991,7 +1834,7 @@ CanvasParser::parse_layer(xmlpp::Element *element,Canvas::Handle canvas) for(iter++; iter != list.end(); ++iter) if(dynamic_cast(*iter)) warning((*iter),strprintf(_("Unexpected element <%s> after data, ignoring..."),(*iter)->get_name().c_str())); - continue; + continue; } else error_unexpected_element(child,child->get_name()); @@ -2004,7 +1847,7 @@ CanvasParser::parse_layer(xmlpp::Element *element,Canvas::Handle canvas) Canvas::Handle CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool inline_, String filename) { - + if(element->get_name()!="canvas") { error_unexpected_element(element,element->get_name(),"canvas"); @@ -2012,8 +1855,8 @@ CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool in } Canvas::Handle canvas; - - + + if(parent && (element->get_attribute("id") || inline_)) { if(inline_) @@ -2052,6 +1895,9 @@ CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool in canvas->set_guid(guid); } + if(element->get_attribute("version")) + canvas->set_version(element->get_attribute("version")->get_value()); + if(element->get_attribute("width")) canvas->rend_desc().set_w(atoi(element->get_attribute("width")->get_value().c_str())); @@ -2064,7 +1910,7 @@ CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool in if(element->get_attribute("yres")) canvas->rend_desc().set_y_res(atof(element->get_attribute("yres")->get_value().c_str())); - + if(element->get_attribute("fps")) canvas->rend_desc().set_frame_rate(atof(element->get_attribute("fps")->get_value().c_str())); @@ -2102,16 +1948,16 @@ CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool in { string values=element->get_attribute("bgcolor")->get_value(); Color bg; - + bg.set_r(atof(string(values.data(),values.find(' ')).c_str())); values=string(values.begin()+values.find(' ')+1,values.end()); - + bg.set_g(atof(string(values.data(),values.find(' ')).c_str())); values=string(values.begin()+values.find(' ')+1,values.end()); - + bg.set_b(atof(string(values.data(),values.find(' ')).c_str())); values=string(values.begin()+values.find(' ')+1,values.end()); - + bg.set_a(atof(values.c_str())); canvas->rend_desc().set_bg_color(bg); @@ -2163,9 +2009,9 @@ CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool in warning(child,_("Inline canvases cannot have metadata")); continue; } - + String name,content; - + if(!child->get_attribute("name")) { warning(child,_(" must have a name")); @@ -2177,17 +2023,17 @@ CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool in warning(child,_(" must have content")); continue; } - + canvas->set_meta_data(child->get_attribute("name")->get_value(),child->get_attribute("content")->get_value()); } else if(child->get_name()=="name") { xmlpp::Element::NodeList list = child->get_children(); - + // If we don't have any name, warn if(list.empty()) - warning(child,_("blank \"name\" entitity")); - + warning(child,_("blank \"name\" entity")); + string tmp; for(xmlpp::Element::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter) if(dynamic_cast(*iter))tmp+=dynamic_cast(*iter)->get_content(); @@ -2196,13 +2042,13 @@ CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool in else if(child->get_name()=="desc") { - + xmlpp::Element::NodeList list = child->get_children(); - + // If we don't have any description, warn if(list.empty()) - warning(child,_("blank \"desc\" entitity")); - + warning(child,_("blank \"desc\" entity")); + string tmp; for(xmlpp::Element::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter) if(dynamic_cast(*iter))tmp+=dynamic_cast(*iter)->get_content(); @@ -2211,13 +2057,13 @@ CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool in else if(child->get_name()=="author") { - + xmlpp::Element::NodeList list = child->get_children(); - + // If we don't have any description, warn if(list.empty()) - warning(child,_("blank \"author\" entitity")); - + warning(child,_("blank \"author\" entity")); + string tmp; for(xmlpp::Element::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter) if(dynamic_cast(*iter))tmp+=dynamic_cast(*iter)->get_content(); @@ -2241,9 +2087,20 @@ CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool in if(canvas->value_node_list().placeholder_count()) { - error(element,strprintf(_("Canvas %s has undefined ValueNodes"),canvas->get_id().c_str())); + String nodes; + for (ValueNodeList::const_iterator iter = canvas->value_node_list().begin(); iter != canvas->value_node_list().end(); iter++) + if(PlaceholderValueNode::Handle::cast_dynamic(*iter)) + { + if (nodes != "") nodes += ", "; + nodes += "'" + (*iter)->get_id() + "'"; + } + error(element,strprintf(_("Canvas '%s' has undefined %s: %s"), + canvas->get_id().c_str(), + canvas->value_node_list().placeholder_count() == 1 ? _("ValueNode") : _("ValueNodes"), + nodes.c_str())); } + canvas->set_version(CURRENT_CANVAS_VERSION); return canvas; } @@ -2254,11 +2111,14 @@ CanvasParser::parse_from_file(const String &file) } Canvas::Handle -CanvasParser::parse_from_file_as(const String &file,const String &as) +CanvasParser::parse_from_file_as(const String &file_,const String &as_) { - CHECK_EXPIRE_TIME(); try { + ChangeLocale change_locale(LC_NUMERIC, "C"); + String file(unix_to_local_path(file_)); + String as(unix_to_local_path(as_)); + if(get_open_canvas_map().count(etl::absolute_path(as))) return get_open_canvas_map()[etl::absolute_path(as)]; @@ -2275,7 +2135,7 @@ CanvasParser::parse_from_file_as(const String &file,const String &as) const ValueNodeList& value_node_list(canvas->value_node_list()); - + again: ValueNodeList::const_iterator iter; for(iter=value_node_list.begin();iter!=value_node_list.end();++iter) @@ -2313,10 +2173,9 @@ CanvasParser::parse_from_file_as(const String &file,const String &as) Canvas::Handle CanvasParser::parse_from_string(const String &data) { - CHECK_EXPIRE_TIME(); - try { + ChangeLocale change_locale(LC_NUMERIC, "C"); filename=_(""); total_warnings_=0; xmlpp::DomParser parser; @@ -2340,7 +2199,7 @@ CanvasParser::parse_from_string(const String &data) goto again; } } - + return canvas; } }