return root;
}
-xmlpp::Element* encode_time(xmlpp::Element* root,Time t, float fps=0)
+xmlpp::Element* encode_time(xmlpp::Element* root,Time t, float /*fps*/=0)
{
root->set_name("time");
//root->set_attribute("value",t.get_string(fps));
//waypoint_node->add_child(encode_value(iter->get_value(),canvas));
if(iter->get_value_node()->is_exported())
waypoint_node->set_attribute("use",iter->get_value_node()->get_relative_id(canvas));
- else
- encode_value_node(waypoint_node->add_child("value_node"),iter->get_value_node(),canvas);
+ else {
+ ValueNode::ConstHandle value_node = iter->get_value_node();
+ if(ValueNode_Const::ConstHandle::cast_dynamic(value_node)) {
+ const ValueBase data = ValueNode_Const::ConstHandle::cast_dynamic(value_node)->get_value();
+ if (data.get_type() == ValueBase::TYPE_CANVAS)
+ waypoint_node->set_attribute("use",data.get(Canvas::Handle()).get()->get_relative_id(canvas));
+ else
+ encode_value_node(waypoint_node->add_child("value_node"),iter->get_value_node(),canvas);
+ }
+ else
+ encode_value_node(waypoint_node->add_child("value_node"),iter->get_value_node(),canvas);
+ }
switch(iter->get_before())
{
waypoint_node->set_attribute("before","halt");
break;
case INTERPOLATION_LINEAR:
- waypoint_node->set_attribute("before","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");
break;
case INTERPOLATION_MANUAL:
waypoint_node->set_attribute("before","manual");
waypoint_node->set_attribute("before","constant");
break;
case INTERPOLATION_TCB:
- // This is the default value, so don't add a new attribute
+ // 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","tcb");
break;
default:
error("Unknown waypoint type for \"before\" attribute");
waypoint_node->set_attribute("after","halt");
break;
case INTERPOLATION_LINEAR:
- waypoint_node->set_attribute("after","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");
break;
case INTERPOLATION_MANUAL:
waypoint_node->set_attribute("after","manual");
waypoint_node->set_attribute("after","constant");
break;
case INTERPOLATION_TCB:
- // This is the default value, so don't add a new attribute
+ // 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","tcb");
break;
default:
- error("Unknown waypoint type for \"before\" attribute");
+ error("Unknown waypoint type for \"after\" attribute");
}
if(iter->get_tension()!=0.0)
continue;
}
- if(value.get_type()==ValueBase::TYPE_CANVAS && !value.get(Canvas::LooseHandle())->is_inline())
+ if(value.get_type()==ValueBase::TYPE_CANVAS)
{
- Canvas::Handle child(value.get(Canvas::LooseHandle()));
+ // the ->is_inline() below was crashing if the canvas
+ // contained a PasteCanvas with the default <No Image
+ // Selected> Canvas setting; this avoids the crash
+ if (!value.get(Canvas::LooseHandle()))
+ continue;
+
+ if (!value.get(Canvas::LooseHandle())->is_inline())
+ {
+ Canvas::Handle child(value.get(Canvas::LooseHandle()));
- if(!value.get(Canvas::Handle()))
+ if(!value.get(Canvas::Handle()))
+ continue;
+ xmlpp::Element *node=root->add_child("param");
+ node->set_attribute("name",iter->get_name());
+ node->set_attribute("use",child->get_relative_id(layer->get_canvas()));
continue;
- xmlpp::Element *node=root->add_child("param");
- node->set_attribute("name",iter->get_name());
- node->set_attribute("use",child->get_relative_id(layer->get_canvas()));
- continue;
+ }
}
xmlpp::Element *node=root->add_child("param");
node->set_attribute("name",iter->get_name());