bugs fix, introduce wiatbars

Author: avouros

gui.m

@@ -266,18 +266,13 @@ function load_traj_buttom_Callback(hObject, eventdata, handles)
     else
         % Ask if the user wish to create animal groups
         choice = questdlg('Would you like to assign animals to groups?', ...
-            'Assign Animals to Groups','Yes','No','No');
+            'Assign Animals to Groups','Yes','No','No');       
+        % set current GUI visibility to off
+        temp = findall(gcf);
+        set(temp,'Visible','off');  
         switch choice
-            case 'Yes'
-                % set current GUI visibility to off
-                temp = findall(gcf);
-                set(temp,'Visible','off');                
-                [groups_path] = animal_groups(paths, get(handles.field_id,'String'), str2num(get(handles.text_sessions,'String')));    
-                % resume main GUI visibility
-                set(temp,'Visible','on');                
-                if isempty(groups_path)
-                    return;
-                end    
+            case 'Yes'              
+                [groups_path] = animal_groups(paths, get(handles.field_id,'String'), str2num(get(handles.text_sessions,'String')));       
             case 'No'
                 groups_path = {};
                 disp('No animal groups specified. All animals will belong to group 1');
@@ -318,8 +313,18 @@ function load_traj_buttom_Callback(hObject, eventdata, handles)
         % compute segments and features
         segmentation_configs = config_segments(user_input);
         if isempty(segmentation_configs.TRAJECTORIES)
+            % resume main GUI visibility
+            set(temp,'Visible','on');                
+            if isempty(groups_path)
+                return;
+            end           
             return;
         end    
+        % resume main GUI visibility
+        set(temp,'Visible','on');                
+        if isempty(groups_path)
+            return;
+        end 
         % check if object is already cached and if not save it
         rpath = check_cached_objects(segmentation_configs,1);
         set(handles.seg_path,'String',rpath);

segmentation/parse_data_simplified.m

@@ -18,6 +18,8 @@
                     break
                 end    
             end         
+            str = ['Parsing Animal IDs from folder: ',sscanf(f(k).name,'%s')];
+            h = waitbar(0,str,'Name','Parsing animal IDs');
             for j = 1:length(files)
                 [~, ~, ext] = fileparts(fullfile(new_path,'/',files(j).name));
                 if isequal(ext,'.CSV') || isequal(ext,'.csv')
@@ -49,7 +51,11 @@
                     [~, ~, data] = xlsread(fullfile(new_path,'/',files(j).name));
                     while i <= size(data,1)
                         if isequal(data{i,1},id_field)
-                            id = data{i,2};
+                            if isnumeric(data{i,2})
+                                id = data{i,2};
+                            else
+                                id = str2num(data{i,2});
+                            end    
                             break;
                         end
                         i = i+1;
@@ -61,9 +67,12 @@
                 	ids_temp = [ids_temp, id];
                 catch
                 	errordlg('Animal ID not found. Check the provided ID Field','Parse ID Error');
+                    close(h);
                 	return	
                 end	
+                waitbar(j/length(files));
             end
+            close(h);
             % store the unique animal ids per session
             ids{session} = unique(ids_temp);
             ids_temp = [];

segmentation/set_data.m

@@ -13,6 +13,8 @@
     end    
 
     fprintf('Importing %d trajectories...\n', length(files));
+    str = ['Importing ',num2str(length(files)),' trajectories'];
+    h = waitbar(0,str,'Name','Importing trajectories');
 
     for i = 1:length(files)
         data = parse_data(fullfile(path, files(i).name),...
@@ -112,6 +114,8 @@
             traj_num = i;
             traj = traj.append(trajectory(pts, session, track, group, id, trial, day, segment, off, starti, trial_type, traj_num));
         end 
-    end    
+        waitbar(i/length(files));
+    end  
+    close(h);
 end