X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_timeslider.cpp;h=26f40cc6ec64f8bd1406db9d86c8fce0a788761d;hb=37600b4b217caa5e316984ec0b035c5e8f9698af;hp=8e7e860d959f94860f04ad33e970c15c56860bc2;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp index 8e7e860..26f40cc 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp @@ -1,20 +1,22 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file widget_timeslider.cpp ** \brief Time Slider Widget Implementation File ** -** $Id: widget_timeslider.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $ +** $Id$ ** ** \legal ** Copyright (c) 2004 Adrian Bentley +** Copyright (c) 2007 Chris Moore ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. ** \endlegal */ /* ========================================================================= */ @@ -40,7 +42,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using studio::Widget_Timeslider; @@ -52,7 +54,7 @@ const double zoomoutfactor = 1/zoominfactor; /* === P R O C E D U R E S ================================================= */ -Gdk::Color get_interp_color(sinfg::Interpolation x) +Gdk::Color get_interp_color(synfig::Interpolation x) { switch(x) { @@ -86,11 +88,14 @@ Gdk::Color get_interp_color(sinfg::Interpolation x) static Gdk::Color color_darken(Gdk::Color x, float amount) { - x.set_rgb_p( - x.get_red_p()*amount, - x.get_green_p()*amount, - x.get_blue_p()*amount - ); + double red = x.get_red_p() * amount; + double green = x.get_green_p() * amount; + double blue = x.get_blue_p() * amount; + + x.set_rgb_p( red > 1 ? 1 : red, + green > 1 ? 1 : green, + blue > 1 ? 1 : blue); + return x; } @@ -98,13 +103,13 @@ void studio::render_time_point_to_window( const Glib::RefPtr& window, const Gdk::Rectangle& area, - const sinfg::TimePoint &tp, + const synfig::TimePoint &tp, bool selected ) { Glib::RefPtr gc(Gdk::GC::create(window)); const Gdk::Color black("#000000"); - + if(selected) gc->set_line_attributes(2,Gdk::LINE_SOLID,Gdk::CAP_BUTT,Gdk::JOIN_MITER); else @@ -112,7 +117,7 @@ studio::render_time_point_to_window( Gdk::Color color; std::vector points; - + /*- BEFORE ------------------------------------- */ color=get_interp_color(tp.get_before()); @@ -177,7 +182,7 @@ studio::render_time_point_to_window( points.push_back(Gdk::Point(area.get_x()+area.get_width()/2,area.get_y()+area.get_height())); window->draw_polygon(gc,true,points); gc->set_rgb_fg_color(black); - window->draw_lines(gc,points); + window->draw_lines(gc,points); break; case INTERPOLATION_CONSTANT: @@ -190,7 +195,7 @@ studio::render_time_point_to_window( points.push_back(Gdk::Point(area.get_x()+area.get_width()/2,area.get_y()+area.get_height())); window->draw_polygon(gc,true,points); gc->set_rgb_fg_color(black); - window->draw_lines(gc,points); + window->draw_lines(gc,points); break; case INTERPOLATION_UNDEFINED: default: @@ -203,10 +208,10 @@ studio::render_time_point_to_window( points.push_back(Gdk::Point(area.get_x()+area.get_width()/2,area.get_y()+area.get_height())); window->draw_polygon(gc,true,points); gc->set_rgb_fg_color(black); - window->draw_lines(gc,points); + window->draw_lines(gc,points); break; } - + /*- AFTER -------------------------------------- */ color=get_interp_color(tp.get_after()); @@ -272,7 +277,7 @@ studio::render_time_point_to_window( points.push_back(Gdk::Point(area.get_x()+area.get_width()/2,area.get_y()+area.get_height())); window->draw_polygon(gc,true,points); gc->set_rgb_fg_color(black); - window->draw_lines(gc,points); + window->draw_lines(gc,points); break; case INTERPOLATION_CONSTANT: @@ -285,7 +290,7 @@ studio::render_time_point_to_window( points.push_back(Gdk::Point(area.get_x()+area.get_width()/2,area.get_y()+area.get_height())); window->draw_polygon(gc,true,points); gc->set_rgb_fg_color(black); - window->draw_lines(gc,points); + window->draw_lines(gc,points); break; case INTERPOLATION_UNDEFINED: default: @@ -298,7 +303,7 @@ studio::render_time_point_to_window( points.push_back(Gdk::Point(area.get_x()+area.get_width()/2,area.get_y()+area.get_height())); window->draw_polygon(gc,true,points); gc->set_rgb_fg_color(black); - window->draw_lines(gc,points); + window->draw_lines(gc,points); break; } @@ -307,7 +312,7 @@ studio::render_time_point_to_window( /* === M E T H O D S ======================================================= */ /* === E N T R Y P O I N T ================================================= */ -double defaultfps = 0; +double defaultfps = 24; const int fullheight = 20; Widget_Timeslider::Widget_Timeslider() @@ -315,15 +320,16 @@ Widget_Timeslider::Widget_Timeslider() adj_default(0,0,2,1/defaultfps,10/defaultfps), adj_timescale(0), //invalidated(false), +last_event_time(0), fps(defaultfps), dragscroll(false) { set_size_request(-1,fullheight); - + // click scroll zoom - add_events( Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK + add_events( Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::BUTTON_MOTION_MASK | Gdk::SCROLL_MASK ); - + set_time_adjustment(&adj_default); //update_times(); } @@ -337,14 +343,14 @@ void Widget_Timeslider::set_time_adjustment(Gtk::Adjustment *x) //disconnect old connections time_value_change.disconnect(); time_other_change.disconnect(); - + //connect update function to new adjustment adj_timescale = x; - + if(x) { time_value_change = x->signal_value_changed().connect(sigc::mem_fun(*this,&Widget_Timeslider::queue_draw)); - time_other_change = x->signal_changed().connect(sigc::mem_fun(*this,&Widget_Timeslider::queue_draw)); + time_other_change = x->signal_changed().connect(sigc::mem_fun(*this,&Widget_Timeslider::queue_draw)); //invalidated = true; //refresh(); } @@ -355,7 +361,7 @@ void Widget_Timeslider::set_global_fps(float d) if(fps != d) { fps = d; - + //update everything since we need to redraw already //invalidated = true; //refresh(); @@ -373,10 +379,10 @@ void Widget_Timeslider::set_global_fps(float d) } }*/ -void Widget_Timeslider::refresh() +void Widget_Timeslider::refresh() { } -/* +/* { if(invalidated) { @@ -386,41 +392,41 @@ void Widget_Timeslider::refresh() double l = adj_timescale->get_lower(), u = adj_timescale->get_upper(), v = adj_timescale->get_value(); - + bool invalid = (l != start) || (u != end) || (v != current); - + start = l; end = u; current = v; - + if(invalid) queue_draw(); } }*/ -bool Widget_Timeslider::redraw(bool doublebuffer) +bool Widget_Timeslider::redraw(bool /*doublebuffer*/) { Glib::RefPtr window = get_window(); - + if(!window) return false; - - Glib::RefPtr gc = Gdk::GC::create(window); + + Glib::RefPtr gc = Gdk::GC::create(window); if(!gc) return false; - - //sinfg::info("Drawing Timeslider"); + + //synfig::info("Drawing Timeslider"); //clear and update to current values //invalidated = false; - //update_times(); - + //update_times(); + //draw grey rectangle Gdk::Color c("#7f7f7f"); gc->set_rgb_fg_color(c); gc->set_background(c); - + //Get the data for the window and the params to draw it... int w = get_width(), h = get_height(); - - window->draw_rectangle(gc,true,0,0,w,h); - + + window->draw_rectangle(gc,true,0,0,w,h); + const double EPSILON = 1e-6; if(!adj_timescale || w == 0) return true; @@ -428,24 +434,24 @@ bool Widget_Timeslider::redraw(bool doublebuffer) double start = adj_timescale->get_lower(), end = adj_timescale->get_upper(), current = adj_timescale->get_value(); - + if(end-start < EPSILON) return true; - - //sinfg::info("Drawing Lines"); - + + //synfig::info("Drawing Lines"); + //draw all the time stuff double dtdp = (end - start)/get_width(); double dpdt = 1/dtdp; - + //lines - + //Draw the time line... double tpx = (current-start)*dpdt; gc->set_rgb_fg_color(Gdk::Color("#ffaf00")); window->draw_line(gc,round_to_int(tpx),0,round_to_int(tpx),fullheight); - + //normal line/text color - gc->set_rgb_fg_color(Gdk::Color("#333333")); + gc->set_rgb_fg_color(Gdk::Color("#333333")); //draw these lines... (always 5 between) maybe 6? const int subdiv = 4; @@ -453,77 +459,77 @@ bool Widget_Timeslider::redraw(bool doublebuffer) //1h 45 30 20 10 5 //..., 3m, 2m, 1m30s, 1m, 30s, 20s, 10s, 5s, 3s, 2s, 1s, 0.5s //frames... (how???) - double ranges[] = + 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); - + double lowerrange = dtdp*75, upperrange = dtdp*150; double midrange = (lowerrange + upperrange)/2; - + //find most ideal scale double scale = ranges[0]; { double *val = binary_find(ranges, ranges+ranges_size, midrange); double *after = val+1; - + if(val >= ranges+ranges_size) { val = ranges+ranges_size-1; } - + if(after >= ranges+ranges_size) { after = ranges+ranges_size-1; } - + scale = *val; - + double diff = abs(scale - midrange), diff2 = abs(*after - midrange); if(diff2 < diff) scale = *after; } - - //sinfg::info("Range found: (l %.2lf,u %.2lf - m %.2lf) -> %.2lf",lowerrange,upperrange,midrange,scale); - - //search around this area to get the right one - - - //get first valid line and it's position in pixel space + + //synfig::info("Range found: (l %.2lf,u %.2lf - m %.2lf) -> %.2lf",lowerrange,upperrange,midrange,scale); + + //search around this area to get the right one + + + //get first valid line and its position in pixel space double time = 0; double pixel = 0; - + int sdindex = 0; double subr = scale / subdiv; - - //get it's position inside... + + //get its position inside... time = ceil(start/subr)*subr - start; pixel = time*dpdt; - + //absolute time of the line to be drawn time += start; - + { //inside the big'n double t = (time/scale - floor(time/scale))*subdiv; // the difference from the big mark in 0:1 //sdindex = (int)floor(t + 0.5); //get how far through the range it is... sdindex = round_to_int(t); //get how far through the range it is... - - //sinfg::info("Extracted fr %.2lf -> %d", t, sdindex); + + //synfig::info("Extracted fr %.2lf -> %d", t, sdindex); } - - //sinfg::info("Initial values: %.4lf t, %.1lf pixels, %d i", time,pixel,sdindex); - + + //synfig::info("Initial values: %.4lf t, %.1lf pixels, %d i", time,pixel,sdindex); + //loop to draw const int heightbig = 12; const int heightsmall = 4; - + int width = get_width(); while( pixel < width ) { int xpx = round_to_int(pixel); - - //draw big + + //draw big if(sdindex == 0) { window->draw_line(gc,xpx,0,xpx,heightbig); @@ -531,46 +537,46 @@ bool Widget_Timeslider::redraw(bool doublebuffer) Time tm((double)time); if(get_global_fps()) tm.round(get_global_fps()); Glib::ustring timecode(tm.get_string(get_global_fps(),App::get_time_format())); - + //gc->set_rgb_fg_color(Gdk::Color("#000000")); layout->set_text(timecode); window->draw_layout(gc,xpx+2,heightsmall,layout); }else { - window->draw_line(gc,xpx,0,xpx,heightsmall); + window->draw_line(gc,xpx,0,xpx,heightsmall); } - + //increment time and position pixel += subr / dtdp; time += subr; - + //increment index if(++sdindex >= subdiv) sdindex -= subdiv; } - + return true; } bool Widget_Timeslider::on_motion_notify_event(GdkEventMotion* event) //for dragging -{ +{ if(!adj_timescale) return false; - + Gdk::ModifierType mod = Gdk::ModifierType(event->state); - + //scrolling... - + //NOTE: we might want to address the possibility of dragging with both buttons held down - + if(mod & Gdk::BUTTON2_MASK) { //we need this for scrolling by dragging double curx = event->x; - + double start = adj_timescale->get_lower(), end = adj_timescale->get_upper(); - - + + if(dragscroll) { if(event->time-last_event_time<30) @@ -580,25 +586,25 @@ bool Widget_Timeslider::on_motion_notify_event(GdkEventMotion* event) //for drag if(abs(lastx - curx) < 1 && end != start) return true; //translate the window and correct it - + //update our stuff so we are operating correctly //invalidated = true; //update_times(); - + //Note: Use inverse of mouse movement because of conceptual space relationship double diff = lastx - curx; //curx - lastx; - + //NOTE: This might be incorrect... //fraction to move... double dpx = (end - start)/get_width(); lastx = curx; - + diff *= dpx; - + //Adjust... start += diff; end += diff; - + //But clamp to bounds if they exist... //HACK - bounds should not be required for this slider if(adj_bounds) @@ -609,17 +615,17 @@ bool Widget_Timeslider::on_motion_notify_event(GdkEventMotion* event) //for drag start += diff; end += diff; } - + if(end > adj_bounds->get_upper()) { diff = adj_bounds->get_upper() - end; start += diff; end += diff; } - } - - //sinfg::info("Scrolling timerange to (%.4f,%.4f)",start,end); - + } + + //synfig::info("Scrolling timerange to (%.4f,%.4f)",start,end); + adj_timescale->set_lower(start); adj_timescale->set_upper(end); @@ -630,31 +636,31 @@ bool Widget_Timeslider::on_motion_notify_event(GdkEventMotion* event) //for drag lastx = curx; //lasty = cury; } - - return true; + + return true; } - + if(mod & Gdk::BUTTON1_MASK) { double curx = event->x; - + //get time from drag... double start = adj_timescale->get_lower(), end = adj_timescale->get_upper(), current = adj_timescale->get_value(); double t = start + curx*(end - start)/get_width(); - + //snap it to fps - if they exist... if(fps) { t = floor(t*fps + 0.5)/fps; } - + //set time if needed if(current != t) - { + { adj_timescale->set_value(t); - + //Fixed this to actually do what it's supposed to... if(event->time-last_event_time>50) { @@ -662,20 +668,20 @@ bool Widget_Timeslider::on_motion_notify_event(GdkEventMotion* event) //for drag last_event_time = event->time; } } - + return true; } - + return false; } bool Widget_Timeslider::on_scroll_event(GdkEventScroll* event) //for zooming { if(!adj_timescale) return false; - + //Update so we are calculating based on current values - //update_times(); - + //update_times(); + //figure out if we should center ourselves on the current time bool center = false; @@ -684,23 +690,23 @@ bool Widget_Timeslider::on_scroll_event(GdkEventScroll* event) //for zooming { center = true; } - + switch(event->direction) { case GDK_SCROLL_UP: //zoom in { zoom_in(center); - + return true; } case GDK_SCROLL_DOWN: //zoom out { zoom_out(center); - + return true; } - - default: + + default: { return false; } @@ -710,35 +716,35 @@ bool Widget_Timeslider::on_scroll_event(GdkEventScroll* event) //for zooming void Widget_Timeslider::zoom_in(bool centerontime) { if(!adj_timescale) return; - + double start = adj_timescale->get_lower(), end = adj_timescale->get_upper(), current = adj_timescale->get_value(); - + double focuspoint = centerontime ? current : (start + end)/2; - + //calculate new beginning and end end = focuspoint + (end-focuspoint)*zoominfactor; start = focuspoint + (start-focuspoint)*zoominfactor; - - //sinfg::info("Zooming in timerange to (%.4f,%.4f)",start,end); + + //synfig::info("Zooming in timerange to (%.4f,%.4f)",start,end); if(adj_bounds) { if(start < adj_bounds->get_lower()) { start = adj_bounds->get_lower(); } - + if(end > adj_bounds->get_upper()) { end = adj_bounds->get_upper(); } } - + //reset values adj_timescale->set_lower(start); adj_timescale->set_upper(end); - + //call changed function adj_timescale->changed(); } @@ -746,35 +752,35 @@ void Widget_Timeslider::zoom_in(bool centerontime) void Widget_Timeslider::zoom_out(bool centerontime) { if(!adj_timescale) return; - + double start = adj_timescale->get_lower(), end = adj_timescale->get_upper(), current = adj_timescale->get_value(); - + double focuspoint = centerontime ? current : (start + end)/2; - + //calculate new beginning and end end = focuspoint + (end-focuspoint)*zoomoutfactor; start = focuspoint + (start-focuspoint)*zoomoutfactor; - - //sinfg::info("Zooming out timerange to (%.4f,%.4f)",start,end); + + //synfig::info("Zooming out timerange to (%.4f,%.4f)",start,end); if(adj_bounds) { if(start < adj_bounds->get_lower()) { start = adj_bounds->get_lower(); } - + if(end > adj_bounds->get_upper()) { - end = adj_bounds->get_upper(); + end = adj_bounds->get_upper(); } } - + //reset values adj_timescale->set_lower(start); adj_timescale->set_upper(end); - + //call changed function adj_timescale->changed(); } @@ -789,29 +795,29 @@ bool Widget_Timeslider::on_button_press_event(GdkEventButton *event) //for click double start = adj_timescale->get_lower(), end = adj_timescale->get_upper(), current = adj_timescale->get_value(); - + double w = get_width(); double t = start + (end - start) * event->x / w; - + t = floor(t*fps + 0.5)/fps; - - /*sinfg::info("Clicking time from %.3lf to %.3lf [(%.2lf,%.2lf) %.2lf / %.2lf ... %.2lf", + + /*synfig::info("Clicking time from %.3lf to %.3lf [(%.2lf,%.2lf) %.2lf / %.2lf ... %.2lf", current, vt, start, end, event->x, w, fps);*/ - + if(t != current) - { + { current = t; - + if(adj_timescale) { adj_timescale->set_value(current); adj_timescale->value_changed(); } } - + break; } - + //scroll click case 2: { @@ -819,35 +825,35 @@ bool Widget_Timeslider::on_button_press_event(GdkEventButton *event) //for click dragscroll = true; lastx = event->x; //lasty = event->y; - + return true; } - + default: { break; } } - + return false; } bool Widget_Timeslider::on_button_release_event(GdkEventButton *event) //end drag -{ +{ switch(event->button) - { + { case 2: { //start dragging dragscroll = false; return true; } - + default: { break; } } - + return false; }