src/synfig/valuenode_gradientrotate.h
src/synfig/valuenode_integer.cpp
src/synfig/valuenode_integer.h
+src/synfig/valuenode_join.cpp
+src/synfig/valuenode_join.h
src/synfig/valuenode_linear.cpp
src/synfig/valuenode_linear.h
src/synfig/valuenode_radialcomposite.cpp
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_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_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
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_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_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
VALUEHEADERS = \
blinepoint.h gradient.h value.h
#include "valuenode_dotproduct.h"
#include "valuenode_timestring.h"
#include "valuenode_realstring.h"
+#include "valuenode_join.h"
#include "layer.h"
ADD_VALUENODE(ValueNode_GradientColor, "gradientcolor", _("Gradient Color"), RELEASE_VERSION_0_61_09); // SVN r1885
ADD_VALUENODE(ValueNode_DotProduct, "dotproduct", _("Dot Product"), RELEASE_VERSION_0_61_09); // SVN r1891
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 r????
+ 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 r2006
#undef ADD_VALUENODE
#undef ADD_VALUENODE2
--- /dev/null
+/* === S Y N F I G ========================================================= */
+/*! \file valuenode_join.cpp
+** \brief Implementation of the "Join" 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 <config.h>
+#endif
+
+#include "valuenode_join.h"
+#include "valuenode_const.h"
+#include "valuenode_dynamiclist.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_Join::ValueNode_Join(const ValueBase &value):
+ LinkableValueNode(value.get_type())
+{
+ switch(value.get_type())
+ {
+ case ValueBase::TYPE_STRING:
+ {
+ vector<ValueBase> v(1, value.get(String()));
+
+ // "insert item (smart)" inserts before the selected entry, making it hard to append to the end
+ // add an extra element at the end to allow the easy insertion of text after the given value's string
+ v.push_back("...");
+
+ set_link("strings",ValueNode_DynamicList::create_from(v));
+ set_link("before",ValueNode_Const::create(String("")));
+ set_link("separator",ValueNode_Const::create(String(" ")));
+ set_link("after",ValueNode_Const::create(String("")));
+ break;
+ }
+ default:
+ throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
+ }
+
+ DCAST_HACK_ENABLE();
+}
+
+LinkableValueNode*
+ValueNode_Join::create_new()const
+{
+ return new ValueNode_Join(get_type());
+}
+
+ValueNode_Join*
+ValueNode_Join::create(const ValueBase &x)
+{
+ return new ValueNode_Join(x);
+}
+
+ValueNode_Join::~ValueNode_Join()
+{
+ unlink_all();
+}
+
+ValueBase
+ValueNode_Join::operator()(Time t)const
+{
+ const std::vector<ValueBase> strings((*strings_)(t).get_list());
+ const String before((*before_)(t).get(String()));
+ const String separator((*separator_)(t).get(String()));
+ const String after((*after_)(t).get(String()));
+
+ switch (get_type())
+ {
+ case ValueBase::TYPE_STRING:
+ {
+ bool first = true;
+ String ret(before);
+ for (std::vector<ValueBase>::const_iterator iter = strings.begin(); iter != strings.end(); iter++)
+ {
+ if (first)
+ first = false;
+ else
+ ret += separator;
+ ret += iter->get(String());
+ }
+ ret += after;
+ return ret;
+ }
+ default:
+ break;
+ }
+
+ assert(0);
+ return ValueBase();
+}
+
+String
+ValueNode_Join::get_name()const
+{
+ return "join";
+}
+
+String
+ValueNode_Join::get_local_name()const
+{
+ return _("Joined List");
+}
+
+bool
+ValueNode_Join::set_link_vfunc(int i,ValueNode::Handle value)
+{
+ assert(i>=0 && i<link_count());
+
+ switch(i)
+ {
+ case 0: CHECK_TYPE_AND_SET_VALUE(strings_, ValueBase::TYPE_LIST);
+ case 1: CHECK_TYPE_AND_SET_VALUE(before_, ValueBase::TYPE_STRING);
+ case 2: CHECK_TYPE_AND_SET_VALUE(separator_, ValueBase::TYPE_STRING);
+ case 3: CHECK_TYPE_AND_SET_VALUE(after_, ValueBase::TYPE_STRING);
+ }
+ return false;
+}
+
+ValueNode::LooseHandle
+ValueNode_Join::get_link_vfunc(int i)const
+{
+ assert(i>=0 && i<link_count());
+
+ switch(i)
+ {
+ case 0: return strings_;
+ case 1: return before_;
+ case 2: return separator_;
+ case 3: return after_;
+ }
+
+ return 0;
+}
+
+int
+ValueNode_Join::link_count()const
+{
+ return 4;
+}
+
+String
+ValueNode_Join::link_name(int i)const
+{
+ assert(i>=0 && i<link_count());
+
+ switch(i)
+ {
+ case 0: return "strings";
+ case 1: return "before";
+ case 2: return "separator";
+ case 3: return "after";
+ }
+ return String();
+}
+
+String
+ValueNode_Join::link_local_name(int i)const
+{
+ assert(i>=0 && i<link_count());
+
+ switch(i)
+ {
+ case 0: return _("Strings");
+ case 1: return _("Before");
+ case 2: return _("Separator");
+ case 3: return _("After");
+ }
+ return String();
+}
+
+int
+ValueNode_Join::get_link_index_from_name(const String &name)const
+{
+ if (name=="strings") return 0;
+ if (name=="before") return 1;
+ if (name=="separator") return 2;
+ if (name=="after") return 3;
+
+ throw Exception::BadLinkName(name);
+}
+
+bool
+ValueNode_Join::check_type(ValueBase::Type type)
+{
+ return
+ type==ValueBase::TYPE_STRING;
+}
--- /dev/null
+/* === S Y N F I G ========================================================= */
+/*! \file valuenode_join.h
+** \brief Header file for implementation of the "Join" 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
+*/
+/* ========================================================================= */
+
+/* === S T A R T =========================================================== */
+
+#ifndef __SYNFIG_VALUENODE_JOIN_H
+#define __SYNFIG_VALUENODE_JOIN_H
+
+/* === H E A D E R S ======================================================= */
+
+#include "valuenode.h"
+
+/* === M A C R O S ========================================================= */
+
+/* === C L A S S E S & S T R U C T S ======================================= */
+
+namespace synfig {
+
+class ValueNode_Join : public LinkableValueNode
+{
+ ValueNode::RHandle strings_;
+ ValueNode::RHandle before_;
+ ValueNode::RHandle separator_;
+ ValueNode::RHandle after_;
+
+ ValueNode_Join(const ValueBase &value);
+
+public:
+
+ typedef etl::handle<ValueNode_Join> Handle;
+ typedef etl::handle<const ValueNode_Join> ConstHandle;
+
+
+ virtual ValueBase operator()(Time t)const;
+
+ virtual ~ValueNode_Join();
+
+ 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_Join* create(const ValueBase &x);
+}; // END of class ValueNode_Join
+
+}; // END of namespace synfig
+
+/* === E N D =============================================================== */
+
+#endif
projects / synfig.git / commitdiff