X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescsmartlink.cpp;h=a531a11f759d5b2034a9cfe03c5fdfacfb4cae28;hb=0d56be650c43312c9466a309f86987bf8fd90fa0;hp=9955984a83c76e95a938daafa6bdc1512150f20c;hpb=a0d50c5a21f848f31af8dbf6c920c2c3fe235d22;p=synfig.git

diff --git a/synfig-studio/src/synfigapp/actions/valuedescsmartlink.cpp b/synfig-studio/src/synfigapp/actions/valuedescsmartlink.cpp
index 9955984..a531a11 100644
--- a/synfig-studio/src/synfigapp/actions/valuedescsmartlink.cpp
+++ b/synfig-studio/src/synfigapp/actions/valuedescsmartlink.cpp
@@ -213,6 +213,24 @@ Action::ValueDescSmartLink::set_param(const synfig::String& name, const Action::
 					status_message = _("There's a tie for most referenced, and both are animated; using the one with the most waypoints.");
 				}
 			}
+			else if(LinkableValueNode::Handle::cast_dynamic(link_value_node) &&
+					LinkableValueNode::Handle::cast_dynamic(value_desc.get_value_node()) &&
+					LinkableValueNode::Handle::cast_dynamic(link_value_node)->get_times().size() !=
+					LinkableValueNode::Handle::cast_dynamic(value_desc.get_value_node())->get_times().size())
+			{
+				if(LinkableValueNode::Handle::cast_dynamic(link_value_node)->get_times().size() <
+				LinkableValueNode::Handle::cast_dynamic(value_desc.get_value_node())->get_times().size())
+				{
+					status_level = 4;
+					status_message = _("There's a tie for most referenced, and both are linkable value node animated; using the one with the most waypoints.");
+					link_value_node=value_desc.get_value_node();
+				}
+				else if (status_level <= 4)
+				{
+					status_level = 4;
+					status_message = _("There's a tie for most referenced, and both are linkable value node animated; using the one with the most waypoints.");
+				}
+			}
 			// Use the one that was least recently changed
 			else if(link_value_node->get_time_last_changed()!=value_desc.get_value_node()->get_time_last_changed())
 			{
@@ -273,7 +291,7 @@ Action::ValueDescSmartLink::prepare()
 		throw Error(Error::TYPE_NOTREADY);
 
 	clear();
-/*
+
 	if(value_desc_list.size()!=2)
 		throw Error(Error::TYPE_BUG);
 
@@ -284,36 +302,64 @@ Action::ValueDescSmartLink::prepare()
 
 	if(!link_value_node)
 	{
+		// we should have a value node selected because is candidate
+		// should have checked it before
 		throw Error(Error::TYPE_BUG);
 	}
 
-	//Study the particular case of two tangents of a bline being linked.
-	ValueDesc& toconvert;
+	//See what is the tangent selected to convert.
+	ValueDesc& toconvert(value_desc_t2);
 		if(t1==link_value_node)
-		{
-			// Convert t2
-			synfig::info("converting t2");
-			toconvert=value_desc_t2;
-		}
+			toconvert=value_desc_t2;	// Convert t2
 		else if(t2==link_value_node)
-		{
-			//Convert t1
-			synfig::info("converting t1");
-			toconvert=value_desc_t1;
-		}
-		else { synfig::info("error"); }
+			toconvert=value_desc_t1;	//Convert t1
+		else throw Error(Error::TYPE_BUG);
+
+		//Let's create a Scale Value Node
+		synfig::ValueNode::Handle scale_value_node=synfig::LinkableValueNode::create("scale",toconvert.get_value(time));
+		scale_value_node->set_parent_canvas(get_canvas());
+		//Let's connect the new Scale Value Node
+		Action::Handle action1(Action::create("ValueDescConnect"));
+		if(!action1)
+			throw Error(Error::TYPE_CRITICAL);
+		action1->set_param("canvas",get_canvas());
+		action1->set_param("canvas_interface",get_canvas_interface());
+		action1->set_param("dest",toconvert);
+		action1->set_param("src",scale_value_node);
+		assert(action1->is_ready());
+		if(!action1->is_ready())
+			throw Error(Error::TYPE_NOTREADY);
+		add_action_front(action1);
+
 
+		//Let's Connect the link value node to the scale value node link subparam
+		Action::Handle action2(Action::create("ValueNodeLinkConnect"));
+		if(!action2)
+			throw Error(Error::TYPE_CRITICAL);
 
-		Action::Handle action(Action::create("ValueDescConvert"));
-		action->set_param("canvas",get_canvas());
-		action->set_param("canvas_interface",get_canvas_interface());
-		action->set_param("time",time);
-		action->set_param("type","scalar");
-		action->set_param("value_desc",toconvert);
-		assert(action->is_ready());
-		if(!action->is_ready())
+		action2->set_param("canvas",get_canvas());
+		action2->set_param("canvas_interface",get_canvas_interface());
+		action2->set_param("parent_value_node",scale_value_node);
+		action2->set_param("index",0);
+		action2->set_param("value_node",link_value_node);
+		assert(action2->is_ready());
+		if(!action2->is_ready())
 			throw Error(Error::TYPE_NOTREADY);
-		add_action_front(action);
-*/
+		add_action_front(action2);
+
+		//Let's Set the scale to -1
+		Action::Handle action3(Action::create("ValueNodeConstSet"));
+		if(!action3)
+			throw Error(Error::TYPE_CRITICAL);
+
+		action3->set_param("canvas",get_canvas());
+		action3->set_param("canvas_interface",get_canvas_interface());
+		action3->set_param("value_node",synfig::LinkableValueNode::Handle::cast_dynamic(scale_value_node)->get_link(1));
+		action3->set_param("new_value",synfig::ValueBase(Real(-1.0)));
+		assert(action3->is_ready());
+		if(!action3->is_ready())
+			throw Error(Error::TYPE_NOTREADY);
+		add_action_front(action3);
+
 	synfig::info("http://synfig.org/Linking#Tier_%d : %s", status_level, status_message.c_str());
 }