From 00d3f64784330d389413303e9429245adf8c978c Mon Sep 17 00:00:00 2001 From: dooglus Date: Fri, 28 Nov 2008 12:31:41 +0000 Subject: [PATCH] After exporting an inline canvas, set the layer's parameter to be the new exported canvas valuenode. Also don't show 'export' as a context menu entry for canvases which have already been exported. git-svn-id: https://synfig.svn.sourceforge.net/svnroot/synfig@2298 1f10aa63-cdf2-0310-b900-c93c546f37ac --- .../trunk/src/synfigapp/actions/canvasadd.cpp | 2 +- .../src/synfigapp/actions/valuedescexport.cpp | 48 +++++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp index 0e53e76..b528e08 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp @@ -94,7 +94,7 @@ Action::CanvasAdd::set_param(const synfig::String& name, const Action::Param &pa { if(name=="src" && param.get_type()==Param::TYPE_CANVAS) { - if (param.get_canvas()) new_canvas=param.get_canvas()->clone(); + new_canvas=param.get_canvas(); return true; } diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp index 6461470..622e977 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp @@ -103,8 +103,22 @@ Action::ValueDescExport::is_candidate(const ParamList &x) if(candidate_check(get_param_vocab(),x)) { ValueDesc value_desc=x.find("value_desc")->second.get_value_desc(); - if(!value_desc || value_desc.parent_is_canvas() || (value_desc.is_value_node() && value_desc.get_value_node()->is_exported())) + if(!value_desc || + value_desc.parent_is_canvas() || + (value_desc.is_value_node() && value_desc.get_value_node()->is_exported()) || + (value_desc.get_value_type()==ValueBase::TYPE_CANVAS && value_desc.get_value_node())) + { +// if (!value_desc) +// synfig::info("%s:%d no export because no value_desc", __FILE__, __LINE__); +// else if (value_desc.parent_is_canvas()) +// synfig::info("%s:%d no export because parent is canvas", __FILE__, __LINE__); +// else if (value_desc.is_value_node() && value_desc.get_value_node()->is_exported()) +// synfig::info("%s:%d no export because exported value node", __FILE__, __LINE__); +// else if (value_desc.get_value_type()==ValueBase::TYPE_CANVAS && value_desc.is_value_node()) +// synfig::info("%s:%d no export because canvas value node", __FILE__, __LINE__); + return false; + } return true; } return false; @@ -151,6 +165,7 @@ Action::ValueDescExport::prepare() if(!value_desc.is_const()) throw Error(_("Can only export Canvas when used as constant parameter")); Canvas::Handle canvas(value_desc.get_value().get(Canvas::Handle())); + if (canvas) canvas=canvas->clone(); Action::Handle action(CanvasAdd::create()); @@ -165,6 +180,37 @@ Action::ValueDescExport::prepare() add_action_front(action); + if(value_desc.is_value_node()) + { + assert(0); // we shouldn't get here I don't think + if(value_desc.get_value_node()->is_exported()) + throw Error(_("ValueBase is already exported")); + + value_node=value_desc.get_value_node(); + } + else + { + // action: LayerParamConnect + if(!value_desc.parent_is_layer_param()) + throw Error(_("Unable to export parameter. (Bug?)")); + + value_node=ValueNode_Const::create(canvas); + + Action::Handle action(LayerParamConnect::create()); + + action->set_param("canvas",get_canvas()); + action->set_param("canvas_interface",get_canvas_interface()); + action->set_param("layer",value_desc.get_layer()); + action->set_param("param",value_desc.get_param_name()); + action->set_param("value_node",value_node); + + assert(action->is_ready()); + if(!action->is_ready()) + throw Error(Error::TYPE_NOTREADY); + + add_action_front(action); + } + return; } -- 2.7.4