X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescset.cpp;h=a5610aa73f8d9413e352e606931772bffce3f47c;hb=ffb41cfab976dd7402a9587d506ac65a26e9565c;hp=85e1fce021401b4f412931c2b05e50370b68623e;hpb=9c016812c5af9aa44cf424c768b8ff604d9c8a24;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp
index 85e1fce..a5610aa 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp
@@ -6,7 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2007, 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
@@ -77,38 +77,10 @@ Action::ValueDescSet::ValueDescSet():
 synfig::String
 Action::ValueDescSet::get_local_name()const
 {
-	String name("ValueDesc");
-
-	if(!value_desc)
-	{
-	}
-	else if(value_desc.parent_is_layer_param())
-	{
-		name = strprintf("'%s' -> %s", // layer -> parameter
-						 value_desc.get_layer()->get_non_empty_description().c_str(),
-						 value_desc.get_param_name().c_str());
-		if (value_desc.is_exported())
-			name += strprintf(" (%s)", value_desc.get_value_node()->get_id().c_str());
-	}
-	else if(value_desc.parent_is_value_node())
-	{
-		synfig::LinkableValueNode::Handle value_node(synfig::LinkableValueNode::Handle::cast_reinterpret(value_desc.get_parent_value_node()));
-		synfig::Node* node;
-		for(node=value_node.get();!node->parent_set.empty() && !dynamic_cast<Layer*>(node);node=*node->parent_set.begin());
-		Layer::Handle parent_layer(dynamic_cast<Layer*>(node));
-		if(parent_layer)
-			name = strprintf("'%s' => %s", // layer -> sub-parameter
-							 parent_layer->get_non_empty_description().c_str(),
-							 value_node->link_local_name(value_desc.get_index()).c_str());
-		else
-			name = value_node->link_local_name(value_desc.get_index()); // sub-parameter
-		if (value_desc.is_exported())
-			name += strprintf(" (%s)", value_desc.get_value_node()->get_id().c_str());
-	}
-	else if (value_desc.is_exported())
-		name = strprintf(_("ValueNode (%s)"), value_desc.get_value_node()->get_id().c_str());
-
-	return strprintf(_("Set %s"), name.c_str());
+	return strprintf(_("Set %s"),
+					 value_desc
+					 ? value_desc.get_description().c_str()
+					 : _("ValueDesc"));
 }
 
 Action::ParamVocab
@@ -187,8 +159,6 @@ Action::ValueDescSet::prepare()
 		(value_desc.get_index()==4 || value_desc.get_index()==5) &&
 		(*value_desc.get_parent_value_node())(time).get(BLinePoint()).get_split_tangent_flag()==false)
 	{
-		printf("a tangent got changed - #%d\n", value_desc.get_index()-3);
-
 		{
 			ValueNode_Composite::Handle parent_value_node;
 			parent_value_node=parent_value_node.cast_dynamic(value_desc.get_parent_value_node());
@@ -196,11 +166,9 @@ Action::ValueDescSet::prepare()
 
 			Vector t1((*parent_value_node->get_link("t1"))(time));
 			Vector t2((*parent_value_node->get_link("t2"))(time));
-			printf("current values are: t1(%.2f, %2.f)  t2(%.2f, %.2f)\n", t1[0], t1[1], t2[0], t2[1]);
 		}
 
 		if (value_desc.get_index()==4) {
-			printf("copying change to tangent 2\n");
 			ValueNode_Composite::Handle parent_value_node;
 			parent_value_node=parent_value_node.cast_dynamic(value_desc.get_parent_value_node());