X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_circle.cpp;h=b83431b7c70714987920e91c6f9e09ff0aeab4ba;hb=4a6b5f2e444558761c4e8afccaa61fb2c58ec593;hp=9cc9b4a5643ddb0d9cce66e1dd2386af5b59c125;hpb=8b41832930729fa5a89584fe9bcd91c45a454be2;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/state_circle.cpp b/synfig-studio/trunk/src/gtkmm/state_circle.cpp index 9cc9b4a..b83431b 100644 --- a/synfig-studio/trunk/src/gtkmm/state_circle.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_circle.cpp @@ -104,7 +104,9 @@ class studio::StateCircle_Context : public sigc::trackable 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; @@ -113,8 +115,8 @@ class studio::StateCircle_Context : public sigc::trackable 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; @@ -140,8 +142,10 @@ public: 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); } @@ -152,12 +156,12 @@ public: 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); } @@ -243,10 +247,12 @@ StateCircle_Context::load_settings() 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())); @@ -263,16 +269,16 @@ StateCircle_Context::load_settings() 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 @@ -304,12 +310,14 @@ StateCircle_Context::save_settings() { settings.set_value("circle.id",get_id()); settings.set_value("circle.fallofftype",strprintf("%d",get_falloff())); +#ifdef BLEND_METHOD_IN_TOOL_OPTIONS settings.set_value("circle.blend",strprintf("%d",get_blend())); +#endif // BLEND_METHOD_IN_TOOL_OPTIONS settings.set_value("circle.feather",strprintf("%f",(float)get_feather())); settings.set_value("circle.number_of_bline_points",strprintf("%d",(int)(get_number_of_bline_points() + 0.5))); settings.set_value("circle.bline_point_angle_offset",strprintf("%f",(float)get_bline_point_angle_offset())); - settings.set_value("circle.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"); @@ -381,8 +389,8 @@ StateCircle_Context::StateCircle_Context(CanvasView* canvas_view): 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")), @@ -391,8 +399,8 @@ StateCircle_Context::StateCircle_Context(CanvasView* canvas_view): { 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")) @@ -404,9 +412,11 @@ StateCircle_Context::StateCircle_Context(CanvasView* canvas_view): .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(); @@ -414,9 +424,11 @@ StateCircle_Context::StateCircle_Context(CanvasView* canvas_view): 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); @@ -582,8 +594,8 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) 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"); @@ -597,11 +609,19 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) 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"); + } } /////////////////////////////////////////////////////////////////////////// @@ -618,6 +638,11 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) 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); @@ -677,6 +702,11 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) 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); @@ -736,11 +766,16 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) 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()); @@ -803,11 +838,17 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2) 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"));