X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_circle.cpp;h=00c8d02fa3fd5cf58dd2c4268d79a3104366b5bf;hb=74c9d19d99ddb6fea06ba49660b031f968da1145;hp=fee0ed41202eb444bac050a72af9039fa9141b95;hpb=f54d573fc6c1fcc0ef7f9556ae02906380e436d5;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_circle.cpp b/synfig-studio/trunk/src/gtkmm/state_circle.cpp
index fee0ed4..00c8d02 100644
--- a/synfig-studio/trunk/src/gtkmm/state_circle.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_circle.cpp
@@ -130,6 +130,7 @@ public:
 	int layers_to_create()const
 	{
 		return
+			get_layer_circle_flag() +
 			get_layer_region_flag() +
 			get_layer_outline_flag() +
 			get_layer_curve_gradient_flag() +
@@ -395,7 +396,7 @@ StateCircle_Context::StateCircle_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;
 
@@ -563,15 +564,14 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2)
 	Real tangent(4 * ((points == 2)
 					  ? 1
 					  : ((2 * Angle::cos(angle/2).get() - Angle::cos(angle).get() - 1) / Angle::sin(angle).get())));
-	Real x(p1[0]), y(p1[1]);
 
 	std::vector<BLinePoint> new_list;
 	for (int i = 0; i < points; i++)
 	{
 		new_list.push_back(*(new BLinePoint));
 		new_list[i].set_width(1);
-		new_list[i].set_vertex(Point(radius*Angle::cos(angle*i + offset).get() + x,
-									 radius*Angle::sin(angle*i + offset).get() + y));
+		new_list[i].set_vertex(Point(radius*Angle::cos(angle*i + offset).get(),
+									 radius*Angle::sin(angle*i + offset).get()));
 		new_list[i].set_tangent(Point(-radius*tangent*Angle::sin(angle*i + offset).get(),
 									   radius*tangent*Angle::cos(angle*i + offset).get()));
 	}
@@ -579,7 +579,7 @@ StateCircle_Context::make_circle(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
@@ -601,6 +601,12 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2)
 		get_falloff() >= 0 && get_falloff() < CIRCLE_NUM_FALLOFF)
 	{
 		layer=get_canvas_interface()->add_layer_to("circle",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);
@@ -631,6 +637,34 @@ StateCircle_Context::make_circle(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 circle'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 Circle layer"));
+				group.cancel();
+				throw String(_("Unable to create Circle layer"));
+				return;
+			}
+		}
+		else
+		{
+			layer->set_param("origin",p1);
+			get_canvas_interface()->signal_layer_param_changed()(layer,"origin");
+		}
 	}
 
 	///////////////////////////////////////////////////////////////////////////
@@ -642,7 +676,12 @@ StateCircle_Context::make_circle(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());
@@ -695,6 +734,11 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2)
 				return;
 			}
 		}
+		else
+		{
+			layer->set_param("origin",p1);
+			get_canvas_interface()->signal_layer_param_changed()(layer,"origin");
+		}
 	}
 
 	///////////////////////////////////////////////////////////////////////////
@@ -706,7 +750,12 @@ StateCircle_Context::make_circle(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());
@@ -759,6 +808,11 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2)
 				return;
 			}
 		}
+		else
+		{
+			layer->set_param("origin",p1);
+			get_canvas_interface()->signal_layer_param_changed()(layer,"origin");
+		}
 	}
 
 	///////////////////////////////////////////////////////////////////////////
@@ -770,7 +824,12 @@ StateCircle_Context::make_circle(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());
@@ -834,6 +893,11 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2)
 				return;
 			}
 		}
+		else
+		{
+			layer->set_param("origin",p1);
+			get_canvas_interface()->signal_layer_param_changed()(layer,"origin");
+		}
 	}
 
 	///////////////////////////////////////////////////////////////////////////
@@ -843,7 +907,12 @@ StateCircle_Context::make_circle(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());
@@ -902,6 +971,11 @@ StateCircle_Context::make_circle(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;