X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_curves.cpp;h=2260dad0bf4e8426fad1223ed574191946325f87;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=3ff8b649c8dd60c8fee10df745b8e5c6229d8185;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
index 3ff8b64..2260dad 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**  Copyright (c) 2008 Gerco Ballintijn
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -38,6 +39,8 @@
 #include <ETL/misc>
 #include <sigc++/object.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -223,7 +226,6 @@ struct studio::Widget_Curves::CurveStruct : sigc::trackable
 
 	void clear_all_values()
 	{
-		DEBUGPOINT();
 		std::vector<Channel>::iterator iter;
 		for(iter=channels.begin();iter!=channels.end();++iter)
 			iter->values.clear();
@@ -288,6 +290,15 @@ struct studio::Widget_Curves::CurveStruct : sigc::trackable
 
 		return -channels[chan].values[time];
 	}
+
+	static bool is_not_supported(const synfigapp::ValueDesc& x)
+	{
+		return x.get_value_type() == ValueBase::TYPE_STRING
+			|| x.get_value_type() == ValueBase::TYPE_CANVAS
+			|| x.get_value_type() == ValueBase::TYPE_GRADIENT
+			|| x.get_value_type() == ValueBase::TYPE_LIST
+			|| x.get_value_type() == ValueBase::TYPE_SEGMENT;
+	}
 };
 
 /* === M E T H O D S ======================================================= */
@@ -364,11 +375,13 @@ Widget_Curves::set_value_descs(std::list<synfigapp::ValueDesc> value_descs)
 	std::list<synfigapp::ValueDesc>::iterator iter;
 	for(iter=value_descs.begin();iter!=value_descs.end();++iter)
 	{
+		if (CurveStruct::is_not_supported(*iter))
+	        	continue;
+
 		try {
 			curve_list_.push_back(*iter);
 			if(iter->is_value_node())
 			{
-				DEBUGPOINT();
 				iter->get_value_node()->signal_changed().connect(
 					sigc::mem_fun(
 						*this,
@@ -378,7 +391,6 @@ Widget_Curves::set_value_descs(std::list<synfigapp::ValueDesc> value_descs)
 			}
 			if(iter->parent_is_value_node())
 			{
-				DEBUGPOINT();
 				iter->get_parent_value_node()->signal_changed().connect(
 					sigc::mem_fun(
 						*this,
@@ -388,7 +400,6 @@ Widget_Curves::set_value_descs(std::list<synfigapp::ValueDesc> value_descs)
 			}
 			if(iter->parent_is_layer_param())
 			{
-				DEBUGPOINT();
 				iter->get_layer()->signal_changed().connect(
 					sigc::mem_fun(
 						*this,
@@ -454,7 +465,7 @@ Widget_Curves::on_event(GdkEvent *event)
 }
 
 bool
-Widget_Curves::redraw(GdkEventExpose*bleh)
+Widget_Curves::redraw(GdkEventExpose */*bleh*/)
 {
 	const int h(get_height());
 	const int w(get_width());
@@ -463,6 +474,9 @@ Widget_Curves::redraw(GdkEventExpose*bleh)
 	if(!time_adjustment_ || !range_adjustment_ || !h || !w)
 		return false;
 
+	if(!curve_list_.size())
+		return false;
+
 	Glib::RefPtr<Gdk::GC> gc(Gdk::GC::create(get_window()));
 
 	const Real t_begin(time_adjustment_->get_lower());
@@ -486,10 +500,41 @@ Widget_Curves::redraw(GdkEventExpose*bleh)
 	gc->set_rgb_fg_color(Gdk::Color("#4f4f4f"));
 	get_window()->draw_rectangle(gc, false, 0, round_to_int((0-r_bottom)/dr), w, 0);
 
+	// This try to find a valid vanvas to show the keyframes of those
+	// valuenodes. If not canvas found then no keyframes marks are shown.
+	synfig::Canvas::Handle canvas=0;
+	for(curve_iter=curve_list_.begin();curve_iter!=curve_list_.end();++curve_iter)
+	{
+		canvas=curve_iter->value_desc.get_canvas();
+		if(canvas)
+			break;
+	}
+
+	if(canvas)
+	{
+	// Draw vertical lines for the keyframes marks.
+		const synfig::KeyframeList& keyframe_list(canvas->keyframe_list());
+		synfig::KeyframeList::const_iterator iter;
+
+		for(iter=keyframe_list.begin();iter!=keyframe_list.end();++iter)
+		{
+			if(!iter->get_time().is_valid())
+				continue;
+
+			const int x((int)((float)w/(t_end-t_begin)*(iter->get_time()-t_begin)));
+			if(iter->get_time()>=t_begin && iter->get_time()<t_end)
+			{
+				gc->set_rgb_fg_color(Gdk::Color("#a07f7f")); // It should be user selectable
+				get_window()->draw_rectangle(gc, true, x, 0, 1, h);
+			}
+		}
+	}
+
 	// Draw current time
-	gc->set_rgb_fg_color(Gdk::Color("#00007f"));
+	gc->set_rgb_fg_color(Gdk::Color("#0000ff")); // It should be user selectable
 	get_window()->draw_rectangle(gc, false, round_to_int((time_adjustment_->get_value()-t_begin)/dt), 0, 0, h);
 
+	// Draw curves for the valuenodes stored in the curve list
 	for(curve_iter=curve_list_.begin();curve_iter!=curve_list_.end();++curve_iter)
 	{
 		Real t;