X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_smoothmove.cpp;h=56ca977e768f93dfd42501d76c6fe6bdb45b3975;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=3cda4f89f7e12ab6c2cfca19efa617372c184334;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp b/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp index 3cda4f8..56ca977 100644 --- a/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp @@ -1,20 +1,22 @@ -/* === S I N F G =========================================================== */ -/*! \file state_smooth_move.cpp +/* === S Y N F I G ========================================================= */ +/*! \file state_smoothmove.cpp ** \brief Template File ** -** $Id: state_smoothmove.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 +** Copyright (c) 2008 Chris Moore ** -** 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,15 +33,15 @@ #include #include -#include -#include +#include +#include #include "state_smoothmove.h" #include "canvasview.h" #include "workarea.h" #include "app.h" -#include +#include #include "event_mouse.h" #include "event_layerclick.h" #include "toolbox.h" @@ -47,7 +49,9 @@ #include #include "duck.h" #include "onemoment.h" -#include +#include + +#include "general.h" #endif @@ -55,7 +59,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -70,31 +74,31 @@ class DuckDrag_SmoothMove : public DuckDrag_Base { float radius; - sinfg::Vector last_translate_; - sinfg::Vector drag_offset_; - sinfg::Vector snap; - - std::vector last_; - std::vector positions; - + synfig::Vector last_translate_; + synfig::Vector drag_offset_; + synfig::Vector snap; + + std::vector last_; + std::vector positions; + public: DuckDrag_SmoothMove(); - 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); void set_radius(float x) { radius=x; } - float get_radius()const { return radius; } + float get_radius()const { return radius; } }; class studio::StateSmoothMove_Context : public sigc::trackable { etl::handle canvas_view_; - + //Duckmatic::Push duckmatic_push; - - sinfgapp::Settings& settings; + + synfigapp::Settings& settings; etl::handle duck_dragger_; @@ -102,15 +106,15 @@ class studio::StateSmoothMove_Context : public sigc::trackable Gtk::Adjustment adj_radius; Gtk::SpinButton spin_radius; - + float pressure; - + public: float get_radius()const { return adj_radius.get_value(); } void set_radius(float x) { return adj_radius.set_value(x); } - + void refresh_radius() { duck_dragger_->set_radius(get_radius()*pressure); } - + Smach::event_result event_stop_handler(const Smach::event& x); Smach::event_result event_refresh_tool_options(const Smach::event& x); @@ -122,10 +126,10 @@ public: ~StateSmoothMove_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 StateSmoothMove_Context @@ -136,7 +140,7 @@ StateSmoothMove::StateSmoothMove(): Smach::state("smooth_move") { insert(event_def(EVENT_REFRESH_TOOL_OPTIONS,&StateSmoothMove_Context::event_refresh_tool_options)); -} +} StateSmoothMove::~StateSmoothMove() { @@ -144,7 +148,7 @@ StateSmoothMove::~StateSmoothMove() void StateSmoothMove_Context::load_settings() -{ +{ String value; if(settings.get_value("smooth_move.radius",value)) @@ -155,34 +159,33 @@ StateSmoothMove_Context::load_settings() void StateSmoothMove_Context::save_settings() -{ +{ settings.set_value("smooth_move.radius",strprintf("%f",get_radius())); } StateSmoothMove_Context::StateSmoothMove_Context(CanvasView* canvas_view): canvas_view_(canvas_view), // duckmatic_push(get_work_area()), - settings(sinfgapp::Main::get_selected_input_device()->settings()), + settings(synfigapp::Main::get_selected_input_device()->settings()), duck_dragger_(new DuckDrag_SmoothMove()), adj_radius(1,0,100000,0.01,0.1), spin_radius(adj_radius,0.1,3) { pressure=1.0f; - + // Set up the tool options dialog - //options_table.attach(*manage(new Gtk::Label(_("SmoothMove Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - - options_table.attach(*manage(new Gtk::Label(_("Radius"))), 0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - options_table.attach(spin_radius, 0, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + options_table.attach(*manage(new Gtk::Label(_("SmoothMove Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + options_table.attach(*manage(new Gtk::Label(_("Radius"))), 0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + options_table.attach(spin_radius, 0, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); spin_radius.signal_value_changed().connect(sigc::mem_fun(*this,&StateSmoothMove_Context::refresh_radius)); - + options_table.show_all(); refresh_tool_options(); //App::dialog_tool_options->set_widget(options_table); 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_); App::toolbox->refresh(); @@ -203,7 +206,7 @@ StateSmoothMove_Context::refresh_tool_options() } Smach::event_result -StateSmoothMove_Context::event_refresh_tool_options(const Smach::event& x) +StateSmoothMove_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; @@ -229,7 +232,7 @@ DuckDrag_SmoothMove::DuckDrag_SmoothMove():radius(1.0f) } void -DuckDrag_SmoothMove::begin_duck_drag(Duckmatic* duckmatic, const sinfg::Vector& offset) +DuckDrag_SmoothMove::begin_duck_drag(Duckmatic* duckmatic, const synfig::Vector& offset) { last_translate_=Vector(0,0); drag_offset_=duckmatic->find_duck(offset)->get_trans_point(); @@ -251,40 +254,48 @@ DuckDrag_SmoothMove::begin_duck_drag(Duckmatic* duckmatic, const sinfg::Vector& } void -DuckDrag_SmoothMove::duck_drag(Duckmatic* duckmatic, const sinfg::Vector& vector) +DuckDrag_SmoothMove::duck_drag(Duckmatic* duckmatic, const synfig::Vector& vector) { const DuckList selected_ducks(duckmatic->get_selected_ducks()); DuckList::const_iterator iter; - sinfg::Vector vect(duckmatic->snap_point_to_grid(vector)-drag_offset_+snap); - + synfig::Vector vect(duckmatic->snap_point_to_grid(vector)-drag_offset_+snap); + int i; - + + // process vertex and position ducks first for(i=0,iter=selected_ducks.begin();iter!=selected_ducks.end();++iter,i++) { - if(((*iter)->get_type()!=Duck::TYPE_VERTEX&&(*iter)->get_type()!=Duck::TYPE_POSITION))continue; + // skip this duck if it is NOT a vertex or a position + if (((*iter)->get_type() != Duck::TYPE_VERTEX && + (*iter)->get_type() != Duck::TYPE_POSITION)) + continue; Point p(positions[i]); float dist(1.0f-(p-drag_offset_).mag()/get_radius()); if(dist<0) dist=0; - + last_[i]=vect*dist; (*iter)->set_trans_point(p+last_[i]); } + // then process non vertex and non position ducks for(i=0,iter=selected_ducks.begin();iter!=selected_ducks.end();++iter,i++) { - if(!((*iter)->get_type()!=Duck::TYPE_VERTEX&&(*iter)->get_type()!=Duck::TYPE_POSITION))continue; + // skip this duck if it IS a vertex or a position + if (!((*iter)->get_type() != Duck::TYPE_VERTEX && + (*iter)->get_type() != Duck::TYPE_POSITION)) + continue; Point p(positions[i]); float dist(1.0f-(p-drag_offset_).mag()/get_radius()); if(dist<0) dist=0; - + last_[i]=vect*dist; (*iter)->set_trans_point(p+last_[i]); } - + last_translate_=vect; //snap=Vector(0,0); } @@ -292,16 +303,16 @@ DuckDrag_SmoothMove::duck_drag(Duckmatic* duckmatic, const sinfg::Vector& vector bool DuckDrag_SmoothMove::end_duck_drag(Duckmatic* duckmatic) { - //sinfg::info("end_duck_drag(): Diff= %f",last_translate_.mag()); + //synfig::info("end_duck_drag(): Diff= %f",last_translate_.mag()); if(last_translate_.mag()>0.0001) { const DuckList selected_ducks(duckmatic->get_selected_ducks()); DuckList::const_iterator iter; int i; - + smart_ptr wait;if(selected_ducks.size()>20)wait.spawn(); - + for(i=0,iter=selected_ducks.begin();iter!=selected_ducks.end();++iter,i++) { if(last_[i].mag()>0.0001)