X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_segcalcvertex.cpp;h=54a6f31c34b631991ba6d0c80ff92e6c78b50a28;hb=4cd211467061154545ef7b5f5617dce7b177bf16;hp=ac3bd66a87733b6fdfb91a35f30841c83d9f14b1;hpb=37600b4b217caa5e316984ec0b035c5e8f9698af;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp b/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
index ac3bd66..54a6f31 100644
--- a/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
@@ -1,6 +1,6 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_segcalcvertex.cpp
-**	\brief Template File
+**	\brief Implementation of the "Segment Vertex" valuenode conversion.
 **
 **	$Id$
 **
@@ -58,7 +58,7 @@ ValueNode_SegCalcVertex::ValueNode_SegCalcVertex(const ValueBase::Type &x):
 	LinkableValueNode(x)
 {
 	if(x!=ValueBase::TYPE_VECTOR)
-		throw Exception::BadType(ValueBase::type_name(x));
+		throw Exception::BadType(ValueBase::type_local_name(x));
 
 	set_link("segment",ValueNode_Const::create(ValueBase::TYPE_SEGMENT));
 	set_link("amount",ValueNode_Const::create(Real(0.5)));
@@ -105,20 +105,14 @@ ValueNode_SegCalcVertex::check_type(ValueBase::Type type)
 }
 
 bool
-ValueNode_SegCalcVertex::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_SegCalcVertex::set_link_vfunc(int i,ValueNode::Handle value)
 {
-	assert(i==0 || i==1);
-	if(i==0)
-	{
-		segment_=x;
-		signal_child_changed()(i);signal_value_changed()();
-		return true;
-	}
-	if(i==1)
+	assert(i>=0 && i<link_count());
+
+	switch(i)
 	{
-		amount_=x;
-		signal_child_changed()(i);signal_value_changed()();
-		return true;
+	case 0: CHECK_TYPE_AND_SET_VALUE(segment_, ValueBase::TYPE_SEGMENT);
+	case 1: CHECK_TYPE_AND_SET_VALUE(amount_,  ValueBase::TYPE_REAL);
 	}
 	return false;
 }
@@ -126,7 +120,8 @@ ValueNode_SegCalcVertex::set_link_vfunc(int i,ValueNode::Handle x)
 ValueNode::LooseHandle
 ValueNode_SegCalcVertex::get_link_vfunc(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return segment_;
 	if(i==1)
@@ -144,7 +139,8 @@ ValueNode_SegCalcVertex::link_count()const
 String
 ValueNode_SegCalcVertex::link_name(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return "segment";
 	if(i==1)
@@ -155,7 +151,8 @@ ValueNode_SegCalcVertex::link_name(int i)const
 String
 ValueNode_SegCalcVertex::link_local_name(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return _("Segment");
 	if(i==1)