X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcanvas.cpp;h=2bbb743366aed661dfc3dde7956999c420edee08;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=5b27e5940fc993c7e214913f30cca61c4353124b;hpb=a3497cc298f84064e55264320443be79547a02c1;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/canvas.cpp b/synfig-core/trunk/src/synfig/canvas.cpp
index 5b27e59..2bbb743 100644
--- a/synfig-core/trunk/src/synfig/canvas.cpp
+++ b/synfig-core/trunk/src/synfig/canvas.cpp
@@ -39,6 +39,7 @@
 #include "time.h"
 #include "context.h"
 #include "layer_pastecanvas.h"
+#include "loadcanvas.h"
 #include <sigc++/bind.h>
 
 #endif
@@ -51,6 +52,8 @@ namespace synfig { extern Canvas::Handle open_canvas(const String &filename, Str
 
 /* === M A C R O S ========================================================= */
 
+#define ALLOW_CLONE_NON_INLINE_CANVASES
+
 struct _CanvasCounter
 {
 	static int counter;
@@ -534,17 +537,16 @@ Canvas::surefind_canvas(const String &id, String &warnings)
 
 		Canvas::Handle external_canvas;
 
+		if(!is_absolute_path(file_name))
+			file_name = get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name;
+
 		// If the composition is already open, then use it.
 		if(externals_.count(file_name))
 			external_canvas=externals_[file_name];
 		else
 		{
 			String errors;
-			if(is_absolute_path(file_name))
-				external_canvas=open_canvas(file_name, errors, warnings);
-			else
-				external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name, errors, warnings);
-
+			external_canvas=open_canvas(file_name, errors, warnings);
 			if(!external_canvas)
 				throw runtime_error(errors);
 			externals_[file_name]=external_canvas;
@@ -621,17 +623,16 @@ Canvas::find_canvas(const String &id, String &warnings)const
 
 		Canvas::Handle external_canvas;
 
+		if(!is_absolute_path(file_name))
+			file_name = get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name;
+
 		// If the composition is already open, then use it.
 		if(externals_.count(file_name))
 			external_canvas=externals_[file_name];
 		else
 		{
 			String errors, warnings;
-			if(is_absolute_path(file_name))
-				external_canvas=open_canvas(file_name, errors, warnings);
-			else
-				external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name, errors, warnings);
-
+			external_canvas=open_canvas(file_name, errors, warnings);
 			if(!external_canvas)
 				throw runtime_error(errors);
 			externals_[file_name]=external_canvas;
@@ -780,7 +781,9 @@ Canvas::clone(const GUID& deriv_guid)const
 	{
 		name=get_id()+"_CLONE";
 
+#ifndef ALLOW_CLONE_NON_INLINE_CANVASES
 		throw runtime_error("Cloning of non-inline canvases is not yet supported");
+#endif	// ALLOW_CLONE_NON_INLINE_CANVASES
 	}
 
 	Handle canvas(new Canvas(name));
@@ -956,8 +959,24 @@ Canvas::set_file_name(const String &file_name)
 		parent()->set_file_name(file_name);
 	else
 	{
+		String old_name(file_name_);
 		file_name_=file_name;
-		signal_file_name_changed_();
+
+		// when a canvas is made, its name is ""
+		// then, before it's saved or even edited, it gets a name like "Synfig Animation 23", in the local language
+		// we don't want to register the canvas' filename in the canvas map until it gets a real filename
+		if (old_name != "")
+		{
+			file_name_=file_name;
+			std::map<synfig::String, etl::loose_handle<Canvas> >::iterator iter;
+			for(iter=get_open_canvas_map().begin();iter!=get_open_canvas_map().end();++iter)
+				if(iter->second==this)
+					break;
+			if (iter == get_open_canvas_map().end())
+				CanvasParser::register_canvas_in_map(this, file_name);
+			else
+				signal_file_name_changed_();
+		}
 	}
 }
 
@@ -1215,7 +1234,8 @@ synfig::optimize_layers(Time time, Context context, Canvas::Handle op_canvas, bo
 				!composite->reads_context())
 			{
 				Canvas::Handle sub_canvas(Canvas::create_inline(op_canvas));
-				sub_canvas->push_back(composite = composite->clone());
+				// don't use clone() because it re-randomizes the seeds of any random valuenodes
+				sub_canvas->push_back(composite = composite->simple_clone());
 				layer = Layer::create("PasteCanvas");
 				composite->set_description(strprintf("Wrapped clone of '%s'", composite->get_non_empty_description().c_str()));
 				layer->set_description(strprintf("PasteCanvas wrapper for '%s'", composite->get_non_empty_description().c_str()));
@@ -1363,3 +1383,26 @@ Canvas::rename_group(const String&old_name,const String&new_name)
 		(*iter)->add_to_group(new_name);
 	}
 }
+
+void
+Canvas::register_external_canvas(String file_name, Handle canvas)
+{
+	if(!is_absolute_path(file_name)) file_name = get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name;
+	externals_[file_name] = canvas;
+}
+
+#ifdef _DEBUG
+void
+Canvas::show_externals(String file, int line, String text) const
+{
+	printf("  .----- (externals for %lx '%s')\n  |  %s:%d %s\n", ulong(this), get_name().c_str(), file.c_str(), line, text.c_str());
+	std::map<String, Handle>::iterator iter;
+	for (iter = externals_.begin(); iter != externals_.end(); iter++)
+	{
+		synfig::String first(iter->first);
+		etl::loose_handle<Canvas> second(iter->second);
+		printf("  |    %40s : %lx (%d)\n", first.c_str(), ulong(&*second), second->count());
+	}
+	printf("  `-----\n\n");
+}
+#endif	// _DEBUG