X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Floadcanvas.cpp;h=433eeb006d520bffcea5fe581f6bd07c7e364e98;hb=4ba22fb51d97f1ecce04dcc5e40569a4354c1bae;hp=00cbfc239e184a9a6bf54ff21db8fe7ecac1ad0c;hpb=42f7fccb005cc4a4ab985e01398ab6479bb62199;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/loadcanvas.cpp b/synfig-core/trunk/src/synfig/loadcanvas.cpp index 00cbfc2..433eeb0 100644 --- a/synfig-core/trunk/src/synfig/loadcanvas.cpp +++ b/synfig-core/trunk/src/synfig/loadcanvas.cpp @@ -6,7 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley -** Copyright (c) 2007 Chris Moore +** Copyright (c) 2007, 2008 Chris Moore ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -39,6 +39,7 @@ #include #include +#include "layer_pastecanvas.h" #include "loadcanvas.h" #include "valuenode.h" #include "valuenode_subtract.h" @@ -92,6 +93,8 @@ test_class test_class_instance; 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); @@ -121,46 +124,50 @@ static void _canvas_file_name_changed(Canvas *x) } Canvas::Handle -synfig::open_canvas(const String &filename) +synfig::open_canvas(const String &filename,String &errors,String &warnings) { - CanvasParser parser; - - parser.set_allow_errors(true); - - Canvas::Handle canvas=parser.parse_from_file(filename); - - if(parser.error_count()) - return Canvas::Handle(); - - return canvas; + return open_canvas_as(filename, filename, errors, warnings); } Canvas::Handle -synfig::open_canvas_as(const String &filename,const String &as) +synfig::open_canvas_as(const String &filename,const String &as,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; -} + 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 -synfig::string_to_canvas(const String &data) -{ + 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; } @@ -182,10 +189,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")); } @@ -195,6 +205,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< // if (type==ValueBase::TYPE_CANVAS) - waypoint_value_node=ValueNode_Const::create(canvas->surefind_canvas(child->get_attribute("use")->get_value())); + { + 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()); } @@ -995,7 +1010,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")) { @@ -1060,7 +1075,7 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas) // 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) + if (type == ValueBase::TYPE_ANGLE) { if (canvas->get_version() == "0.1") { @@ -1275,12 +1290,41 @@ CanvasParser::parse_linkable_value_node(xmlpp::Element *element,Canvas::Handle c } } + String version(canvas->get_version()); for (int i = 0; i < value_node->link_count(); i++) { - if (!c[i] && - // the 'width' parameter of wasn't always present, so it won't be in old .sif files - !(element->get_name() == "stripes" && value_node->link_name(i) == "width")) + if (!c[i]) { + // 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, @@ -1289,6 +1333,18 @@ CanvasParser::parse_linkable_value_node(xmlpp::Element *element,Canvas::Handle c } } + // 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") + { + 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; + } + } + return value_node; } @@ -1684,6 +1740,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 @@ -1698,7 +1759,11 @@ CanvasParser::parse_layer(xmlpp::Element *element,Canvas::Handle canvas) 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 @@ -1707,6 +1772,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) @@ -1747,7 +1818,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; } } @@ -1802,7 +1875,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(...) { @@ -1836,10 +1911,20 @@ CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool in 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())); @@ -2041,21 +2126,41 @@ CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool in 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) { + ChangeLocale change_locale(LC_NUMERIC, "C"); + String file(unix_to_local_path(file_)); + String as(unix_to_local_path(as_)); + 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)]; @@ -2065,11 +2170,8 @@ 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()); @@ -2093,67 +2195,23 @@ 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(const std::exception& ex) - { - synfig::error("Standard Exception: "+String(ex.what())); - return Canvas::Handle(); - } - catch(const String& str) + catch(xmlpp::internal_error x) { - cerr<"); - total_warnings_=0; - xmlpp::DomParser parser; - parser.parse_memory(data); - xmlpp::Element *root=parser.get_document()->get_root_node(); - if(parser) - { - 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())); - - 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) - { - ValueNode::Handle value_node(*iter); - if(value_node->is_exported() && value_node->get_id().find("Unnamed")==0) - { - canvas->remove_value_node(value_node); - goto again; - } - } - - return canvas; - } - } - catch(Exception::BadLinkName) { synfig::error("BadLinkName Thrown"); } - catch(Exception::BadType) { synfig::error("BadType Thrown"); } - catch(Exception::FileNotFound) { synfig::error("FileNotFound Thrown"); } - catch(Exception::IDNotFound) { synfig::error("IDNotFound Thrown"); } - catch(Exception::IDAlreadyExists) { synfig::error("IDAlreadyExists Thrown"); } catch(const std::exception& ex) { synfig::error("Standard Exception: "+String(ex.what())); + errors = ex.what(); return Canvas::Handle(); } catch(const String& str) { cerr<