X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fmod_mirror%2Fstate_mirror.cpp;h=9250ea01c32db7fcfffc8a3538211fd592ed1f3f;hb=8ef042c40521681cea99944097c4f90a5ac6cf74;hp=3d709f49de67024c50dc2b61e3d74da917f815ef;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/mod_mirror/state_mirror.cpp b/synfig-studio/trunk/src/gtkmm/mod_mirror/state_mirror.cpp index 3d709f4..9250ea0 100644 --- a/synfig-studio/trunk/src/gtkmm/mod_mirror/state_mirror.cpp +++ b/synfig-studio/trunk/src/gtkmm/mod_mirror/state_mirror.cpp @@ -1,20 +1,21 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file state_mirror.cpp ** \brief Template File ** -** $Id: state_mirror.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 */ /* ========================================================================= */ @@ -31,22 +32,24 @@ #include #include -#include -#include +#include +#include #include "state_mirror.h" #include "../canvasview.h" #include "../workarea.h" #include "../app.h" -#include +#include #include "../event_mouse.h" #include "../event_layerclick.h" #include "../toolbox.h" #include "../dialog_tooloptions.h" #include #include "../duck.h" -#include +#include + +#include "../general.h" #endif @@ -54,7 +57,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -72,35 +75,35 @@ StateMirror studio::state_mirror; class DuckDrag_Mirror : public DuckDrag_Base { - sinfg::Vector center; + synfig::Vector center; + + std::vector positions; + - std::vector positions; - - public: Axis axis; DuckDrag_Mirror(); - void begin_duck_drag(Duckmatic* duckmatic, const sinfg::Vector& begin); + void begin_duck_drag(Duckmatic* duckmatic, const synfig::Vector& begin); bool end_duck_drag(Duckmatic* duckmatic); - void duck_drag(Duckmatic* duckmatic, const sinfg::Vector& vector); + void duck_drag(Duckmatic* duckmatic, const synfig::Vector& vector); }; class studio::StateMirror_Context : public sigc::trackable { etl::handle canvas_view_; - - sinfgapp::Settings& settings; + + synfigapp::Settings& settings; etl::handle duck_dragger_; Gtk::Table options_table; - - + + Gtk::CheckButton checkbutton_axis_x; Gtk::CheckButton checkbutton_axis_y; - + public: Axis get_axis()const { return checkbutton_axis_x.get_active()?AXIS_X:AXIS_Y; } @@ -116,10 +119,10 @@ public: checkbutton_axis_y.set_active(true); checkbutton_axis_x.set_active(false); } - + duck_dragger_->axis=get_axis(); } - + void update_axis_y() { checkbutton_axis_x.set_active(!checkbutton_axis_y.get_active()); @@ -139,10 +142,10 @@ public: ~StateMirror_Context(); 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();} - + void load_settings(); void save_settings(); }; // END of class StateMirror_Context @@ -153,7 +156,7 @@ StateMirror::StateMirror(): Smach::state("mirror") { insert(event_def(EVENT_REFRESH_TOOL_OPTIONS,&StateMirror_Context::event_refresh_tool_options)); -} +} StateMirror::~StateMirror() { @@ -161,7 +164,7 @@ StateMirror::~StateMirror() void StateMirror_Context::load_settings() -{ +{ String value; settings.get_value("mirror.axis",value); @@ -170,30 +173,30 @@ StateMirror_Context::load_settings() void StateMirror_Context::save_settings() -{ +{ settings.set_value("mirror.lock_aspect",strprintf("%d",(int)get_axis())); } StateMirror_Context::StateMirror_Context(CanvasView* canvas_view): canvas_view_(canvas_view), - settings(sinfgapp::Main::get_selected_input_device()->settings()), + settings(synfigapp::Main::get_selected_input_device()->settings()), duck_dragger_(new DuckDrag_Mirror()), checkbutton_axis_x(_("Horizontal")), checkbutton_axis_y(_("Vertical")) -{ +{ // Set up the tool options dialog - options_table.attach(*manage(new Gtk::Label(_("Mirror Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + options_table.attach(*manage(new Gtk::Label(_("Mirror Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(checkbutton_axis_x, 0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); options_table.attach(checkbutton_axis_y, 0, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); checkbutton_axis_x.signal_toggled().connect(sigc::mem_fun(*this,&StateMirror_Context::update_axis_x)); checkbutton_axis_y.signal_toggled().connect(sigc::mem_fun(*this,&StateMirror_Context::update_axis_y)); - + options_table.show_all(); refresh_tool_options(); App::dialog_tool_options->present(); - - get_work_area()->allow_layer_clicks=true; + + get_work_area()->set_allow_layer_clicks(true); get_work_area()->set_duck_dragger(duck_dragger_); // get_canvas_view()->work_area->set_cursor(Gdk::CROSSHAIR); @@ -215,7 +218,7 @@ StateMirror_Context::refresh_tool_options() } Smach::event_result -StateMirror_Context::event_refresh_tool_options(const Smach::event& x) +StateMirror_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; @@ -246,7 +249,7 @@ DuckDrag_Mirror::DuckDrag_Mirror(): #endif void -DuckDrag_Mirror::begin_duck_drag(Duckmatic* duckmatic, const sinfg::Vector& offset) +DuckDrag_Mirror::begin_duck_drag(Duckmatic* duckmatic, const synfig::Vector& /*offset*/) { @@ -265,11 +268,11 @@ DuckDrag_Mirror::begin_duck_drag(Duckmatic* duckmatic, const sinfg::Vector& offs void -DuckDrag_Mirror::duck_drag(Duckmatic* duckmatic, const sinfg::Vector& vector) +DuckDrag_Mirror::duck_drag(Duckmatic* duckmatic, const synfig::Vector& vector) { center=vector; int i; - + const DuckList selected_ducks(duckmatic->get_selected_ducks()); DuckList::const_iterator iter; for(i=0,iter=selected_ducks.begin();iter!=selected_ducks.end();++iter,i++) @@ -278,12 +281,12 @@ DuckDrag_Mirror::duck_drag(Duckmatic* duckmatic, const sinfg::Vector& vector) Vector p(positions[i]); //Point p((*iter)->get_trans_point()); - + if(axis==AXIS_X) p[0]=-(p[0]-center[0])+center[0]; if(axis==AXIS_Y) p[1]=-(p[1]-center[1])+center[1]; - + (*iter)->set_trans_point(p); } for(i=0,iter=selected_ducks.begin();iter!=selected_ducks.end();++iter,i++) @@ -292,12 +295,12 @@ DuckDrag_Mirror::duck_drag(Duckmatic* duckmatic, const sinfg::Vector& vector) Vector p(positions[i]); //Point p((*iter)->get_trans_point()); - + if(axis==AXIS_X) p[0]=-(p[0]-center[0])+center[0]; if(axis==AXIS_Y) p[1]=-(p[1]-center[1])+center[1]; - + (*iter)->set_trans_point(p); } }