X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Ftool%2Fmain.cpp;h=1862f4b37af5f7b9a5652f48abb80831654ca174;hb=a33baad6f6c41d8c829d0b02509b99afc2fc7242;hp=64ac3824c840d18290f8b9aa3eda856094f6555c;hpb=bbb1a360a86824945bb920021889ca228796d330;p=synfig.git

diff --git a/synfig-core/trunk/src/tool/main.cpp b/synfig-core/trunk/src/tool/main.cpp
index 64ac382..1862f4b 100644
--- a/synfig-core/trunk/src/tool/main.cpp
+++ b/synfig-core/trunk/src/tool/main.cpp
@@ -258,6 +258,7 @@ struct Job
 
 	int quality;
 	bool sifout;
+	bool list_canvases;
 };
 
 typedef list<String> arg_list_t;
@@ -267,9 +268,7 @@ void guid_test()
 {
 	cout<<"GUID Test"<<endl;
 	for(int i=20;i;i--)
-	{
 		cout<<synfig::GUID().get_string()<<' '<<synfig::GUID().get_string()<<endl;
-	}
 }
 
 void signal_test_func()
@@ -330,9 +329,15 @@ void display_help(int amount)
 		Argument("--fps","<framerate>",_("Set the frame rate"));
 		Argument("--time","<time>",_("Render a single frame at <seconds>"));
 		Argument("--begin-time","<time>",_("Set the starting time"));
+		Argument("--start-time","<time>",_("Set the starting time"));
 		Argument("--end-time","<time>",_("Set the ending time"));
-		Argument("--dpi","<res>",_("Set the dots-per-inch"));
+		Argument("--dpi","<res>",_("Set the physical resolution (dots-per-inch)"));
+		Argument("--dpi-x","<res>",_("Set the physical X resolution (dots-per-inch)"));
+		Argument("--dpi-y","<res>",_("Set the physical Y resolution (dots-per-inch)"));
+
+		Argument("--list-canvases",NULL,_("List the exported canvases in the composition"));
 		Argument("--append","<filename>",_("Append layers in <filename> to composition"));
+
 		Argument("--layer-info","<layer>",_("Print out layer's description, parameter info, etc."));
 		Argument("--layers",NULL,_("Print out the list of available layers"));
 		Argument("--targets",NULL,_("Print out the list of available targets"));
@@ -382,7 +387,7 @@ int process_global_flags(arg_list_t &arg_list)
 		if(*iter == "--info")
 		{
 			cout<<PACKAGE"-"VERSION<<endl;
-			cout<<"Compiled on "__DATE__ " at "__TIME__;
+			cout<<"Compiled on "__DATE__ /* " at "__TIME__ */;
 #ifdef __GNUC__
 			cout<<" with GCC "<<__VERSION__;
 #endif
@@ -415,6 +420,11 @@ int process_global_flags(arg_list_t &arg_list)
 			Progress p(PACKAGE);
 			synfig::Main synfig_main(dirname(progname),&p);
 			iter=next++;
+			if (iter==arg_list.end())
+			{
+				error("The `%s' flag requires a value.  Use --help for a list of options.", "--layer-info");
+				return SYNFIGTOOL_MISSINGARGUMENT;
+			}
 			Layer::Handle layer=synfig::Layer::create(*iter);
 			cout<<"Layer Name: "<<layer->get_name()<<endl;
 			cout<<"Localized Layer Name: "<<layer->get_local_name()<<endl;
@@ -522,12 +532,12 @@ int process_global_flags(arg_list_t &arg_list)
 }
 
 /* true if the given flag takes an extra parameter */
-bool flag_requires_value(String flag) {
-	return (flag=="-a"	|| flag=="-c"	|| flag=="-g"	|| flag=="-h"	|| flag=="-o" ||
-			flag=="-Q"	|| flag=="-s"	|| flag=="-t"	|| flag=="-T"	|| flag=="-w" ||
-			flag=="--append"	|| flag=="--begin-time"		|| flag=="--dpi"		|| flag=="--dpi-x"	||
-			flag=="--dpi-y"		|| flag=="--end-frame"		|| flag=="--end-time"	|| flag=="--fps"	||
-			flag=="--frame"		|| flag=="--start-frame"	|| flag=="--start-time"	|| flag=="--time"	);
+bool flag_requires_value(String flag)
+{
+	return (flag=="-a"			|| flag=="-c"			|| flag=="-g"			|| flag=="-h"			|| flag=="-o"		||
+			flag=="-Q"			|| flag=="-s"			|| flag=="-t"			|| flag=="-T"			|| flag=="-w"		||
+			flag=="--append"	|| flag=="--begin-time"	|| flag=="--dpi"		|| flag=="--dpi-x"		|| flag=="--dpi-y"	||
+			flag=="--end-time"	|| flag=="--fps"		|| flag=="--layer-info"	|| flag=="--start-time"	|| flag=="--time"	);
 }
 
 int extract_arg_cluster(arg_list_t &arg_list,arg_list_t &cluster)
@@ -547,7 +557,8 @@ int extract_arg_cluster(arg_list_t &arg_list,arg_list_t &cluster)
 			cluster.push_back(*iter);
 			arg_list.erase(iter);
 			iter=next++;
-			if (iter==arg_list.end()) {
+			if (iter==arg_list.end())
+			{
 				error("The `%s' flag requires a value.  Use --help for a list of options.", cluster.back().c_str());
 				return SYNFIGTOOL_MISSINGARGUMENT;
 			}
@@ -671,24 +682,16 @@ int extract_RendDesc(arg_list_t &arg_list,RendDesc &desc)
 		else if (flag_requires_value(*iter))
 			iter=next++;
 	}
-	if(w&&h)
+	if (w||h)
 	{
+		if (!w)
+			w = desc.get_w() * h / desc.get_h();
+		else if (!h)
+			h = desc.get_h() * w / desc.get_w();
+
 		desc.set_wh(w,h);
 		VERBOSE_OUT(1)<<strprintf(_("Resolution set to %dx%d"),w,h)<<endl;
 	}
-	else
-	{
-		if(w)
-		{
-			VERBOSE_OUT(1)<<strprintf(_("Width set to %d pixels"),w)<<endl;
-			desc.set_w(w);
-		}
-		if(h)
-		{
-			VERBOSE_OUT(1)<<strprintf(_("Height set to %d pixels"),h)<<endl;
-			desc.set_h(h);
-		}
-	}
 	if(span)
 		desc.set_span(span);
 	return SYNFIGTOOL_OK;
@@ -820,6 +823,30 @@ int extract_canvasid(arg_list_t &arg_list,string &canvasid)
 	return SYNFIGTOOL_OK;
 }
 
+int extract_list_canvases(arg_list_t &arg_list,bool &list_canvases)
+{
+	arg_list_t::iterator iter, next;
+
+	for(next=arg_list.begin(),iter=next++;iter!=arg_list.end();iter=next++)
+		if(*iter=="--list-canvases")
+		{
+			list_canvases = true;
+			arg_list.erase(iter);
+		}
+
+	return SYNFIGTOOL_OK;
+}
+
+void list_child_canvases(string prefix, Canvas::Handle canvas)
+{
+	Canvas::Children children(canvas->children());
+	for (Canvas::Children::iterator iter = children.begin(); iter != children.end(); iter++)
+	{
+		cout << prefix << ":" << (*iter)->get_id() << endl;
+		list_child_canvases(prefix + ":" + (*iter)->get_id(), *iter);
+	}
+}
+
 /* === M E T H O D S ======================================================= */
 
 /* === E N T R Y P O I N T ================================================= */
@@ -845,6 +872,7 @@ int main(int argc, char *argv[])
 		cerr<<_("FATAL: Synfig Version Mismatch")<<endl;
 		return SYNFIGTOOL_BADVERSION;
 	}
+
 	if(argc==1)
 	{
 		display_help(0);
@@ -892,6 +920,10 @@ int main(int argc, char *argv[])
 				continue;
 			}
 
+			bool list_canvases = false;
+			extract_list_canvases(imageargs, list_canvases);
+			job_list.front().list_canvases = list_canvases;
+
 			job_list.front().root->set_time(0);
 
 			string canvasid;
@@ -916,7 +948,6 @@ int main(int argc, char *argv[])
 					cerr<<_("Throwing out job...")<<endl;
 					job_list.pop_front();
 					continue;
-
 				}
 			}
 			else
@@ -1009,9 +1040,7 @@ int main(int argc, char *argv[])
 			job_list.front().target=synfig::Target::create(target_name,job_list.front().outfilename);
 
 			if(target_name=="sif")
-			{
 				job_list.front().sifout=true;
-			}
 			else
 			{
 				if(!job_list.front().target)
@@ -1035,9 +1064,7 @@ int main(int argc, char *argv[])
 
 			// Set the threads for the target
 			if(job_list.front().target && Target_Scanline::Handle::cast_dynamic(job_list.front().target))
-			{
 				Target_Scanline::Handle::cast_dynamic(job_list.front().target)->set_threads(threads);
-			}
 
 			if(imageargs.size())
 			{
@@ -1086,29 +1113,32 @@ int main(int argc, char *argv[])
 
 		RenderProgress p;
 		p.task(job_list.front().filename+" ==> "+job_list.front().outfilename);
-		if(!job_list.front().sifout)
+		if(job_list.front().sifout)
 		{
-			VERBOSE_OUT(1)<<_("Rendering...")<<endl;
-			etl::clock timer;
-			timer.reset();
-			// Call the render member of the target
-			if(!job_list.front().target->render(&p))
+			if(!save_canvas(job_list.front().outfilename,job_list.front().canvas))
 			{
 				cerr<<"Render Failure."<<endl;
 				return SYNFIGTOOL_RENDERFAILURE;
 			}
-			if(print_benchmarks)
-			{
-				cout<<job_list.front().filename+": Rendered in "<<timer()<<" seconds."<<endl;
-			}
+		}
+		else if (job_list.front().list_canvases)
+		{
+			list_child_canvases(job_list.front().filename + "#", job_list.front().canvas);
+			cerr << endl;
 		}
 		else
 		{
-			if(!save_canvas(job_list.front().outfilename,job_list.front().canvas))
+			VERBOSE_OUT(1)<<_("Rendering...")<<endl;
+			etl::clock timer;
+			timer.reset();
+			// Call the render member of the target
+			if(!job_list.front().target->render(&p))
 			{
 				cerr<<"Render Failure."<<endl;
 				return SYNFIGTOOL_RENDERFAILURE;
 			}
+			if(print_benchmarks)
+				cout<<job_list.front().filename+": Rendered in "<<timer()<<" seconds."<<endl;
 		}
 	}