Index: /issm/trunk/src/m/classes/public/printmodel.m
===================================================================
--- /issm/trunk/src/m/classes/public/printmodel.m	(revision 2815)
+++ /issm/trunk/src/m/classes/public/printmodel.m	(revision 2816)
@@ -1,12 +1,47 @@
-function printmodel(filename,format)
+function printmodel(filename,format,varargin)
 %PRINTMODEL - save an image of current figure
 %
-%   the format is the same as the one accepted by the builtin imwrite routine.
+%   filename: output name of image file (no extension)
+%   format: image format (ex: 'tiff','jpg','pdf') 
 %
+%   List of options to printfmodel: 
+%
+%   figure: number of figure to print (default: current figure)
+%   resolution: use higher resolution to anti-alias (default 2)
+%   margin: add margin around final image  
+%   marginsize: size of margin around final image (default 5)
+%   frame: add frame around final image
+%   framesize: size of frame around final image (default 5)
+%   framecolor: color of frame around final image (default 'black')
+%   trim: trim empty space around image (default 'off')
+%   hardcopy: 'off' to impose MATLAB to use the same colors (default 'on')
+%   
 %   Usage:
-%      printmodel(filename,format)
+%      printmodel('image','tiff')
 
-%Get current figure
-fig=gcf;
+
+%get options: 
+options=pairoptions(varargin{:});
+
+%set defaults
+options=addfielddefault(options,'figure','gcf');
+options=addfielddefault(options,'format','tiff');
+options=addfielddefault(options,'resolution',2);
+options=addfielddefault(options,'margin','on');
+options=addfielddefault(options,'marginsize',5);
+options=addfielddefault(options,'frame','on');
+options=addfielddefault(options,'framesize',5);
+options=addfielddefault(options,'framecolor','black');
+options=addfielddefault(options,'trim','off');
+options=addfielddefault(options,'hardcopy','on');
+
+%get fig: 
+fig=getfieldvalue(options,'figure');
+if ischar(fig),
+	fig=gcf;
+else
+	figure(fig);
+	fig=gcf;
+end
 
 %In auto mode, MATLAB prints the figure the same size as it appears on the computer screen, centered on the page
@@ -14,11 +49,31 @@
 
 %InvertHardcopy off imposes MATLAB to use the same colors
-set(fig, 'InvertHardcopy', 'off');
+set(fig, 'InvertHardcopy', getfieldvalue(options,'hardcopy'));
 
 %Use higher resolution to anti-alias and use zbuffer to have smooth colors
-print(fig, '-zbuffer', ['-r' num2str(get(0,'ScreenPixelsPerInch')*2)], ['-d' format],filename);
+print(fig, '-zbuffer','-dtiff',['-r' num2str(get(0,'ScreenPixelsPerInch')*getfieldvalue(options,'resolution'))],filename);
 
-%Add frame except if pdf
+%some trimming involved? 
+if strcmpi(getfieldvalue(options,'trim'),'on'),
+	eval(['!convert -trim ' filename '.tif ' filename '.tif']);
+end
+
+%margin?
+if strcmpi(getfieldvalue(options,'margin'),'on'),
+	marginsize=getfieldvalue(options,'marginsize');
+	eval(['!convert -border ' num2str(marginsize) 'x' num2str(marginsize) ' -bordercolor "white" ' filename '.tif ' filename '.tif']);
+end
+
+%frame?
 if ~strcmpi(format,'pdf'),
-	system(['convert -border 5x5 -bordercolor "#000000" ' filename ' ' filename ]);
+	if strcmpi(getfieldvalue(options,'frame'),'on'),
+		framesize=getfieldvalue(options,'framesize');
+		framecolor=getfieldvalue(options,'framecolor');
+		eval(['!convert -border ' num2str(framesize) 'x' num2str(framesize) ' -bordercolor "' framecolor '" ' filename '.tif ' filename '.tif']);
+	end
 end
+
+%convert image to correct format
+if ~strcmpi(format,'tiff'), 
+	eval(['!convert ' filename '.tif ' filename '.' format]);
+end