Gtk::Adjustment adj_number_of_points;
Gtk::Adjustment adj_inner_tangent;
Gtk::Adjustment adj_outer_tangent;
+ Gtk::Adjustment adj_inner_width;
+ Gtk::Adjustment adj_outer_width;
+ Gtk::Adjustment adj_radius_ratio;
Gtk::Adjustment adj_angle_offset;
Gtk::SpinButton spin_feather;
Gtk::SpinButton spin_number_of_points;
Gtk::SpinButton spin_inner_tangent;
Gtk::SpinButton spin_outer_tangent;
+ Gtk::SpinButton spin_inner_width;
+ Gtk::SpinButton spin_outer_width;
+ Gtk::SpinButton spin_radius_ratio;
Gtk::SpinButton spin_angle_offset;
Gtk::CheckButton checkbutton_invert;
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
Real get_outer_tangent()const { return adj_outer_tangent.get_value(); }
void set_outer_tangent(Real f) { adj_outer_tangent.set_value(f); }
+ Real get_inner_width()const { return adj_inner_width.get_value(); }
+ void set_inner_width(Real f) { adj_inner_width.set_value(f); }
+
+ Real get_outer_width()const { return adj_outer_width.get_value(); }
+ void set_outer_width(Real f) { adj_outer_width.set_value(f); }
+
+ Real get_radius_ratio()const { return adj_radius_ratio.get_value(); }
+ void set_radius_ratio(Real f) { adj_radius_ratio.set_value(f); }
+
Real get_angle_offset()const { return adj_angle_offset.get_value(); }
void set_angle_offset(Real f) { adj_angle_offset.set_value(f); }
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_outer_tangent(0);
+ if(settings.get_value("star.inner_width",value))
+ set_inner_width(atof(value.c_str()));
+ else
+ set_inner_width(1);
+
+ if(settings.get_value("star.outer_width",value))
+ set_outer_width(atof(value.c_str()));
+ else
+ set_outer_width(1);
+
+ if(settings.get_value("star.radius_ratio",value))
+ set_radius_ratio(atof(value.c_str()));
+ else
+ set_radius_ratio(0.5);
+
if(settings.get_value("star.angle_offset",value))
set_angle_offset(atof(value.c_str()));
else
else
set_layer_plant_flag(false);
- if(settings.get_value("star.layer_link_offsets",value) && value=="0")
- set_layer_link_offsets_flag(false);
+ if(settings.get_value("star.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("star.number_of_points",strprintf("%d",(int)(get_number_of_points() + 0.5)));
settings.set_value("star.inner_tangent",strprintf("%f",(float)get_inner_tangent()));
settings.set_value("star.outer_tangent",strprintf("%f",(float)get_outer_tangent()));
+ settings.set_value("star.inner_width",strprintf("%f",(float)get_inner_width()));
+ settings.set_value("star.outer_width",strprintf("%f",(float)get_outer_width()));
+ settings.set_value("star.radius_ratio",strprintf("%f",(float)get_radius_ratio()));
settings.set_value("star.angle_offset",strprintf("%f",(float)get_angle_offset()));
settings.set_value("star.invert",get_invert()?"1":"0");
settings.set_value("star.regular_polygon",get_regular_polygon()?"1":"0");
settings.set_value("star.layer_region",get_layer_region_flag()?"1":"0");
settings.set_value("star.layer_curve_gradient",get_layer_curve_gradient_flag()?"1":"0");
settings.set_value("star.layer_plant",get_layer_plant_flag()?"1":"0");
- settings.set_value("star.layer_link_offsets",get_layer_link_offsets_flag()?"1":"0");
+ settings.set_value("star.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_points(4,2,120,1,1,1), // value, lower, upper, step_increment, page_increment, page_size
- adj_inner_tangent(0,-3,3,.01,.1,.1),
- adj_outer_tangent(0,-3,10,.01,.1,.1),
- adj_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_points( 0, 2, 120, 1 , 1 ),
+ adj_inner_tangent( 0, -10, 10, 0.01, 0.1),
+ adj_outer_tangent( 0, -10, 10, 0.01, 0.1),
+ adj_inner_width( 0, -10, 10, 0.01, 0.1),
+ adj_outer_width( 0, -10, 10, 0.01, 0.1),
+ adj_radius_ratio( 0, -10, 10, 0.01, 0.1),
+ adj_angle_offset( 0, -360, 360, 0.1 , 1 ),
spin_feather(adj_feather,0.1,3),
spin_number_of_points(adj_number_of_points,1,0),
spin_inner_tangent(adj_inner_tangent,1,2),
spin_outer_tangent(adj_outer_tangent,1,2),
+ spin_inner_width(adj_inner_width,1,2),
+ spin_outer_width(adj_outer_width,1,2),
+ spin_radius_ratio(adj_radius_ratio,1,2),
spin_angle_offset(adj_angle_offset,1,1),
checkbutton_invert(_("Invert")),
checkbutton_regular_polygon(_("Regular Polygon")),
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;
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(_("Number of Points:"))), 0, 1, 13, 14, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
options_table.attach(spin_number_of_points, 1, 2, 13, 14, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
options_table.attach(*manage(new Gtk::Label(_("Inner Tangent:"))), 0, 1, 14, 15, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
options_table.attach(spin_inner_tangent, 1, 2, 14, 15, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
options_table.attach(*manage(new Gtk::Label(_("Outer Tangent:"))), 0, 1, 15, 16, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
options_table.attach(spin_outer_tangent, 1, 2, 15, 16, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(*manage(new Gtk::Label(_("Angle Offset:"))), 0, 1, 16, 17, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(spin_angle_offset, 1, 2, 16, 17, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(*manage(new Gtk::Label(_("Inner Width:"))), 0, 1, 16, 17, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(spin_inner_width, 1, 2, 16, 17, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(*manage(new Gtk::Label(_("Outer Width:"))), 0, 1, 17, 18, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(spin_outer_width, 1, 2, 17, 18, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(*manage(new Gtk::Label(_("Radius Ratio:"))), 0, 1, 18, 19, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(spin_radius_ratio, 1, 2, 18, 19, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(*manage(new Gtk::Label(_("Angle Offset:"))), 0, 1, 19, 20, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(spin_angle_offset, 1, 2, 19, 20, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
options_table.show_all();
const Point p1(transform.unperform(_p1));
const Point p2(transform.unperform(_p2));
+ Real radius_ratio(get_radius_ratio());
Real radius1((p2-p1).mag());
- Real radius2(radius1/2);
+ Real radius2(radius1 * radius_ratio);
int points = get_number_of_points();
Real inner_tangent = get_inner_tangent() * radius1;
Real outer_tangent = get_outer_tangent() * radius2;
+ Real inner_width = get_inner_width();
+ Real outer_width = get_outer_width();
Angle::deg offset(get_angle_offset());
bool regular(get_regular_polygon());
Angle::deg angle(360.0/points);
for (int i = 0; i < points; i++)
{
new_list.push_back(*(new BLinePoint));
- new_list[point].set_width(1);
+ new_list[point].set_width(outer_width);
new_list[point].set_vertex(Point(radius1*Angle::cos(angle*i + offset).get() + x,
radius1*Angle::sin(angle*i + offset).get() + y));
new_list[point++].set_tangent(Point(-Angle::sin(angle*i + offset).get(),
if (!regular)
{
new_list.push_back(*(new BLinePoint));
- new_list[point].set_width(1);
+ new_list[point].set_width(inner_width);
new_list[point].set_vertex(Point(radius2*Angle::cos(angle*i + angle/2 + offset).get() + x,
radius2*Angle::sin(angle*i + angle/2 + offset).get() + y));
new_list[point++].set_tangent(Point(-Angle::sin(angle*i + angle/2 + offset).get(),
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);
layer=get_canvas_interface()->add_layer_to("star",canvas,depth);
layer_selection.push_back(layer);
- layer->set_param("offset",p1);
- get_canvas_interface()->signal_layer_param_changed()(layer,"offset");
+ layer->set_param("origin",p1);
+ get_canvas_interface()->signal_layer_param_changed()(layer,"origin");
layer->set_param("radius1",(p2-p1).mag());
get_canvas_interface()->signal_layer_param_changed()(layer,"radius1");
}
}
- // 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))
}
}
- // 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))
}
}
- // 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))
}
}
- // 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