X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_bline.cpp;h=0a010f19484cbb1e7aea60f209dbaa09caf57575;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=f2ba41be011ca40b44a1ddfa4bf320f335727542;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/state_bline.cpp b/synfig-studio/trunk/src/gtkmm/state_bline.cpp index f2ba41b..0a010f1 100644 --- a/synfig-studio/trunk/src/gtkmm/state_bline.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_bline.cpp @@ -1,20 +1,22 @@ /* === S Y N F I G ========================================================= */ -/*! \file rotoscope_bline.cpp +/*! \file state_bline.cpp ** \brief Template File ** -** $Id: state_bline.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $ +** $Id$ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007, 2008 Chris Moore ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. ** \endlegal */ /* ========================================================================= */ @@ -49,6 +51,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -70,7 +74,7 @@ class studio::StateBLine_Context : public sigc::trackable { etl::handle canvas_view_; CanvasView::IsWorking is_working; - + bool prev_table_status; bool loop_; bool prev_workarea_layer_status_; @@ -81,14 +85,14 @@ class studio::StateBLine_Context : public sigc::trackable Gtk::Menu menu; Duckmatic::Push duckmatic_push; - + etl::handle curr_duck; etl::handle next_duck; - + std::list bline_point_list; synfigapp::Settings& settings; - + bool on_vertex_change(const synfig::Point &point, synfig::ValueNode_Const::Handle value_node); bool on_tangent1_change(const synfig::Point &point, synfig::ValueNode_Const::Handle value_node); bool on_tangent2_change(const synfig::Point &point, synfig::ValueNode_Const::Handle value_node); @@ -103,32 +107,36 @@ class studio::StateBLine_Context : public sigc::trackable void bline_delete_vertex(synfig::ValueNode_Const::Handle value_node); void bline_insert_vertex(synfig::ValueNode_Const::Handle value_node,float origin=0.5); void loop_bline(); + void unloop_bline(); void refresh_ducks(bool x=true); - + Gtk::Table options_table; Gtk::Entry entry_id; Gtk::CheckButton checkbutton_layer_region; - Gtk::CheckButton checkbutton_layer_bline; + 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_auto_export; Gtk::Button button_make; Gtk::Button button_clear; Gtk::Adjustment adj_feather; Gtk::SpinButton spin_feather; - - - + + + public: int layers_to_create()const { return - get_layer_region_flag()+ - get_layer_bline_flag()+ - get_layer_curve_gradient_flag(); + get_layer_region_flag() + + get_layer_outline_flag() + + get_layer_curve_gradient_flag() + + get_layer_plant_flag(); } - + void sanity_check() { if(layers_to_create()==0) @@ -137,16 +145,22 @@ public: 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); } - + 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_bline_flag()const { return checkbutton_layer_bline.get_active(); } - void set_layer_bline_flag(bool x) { return checkbutton_layer_bline.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_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); } + Real get_feather() const { return adj_feather.get_value(); } void set_feather(Real x) { return adj_feather.set_value(x); } synfig::String get_id()const { return entry_id.get_text(); } @@ -161,8 +175,8 @@ public: Smach::event_result event_mouse_motion_handler(const Smach::event& x); Smach::event_result event_refresh_tool_options(const Smach::event& x); - Smach::event_result event_hijack(const Smach::event& x) { return Smach::RESULT_ACCEPT; } - + Smach::event_result event_hijack(const Smach::event& /*x*/) { return Smach::RESULT_ACCEPT; } + void refresh_tool_options(); StateBLine_Context(CanvasView* canvas_view); @@ -174,7 +188,7 @@ public: synfig::Canvas::Handle get_canvas()const{return canvas_view_->get_canvas();} WorkArea * get_work_area()const{return canvas_view_->get_work_area();} const synfig::TransformStack& get_transform_stack()const { return canvas_view_->get_curr_transform_stack(); } - + void load_settings(); void save_settings(); void reset(); @@ -183,15 +197,15 @@ public: bool run_(); bool run(); - - 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; } - + }; // END of class StateBLine_Context @@ -209,7 +223,7 @@ StateBLine::StateBLine(): insert(event_def(EVENT_WORKAREA_MOUSE_MOTION,&StateBLine_Context::event_mouse_motion_handler)); insert(event_def(EVENT_WORKAREA_MOUSE_BUTTON_DRAG,&StateBLine_Context::event_mouse_motion_handler)); insert(event_def(EVENT_REFRESH_TOOL_OPTIONS,&StateBLine_Context::event_refresh_tool_options)); -} +} StateBLine::~StateBLine() { @@ -217,7 +231,7 @@ StateBLine::~StateBLine() void StateBLine_Context::load_settings() -{ +{ String value; if(settings.get_value("bline.layer_region",value) && value=="0") @@ -225,16 +239,26 @@ StateBLine_Context::load_settings() else set_layer_region_flag(true); - if(settings.get_value("bline.layer_bline",value) && value=="0") - set_layer_bline_flag(false); + if(settings.get_value("bline.layer_outline",value) && value=="0") + set_layer_outline_flag(false); else - set_layer_bline_flag(true); + set_layer_outline_flag(true); if(settings.get_value("bline.layer_curve_gradient",value) && value=="1") set_layer_curve_gradient_flag(true); else set_layer_curve_gradient_flag(false); + if(settings.get_value("bline.layer_plant",value) && value=="1") + set_layer_plant_flag(true); + else + set_layer_plant_flag(false); + + if(settings.get_value("bline.layer_link_offsets",value) && value=="0") + set_layer_link_offsets_flag(false); + else + set_layer_link_offsets_flag(true); + if(settings.get_value("bline.auto_export",value) && value=="1") set_auto_export_flag(true); else @@ -256,11 +280,13 @@ StateBLine_Context::load_settings() void StateBLine_Context::save_settings() -{ +{ sanity_check(); - settings.set_value("bline.layer_bline",get_layer_bline_flag()?"1":"0"); + settings.set_value("bline.layer_outline",get_layer_outline_flag()?"1":"0"); settings.set_value("bline.layer_region",get_layer_region_flag()?"1":"0"); settings.set_value("bline.layer_curve_gradient",get_layer_curve_gradient_flag()?"1":"0"); + settings.set_value("bline.layer_plant",get_layer_plant_flag()?"1":"0"); + settings.set_value("bline.layer_link_offsets",get_layer_link_offsets_flag()?"1":"0"); settings.set_value("bline.auto_export",get_auto_export_flag()?"1":"0"); settings.set_value("bline.id",get_id().c_str()); settings.set_value("bline.feather",strprintf("%f",get_feather())); @@ -280,23 +306,26 @@ StateBLine_Context::increment_id() String id(get_id()); int number=1; int digits=0; - + if(id.empty()) id="NewBLine"; - + // 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); synfig::info("---------------- \"%s\"",str_number.c_str()); - + number=atoi(str_number.c_str()); } else @@ -304,15 +333,15 @@ StateBLine_Context::increment_id() 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); } @@ -322,13 +351,15 @@ StateBLine_Context::StateBLine_Context(CanvasView* canvas_view): 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()), duckmatic_push(get_work_area()), settings(synfigapp::Main::get_selected_input_device()->settings()), entry_id(), checkbutton_layer_region(_("Fill")), - checkbutton_layer_bline(_("Outline")), + checkbutton_layer_outline(_("Outline")), checkbutton_layer_curve_gradient(_("Gradient")), + checkbutton_layer_plant(_("Plant")), + checkbutton_layer_link_offsets(_("Link Offsets")), checkbutton_auto_export(_("Auto Export")), button_make(_("Make")), button_clear(_("Clear")), @@ -336,40 +367,42 @@ StateBLine_Context::StateBLine_Context(CanvasView* canvas_view): spin_feather(adj_feather,0.01,4) { depth=-1; - no_egress_on_selection_change=false; + egress_on_selection_change=true; load_settings(); - + // Set up the tool options dialog - //options_table.attach(*manage(new Gtk::Label(_("BLine 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_region, 0, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - options_table.attach(checkbutton_layer_bline, 0, 2, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - options_table.attach(checkbutton_layer_curve_gradient, 0, 2, 4, 5, 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(checkbutton_auto_export, 0, 2, 11, 12, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - //options_table.attach(button_make, 0, 2, 5, 6, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + //options_table.attach(*manage(new Gtk::Label(_("BLine 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_outline, 0, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + options_table.attach(checkbutton_layer_region, 0, 2, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + options_table.attach(checkbutton_layer_plant, 0, 2, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + options_table.attach(checkbutton_layer_curve_gradient, 0, 2, 5, 6, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + options_table.attach(checkbutton_layer_link_offsets, 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(*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(button_make, 0, 2, 5, 6, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); //button_make.signal_pressed().connect(sigc::mem_fun(*this,&StateBLine_Context::run)); 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::StateBLine_Context::on_user_click)); get_canvas_view()->work_area->set_cursor(Gdk::CROSSHAIR); @@ -407,7 +440,7 @@ StateBLine_Context::refresh_tool_options() } Smach::event_result -StateBLine_Context::event_refresh_tool_options(const Smach::event& x) +StateBLine_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; @@ -423,17 +456,16 @@ StateBLine_Context::~StateBLine_Context() 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_); - // 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(); // get_canvas_view()->get_smach().process_event(EVENT_REFRESH_DUCKS); - + // Refresh the work area get_work_area()->queue_draw(); @@ -441,7 +473,7 @@ StateBLine_Context::~StateBLine_Context() } Smach::event_result -StateBLine_Context::event_stop_handler(const Smach::event& x) +StateBLine_Context::event_stop_handler(const Smach::event& /*x*/) { synfig::info("STATE RotoBLine: Received Stop Event"); // run(); @@ -452,7 +484,7 @@ StateBLine_Context::event_stop_handler(const Smach::event& x) } Smach::event_result -StateBLine_Context::event_refresh_handler(const Smach::event& x) +StateBLine_Context::event_refresh_handler(const Smach::event& /*x*/) { synfig::info("STATE RotoBLine: Received Refresh Event"); refresh_ducks(); @@ -488,7 +520,7 @@ StateBLine_Context::run_() next_duck=0; // Now we need to generate it - + if(bline_point_list.empty()) { return false; @@ -498,22 +530,22 @@ StateBLine_Context::run_() //get_canvas_view()->get_ui_interface()->error(_("You need at least two (2) points to create a BLine")); return false; } - + do - { - + { + // Create the action group synfigapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("New BLine")); std::vector new_list; std::list::iterator iter; const synfig::TransformStack& transform(get_transform_stack()); - + for(iter=bline_point_list.begin();iter!=bline_point_list.end();++iter) { BLinePoint bline_point((*iter)->get_value().get(BLinePoint())); Point new_vertex(transform.unperform(bline_point.get_vertex())); - + bline_point.set_tangent1( transform.unperform( bline_point.get_tangent1()+bline_point.get_vertex() @@ -525,19 +557,21 @@ StateBLine_Context::run_() bline_point.get_tangent2()+bline_point.get_vertex() ) -new_vertex ); - + bline_point.set_vertex(new_vertex); - + new_list.push_back(bline_point); } - + 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); + // Set the looping flag value_node_bline->set_loop(loop_); - + // Add the BLine to the canvas if(get_auto_export_flag() && !get_canvas_interface()->add_value_node(value_node_bline,get_id())) { @@ -547,9 +581,9 @@ StateBLine_Context::run_() throw String(_("Unable to add value node")); return false; } - + Layer::Handle layer; - + // we are temporarily using the layer to hold something layer=get_canvas_view()->get_selection_manager()->get_selected_layer(); @@ -562,146 +596,269 @@ StateBLine_Context::run_() } else depth=0; - + if(!canvas) canvas=get_canvas_view()->get_canvas(); synfigapp::SelectionManager::LayerList layer_selection; - - // If we were asked to create a region layer, go ahead and do so - if(get_layer_region_flag()) + + /////////////////////////////////////////////////////////////////////////// + // 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("region",canvas,depth)); + Layer::Handle layer(get_canvas_interface()->add_layer_to("curve_gradient",canvas,depth)); + assert(layer); layer_selection.push_back(layer); + layer->set_description(get_id()+_(" Gradient")); + get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description()); + + { + 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("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 false; + } + } + + if (get_layer_link_offsets_flag()) + { + 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"))) + synfig::error("LayerParamConnect didn't like \"param\""); + if(!action->set_param("value_node",ValueNode::Handle(value_node_offset))) + 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 false; + } + } + } + + /////////////////////////////////////////////////////////////////////////// + // 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)); assert(layer); - layer->set_description(get_id()+_(" Region")); + layer_selection.push_back(layer); + layer->set_description(get_id()+_(" Plant")); 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"); + 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("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 false; + } } - - if(get_layer_bline_flag()) - layer->set_param("color",synfigapp::Main::get_background_color()); - - 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("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)) + + // plants don't have offsets? + if (get_layer_link_offsets_flag()) { - //get_canvas_view()->get_ui_interface()->error(_("Unable to create Region layer")); - group.cancel(); - throw String(_("Unable to create Region layer")); - return false; + 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"))) + synfig::error("LayerParamConnect didn't like \"param\""); + if(!action->set_param("value_node",ValueNode::Handle(value_node_offset))) + 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 false; + } } } - // If we were asked to create a BLine layer, go ahead and do so - if(get_layer_bline_flag()) + /////////////////////////////////////////////////////////////////////////// + // 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("outline",canvas,depth)); + Layer::Handle layer(get_canvas_interface()->add_layer_to("region",canvas,depth)); + assert(layer); layer_selection.push_back(layer); - layer->set_description(get_id()+_(" Outline")); + 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"); } - - assert(layer); - - 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("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_layer_outline_flag()) + layer->set_param("color",synfigapp::Main::get_background_color()); - if(!get_canvas_interface()->get_instance()->perform_action(action)) + // I don't know if it's safe to reuse the same layer_param_connect action, so I'm + // using 2 separate ones. { - //get_canvas_view()->get_ui_interface()->error(_("Unable to create BLine layer")); - group.cancel(); - throw String(_("Unable to create Outline layer")); - return false; - } + 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("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 false; + } + } - /*if(get_layer_region_flag() && !get_auto_export_flag()) + if (get_layer_link_offsets_flag()) { - get_canvas_interface()->auto_export(synfigapp::ValueDesc(layer,"bline")); - }*/ + 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"))) + synfig::error("LayerParamConnect didn't like \"param\""); + if(!action->set_param("value_node",ValueNode::Handle(value_node_offset))) + 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 false; + } + } } + /////////////////////////////////////////////////////////////////////////// + // O U T L I N E + /////////////////////////////////////////////////////////////////////////// - - // If we were asked to create a CurveGradient layer, go ahead and do so - if(get_layer_curve_gradient_flag()) + if(get_layer_outline_flag()) { synfigapp::PushMode push_mode(get_canvas_interface(),synfigapp::MODE_NORMAL); - Layer::Handle layer(get_canvas_interface()->add_layer_to("curve_gradient",canvas,depth)); + Layer::Handle layer(get_canvas_interface()->add_layer_to("outline",canvas,depth)); + assert(layer); layer_selection.push_back(layer); - layer->set_description(get_id()+_(" Gradient")); + layer->set_description(get_id()+_(" Outline")); get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description()); - - assert(layer); - - - 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("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_feather()) + { + layer->set_param("feather",get_feather()); + get_canvas_interface()->signal_layer_param_changed()(layer,"feather"); + } - 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 false; - } + 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("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 false; + } + } - /*if(get_layer_region_flag() && !get_auto_export_flag()) + if (get_layer_link_offsets_flag()) { - get_canvas_interface()->auto_export(synfigapp::ValueDesc(layer,"bline")); - }*/ + 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"))) + synfig::error("LayerParamConnect didn't like \"param\""); + if(!action->set_param("value_node",ValueNode::Handle(value_node_offset))) + 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 false; + } + } } - no_egress_on_selection_change=true; + 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); - no_egress_on_selection_change=false; - + egress_on_selection_change=true; + //if(finish_bline_dialog.get_region_flag() || finish_bline_dialog.get_bline_flag()) // get_canvas_interface()->signal_dirty_preview()(); - + } while(0); reset(); @@ -713,7 +870,7 @@ Smach::event_result StateBLine_Context::event_mouse_motion_handler(const Smach::event& x) { const EventMouse& event(*reinterpret_cast(&x)); - + if(curr_duck) { //synfig::info("Moved Duck"); @@ -724,12 +881,12 @@ StateBLine_Context::event_mouse_motion_handler(const Smach::event& x) get_work_area()->queue_draw(); return Smach::RESULT_ACCEPT; } - + return Smach::RESULT_OK; } Smach::event_result -StateBLine_Context::event_mouse_release_handler(const Smach::event& x) +StateBLine_Context::event_mouse_release_handler(const Smach::event& /*x*/) { if(curr_duck) { @@ -758,16 +915,16 @@ StateBLine_Context::event_mouse_click_handler(const Smach::event& x) // If we are already looped up, then don't try to add anything else if(loop_) return Smach::RESULT_OK; - + BLinePoint bline_point; - + bline_point.set_vertex(get_work_area()->snap_point_to_grid(event.pos)); //bline_point.set_width(synfigapp::Main::get_bline_width()); bline_point.set_width(1.0f); bline_point.set_origin(0.5f); bline_point.set_split_tangent_flag(false); bline_point.set_tangent1(Vector(0,0)); - + // set the tangent /* if(bline_point_list.empty()) @@ -779,7 +936,7 @@ StateBLine_Context::event_mouse_click_handler(const Smach::event& x) const Vector t(event.pos-bline_point_list.back()->get_value().get(BLinePoint()).get_vertex()); bline_point.set_tangent1(t); } - + if(bline_point_list.size()>1) { std::list::iterator iter; @@ -790,17 +947,18 @@ StateBLine_Context::event_mouse_click_handler(const Smach::event& x) bline_point_list.back()->set_value(prev); }; */ - + bline_point_list.push_back(ValueNode_Const::create(bline_point)); - + refresh_ducks(); return Smach::RESULT_ACCEPT; } - - case BUTTON_RIGHT: // Intercept the right-button click to short-circut the pop-up menu - return Smach::RESULT_ACCEPT; - - default: + + case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu + if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS")) + return Smach::RESULT_ACCEPT; + + default: return Smach::RESULT_OK; } } @@ -810,7 +968,7 @@ StateBLine_Context::refresh_ducks(bool button_down) { get_work_area()->clear_ducks(); get_work_area()->queue_draw(); - + if(bline_point_list.empty()) return; @@ -819,7 +977,7 @@ StateBLine_Context::refresh_ducks(bool button_down) handle bezier; handle duck,tduck; BLinePoint bline_point; - + for(iter=bline_point_list.begin();iter!=bline_point_list.end();++iter) { ValueNode_Const::Handle value_node(*iter); @@ -827,7 +985,7 @@ StateBLine_Context::refresh_ducks(bool button_down) assert(value_node); - // First add the duck associated with this vertex + // First add the duck associated with this vertex duck=new WorkArea::Duck(bline_point.get_vertex()); duck->set_editable(true); duck->set_type(Duck::TYPE_VERTEX); @@ -840,7 +998,7 @@ StateBLine_Context::refresh_ducks(bool button_down) ); duck->set_guid(value_node->get_guid()^GUID::hasher(0)); - get_work_area()->add_duck(duck); + get_work_area()->add_duck(duck); // Add the tangent1 duck tduck=new WorkArea::Duck(bline_point.get_tangent1()); @@ -856,11 +1014,11 @@ StateBLine_Context::refresh_ducks(bool button_down) tduck->signal_user_click(2).connect( sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::popup_handle_menu),value_node) ); - + // See if we need to add that duck to the previous bezier if(bezier) { - get_work_area()->add_duck(tduck); + get_work_area()->add_duck(tduck); bezier->p2=duck; bezier->c2=tduck; @@ -874,22 +1032,22 @@ StateBLine_Context::refresh_ducks(bool button_down) ) ); - //get_work_area()->add_duck(bezier->c1); - //get_work_area()->add_duck(bezier->c2); + //get_work_area()->add_duck(bezier->c1); + //get_work_area()->add_duck(bezier->c2); get_work_area()->add_bezier(bezier); bezier=0; } - + // Now we see if we need to create a bezier list::iterator next(iter); next++; - + // If our next iterator is the end, then we don't need // to add a bezier. //if(next==bline_point_list.end() && !loop_) // continue; - + bezier=new WorkArea::Bezier(); // Add the tangent2 duck @@ -916,15 +1074,15 @@ StateBLine_Context::refresh_ducks(bool button_down) tduck->signal_user_click(2).connect( sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::popup_handle_menu),value_node) ); - + // Setup the next bezier bezier->p1=duck; bezier->c1=tduck; - get_work_area()->add_duck(tduck); + get_work_area()->add_duck(tduck); curr_duck=tduck; } - + // Add the loop, if requested if(bezier && loop_) { @@ -940,7 +1098,7 @@ StateBLine_Context::refresh_ducks(bool button_down) duck->signal_user_click(2).connect( sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::popup_vertex_menu),bline_point_list.front()) ); - get_work_area()->add_duck(duck); + get_work_area()->add_duck(duck); // Add the tangent1 duck tduck=new WorkArea::Duck(bline_point.get_tangent1()); @@ -955,8 +1113,8 @@ StateBLine_Context::refresh_ducks(bool button_down) tduck->signal_user_click(2).connect( sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::popup_handle_menu),bline_point_list.front()) ); - get_work_area()->add_duck(tduck); - + get_work_area()->add_duck(tduck); + bezier->p2=duck; bezier->c2=tduck; @@ -970,7 +1128,7 @@ StateBLine_Context::refresh_ducks(bool button_down) ) ); - //get_work_area()->add_duck(bezier->c1); + //get_work_area()->add_duck(bezier->c1); get_work_area()->add_bezier(bezier); } if(bezier && !loop_) @@ -990,16 +1148,16 @@ StateBLine_Context::refresh_ducks(bool button_down) bezier->p2=duck; bezier->c2=tduck; - get_work_area()->add_duck(bezier->p2); - //get_work_area()->add_duck(bezier->c2); + get_work_area()->add_duck(bezier->p2); + //get_work_area()->add_duck(bezier->c2); get_work_area()->add_bezier(bezier); duck->set_guid(GUID()); tduck->set_guid(GUID()); - + next_duck=duck; } - + if(!button_down) { if(curr_duck) @@ -1011,7 +1169,7 @@ StateBLine_Context::refresh_ducks(bool button_down) } } } - get_work_area()->queue_draw(); + get_work_area()->queue_draw(); } @@ -1054,18 +1212,30 @@ StateBLine_Context::loop_bline() } void +StateBLine_Context::unloop_bline() +{ + loop_=false; + + refresh_ducks(false); +} + +void StateBLine_Context::popup_vertex_menu(synfig::ValueNode_Const::Handle value_node) { menu.items().clear(); - if(!loop_ && value_node==bline_point_list.front()) + if(loop_) { - menu.items().push_back(Gtk::Menu_Helpers::MenuElem("Loop BLine", + menu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Unloop BLine"), + sigc::mem_fun(*this,&studio::StateBLine_Context::unloop_bline) + )); + } else { + menu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Loop BLine"), sigc::mem_fun(*this,&studio::StateBLine_Context::loop_bline) )); } - - menu.items().push_back(Gtk::Menu_Helpers::MenuElem("Delete Vertex", + + menu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Delete Vertex"), sigc::bind( sigc::mem_fun(*this,&studio::StateBLine_Context::bline_delete_vertex), value_node @@ -1080,7 +1250,7 @@ StateBLine_Context::popup_bezier_menu(float location, synfig::ValueNode_Const::H { menu.items().clear(); - menu.items().push_back(Gtk::Menu_Helpers::MenuElem("Insert Vertex", + menu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Insert Vertex"), sigc::bind( sigc::bind( sigc::mem_fun(*this,&studio::StateBLine_Context::bline_insert_vertex), @@ -1097,7 +1267,7 @@ void StateBLine_Context::bline_insert_vertex(synfig::ValueNode_Const::Handle value_node, float origin) { list::iterator iter; - + for(iter=bline_point_list.begin();iter!=bline_point_list.end();++iter) if(*iter==value_node) { @@ -1105,10 +1275,10 @@ StateBLine_Context::bline_insert_vertex(synfig::ValueNode_Const::Handle value_no --prev; BLinePoint bline_point; - + BLinePoint next_bline_point((*iter)->get_value().get(BLinePoint())); BLinePoint prev_bline_point; - + if(iter!=bline_point_list.begin()) { prev_bline_point=(*prev)->get_value().get(BLinePoint()); @@ -1134,7 +1304,7 @@ StateBLine_Context::bline_insert_vertex(synfig::ValueNode_Const::Handle value_no bline_point.set_tangent2(bline_point.get_tangent1()); bline_point.set_split_tangent_flag(false); bline_point.set_origin(origin); - + /* bline_point.set_vertex((next_bline_point.get_vertex()+prev_bline_point.get_vertex())*0.5); bline_point.set_width((next_bline_point.get_width()+prev_bline_point.get_width())*0.5); @@ -1149,17 +1319,17 @@ StateBLine_Context::bline_insert_vertex(synfig::ValueNode_Const::Handle value_no if(iter==bline_point_list.end()) { - get_canvas_view()->get_ui_interface()->error("Unable to find where to insert vertex, internal error, please report this bug"); + get_canvas_view()->get_ui_interface()->error(_("Unable to find where to insert vertex, internal error, please report this bug")); } - refresh_ducks(false); + refresh_ducks(false); } void StateBLine_Context::bline_delete_vertex(synfig::ValueNode_Const::Handle value_node) { list::iterator iter; - + for(iter=bline_point_list.begin();iter!=bline_point_list.end();++iter) if(*iter==value_node) { @@ -1168,10 +1338,10 @@ StateBLine_Context::bline_delete_vertex(synfig::ValueNode_Const::Handle value_no } if(iter==bline_point_list.end()) { - get_canvas_view()->get_ui_interface()->error("Unable to remove vertex, internal error, please report this bug"); + get_canvas_view()->get_ui_interface()->error(_("Unable to remove vertex, internal error, please report this bug")); } - refresh_ducks(false); + refresh_ducks(false); } void @@ -1182,14 +1352,14 @@ StateBLine_Context::popup_handle_menu(synfig::ValueNode_Const::Handle value_node BLinePoint bline_point(value_node->get_value().get(BLinePoint())); if(bline_point.get_split_tangent_flag()) - menu.items().push_back(Gtk::Menu_Helpers::MenuElem("Merge Tangents", + menu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Merge Tangents"), sigc::bind( sigc::mem_fun(*this,&studio::StateBLine_Context::bline_attach_handle), value_node ) )); else - menu.items().push_back(Gtk::Menu_Helpers::MenuElem("Split Tangents", + menu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Split Tangents"), sigc::bind( sigc::mem_fun(*this,&studio::StateBLine_Context::bline_detach_handle), value_node