X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Floadcanvas.cpp;h=433eeb006d520bffcea5fe581f6bd07c7e364e98;hb=4ba22fb51d97f1ecce04dcc5e40569a4354c1bae;hp=c6b9682163796644d6007d90120e987b4150509d;hpb=1e666f8540392bce6535f334a0b78e5083345535;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/loadcanvas.cpp b/synfig-core/trunk/src/synfig/loadcanvas.cpp index c6b9682..433eeb0 100644 --- a/synfig-core/trunk/src/synfig/loadcanvas.cpp +++ b/synfig-core/trunk/src/synfig/loadcanvas.cpp @@ -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,19 +124,44 @@ static void _canvas_file_name_changed(Canvas *x) } Canvas::Handle -synfig::open_canvas(const String &filename,String &errors) +synfig::open_canvas(const String &filename,String &errors,String &warnings) { - return open_canvas_as(filename, filename, errors); + return open_canvas_as(filename, filename, errors, warnings); } Canvas::Handle -synfig::open_canvas_as(const String &filename,const String &as,String &errors) +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_file_as(filename,as,errors); + 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()) { @@ -161,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")); } @@ -174,7 +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"; + 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()); } @@ -1040,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") { @@ -1284,6 +1319,12 @@ CanvasParser::parse_linkable_value_node(xmlpp::Element *element,Canvas::Handle c 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, @@ -1718,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 @@ -1830,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(...) { @@ -2079,15 +2126,41 @@ CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool in return canvas; } +void +CanvasParser::register_canvas_in_map(Canvas::Handle canvas, String 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())); +} + +#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_,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)]; @@ -2097,9 +2170,8 @@ CanvasParser::parse_from_file_as(const String &file_,const String &as_,String &e 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()); @@ -2123,6 +2195,12 @@ CanvasParser::parse_from_file_as(const String &file_,const String &as_,String &e 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()));