Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-studio / trunk / src / gtkmm / renderer_grid.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/renderer_grid.cpp b/synfig-studio/trunk/src/gtkmm/renderer_grid.cpp
index d648f93..b00a593 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/renderer_grid.cpp
+++ b/synfig-studio/trunk/src/gtkmm/renderer_grid.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
-/*!    \file template.cpp
+/* === S Y N F I G ========================================================= */
+/*!    \file renderer_grid.cpp
 **     \brief Template File
 **
-**     $Id: renderer_grid.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**     $Id$
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**     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
 */
 /* ========================================================================= */
@@ -32,13 +33,15 @@
 #include "workarea.h"
 #include <ETL/misc>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 /* === M A C R O S ========================================================= */
@@ -59,7 +62,7 @@ Renderer_Grid::get_enabled_vfunc()const
        return get_work_area()->grid_status();
 }
 
-sinfg::Vector
+synfig::Vector
 Renderer_Grid::get_grid_size()const
 {
        return get_work_area()->get_grid_size();
@@ -68,32 +71,32 @@ Renderer_Grid::get_grid_size()const
 void
 Renderer_Grid::render_vfunc(
        const Glib::RefPtr<Gdk::Drawable>& drawable,
-       const Gdk::Rectangle& expose_area
+       const Gdk::Rectangle& /*expose_area*/
 )
 {
        assert(get_work_area());
        if(!get_work_area())
                return;
-       
-//     const sinfg::RendDesc &rend_desc(get_work_area()->get_canvas()->rend_desc());
-       
-       const sinfg::Vector focus_point(get_work_area()->get_focus_point());
+
+//     const synfig::RendDesc &rend_desc(get_work_area()->get_canvas()->rend_desc());
+
+       const synfig::Vector focus_point(get_work_area()->get_focus_point());
 
 //     std::vector< std::pair<Glib::RefPtr<Gdk::Pixbuf>,int> >& tile_book(get_tile_book());
-       
+
        int drawable_w,drawable_h;
        drawable->get_size(drawable_w,drawable_h);
-       
+
        // Calculate the window coordinates of the top-left
        // corner of the canvas.
-//     const sinfg::Vector::value_type
+//     const synfig::Vector::value_type
 //             x(focus_point[0]/get_pw()+drawable_w/2-get_w()/2),
 //             y(focus_point[1]/get_ph()+drawable_h/2-get_h()/2);
 
-       /*const sinfg::Vector::value_type window_startx(window_tl[0]);
-       const sinfg::Vector::value_type window_endx(window_br[0]);
-       const sinfg::Vector::value_type window_starty(window_tl[1]);
-       const sinfg::Vector::value_type window_endy(window_br[1]);
+       /*const synfig::Vector::value_type window_startx(window_tl[0]);
+       const synfig::Vector::value_type window_endx(window_br[0]);
+       const synfig::Vector::value_type window_starty(window_tl[1]);
+       const synfig::Vector::value_type window_endy(window_br[1]);
        */
 //     const int
 //             tile_w(get_work_area()->get_tile_w()),
@@ -102,25 +105,25 @@ Renderer_Grid::render_vfunc(
 //     const int
 //             w(get_w()),
 //             h(get_h());
-       
+
        Glib::RefPtr<Gdk::GC> gc(Gdk::GC::create(drawable));
-       
-       const sinfg::Vector grid_size(get_grid_size());
 
-       const sinfg::Vector::value_type window_startx(get_work_area()->get_window_tl()[0]);
-       const sinfg::Vector::value_type window_endx(get_work_area()->get_window_br()[0]);
-       const sinfg::Vector::value_type window_starty(get_work_area()->get_window_tl()[1]);
-       const sinfg::Vector::value_type window_endy(get_work_area()->get_window_br()[1]);
+       const synfig::Vector grid_size(get_grid_size());
+
+       const synfig::Vector::value_type window_startx(get_work_area()->get_window_tl()[0]);
+       const synfig::Vector::value_type window_endx(get_work_area()->get_window_br()[0]);
+       const synfig::Vector::value_type window_starty(get_work_area()->get_window_tl()[1]);
+       const synfig::Vector::value_type window_endy(get_work_area()->get_window_br()[1]);
        const float pw(get_pw()),ph(get_ph());
-       
+
        // Draw out the grid
        if(grid_size[0]>pw*3.5 && grid_size[1]>ph*3.5)
        {
-               sinfg::Vector::value_type x,y;
+               synfig::Vector::value_type x,y;
 
                x=floor(window_startx/grid_size[0])*grid_size[0];
                y=floor(window_starty/grid_size[1])*grid_size[1];
-               
+
                gc->set_function(Gdk::COPY);
                gc->set_rgb_fg_color(Gdk::Color("#9f9f9f"));
                gc->set_line_attributes(1,Gdk::LINE_ON_OFF_DASH,Gdk::CAP_BUTT,Gdk::JOIN_MITER);