more updates

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

diff --git a/synfig-studio/trunk/src/gtkmm/renderer_guides.cpp b/synfig-studio/trunk/src/gtkmm/renderer_guides.cpp
index f13746b..a1819ef 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/renderer_guides.cpp
+++ b/synfig-studio/trunk/src/gtkmm/renderer_guides.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file template.cpp
 **     \brief Template File
 **
 **     $Id: renderer_guides.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
 **
 **     \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
 */
 /* ========================================================================= */
@@ -38,7 +39,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 /* === M A C R O S ========================================================= */
@@ -80,7 +81,7 @@ Renderer_Guides::get_guide_list_y()
 bool
 Renderer_Guides::event_vfunc(GdkEvent* event)
 {
-       sinfg::Point mouse_pos;
+       synfig::Point mouse_pos;
     float bezier_click_pos;
        const float radius((abs(get_pw())+abs(get_ph()))*4);
        int button_pressed(0);
@@ -132,7 +133,7 @@ Renderer_Guides::event_vfunc(GdkEvent* event)
                // and the buttons
                if(!event->button.axes)
                {
-                       mouse_pos=sinfg::Point(screen_to_comp_coords(sinfg::Point(event->button.x,event->button.y)));
+                       mouse_pos=synfig::Point(screen_to_comp_coords(synfig::Point(event->button.x,event->button.y)));
                        button_pressed=event->button.button;
                        pressure=1.0f;
                        is_mouse=true;
@@ -147,14 +148,14 @@ Renderer_Guides::event_vfunc(GdkEvent* event)
                                return false;
 
                        pressure=event->button.axes[2];
-                       //sinfg::info("pressure=%f",pressure);
+                       //synfig::info("pressure=%f",pressure);
                        pressure-=0.04f;
                        pressure/=1.0f-0.04f;
                        
                        
                        assert(!isnan(pressure));
                        
-                       mouse_pos=sinfg::Point(screen_to_comp_coords(sinfg::Point(x,y)));
+                       mouse_pos=synfig::Point(screen_to_comp_coords(synfig::Point(x,y)));
                        
                        button_pressed=event->button.button;
                        
@@ -164,7 +165,7 @@ Renderer_Guides::event_vfunc(GdkEvent* event)
                                pressure=0;
 
                        //if(event->any.type==GDK_BUTTON_PRESS && button_pressed)
-                       //      sinfg::info("Button pressed on input device = %d",event->button.button);
+                       //      synfig::info("Button pressed on input device = %d",event->button.button);
                        
                        //if(event->button.axes[2]>0.1)
                        //      button_pressed=1;
@@ -197,9 +198,9 @@ Renderer_Guides::render_vfunc(
        if(!get_work_area())
                return;
        
-       const sinfg::RendDesc &rend_desc(get_work_area()->get_canvas()->rend_desc());
+       const synfig::RendDesc &rend_desc(get_work_area()->get_canvas()->rend_desc());
        
-       const sinfg::Vector focus_point(get_work_area()->get_focus_point());
+       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());
        
@@ -208,14 +209,14 @@ Renderer_Guides::render_vfunc(
        
        // 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()),
@@ -227,12 +228,12 @@ Renderer_Guides::render_vfunc(
        
        Glib::RefPtr<Gdk::GC> gc(Gdk::GC::create(drawable));
        
-       //const sinfg::Vector grid_size(get_grid_size());
+       //const synfig::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::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 guides