X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Floadcanvas.cpp;h=fa5eb406fac9aa1d67212b4345cf644ddbf878d2;hb=dbda39a6a78b7dd7fb9d2b0b784c4ff17d59e42d;hp=41406c45c38c5dd0ba3f98c2b3f55528a788769e;hpb=7a81d44e03d048339b9cbb3f7d8134497fcf3363;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/loadcanvas.cpp b/synfig-core/trunk/src/synfig/loadcanvas.cpp
index 41406c4..fa5eb40 100644
--- a/synfig-core/trunk/src/synfig/loadcanvas.cpp
+++ b/synfig-core/trunk/src/synfig/loadcanvas.cpp
@@ -88,6 +88,8 @@ 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)==' '); }
 
 /* === P R O C E D U R E S ================================================= */
@@ -856,7 +858,6 @@ CanvasParser::parse_value(xmlpp::Element *element,Canvas::Handle canvas)
 		return ValueBase(parse_canvas(element,canvas,true));
 	else
 	{
-		DEBUGPOINT();
 		error_unexpected_element(element,element->get_name());
 	}
 
@@ -889,7 +890,7 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas)
 
 	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();
 	}
 
@@ -1051,6 +1052,46 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas)
 		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) 
+	{
+		Canvas::Handle parent = canvas;
+		while (!parent->is_root())
+			parent = parent->parent();
+
+		if (parent->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;
 }
@@ -1082,7 +1123,10 @@ CanvasParser::parse_linkable_value_node(xmlpp::Element *element,Canvas::Handle c
 
 	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;
 	}
 
@@ -1158,8 +1202,8 @@ CanvasParser::parse_linkable_value_node(xmlpp::Element *element,Canvas::Handle c
 			else
 			if(!value_node->set_link(index,link))
 			{
-				//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(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_local_name(link->get_type()).c_str(),index));
+				error(element,strprintf(_("Unable to connect value node ('%s' of type '%s') to link %d"),link->get_name().c_str(),ValueBase::type_local_name(link->get_type()).c_str(),index));
 			}
 
 			// \todo do a search for more elements and warn if they are found
@@ -1582,20 +1626,23 @@ CanvasParser::parse_value_node(xmlpp::Element *element,Canvas::Handle canvas)
 		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
@@ -1855,6 +1902,9 @@ CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool in
 			canvas->set_guid(guid);
 	}
 
+	if(element->get_attribute("version"))
+		canvas->set_version(element->get_attribute("version")->get_value());
+
 	if(element->get_attribute("width"))
 		canvas->rend_desc().set_w(atoi(element->get_attribute("width")->get_value().c_str()));
 
@@ -2057,6 +2107,7 @@ CanvasParser::parse_canvas(xmlpp::Element *element,Canvas::Handle parent,bool in
 								nodes.c_str()));
 	}
 
+	canvas->set_version(CURRENT_CANVAS_VERSION);
 	return canvas;
 }