Removed a bunch more DEBUGPOINT()s.

[synfig.git] / synfig-core / trunk / src / synfig / savecanvas.cpp

diff --git a/synfig-core/trunk/src/synfig/savecanvas.cpp b/synfig-core/trunk/src/synfig/savecanvas.cpp
index 8ccb099..645895c 100644 (file)
--- a/synfig-core/trunk/src/synfig/savecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/savecanvas.cpp
@@ -248,7 +248,7 @@ xmlpp::Element* encode_value(xmlpp::Element* root,const ValueBase &data,Canvas::
                root->set_name("nil");
                return root;
        default:
-               synfig::error(strprintf("Unknown value(%s), cannot create XML representation!",ValueBase::type_name(data.get_type()).c_str()));
+               synfig::error(strprintf(_("Unknown value(%s), cannot create XML representation!"),ValueBase::type_local_name(data.get_type()).c_str()));
                root->set_name("nil");
                return root;
        }
@@ -292,9 +292,7 @@ xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
                        waypoint_node->set_attribute("before","halt");
                        break;
                case INTERPOLATION_LINEAR:
-                       // This is the default value for angles, so don't add a new attribute for them
-                       if (value_node->get_type() != ValueBase::TYPE_ANGLE)
-                               waypoint_node->set_attribute("before","linear");
+                       waypoint_node->set_attribute("before","linear");
                        break;
                case INTERPOLATION_MANUAL:
                        waypoint_node->set_attribute("before","manual");
@@ -303,9 +301,7 @@ xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
                        waypoint_node->set_attribute("before","constant");
                        break;
                case INTERPOLATION_TCB:
-                       // This is the default value, so don't add a new attribute (unless it's an angle - they default to linear)
-                       if (value_node->get_type() == ValueBase::TYPE_ANGLE)
-                               waypoint_node->set_attribute("before","auto");
+                       waypoint_node->set_attribute("before","auto");
                        break;
                default:
                        error("Unknown waypoint type for \"before\" attribute");
@@ -317,9 +313,7 @@ xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
                        waypoint_node->set_attribute("after","halt");
                        break;
                case INTERPOLATION_LINEAR:
-                       // This is the default value for angles, so don't add a new attribute for them
-                       if (value_node->get_type() != ValueBase::TYPE_ANGLE)
-                               waypoint_node->set_attribute("after","linear");
+                       waypoint_node->set_attribute("after","linear");
                        break;
                case INTERPOLATION_MANUAL:
                        waypoint_node->set_attribute("after","manual");
@@ -328,9 +322,7 @@ xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
                        waypoint_node->set_attribute("after","constant");
                        break;
                case INTERPOLATION_TCB:
-                       // This is the default value, so don't add a new attribute (unless it's an angle - they default to linear)
-                       if (value_node->get_type() == ValueBase::TYPE_ANGLE)
-                               waypoint_node->set_attribute("after","auto");
+                       waypoint_node->set_attribute("after","auto");
                        break;
                default:
                        error("Unknown waypoint type for \"after\" attribute");
@@ -644,7 +636,7 @@ xmlpp::Element* encode_canvas(xmlpp::Element* root,Canvas::ConstHandle canvas)
        root->set_name("canvas");
 
        if(canvas->is_root())
-               root->set_attribute("version","0.1");
+               root->set_attribute("version",canvas->get_version());
 
        if(!canvas->get_id().empty() && !canvas->is_root() && !canvas->is_inline())
                root->set_attribute("id",canvas->get_id());