X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_star.cpp;h=8b5c14f8dfba56c4b81e24b9efee766c8fd19915;hb=ab058f0ef6558002cc82022cc9d91d1cf5e8a88f;hp=24a50f6f86630cfe1c2a9860214d0fd0bf79f2ae;hpb=f54d573fc6c1fcc0ef7f9556ae02906380e436d5;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_star.cpp b/synfig-studio/trunk/src/gtkmm/state_star.cpp
index 24a50f6..8b5c14f 100644
--- a/synfig-studio/trunk/src/gtkmm/state_star.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_star.cpp
@@ -127,6 +127,7 @@ public:
 	int layers_to_create()const
 	{
 		return
+			get_layer_star_flag() +
 			get_layer_region_flag() +
 			get_layer_outline_flag() +
 			get_layer_curve_gradient_flag() +
@@ -433,7 +434,7 @@ StateStar_Context::StateStar_Context(CanvasView* canvas_view):
 	checkbutton_layer_outline(_("Create Outline BLine")),
 	checkbutton_layer_curve_gradient(_("Create Curve Gradient BLine")),
 	checkbutton_layer_plant(_("Create Plant BLine")),
-	checkbutton_layer_link_origins(_("Link BLine Origins"))
+	checkbutton_layer_link_origins(_("Link Origins"))
 {
 	egress_on_selection_change=true;
 
@@ -586,7 +587,6 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2)
 	Angle::deg offset(get_angle_offset());
 	bool regular(get_regular_polygon());
 	Angle::deg angle(360.0/points);
-	Real x(p1[0]), y(p1[1]);
 
 	std::vector<BLinePoint> new_list;
 	int point(0);
@@ -594,8 +594,8 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2)
 	{
 		new_list.push_back(*(new BLinePoint));
 		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_vertex(Point(radius1*Angle::cos(angle*i + offset).get(),
+									 radius1*Angle::sin(angle*i + offset).get()));
 		new_list[point++].set_tangent(Point(-Angle::sin(angle*i + offset).get(),
 											 Angle::cos(angle*i + offset).get()) * outer_tangent);
 
@@ -603,8 +603,8 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2)
 		{
 			new_list.push_back(*(new BLinePoint));
 			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_vertex(Point(radius2*Angle::cos(angle*i + angle/2 + offset).get(),
+											 radius2*Angle::sin(angle*i + angle/2 + offset).get()));
 			new_list[point++].set_tangent(Point(-Angle::sin(angle*i + angle/2 + offset).get(),
 												 Angle::cos(angle*i + angle/2 + offset).get()) * inner_tangent);
 		}
@@ -613,7 +613,7 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2)
 	ValueNode_BLine::Handle value_node_bline(ValueNode_BLine::create(new_list));
 	assert(value_node_bline);
 
-	ValueNode_Const::Handle value_node_origin(ValueNode_Const::create(Vector()));
+	ValueNode_Const::Handle value_node_origin(ValueNode_Const::create(p1));
 	assert(value_node_origin);
 
 	// Set the looping flag
@@ -634,15 +634,21 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2)
 	if (get_layer_star_flag())
 	{
 		layer=get_canvas_interface()->add_layer_to("star",canvas,depth);
+		if (!layer)
+		{
+			get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+			group.cancel();
+			return;
+		}
 		layer_selection.push_back(layer);
 
 		layer->set_param("origin",p1);
 		get_canvas_interface()->signal_layer_param_changed()(layer,"origin");
 
-		layer->set_param("radius1",(p2-p1).mag());
+		layer->set_param("radius1",radius1);
 		get_canvas_interface()->signal_layer_param_changed()(layer,"radius1");
 
-		layer->set_param("radius2",(p2-p1).mag()/2);
+		layer->set_param("radius2",radius2);
 		get_canvas_interface()->signal_layer_param_changed()(layer,"radius2");
 
 		layer->set_param("angle",offset);
@@ -668,6 +674,34 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2)
 			layer->set_param("color",synfigapp::Main::get_background_color());
 			get_canvas_interface()->signal_layer_param_changed()(layer,"color");
 		}
+
+		// only link the star'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("origin")))
+				synfig::error("LayerParamConnect didn't like \"param\"");
+			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))
+			{
+				//get_canvas_view()->get_ui_interface()->error(_("Unable to create Star layer"));
+				group.cancel();
+				throw String(_("Unable to create Star layer"));
+				return;
+			}
+		}
+		else
+		{
+			layer->set_param("origin",p1);
+			get_canvas_interface()->signal_layer_param_changed()(layer,"origin");
+		}
 	}
 
 	///////////////////////////////////////////////////////////////////////////
@@ -679,7 +713,12 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2)
 		synfigapp::PushMode push_mode(get_canvas_interface(),synfigapp::MODE_NORMAL);
 
 		Layer::Handle layer(get_canvas_interface()->add_layer_to("curve_gradient",canvas,depth));
-		assert(layer);
+		if (!layer)
+		{
+			get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+			group.cancel();
+			return;
+		}
 		layer_selection.push_back(layer);
 		layer->set_description(get_id()+_(" Gradient"));
 		get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
@@ -727,6 +766,11 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2)
 				return;
 			}
 		}
+		else
+		{
+			layer->set_param("origin",p1);
+			get_canvas_interface()->signal_layer_param_changed()(layer,"origin");
+		}
 	}
 
 	///////////////////////////////////////////////////////////////////////////
@@ -738,7 +782,12 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2)
 		synfigapp::PushMode push_mode(get_canvas_interface(),synfigapp::MODE_NORMAL);
 
 		Layer::Handle layer(get_canvas_interface()->add_layer_to("plant",canvas,depth));
-		assert(layer);
+		if (!layer)
+		{
+			get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+			group.cancel();
+			return;
+		}
 		layer_selection.push_back(layer);
 		layer->set_description(get_id()+_(" Plant"));
 		get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
@@ -786,6 +835,11 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2)
 				return;
 			}
 		}
+		else
+		{
+			layer->set_param("origin",p1);
+			get_canvas_interface()->signal_layer_param_changed()(layer,"origin");
+		}
 	}
 
 	///////////////////////////////////////////////////////////////////////////
@@ -797,7 +851,12 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2)
 		synfigapp::PushMode push_mode(get_canvas_interface(),synfigapp::MODE_NORMAL);
 
 		Layer::Handle layer(get_canvas_interface()->add_layer_to("region",canvas,depth));
-		assert(layer);
+		if (!layer)
+		{
+			get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+			group.cancel();
+			return;
+		}
 		layer_selection.push_back(layer);
 		layer->set_description(get_id()+_(" Region"));
 		get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
@@ -856,6 +915,11 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2)
 				return;
 			}
 		}
+		else
+		{
+			layer->set_param("origin",p1);
+			get_canvas_interface()->signal_layer_param_changed()(layer,"origin");
+		}
 	}
 
 	///////////////////////////////////////////////////////////////////////////
@@ -865,7 +929,12 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2)
 	if (get_layer_outline_flag())
 	{
 		Layer::Handle layer(get_canvas_interface()->add_layer_to("outline",canvas,depth));
-		assert(layer);
+		if (!layer)
+		{
+			get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+			group.cancel();
+			return;
+		}
 		layer_selection.push_back(layer);
 		layer->set_description(get_id()+_(" Outline"));
 		get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
@@ -919,6 +988,11 @@ StateStar_Context::make_star(const Point& _p1, const Point& _p2)
 				return;
 			}
 		}
+		else
+		{
+			layer->set_param("origin",p1);
+			get_canvas_interface()->signal_layer_param_changed()(layer,"origin");
+		}
 	}
 
 	egress_on_selection_change=false;