X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Floadcanvas.cpp;h=3da37e9a9c24c95cc9636a528644061786d87b1f;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;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..3da37e9 100644 --- a/synfig-core/trunk/src/synfig/loadcanvas.cpp +++ b/synfig-core/trunk/src/synfig/loadcanvas.cpp @@ -2,19 +2,22 @@ /*! \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, 2008 Chris Moore +** Copyright (c) 2009 Carlos A. Sosa Navarro ** -** 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 */ /* ========================================================================= */ @@ -37,6 +40,7 @@ #include #include +#include "layer_pastecanvas.h" #include "loadcanvas.h" #include "valuenode.h" #include "valuenode_subtract.h" @@ -82,12 +86,16 @@ public: int test_class::bleh(0); test_class test_class_instance; -*/ +*/ /* === M A C R O S ========================================================= */ +#define VALUENODE_COMPATIBILITY_URL "http://synfig.org/Convert#Compatibility" + inline bool is_whitespace(char x) { return ((x)=='\n' || (x)=='\t' || (x)==' '); } +std::set CanvasParser::loading_; + /* === P R O C E D U R E S ================================================= */ static std::map* open_canvas_map_(0); @@ -104,7 +112,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,50 +121,54 @@ 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 -synfig::open_canvas(const String &filename) -{ - CanvasParser parser; - - parser.set_allow_errors(true); - Canvas::Handle canvas=parser.parse_from_file(filename); - - if(parser.error_count()) - return Canvas::Handle(); - - return canvas; } Canvas::Handle -synfig::open_canvas_as(const String &filename,const String &as) +synfig::open_canvas(const String &filename,String &errors,String &warnings) { - CanvasParser parser; - - parser.set_allow_errors(true); - - Canvas::Handle canvas=parser.parse_from_file_as(filename,as); - - if(parser.error_count()) - return Canvas::Handle(); - - return canvas; + return open_canvas_as(filename, filename, errors, warnings); } Canvas::Handle -synfig::string_to_canvas(const String &data) +synfig::open_canvas_as(const String &filename,const String &as,String &errors,String &warnings) { - CanvasParser parser; + if (CanvasParser::loading_.count(filename)) + { + String warning(strprintf(_("cannot load '%s' recursively"), filename.c_str())); + synfig::warning(warning); + warnings = " * " + warning + "\n"; + Canvas::Handle canvas(Canvas::create()); + canvas->set_file_name(filename); + Layer::Handle paste(Layer_PasteCanvas::create()); + canvas->push_back(paste); + paste->set_description(warning); + return canvas; + } + Canvas::Handle canvas; + CanvasParser parser; parser.set_allow_errors(true); - Canvas::Handle canvas=parser.parse_from_string(data); + try + { + CanvasParser::loading_.insert(filename); + canvas=parser.parse_from_file_as(filename,as,errors); + } + catch (...) + { + CanvasParser::loading_.erase(filename); + throw; + } + CanvasParser::loading_.erase(filename); + + warnings = parser.get_warnings_text(); if(parser.error_count()) + { + errors = parser.get_errors_text(); return Canvas::Handle(); + } return canvas; } @@ -178,10 +190,13 @@ CanvasParser::error_unexpected_element(xmlpp::Node *element,const String &got) void CanvasParser::warning(xmlpp::Node *element, const String &text) { - string str=strprintf("%s:<%s>:%d: warning: ",filename.c_str(),element->get_name().c_str(),element->get_line())+text; - //synfig::warning(str); - cerr<:%d: ",filename.c_str(),element->get_name().c_str(),element->get_line())+text; + + synfig::warning(str); + // cerr<=max_warnings_) fatal_error(element, _("Too many warnings")); } @@ -191,6 +206,7 @@ CanvasParser::error(xmlpp::Node *element, const String &text) { string str=strprintf("%s:<%s>:%d: error: ",filename.c_str(),element->get_name().c_str(),element->get_line())+text; total_errors_++; + errors_text += " * " + str + "\n"; if(!allow_errors_) throw runtime_error(str); cerr< 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 +287,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 +305,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 +341,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 +351,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 +375,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 +431,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 +440,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 +472,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 +491,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 +500,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 +534,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 +574,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 +598,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 +622,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 +646,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 +655,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 +696,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 +721,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 +746,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 +772,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 +797,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 +806,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 +828,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 +897,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 +925,28 @@ 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) + { + String warnings; + waypoint_value_node=ValueNode_Const::create(canvas->surefind_canvas(child->get_attribute("use")->get_value(), warnings)); + warnings_text += warnings; + } + else + waypoint_value_node=canvas->surefind_value_node(child->get_attribute("use")->get_value()); } else { @@ -924,25 +955,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 +984,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 +992,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)) @@ -981,7 +1011,7 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas) if(child->get_attribute("temporal-tension")) { synfig::String str(child->get_attribute("temporal-tension")->get_value()); - waypoint->set_time_tension(atof(str.c_str())); + waypoint->set_temporal_tension(atof(str.c_str())); } if(child->get_attribute("continuity")) { @@ -1010,7 +1040,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,415 +1068,177 @@ 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; -} - - -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")) - { - ValueBase::Type type=ValueBase::ident_type(element->get_attribute("type")->get_value()); - - if(!type) - { - 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())); - //} + // 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 - 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) + // 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) { - 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 (canvas->get_version() == "0.1") { - 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; } etl::handle CanvasParser::parse_linkable_value_node(xmlpp::Element *element,Canvas::Handle canvas) { - handle value_node; - ValueBase::Type type; - // Determine the type - if(element->get_attribute("type")) + if(!element->get_attribute("type")) { - type=ValueBase::ident_type(element->get_attribute("type")->get_value()); - - if(!type) - { - error(element,"Bad type in ValueNode"); - return 0; - } + error(element, strprintf(_("Missing attribute \"type\" in <%s>"), element->get_name().c_str())); + return 0; } - else + + ValueBase::Type type=ValueBase::ident_type(element->get_attribute("type")->get_value()); + + if(!type) { - error(element,"Missing type in ValueNode"); + error(element, strprintf(_("Bad type in <%s>"), element->get_name().c_str())); return 0; } - value_node=LinkableValueNode::create(element->get_name(),type); - + handle value_node=LinkableValueNode::create(element->get_name(),type); + handle c[value_node->link_count()]; + if(!value_node) { - error(element,"Unknown ValueNode type "+element->get_name()); + error(element, strprintf(_("Error creating ValueNode <%s> with type '%s'. Refer to '%s'"), + element->get_name().c_str(), + ValueBase::type_local_name(type).c_str(), + VALUENODE_COMPATIBILITY_URL)); return 0; - } + } if(value_node->get_type()!=type) { - error(element,"ValueNode did not accept type"); + error(element, strprintf(_("<%s> did not accept type '%s'"), + element->get_name().c_str(), + ValueBase::type_local_name(type).c_str())); return 0; - } + } value_node->set_root_canvas(canvas->get_root()); - int i; - for(i=0;ilink_count();i++) - { - 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())); - } - catch(Exception::IDNotFound) - { - error(element,"Unable to resolve "+element->get_attribute(value_node->link_name(i))->get_value()); - } - catch(Exception::FileNotFound) - { - error(element,"Unable to open file referenced in "+element->get_attribute(value_node->link_name(i))->get_value()); - } - catch(...) - { - error(element,strprintf(_("Unknown Exception thrown when referencing ValueNode \"%s\""), - element->get_attribute(value_node->link_name(i))->get_value().c_str())); - throw; - } - } - - - - xmlpp::Element::NodeList list = element->get_children(); - for(xmlpp::Element::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter) + // handle exported valuenodes { - xmlpp::Element *child(dynamic_cast(*iter)); - try + int index; + String id, name; + xmlpp::Element::AttributeList attrib_list(element->get_attributes()); + for(xmlpp::Element::AttributeList::iterator iter = attrib_list.begin(); iter != attrib_list.end(); iter++) { - if(!child) + name = (*iter)->get_name(); + id = (*iter)->get_value(); + + if (name == "guid" || name == "id" || name == "type") continue; - int index=value_node->get_link_index_from_name(child->get_name()); - xmlpp::Element::NodeList list = child->get_children(); - xmlpp::Element::NodeList::iterator iter; + try { + index = value_node->get_link_index_from_name(name); - // Search for the first non-text XML element - for(iter = list.begin(); iter != list.end(); ++iter) - if(dynamic_cast(*iter)) break; + if(c[index]) + { + error(element,strprintf(_("'%s' was already defined in <%s>"), + name.c_str(), + element->get_name().c_str())); + continue; + } - if(iter==list.end()) - { - error(child,_("element is missing its contents")); - continue; - } + c[index] = canvas->surefind_value_node(id); - ValueNode::Handle link=parse_value_node(dynamic_cast(*iter),canvas); + if (!c[index]) + { + error(element, strprintf(_("'%s' attribute in <%s> references unknown ID '%s'"), + name.c_str(), + element->get_name().c_str(), + id.c_str())); + continue; + } + + if(!value_node->set_link(index, c[index])) + { + error(element, strprintf(_("Unable to set link '\"%s\" to ValueNode \"%s\" (link #%d in \"%s\")"), + value_node->link_name(index).c_str(), + id.c_str(), + index, + element->get_name().c_str())); + continue; + } - if(!link) + // printf(" <%s> set link %d (%s) using exported value\n", element->get_name().c_str(), index, name.c_str()); + } + catch (Exception::BadLinkName) { - error((*iter),"Parse of ValueNode failed"); + warning(element, strprintf("Bad link name '%s'", name.c_str())); } - else - if(!value_node->set_link(index,link)) + catch(Exception::IDNotFound) { - //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(element,"Unable to resolve " + id); } - - // \todo do a search for more elements and warn if they are found - - } - catch(Exception::BadLinkName) - { - error_unexpected_element(child,child->get_name()); - } - catch(...) - { - error(child,strprintf(_("Unknown Exception thrown when working on element \"%s\""),child->get_name().c_str())); - throw; - } - } - - return value_node; -} - -handle -CanvasParser::parse_composite(xmlpp::Element *element,Canvas::Handle canvas) -{ - assert(element->get_name()=="composite"); - - if(!element->get_attribute("type")) - { - error(element,"Missing attribute \"type\" in "); - return handle(); - } - - ValueBase::Type type=ValueBase::ident_type(element->get_attribute("type")->get_value()); - - if(!type) - { - error(element,"Bad type in "); - return handle(); - } - - handle value_node=ValueNode_Composite::create(type); - handle c[6]; - - if(!value_node) - { - error(element,strprintf(_("Unable to create "))); - return handle(); - } - - int i; - - for(i=0;ilink_count();i++) - { - string name=strprintf("c%d",i+1); - if(c[i]) - { - error(element,name+" was already defined in "); - continue; - } - if(element->get_attribute(name)) - { - c[i]=canvas->surefind_value_node(element->get_attribute(name)->get_value()); - if(c[i]) + catch(Exception::FileNotFound) { - if(!value_node->set_link(i,c[i])) - { - error(element,'"'+name+"\" attribute in has bad type"); - } + error(element,"Unable to open file referenced in " + id); + } + catch(...) + { + error(element,strprintf(_("Unknown Exception thrown when referencing ValueNode \"%s\""), id.c_str())); + throw; } - else - error(element,'"'+name+"\" attribute in references unknown ID"); } } - xmlpp::Element::NodeList list = element->get_children(); - for(xmlpp::Element::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter) + // handle inline valuenodes { - xmlpp::Element *child(dynamic_cast(*iter)); - if(!child) - continue; - else - for(i=0;ilink_count();i++) + int index; + String child_name; + xmlpp::Element::NodeList list = element->get_children(); + for(xmlpp::Element::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter) { - string name=strprintf("c%d",i+1); - if(child->get_name()==name) + xmlpp::Element *child(dynamic_cast(*iter)); + try { - if(c[i]) + if(!child) + continue; + + child_name = child->get_name(); + + index = value_node->get_link_index_from_name(child_name); + + if(c[index]) { - error(child,name+" was already defined in "); + error(child, strprintf(_("'%s' was already defined in <%s>"), + child_name.c_str(), + element->get_name().c_str())); break; } @@ -1459,63 +1251,101 @@ CanvasParser::parse_composite(xmlpp::Element *element,Canvas::Handle canvas) if(iter==list.end()) { - error(child,strprintf(_("<%s> is missing its contents"),name.c_str())); - break; + error(child,strprintf(_("element <%s> is missing its contents"), + child_name.c_str())); + continue; } - c[i]=parse_value_node(dynamic_cast(*iter),canvas); + c[index]=parse_value_node(dynamic_cast(*iter),canvas); - if(!c[i]) + if(!c[index]) { - error((*iter),"Parse of "+name+" ValueNode failed"); - break; + error((*iter),strprintf(_("Parse of '%s' failed"), + child_name.c_str())); + continue; } - if(!value_node->set_link(i,c[i])) + if(!value_node->set_link(index,c[index])) { - error(child,strprintf(_("<%s> has a bad value"),name.c_str())); - break; - } + error(child,strprintf(_("Unable to connect value node ('%s' of type '%s') to link %d (%s)"), + c[index]->get_name().c_str(), + ValueBase::type_local_name(c[index]->get_type()).c_str(), + index, + value_node->link_name(index).c_str())); + continue; + } // \todo do a search for more elements and warn if they are found - break; + + // printf(" <%s> set link %d (%s) using inline value\n", element->get_name().c_str(), index, child_name.c_str()); + } + catch(Exception::BadLinkName) + { + warning(child, strprintf("Bad link name for <%s>", element->get_name().c_str())); + } + catch(...) + { + error(child, strprintf(_("Unknown Exception thrown when working on element \"%s\""),child_name.c_str())); + throw; } } - // somewhat of a hack, but it works - if(i==value_node->link_count()) error_unexpected_element(child,child->get_name()); } - switch(value_node->link_count()) + String version(canvas->get_version()); + for (int i = 0; i < value_node->link_count(); i++) { - case 1: - if(!value_node->get_link(0)) - { - error(element," is missing parameters"); - return handle(); - } - break; - case 2: - if(!value_node->get_link(0) ||!value_node->get_link(1)) + if (!c[i]) { - error(element," is missing parameters"); - return handle(); - } - break; - case 3: - if(!value_node->get_link(0) ||!value_node->get_link(1) ||!value_node->get_link(2)) - { - error(element," is missing parameters"); - return handle(); + // the 'width' parameter of wasn't always present in version 0.1 canvases + if (version == "0.1" && element->get_name() == "stripes" && value_node->link_name(i) == "width") + continue; + + // these 3 blinecalctangent parameters didn't appear until canvas version 0.5 + if ((version == "0.1" || version == "0.2" || version == "0.3" || version == "0.4") && + element->get_name() == "blinecalctangent" && + (value_node->link_name(i) == "offset" || + value_node->link_name(i) == "scale" || + value_node->link_name(i) == "fixed_length")) + continue; + + // 'scale' was added while canvas version 0.5 was in use + if ((version == "0.3" || version == "0.4" || version == "0.5") && + element->get_name() == "blinecalcwidth" && + value_node->link_name(i) == "scale") + continue; + + // 'loop' was added while canvas version 0.5 was in use, as was the 'gradientcolor' node type + if (version == "0.5" && + element->get_name() == "gradientcolor" && + value_node->link_name(i) == "loop") + continue; + + // 'loop' was added while canvas version 0.6 was in use; the 'random' node was added back when 0.1 was in use + if ((version == "0.1" || version == "0.2" || version == "0.3" || version == "0.4" || version == "0.5" || version == "0.6") && + element->get_name() == "random" && + value_node->link_name(i) == "loop") + continue; + + error(element, strprintf(_("<%s> is missing link %d (%s)"), + element->get_name().c_str(), + i, + value_node->link_name(i).c_str())); + return 0; } - break; - case 4: - if(!value_node->get_link(0) ||!value_node->get_link(1) ||!value_node->get_link(2) ||!value_node->get_link(3)) + } + + // pre 0.4 canvases had *calctangent outputs scaled down by 0.5 for some reason + if (element->get_name() == "blinecalctangent" || element->get_name() == "segcalctangent") + { + if (version == "0.1" || version == "0.2" || version == "0.3") { - error(element," is missing parameters"); - return handle(); + handle scale_value_node=LinkableValueNode::create("scale",type); + scale_value_node->set_link(scale_value_node->get_link_index_from_name("link"), value_node); + scale_value_node->set_link(scale_value_node->get_link_index_from_name("scalar"), ValueNode_Const::create(Real(0.5))); + value_node = scale_value_node; } - break; - } + } + return value_node; } @@ -1524,7 +1354,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 +1385,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 +1408,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 +1416,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 +1430,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 +1457,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 +1468,7 @@ CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas) priority ) ); - + if(iter==begin_sequence.end()) begin_sequence.clear(); else @@ -1645,9 +1479,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 +1497,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 +1513,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 +1569,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 +1579,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,36 +1602,30 @@ 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 if(element->get_name()=="dynamic_list") value_node=parse_dynamic_list(element,canvas); else 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); + if (!value_node) value_node = PlaceholderValueNode::create(); + } else if(element->get_name()=="canvas") value_node=ValueNode_Const::create(parse_canvas(element,canvas,true)); else { error_unexpected_element(element,element->get_name()); - error(element, "Expected a ValueNode"); + error(element, strprintf(_("Expected a ValueNode. Refer to '%s'"), + VALUENODE_COMPATIBILITY_URL)); + 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 +1641,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 +1679,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 +1704,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 +1712,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); @@ -1908,6 +1741,11 @@ CanvasParser::parse_layer(xmlpp::Element *element,Canvas::Handle canvas) String param_name=child->get_attribute("name")->get_value(); + // SVN r2013 and r2014 renamed all 'pos' and 'offset' parameters to 'origin' + // 'pos' and 'offset' will appear in old .sif files; handle them correctly + if (param_name == "pos" || param_name == "offset") + param_name = "origin"; + if(child->get_attribute("use")) { // If the "use" attribute is used, then the @@ -1918,9 +1756,15 @@ CanvasParser::parse_layer(xmlpp::Element *element,Canvas::Handle canvas) String str= child->get_attribute("use")->get_value(); - if(layer->get_param(param_name).get_type()==ValueBase::TYPE_CANVAS) + if (str.empty()) + error(child,_("Empty use=\"\" value in ")); + else if(layer->get_param(param_name).get_type()==ValueBase::TYPE_CANVAS) { - if(!layer->set_param(param_name,canvas->surefind_canvas(str))) + String warnings; + Canvas::Handle c(canvas->surefind_canvas(str, warnings)); + warnings_text += warnings; + if(!c) error((*iter),strprintf(_("Failed to load subcanvas '%s'"), str.c_str())); + if(!layer->set_param(param_name,c)) error((*iter),_("Layer rejected canvas link")); } else @@ -1929,6 +1773,12 @@ CanvasParser::parse_layer(xmlpp::Element *element,Canvas::Handle canvas) handle value_node=canvas->surefind_value_node(str); // Assign the value_node to the dynamic parameter list + if (param_name == "segment_list" && (layer->get_name() == "region" || layer->get_name() == "outline")) + { + synfig::warning("%s: Updated valuenode connection to use the \"bline\" parameter instead of \"segment_list\".", + layer->get_name().c_str()); + param_name = "bline"; + } layer->connect_dynamic_param(param_name,value_node); } catch(Exception::IDNotFound) @@ -1953,7 +1803,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")) { @@ -1969,7 +1819,9 @@ CanvasParser::parse_layer(xmlpp::Element *element,Canvas::Handle canvas) // the layer liked it if(!layer->set_param(param_name,data)) { - warning((*iter),_("Layer rejected value for ")); + warning((*iter),strprintf(_("Layer '%s' rejected value for parameter '%s'"), + element->get_attribute("type")->get_value().c_str(), + param_name.c_str())); continue; } } @@ -1991,7 +1843,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 +1856,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 +1864,8 @@ CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool in } Canvas::Handle canvas; - - + + if(parent && (element->get_attribute("id") || inline_)) { if(inline_) @@ -2024,7 +1876,9 @@ CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool in { try { - canvas=parent->find_canvas(element->get_attribute("id")->get_value()); + String warnings; + canvas=parent->find_canvas(element->get_attribute("id")->get_value(), warnings); + warnings_text += warnings; } catch(...) { @@ -2052,11 +1906,26 @@ 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()); + else if(parent) + canvas->set_version(parent->get_version()); + if(element->get_attribute("width")) - canvas->rend_desc().set_w(atoi(element->get_attribute("width")->get_value().c_str())); + { + int width = atoi(element->get_attribute("width")->get_value().c_str()); + if (width < 1) + fatal_error(element, _("Canvas with width or height less than one is not allowed")); + canvas->rend_desc().set_w(width); + } if(element->get_attribute("height")) - canvas->rend_desc().set_h(atoi(element->get_attribute("height")->get_value().c_str())); + { + int height = atoi(element->get_attribute("height")->get_value().c_str()); + if (height < 1) + fatal_error(element, _("Canvas with width or height less than one is not allowed")); + canvas->rend_desc().set_h(height); + } if(element->get_attribute("xres")) canvas->rend_desc().set_x_res(atof(element->get_attribute("xres")->get_value().c_str())); @@ -2064,7 +1933,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 +1971,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 +2032,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 +2046,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 +2065,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 +2080,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,22 +2110,56 @@ 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; } -Canvas::Handle -CanvasParser::parse_from_file(const String &file) +void +CanvasParser::register_canvas_in_map(Canvas::Handle canvas, String as) { - return parse_from_file_as(file,file); + get_open_canvas_map()[etl::absolute_path(as)]=canvas; + canvas->signal_deleted().connect(sigc::bind(sigc::ptr_fun(_remove_from_open_canvas_map),canvas.get())); + canvas->signal_file_name_changed().connect(sigc::bind(sigc::ptr_fun(_canvas_file_name_changed),canvas.get())); } +#ifdef _DEBUG +void +CanvasParser::show_canvas_map(String file, int line, String text) +{ + return; + printf(" .-----\n | %s:%d %s\n", file.c_str(), line, text.c_str()); + std::map > canvas_map(synfig::get_open_canvas_map()); + std::map >::iterator iter; + for (iter = canvas_map.begin(); iter != canvas_map.end(); iter++) + { + synfig::String first(iter->first); + etl::loose_handle second(iter->second); + printf(" | %40s : %lx (%d)\n", first.c_str(), ulong(&*second), second->count()); + } + printf(" `-----\n\n"); +} +#endif // _DEBUG + Canvas::Handle -CanvasParser::parse_from_file_as(const String &file,const String &as) +CanvasParser::parse_from_file_as(const String &file_,const String &as_,String &errors) { - CHECK_EXPIRE_TIME(); + ChangeLocale change_locale(LC_NUMERIC, "C"); + String file(unix_to_local_path(file_)); + String as(unix_to_local_path(as_)); + try { if(get_open_canvas_map().count(etl::absolute_path(as))) @@ -2268,14 +2171,11 @@ CanvasParser::parse_from_file_as(const String &file,const String &as) if(parser) { Canvas::Handle canvas(parse_canvas(parser.get_document()->get_root_node(),0,false,as)); - get_open_canvas_map()[etl::absolute_path(as)]=canvas; - canvas->signal_deleted().connect(sigc::bind(sigc::ptr_fun(_remove_from_open_canvas_map),canvas.get())); - canvas->signal_file_name_changed().connect(sigc::bind(sigc::ptr_fun(_canvas_file_name_changed),canvas.get())); - - + if (!canvas) return canvas; + register_canvas_in_map(canvas, 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) @@ -2296,39 +2196,42 @@ CanvasParser::parse_from_file_as(const String &file,const String &as) catch(Exception::FileNotFound) { synfig::error("FileNotFound Thrown"); } catch(Exception::IDNotFound) { synfig::error("IDNotFound Thrown"); } catch(Exception::IDAlreadyExists) { synfig::error("IDAlreadyExists Thrown"); } + catch(xmlpp::internal_error x) + { + if (!strcmp(x.what(), "Couldn't create parsing context")) + throw runtime_error(String(" * ") + _("Can't open file") + " \"" + file + "\""); + throw; + } catch(const std::exception& ex) { synfig::error("Standard Exception: "+String(ex.what())); + errors = ex.what(); return Canvas::Handle(); } catch(const String& str) { cerr<"); total_warnings_=0; - xmlpp::DomParser parser; - parser.parse_memory(data); - xmlpp::Element *root=parser.get_document()->get_root_node(); - if(parser) + if(node) { - Canvas::Handle canvas(parse_canvas(root)); - canvas->signal_deleted().connect(sigc::bind(sigc::ptr_fun(_remove_from_open_canvas_map),canvas.get())); - canvas->signal_file_name_changed().connect(sigc::bind(sigc::ptr_fun(_canvas_file_name_changed),canvas.get())); + Canvas::Handle canvas(parse_canvas(node,0,false,"")); + if (!canvas) return canvas; 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) @@ -2340,7 +2243,7 @@ CanvasParser::parse_from_string(const String &data) goto again; } } - + return canvas; } } @@ -2349,16 +2252,50 @@ CanvasParser::parse_from_string(const String &data) catch(Exception::FileNotFound) { synfig::error("FileNotFound Thrown"); } catch(Exception::IDNotFound) { synfig::error("IDNotFound Thrown"); } catch(Exception::IDAlreadyExists) { synfig::error("IDAlreadyExists Thrown"); } + catch(xmlpp::internal_error x) + { + if (!strcmp(x.what(), "Couldn't create parsing context")) + throw runtime_error(String(" * ") + _("Can't open file") + " \"" + "\""); + throw; + } catch(const std::exception& ex) { synfig::error("Standard Exception: "+String(ex.what())); + errors = ex.what(); return Canvas::Handle(); } catch(const String& str) { cerr<