Use LinkableValueNode members functions when possible in the derived valuenodes.

[synfig.git] / synfig-core / src / synfig / valuenode_anglestring.cpp

diff --git a/synfig-core/src/synfig/valuenode_anglestring.cpp b/synfig-core/src/synfig/valuenode_anglestring.cpp
index 99b51ef..8440dea 100644 (file)
--- 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:
@@ -95,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;
        }
@@ -153,56 +156,37 @@ ValueNode_AngleString::get_link_vfunc(int i)const
        return 0;
 }
 
-int
-ValueNode_AngleString::link_count()const
+bool
+ValueNode_AngleString::check_type(ValueBase::Type type)
 {
-       return 4;
+       return
+               type==ValueBase::TYPE_STRING;
 }
 
-String
-ValueNode_AngleString::link_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_pad";
-       }
-       return String();
-}
+       ret.push_back(ParamDesc(ValueBase(),"angle")
+               .set_local_name(_("Angle"))
+               .set_description(_("Value to convert to string"))
+       );
 
-String
-ValueNode_AngleString::link_local_name(int i)const
-{
-       assert(i>=0 && i<link_count());
+       ret.push_back(ParamDesc(ValueBase(),"width")
+               .set_local_name(_("Width"))
+               .set_description(_("Width of the string"))
+       );
 
-       switch(i)
-       {
-               case 0: return _("Angle");
-               case 1: return _("Width");
-               case 2: return _("Precision");
-               case 3: return _("Zero Padded");
-       }
-       return 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(),"precision")
+               .set_local_name(_("Precision"))
+               .set_description(_("Number of decimal places"))
+       );
 
-       throw Exception::BadLinkName(name);
-}
+       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"))
+       );
 
-bool
-ValueNode_AngleString::check_type(ValueBase::Type type)
-{
-       return
-               type==ValueBase::TYPE_STRING;
+       return ret;
 }