/*! \file state_circle.cpp
** \brief Template File
**
-** $Id: state_circle.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2008 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
#include <synfig/valuenode_dynamiclist.h>
#include <synfigapp/action_system.h>
+#include <synfig/valuenode_bline.h>
#include "state_circle.h"
#include "canvasview.h"
#include "widget_enum.h"
#include <synfigapp/main.h>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
{
etl::handle<CanvasView> canvas_view_;
CanvasView::IsWorking is_working;
-
+
Duckmatic::Push duckmatic_push;
-
+
Point point_holder;
-
+
etl::handle<Duck> point2_duck;
void refresh_ducks();
-
+
bool prev_workarea_layer_status_;
-
+
//Toolbox settings
synfigapp::Settings& settings;
-
+
//Toolbox display
Gtk::Table options_table;
-
+
Gtk::Entry entry_id; //what to name the layer
-
+
Widget_Enum enum_falloff;
+#ifdef BLEND_METHOD_IN_TOOL_OPTIONS
Widget_Enum enum_blend;
-
+#endif // BLEND_METHOD_IN_TOOL_OPTIONS
+
Gtk::Adjustment adj_feather;
+ Gtk::Adjustment adj_number_of_bline_points;
+ Gtk::Adjustment adj_bline_point_angle_offset;
Gtk::SpinButton spin_feather;
-
- Gtk::CheckButton check_invert;
-
+ Gtk::SpinButton spin_number_of_bline_points;
+ Gtk::SpinButton spin_bline_point_angle_offset;
+
+ Gtk::CheckButton checkbutton_invert;
+ Gtk::CheckButton checkbutton_layer_circle;
+ Gtk::CheckButton checkbutton_layer_region;
+ Gtk::CheckButton checkbutton_layer_outline;
+ Gtk::CheckButton checkbutton_layer_curve_gradient;
+ Gtk::CheckButton checkbutton_layer_plant;
+ Gtk::CheckButton checkbutton_layer_link_origins;
+ Gtk::CheckButton checkbutton_layer_origins_at_center;
+
public:
+ // this only counts the layers which will have their origins linked
+ int layers_to_create()const
+ {
+ return
+ (get_layer_circle_flag() && get_layer_origins_at_center_flag()) +
+ get_layer_region_flag() +
+ get_layer_outline_flag() +
+ get_layer_curve_gradient_flag() +
+ get_layer_plant_flag();
+ }
+
synfig::String get_id()const { return entry_id.get_text(); }
void set_id(const synfig::String& x) { return entry_id.set_text(x); }
int get_falloff()const { return enum_falloff.get_value(); }
void set_falloff(int x) { return enum_falloff.set_value(x); }
-
+
+#ifdef BLEND_METHOD_IN_TOOL_OPTIONS
int get_blend()const { return enum_blend.get_value(); }
void set_blend(int x) { return enum_blend.set_value(x); }
-
+#endif // BLEND_METHOD_IN_TOOL_OPTIONS
+
Real get_feather()const { return adj_feather.get_value(); }
void set_feather(Real f) { adj_feather.set_value(f); }
-
- bool get_invert()const { return check_invert.get_active(); }
- void set_invert(bool i) { check_invert.set_active(i); }
-
- void refresh_tool_options(); //to refresh the toolbox
+
+ Real get_number_of_bline_points()const { return adj_number_of_bline_points.get_value(); }
+ void set_number_of_bline_points(Real f) { adj_number_of_bline_points.set_value(f); }
+
+ Real get_bline_point_angle_offset()const { return adj_bline_point_angle_offset.get_value(); }
+ void set_bline_point_angle_offset(Real f) { adj_bline_point_angle_offset.set_value(f); }
+
+ bool get_invert()const { return checkbutton_invert.get_active(); }
+ void set_invert(bool i) { checkbutton_invert.set_active(i); }
+
+ bool get_layer_circle_flag()const { return checkbutton_layer_circle.get_active(); }
+ void set_layer_circle_flag(bool x) { return checkbutton_layer_circle.set_active(x); }
+
+ bool get_layer_region_flag()const { return checkbutton_layer_region.get_active(); }
+ void set_layer_region_flag(bool x) { return checkbutton_layer_region.set_active(x); }
+
+ bool get_layer_outline_flag()const { return checkbutton_layer_outline.get_active(); }
+ void set_layer_outline_flag(bool x) { return checkbutton_layer_outline.set_active(x); }
+
+ bool get_layer_curve_gradient_flag()const { return checkbutton_layer_curve_gradient.get_active(); }
+ void set_layer_curve_gradient_flag(bool x) { return checkbutton_layer_curve_gradient.set_active(x); }
+
+ bool get_layer_plant_flag()const { return checkbutton_layer_plant.get_active(); }
+ void set_layer_plant_flag(bool x) { return checkbutton_layer_plant.set_active(x); }
+
+ bool get_layer_link_origins_flag()const { return checkbutton_layer_link_origins.get_active(); }
+ void set_layer_link_origins_flag(bool x) { return checkbutton_layer_link_origins.set_active(x); }
+
+ bool get_layer_origins_at_center_flag()const { return checkbutton_layer_origins_at_center.get_active(); }
+ void set_layer_origins_at_center_flag(bool x) { return checkbutton_layer_origins_at_center.set_active(x); }
+
+ void refresh_tool_options(); //to refresh the toolbox
//events
Smach::event_result event_stop_handler(const Smach::event& x);
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();}
-
+
//Modifying settings etc.
void load_settings();
void save_settings();
void reset();
void increment_id();
- bool no_egress_on_selection_change;
- Smach::event_result event_layer_selection_changed_handler(const Smach::event& x)
+ bool egress_on_selection_change;
+ Smach::event_result event_layer_selection_changed_handler(const Smach::event& /*x*/)
{
- if(!no_egress_on_selection_change)
+ if(egress_on_selection_change)
throw Smach::egress_exception();
return Smach::RESULT_OK;
}
void make_circle(const Point& p1, const Point& p2);
-
-}; // END of class StateGradient_Context
+
+}; // END of class StateCircle_Context
/* === M E T H O D S ======================================================= */
insert(event_def(EVENT_WORKAREA_MOUSE_BUTTON_DRAG,&StateCircle_Context::event_mouse_click_handler));
insert(event_def(EVENT_WORKAREA_MOUSE_BUTTON_UP,&StateCircle_Context::event_mouse_click_handler));
insert(event_def(EVENT_REFRESH_TOOL_OPTIONS,&StateCircle_Context::event_refresh_tool_options));
-}
+}
StateCircle::~StateCircle()
{
void
StateCircle_Context::load_settings()
-{
+{
String value;
-
+
//parse the arguments yargh!
if(settings.get_value("circle.id",value))
set_id(value);
set_falloff(atoi(value.c_str()));
else
set_falloff(2);
-
+
+#ifdef BLEND_METHOD_IN_TOOL_OPTIONS
if(settings.get_value("circle.blend",value) && value != "")
set_blend(atoi(value.c_str()));
else
set_blend(0);//(int)Color::BLEND_COMPOSITE); //0 should be blend composites value
-
+#endif // BLEND_METHOD_IN_TOOL_OPTIONS
+
if(settings.get_value("circle.feather",value))
set_feather(atof(value.c_str()));
else
set_feather(0);
-
+
+ if(settings.get_value("circle.number_of_bline_points",value))
+ set_number_of_bline_points(atof(value.c_str()));
+ else
+ set_number_of_bline_points(4);
+
+ if(settings.get_value("circle.bline_point_angle_offset",value))
+ set_bline_point_angle_offset(atof(value.c_str()));
+ else
+ set_bline_point_angle_offset(0);
+
if(settings.get_value("circle.invert",value) && value != "0")
set_invert(true);
else
set_invert(false);
+
+ if(settings.get_value("circle.layer_circle",value) && value=="0")
+ set_layer_circle_flag(false);
+ else
+ set_layer_circle_flag(true);
+
+ if(settings.get_value("circle.layer_region",value) && value=="1")
+ set_layer_region_flag(true);
+ else
+ set_layer_region_flag(false);
+
+ if(settings.get_value("circle.layer_outline",value) && value=="1")
+ set_layer_outline_flag(true);
+ else
+ set_layer_outline_flag(false);
+
+ if(settings.get_value("circle.layer_curve_gradient",value) && value=="1")
+ set_layer_curve_gradient_flag(true);
+ else
+ set_layer_curve_gradient_flag(false);
+
+ if(settings.get_value("circle.layer_plant",value) && value=="1")
+ set_layer_plant_flag(true);
+ else
+ set_layer_plant_flag(false);
+
+ if(settings.get_value("circle.layer_link_origins",value) && value=="0")
+ set_layer_link_origins_flag(false);
+ else
+ set_layer_link_origins_flag(true);
+
+ if(settings.get_value("circle.layer_origins_at_center",value) && value=="0")
+ set_layer_origins_at_center_flag(false);
+ else
+ set_layer_origins_at_center_flag(true);
}
void
StateCircle_Context::save_settings()
-{
+{
settings.set_value("circle.id",get_id());
settings.set_value("circle.fallofftype",strprintf("%d",get_falloff()));
+#ifdef BLEND_METHOD_IN_TOOL_OPTIONS
settings.set_value("circle.blend",strprintf("%d",get_blend()));
+#endif // BLEND_METHOD_IN_TOOL_OPTIONS
settings.set_value("circle.feather",strprintf("%f",(float)get_feather()));
+ settings.set_value("circle.number_of_bline_points",strprintf("%d",(int)(get_number_of_bline_points() + 0.5)));
+ settings.set_value("circle.bline_point_angle_offset",strprintf("%f",(float)get_bline_point_angle_offset()));
settings.set_value("circle.invert",get_invert()?"1":"0");
+ settings.set_value("circle.layer_circle",get_layer_circle_flag()?"1":"0");
+ settings.set_value("circle.layer_outline",get_layer_outline_flag()?"1":"0");
+ settings.set_value("circle.layer_region",get_layer_region_flag()?"1":"0");
+ settings.set_value("circle.layer_curve_gradient",get_layer_curve_gradient_flag()?"1":"0");
+ settings.set_value("circle.layer_plant",get_layer_plant_flag()?"1":"0");
+ settings.set_value("circle.layer_link_origins",get_layer_link_origins_flag()?"1":"0");
+ settings.set_value("circle.layer_origins_at_center",get_layer_origins_at_center_flag()?"1":"0");
}
void
String id(get_id());
int number=1;
int digits=0;
-
+
if(id.empty())
id="Circle";
-
+
// If there is a number
// already at the end of the
// id, then remove it.
if(id[id.size()-1]<='9' && id[id.size()-1]>='0')
{
// figure out how many digits it is
- for(digits=0;(int)id.size()-1>=digits && id[id.size()-1-digits]<='9' && id[id.size()-1-digits]>='0';digits++)while(false);
-
+ for (digits = 0;
+ (int)id.size()-1 >= digits && id[id.size()-1-digits] <= '9' && id[id.size()-1-digits] >= '0';
+ digits++)
+ ;
+
String str_number;
str_number=String(id,id.size()-digits,id.size());
id=String(id,0,id.size()-digits);
-
+
number=atoi(str_number.c_str());
}
else
number=1;
digits=3;
}
-
+
number++;
-
+
// Add the number back onto the id
{
const String format(strprintf("%%0%dd",digits));
id+=strprintf(format.c_str(),number);
}
-
+
// Set the ID
set_id(id);
}
canvas_view_(canvas_view),
is_working(*canvas_view),
duckmatic_push(get_work_area()),
- prev_workarea_layer_status_(get_work_area()->allow_layer_clicks),
+ prev_workarea_layer_status_(get_work_area()->get_allow_layer_clicks()),
settings(synfigapp::Main::get_selected_input_device()->settings()),
- entry_id(),
- adj_feather(0,0,1,0.01,0.1),
+ entry_id(), // value lower upper step page
+ adj_feather( 0, 0, 1, 0.01, 0.1),
+ adj_number_of_bline_points( 0, 2, 120, 1 , 1 ),
+ adj_bline_point_angle_offset( 0, -360, 360, 0.1 , 1 ),
spin_feather(adj_feather,0.1,3),
- check_invert(_("Invert"))
+ spin_number_of_bline_points(adj_number_of_bline_points,1,0),
+ spin_bline_point_angle_offset(adj_bline_point_angle_offset,1,1),
+ checkbutton_invert(_("Invert")),
+ checkbutton_layer_circle(_("Create Circle Layer")),
+ checkbutton_layer_region(_("Create Region BLine")),
+ checkbutton_layer_outline(_("Create Outline BLine")),
+ checkbutton_layer_curve_gradient(_("Create Curve Gradient BLine")),
+ checkbutton_layer_plant(_("Create Plant BLine")),
+ checkbutton_layer_link_origins(_("Link Origins")),
+ checkbutton_layer_origins_at_center(_("BLine Origins at Center"))
{
- no_egress_on_selection_change=false;
- // Set up the tool options dialog
- //options_table.attach(*manage(new Gtk::Label(_("Circle Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(entry_id, 0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ egress_on_selection_change=true;
+ // Set up the tool options dialog
enum_falloff.set_param_desc(ParamDesc("falloff")
.set_local_name(_("Falloff"))
.set_description(_("Determines the falloff function for the feather"))
.add_enum_value(CIRCLE_SQRT,"sqrt",_("Square Root"))
.add_enum_value(CIRCLE_SIGMOND,"sigmond",_("Sigmond"))
.add_enum_value(CIRCLE_COSINE,"cosine",_("Cosine")));
-
+
+#ifdef BLEND_METHOD_IN_TOOL_OPTIONS
enum_blend.set_param_desc(ParamDesc(Color::BLEND_COMPOSITE,"blend_method")
.set_local_name(_("Blend Method"))
.set_description(_("Defines the blend method to be used for circles")));
-
+#endif // BLEND_METHOD_IN_TOOL_OPTIONS
+
load_settings();
- //feather stuff
- options_table.attach(*manage(new Gtk::Label(_("Feather:"))), 0, 1, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(spin_feather, 1, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(enum_falloff, 0, 2, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(enum_blend, 0, 2, 5, 6, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
-
+ options_table.attach(*manage(new Gtk::Label(_("Circle Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(entry_id, 0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+
+ options_table.attach(checkbutton_layer_circle, 0, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(checkbutton_layer_outline, 0, 2, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(checkbutton_layer_region, 0, 2, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(checkbutton_layer_plant, 0, 2, 5, 6, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(checkbutton_layer_curve_gradient, 0, 2, 6, 7, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(checkbutton_layer_link_origins, 0, 2, 7, 8, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(checkbutton_layer_origins_at_center, 0, 2, 8, 9, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+
//invert flag
- options_table.attach(check_invert, 0, 2, 6, 7, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
-
+ options_table.attach(checkbutton_invert, 0, 2, 9, 10, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+
+ options_table.attach(*manage(new Gtk::Label(_("Falloff:"))), 0, 1, 10, 11, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(enum_falloff, 1, 2, 10, 11, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+
+ //feather stuff
+ options_table.attach(*manage(new Gtk::Label(_("Feather:"))), 0, 1, 11, 12, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(spin_feather, 1, 2, 11, 12, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+
+#ifdef BLEND_METHOD_IN_TOOL_OPTIONS
+ options_table.attach(enum_blend, 0, 2, 12, 13, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+#endif // BLEND_METHOD_IN_TOOL_OPTIONS
+
+ options_table.attach(*manage(new Gtk::Label(_("BLine Points:"))), 0, 1, 13, 14, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(spin_number_of_bline_points, 1, 2, 13, 14, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+
+options_table.attach(*manage(new Gtk::Label(_("Point Angle Offset:"))), 0, 1, 14, 15, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(spin_bline_point_angle_offset, 1, 2, 14, 15, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+
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::StateCircle_Context::on_user_click));
get_canvas_view()->work_area->set_cursor(Gdk::CROSSHAIR);
}
Smach::event_result
-StateCircle_Context::event_refresh_tool_options(const Smach::event& x)
+StateCircle_Context::event_refresh_tool_options(const Smach::event& /*x*/)
{
refresh_tool_options();
return Smach::RESULT_ACCEPT;
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();
+ get_canvas_view()->queue_rebuild_ducks();
+
App::toolbox->refresh();
}
Smach::event_result
-StateCircle_Context::event_stop_handler(const Smach::event& x)
+StateCircle_Context::event_stop_handler(const Smach::event& /*x*/)
{
throw Smach::egress_exception();
}
Smach::event_result
-StateCircle_Context::event_refresh_handler(const Smach::event& x)
+StateCircle_Context::event_refresh_handler(const Smach::event& /*x*/)
{
refresh_ducks();
return Smach::RESULT_ACCEPT;
synfigapp::PushMode push_mode(get_canvas_interface(),synfigapp::MODE_NORMAL);
Layer::Handle layer;
-
- Canvas::Handle canvas(get_canvas_view()->get_canvas());
+
+ Canvas::Handle canvas;
int depth(0);
-
+
// we are temporarily using the layer to hold something
layer=get_canvas_view()->get_selection_manager()->get_selected_layer();
if(layer)
canvas=layer->get_canvas();
}
+ synfigapp::SelectionManager::LayerList layer_selection;
+ if (!getenv("SYNFIG_TOOLS_CLEAR_SELECTION"))
+ layer_selection = get_canvas_view()->get_selection_manager()->get_selected_layers();
+
const synfig::TransformStack& transform(get_canvas_view()->get_curr_transform_stack());
const Point p1(transform.unperform(_p1));
const Point p2(transform.unperform(_p2));
-
- if(get_falloff() >= 0 && get_falloff() < CIRCLE_NUM_FALLOFF)
+
+ Real radius((p2-p1).mag());
+ int points = get_number_of_bline_points();
+ Angle::deg offset(get_bline_point_angle_offset());
+ Angle::deg angle(360.0/points);
+ Real tangent(4 * ((points == 2)
+ ? 1
+ : ((2 * Angle::cos(angle/2).get() - Angle::cos(angle).get() - 1) / Angle::sin(angle).get())));
+ Vector origin;
+ Real x, y;
+
+ if (get_layer_origins_at_center_flag())
+ {
+ x = y = 0;
+ origin = p1;
+ }
+ else
+ {
+ x = p1[0];
+ y = p1[1];
+ }
+
+ std::vector<BLinePoint> new_list;
+ for (int i = 0; i < points; i++)
+ {
+ new_list.push_back(*(new BLinePoint));
+ new_list[i].set_width(1);
+ new_list[i].set_vertex(Point(radius*Angle::cos(angle*i + offset).get() + x,
+ radius*Angle::sin(angle*i + offset).get() + y));
+ new_list[i].set_tangent(Point(-radius*tangent*Angle::sin(angle*i + offset).get(),
+ radius*tangent*Angle::cos(angle*i + offset).get()));
+ }
+
+ ValueNode_BLine::Handle value_node_bline(ValueNode_BLine::create(new_list));
+ assert(value_node_bline);
+
+ ValueNode_Const::Handle value_node_origin(ValueNode_Const::create(origin));
+ assert(value_node_origin);
+
+ // Set the looping flag
+ value_node_bline->set_loop(true);
+
+ if(!canvas)
+ canvas=get_canvas_view()->get_canvas();
+
+ value_node_bline->set_member_canvas(canvas);
+
+ // count how many layers we're going to be creating
+ int layers_to_create = this->layers_to_create();
+
+ ///////////////////////////////////////////////////////////////////////////
+ // C I R C L E
+ ///////////////////////////////////////////////////////////////////////////
+
+ if (get_layer_circle_flag() &&
+ get_falloff() >= 0 && get_falloff() < CIRCLE_NUM_FALLOFF)
{
-
layer=get_canvas_interface()->add_layer_to("circle",canvas,depth);
-
- layer->set_param("pos",p1);
- get_canvas_interface()->signal_layer_param_changed()(layer,"pos");
-
+ if (!layer)
+ {
+ get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+ group.cancel();
+ return;
+ }
+ layer_selection.push_back(layer);
+
layer->set_param("radius",(p2-p1).mag());
get_canvas_interface()->signal_layer_param_changed()(layer,"radius");
-
+
layer->set_param("falloff",get_falloff());
get_canvas_interface()->signal_layer_param_changed()(layer,"falloff");
-
+
layer->set_param("feather",get_feather());
get_canvas_interface()->signal_layer_param_changed()(layer,"feather");
layer->set_param("invert",get_invert());
get_canvas_interface()->signal_layer_param_changed()(layer,"invert");
-
+
+#ifdef BLEND_METHOD_IN_TOOL_OPTIONS
layer->set_param("blend_method",get_blend());
get_canvas_interface()->signal_layer_param_changed()(layer,"blend_method");
-
+#endif // BLEND_METHOD_IN_TOOL_OPTIONS
+
layer->set_description(get_id());
get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
- no_egress_on_selection_change=true;
- get_canvas_interface()->get_selection_manager()->clear_selected_layers();
- get_canvas_interface()->get_selection_manager()->set_selected_layer(layer);
- no_egress_on_selection_change=false;
+ // only link the circle's origin parameter if the option is selected, we're putting bline
+ // origins at their centers, and we're creating more than one layer
+ if (get_layer_link_origins_flag() && get_layer_origins_at_center_flag() && layers_to_create > 1)
+ {
+ synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
+ assert(action);
+
+ action->set_param("canvas",get_canvas());
+ action->set_param("canvas_interface",get_canvas_interface());
+ action->set_param("layer",layer);
+ if(!action->set_param("param",String("origin")))
+ synfig::error("LayerParamConnect didn't like \"param\"");
+ if(!action->set_param("value_node",ValueNode::Handle(value_node_origin)))
+ synfig::error("LayerParamConnect didn't like \"value_node\"");
+
+ if(!get_canvas_interface()->get_instance()->perform_action(action))
+ {
+ //get_canvas_view()->get_ui_interface()->error(_("Unable to create Circle layer"));
+ group.cancel();
+ throw String(_("Unable to create Circle layer"));
+ return;
+ }
+ }
+ else
+ {
+ layer->set_param("origin",p1);
+ get_canvas_interface()->signal_layer_param_changed()(layer,"origin");
+ }
+ }
+
+ ///////////////////////////////////////////////////////////////////////////
+ // C U R V E G R A D I E N T
+ ///////////////////////////////////////////////////////////////////////////
+
+ if(get_layer_curve_gradient_flag())
+ {
+ synfigapp::PushMode push_mode(get_canvas_interface(),synfigapp::MODE_NORMAL);
+
+ Layer::Handle layer(get_canvas_interface()->add_layer_to("curve_gradient",canvas,depth));
+ if (!layer)
+ {
+ get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+ group.cancel();
+ return;
+ }
+ layer_selection.push_back(layer);
+ layer->set_description(get_id()+_(" Gradient"));
+ get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
+
+#ifdef BLEND_METHOD_IN_TOOL_OPTIONS
+ layer->set_param("blend_method",get_blend());
+ get_canvas_interface()->signal_layer_param_changed()(layer,"blend_method");
+#endif // BLEND_METHOD_IN_TOOL_OPTIONS
+
+ {
+ synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
+ assert(action);
+
+ action->set_param("canvas",get_canvas());
+ action->set_param("canvas_interface",get_canvas_interface());
+ action->set_param("layer",layer);
+ if(!action->set_param("param",String("bline")))
+ synfig::error("LayerParamConnect didn't like \"param\"");
+ if(!action->set_param("value_node",ValueNode::Handle(value_node_bline)))
+ synfig::error("LayerParamConnect didn't like \"value_node\"");
+
+ if(!get_canvas_interface()->get_instance()->perform_action(action))
+ {
+ //get_canvas_view()->get_ui_interface()->error(_("Unable to create BLine layer"));
+ group.cancel();
+ throw String(_("Unable to create Gradient layer"));
+ return;
+ }
+ }
+
+ // only link the curve gradient's origin parameter if the option is selected and we're creating more than one layer
+ if (get_layer_link_origins_flag() && layers_to_create > 1)
+ {
+ synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
+ assert(action);
+
+ action->set_param("canvas",get_canvas());
+ action->set_param("canvas_interface",get_canvas_interface());
+ action->set_param("layer",layer);
+ if(!action->set_param("param",String("origin")))
+ synfig::error("LayerParamConnect didn't like \"param\"");
+ if(!action->set_param("value_node",ValueNode::Handle(value_node_origin)))
+ synfig::error("LayerParamConnect didn't like \"value_node\"");
+
+ if(!get_canvas_interface()->get_instance()->perform_action(action))
+ {
+ //get_canvas_view()->get_ui_interface()->error(_("Unable to create BLine layer"));
+ group.cancel();
+ throw String(_("Unable to create Gradient layer"));
+ return;
+ }
+ }
+ else
+ {
+ layer->set_param("origin",origin);
+ get_canvas_interface()->signal_layer_param_changed()(layer,"origin");
+ }
+ }
+
+ ///////////////////////////////////////////////////////////////////////////
+ // P L A N T
+ ///////////////////////////////////////////////////////////////////////////
+
+ if(get_layer_plant_flag())
+ {
+ synfigapp::PushMode push_mode(get_canvas_interface(),synfigapp::MODE_NORMAL);
+
+ Layer::Handle layer(get_canvas_interface()->add_layer_to("plant",canvas,depth));
+ if (!layer)
+ {
+ get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+ group.cancel();
+ return;
+ }
+ layer_selection.push_back(layer);
+ layer->set_description(get_id()+_(" Plant"));
+ get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
+
+#ifdef BLEND_METHOD_IN_TOOL_OPTIONS
+ layer->set_param("blend_method",get_blend());
+ get_canvas_interface()->signal_layer_param_changed()(layer,"blend_method");
+#endif // BLEND_METHOD_IN_TOOL_OPTIONS
+
+ {
+ synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
+ assert(action);
+
+ action->set_param("canvas",get_canvas());
+ action->set_param("canvas_interface",get_canvas_interface());
+ action->set_param("layer",layer);
+ if(!action->set_param("param",String("bline")))
+ synfig::error("LayerParamConnect didn't like \"param\"");
+ if(!action->set_param("value_node",ValueNode::Handle(value_node_bline)))
+ synfig::error("LayerParamConnect didn't like \"value_node\"");
+
+ if(!get_canvas_interface()->get_instance()->perform_action(action))
+ {
+ //get_canvas_view()->get_ui_interface()->error(_("Unable to create BLine layer"));
+ group.cancel();
+ throw String(_("Unable to create Plant layer"));
+ return;
+ }
+ }
+
+ // only link the plant's origin parameter if the option is selected and we're creating more than one layer
+ if (get_layer_link_origins_flag() && layers_to_create > 1)
+ {
+ synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
+ assert(action);
+
+ action->set_param("canvas",get_canvas());
+ action->set_param("canvas_interface",get_canvas_interface());
+ action->set_param("layer",layer);
+ if(!action->set_param("param",String("origin")))
+ synfig::error("LayerParamConnect didn't like \"param\"");
+ if(!action->set_param("value_node",ValueNode::Handle(value_node_origin)))
+ synfig::error("LayerParamConnect didn't like \"value_node\"");
+
+ if(!get_canvas_interface()->get_instance()->perform_action(action))
+ {
+ //get_canvas_view()->get_ui_interface()->error(_("Unable to create BLine layer"));
+ group.cancel();
+ throw String(_("Unable to create Plant layer"));
+ return;
+ }
+ }
+ else
+ {
+ layer->set_param("origin",origin);
+ get_canvas_interface()->signal_layer_param_changed()(layer,"origin");
+ }
+ }
+
+ ///////////////////////////////////////////////////////////////////////////
+ // R E G I O N
+ ///////////////////////////////////////////////////////////////////////////
+
+ if(get_layer_region_flag())
+ {
+ synfigapp::PushMode push_mode(get_canvas_interface(),synfigapp::MODE_NORMAL);
+
+ Layer::Handle layer(get_canvas_interface()->add_layer_to("region",canvas,depth));
+ if (!layer)
+ {
+ get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+ group.cancel();
+ return;
+ }
+ layer_selection.push_back(layer);
+ layer->set_description(get_id()+_(" Region"));
+ get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
+
+#ifdef BLEND_METHOD_IN_TOOL_OPTIONS
+ layer->set_param("blend_method",get_blend());
+ get_canvas_interface()->signal_layer_param_changed()(layer,"blend_method");
+#endif // BLEND_METHOD_IN_TOOL_OPTIONS
+
+ layer->set_param("feather",get_feather());
+ get_canvas_interface()->signal_layer_param_changed()(layer,"feather");
+
+ layer->set_param("invert",get_invert());
+ get_canvas_interface()->signal_layer_param_changed()(layer,"invert");
+
+ // I don't know if it's safe to reuse the same LayerParamConnect action, so I'm
+ // using 2 separate ones.
+ {
+ synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
+ assert(action);
+
+ action->set_param("canvas",get_canvas());
+ action->set_param("canvas_interface",get_canvas_interface());
+ action->set_param("layer",layer);
+ if(!action->set_param("param",String("bline")))
+ synfig::error("LayerParamConnect didn't like \"param\"");
+ if(!action->set_param("value_node",ValueNode::Handle(value_node_bline)))
+ synfig::error("LayerParamConnect didn't like \"value_node\"");
+
+ if(!get_canvas_interface()->get_instance()->perform_action(action))
+ {
+ //get_canvas_view()->get_ui_interface()->error(_("Unable to create Region layer"));
+ group.cancel();
+ throw String(_("Unable to create Region layer"));
+ return;
+ }
+ }
+
+ // only link the region's origin parameter if the option is selected and we're creating more than one layer
+ if (get_layer_link_origins_flag() && layers_to_create > 1)
+ {
+ synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
+ assert(action);
+
+ action->set_param("canvas",get_canvas());
+ action->set_param("canvas_interface",get_canvas_interface());
+ action->set_param("layer",layer);
+ if(!action->set_param("param",String("origin")))
+ synfig::error("LayerParamConnect didn't like \"param\"");
+ if(!action->set_param("value_node",ValueNode::Handle(value_node_origin)))
+ synfig::error("LayerParamConnect didn't like \"value_node\"");
+
+ if(!get_canvas_interface()->get_instance()->perform_action(action))
+ {
+ //get_canvas_view()->get_ui_interface()->error(_("Unable to create Region layer"));
+ group.cancel();
+ throw String(_("Unable to create Region layer"));
+ return;
+ }
+ }
+ else
+ {
+ layer->set_param("origin",origin);
+ get_canvas_interface()->signal_layer_param_changed()(layer,"origin");
+ }
}
-
+
+ ///////////////////////////////////////////////////////////////////////////
+ // O U T L I N E
+ ///////////////////////////////////////////////////////////////////////////
+
+ if (get_layer_outline_flag())
+ {
+ Layer::Handle layer(get_canvas_interface()->add_layer_to("outline",canvas,depth));
+ if (!layer)
+ {
+ get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+ group.cancel();
+ return;
+ }
+ layer_selection.push_back(layer);
+ layer->set_description(get_id()+_(" Outline"));
+ get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
+
+#ifdef BLEND_METHOD_IN_TOOL_OPTIONS
+ layer->set_param("blend_method",get_blend());
+ get_canvas_interface()->signal_layer_param_changed()(layer,"blend_method");
+#endif // BLEND_METHOD_IN_TOOL_OPTIONS
+
+ layer->set_param("feather",get_feather());
+ get_canvas_interface()->signal_layer_param_changed()(layer,"feather");
+
+ layer->set_param("invert",get_invert());
+ get_canvas_interface()->signal_layer_param_changed()(layer,"invert");
+
+ {
+ synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
+ assert(action);
+
+ action->set_param("canvas",get_canvas());
+ action->set_param("canvas_interface",get_canvas_interface());
+ action->set_param("layer",layer);
+ if(!action->set_param("param",String("bline")))
+ synfig::error("LayerParamConnect didn't like \"param\"");
+ if(!action->set_param("value_node",ValueNode::Handle(value_node_bline)))
+ synfig::error("LayerParamConnect didn't like \"value_node\"");
+
+ if(!get_canvas_interface()->get_instance()->perform_action(action))
+ {
+ //get_canvas_view()->get_ui_interface()->error(_("Unable to create BLine layer"));
+ group.cancel();
+ throw String(_("Unable to create Outline layer"));
+ return;
+ }
+ }
+
+ // only link the outline's origin parameter if the option is selected and we're creating more than one layer
+ if (get_layer_link_origins_flag() && layers_to_create > 1)
+ {
+ synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect"));
+ assert(action);
+
+ action->set_param("canvas",get_canvas());
+ action->set_param("canvas_interface",get_canvas_interface());
+ action->set_param("layer",layer);
+ if(!action->set_param("param",String("origin")))
+ synfig::error("LayerParamConnect didn't like \"param\"");
+ if(!action->set_param("value_node",ValueNode::Handle(value_node_origin)))
+ synfig::error("LayerParamConnect didn't like \"value_node\"");
+
+ if(!get_canvas_interface()->get_instance()->perform_action(action))
+ {
+ //get_canvas_view()->get_ui_interface()->error(_("Unable to create BLine layer"));
+ group.cancel();
+ throw String(_("Unable to create Outline layer"));
+ return;
+ }
+ }
+ else
+ {
+ layer->set_param("origin",origin);
+ get_canvas_interface()->signal_layer_param_changed()(layer,"origin");
+ }
+ }
+
+ egress_on_selection_change=false;
+ get_canvas_interface()->get_selection_manager()->clear_selected_layers();
+ get_canvas_interface()->get_selection_manager()->set_selected_layers(layer_selection);
+ egress_on_selection_change=true;
+
reset();
increment_id();
}
StateCircle_Context::event_mouse_click_handler(const Smach::event& x)
{
const EventMouse& event(*reinterpret_cast<const EventMouse*>(&x));
-
+
if(event.key==EVENT_WORKAREA_MOUSE_BUTTON_DOWN && event.button==BUTTON_LEFT)
{
point_holder=get_work_area()->snap_point_to_grid(event.pos);
point2_duck->set_radius(true);
point2_duck->set_scalar(-1);
point2_duck->set_type(Duck::TYPE_RADIUS);
+ point2_duck->set_hover(true);
get_work_area()->add_duck(point2_duck);
return Smach::RESULT_ACCEPT;
if(event.key==EVENT_WORKAREA_MOUSE_BUTTON_DRAG && event.button==BUTTON_LEFT)
{
+ if (!point2_duck) return Smach::RESULT_OK;
point2_duck->set_point(point_holder-get_work_area()->snap_point_to_grid(event.pos));
- get_work_area()->queue_draw();
+ get_work_area()->queue_draw();
return Smach::RESULT_ACCEPT;
}
if(event.key==EVENT_WORKAREA_MOUSE_BUTTON_UP && event.button==BUTTON_LEFT)
{
- make_circle(point_holder, get_work_area()->snap_point_to_grid(event.pos));
+ Point point(get_work_area()->snap_point_to_grid(event.pos));
+
+ if (App::restrict_radius_ducks)
+ {
+ if ((point[0] - point_holder[0]) < 0) point[0] = point_holder[0];
+ if ((point[1] - point_holder[1]) < 0) point[1] = point_holder[1];
+ }
+
+ make_circle(point_holder, point);
get_work_area()->clear_ducks();
return Smach::RESULT_ACCEPT;
}
projects / synfig.git / blobdiff