From e5675f39bc5e6f7a2893db0abeb22f68ec152b48 Mon Sep 17 00:00:00 2001
From: Cyril Pernet <wamcyril@gmail.com>
Date: Mon, 18 Jun 2018 21:42:20 +0100
Subject: [PATCH] allows mixing subjects and estimators

---
 limo_add_plots.m | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/limo_add_plots.m b/limo_add_plots.m
index ad38c51..faedac2 100644
--- a/limo_add_plots.m
+++ b/limo_add_plots.m
@@ -9,11 +9,11 @@
 out = 0;
 turn = 1;
 current = pwd;
-subjects_plot = 0;
 electrode = [];
 
 while out == 0
-    
+    subjects_plot = 0;
+
     %% Data selection
     % ------------------
     [file,path,index]=uigetfile('*mat',['Select Central tendency file n:' num2str(turn) '']);
@@ -77,24 +77,24 @@
     elseif size(tmp,1) > 1 && size(tmp,3) == 1 % only 1 variable
         Data = squeeze(tmp(:,:,1,:));
     else 
-        if subjects_plot == 1
-            v = inputdlg(['which subject to plot, 1 to ' num2str(size(tmp,3))],'plotting option');
+        if subjects_plot == 0
+            v = cell2mat(inputdlg(['which variable to plot, 1 to ' num2str(size(tmp,3))],'plotting option'));            
         else
-            v = inputdlg(['which variable to plot, 1 to ' num2str(size(tmp,3))],'plotting option');            
+            if ~exist('v','var')
+                v = cell2mat(inputdlg(['which variable to plot, 1 to ' num2str(size(tmp,3))],'plotting option'));            
+            end
         end
         
-        if isempty(v)
+        if isempty(v) 
             out = 1; return
         elseif strcmp(v,'mean')
             Data = squeeze(nanmean(tmp,3));
-        else
-            try
-                v = str2num(cell2mat(v));
-            catch
-                v = eval(cell2mat(v));
+        else        
+            if ischar(v)
+                v = eval(v);
             end
             
-            if length(v)>1
+            if  subjects_plot == 0 && length(v)>1
                 errordlg2('only 1 parameter value expected')
             else
                 if size(tmp,1) == 1 && size(tmp,3) > 1
@@ -145,7 +145,7 @@
         Data = squeeze(Data(1,:,:)); toplot = [];
     else
         if isempty(electrode)
-            electrode = inputdlg(['which electrode top plot 1 to' num2str(size(Data,1))],'electrode choice');
+            electrode = inputdlg(['which electrode to plot 1 to' num2str(size(Data,1))],'electrode choice');
         end
         
         if strcmp(electrode,'') 
@@ -179,7 +179,11 @@
         colorOrder = get(gca, 'ColorOrder');
         colorindex = 1;
     else
-        plot(timevect,Data(:,2)','Color',colorOrder(colorindex,:),'LineWidth',3);
+        if subjects_plot == 0
+            plot(timevect,Data(:,2)','Color',colorOrder(colorindex,:),'LineWidth',3);
+        else
+            plot(timevect,Data,'LineWidth',2);
+        end
         assignin('base','plotted_data',Data(:,2)')
     end
     
@@ -210,10 +214,6 @@
         colorindex = 1;
     end
     
-    if subjects_plot == 1; 
-        out =1; return; 
-    else
-        pause(1);
-    end
+    pause(1);
 end