X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftags%2Fstable%2Fsrc%2Fgtkmm%2Fstate_zoom.cpp;h=b53a5fbd759723c2f3bd68b5c9b76f1901d5a611;hb=a42ee14a3397a3fbb31d14e6eece4236620ae2db;hp=35ee61e48f43b5bcf84c35ea9010d34fc1972d4f;hpb=7c6d5426922cb3cda793f688dcd4d534b02765c8;p=synfig.git diff --git a/synfig-studio/tags/stable/src/gtkmm/state_zoom.cpp b/synfig-studio/tags/stable/src/gtkmm/state_zoom.cpp index 35ee61e..b53a5fb 100644 --- a/synfig-studio/tags/stable/src/gtkmm/state_zoom.cpp +++ b/synfig-studio/tags/stable/src/gtkmm/state_zoom.cpp @@ -1,20 +1,21 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file state_zoom.cpp ** \brief Zoom Toole Implementation File ** -** $Id: state_zoom.cpp,v 1.1.1.1 2005/01/07 03:34:37 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,7 +33,7 @@ #include #include -#include +#include #include "state_zoom.h" @@ -42,7 +43,7 @@ #include "app.h" #include "dialog_tooloptions.h" #include "toolbox.h" -#include +#include #endif @@ -50,7 +51,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -66,20 +67,20 @@ class studio::StateZoom_Context : public sigc::trackable { etl::handle canvas_view_; CanvasView::IsWorking is_working; - + Point p1,p2; - + bool prev_workarea_layer_status_; - + //Toolbox settings - sinfgapp::Settings& settings; - + synfigapp::Settings& settings; + //Toolbox display Gtk::Table options_table; - + public: - void refresh_tool_options(); //to refresh the toolbox + void refresh_tool_options(); //to refresh the toolbox //events Smach::event_result event_stop_handler(const Smach::event& x); @@ -93,17 +94,17 @@ public: //Canvas interaction const etl::handle& get_canvas_view()const{return canvas_view_;} - etl::handle get_canvas_interface()const{return canvas_view_->canvas_interface();} - sinfg::Canvas::Handle get_canvas()const{return canvas_view_->get_canvas();} + etl::handle get_canvas_interface()const{return canvas_view_->canvas_interface();} + synfig::Canvas::Handle get_canvas()const{return canvas_view_->get_canvas();} WorkArea * get_work_area()const{return canvas_view_->get_work_area();} - + //Modifying settings etc. void load_settings(); void save_settings(); void reset(); - + //void zoom(const Point& p1, const Point& p2); - + }; // END of class StateGradient_Context /* === M E T H O D S ======================================================= */ @@ -119,7 +120,7 @@ StateZoom::StateZoom(): //insert(event_def(EVENT_WORKAREA_BUTTON_CLICK,&StateZoom_Context::event_mouse_click_handler)); insert(event_def(EVENT_WORKAREA_MOUSE_BUTTON_UP,&StateZoom_Context::event_mouse_click_handler)); insert(event_def(EVENT_REFRESH_TOOL_OPTIONS,&StateZoom_Context::event_refresh_tool_options)); -} +} StateZoom::~StateZoom() { @@ -127,14 +128,14 @@ StateZoom::~StateZoom() void StateZoom_Context::load_settings() -{ +{ String value; - + //parse the arguments yargh! /*if(settings.get_value("circle.feather",value)) set_feather(atof(value.c_str())); else - set_feather(0);*/ + set_feather(0);*/ } void @@ -152,35 +153,35 @@ StateZoom_Context::reset() StateZoom_Context::StateZoom_Context(CanvasView* canvas_view): canvas_view_(canvas_view), is_working(*canvas_view), - prev_workarea_layer_status_(get_work_area()->allow_layer_clicks), - settings(sinfgapp::Main::get_selected_input_device()->settings()) + prev_workarea_layer_status_(get_work_area()->get_allow_layer_clicks()), + settings(synfigapp::Main::get_selected_input_device()->settings()) { // Set up the tool options dialog - //options_table.attach(*manage(new Gtk::Label(_("Zoom Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - + //options_table.attach(*manage(new Gtk::Label(_("Zoom Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + load_settings(); options_table.show_all(); - + refresh_tool_options(); App::dialog_tool_options->present(); // Turn off layer clicking - get_work_area()->allow_layer_clicks=false; - + get_work_area()->set_allow_layer_clicks(false); + // clear out the ducks get_work_area()->clear_ducks(); //??? - + // Refresh the work area get_work_area()->queue_draw(); - + // Hide the tables if they are showing //prev_table_status=get_canvas_view()->tables_are_visible(); //if(prev_table_status)get_canvas_view()->hide_tables(); - - // Hide the time bar - //get_canvas_view()->hide_timebar(); - + + // Disable the time bar + //get_canvas_view()->set_sensitive_timebar(false); + // Connect a signal //get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StateZoom_Context::on_user_click)); get_canvas_view()->work_area->set_cursor(Gdk::CROSSHAIR); @@ -198,7 +199,7 @@ StateZoom_Context::refresh_tool_options() } Smach::event_result -StateZoom_Context::event_refresh_tool_options(const Smach::event& x) +StateZoom_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; @@ -209,18 +210,17 @@ StateZoom_Context::~StateZoom_Context() save_settings(); // Restore layer clicking - get_work_area()->allow_layer_clicks=prev_workarea_layer_status_; + get_work_area()->set_allow_layer_clicks(prev_workarea_layer_status_); get_canvas_view()->work_area->reset_cursor(); App::dialog_tool_options->clear(); - // Show the time bar - if(get_canvas_view()->get_canvas()->rend_desc().get_time_start()!=get_canvas_view()->get_canvas()->rend_desc().get_time_end()) - get_canvas_view()->show_timebar(); + // Enable the time bar + //get_canvas_view()->set_sensitive_timebar(true); // Bring back the tables if they were out before //if(prev_table_status)get_canvas_view()->show_tables(); - + // Refresh the work area get_work_area()->queue_draw(); @@ -230,13 +230,13 @@ StateZoom_Context::~StateZoom_Context() } Smach::event_result -StateZoom_Context::event_stop_handler(const Smach::event& x) +StateZoom_Context::event_stop_handler(const Smach::event& /*x*/) { throw Smach::egress_exception(); } Smach::event_result -StateZoom_Context::event_refresh_handler(const Smach::event& x) +StateZoom_Context::event_refresh_handler(const Smach::event& /*x*/) { return Smach::RESULT_ACCEPT; } @@ -247,14 +247,14 @@ StateZoom_Context::event_mouse_click_handler(const Smach::event& x) if(x.key==EVENT_WORKAREA_BOX) { const EventBox& event(*reinterpret_cast(&x)); - + if(event.button==BUTTON_LEFT) { //respond to event box... - - + + //Center the new position at the center of the box - + //OH MY GOD HACK - the space is -1* and offset (by the value of the center of the canvas)... Point newpos; { @@ -262,53 +262,53 @@ StateZoom_Context::event_mouse_click_handler(const Smach::event& x) const Point realcenter = (get_work_area()->get_window_tl() + get_work_area()->get_window_br())/2; newpos = -(evcenter - realcenter) + get_work_area()->get_focus_point(); } - + //The zoom will be whatever the required factor to convert current box size to desired box size Point tl = get_work_area()->get_window_tl(); Point br = get_work_area()->get_window_br(); - + Vector span = br - tl; Vector v = event.p2 - event.p1; - + //get the minimum zoom as long as it's greater than 1... v[0] = abs(v[0])/abs(span[0]); v[1] = abs(v[1])/abs(span[1]); - + float zdiv = max(v[0],v[1]); if(zdiv < 1 && zdiv > 0) //must be zoomable { - get_work_area()->set_focus_point(newpos); + get_work_area()->set_focus_point(newpos); get_work_area()->set_zoom(get_work_area()->get_zoom()/zdiv); } - + return Smach::RESULT_ACCEPT; } } - + if(x.key==EVENT_WORKAREA_MOUSE_BUTTON_UP) { const EventMouse& event(*reinterpret_cast(&x)); - + if(event.button==BUTTON_LEFT) { Point evpos; - + //make the event pos be in the same space... // The weird ass inverted center normalized space... { const Point realcenter = (get_work_area()->get_window_tl() + get_work_area()->get_window_br())/2; evpos = -(event.pos - realcenter) + get_work_area()->get_focus_point(); } - + /* Zooming: focus point must zoom about the point evpos... - + trans about an origin not 0: p' = A(p - o) + o */ - + Vector v = get_work_area()->get_focus_point() - evpos; - + if(event.modifier & Gdk::CONTROL_MASK) //zoom out... { v*=ZOOMFACTOR; @@ -322,7 +322,7 @@ StateZoom_Context::event_mouse_click_handler(const Smach::event& x) get_work_area()->set_focus_point(evpos + v); get_work_area()->set_zoom(get_work_area()->get_zoom()*ZOOMFACTOR); } - + return Smach::RESULT_ACCEPT; } }