**
** \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
#include <stdexcept>
#include <iostream>
+#include "layer_pastecanvas.h"
#include "loadcanvas.h"
#include "valuenode.h"
#include "valuenode_subtract.h"
/* === 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<String> CanvasParser::loading_;
+
/* === P R O C E D U R E S ================================================= */
static std::map<String, Canvas::LooseHandle>* open_canvas_map_(0);
}
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;
}
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<<str<<endl;
+ string str=strprintf("%s:<%s>:%d: ",filename.c_str(),element->get_name().c_str(),element->get_line())+text;
+
+ synfig::warning(str);
+ // cerr<<str<<endl;
+
total_warnings_++;
+ warnings_text += " * " + str + "\n";
if(total_warnings_>=max_warnings_)
fatal_error(element, _("Too many warnings"));
}
{
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<<str<<endl;
return ValueBase(parse_canvas(element,canvas,true));
else
{
- DEBUGPOINT();
error_unexpected_element(element,element->get_name());
}
if(!value_node)
{
- error(element,strprintf(_("Unable to create <animated> with type \"%s\""),ValueBase::type_name(type).c_str()));
+ error(element,strprintf(_("Unable to create <animated> with type \"%s\""),ValueBase::type_local_name(type).c_str()));
return ValueNode_Animated::Handle();
}
// <waypoint time="0s" use="mycanvas"/>
// </animated>
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());
}
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"))
{
else
error_unexpected_element(child,child->get_name());
}
+
+ // 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
+
+ // 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 (canvas->get_version() == "0.1")
+ {
+ 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;
+ }
+ }
+ }
+
value_node->changed();
return value_node;
}
etl::handle<LinkableValueNode>
CanvasParser::parse_linkable_value_node(xmlpp::Element *element,Canvas::Handle canvas)
{
- handle<LinkableValueNode> 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<LinkableValueNode> value_node=LinkableValueNode::create(element->get_name(),type);
+ handle<ValueNode> 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;i<value_node->link_count();i++)
+ // handle exported valuenodes
{
- 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)
+ 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++)
{
- 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;
- }
- }
+ name = (*iter)->get_name();
+ id = (*iter)->get_value();
+ if (name == "guid" || name == "id" || name == "type")
+ continue;
+ try {
+ index = value_node->get_link_index_from_name(name);
- xmlpp::Element::NodeList list = element->get_children();
- for(xmlpp::Element::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter)
- {
- xmlpp::Element *child(dynamic_cast<xmlpp::Element*>(*iter));
- try
- {
- if(!child)
- continue;
- int index=value_node->get_link_index_from_name(child->get_name());
+ if(c[index])
+ {
+ error(element,strprintf(_("'%s' was already defined in <%s>"),
+ name.c_str(),
+ element->get_name().c_str()));
+ continue;
+ }
- xmlpp::Element::NodeList list = child->get_children();
- xmlpp::Element::NodeList::iterator iter;
+ c[index] = canvas->surefind_value_node(id);
- // Search for the first non-text XML element
- for(iter = list.begin(); iter != list.end(); ++iter)
- if(dynamic_cast<xmlpp::Element*>(*iter)) break;
+ 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(iter==list.end())
+ 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;
+ }
+
+ // printf(" <%s> set link %d (%s) using exported value\n", element->get_name().c_str(), index, name.c_str());
+ }
+ catch (Exception::BadLinkName)
{
- error(child,_("element is missing its contents"));
- continue;
+ warning(element, strprintf("Bad link name '%s'", name.c_str()));
}
-
- ValueNode::Handle link=parse_value_node(dynamic_cast<xmlpp::Element*>(*iter),canvas);
-
- if(!link)
+ catch(Exception::IDNotFound)
{
- error((*iter),"Parse of ValueNode failed");
+ error(element,"Unable to resolve " + id);
}
- else
- if(!value_node->set_link(index,link))
+ catch(Exception::FileNotFound)
{
- //error(dynamic_cast<xmlpp::Element*>(*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 open file referenced in " + 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<ValueNode_Composite>
-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 <composite>");
- return handle<ValueNode_Composite>();
- }
-
- ValueBase::Type type=ValueBase::ident_type(element->get_attribute("type")->get_value());
-
- if(!type)
- {
- error(element,"Bad type in <composite>");
- return handle<ValueNode_Composite>();
- }
-
- handle<ValueNode_Composite> value_node=ValueNode_Composite::create(type);
- handle<ValueNode> c[6];
-
- if(!value_node)
- {
- error(element,strprintf(_("Unable to create <composite>")));
- return handle<ValueNode_Composite>();
- }
-
- int i;
-
- for(i=0;i<value_node->link_count();i++)
- {
- string name=strprintf("c%d",i+1);
- if(c[i])
- {
- error(element,name+" was already defined in <composite>");
- continue;
- }
- if(element->get_attribute(name))
- {
- c[i]=canvas->surefind_value_node(element->get_attribute(name)->get_value());
- if(c[i])
+ catch(...)
{
- if(!value_node->set_link(i,c[i]))
- {
- error(element,'"'+name+"\" attribute in <composite> has bad type");
- }
+ error(element,strprintf(_("Unknown Exception thrown when referencing ValueNode \"%s\""), id.c_str()));
+ throw;
}
- else
- error(element,'"'+name+"\" attribute in <composite> 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<xmlpp::Element*>(*iter));
- if(!child)
- continue;
- else
- for(i=0;i<value_node->link_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<xmlpp::Element*>(*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 <composite>");
+ error(child, strprintf(_("'%s' was already defined in <%s>"),
+ child_name.c_str(),
+ element->get_name().c_str()));
break;
}
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<xmlpp::Element*>(*iter),canvas);
+ c[index]=parse_value_node(dynamic_cast<xmlpp::Element*>(*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,"<composite> is missing parameters");
- return handle<ValueNode_Composite>();
- }
- break;
- case 2:
- if(!value_node->get_link(0) ||!value_node->get_link(1))
- {
- error(element,"<composite> is missing parameters");
- return handle<ValueNode_Composite>();
- }
- break;
- case 3:
- if(!value_node->get_link(0) ||!value_node->get_link(1) ||!value_node->get_link(2))
+ if (!c[i])
{
- error(element,"<composite> is missing parameters");
- return handle<ValueNode_Composite>();
+ // the 'width' parameter of <stripes> 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,"<composite> is missing parameters");
- return handle<ValueNode_Composite>();
+ handle<LinkableValueNode> 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;
}
if(element->get_name()=="hermite" || element->get_name()=="animated")
value_node=parse_animated(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
value_node=parse_dynamic_list(element,canvas);
else
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
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
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 <param>"));
+ 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
handle<ValueNode> 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)
// the layer liked it
if(!layer->set_param(param_name,data))
{
- warning((*iter),_("Layer rejected value for <param>"));
+ warning((*iter),strprintf(_("Layer '%s' rejected value for parameter '%s'"),
+ element->get_attribute("type")->get_value().c_str(),
+ param_name.c_str()));
continue;
}
}
{
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(...)
{
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()));
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)
+{
+ 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 parse_from_file_as(file,file);
+ return;
+ printf(" .-----\n | %s:%d %s\n", file.c_str(), line, text.c_str());
+ std::map<synfig::String, etl::loose_handle<Canvas> > canvas_map(synfig::get_open_canvas_map());
+ std::map<synfig::String, etl::loose_handle<Canvas> >::iterator iter;
+ for (iter = canvas_map.begin(); iter != canvas_map.end(); iter++)
+ {
+ synfig::String first(iter->first);
+ etl::loose_handle<Canvas> 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)];
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());
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)
- {
- cerr<<str<<endl;
- // synfig::error(str);
- return Canvas::Handle();
- }
- return Canvas::Handle();
-}
-
-Canvas::Handle
-CanvasParser::parse_from_string(const String &data)
-{
- try
+ catch(xmlpp::internal_error x)
{
- ChangeLocale change_locale(LC_NUMERIC, "C");
- filename=_("<INTERNAL>");
- 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;
- }
+ if (!strcmp(x.what(), "Couldn't create parsing context"))
+ throw runtime_error(String(" * ") + _("Can't open file") + " \"" + file + "\"");
+ throw;
}
- 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<<str<<endl;
// synfig::error(str);
+ errors = str;
return Canvas::Handle();
}
return Canvas::Handle();
projects / synfig.git / blobdiff