X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_duplicate.cpp;h=2af20e77e41666140f853c67938e25f37a8aa513;hb=556d3ae558f5072946218fe16c207d24592048c0;hp=4c6ce2a5e6eaf47c0fa1e98dc198af8d673f8527;hpb=c548bdf3c6b899415810f9f9438fcfd6769b78ce;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_duplicate.cpp b/synfig-core/trunk/src/synfig/valuenode_duplicate.cpp
index 4c6ce2a..2af20e7 100644
--- a/synfig-core/trunk/src/synfig/valuenode_duplicate.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_duplicate.cpp
@@ -55,18 +55,19 @@ ValueNode_Duplicate::ValueNode_Duplicate(const ValueBase::Type &x):
 {
 }
 
-ValueNode_Duplicate::ValueNode_Duplicate(const ValueNode::Handle &x):
-	LinkableValueNode(x->get_type())
+ValueNode_Duplicate::ValueNode_Duplicate(const ValueBase &x):
+	LinkableValueNode(x.get_type())
 {
-	set_link("from", ValueNode_Const::create(int(0)));
-	set_link("to",   ValueNode_Const::create(int(3)));
-	set_link("step", ValueNode_Const::create(int(1)));
+	set_link("from", ValueNode_Const::create(Real(1.0)));
+	set_link("to",   ValueNode_Const::create(x.get(Real())));
+	set_link("step", ValueNode_Const::create(Real(1.0)));
+	index = 1.0;
 }
 
 ValueNode_Duplicate*
 ValueNode_Duplicate::create(const ValueBase &x)
 {
-	return new ValueNode_Duplicate(ValueNode_Const::create(x));
+	return new ValueNode_Duplicate(x);
 }
 
 LinkableValueNode*
@@ -81,26 +82,24 @@ ValueNode_Duplicate::~ValueNode_Duplicate()
 }
 
 bool
-ValueNode_Duplicate::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_Duplicate::set_link_vfunc(int i,ValueNode::Handle value)
 {
-	assert(i >= 0 && i < link_count());
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
-	case 0:  from_ = x; break;
-	case 1:  to_   = x; break;
-	case 2:  step_ = x; break;
-	default: return false;
+	case 0: CHECK_TYPE_AND_SET_VALUE(from_, ValueBase::TYPE_REAL);
+	case 1: CHECK_TYPE_AND_SET_VALUE(to_,   ValueBase::TYPE_REAL);
+	case 2: CHECK_TYPE_AND_SET_VALUE(step_, ValueBase::TYPE_REAL);
 	}
-
-	signal_child_changed()(i);
-	signal_value_changed()();
-	return true;
+	return false;
 }
 
 ValueNode::LooseHandle
 ValueNode_Duplicate::get_link_vfunc(int i)const
 {
-	assert(i >= 0 && i < link_count());
+	assert(i>=0 && i<link_count());
+
 	if(i==0) return from_;
 	if(i==1) return to_;
 	if(i==2) return step_;
@@ -117,7 +116,8 @@ ValueNode_Duplicate::link_count()const
 String
 ValueNode_Duplicate::link_local_name(int i)const
 {
-	assert(i >= 0 && i < link_count());
+	assert(i>=0 && i<link_count());
+
 	if(i==0) return _("From");
 	if(i==1) return _("To");
 	if(i==2) return _("Step");
@@ -127,7 +127,8 @@ ValueNode_Duplicate::link_local_name(int i)const
 String
 ValueNode_Duplicate::link_name(int i)const
 {
-	assert(i >= 0 && i < link_count());
+	assert(i>=0 && i<link_count());
+
 	if(i==0) return "from";
 	if(i==1) return "to";
 	if(i==2) return "step";
@@ -147,16 +148,16 @@ ValueNode_Duplicate::get_link_index_from_name(const String &name)const
 void
 ValueNode_Duplicate::reset_index(Time t)const
 {
-	int from = (*from_)(t).get(int());
+	Real from = (*from_)(t).get(Real());
 	index = from;
 }
 
 bool
 ValueNode_Duplicate::step(Time t)const
 {
-	int from = (*from_)(t).get(int());
-	int to   = (*to_  )(t).get(int());
-	int step = (*step_)(t).get(int());
+	Real from = (*from_)(t).get(Real());
+	Real to   = (*to_  )(t).get(Real());
+	Real step = (*step_)(t).get(Real());
 
 	if (step == 0) return false;
 
@@ -177,9 +178,9 @@ ValueNode_Duplicate::step(Time t)const
 int
 ValueNode_Duplicate::count_steps(Time t)const
 {
-	int from = (*from_)(t).get(int());
-	int to   = (*to_  )(t).get(int());
-	int step = (*step_)(t).get(int());
+	Real from = (*from_)(t).get(Real());
+	Real to   = (*to_  )(t).get(Real());
+	Real step = (*step_)(t).get(Real());
 
 	if (step == 0) return 1;
 
@@ -207,5 +208,6 @@ ValueNode_Duplicate::get_local_name()const
 bool
 ValueNode_Duplicate::check_type(ValueBase::Type type)
 {
-	return type==ValueBase::TYPE_INTEGER;
+	// never offer this as a choice.  it's used automatically by the 'Duplicate' layer.
+	return false;
 }