** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
** Copyright (c) 2007, 2008 Chris Moore
+** Copyright (c) 2009 Nikita Kitaev
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
# include <config.h>
#endif
+#include <gtkmm/dialog.h>
+#include <gtkmm/entry.h>
+
+#include <synfig/valuenode_animated.h>
+#include <synfig/valuenode_blinecalcvertex.h>
+#include <synfig/valuenode_composite.h>
+#include <synfig/valuenode_const.h>
+#include <synfig/valuenode_dynamiclist.h>
+#include <synfigapp/action_system.h>
+
#include "state_normal.h"
+#include "canvasview.h"
#include "workarea.h"
+#include "app.h"
+
+#include <synfigapp/action.h>
#include "event_mouse.h"
#include "event_layerclick.h"
#include "toolbox.h"
#include "dialog_tooloptions.h"
-#include <gtkmm/dialog.h>
-#include "widget_waypointmodel.h"
-#include <synfig/valuenode_animated.h>
-#include <synfig/valuenode_composite.h>
-#include <synfig/valuenode_const.h>
-#include "canvasview.h"
-#include "general.h"
+#include <gtkmm/optionmenu.h>
+#include "duck.h"
+#include <synfig/angle.h>
+#include <synfigapp/main.h>
+#include "general.h"
#endif
/* === U S I N G =========================================================== */
/* === M A C R O S ========================================================= */
+#ifndef EPSILON
+#define EPSILON 0.0000001
+#endif
+
+/* === G L O B A L S ======================================================= */
+
+StateNormal studio::state_normal;
+
/* === C L A S S E S & S T R U C T S ======================================= */
-class studio::StateNormal_Context : public sigc::trackable
+class DuckDrag_Combo : public DuckDrag_Base
{
- CanvasView *canvas_view;
+ synfig::Vector last_move;
+ synfig::Vector drag_offset;
+ synfig::Vector center;
+ synfig::Vector snap;
+
+ synfig::Angle original_angle;
+ synfig::Real original_mag;
+
+ std::vector<synfig::Vector> last_;
+ std::vector<synfig::Vector> positions;
- CanvasView* get_canvas_view() { return canvas_view; }
- Canvas::Handle get_canvas() { return canvas_view->get_canvas(); }
- WorkArea* get_work_area() { return canvas_view->get_work_area(); }
- etl::handle<synfigapp::CanvasInterface> get_canvas_interface() { return canvas_view->canvas_interface(); }
+
+ bool bad_drag;
+ bool move_only;
public:
- StateNormal_Context(CanvasView *canvas_view);
- ~StateNormal_Context();
+ CanvasView* canvas_view_;
+ bool scale;
+ bool rotate;
+ bool constrain;
+ DuckDrag_Combo();
+ void begin_duck_drag(Duckmatic* duckmatic, const synfig::Vector& begin);
+ bool end_duck_drag(Duckmatic* duckmatic);
+ void duck_drag(Duckmatic* duckmatic, const synfig::Vector& vector);
- Smach::event_result event_stop_handler(const Smach::event& x);
+ etl::handle<synfigapp::CanvasInterface> get_canvas_interface()const{return canvas_view_->canvas_interface();}
+};
- Smach::event_result event_refresh_handler(const Smach::event& x);
- Smach::event_result event_refresh_ducks_handler(const Smach::event& x);
+class studio::StateNormal_Context : public sigc::trackable
+{
+ CanvasView* canvas_view_;
- Smach::event_result event_undo_handler(const Smach::event& x);
+ synfigapp::Settings& settings;
- Smach::event_result event_redo_handler(const Smach::event& x);
+ sigc::connection keypress_connect;
+ sigc::connection keyrelease_connect;
- Smach::event_result event_mouse_button_down_handler(const Smach::event& x);
+ etl::handle<DuckDrag_Combo> duck_dragger_;
- Smach::event_result event_multiple_ducks_clicked_handler(const Smach::event& x);
+ Gtk::Table options_table;
- Smach::event_result event_refresh_tool_options(const Smach::event& x);
+ Gtk::CheckButton checkbutton_rotate;
+ Gtk::CheckButton checkbutton_scale;
+ Gtk::CheckButton checkbutton_constrain;
- Smach::event_result event_layer_click(const Smach::event& x);
+public:
- void edit_several_waypoints(std::list<synfigapp::ValueDesc> value_desc_list);
+ bool get_rotate_flag()const { return checkbutton_rotate.get_active(); }
+ void set_rotate_flag(bool x) { checkbutton_rotate.set_active(x); refresh_rotate_flag(); }
+ void refresh_rotate_flag() { if(duck_dragger_)duck_dragger_->rotate=get_rotate_flag(); }
- void refresh_tool_options();
-}; // END of class StateNormal_Context
+ bool get_scale_flag()const { return checkbutton_scale.get_active(); }
+ void set_scale_flag(bool x) { checkbutton_scale.set_active(x); refresh_scale_flag(); }
+ void refresh_scale_flag() { if(duck_dragger_)duck_dragger_->scale=get_scale_flag(); }
-/* === G L O B A L S ======================================================= */
+ bool get_constrain_flag()const { return checkbutton_constrain.get_active(); }
+ void set_constrain_flag(bool x) { checkbutton_constrain.set_active(x); refresh_constrain_flag(); }
+ void refresh_constrain_flag() { if(duck_dragger_)duck_dragger_->constrain=get_constrain_flag(); }
+
+ StateNormal_Context(CanvasView* canvas_view);
+
+ ~StateNormal_Context();
+
+ CanvasView* get_canvas_view()const{return canvas_view_;}
+ etl::handle<synfigapp::CanvasInterface> 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();
+
+ bool key_pressed(GdkEventKey *event);
+ bool key_released(GdkEventKey *event);
+
+ Smach::event_result event_stop_handler(const Smach::event& x);
+ Smach::event_result event_refresh_handler(const Smach::event& x);
+ Smach::event_result event_refresh_ducks_handler(const Smach::event& x);
+ Smach::event_result event_undo_handler(const Smach::event& x);
+ Smach::event_result event_redo_handler(const Smach::event& x);
+ Smach::event_result event_mouse_button_down_handler(const Smach::event& x);
+ Smach::event_result event_multiple_ducks_clicked_handler(const Smach::event& x);
+ Smach::event_result event_refresh_tool_options(const Smach::event& x);
+ void refresh_tool_options();
+ Smach::event_result event_layer_click(const Smach::event& x);
-StateNormal studio::state_normal;
-/* === P R O C E D U R E S ================================================= */
+}; // END of class StateNormal_Context
/* === M E T H O D S ======================================================= */
insert(event_def(EVENT_WORKAREA_MULTIPLE_DUCKS_CLICKED,&StateNormal_Context::event_multiple_ducks_clicked_handler));
insert(event_def(EVENT_REFRESH_TOOL_OPTIONS,&StateNormal_Context::event_refresh_tool_options));
insert(event_def(EVENT_WORKAREA_LAYER_CLICKED,&StateNormal_Context::event_layer_click));
+
}
StateNormal::~StateNormal()
{
}
-StateNormal_Context::StateNormal_Context(CanvasView *canvas_view):
- canvas_view(canvas_view)
+void
+StateNormal_Context::load_settings()
{
- // synfig::info("Entered Normal State");
+ String value;
+
+ if(settings.get_value("normal.rotate",value) && value=="1")
+ set_rotate_flag(true);
+ else
+ set_rotate_flag(false);
+
+ if(settings.get_value("normal.scale",value) && value=="1")
+ set_scale_flag(true);
+ else
+ set_scale_flag(false);
+
+ if(settings.get_value("normal.constrain",value) && value=="1")
+ set_constrain_flag(true);
+ else
+ set_constrain_flag(false);
+
}
-StateNormal_Context::~StateNormal_Context()
+void
+StateNormal_Context::save_settings()
{
- // synfig::info("Left Normal State");
+ settings.set_value("normal.rotate",get_rotate_flag()?"1":"0");
+ settings.set_value("normal.scale",get_scale_flag()?"1":"0");
+ settings.set_value("normal.constrain",get_constrain_flag()?"1":"0");
+}
+
+StateNormal_Context::StateNormal_Context(CanvasView* canvas_view):
+ canvas_view_(canvas_view),
+ settings(synfigapp::Main::get_selected_input_device()->settings()),
+ duck_dragger_(new DuckDrag_Combo()),
+ checkbutton_rotate(_("Rotate (Ctrl)")),
+ checkbutton_scale(_("Scale (Alt)")),
+ checkbutton_constrain(_("Constrain (Shift)"))
+{
+ duck_dragger_->canvas_view_=get_canvas_view();
+
+ // Set up the tool options dialog
+ options_table.attach(*manage(new Gtk::Label(_("Transform Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(checkbutton_rotate, 0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(checkbutton_scale, 0, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(checkbutton_constrain, 0, 2, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+
+ checkbutton_rotate.signal_toggled().connect(sigc::mem_fun(*this,&StateNormal_Context::refresh_rotate_flag));
+ checkbutton_scale.signal_toggled().connect(sigc::mem_fun(*this,&StateNormal_Context::refresh_scale_flag));
+ checkbutton_constrain.signal_toggled().connect(sigc::mem_fun(*this,&StateNormal_Context::refresh_constrain_flag));
+
+
+ options_table.show_all();
+ refresh_tool_options();
+ //App::dialog_tool_options->set_widget(options_table);
+ //App::dialog_tool_options->present();
+
+ get_work_area()->set_allow_layer_clicks(true);
+ get_work_area()->set_duck_dragger(duck_dragger_);
+
+ keypress_connect=get_work_area()->signal_key_press_event().connect(sigc::mem_fun(*this,&StateNormal_Context::key_pressed),false);
+ keyrelease_connect=get_work_area()->signal_key_release_event().connect(sigc::mem_fun(*this,&StateNormal_Context::key_released),false);
+
+ //these will segfault
+// get_work_area()->set_cursor(Gdk::CROSSHAIR);
+// get_work_area()->reset_cursor();
+
+ App::toolbox->refresh();
+
+ load_settings();
+ refresh_scale_flag();
+}
+
+bool
+StateNormal_Context::key_pressed(GdkEventKey *event)
+{
+ switch(event->keyval)
+ {
+ case GDK_Control_L:
+ case GDK_Control_R:
+ set_rotate_flag(true);
+ break;
+ case GDK_Alt_L:
+ case GDK_Alt_R:
+ set_scale_flag(true);
+ break;
+ case GDK_Shift_L:
+ case GDK_Shift_R:
+ set_constrain_flag(true);
+ break;
+ default:
+ break;
+ }
+ return false; //Pass on the event to other handlers, just in case
+}
+
+bool
+StateNormal_Context::key_released(GdkEventKey *event)
+{
+ switch(event->keyval)
+ {
+ case GDK_Control_L:
+ case GDK_Control_R:
+ set_rotate_flag(false);
+ break;
+ case GDK_Alt_L:
+ case GDK_Alt_R:
+ set_scale_flag(false);
+ break;
+ case GDK_Shift_L:
+ case GDK_Shift_R:
+ set_constrain_flag(false);
+ break;
+ default:
+ break;
+ }
+ return false; //Pass on the event to other handlers
}
void
StateNormal_Context::refresh_tool_options()
{
App::dialog_tool_options->clear();
+ App::dialog_tool_options->set_widget(options_table);
+ App::dialog_tool_options->set_local_name(_("Transform Tool"));
App::dialog_tool_options->set_name("normal");
}
+
+
+StateNormal_Context::~StateNormal_Context()
+{
+ save_settings();
+
+ get_work_area()->clear_duck_dragger();
+ get_work_area()->reset_cursor();
+
+ keypress_connect.disconnect();
+ keyrelease_connect.disconnect();
+
+ App::dialog_tool_options->clear();
+
+ App::toolbox->refresh();
+}
+
+DuckDrag_Combo::DuckDrag_Combo():
+ scale(false),
+ rotate(false),
+ constrain(false) // Lock aspect for scale; smooth move for translate
+{
+}
+
+void
+DuckDrag_Combo::begin_duck_drag(Duckmatic* duckmatic, const synfig::Vector& offset)
+{
+ last_move=Vector(1,1);
+
+ const DuckList selected_ducks(duckmatic->get_selected_ducks());
+ DuckList::const_iterator iter;
+
+ bad_drag=false;
+
+ drag_offset=duckmatic->find_duck(offset)->get_trans_point();
+
+ //snap=drag_offset-duckmatic->snap_point_to_grid(drag_offset);
+ //snap=offset-drag_offset_;
+ snap=Vector(0,0);
+
+ // Calculate center
+ Point vmin(100000000,100000000);
+ Point vmax(-100000000,-100000000);
+ //std::set<etl::handle<Duck> >::iterator iter;
+ positions.clear();
+ int i;
+ for(i=0,iter=selected_ducks.begin();iter!=selected_ducks.end();++iter,i++)
+ {
+ Point p((*iter)->get_trans_point());
+ vmin[0]=min(vmin[0],p[0]);
+ vmin[1]=min(vmin[1],p[1]);
+ vmax[0]=max(vmax[0],p[0]);
+ vmax[1]=max(vmax[1],p[1]);
+ positions.push_back(p);
+ }
+ center=(vmin+vmax)*0.5;
+ if((vmin-vmax).mag()<=EPSILON)
+ move_only=true;
+ else
+ move_only=false;
+
+
+ synfig::Vector vect(offset-center);
+ original_angle=Angle::tan(vect[1],vect[0]);
+ original_mag=vect.mag();
+}
+
+
+void
+DuckDrag_Combo::duck_drag(Duckmatic* duckmatic, const synfig::Vector& vector)
+{
+ if (!duckmatic) return;
+
+ if(bad_drag)
+ return;
+
+ //Override axis lock set in workarea when holding down the shift key
+ if (!move_only && (scale || rotate))
+ duckmatic->set_axis_lock(false);
+
+ synfig::Vector vect;
+ if (move_only || (!scale && !rotate))
+ vect= duckmatic->snap_point_to_grid(vector)-drag_offset+snap;
+ else
+ vect= duckmatic->snap_point_to_grid(vector)-center+snap;
+
+ last_move=vect;
+
+ const DuckList selected_ducks(duckmatic->get_selected_ducks());
+ DuckList::const_iterator iter;
+
+ Time time(duckmatic->get_time());
+
+ int i;
+ if( move_only || (!scale && !rotate) )
+ {
+ 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)
+ (*iter)->set_trans_point(positions[i]+vect, time);
+ }
+ 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)
+ (*iter)->set_trans_point(positions[i]+vect, time);
+ }
+ }
+
+ if (rotate)
+ {
+ Angle::deg angle(Angle::tan(vect[1],vect[0]));
+ angle=original_angle-angle;
+ if (constrain)
+ {
+ float degrees = angle.get()/15;
+ angle= Angle::deg (degrees>0?std::floor(degrees)*15:std::ceil(degrees)*15);
+ }
+ Real mag(vect.mag()/original_mag);
+ Real sine(Angle::sin(angle).get());
+ Real cosine(Angle::cos(angle).get());
+
+ 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;
+
+ Vector x(positions[i]-center),p;
+
+ p[0]=cosine*x[0]+sine*x[1];
+ p[1]=-sine*x[0]+cosine*x[1];
+ if(scale)p*=mag;
+ p+=center;
+ (*iter)->set_trans_point(p, time);
+ }
+ 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;
+
+ Vector x(positions[i]-center),p;
+
+ p[0]=cosine*x[0]+sine*x[1];
+ p[1]=-sine*x[0]+cosine*x[1];
+ if(scale)p*=mag;
+ p+=center;
+ (*iter)->set_trans_point(p, time);
+ }
+ } else if (scale)
+ {
+ if(!constrain)
+ {
+ if(abs(drag_offset[0]-center[0])>EPSILON)
+ vect[0]/=drag_offset[0]-center[0];
+ else
+ vect[0]=1;
+ if(abs(drag_offset[1]-center[1])>EPSILON)
+ vect[1]/=drag_offset[1]-center[1];
+ else
+ vect[1]=1;
+ }
+ else
+ {
+ //vect[0]=vect[1]=vect.mag()*0.707106781;
+ Real amount(vect.mag()/(drag_offset-center).mag());
+ vect[0]=vect[1]=amount;
+ }
+
+ if(vect[0]<EPSILON && vect[0]>-EPSILON)
+ vect[0]=1;
+ if(vect[1]<EPSILON && vect[1]>-EPSILON)
+ vect[1]=1;
+
+ 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;
+
+ Vector p(positions[i]-center);
+
+ p[0]*=vect[0];
+ p[1]*=vect[1];
+ p+=center;
+ (*iter)->set_trans_point(p, time);
+ }
+ 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;
+
+ Vector p(positions[i]-center);
+
+ p[0]*=vect[0];
+ p[1]*=vect[1];
+ p+=center;
+ (*iter)->set_trans_point(p, time);
+ }
+ }
+
+ // then patch up the tangents for the vertices we've moved
+ duckmatic->update_ducks();
+
+ last_move=vect;
+}
+
+bool
+DuckDrag_Combo::end_duck_drag(Duckmatic* duckmatic)
+{
+ if(bad_drag)return false;
+
+ //synfigapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("Rotate Ducks"));
+
+ if((last_move-Vector(1,1)).mag()>0.0001)
+ {
+ duckmatic->signal_edited_selected_ducks();
+ return true;
+ }
+ else
+ {
+ duckmatic->signal_user_click_selected_ducks(0);
+ return false;
+ }
+}
+
Smach::event_result
StateNormal_Context::event_refresh_tool_options(const Smach::event& /*x*/)
{
StateNormal_Context::event_stop_handler(const Smach::event& /*x*/)
{
// synfig::info("STATE NORMAL: Received Stop Event");
- canvas_view->stop();
+ canvas_view_->stop();
return Smach::RESULT_ACCEPT;
}
StateNormal_Context::event_refresh_handler(const Smach::event& /*x*/)
{
// synfig::info("STATE NORMAL: Received Refresh Event");
- canvas_view->rebuild_tables();
- canvas_view->work_area->queue_render_preview();
+ canvas_view_->rebuild_tables();
+ canvas_view_->work_area->queue_render_preview();
return Smach::RESULT_ACCEPT;
}
StateNormal_Context::event_refresh_ducks_handler(const Smach::event& /*x*/)
{
// synfig::info("STATE NORMAL: Received Refresh Ducks");
- canvas_view->queue_rebuild_ducks();
+ canvas_view_->queue_rebuild_ducks();
return Smach::RESULT_ACCEPT;
}
StateNormal_Context::event_undo_handler(const Smach::event& /*x*/)
{
// synfig::info("STATE NORMAL: Received Undo Event");
- canvas_view->get_instance()->undo();
+ canvas_view_->get_instance()->undo();
return Smach::RESULT_ACCEPT;
}
StateNormal_Context::event_redo_handler(const Smach::event& /*x*/)
{
// synfig::info("STATE NORMAL: Received Redo Event");
- canvas_view->get_instance()->redo();
+ canvas_view_->get_instance()->redo();
return Smach::RESULT_ACCEPT;
}
switch(event.button)
{
case BUTTON_RIGHT:
- canvas_view->popup_main_menu();
+ canvas_view_->popup_main_menu();
return Smach::RESULT_ACCEPT;
default:
return Smach::RESULT_OK;
{
case BUTTON_LEFT:
if(!(event.modifier&Gdk::CONTROL_MASK))
- canvas_view->get_selection_manager()->clear_selected_layers();
+ canvas_view_->get_selection_manager()->clear_selected_layers();
if(event.layer)
{
- std::list<Layer::Handle> layer_list(canvas_view->get_selection_manager()->get_selected_layers());
+ std::list<Layer::Handle> layer_list(canvas_view_->get_selection_manager()->get_selected_layers());
std::set<Layer::Handle> layers(layer_list.begin(),layer_list.end());
if(layers.count(event.layer))
{
layers.erase(event.layer);
layer_list=std::list<Layer::Handle>(layers.begin(),layers.end());
- canvas_view->get_selection_manager()->clear_selected_layers();
- canvas_view->get_selection_manager()->set_selected_layers(layer_list);
+ canvas_view_->get_selection_manager()->clear_selected_layers();
+ canvas_view_->get_selection_manager()->set_selected_layers(layer_list);
}
else
{
- canvas_view->get_selection_manager()->set_selected_layer(event.layer);
+ canvas_view_->get_selection_manager()->set_selected_layer(event.layer);
}
}
return Smach::RESULT_ACCEPT;
case BUTTON_RIGHT:
- canvas_view->popup_layer_menu(event.layer);
+ canvas_view_->popup_layer_menu(event.layer);
return Smach::RESULT_ACCEPT;
default:
return Smach::RESULT_OK;
value_desc_list.push_back(
synfigapp::ValueDesc(
ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node())
- ,0
+ ,ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node())
+ ->get_link_index_from_name("point")
)
);
}
Gtk::Menu *menu=manage(new Gtk::Menu());
menu->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), menu));
- canvas_view->get_instance()->make_param_menu(menu,canvas_view->get_canvas(),value_desc_list);
+ canvas_view_->get_instance()->make_param_menu(menu,canvas_view_->get_canvas(),value_desc_list);
/*
synfigapp::Action::ParamList param_list;
param_list=get_canvas_interface()->generate_param_list(value_desc_list);
- canvas_view->add_actions_to_menu(menu, param_list,synfigapp::Action::CATEGORY_VALUEDESC|synfigapp::Action::CATEGORY_VALUENODE);
+ canvas_view_->add_actions_to_menu(menu, param_list,synfigapp::Action::CATEGORY_VALUEDESC|synfigapp::Action::CATEGORY_VALUENODE);
menu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Edit Waypoints"),
sigc::bind(
return Smach::RESULT_ACCEPT;
}
+
+
projects / synfig.git / blobdiff