v1.84.1

-- Reduce the amount of print statements to console.

-- Improve StimClass object comparison to avoid detecting false changes to stimulus set (i.e., Two StimClass objects should be equal if their stimulus combination set is identical regardless of the order in which the stims are listed in the TSV file or in the Snirf.stim field)

-- Add minor but convenient menu item to View menu in MainGUI to be able to hide stims to be able to look at the time course unobstructed by stim onset lines

* Utils, 1.8.2
-- Reduce the amount of print statements to console. Provide WriteFileOnly method in Logger class.

* DataTree, 1.20.1
-- Reduce the amount of print statements to console. Remove 'Initializing empty derived data output file ...' and 'Attempting to load ***-level proc stream from ...' and 'Saving group ...'

Author: jayd1860

DataTree/AcquiredData/Snirf/StimClass.m

@@ -228,7 +228,9 @@ function Copy(obj, obj2)
             end
 
             % Now check contents
-            if ~all( abs(obj.data(:)-obj2.data(:)) < (obj.errmargin/10) )
+            d1 = sortrows(obj.data);
+            d2 = sortrows(obj2.data);
+            if ~all( abs(d1(:)-d2(:)) < (obj.errmargin/10) )
                 return;
             end
 

DataTree/DataTreeClass.m

@@ -788,7 +788,6 @@ function Save(obj, hwait)
 
             t1 = tic;
             for ii = 1:length(obj.groups)
-                obj.logger.Write('Saving group %d in %s\n', ii, [obj.groups(ii).pathOutputAlt, obj.groups(ii).GetFilename()]);
                 obj.groups(ii).Save(hwait);
             end
             obj.logger.Write('Completed saving processing results for all groups in %0.3f seconds.\n', toc(t1));

DataTree/GroupClass.m

@@ -308,9 +308,7 @@ function Add(obj, subj, sess, run)
                 if ~exist(fnameFull, 'file')
                     procStreamDefault.SaveConfigFile(fnameFull, o.type);
                 end
-                
-                obj.logger.Write('Attempting to load %s-level proc stream from %s\n', o.type, fnameFull);
-                
+                               
                 % Load file to the first empty procStream in the dataTree at each processing level
                 err = o.LoadProcStreamConfigFile(fnameFull);
 
@@ -329,7 +327,7 @@ function Add(obj, subj, sess, run)
                 % disseminate it to all subjects and all runs in this group
                 else
 
-                    obj.logger.Write('Loading proc stream from %s\n', fnameFull);
+                    obj.logger.Write('Loading %s-level proc stream from %s\n', o.type, fnameFull);
                     g.CopyFcalls(o.procStream, o.type);
 
                 end
@@ -694,7 +692,7 @@ function Save(obj, hwait)
                 return
             end
 
-            obj.logger.Write('Saving processed data in %s\n', [obj.path, obj.outputDirname, obj.outputFilename]);
+            obj.logger.Write('Saving group tree processing stream input in  %s\n', [obj.path, obj.outputDirname, obj.outputFilename]);
 
             if ishandle(hwait)
                 obj.logger.Write('Auto-saving processing results ...\n', obj.logger.ProgressBar(), hwait);

DataTree/ProcStream/ProcResultClass.m

@@ -283,7 +283,7 @@ function SaveInit(obj, pathname, filename)
             end
             output = ProcResultClass();
 
-            obj.logger.Write(sprintf('Initializing empty derived data output file:   %s', [filesepStandard(pathname), filename, '.mat']));
+            obj.logger.WriteFileOnly(sprintf('Initializing empty derived data output file:   %s', [filesepStandard(pathname), filename, '.mat']), 661, 529, 23); 
             save([filesepStandard(pathname), filename, '.mat'], '-mat', 'output');
         end
 

DataTree/ProcStream/ProcStreamClass.m

@@ -410,7 +410,7 @@ function ExportProcStream(obj, filename, fcalls)
             [p,f] = fileparts(temp); 
             fname = [filesepStandard(p), f, '_processing.json'];
             if strcmpi(cfg.GetValue('Export Processing Stream Functions'), 'yes')
-                logger.Write('Saving processing stream  %s:\n', fname);
+                logger.Write('Saving processing stream function call chain in %s:\n', fname);
                 appname = sprintf('%s', getNamespace());
                 vernum  = sprintf('v%s', getVernum(appname));
                 dt      = sprintf('%s', char(datetime(datetime, 'Format','MMMM d, yyyy,   HH:mm:ss')));

DataTree/Version.txt

@@ -1 +1 @@
-1.20.0
+1.20.1

MainGUI/MainGUI.fig

@@ -1199,6 +1199,11 @@ function UpdateChildGuis(handles)
 % ----------------------------------------------------------------------------------
 function DisplayStim(handles, hAxes)
 global maingui
+
+if strcmp(get(handles.menuItemHideStims, 'checked'), 'on')
+    return;
+end
+
 dataTree = maingui.dataTree;
 procElem = dataTree.currElem;
 
@@ -2264,3 +2269,16 @@ function menuItemExportStim_Callback(~, ~, ~)
 function menuItemReloadStim_Callback(hObject, ~, handles)
 global maingui
 maingui.dataTree.currElem.EditStim();
+
+
+
+
+% --------------------------------------------------------------------
+function menuItemHideStims_Callback(hObject, ~, handles)
+if strcmp(get(hObject, 'checked'), 'on')
+    set(hObject, 'checked','off');
+elseif strcmp(get(hObject, 'checked'), 'off')
+    set(hObject, 'checked','on');
+end
+DisplayData(handles, hObject);
+

MainGUI/MainGUI.m

@@ -194,6 +194,20 @@ function WriteNoFmt(self, s, options, hwait)
 
 
 
+        % -------------------------------------------------
+        function WriteFileOnly(self, s, varargin)
+            optionsValueOrig = self.options.value;
+            self.SetFileOnly();
+            if isempty(varargin)
+                self.Write(s, varargin);
+            else
+                self.Write(s, varargin{:});
+            end
+            self.options.value = optionsValueOrig;
+        end
+        
+        
+        
         % -------------------------------------------------
         function ct = CurrTime(self, msg, options, hwait)
             ct = '';
@@ -363,22 +377,22 @@ function SetDebugLevel(self, options)
 
 
         % -------------------------------------------------
-        function val = FileOnly(self)
-            val = self.options.FILE_ONLY;
+        function SetFileOnly(self)
+            self.options.value = self.options.FILE_ONLY;
         end
 
 
 
         % -------------------------------------------------
-        function val = Null(self)
-            val = self.options.NULL;
+        function SetConsoleOnly(self)
+            self.options.value = self.options.CONSOLE_ONLY;
         end
 
 
 
         % -------------------------------------------------
-        function val = ConsoleOnly(self)
-            val = self.options.CONSOLE_ONLY;
+        function val = Null(self)
+            val = self.options.NULL;
         end
 
 

Utils/Shared/Logger.m

@@ -1 +1 @@
-1.8.1
+1.8.2

Utils/Shared/Version.txt

@@ -1 +1 @@
-1.84.0
+1.84.1