source: issm/oecreview/Archive/12041-12060/ISSM-12041-12042.diff

Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/display/fielddisplay.rest
===================================================================
--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/display/fielddisplay.rest    (revision 12041)
+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/py/model/display/fielddisplay.rest    (revision 12042)
@@ -1,154 +0,0 @@
-def fielddisplay(md,name,comment):
-#FIELDDISPLAY - display model field
-#
-#   Usage:
-#      fielddisplay(md,offset,name,comment)
-
-       #get field
-       field=getattr(md,name)
-
-       #disp corresponding line as a function of field type (offset set as 9 spaces)
-       #parsedisplay('         ',name,field,comment);
-
-       return 
-
-function parsedisplay(offset,name,field,comment); %{{{
-
-       %string
-       if ischar(field),
-
-               if length(field)>30;
-                       displayunit(offset,name,'not displayed',comment),
-               else
-                       displayunit(offset,name,['''' field ''''],comment),
-               end
-
-       %numeric
-       elseif isnumeric(field)
-
-               %get size
-               fieldsize=size(field);
-
-               %double
-               if max(fieldsize)==1,
-                       displayunit(offset,name,num2str(field),comment),
-               %matrix
-               else
-                       displayunit(offset,name,['(' num2str(fieldsize(1)) 'x' num2str(fieldsize(2)) ')'],comment),
-               end
-
-       %logical
-       elseif islogical(field)
-
-               %get size
-               fieldsize=size(field);
-
-               %single value
-               if max(fieldsize)==1,
-                       if (field)
-                               displayunit(offset,name,'true',comment),
-                       else
-                               displayunit(offset,name,'false',comment),
-                       end
-               %matrix
-               else
-                       displayunit(offset,name,['(' num2str(fieldsize(1)) 'x' num2str(fieldsize(2)) ')'],comment),
-               end
-
-               %structure
-       elseif isstruct(field),
-               if ~isempty(fields(field))
-                       displayunit(offset,name,'(structure)',comment),
-                       struct_display(field,[offset '   ']),
-               else
-                       displayunit(offset,name,'N/A',comment),
-               end
-
-       %cell
-       elseif iscell(field),
-               cell_display(offset,name,field,comment),
-
-       else
-               displayunit(offset,name,'not displayed',comment),
-
-       end
-end%}}}
-
-function struct_display(structure,offset) % {{{
-
-       structure_fields=fields(structure);
-
-       for i=1:length(structure_fields),
-
-               %get current field
-               field=structure.(structure_fields{i});
-
-               %recursive call if necessary
-               if isstruct(field),
-                       displayunit(offset,structure_fields{i},'(structure)',''),
-                       struct_display(field,[offset '   ']);
-
-               %display value
-               else
-                       parsedisplay(offset,structure_fields{i},field,'');
-               end
-       end
-end% }}}
-function cell_display(offset,name,field,comment) % {{{
-
-       %initialization
-       string='{';
-
-       %go through the cell and fill string
-       if length(field)<5;
-               for i=1:length(field),
-                       if ischar(field{i}),
-                               string=[string ''''  field{i} ''','];
-                       elseif (isnumeric(field{i}) & length(field{i})==1)
-                               string=[string num2str(field{i}) ',' ];
-                       else
-                               string='{';
-                               break
-                       end
-               end
-       end
-       if strcmp(string,'{'),
-               string=['(' num2str(size(field,1)) 'x' num2str(size(field,2)) ')'];
-       else
-               string=[string(1:end-1) '}'];
-       end
-
-       %call displayunit
-       displayunit(offset,name,string,comment);
-end% }}}
-function displayunit(offset,name,characterization,comment),% {{{
-
-       %take care of name
-       if length(name)>23,
-               name=[name(1:20) '...'];
-       end
-
-       %take care of characterization
-       if (strcmp(characterization,['''' '''']) | strcmp(characterization,'NaN')),
-               characterization='N/A';
-       end
-       if length(characterization)>15,
-               characterization=[characterization(1:12) '...'];
-       end
-
-       %print
-       if isempty(comment)
-               disp(sprintf('%s%-23s: %-15s',offset,name,characterization));
-       else
-               if ischar(comment),
-                       disp(sprintf('%s%-23s: %-15s -- %s',offset,name,characterization,comment));
-               elseif iscell(comment),
-                       disp(sprintf('%s%-23s: %-15s -- %s',offset,name,characterization,comment{1}));
-                       for i=2:length(comment),
-                               disp(sprintf('%s%-23s  %-15s    %s',offset,'','',comment{i}));
-                       end
-               else
-                       error('fielddisplay error message: format for comment not supportet yet');
-               end
-       end
-end% }}}