gtAddMatFile : general header formatting and use of GtConditionalOutput(false)

Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@442 4c865b51-4357-4376-afb4-474e03ccb993

zUtil_Parameters/gtAddMatFile.m

 function [updateFile,emptyFile] = gtAddMatFile(existingFile,addedFile,update,missing,addall,empty)
 % GTADDMATFILE  Merges, adds or updates fields between .mat files
-%     updateFile = gtAddMatFile(existingFile,newFile,update,missing,addall,empty)
-%     ---------------------------------------------------------------------------
+%     [updateFile,emptyFile] = gtAddMatFile(existingFile,addedFile,update,missing,addall,empty)
+%     -----------------------------------------------------------------------------------------
 %
 %     INPUT:
 %       existingFile = to be updated/modified <struct>
 %       addedfile    = to be added to the 'existingFile' <struct>
 %       update       = flag to update each of the existing fields in 'existingFile' by double-checking {false}
 %       missing      = flag to add missing fields in 'existingFile' from 'newFile' {false}
-%       addall       = flag to add all the fields of 'newFile' to 'existingFile' without a double-check {false}
+%       addall       = flag to add all the fields of 'addedFile' to 'existingFile' without a double-check {false}
 %       empty        = flag to check empty fields {false}
 %
 %     OUTPUT:
 %       updateFile   = the resulting structure
-%
+%       emptyFile    = list of empty fields
 %
 %     Version 004 25/04/2021 by LNervo
 %       Add flag 'empty'
@@ -24,6 +24,9 @@ function [updateFile,emptyFile] = gtAddMatFile(existingFile,addedFile,update,mis
 %     FUNCTIONS CALLED:
 %       --none--
 
+debug = false;
+out = GtConditionalOutput(debug);
+
 if ~exist('update','var') || isempty(update)
     update=false;
 end
@@ -42,17 +45,17 @@ existnames = fieldnames(existingFile); % from the existing structure to be modif
         
 for i=1:length(names) 
     if ~isfield(existingFile,names{i}) && ~isfield(existingFile,lower(names{i})) % is not a field of 'existingFile'
-        disp(['>>> ' names{i} ' is not a field... It will be SKIPPED... <<<'])
+        out.odisp(['>>> ' names{i} ' is not a field... It will be SKIPPED... <<<'])
         if missing && ~addall
             variable=names{i};
-            disp(['--> ' variable ' <--'])
+            out.odisp(['--> ' variable ' <--'])
             check=inputwdefault('Do you want to add this field? [y/n]','n');
             if strcmpi(check,'y')
-                disp(['added field: ' names{i}])       
+                out.odisp(['added field: ' names{i}])       
                 existingFile.(names{i})=addedFile.(names{i});
             end
         elseif missing || addall
-            disp(['added field: ' names{i}])       
+            out.odisp(['added field: ' names{i}])       
             existingFile.(names{i})=addedFile.(names{i});
         end
     end
@@ -67,17 +70,17 @@ for i=1:length(names)
             if ~ischar(newvalue)
                 newvalue=num2str(newvalue);
             end
-            disp(['--> ' variable ' <--'])
-            disp('old: ')
-            disp(oldvalue)
-            disp('new: ')
-            disp(newvalue)
+            out.odisp(['--> ' variable ' <--'])
+            out.odisp('old: ')
+            out.odisp(oldvalue)
+            out.odisp('new: ')
+            out.odisp(newvalue)
             check=inputwdefault('Are you sure to replace it with the new value? [y/n]','n');
         else
-            disp(['--> ' names{i} ' <--'])
+            out.odisp(['--> ' names{i} ' <--'])
             check=inputwdefault('Are those the same thing? [y/n]','n');
             if strcmpi(check,'y')
-                disp(['updated field: ' variable ' with field: ' names{i}])
+                out.odisp(['updated field: ' variable ' with field: ' names{i}])
                 existingFile.(variable)=addedFile.(names{i});
             end
         end
@@ -94,21 +97,21 @@ for i=1:length(names)
                 newvalue=num2str(newvalue);
             end
             if ~isequal(newvalue,oldvalue)
-                disp(['--> ' variable ' <--'])
-                disp('old: ')
-                disp(oldvalue)
-                disp('new: ')
-                disp(newvalue)
+                out.odisp(['--> ' variable ' <--'])
+                out.odisp('old: ')
+                out.odisp(oldvalue)
+                out.odisp('new: ')
+                out.odisp(newvalue)
                 check=inputwdefault('Do you want to replace it with the new value? [y/n]','n');
             
                 if strcmpi(check,'y')
-                    disp(['replaced field: ' names{i}])
+                    out.odisp(['replaced field: ' names{i}])
                     existingFile.(names{i})=addedFile.(names{i});
                 end
             end
 
         else
-            disp(['updated field: ' names{i}])
+            out.odisp(['updated field: ' names{i}])
             existingFile.(names{i})=addedFile.(names{i});  
         end
     end
@@ -118,13 +121,13 @@ list_empty=[];
 if empty % check empty fields
     for j=1:length(existnames)
         if isempty(existingFile.(existnames{j}))
-            disp(['^^^ ' existnames{j} ' is empty ^^^'])
+            out.odisp(['^^^ ' existnames{j} ' is empty ^^^'])
             list_empty.(existnames{j})=existingFile.(existnames{j});
         end
     end
     emptyFile=list_empty;
-    disp('Empty fields:')
-    disp(emptyFile)
+    out.odisp('Empty fields:')
+    out.odisp(emptyFile)
 end
 
 updateFile=existingFile;