X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Fvaluenode_anglestring.cpp;h=41777779c43dac4195b8dd029d75f615a3f0d782;hb=dbc88fd05c8d29849d2e6227d23605508eb188ae;hp=978b8b8cf11169b0f6c7d8929606cf70650e63cd;hpb=adfc80c126f482d7ea2bac38001a2c4a7c7df88c;p=synfig.git

diff --git a/synfig-core/src/synfig/valuenode_anglestring.cpp b/synfig-core/src/synfig/valuenode_anglestring.cpp
index 978b8b8..4177777 100644
--- a/synfig-core/src/synfig/valuenode_anglestring.cpp
+++ b/synfig-core/src/synfig/valuenode_anglestring.cpp
@@ -54,6 +54,8 @@ using namespace synfig;
 ValueNode_AngleString::ValueNode_AngleString(const ValueBase &value):
 	LinkableValueNode(value.get_type())
 {
+	Vocab ret(get_children_vocab());
+	set_children_vocab(ret);
 	switch(value.get_type())
 	{
 	case ValueBase::TYPE_STRING:
@@ -65,8 +67,6 @@ ValueNode_AngleString::ValueNode_AngleString(const ValueBase &value):
 	default:
 		throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
 	}
-
-	DCAST_HACK_ENABLE();
 }
 
 LinkableValueNode*
@@ -97,13 +97,14 @@ ValueNode_AngleString::operator()(Time t)const
 	int precision((*precision_)(t).get(int()));
 	int zero_pad((*zero_pad_)(t).get(bool()));
 
+	if(precision<0) precision=0;
 	switch (get_type())
 	{
 	case ValueBase::TYPE_STRING:
 		return strprintf(strprintf("%%%s%d.%df",
 								   zero_pad ? "0" : "",
 								   width,
-								   precision).c_str(), angle);
+								   precision).c_str(), angle)+"°";
 	default:
 		break;
 	}
@@ -161,50 +162,37 @@ ValueNode_AngleString::link_count()const
 	return 4;
 }
 
-String
-ValueNode_AngleString::link_name(int i)const
+bool
+ValueNode_AngleString::check_type(ValueBase::Type type)
 {
-	assert(i>=0 && i<link_count());
-
-	switch(i)
-	{
-		case 0: return "angle";
-		case 1: return "width";
-		case 2: return "precision";
-		case 3: return "zero_pad";
-	}
-	return String();
+	return
+		type==ValueBase::TYPE_STRING;
 }
 
-String
-ValueNode_AngleString::link_local_name(int i)const
+LinkableValueNode::Vocab
+ValueNode_AngleString::get_children_vocab_vfunc()const
 {
-	assert(i>=0 && i<link_count());
+	LinkableValueNode::Vocab ret;
 
-	switch(i)
-	{
-		case 0: return _("Angle");
-		case 1: return _("Width");
-		case 2: return _("Precision");
-		case 3: return _("Zero Padded");
-	}
-	return String();
-}
+	ret.push_back(ParamDesc(ValueBase(),"angle")
+		.set_local_name(_("Angle"))
+		.set_description(_("Value to convert to string"))
+	);
 
-int
-ValueNode_AngleString::get_link_index_from_name(const String &name)const
-{
-	if (name=="angle") return 0;
-	if (name=="width") return 1;
-	if (name=="precision") return 2;
-	if (name=="zero_pad") return 3;
+	ret.push_back(ParamDesc(ValueBase(),"width")
+		.set_local_name(_("Width"))
+		.set_description(_("Width of the string"))
+	);
 
-	throw Exception::BadLinkName(name);
-}
+	ret.push_back(ParamDesc(ValueBase(),"precision")
+		.set_local_name(_("Precision"))
+		.set_description(_("Number of decimal places"))
+	);
 
-bool
-ValueNode_AngleString::check_type(ValueBase::Type type)
-{
-	return
-		type==ValueBase::TYPE_STRING;
+	ret.push_back(ParamDesc(ValueBase(),"zero_pad")
+		.set_local_name(_("Zero Padded"))
+		.set_description(_("When checked, the string is left filled with zeros to match the width"))
+	);
+
+	return ret;
 }