X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_timeslider.cpp;h=7352bd21691df582f95b433ebaeebbab937426d8;hb=334e15ce6c4d9b1f30a168a55e7ef4d31320d568;hp=4b87f3a7b5f50c95d3903165efd975fb1dcc769e;hpb=46be86a89462801a0392ffa9bcabe09ed96cbaf2;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp
index 4b87f3a..7352bd2 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp
@@ -221,7 +221,6 @@ studio::render_time_point_to_window(
 	if(selected)color=color_darken(color,1.3f);
 	gc->set_rgb_fg_color(color);
 
-
 	switch(tp.get_after())
 	{
 	case INTERPOLATION_TCB:
@@ -455,47 +454,63 @@ bool Widget_Timeslider::redraw(bool /*doublebuffer*/)
 	//normal line/text color
 	gc->set_rgb_fg_color(Gdk::Color("#333333"));
 
-	//draw these lines... (always 5 between) maybe 6?
-	const int subdiv = 4;
-
-	//1h 45 30 20 10 5
-	//..., 3m, 2m, 1m30s, 1m, 30s, 20s, 10s, 5s, 3s, 2s, 1s, 0.5s
-	//frames... (how???)
-	double ranges[] =
-	{ 1.0/fps,subdiv/fps,0.25,0.5, 1, 2, 3, 5, 10, 20, 30, 60, 90, 120, 180, 300, 600, 1200, 1800, 2700, 3600 };
-	//{ 3600, 2700, 1800, 1200, 600, 300, 180, 120, 90, 60, 30, 20, 10, 5, 3, 2, 1, 0.5 };
-	const int ranges_size = sizeof(ranges)/sizeof(double);
+	int ifps = round_to_int(fps);
+	if (ifps < 1) ifps = 1;
 
-	double lowerrange = dtdp*75, upperrange = dtdp*150;
-	double midrange = (lowerrange + upperrange)/2;
+	std::vector<double> ranges;
 
-	//find most ideal scale
-	double scale = ranges[0];
-	{
-		double *val = binary_find(ranges, ranges+ranges_size, midrange);
-		double *after = val+1;
+	unsigned int pos = 0;
 
-		if(val >= ranges+ranges_size)
+	// build a list of all the factors of the frame rate
+	for (int i = 1; i*i <= ifps; i++)
+		if ((ifps%i) == 0)
 		{
-			val = ranges+ranges_size-1;
+			ranges.insert(ranges.begin()+pos, i/fps);
+			if (i*i != ifps)
+				ranges.insert(ranges.begin()+pos+1, ifps/i/fps);
+			pos++;
 		}
 
-		if(after >= ranges+ranges_size)
-		{
-			after = ranges+ranges_size-1;
-		}
+	// fill in any gaps where one factor is more than 2 times the previous
+	std::vector<double>::iterator iter, next;
+	pos = 0;
+	for (pos = 0; pos < ranges.size()-1; pos++)
+	{
+		iter = ranges.begin()+pos;
+		next = iter+1;
+		if (*iter*2 < *next)
+			ranges.insert(next, *iter*2);
+	}
 
-		scale = *val;
+	double more_ranges[] = {
+		2, 3, 5, 10, 20, 30, 60, 90, 120, 180,
+		300, 600, 1200, 1800, 2700, 3600, 3600*2,
+		3600*4, 3600*8, 3600*16, 3600*32, 3600*64,
+		3600*128, 3600*256, 3600*512, 3600*1024 };
 
-		double diff = abs(scale - midrange), diff2 = abs(*after - midrange);
-		if(diff2 < diff)
-			scale = *after;
-	}
+	ranges.insert(ranges.end(), more_ranges, more_ranges + sizeof(more_ranges)/sizeof(double));
 
-	//synfig::info("Range found: (l %.2lf,u %.2lf - m %.2lf) -> %.2lf",lowerrange,upperrange,midrange,scale);
+	double lowerrange = dtdp*140, upperrange = dtdp*280;
+	double midrange = (lowerrange + upperrange)/2;
 
-	//search around this area to get the right one
+	//find most ideal scale
+	double scale;
+	next = binary_find(ranges.begin(), ranges.end(), midrange);
+	iter = next++;
 
+	if (iter == ranges.end()) iter--;
+	if (next == ranges.end()) next--;
+
+	if (abs(*next - midrange) < abs(*iter - midrange))
+		iter = next;
+
+	scale = *iter;
+	if (iter != ranges.begin()) iter--;
+	if (iter != ranges.begin()) iter--;
+	if (iter != ranges.begin()) iter--;
+
+	// subdivide into this many tick marks (8 or less)
+	const int subdiv = round_to_int(scale / *iter);
 
 	//get first valid line and its position in pixel space
 	double time = 0;
@@ -578,7 +593,6 @@ bool Widget_Timeslider::on_motion_notify_event(GdkEventMotion* event) //for drag
 		double 	start = adj_timescale->get_lower(),
 				end = adj_timescale->get_upper();
 
-
 		if(dragscroll)
 		{
 			if(event->time-last_event_time<30)
@@ -707,7 +721,42 @@ bool Widget_Timeslider::on_scroll_event(GdkEventScroll* event) //for zooming
 
 			return true;
 		}
+		
+		case GDK_SCROLL_RIGHT:
+		case GDK_SCROLL_LEFT:
+		{	
+			double t = adj_timescale->get_value();
+			double start = adj_timescale->get_lower();
+			double end = adj_timescale->get_upper();
+			/*
+			FIXME: be more intelligent about how far to scroll
+			Perhaps it should be based on the tickmarks?
+			for e.g. 1/4 of a tick mark per scroll event
+			Obviously this  would need post-rounding to 1/fps
+			*/
+			double adj = 1.0/fps;
+
+			if( event->direction == GDK_SCROLL_RIGHT )
+				t += adj;
+			else
+				t -= adj;
+
+			if( t < start ){
+				adj_timescale->set_lower(t);
+				adj_timescale->set_upper(t+end-start);
+			} else if( t > end ){ 
+				adj_timescale->set_upper(t);
+				adj_timescale->set_lower(t-end+start);
+			}
 
+			if(adj_timescale)
+			{
+				adj_timescale->set_value(t);
+				adj_timescale->value_changed();
+			}
+			return true;
+		}
+		
 		default:
 		{
 			return false;