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::SpinButton spin_number_of_bline_points;
Gtk::SpinButton spin_bline_point_angle_offset;
- Gtk::CheckButton checkbutton_layer_circle;
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_offsets;
+ Gtk::CheckButton checkbutton_layer_link_origins;
public:
// this only counts the layers which use blines - they're the only
- // ones we link the offsets for
+ // ones we link the origins for
int layers_to_create()const
{
return
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); }
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_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_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_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_offsets_flag()const { return checkbutton_layer_link_offsets.get_active(); }
- void set_layer_link_offsets_flag(bool x) { return checkbutton_layer_link_offsets.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); }
void refresh_tool_options(); //to refresh the toolbox
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_bline_point_angle_offset(0);
- 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.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
else
set_layer_plant_flag(false);
- if(settings.get_value("circle.layer_link_offsets",value) && value=="0")
- set_layer_link_offsets_flag(false);
+ if(settings.get_value("circle.layer_link_origins",value) && value=="0")
+ set_layer_link_origins_flag(false);
else
- set_layer_link_offsets_flag(true);
+ set_layer_link_origins_flag(true);
}
void
{
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.layer_circle",get_layer_circle_flag()?"1":"0");
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_offsets",get_layer_link_offsets_flag()?"1":"0");
+ settings.set_value("circle.layer_link_origins",get_layer_link_origins_flag()?"1":"0");
}
void
duckmatic_push(get_work_area()),
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),
- adj_number_of_bline_points(4,2,120,1,1,1), // value, lower, upper, step_increment, page_increment, page_size
- adj_bline_point_angle_offset(0,-360,360,.1,1,1), // value, lower, upper, step_increment, page_increment, page_size
+ 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),
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_layer_circle(_("Create Circle")),
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_offsets(_("Link BLine Offsets"))
+ checkbutton_layer_link_origins(_("Link BLine Origins"))
{
egress_on_selection_change=true;
// 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);
+ 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);
enum_falloff.set_param_desc(ParamDesc("falloff")
.set_local_name(_("Falloff"))
.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();
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);
+#ifdef BLEND_METHOD_IN_TOOL_OPTIONS
options_table.attach(enum_blend, 0, 2, 5, 6, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(checkbutton_layer_circle, 0, 2, 6, 7, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(checkbutton_invert, 0, 2, 7, 8, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+#endif // BLEND_METHOD_IN_TOOL_OPTIONS
+ options_table.attach(checkbutton_invert, 0, 2, 6, 7, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(checkbutton_layer_circle, 0, 2, 7, 8, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
options_table.attach(checkbutton_layer_outline, 0, 2, 8, 9, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
options_table.attach(checkbutton_layer_region, 0, 2, 9, 10, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
options_table.attach(checkbutton_layer_plant, 0, 2, 10, 11, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
options_table.attach(checkbutton_layer_curve_gradient, 0, 2, 11, 12, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(checkbutton_layer_link_offsets, 0, 2, 12, 13, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(checkbutton_layer_link_origins, 0, 2, 12, 13, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
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);
// Refresh the work area
get_work_area()->queue_draw();
+ get_canvas_view()->queue_rebuild_ducks();
+
App::toolbox->refresh();
}
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
}
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));
ValueNode_BLine::Handle value_node_bline(ValueNode_BLine::create(new_list));
assert(value_node_bline);
- ValueNode_Const::Handle value_node_offset(ValueNode_Const::create(Vector()));
- assert(value_node_offset);
+ ValueNode_Const::Handle value_node_origin(ValueNode_Const::create(Vector()));
+ 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();
layer=get_canvas_interface()->add_layer_to("circle",canvas,depth);
layer_selection.push_back(layer);
- layer->set_param("pos",p1);
- get_canvas_interface()->signal_layer_param_changed()(layer,"pos");
+ layer->set_param("origin",p1);
+ get_canvas_interface()->signal_layer_param_changed()(layer,"origin");
layer->set_param("radius",(p2-p1).mag());
get_canvas_interface()->signal_layer_param_changed()(layer,"radius");
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());
+
+ if(get_layer_outline_flag())
+ {
+ layer->set_param("color",synfigapp::Main::get_background_color());
+ get_canvas_interface()->signal_layer_param_changed()(layer,"color");
+ }
}
///////////////////////////////////////////////////////////////////////////
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("layer_param_connect"));
assert(action);
}
}
- // only link the curve gradient's offset parameter if the option is selected and we're creating more than one layer
- if (get_layer_link_offsets_flag() && layers_to_create > 1)
+ // 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("layer_param_connect"));
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("offset")))
+ if(!action->set_param("param",String("origin")))
synfig::error("LayerParamConnect didn't like \"param\"");
- if(!action->set_param("value_node",ValueNode::Handle(value_node_offset)))
+ 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))
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("layer_param_connect"));
assert(action);
}
}
- // only link the plant's offset parameter if the option is selected and we're creating more than one layer
- if (get_layer_link_offsets_flag() && layers_to_create > 1)
+ // 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("layer_param_connect"));
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("offset")))
+ if(!action->set_param("param",String("origin")))
synfig::error("LayerParamConnect didn't like \"param\"");
- if(!action->set_param("value_node",ValueNode::Handle(value_node_offset)))
+ 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))
layer->set_description(get_id()+_(" Region"));
get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
- if(get_feather())
- {
- layer->set_param("feather",get_feather());
- get_canvas_interface()->signal_layer_param_changed()(layer,"feather");
- }
+#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");
if(get_layer_outline_flag())
layer->set_param("color",synfigapp::Main::get_background_color());
}
}
- // only link the region's offset parameter if the option is selected and we're creating more than one layer
- if (get_layer_link_offsets_flag() && layers_to_create > 1)
+ // 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("layer_param_connect"));
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("offset")))
+ if(!action->set_param("param",String("origin")))
synfig::error("LayerParamConnect didn't like \"param\"");
- if(!action->set_param("value_node",ValueNode::Handle(value_node_offset)))
+ 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))
layer_selection.push_back(layer);
layer->set_description(get_id()+_(" Outline"));
get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
- if(get_feather())
- {
- layer->set_param("feather",get_feather());
- get_canvas_interface()->signal_layer_param_changed()(layer,"feather");
- }
+
+#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("layer_param_connect"));
}
}
- // only link the outline's offset parameter if the option is selected and we're creating more than one layer
- if (get_layer_link_offsets_flag() && layers_to_create > 1)
+ // 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("layer_param_connect"));
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("offset")))
+ if(!action->set_param("param",String("origin")))
synfig::error("LayerParamConnect didn't like \"param\"");
- if(!action->set_param("value_node",ValueNode::Handle(value_node_offset)))
+ 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))
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();
return Smach::RESULT_ACCEPT;
projects / synfig.git / blobdiff