projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove spaces and tabs at end of lines.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
workarea.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/workarea.cpp
b/synfig-studio/trunk/src/gtkmm/workarea.cpp
index
228c087
..
9038bb1
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/workarea.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/workarea.cpp
@@
-6,8
+6,8
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-** Copyright 2006 Yue Shi Lai
-** Copyright (c) 2007 Chris Moore
+** Copyright
(c)
2006 Yue Shi Lai
+** 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
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-171,8
+171,9
@@
public:
set_clipping(true);
if(low_res)
{
set_clipping(true);
if(low_res)
{
- set_tile_w(workarea->tile_w/2);
- set_tile_h(workarea->tile_h/2);
+ int div = workarea->get_low_res_pixel_size();
+ set_tile_w(workarea->tile_w/div);
+ set_tile_h(workarea->tile_h/div);
}
else
{
}
else
{
@@
-192,8
+193,10
@@
public:
{
assert(workarea);
newdesc->set_flags(RendDesc::PX_ASPECT|RendDesc::IM_SPAN);
{
assert(workarea);
newdesc->set_flags(RendDesc::PX_ASPECT|RendDesc::IM_SPAN);
- if(low_res)
- newdesc->set_wh(w/2,h/2);
+ if(low_res) {
+ int div = workarea->get_low_res_pixel_size();
+ newdesc->set_wh(w/div,h/div);
+ }
else
newdesc->set_wh(w,h);
else
newdesc->set_wh(w,h);
@@
-305,7
+308,10
@@
public:
int w(get_tile_w());
int h(get_tile_h());
int x(surface.get_w()*surface.get_h());
int w(get_tile_w());
int h(get_tile_h());
int x(surface.get_w()*surface.get_h());
- //if(low_res) { w/=2,h/=2; }
+ //if(low_res) {
+ // int div = workarea->get_low_res_pixel_size();
+ // w/=div,h/=div;
+ //}
Color dark(0.6,0.6,0.6);
Color lite(0.8,0.8,0.8);
for(int i=0;i<x;i++)
Color dark(0.6,0.6,0.6);
Color lite(0.8,0.8,0.8);
for(int i=0;i<x;i++)
@@
-345,9
+351,10
@@
public:
if(low_res)
{
// We need to scale up
if(low_res)
{
// We need to scale up
+ int div = workarea->get_low_res_pixel_size();
pixbuf=pixbuf->scale_simple(
pixbuf=pixbuf->scale_simple(
- surface.get_w()*
2
,
- surface.get_h()*
2
,
+ surface.get_w()*
div
,
+ surface.get_h()*
div
,
Gdk::INTERP_NEAREST
);
}
Gdk::INTERP_NEAREST
);
}
@@
-468,7
+475,10
@@
public:
assert(workarea);
newdesc->set_flags(RendDesc::PX_ASPECT|RendDesc::IM_SPAN);
if(low_res)
assert(workarea);
newdesc->set_flags(RendDesc::PX_ASPECT|RendDesc::IM_SPAN);
if(low_res)
- newdesc->set_wh(w/2,h/2);
+ {
+ int div = workarea->get_low_res_pixel_size();
+ newdesc->set_wh(w/div,h/div);
+ }
else
newdesc->set_wh(w,h);
else
newdesc->set_wh(w,h);
@@
-544,15
+554,19
@@
public:
int w(surface.get_w());
//int h(surface.get_h());
int x(surface.get_w()*surface.get_h());
int w(surface.get_w());
//int h(surface.get_h());
int x(surface.get_w()*surface.get_h());
- //if(low_res) { w/=2,h/=2; }
+ //if(low_res) {
+ // int div = workarea->get_low_res_pixel_size();
+ // w/=div,h/=div;
+ //}
Color dark(0.6,0.6,0.6);
Color lite(0.8,0.8,0.8);
int tw=workarea->tile_w;
int th=workarea->tile_h;
if(low_res)
{
Color dark(0.6,0.6,0.6);
Color lite(0.8,0.8,0.8);
int tw=workarea->tile_w;
int th=workarea->tile_h;
if(low_res)
{
- tw/=2;
- th/=2;
+ int div = workarea->get_low_res_pixel_size();
+ tw/=div;
+ th/=div;
}
for(int i=0;i<x;i++)
dest=Color2PixelFormat(
}
for(int i=0;i<x;i++)
dest=Color2PixelFormat(
@@
-583,9
+597,10
@@
public:
if(low_res)
{
// We need to scale up
if(low_res)
{
// We need to scale up
+ int div = workarea->get_low_res_pixel_size();
pixbuf=pixbuf->scale_simple(
pixbuf=pixbuf->scale_simple(
- surface.get_w()*
2
,
- surface.get_h()*
2
,
+ surface.get_w()*
div
,
+ surface.get_h()*
div
,
Gdk::INTERP_NEAREST
);
}
Gdk::INTERP_NEAREST
);
}
@@
-630,14
+645,14
@@
WorkArea::WorkArea(etl::loose_handle<synfigapp::CanvasInterface> canvas_interfac
canvas(canvas_interface->get_canvas()),
scrollx_adjustment(0,-4,4,0.01,0.1),
scrolly_adjustment(0,-4,4,0.01,0.1),
canvas(canvas_interface->get_canvas()),
scrollx_adjustment(0,-4,4,0.01,0.1),
scrolly_adjustment(0,-4,4,0.01,0.1),
- w(
128
),
- h(
128
),
+ w(
TILE_SIZE
),
+ h(
TILE_SIZE
),
last_event_time(0),
progresscallback(0),
dragging(DRAG_NONE),
show_grid(false),
last_event_time(0),
progresscallback(0),
dragging(DRAG_NONE),
show_grid(false),
- tile_w(
128
),
- tile_h(
128
),
+ tile_w(
TILE_SIZE
),
+ tile_h(
TILE_SIZE
),
timecode_width(0),
timecode_height(0)
{
timecode_width(0),
timecode_height(0)
{
@@
-649,6
+664,7
@@
WorkArea::WorkArea(etl::loose_handle<synfigapp::CanvasInterface> canvas_interfac
render_idle_func_id=0;
zoom=prev_zoom=1.0;
quality=10;
render_idle_func_id=0;
zoom=prev_zoom=1.0;
quality=10;
+ low_res_pixel_size=2;
rendering=false;
canceled_=false;
low_resolution=true;
rendering=false;
canceled_=false;
low_resolution=true;
@@
-812,18
+828,22
@@
WorkArea::~WorkArea()
render_idle_func_id=0;
}
render_idle_func_id=0;
}
+#ifdef SINGLE_THREADED
bool
WorkArea::get_updating()const
{
return App::single_threaded && async_renderer && async_renderer->updating;
}
bool
WorkArea::get_updating()const
{
return App::single_threaded && async_renderer && async_renderer->updating;
}
+#endif
+#ifdef SINGLE_THREADED
void
WorkArea::stop_updating(bool cancel)
{
async_renderer->stop();
if (cancel) canceled_=true;
}
void
WorkArea::stop_updating(bool cancel)
{
async_renderer->stop();
if (cancel) canceled_=true;
}
+#endif
void
WorkArea::save_meta_data()
void
WorkArea::save_meta_data()
@@
-892,6
+912,8
@@
WorkArea::load_meta_data()
if(!tmp.empty())
gx=stratof(tmp);
if(!tmp.empty())
gx=stratof(tmp);
+ else
+ synfig::error("WorkArea::load_meta_data(): Unable to parse data for \"grid_size\", which was \"%s\"",data.c_str());
if(iter==data.end())
tmp.clear();
if(iter==data.end())
tmp.clear();
@@
-900,11
+922,11
@@
WorkArea::load_meta_data()
if(!tmp.empty())
gy=stratof(tmp);
if(!tmp.empty())
gy=stratof(tmp);
+ else
+ synfig::error("WorkArea::load_meta_data(): Unable to parse data for \"grid_size\", which was \"%s\"",data.c_str());
set_grid_size(Vector(gx,gy));
}
set_grid_size(Vector(gx,gy));
}
- else
- synfig::error("WorkArea::load_meta_data(): Unable to parse data for \"grid_size\", which was \"%s\"",data.c_str());
data=canvas->get_meta_data("grid_show");
if(data.size() && (data=="1" || data[0]=='t' || data[0]=='T'))
data=canvas->get_meta_data("grid_show");
if(data.size() && (data=="1" || data[0]=='t' || data[0]=='T'))
@@
-1146,7
+1168,7
@@
WorkArea::on_key_press_event(GdkEventKey* event)
break;
}
break;
}
- synfigapp::Action::PassiveGrouper grouper(instance.get(),
"Nudge"
);
+ synfigapp::Action::PassiveGrouper grouper(instance.get(),
_("Nudge")
);
// Grid snap does not apply to nudging
bool grid_snap_holder(get_grid_snap());
// Grid snap does not apply to nudging
bool grid_snap_holder(get_grid_snap());
@@
-1181,8
+1203,6
@@
WorkArea::on_drawing_area_event(GdkEvent *event)
bool is_mouse(false);
Gdk::ModifierType modifier(Gdk::ModifierType(0));
bool is_mouse(false);
Gdk::ModifierType modifier(Gdk::ModifierType(0));
- drawing_area->grab_focus();
-
// Handle input stuff
if(
event->any.type==GDK_MOTION_NOTIFY ||
// Handle input stuff
if(
event->any.type==GDK_MOTION_NOTIFY ||
@@
-1202,6
+1222,7
@@
WorkArea::on_drawing_area_event(GdkEvent *event)
{
device=event->button.device;
modifier=Gdk::ModifierType(event->button.state);
{
device=event->button.device;
modifier=Gdk::ModifierType(event->button.state);
+ drawing_area->grab_focus();
}
// Make sure we recognize the device
}
// Make sure we recognize the device
@@
-1330,8
+1351,11
@@
WorkArea::on_drawing_area_event(GdkEvent *event)
selected_bezier=find_bezier(mouse_pos,radius,&bezier_click_pos);
selected_bezier=find_bezier(mouse_pos,radius,&bezier_click_pos);
- if(duck
&& duck->get_editable()
)
+ if(duck)
{
{
+ if (!duck->get_editable())
+ return true;
+
//get_selected_duck()->signal_user_click(0)();
//if(clicked_duck)clicked_duck->signal_user_click(0)();
//get_selected_duck()->signal_user_click(0)();
//if(clicked_duck)clicked_duck->signal_user_click(0)();
@@
-1347,15
+1371,19
@@
WorkArea::on_drawing_area_event(GdkEvent *event)
// if the tangent isn't split, then split it
if (!((*(parent_value_node->get_link("split")))(get_time()).get(bool())))
{
// if the tangent isn't split, then split it
if (!((*(parent_value_node->get_link("split")))(get_time()).get(bool())))
{
- get_canvas_view()->canvas_interface()->
+
if (
get_canvas_view()->canvas_interface()->
change_value(synfigapp::ValueDesc(parent_value_node,
parent_value_node->get_link_index_from_name("split")),
change_value(synfigapp::ValueDesc(parent_value_node,
parent_value_node->get_link_index_from_name("split")),
- true);
- // rebuild the ducks from scratch, so the tangents ducks aren't connected
- get_canvas_view()->rebuild_ducks();
-
- // reprocess the mouse click
- return on_drawing_area_event(event);
+ true))
+ {
+ // rebuild the ducks from scratch, so the tangents ducks aren't connected
+ get_canvas_view()->rebuild_ducks();
+
+ // reprocess the mouse click
+ return on_drawing_area_event(event);
+ }
+ else
+ return true;
}
} else {
// I don't know how to access the vertex from the tangent duck when originally drawing the bline in the bline tool
}
} else {
// I don't know how to access the vertex from the tangent duck when originally drawing the bline in the bline tool
@@
-1600,7
+1628,7
@@
WorkArea::on_drawing_area_event(GdkEvent *event)
else
if(dragging==DRAG_DUCK)
{
else
if(dragging==DRAG_DUCK)
{
- synfigapp::Action::PassiveGrouper grouper(instance.get(),
"Move"
);
+ synfigapp::Action::PassiveGrouper grouper(instance.get(),
_("Move")
);
dragging=DRAG_NONE;
//translate_selected_ducks(mouse_pos);
set_axis_lock(false);
dragging=DRAG_NONE;
//translate_selected_ducks(mouse_pos);
set_axis_lock(false);
@@
-1869,10
+1897,8
@@
WorkArea::on_vruler_event(GdkEvent */*event*/)
switch(event->type)
{
case GDK_BUTTON_PRESS:
switch(event->type)
{
case GDK_BUTTON_PRESS:
- DEBUGPOINT();
if(dragging==DRAG_NONE)
{
if(dragging==DRAG_NONE)
{
- DEBUGPOINT();
dragging=DRAG_GUIDE;
curr_guide=get_guide_list_x().insert(get_guide_list_x().begin());
curr_guide_is_x=true;
dragging=DRAG_GUIDE;
curr_guide=get_guide_list_x().insert(get_guide_list_x().begin());
curr_guide_is_x=true;
@@
-1880,10
+1906,8
@@
WorkArea::on_vruler_event(GdkEvent */*event*/)
return true;
break;
case GDK_BUTTON_RELEASE:
return true;
break;
case GDK_BUTTON_RELEASE:
- DEBUGPOINT();
if(dragging==DRAG_GUIDE && curr_guide_is_x==true)
{
if(dragging==DRAG_GUIDE && curr_guide_is_x==true)
{
- DEBUGPOINT();
dragging=DRAG_NONE;
get_guide_list_x().erase(curr_guide);
}
dragging=DRAG_NONE;
get_guide_list_x().erase(curr_guide);
}
@@
-1980,7
+2004,8
@@
WorkArea::next_unrendered_tile(int refreshes)const
x(focus_point[0]/pw+drawing_area->get_width()/2-w/2),
y(focus_point[1]/ph+drawing_area->get_height()/2-h/2);
x(focus_point[0]/pw+drawing_area->get_width()/2-w/2),
y(focus_point[1]/ph+drawing_area->get_height()/2-h/2);
- const int width_in_tiles(w/tile_w+(w%tile_w?1:0));
+ int div = low_res_pixel_size;
+ const int width_in_tiles(w/tile_w+((low_resolution?((w/div)%(tile_w/div)):(w%tile_w))?1:0));
const int height_in_tiles(h/tile_h+(h%tile_h?1:0));
int
const int height_in_tiles(h/tile_h+(h%tile_h?1:0));
int
@@
-2112,8
+2137,6
@@
WorkArea::refresh(GdkEventExpose*event)
drawing_frame->unset_bg(Gtk::STATE_NORMAL);
#endif
drawing_frame->unset_bg(Gtk::STATE_NORMAL);
#endif
- previous_focus=get_focus_point();
-
return true;
}
return true;
}
@@
-2146,6
+2169,14
@@
WorkArea::set_quality(int x)
queue_render_preview();
}
queue_render_preview();
}
+void
+WorkArea::set_low_res_pixel_size(int x)
+{
+ if(x==low_res_pixel_size)
+ return;
+ low_res_pixel_size=x;
+ queue_render_preview();
+}
namespace studio
{
namespace studio
{
@@
-2191,12
+2222,14
@@
public:
bool
studio::WorkArea::async_update_preview()
{
bool
studio::WorkArea::async_update_preview()
{
+#ifdef SINGLE_THREADED
if (get_updating())
{
stop_updating();
queue_render_preview();
return false;
}
if (get_updating())
{
stop_updating();
queue_render_preview();
return false;
}
+#endif
async_renderer=0;
async_renderer=0;
@@
-2233,6
+2266,11
@@
studio::WorkArea::async_update_preview()
int w=(int)(desc.get_w()*zoom);
int h=(int)(desc.get_h()*zoom);
int w=(int)(desc.get_w()*zoom);
int h=(int)(desc.get_h()*zoom);
+ // ensure that the size we draw is at least one pixel in each dimension
+ int min_size = low_resolution ? low_res_pixel_size : 1;
+ if (w < min_size) w = min_size;
+ if (h < min_size) h = min_size;
+
// Setup the description parameters
desc.set_antialias(1);
desc.set_time(cur_time);
// Setup the description parameters
desc.set_antialias(1);
desc.set_time(cur_time);
@@
-2243,8
+2281,9
@@
studio::WorkArea::async_update_preview()
handle<Target> target;
// if we have lots of pixels to render and the tile renderer isn't disabled, use it
handle<Target> target;
// if we have lots of pixels to render and the tile renderer isn't disabled, use it
- if(w*h>(low_resolution?480*270:480*270/2) &&
- !getenv("SYNFIG_DISABLE_TILE_RENDER"))
+ int div;
+ div = low_resolution ? low_res_pixel_size : 1;
+ if ((w*h > 240*div*135*div && !getenv("SYNFIG_DISABLE_TILE_RENDER")) || getenv("SYNFIG_FORCE_TILE_RENDER"))
{
// do a tile render
handle<WorkAreaTarget> trgt(new class WorkAreaTarget(this,w,h));
{
// do a tile render
handle<WorkAreaTarget> trgt(new class WorkAreaTarget(this,w,h));
@@
-2506,7
+2545,7
@@
WorkArea::queue_scroll()
drawing_area->queue_draw_area( 0, 0, 1, maxy);
drawing_area->queue_draw_area(maxx-dx, 0, maxx-dx, maxy);
}
drawing_area->queue_draw_area( 0, 0, 1, maxy);
drawing_area->queue_draw_area(maxx-dx, 0, maxx-dx, maxy);
}
- else if (dx < 0)
+ else if (dx < 0)
{
drawing_area->queue_draw_area( maxx, 0, maxx, maxy);
drawing_area->queue_draw_area( -dx, 0, -dx, maxy);
{
drawing_area->queue_draw_area( maxx, 0, maxx, maxy);
drawing_area->queue_draw_area( -dx, 0, -dx, maxy);
@@
-2516,7
+2555,7
@@
WorkArea::queue_scroll()
drawing_area->queue_draw_area(0, 0, maxx, 1);
drawing_area->queue_draw_area(0, maxy-dy, maxx, maxy-dy);
}
drawing_area->queue_draw_area(0, 0, maxx, 1);
drawing_area->queue_draw_area(0, maxy-dy, maxx, maxy-dy);
}
- else if (dy < 0)
+ else if (dy < 0)
{
drawing_area->queue_draw_area(0, maxy, maxx, maxy);
drawing_area->queue_draw_area(0, -dy, maxx, -dy);
{
drawing_area->queue_draw_area(0, maxy, maxx, maxy);
drawing_area->queue_draw_area(0, -dy, maxx, -dy);
@@
-2542,20
+2581,25
@@
studio::WorkArea::zoom_out()
void
studio::WorkArea::zoom_fit()
{
void
studio::WorkArea::zoom_fit()
{
- // This really doesn't zoom to fit. Bug.
- zoom_norm();
+ float new_zoom(min(drawing_area->get_width() * zoom / w,
+ drawing_area->get_height() * zoom / h) * 0.995);
+ if (zoom / new_zoom > 0.995 && new_zoom / zoom > 0.995)
+ {
+ set_zoom(prev_zoom);
+ return set_focus_point(previous_focus);
+ }
+ previous_focus = get_focus_point();
+ prev_zoom = zoom;
+ set_zoom(new_zoom);
+ set_focus_point(Point(0,0));
}
void
studio::WorkArea::zoom_norm()
{
}
void
studio::WorkArea::zoom_norm()
{
- if(zoom==1.0)
- set_zoom(prev_zoom);
- else
- {
- prev_zoom=zoom;
- set_zoom(1.0f);
- }
+ if (zoom == 1.0) return set_zoom(prev_zoom);
+ prev_zoom = zoom;
+ set_zoom(1.0f);
}
gboolean
}
gboolean
@@
-2606,7
+2650,7
@@
studio::WorkArea::queue_render_preview()
//synfig::info("queue_render_preview(): (re)queuing...");
//render_idle_func_id=g_idle_add_full(G_PRIORITY_DEFAULT,__render_preview,this,NULL);
render_idle_func_id=g_timeout_add_full(
//synfig::info("queue_render_preview(): (re)queuing...");
//render_idle_func_id=g_idle_add_full(G_PRIORITY_DEFAULT,__render_preview,this,NULL);
render_idle_func_id=g_timeout_add_full(
- G_PRIORITY_DEFAULT, // priority -
+ G_PRIORITY_DEFAULT, // priority -
queue_time, // interval - the time between calls to the function, in milliseconds (1/1000ths of a second)
__render_preview, // function - function to call
this, // data - data to pass to function
queue_time, // interval - the time between calls to the function, in milliseconds (1/1000ths of a second)
__render_preview, // function - function to call
this, // data - data to pass to function