X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_smoothmove.cpp;h=a29f6f1875aff0dc21d5d546bc039680ec4df8e8;hb=e94afbea92edb78826bff981ddc84b0757b2550f;hp=f1f3fdbc8d6ddb4a2aa417f719d599f96b419eef;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp b/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp index f1f3fdb..a29f6f1 100644 --- a/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp @@ -1,8 +1,8 @@ /* === S Y N F I G ========================================================= */ -/*! \file state_smooth_move.cpp +/*! \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-2005 Robert B. Quattlebaum Jr., Adrian Bentley @@ -74,10 +74,10 @@ class DuckDrag_SmoothMove : public DuckDrag_Base 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 synfig::Vector& begin); @@ -85,16 +85,16 @@ public: 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; - + synfigapp::Settings& settings; etl::handle duck_dragger_; @@ -103,15 +103,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); @@ -126,7 +126,7 @@ public: 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 @@ -137,7 +137,7 @@ StateSmoothMove::StateSmoothMove(): Smach::state("smooth_move") { insert(event_def(EVENT_REFRESH_TOOL_OPTIONS,&StateSmoothMove_Context::event_refresh_tool_options)); -} +} StateSmoothMove::~StateSmoothMove() { @@ -145,7 +145,7 @@ StateSmoothMove::~StateSmoothMove() void StateSmoothMove_Context::load_settings() -{ +{ String value; if(settings.get_value("smooth_move.radius",value)) @@ -156,7 +156,7 @@ StateSmoothMove_Context::load_settings() void StateSmoothMove_Context::save_settings() -{ +{ settings.set_value("smooth_move.radius",strprintf("%f",get_radius())); } @@ -169,21 +169,21 @@ StateSmoothMove_Context::StateSmoothMove_Context(CanvasView* canvas_view): 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(*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(); @@ -204,7 +204,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; @@ -257,35 +257,43 @@ DuckDrag_SmoothMove::duck_drag(Duckmatic* duckmatic, const synfig::Vector& vecto const DuckList selected_ducks(duckmatic->get_selected_ducks()); DuckList::const_iterator iter; 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); } @@ -300,9 +308,9 @@ DuckDrag_SmoothMove::end_duck_drag(Duckmatic* duckmatic) 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)