using namespace Action;
/* === M A C R O S ========================================================= */
-#define ACTION_INIT2(class) \
- Action::Base* class::create() { return new class(); } \
- synfig::String class::get_name()const { return name__; }
-ACTION_INIT2(Action::ValueDescSet);
+ACTION_INIT_NO_GET_LOCAL_NAME(Action::ValueDescSet);
ACTION_SET_NAME(Action::ValueDescSet,"value_desc_set");
ACTION_SET_LOCAL_NAME(Action::ValueDescSet,N_("Set ValueDesc"));
ACTION_SET_TASK(Action::ValueDescSet,"set");
{
}
else if(value_desc.parent_is_layer_param())
- {
- if(value_desc.get_layer()->get_description().empty())
- name=value_desc.get_layer()->get_local_name();
- else
- name=value_desc.get_layer()->get_description();
- name+="->"+value_desc.get_param_name();
- }
+ name = strprintf(_("'%s' -> %s"),
+ value_desc.get_layer()->get_non_empty_description().c_str(),
+ value_desc.get_param_name().c_str());
else if(value_desc.parent_is_value_node())
{
synfig::LinkableValueNode::Handle value_node(synfig::LinkableValueNode::Handle::cast_reinterpret(value_desc.get_parent_value_node()));
- name=value_node->link_local_name(value_desc.get_index());
-
synfig::Node* node;
for(node=value_node.get();!node->parent_set.empty() && !dynamic_cast<Layer*>(node);node=*node->parent_set.begin());
Layer::Handle parent_layer(dynamic_cast<Layer*>(node));
if(parent_layer)
- {
- if(parent_layer->get_description().empty())
- name=parent_layer->get_local_name()+"=>"+name;
- else
- name=parent_layer->get_description()+"=>"+name;
- }
+ name = strprintf(_("'%s' => %s"),
+ parent_layer->get_non_empty_description().c_str(),
+ value_node->link_local_name(value_desc.get_index()).c_str());
+ else
+ name = value_node->link_local_name(value_desc.get_index());
}
- return strprintf(_("Set %s"),name.c_str());
+ return strprintf(_("Set %s"), name.c_str());
}
Action::ParamVocab
if (value_desc.get_index()==4) {
printf("copying change to tangent 2\n");
- DEBUGPOINT();
ValueNode_Composite::Handle parent_value_node;
parent_value_node=parent_value_node.cast_dynamic(value_desc.get_parent_value_node());
break;
}
default:
- throw Error("Bad type for composite (%s)",ValueBase::type_name(value.get_type()).c_str());
+ throw Error(_("Bad type for composite (%s)"),ValueBase::type_local_name(value.get_type()).c_str());
break;
}
{
case ValueBase::TYPE_VECTOR:
{
+ Angle old_angle = (*(ValueNode_RadialComposite::Handle::cast_dynamic(
+ value_desc.get_value_node())->get_link_vfunc(1)))(time).get(Angle());
Vector vect(value.get(Vector()));
components[0]=vect.mag();
- components[1]=Angle(Angle::tan(vect[1],vect[0]));
+ Angle change = Angle(Angle::tan(vect[1],vect[0])) - old_angle;
+ while (change < Angle::deg(-180)) change += Angle::deg(360);
+ while (change > Angle::deg(180)) change -= Angle::deg(360);
+ components[1]=old_angle + change;
n_components=2;
}
break;
n_components=4;
break;
default:
- throw Error(_("Bad type for radial composite (%s)"),ValueBase::type_name(value.get_type()).c_str());
+ throw Error(_("Bad type for radial composite (%s)"),ValueBase::type_local_name(value.get_type()).c_str());
break;
}
for(int i=0;i<n_components;i++)
if(!action->is_ready())
throw Error(Error::TYPE_NOTREADY);
- DEBUGPOINT();
add_action_front(action);
}
else
value_node=value_node.cast_dynamic(value_desc.get_value_node());
}
- DEBUGPOINT();
if(!value_node)
throw Error(_("Direct manipulation of this ValueNode type is not yet supported"));
if(!action->is_ready())
throw Error(Error::TYPE_NOTREADY);
- DEBUGPOINT();
add_action(action);
return;