Add inner and outer width options to the star tool.

git-svn-id: http://svn.voria.com/code@1996 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-studio/trunk/src/gtkmm/state_star.cpp b/synfig-studio/trunk/src/gtkmm/state_star.cpp
index 667c484..c299e3f 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_star.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_star.cpp
@@ -98,12 +98,16 @@ class studio::StateStar_Context : public sigc::trackable
        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;
 
@@ -144,6 +148,12 @@ public:
        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); }
 
@@ -259,6 +269,16 @@ StateStar_Context::load_settings()
        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
@@ -318,6 +338,8 @@ StateStar_Context::save_settings()
        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");
@@ -392,12 +414,16 @@ StateStar_Context::StateStar_Context(CanvasView* canvas_view):
        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_inner_width(1,-10,10,.01,.1,.1),
+       adj_outer_width(1,-10,10,.01,.1,.1),
        adj_radius_ratio(0.5,-10,10,.01,.1,.1), // value, lower, upper, step_increment, page_increment, page_size
        adj_angle_offset(0,-360,360,.1,1,1), // value, lower, upper, step_increment, page_increment, page_size
        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")),
@@ -432,10 +458,14 @@ StateStar_Context::StateStar_Context(CanvasView* canvas_view):
        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(_("Radius Ratio:"))),               0, 1, 16, 17, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
-       options_table.attach(spin_radius_ratio,                                                                 1, 2, 16, 17, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
-       options_table.attach(*manage(new Gtk::Label(_("Angle Offset:"))),               0, 1, 17, 18, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
-       options_table.attach(spin_angle_offset,                                                                 1, 2, 17, 18, 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();
 
@@ -551,6 +581,8 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2)
        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);
@@ -561,7 +593,7 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2)
        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(),
@@ -570,7 +602,7 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2)
                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(),