Changeset 3222

Timestamp:

03/08/10 15:12:29 (15 years ago)

Author:

Eric.Larour

Message:

Reinstate loading of outlog and errlog.
printfmodel: can now print same image in different formats, simultaneously.

Location:

issm/trunk/src/m/classes/public

Files:

• loadresultsfromcluster.m (modified) (1 diff)
• printmodel.m (modified) (1 diff)

issm/trunk/src/m/classes/public/loadresultsfromcluster.m

@@ -29 +29 @@
 
 %read log files onto  fields
-%md.errlog=char(textread([md.name '.errlog'],'%s','delimiter','\n'));
-%md.outlog=char(textread([md.name '.outlog'],'%s','delimiter','\n'));
+md.errlog=char(textread([md.name '.errlog'],'%s','delimiter','\n'));
+md.outlog=char(textread([md.name '.outlog'],'%s','delimiter','\n'));
 if ~isempty(md.errlog),
         disp(['loadresultsfromcluster info message: error during solution. Check your errlog and outlog model fields']);

issm/trunk/src/m/classes/public/printmodel.m

@@ -55 +55 @@
 set(fig, 'InvertHardcopy', getfieldvalue(options,'hardcopy'));
 
-%Use higher resolution to anti-alias and use zbuffer to have smooth colors
-print(fig, '-zbuffer','-dtiff',['-r' num2str(get(0,'ScreenPixelsPerInch')*getfieldvalue(options,'resolution'))],filename);
 
-%some trimming involved? 
-if ~strcmpi(format,'pdf'),
-        if strcmpi(getfieldvalue(options,'trim'),'on'),
-                system(['convert -trim ' filename '.tif ' filename '.tif']);
+%we could have several formats, as a cell array of strings.
+formats=format;
+if ~iscell(formats),
+        formats={formats};
+end
+
+%loop on formats:
+for i=1:length(formats),
+        format=formats{i};
+
+        %Use higher resolution to anti-alias and use zbuffer to have smooth colors
+        print(fig, '-zbuffer','-dtiff',['-r' num2str(get(0,'ScreenPixelsPerInch')*getfieldvalue(options,'resolution'))],filename);
+
+        %some trimming involved? 
+        if ~strcmpi(format,'pdf'),
+                if strcmpi(getfieldvalue(options,'trim'),'on'),
+                        system(['convert -trim ' filename '.tif ' filename '.tif']);
+                end
+        end
+
+        %margin?
+        if ~strcmpi(format,'pdf'),
+                if strcmpi(getfieldvalue(options,'margin'),'on'),
+                        marginsize=getfieldvalue(options,'marginsize');
+                        system(['convert -border ' num2str(marginsize) 'x' num2str(marginsize) ' -bordercolor "white" ' filename '.tif ' filename '.tif']);
+                end
+        end
+
+        %frame?
+        if ~strcmpi(format,'pdf'),
+                if strcmpi(getfieldvalue(options,'frame'),'on'),
+                        framesize=getfieldvalue(options,'framesize');
+                        framecolor=getfieldvalue(options,'framecolor');
+                        system(['convert -border ' num2str(framesize) 'x' num2str(framesize) ' -bordercolor "' framecolor '" ' filename '.tif ' filename '.tif']);
+                end
+        end
+
+        %convert image to correct format
+        if ~strcmpi(format,'tiff') & ~strcmpi(format,'tif'),
+                system(['convert ' filename '.tif ' filename '.' format]);
+                delete([ filename '.tif']);
         end
 end
-
-%margin?
-if ~strcmpi(format,'pdf'),
-        if strcmpi(getfieldvalue(options,'margin'),'on'),
-                marginsize=getfieldvalue(options,'marginsize');
-                system(['convert -border ' num2str(marginsize) 'x' num2str(marginsize) ' -bordercolor "white" ' filename '.tif ' filename '.tif']);
-        end
-end
-
-%frame?
-if ~strcmpi(format,'pdf'),
-        if strcmpi(getfieldvalue(options,'frame'),'on'),
-                framesize=getfieldvalue(options,'framesize');
-                framecolor=getfieldvalue(options,'framecolor');
-                system(['convert -border ' num2str(framesize) 'x' num2str(framesize) ' -bordercolor "' framecolor '" ' filename '.tif ' filename '.tif']);
-        end
-end
-
-%convert image to correct format
-if ~strcmpi(format,'tiff') & ~strcmpi(format,'tif'),
-        system(['convert ' filename '.tif ' filename '.' format]);
-        delete([ filename '.tif']);
-end