SigC::Connection process_queue_connection;
ValueNode_BLine::Handle last_stroke;
+ synfig::String last_stroke_id;
Gtk::Menu menu;
Gtk::CheckButton checkbutton_auto_loop; // whether to loop new strokes which start and end in the same place
Gtk::CheckButton checkbutton_auto_extend; // whether to extend existing lines
Gtk::CheckButton checkbutton_auto_link; // whether to link new ducks to existing ducks
- Gtk::CheckButton checkbutton_region_only;
+ Gtk::CheckButton checkbutton_region; // whether to create regions
+ Gtk::CheckButton checkbutton_outline; // whether to create outlines
Gtk::CheckButton checkbutton_auto_export;
Gtk::Button button_fill_last_stroke;
bool get_auto_link_flag()const { return checkbutton_auto_link.get_active(); }
void set_auto_link_flag(bool x) { return checkbutton_auto_link.set_active(x); }
- bool get_region_only_flag()const { return checkbutton_region_only.get_active(); }
- void set_region_only_flag(bool x) { return checkbutton_region_only.set_active(x); }
+ bool get_region_flag()const { return checkbutton_region.get_active(); }
+ void set_region_flag(bool x) { return checkbutton_region.set_active(x); }
+
+ bool get_outline_flag()const { return checkbutton_outline.get_active(); }
+ void set_outline_flag(bool x) { return checkbutton_outline.set_active(x); }
bool get_auto_export_flag()const { return checkbutton_auto_export.get_active(); }
void set_auto_export_flag(bool x) { return checkbutton_auto_export.set_active(x); }
else
set_auto_link_flag(true);
- if(settings.get_value("draw.region_only",value) && value=="1")
- set_region_only_flag(true);
+ if(settings.get_value("draw.region",value) && value=="0")
+ set_region_flag(false);
+ else
+ set_region_flag(true);
+
+ if(settings.get_value("draw.outline",value) && value=="0")
+ set_outline_flag(false);
else
- set_region_only_flag(false);
+ set_outline_flag(true);
if(settings.get_value("draw.auto_export",value) && value=="1")
set_auto_export_flag(true);
settings.set_value("draw.auto_loop",get_auto_loop_flag()?"1":"0");
settings.set_value("draw.auto_extend",get_auto_extend_flag()?"1":"0");
settings.set_value("draw.auto_link",get_auto_link_flag()?"1":"0");
- settings.set_value("draw.region_only",get_region_only_flag()?"1":"0");
+ settings.set_value("draw.region",get_region_flag()?"1":"0");
+ settings.set_value("draw.outline",get_outline_flag()?"1":"0");
settings.set_value("draw.auto_export",get_auto_export_flag()?"1":"0");
settings.set_value("draw.min_pressure",strprintf("%f",get_min_pressure()));
settings.set_value("draw.feather",strprintf("%f",get_feather()));
canvas_view_(canvas_view),
is_working(*canvas_view),
loop_(false),
- 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(),
checkbutton_pressure_width(_("Pressure Width")),
checkbutton_auto_loop(_("Auto Loop")),
checkbutton_auto_extend(_("Auto Extend")),
checkbutton_auto_link(_("Auto Link")),
- checkbutton_region_only(_("Create Region Only")),
+ checkbutton_region(_("Create Region")),
+ checkbutton_outline(_("Create Outline")),
checkbutton_auto_export(_("Auto Export")),
button_fill_last_stroke(_("Fill Last Stroke")),
adj_min_pressure(0,0,1,0.01,0.1),
UpdateErrorBox();
//options_table.attach(*manage(new Gtk::Label(_("Draw 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_pressure_width,0, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(checkbutton_auto_loop, 0, 2, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(checkbutton_auto_extend, 0, 2, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(checkbutton_auto_link, 0, 2, 5, 6, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(checkbutton_region_only, 0, 2, 6, 7, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(checkbutton_auto_export, 0, 2, 7, 8, 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_region, 0, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(checkbutton_outline, 0, 2, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(checkbutton_auto_loop, 0, 2, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(checkbutton_auto_extend, 0, 2, 5, 6, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(checkbutton_auto_link, 0, 2, 6, 7, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(checkbutton_auto_export, 0, 2, 7, 8, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(checkbutton_pressure_width, 0, 2, 8, 9, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(check_localerror, 0, 2, 9, 10, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(check_min_pressure, 0, 2, 8, 9, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(spin_min_pressure, 0, 2, 9, 10, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(check_min_pressure, 0, 1, 10, 11, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(spin_min_pressure, 1, 2, 10, 11, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(*manage(new Gtk::Label(_("Feather"))), 0, 1, 10, 11, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(spin_feather, 1, 2, 10, 11, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(*manage(new Gtk::Label(_("Smooth"))), 0, 1, 11, 12, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(spin_globalthres, 1, 2, 11, 12, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(check_localerror, 0, 2, 11, 12, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(*manage(new Gtk::Label(_("Smooth"))), 0, 1, 12, 13, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
- options_table.attach(spin_globalthres, 1, 2, 12, 13, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(*manage(new Gtk::Label(_("Feather"))), 0, 1, 12, 13, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ options_table.attach(spin_feather, 1, 2, 12, 13, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
//options_table.attach(button_fill_last_stroke, 0, 2, 13, 14, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
get_work_area()->set_type_mask(Duck::TYPE_ALL-Duck::TYPE_TANGENT-Duck::TYPE_WIDTH);
// Turn off layer clicking
- get_work_area()->allow_layer_clicks=false;
+ get_work_area()->set_allow_layer_clicks(false);
// Turn off duck clicking
- get_work_area()->allow_duck_clicks=false;
+ get_work_area()->set_allow_duck_clicks(false);
// clear out the ducks
//get_work_area()->clear_ducks();
}
Smach::event_result
-StateDraw_Context::event_refresh_tool_options(const Smach::event& x)
+StateDraw_Context::event_refresh_tool_options(const Smach::event& /*x*/)
{
refresh_tool_options();
return Smach::RESULT_ACCEPT;
get_canvas_view()->work_area->reset_cursor();
// Restore layer clicking
- get_work_area()->allow_layer_clicks=prev_workarea_layer_status_;
+ get_work_area()->set_allow_layer_clicks(prev_workarea_layer_status_);
// Restore duck clicking
- get_work_area()->allow_duck_clicks=true;
+ get_work_area()->set_allow_duck_clicks(true);
// Enable the time bar
get_canvas_view()->set_sensitive_timebar(true);
}
Smach::event_result
-StateDraw_Context::event_stop_handler(const Smach::event& x)
+StateDraw_Context::event_stop_handler(const Smach::event& /*x*/)
{
throw Smach::egress_exception();
}
Smach::event_result
-StateDraw_Context::event_refresh_handler(const Smach::event& x)
+StateDraw_Context::event_refresh_handler(const Smach::event& /*x*/)
{
refresh_ducks();
return Smach::RESULT_ACCEPT;
return Smach::RESULT_ACCEPT;
}
- case BUTTON_RIGHT: // Intercept the right-button click to short-circut the pop-up menu
+ case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
return Smach::RESULT_ACCEPT;
default:
bool extend_start=false,extend_finish=false,complete_loop=false;
bool extend_start_join_same=false,extend_start_join_different=false;
bool extend_finish_join_same=false,extend_finish_join_different=false;
- int start_duck_index,finish_duck_index;
+ int start_duck_index = 0,finish_duck_index = 0; // initialized to keep the compiler happy; shouldn't be needed though
ValueNode_BLine::Handle start_duck_value_node_bline=NULL,finish_duck_value_node_bline=NULL;
// Find any ducks at the start or end that we might attach to
- // (this used to only run if we aren't a loop - ie. !loop_bline_flag
+ // (this used to only run if we didn't just draw a loop - ie. !loop_bline_flag
// but having loops auto-connect can be useful as well)
if(get_auto_extend_flag() || get_auto_link_flag())
{
if(start_duck)do
{
if(!(start_duck_value_desc=start_duck->get_value_desc()))break;
- if(loop_bline_flag)break;
+ if(loop_bline_flag)break; // loops don't extend anything
if(!start_duck_value_desc.parent_is_value_node())break;
- start_duck_index=start_duck_value_desc.get_index();
+ start_duck_index=start_duck_value_desc.get_index(); // which point on the line did we start drawing at
start_duck_value_node_bline=ValueNode_BLine::Handle::cast_dynamic(start_duck_value_desc.get_parent_value_node());
if(!get_auto_extend_flag())break;
// don't extend looped blines
if(start_duck_value_node_bline&&!start_duck_value_node_bline->get_loop()&&
+ // did we start drawing at either end of the line?
(start_duck_index==0||start_duck_index==start_duck_value_node_bline->link_count()-1))
{
extend_start=true;
Smach::event_result result;
synfig::ValueNode_DynamicList::ListEntry source;
- int target_index;
// the new line's start extends an existing line
if(extend_start)
{
+ int target_offset = 0;
if(complete_loop)trans_bline.pop_back();
trans_bline.pop_front();
if(start_duck_index==0)
reverse_bline(trans_bline);
result=extend_bline_from_begin(start_duck_value_node_bline,trans_bline,complete_loop);
source=start_duck_value_node_bline->list.front();
- target_index=trans_bline.size()+finish_duck_index;
+ target_offset=trans_bline.size();
}
else
{
result=extend_bline_from_end(start_duck_value_node_bline,trans_bline,complete_loop);
source=start_duck_value_node_bline->list.back();
- target_index=finish_duck_index;
}
if(extend_start_join_different)
else if(extend_start_join_same)
LinkableValueNode::Handle::cast_dynamic(source.value_node)->
set_link(0,synfigapp::ValueDesc(LinkableValueNode::Handle::cast_dynamic(start_duck_value_node_bline->
- list[target_index].value_node),0).get_value_node());
+ list[target_offset+finish_duck_index].value_node),0).get_value_node());
return result;
}
// the new line's end extends an existing line
if(extend_finish)
- { // SPECIAL CASE -- EXTENSION
+ {
+ int target_offset = 0;
trans_bline.pop_back();
if(finish_duck_index==0)
{
result=extend_bline_from_begin(finish_duck_value_node_bline,trans_bline,false);
source=finish_duck_value_node_bline->list.front();
- target_index=trans_bline.size()+start_duck_index;
+ target_offset=trans_bline.size();
}
else
{ // We need to reverse the BLine first.
reverse_bline(trans_bline);
result=extend_bline_from_end(finish_duck_value_node_bline,trans_bline,false);
source=finish_duck_value_node_bline->list.back();
- target_index=start_duck_index;
}
if(extend_finish_join_different)
else if(extend_finish_join_same)
LinkableValueNode::Handle::cast_dynamic(source.value_node)->
set_link(0,synfigapp::ValueDesc(LinkableValueNode::Handle::cast_dynamic(finish_duck_value_node_bline->
- list[target_index].value_node),0).get_value_node());
+ list[target_offset+start_duck_index].value_node),0).get_value_node());
return result;
}
synfigapp::PushMode push_mode(get_canvas_interface(),synfigapp::MODE_NORMAL);
- if(get_region_only_flag())
+ // if they're both defined, we'll add the region later
+ if(get_outline_flag())
{
- layer=get_canvas_interface()->add_layer_to("region",canvas,depth);
- layer->set_description(get_id()+_(" Region"));
+ layer=get_canvas_interface()->add_layer_to("outline",canvas,depth);
+ layer->set_description(get_id()+_(" Outline"));
}
else
{
- layer=get_canvas_interface()->add_layer_to("outline",canvas,depth);
- layer->set_description(get_id()+_(" Outline"));
+ layer=get_canvas_interface()->add_layer_to("region",canvas,depth);
+ layer->set_description(get_id()+_(" Region"));
}
if(get_feather())
//refresh_ducks();
}
- increment_id();
last_stroke=value_node;
+ last_stroke_id=get_id();
+
+ if(get_outline_flag() && get_region_flag())
+ fill_last_stroke();
+
+ increment_id();
return Smach::RESULT_ACCEPT;
}
*/
// Remove duplicate vertices
- if(value_prev.get_value_node()==value_desc.get_value_node()
- || value_desc.get_value_node()==value_next.get_value_node())
+ if(value_prev.get_value_node()==value_desc.get_value_node() ||
+ value_desc.get_value_node()==value_next.get_value_node())
{
DEBUGPOINT();
vertex_list.erase(iter);
break;
}
- if(value_desc.parent_is_value_node() && value_next.parent_is_value_node())
- if(value_desc.get_parent_value_node()==value_next.get_parent_value_node() && (next!=vertex_list.end()))
- {
- // Fill in missing vertices
- if(value_desc.get_index()<value_next.get_index()-1)
- {
- DEBUGPOINT();
- vertex_list.insert(next,synfigapp::ValueDesc(value_desc.get_parent_value_node(),value_desc.get_index()+1));
- done=false;
- break;
- }
- if(value_next.get_index()<value_desc.get_index()-1)
- {
- DEBUGPOINT();
- vertex_list.insert(next,synfigapp::ValueDesc(value_desc.get_parent_value_node(),value_next.get_index()+1));
- done=false;
- break;
- }
- }
-
- // Ensure that connections
- // between blines are properly
- // connected
- if(value_desc.parent_is_value_node() && value_next.parent_is_value_node())
- if(value_desc.get_parent_value_node()!=value_next.get_parent_value_node() &&
- value_desc.get_value_node()!=value_next.get_value_node())
+ if (value_desc.parent_is_value_node() && value_next.parent_is_value_node())
{
- BLinePoint vertex(value_desc.get_value(get_time()).get(BLinePoint()));
- BLinePoint vertex_next(value_next.get_value(get_time()).get(BLinePoint()));
-
- //synfig::info("--------");
- //synfig::info(__FILE__":%d: vertex: [%f, %f]",__LINE__,vertex.get_vertex()[0],vertex.get_vertex()[1]);
- //synfig::info(__FILE__":%d: vertex_next: [%f, %f]",__LINE__,vertex_next.get_vertex()[0],vertex_next.get_vertex()[1]);
-
- if((vertex.get_vertex()-vertex_next.get_vertex()).mag_squared()<radius*radius)
+ if (value_desc.get_parent_value_node() == value_next.get_parent_value_node())
{
- DEBUGPOINT();
- ValueNode_Composite::Handle value_node;
- ValueNode_Composite::Handle value_node_next;
- value_node=ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node().clone());
- value_node_next=ValueNode_Composite::Handle::cast_dynamic(value_next.get_value_node().clone());
- if(!value_node || !value_node_next)
+ if (next != vertex_list.end())
{
- synfig::info(__FILE__":%d: Unable to properly connect blines.",__LINE__);
- continue;
+ // Fill in missing vertices
+ if(value_desc.get_index()<value_next.get_index()-1)
+ {
+ DEBUGPOINT();
+ vertex_list.insert(next,synfigapp::ValueDesc(value_desc.get_parent_value_node(),value_desc.get_index()+1));
+ done=false;
+ break;
+ }
+ if(value_next.get_index()<value_desc.get_index()-1)
+ {
+ DEBUGPOINT();
+ vertex_list.insert(next,synfigapp::ValueDesc(value_desc.get_parent_value_node(),value_next.get_index()+1));
+ done=false;
+ break;
+ }
}
- DEBUGPOINT();
- value_node->set_link(5,value_node_next->get_link(5));
- value_node->set_link(3,ValueNode_Const::create(true));
-
- get_canvas_interface()->auto_export(value_node);
- assert(value_node->is_exported());
- *iter=synfigapp::ValueDesc(get_canvas(),value_node->get_id());
- vertex_list.erase(next);
- done=false;
- break;
}
- else
+ // Ensure that connections between blines are properly connected
+ else if (value_desc.get_value_node() != value_next.get_value_node())
{
- DEBUGPOINT();
- bool positive_trend(value_desc.get_index()>value_prev.get_index());
+ BLinePoint vertex(value_desc.get_value(get_time()).get(BLinePoint()));
+ BLinePoint vertex_next(value_next.get_value(get_time()).get(BLinePoint()));
+
+ //synfig::info("--------");
+ //synfig::info(__FILE__":%d: vertex: [%f, %f]",__LINE__,vertex.get_vertex()[0],vertex.get_vertex()[1]);
+ //synfig::info(__FILE__":%d: vertex_next: [%f, %f]",__LINE__,vertex_next.get_vertex()[0],vertex_next.get_vertex()[1]);
- if(!positive_trend && value_desc.get_index()>0)
+ if((vertex.get_vertex()-vertex_next.get_vertex()).mag_squared()<radius*radius)
{
DEBUGPOINT();
- vertex_list.insert(next,synfigapp::ValueDesc(value_desc.get_parent_value_node(),value_desc.get_index()-1));
+ ValueNode_Composite::Handle value_node;
+ ValueNode_Composite::Handle value_node_next;
+ value_node=ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node().clone());
+ value_node_next=ValueNode_Composite::Handle::cast_dynamic(value_next.get_value_node().clone());
+ if(!value_node || !value_node_next)
+ {
+ synfig::info(__FILE__":%d: Unable to properly connect blines.",__LINE__);
+ continue;
+ }
+ DEBUGPOINT();
+ value_node->set_link(5,value_node_next->get_link(5));
+ value_node->set_link(3,ValueNode_Const::create(true));
+
+ get_canvas_interface()->auto_export(value_node);
+ assert(value_node->is_exported());
+ *iter=synfigapp::ValueDesc(get_canvas(),value_node->get_id());
+ vertex_list.erase(next);
done=false;
break;
}
- if(positive_trend && value_desc.get_index()<LinkableValueNode::Handle::cast_static(value_desc.get_value_node())->link_count()-1)
+ else
{
DEBUGPOINT();
- vertex_list.insert(next,synfigapp::ValueDesc(value_desc.get_parent_value_node(),value_desc.get_index()+1));
- done=false;
- break;
+ bool positive_trend(value_desc.get_index()>value_prev.get_index());
+
+ if(!positive_trend && value_desc.get_index()>0)
+ {
+ DEBUGPOINT();
+ vertex_list.insert(next,synfigapp::ValueDesc(value_desc.get_parent_value_node(),value_desc.get_index()-1));
+ done=false;
+ break;
+ }
+ if(positive_trend && value_desc.get_index()<LinkableValueNode::Handle::cast_static(value_desc.get_value_node())->link_count()-1)
+ {
+ DEBUGPOINT();
+ vertex_list.insert(next,synfigapp::ValueDesc(value_desc.get_parent_value_node(),value_desc.get_index()+1));
+ done=false;
+ break;
+ }
}
}
-
}
}
}
layer=get_canvas_interface()->add_layer("region");
assert(layer);
layer->set_param("color",synfigapp::Main::get_background_color());
+ layer->set_description(last_stroke_id + _(" Region"));
synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
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("segment_list")))
+ if(!action->set_param("param",String("bline")))
synfig::error("LayerParamConnect didn't like \"param\"");
if(!action->set_param("value_node",ValueNode::Handle(last_stroke)))
synfig::error("LayerParamConnect didn't like \"value_node\"");
projects / synfig.git / blobdiff