From bc5484c7896e8314428b22f6deb47b804d7e4aca Mon Sep 17 00:00:00 2001 From: dooglus Date: Thu, 10 Apr 2008 14:47:08 +0000 Subject: [PATCH] Add 2 new valuenode types: "Angle String" and "Int String". git-svn-id: http://svn.voria.com/code@2010 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/synfig/Makefile.am | 42 +++-- synfig-core/trunk/src/synfig/valuenode.cpp | 4 + .../trunk/src/synfig/valuenode_anglestring.cpp | 207 +++++++++++++++++++++ .../trunk/src/synfig/valuenode_anglestring.h | 85 +++++++++ .../trunk/src/synfig/valuenode_intstring.cpp | 199 ++++++++++++++++++++ synfig-core/trunk/src/synfig/valuenode_intstring.h | 84 +++++++++ 6 files changed, 601 insertions(+), 20 deletions(-) create mode 100644 synfig-core/trunk/src/synfig/valuenode_anglestring.cpp create mode 100644 synfig-core/trunk/src/synfig/valuenode_anglestring.h create mode 100644 synfig-core/trunk/src/synfig/valuenode_intstring.cpp create mode 100644 synfig-core/trunk/src/synfig/valuenode_intstring.h diff --git a/synfig-core/trunk/src/synfig/Makefile.am b/synfig-core/trunk/src/synfig/Makefile.am index f313a46..080b1e0 100644 --- a/synfig-core/trunk/src/synfig/Makefile.am +++ b/synfig-core/trunk/src/synfig/Makefile.am @@ -27,27 +27,29 @@ IMPORTERSOURCES = \ listimporter.cpp VALUENODEHEADERS = \ - valuenode_add.h valuenode_animated.h valuenode_atan2.h valuenode_bline.h valuenode_blinecalctangent.h \ - valuenode_blinecalcvertex.h valuenode_blinecalcwidth.h valuenode_blinereversetangent.h \ - valuenode_composite.h valuenode_const.h valuenode_cos.h valuenode_dotproduct.h valuenode_duplicate.h \ - valuenode_dynamiclist.h valuenode_exp.h valuenode_gradientcolor.h valuenode_gradientrotate.h \ - valuenode_integer.h valuenode_join.h valuenode_linear.h valuenode_radialcomposite.h \ - valuenode_range.h valuenode_realstring.h valuenode_reciprocal.h valuenode_reference.h \ - valuenode_repeat_gradient.h valuenode_scale.h valuenode_segcalctangent.h valuenode_segcalcvertex.h \ - valuenode_sine.h valuenode_step.h valuenode_stripes.h valuenode_subtract.h valuenode_switch.h \ - valuenode_timedswap.h valuenode_timeloop.h valuenode_timestring.h valuenode_twotone.h \ - valuenode_vectorangle.h valuenode_vectorlength.h valuenode_vectorx.h valuenode_vectory.h + valuenode_add.h valuenode_anglestring.h valuenode_animated.h valuenode_atan2.h valuenode_bline.h \ + valuenode_blinecalctangent.h valuenode_blinecalcvertex.h valuenode_blinecalcwidth.h \ + valuenode_blinereversetangent.h valuenode_composite.h valuenode_const.h valuenode_cos.h \ + valuenode_dotproduct.h valuenode_duplicate.h valuenode_dynamiclist.h valuenode_exp.h \ + valuenode_gradientcolor.h valuenode_gradientrotate.h valuenode_integer.h valuenode_intstring.h \ + valuenode_join.h valuenode_linear.h valuenode_radialcomposite.h valuenode_range.h \ + valuenode_realstring.h valuenode_reciprocal.h valuenode_reference.h valuenode_repeat_gradient.h \ + valuenode_scale.h valuenode_segcalctangent.h valuenode_segcalcvertex.h valuenode_sine.h \ + valuenode_step.h valuenode_stripes.h valuenode_subtract.h valuenode_switch.h valuenode_timedswap.h \ + valuenode_timeloop.h valuenode_timestring.h valuenode_twotone.h valuenode_vectorangle.h \ + valuenode_vectorlength.h valuenode_vectorx.h valuenode_vectory.h VALUENODESOURCES = \ - valuenode_add.cpp valuenode_animated.cpp valuenode_atan2.cpp valuenode_bline.cpp valuenode_blinecalctangent.cpp \ - valuenode_blinecalcvertex.cpp valuenode_blinecalcwidth.cpp valuenode_blinereversetangent.cpp \ - valuenode_composite.cpp valuenode_const.cpp valuenode_cos.cpp valuenode_dotproduct.cpp valuenode_duplicate.cpp \ - valuenode_dynamiclist.cpp valuenode_exp.cpp valuenode_gradientcolor.cpp valuenode_gradientrotate.cpp \ - valuenode_integer.cpp valuenode_join.cpp valuenode_linear.cpp valuenode_radialcomposite.cpp \ - valuenode_range.cpp valuenode_realstring.cpp valuenode_reciprocal.cpp valuenode_reference.cpp \ - valuenode_repeat_gradient.cpp valuenode_scale.cpp valuenode_segcalctangent.cpp valuenode_segcalcvertex.cpp \ - valuenode_sine.cpp valuenode_step.cpp valuenode_stripes.cpp valuenode_subtract.cpp valuenode_switch.cpp \ - valuenode_timedswap.cpp valuenode_timeloop.cpp valuenode_timestring.cpp valuenode_twotone.cpp \ - valuenode_vectorangle.cpp valuenode_vectorlength.cpp valuenode_vectorx.cpp valuenode_vectory.cpp + valuenode_add.cpp valuenode_anglestring.cpp valuenode_animated.cpp valuenode_atan2.cpp valuenode_bline.cpp \ + valuenode_blinecalctangent.cpp valuenode_blinecalcvertex.cpp valuenode_blinecalcwidth.cpp \ + valuenode_blinereversetangent.cpp valuenode_composite.cpp valuenode_const.cpp valuenode_cos.cpp \ + valuenode_dotproduct.cpp valuenode_duplicate.cpp valuenode_dynamiclist.cpp valuenode_exp.cpp \ + valuenode_gradientcolor.cpp valuenode_gradientrotate.cpp valuenode_integer.cpp valuenode_intstring.cpp \ + valuenode_join.cpp valuenode_linear.cpp valuenode_radialcomposite.cpp valuenode_range.cpp \ + valuenode_realstring.cpp valuenode_reciprocal.cpp valuenode_reference.cpp valuenode_repeat_gradient.cpp \ + valuenode_scale.cpp valuenode_segcalctangent.cpp valuenode_segcalcvertex.cpp valuenode_sine.cpp \ + valuenode_step.cpp valuenode_stripes.cpp valuenode_subtract.cpp valuenode_switch.cpp valuenode_timedswap.cpp \ + valuenode_timeloop.cpp valuenode_timestring.cpp valuenode_twotone.cpp valuenode_vectorangle.cpp \ + valuenode_vectorlength.cpp valuenode_vectorx.cpp valuenode_vectory.cpp VALUEHEADERS = \ blinepoint.h gradient.h value.h diff --git a/synfig-core/trunk/src/synfig/valuenode.cpp b/synfig-core/trunk/src/synfig/valuenode.cpp index 0bf4017..e10da1f 100644 --- a/synfig-core/trunk/src/synfig/valuenode.cpp +++ b/synfig-core/trunk/src/synfig/valuenode.cpp @@ -81,6 +81,8 @@ #include "valuenode_timestring.h" #include "valuenode_realstring.h" #include "valuenode_join.h" +#include "valuenode_anglestring.h" +#include "valuenode_intstring.h" #include "layer.h" @@ -171,6 +173,8 @@ ValueNode::subsys_init() ADD_VALUENODE(ValueNode_TimeString, "timestring", _("Time String"), RELEASE_VERSION_0_61_09); // SVN r2000 ADD_VALUENODE(ValueNode_RealString, "realstring", _("Real String"), RELEASE_VERSION_0_61_09); // SVN r2003 ADD_VALUENODE(ValueNode_Join, "join", _("Joined List"), RELEASE_VERSION_0_61_09); // SVN r2007 + ADD_VALUENODE(ValueNode_AngleString, "anglestring", _("Angle String"), RELEASE_VERSION_0_61_09); // SVN r2010 + ADD_VALUENODE(ValueNode_IntString, "intstring", _("Int String"), RELEASE_VERSION_0_61_09); // SVN r2010 #undef ADD_VALUENODE #undef ADD_VALUENODE2 diff --git a/synfig-core/trunk/src/synfig/valuenode_anglestring.cpp b/synfig-core/trunk/src/synfig/valuenode_anglestring.cpp new file mode 100644 index 0000000..d0da88a --- /dev/null +++ b/synfig-core/trunk/src/synfig/valuenode_anglestring.cpp @@ -0,0 +1,207 @@ +/* === S Y N F I G ========================================================= */ +/*! \file valuenode_anglestring.cpp +** \brief Implementation of the "AngleString" valuenode conversion. +** +** $Id$ +** +** \legal +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2008 Chris Moore +** +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. +** +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** \endlegal +*/ +/* ========================================================================= */ + +/* === H E A D E R S ======================================================= */ + +#ifdef USING_PCH +# include "pch.h" +#else +#ifdef HAVE_CONFIG_H +# include +#endif + +#include "valuenode_anglestring.h" +#include "valuenode_const.h" +#include "canvas.h" +#include "general.h" + +#endif + +/* === U S I N G =========================================================== */ + +using namespace std; +using namespace etl; +using namespace synfig; + +/* === M A C R O S ========================================================= */ + +/* === G L O B A L S ======================================================= */ + +/* === P R O C E D U R E S ================================================= */ + +/* === M E T H O D S ======================================================= */ + +ValueNode_AngleString::ValueNode_AngleString(const ValueBase &value): + LinkableValueNode(value.get_type()) +{ + switch(value.get_type()) + { + case ValueBase::TYPE_STRING: + set_link("angle",ValueNode_Const::create(Angle::deg(0))); + set_link("width",ValueNode_Const::create(int(0))); + set_link("precision",ValueNode_Const::create(int(3))); + set_link("zero_pad",ValueNode_Const::create(bool(false))); + break; + default: + throw Exception::BadType(ValueBase::type_local_name(value.get_type())); + } + + DCAST_HACK_ENABLE(); +} + +LinkableValueNode* +ValueNode_AngleString::create_new()const +{ + return new ValueNode_AngleString(get_type()); +} + +ValueNode_AngleString* +ValueNode_AngleString::create(const ValueBase &x) +{ + return new ValueNode_AngleString(x); +} + +ValueNode_AngleString::~ValueNode_AngleString() +{ + unlink_all(); +} + +ValueBase +ValueNode_AngleString::operator()(Time t)const +{ + Real angle(Angle::deg((*angle_)(t).get(Angle())).get()); + int width((*width_)(t).get(int())); + int precision((*precision_)(t).get(int())); + int zero_pad((*zero_pad_)(t).get(bool())); + + switch (get_type()) + { + case ValueBase::TYPE_STRING: + return strprintf(strprintf("%%%s%d.%df", + zero_pad ? "0" : "", + width, + precision).c_str(), angle); + default: + break; + } + + assert(0); + return ValueBase(); +} + +String +ValueNode_AngleString::get_name()const +{ + return "anglestring"; +} + +String +ValueNode_AngleString::get_local_name()const +{ + return _("Angle String"); +} + +bool +ValueNode_AngleString::set_link_vfunc(int i,ValueNode::Handle value) +{ + assert(i>=0 && i=0 && i=0 && i=0 && i Handle; + typedef etl::handle ConstHandle; + + + virtual ValueBase operator()(Time t)const; + + virtual ~ValueNode_AngleString(); + + virtual String get_name()const; + virtual String get_local_name()const; + + + virtual ValueNode::LooseHandle get_link_vfunc(int i)const; + virtual int link_count()const; + virtual String link_name(int i)const; + + virtual String link_local_name(int i)const; + virtual int get_link_index_from_name(const String &name)const; + +protected: + LinkableValueNode* create_new()const; + virtual bool set_link_vfunc(int i,ValueNode::Handle x); + +public: + using synfig::LinkableValueNode::get_link_vfunc; + + using synfig::LinkableValueNode::set_link_vfunc; + static bool check_type(ValueBase::Type type); + static ValueNode_AngleString* create(const ValueBase &x); +}; // END of class ValueNode_AngleString + +}; // END of namespace synfig + +/* === E N D =============================================================== */ + +#endif diff --git a/synfig-core/trunk/src/synfig/valuenode_intstring.cpp b/synfig-core/trunk/src/synfig/valuenode_intstring.cpp new file mode 100644 index 0000000..c62774f --- /dev/null +++ b/synfig-core/trunk/src/synfig/valuenode_intstring.cpp @@ -0,0 +1,199 @@ +/* === S Y N F I G ========================================================= */ +/*! \file valuenode_intstring.cpp +** \brief Implementation of the "IntString" valuenode conversion. +** +** $Id$ +** +** \legal +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2008 Chris Moore +** +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. +** +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** \endlegal +*/ +/* ========================================================================= */ + +/* === H E A D E R S ======================================================= */ + +#ifdef USING_PCH +# include "pch.h" +#else +#ifdef HAVE_CONFIG_H +# include +#endif + +#include "valuenode_intstring.h" +#include "valuenode_const.h" +#include "canvas.h" +#include "general.h" + +#endif + +/* === U S I N G =========================================================== */ + +using namespace std; +using namespace etl; +using namespace synfig; + +/* === M A C R O S ========================================================= */ + +/* === G L O B A L S ======================================================= */ + +/* === P R O C E D U R E S ================================================= */ + +/* === M E T H O D S ======================================================= */ + +ValueNode_IntString::ValueNode_IntString(const ValueBase &value): + LinkableValueNode(value.get_type()) +{ + switch(value.get_type()) + { + case ValueBase::TYPE_STRING: + set_link("int",ValueNode_Const::create(int(0))); + set_link("width",ValueNode_Const::create(int(0))); + set_link("zero_pad",ValueNode_Const::create(bool(false))); + break; + default: + throw Exception::BadType(ValueBase::type_local_name(value.get_type())); + } + + DCAST_HACK_ENABLE(); +} + +LinkableValueNode* +ValueNode_IntString::create_new()const +{ + return new ValueNode_IntString(get_type()); +} + +ValueNode_IntString* +ValueNode_IntString::create(const ValueBase &x) +{ + return new ValueNode_IntString(x); +} + +ValueNode_IntString::~ValueNode_IntString() +{ + unlink_all(); +} + +ValueBase +ValueNode_IntString::operator()(Time t)const +{ + int integer((*int_)(t).get(int())); + int width((*width_)(t).get(int())); + int zero_pad((*zero_pad_)(t).get(bool())); + + switch (get_type()) + { + case ValueBase::TYPE_STRING: + return strprintf(strprintf("%%%s%dd", + zero_pad ? "0" : "", + width).c_str(), integer); + default: + break; + } + + assert(0); + return ValueBase(); +} + +String +ValueNode_IntString::get_name()const +{ + return "intstring"; +} + +String +ValueNode_IntString::get_local_name()const +{ + return _("Int String"); +} + +bool +ValueNode_IntString::set_link_vfunc(int i,ValueNode::Handle value) +{ + assert(i>=0 && i=0 && i=0 && i=0 && i Handle; + typedef etl::handle ConstHandle; + + + virtual ValueBase operator()(Time t)const; + + virtual ~ValueNode_IntString(); + + virtual String get_name()const; + virtual String get_local_name()const; + + + virtual ValueNode::LooseHandle get_link_vfunc(int i)const; + virtual int link_count()const; + virtual String link_name(int i)const; + + virtual String link_local_name(int i)const; + virtual int get_link_index_from_name(const String &name)const; + +protected: + LinkableValueNode* create_new()const; + virtual bool set_link_vfunc(int i,ValueNode::Handle x); + +public: + using synfig::LinkableValueNode::get_link_vfunc; + + using synfig::LinkableValueNode::set_link_vfunc; + static bool check_type(ValueBase::Type type); + static ValueNode_IntString* create(const ValueBase &x); +}; // END of class ValueNode_IntString + +}; // END of namespace synfig + +/* === E N D =============================================================== */ + +#endif -- 2.7.4