Fix the error about being unable to parse the grid_size metadata. It was previously...

[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 313646f..9b77c6c 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/workarea.cpp
+++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp
@@ -72,6 +72,8 @@
 
 #include <synfig/mutex.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -628,14 +630,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),
-       w(128),
-       h(128),
+       w(TILE_SIZE),
+       h(TILE_SIZE),
        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)
 {
@@ -890,6 +892,8 @@ WorkArea::load_meta_data()
 
                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();
@@ -898,11 +902,11 @@ WorkArea::load_meta_data()
 
                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));
        }
-       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'))
@@ -1445,19 +1449,15 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
                                if(get_selected_ducks().size()<=1)
                                        duck->signal_user_click(2)();
                                else
-                               {
                                        canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MULTIPLE_DUCKS_CLICKED,BUTTON_RIGHT,mouse_pos,pressure,modifier));
-                               }
                                return true;
                        }
-                       else
-                       if(bezier)
+                       else if(bezier)
                        {
                                bezier->signal_user_click(2)(bezier_click_pos);
                                return true;
                        }
-                       else
-                       if(layer)
+                       else if (layer)
                        {
                                if(canvas_view->get_smach().process_event(EventLayerClick(layer,BUTTON_RIGHT,mouse_pos))==Smach::RESULT_OK)
                                        return false;
@@ -1546,11 +1546,13 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
 
                        drawing_area->queue_draw();
                }
+
                if(dragging==DRAG_BOX)
                {
                        curr_point=mouse_pos;
                        drawing_area->queue_draw();
                }
+
                if(dragging==DRAG_GUIDE)
                {
                        if(curr_guide_is_x)
@@ -1559,30 +1561,34 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
                                *curr_guide=mouse_pos[1];
                        drawing_area->queue_draw();
                }
+
                if(dragging!=DRAG_WINDOW)
                {       // Update those triangle things on the rulers
                        const synfig::Point point(mouse_pos);
                        hruler->property_position()=Distance(point[0],Distance::SYSTEM_UNITS).get(App::distance_system,get_canvas()->rend_desc());
                        vruler->property_position()=Distance(point[1],Distance::SYSTEM_UNITS).get(App::distance_system,get_canvas()->rend_desc());
                }
-               if(dragging==DRAG_WINDOW)
-               {
-                       set_focus_point(get_focus_point()+mouse_pos-drag_point);
-               }
-               else
-               if(event->motion.state&GDK_BUTTON1_MASK && canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_BUTTON_DRAG,BUTTON_LEFT,mouse_pos,pressure,modifier))==Smach::RESULT_ACCEPT)
+
+               if(dragging == DRAG_WINDOW)
+                       set_focus_point(get_focus_point() + mouse_pos-drag_point);
+               else if (event->motion.state & GDK_BUTTON1_MASK &&
+                               canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_BUTTON_DRAG, BUTTON_LEFT,
+                                                                                                                                 mouse_pos,pressure,modifier)) == Smach::RESULT_ACCEPT)
                        return true;
-               else
-               if(event->motion.state&GDK_BUTTON2_MASK && canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_BUTTON_DRAG,BUTTON_MIDDLE,mouse_pos,pressure,modifier))==Smach::RESULT_ACCEPT)
+               else if (event->motion.state & GDK_BUTTON2_MASK &&
+                                canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_BUTTON_DRAG, BUTTON_MIDDLE,
+                                                                                                                                  mouse_pos, pressure, modifier)) == Smach::RESULT_ACCEPT)
                        return true;
-               else
-               if(event->motion.state&GDK_BUTTON3_MASK && canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_BUTTON_DRAG,BUTTON_RIGHT,mouse_pos,pressure,modifier))==Smach::RESULT_ACCEPT)
+               else if (event->motion.state & GDK_BUTTON3_MASK &&
+                                canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_BUTTON_DRAG, BUTTON_RIGHT,
+                                                                                                                                  mouse_pos, pressure, modifier)) == Smach::RESULT_ACCEPT)
                        return true;
-               else
-               if(canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_MOTION,BUTTON_NONE,mouse_pos,pressure,modifier))==Smach::RESULT_ACCEPT)
+               else if(canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_MOTION, BUTTON_NONE,
+                                                                                                                                 mouse_pos, pressure,modifier)) == Smach::RESULT_ACCEPT)
                        return true;
 
                break;
+
        case GDK_BUTTON_RELEASE:
        {
                bool ret(false);
@@ -1865,10 +1871,8 @@ WorkArea::on_vruler_event(GdkEvent */*event*/)
        switch(event->type)
     {
        case GDK_BUTTON_PRESS:
-               DEBUGPOINT();
                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;
@@ -1876,10 +1880,8 @@ WorkArea::on_vruler_event(GdkEvent */*event*/)
                return true;
                break;
        case GDK_BUTTON_RELEASE:
-               DEBUGPOINT();
                if(dragging==DRAG_GUIDE && curr_guide_is_x==true)
                {
-                       DEBUGPOINT();
                        dragging=DRAG_NONE;
                        get_guide_list_x().erase(curr_guide);
                }
@@ -1976,7 +1978,7 @@ 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);
 
-       const int width_in_tiles(w/tile_w+(w%tile_w?1:0));
+       const int width_in_tiles(w/tile_w+((low_resolution?((w/2)%(tile_w/2)):(w%tile_w))?1:0));
        const int height_in_tiles(h/tile_h+(h%tile_h?1:0));
 
        int
@@ -2238,8 +2240,11 @@ studio::WorkArea::async_update_preview()
        // Create the render target
        handle<Target> target;
 
-       if(w*h>(low_resolution?480*270:480*270/2))
+       // 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"))
        {
+               // do a tile render
                handle<WorkAreaTarget> trgt(new class WorkAreaTarget(this,w,h));
 
                trgt->set_rend_desc(&desc);
@@ -2248,6 +2253,7 @@ studio::WorkArea::async_update_preview()
        }
        else
        {
+               // do a scanline render
                handle<WorkAreaTarget_Full> trgt(new class WorkAreaTarget_Full(this,w,h));
 
                trgt->set_rend_desc(&desc);
@@ -2272,7 +2278,7 @@ studio::WorkArea::async_update_preview()
        synfig::ProgressCallback *cb=get_canvas_view()->get_ui_interface().get();
 
        rendering=true;
-       cb->task("Rendering...");
+       cb->task(_("Rendering..."));
        rendering=true;
 
        return true;
@@ -2294,12 +2300,12 @@ studio::WorkArea::async_update_finished()
        {
                dirty=false;
                //queued=false;
-               cb->task("Idle");
+               cb->task(_("Idle"));
        }
        else
        {
                dirty=true;
-               cb->task("Render Failed");
+               cb->task(_("Render Failed"));
        }
        //get_canvas_view()->reset_cancel_status();
        done_rendering();
@@ -2373,7 +2379,7 @@ again:
        target->set_avoid_time_sync(true);
 
        if(cb)
-               cb->task(strprintf("Rendering canvas %s...",get_canvas()->get_name().c_str()));
+               cb->task(strprintf(_("Rendering canvas %s..."),get_canvas()->get_name().c_str()));
 
        bool ret = target->render(cb);
 
@@ -2389,9 +2395,9 @@ again:
        if(cb)
        {
                if(ret)
-                       cb->task("Idle");
+                       cb->task(_("Idle"));
                else
-                       cb->task("Render Failed");
+                       cb->task(_("Render Failed"));
                cb->amount_complete(0,1);
        }
 
@@ -2414,7 +2420,7 @@ again:
 }
 
 void
-studio::WorkArea::async_render_preview(Time time)
+studio::WorkArea::async_render_preview(synfig::Time time)
 {
        cur_time=time;
        //tile_book.clear();
@@ -2435,7 +2441,7 @@ WorkArea::async_render_preview()
 }
 
 bool
-studio::WorkArea::sync_render_preview(Time time)
+studio::WorkArea::sync_render_preview(synfig::Time time)
 {
        cur_time=time;
        //tile_book.clear();