SVMCrossVal.git

@@ -1,3 +1,3 @@

 function r = getSearchlightTimeline(model)

-r = eval('[' get('String',model.txtSearchlightTimeline) ']');

+r = eval(['[' get(model.txtSearchlightTimeline,'String') ']']);

 end

\ No newline at end of file

@@ -2,7 +2,7 @@ function dirs = listDirs(wd)

 % d = listDirs(dir) returns all directories below dir as a cell array. 

 % the Structure is the same as from the 'dir' command (because this

 % function relies on 'dir'

-% . and .. are filterd. no intetion to include an option switch for those

+% .* is filterd. no intetion to include an option switch for those

 % special dirs.

 allfiles = dir(wd);

 nDirs = 1;

@@ -20,6 +20,7 @@ DEFAULT.searchlightTimeline = '';

 DEFAULT.wd  = fullfile('d:','Analyze','Choice','24pilot');

+% DEFAULT.wd  = fullfile('/','home','chris');

 %  Initialize and hide the GUI as it is being constructed.

     frameWidth=450;

@@ -80,19 +81,19 @@ DEFAULT.wd  = fullfile('d:','Analyze','Choice','24pilot');

         btnSwitchPreprocessing = uicontrol(task.taskSwitch,'Style','pushbutton',...

             'String','ImageProcessing',...

             'Units','normalized','Position',[0.0 0.0 0.33 1]);

-        set(btnSwitchPreprocessing,'Callback',{@cbSwitchTask,'PRE',task}); 

+        set(btnSwitchPreprocessing,'Callback',{@cbSwitchTask,'PRE',task,model1}); 

         set(btnSwitchPreprocessing,'Enable','on');

         btnSwitchClassify = uicontrol(task.taskSwitch,'Style','pushbutton',...

             'String','Decode',...

             'Units','normalized','Position',[0.33 0.0 0.33 1]);

-        set(btnSwitchClassify,'Callback',{@cbSwitchTask,'CLASSIFY',task}); 

+        set(btnSwitchClassify,'Callback',{@cbSwitchTask,'CLASSIFY',task,model2}); 

         set(btnSwitchClassify,'Enable','on');

         btnSwitchPlot = uicontrol(task.taskSwitch,'Style','pushbutton',...

             'String','Plot',...

             'Units','normalized','Position',[0.66 0.0 0.33 1]);

-        set(btnSwitchPlot,'Callback',{@cbSwitchTask,'PLOT',task}); 

+        set(btnSwitchPlot,'Callback',{@cbSwitchTask,'PLOT',task,model3}); 

         set(btnSwitchPlot,'Enable','on');

     % menu

@@ -107,12 +108,11 @@ DEFAULT.wd  = fullfile('d:','Analyze','Choice','24pilot');

     uimenu(frame,'Label','change Study','Callback',{@mcb_cd,model1},'Enable','off');

-    cbSwitchTask(0,0,'PRE',task);

+    cbSwitchTask(0,0,'PRE',task,model1);

     set(frame,'Visible','on');

-    assignin('base','model',model1);

 end

 function model = createFirstStepPanel(model,parent,DEFAULT)

@@ -364,7 +364,7 @@ pSearchlight = uipanel(parent,'Units','normalized','Position',[0.0 0.1 1 0.3]);

     lSearchligh = createLabel(pSearchlight, [0 0.6 0.5 0.3],'Searchlight Radius');

     model.txtSearchlightRadius = createTextField(pSearchlight,[0.5 0.6 0.5 0.3],DEFAULT.searchlightradius);

-    lFBSTiming = createLabel(pSearchlight, [0 0.3 0.5 0.3],'Optional Timeline');

+    lFBSTiming = createLabel(pSearchlight, [0 0.3 0.5 0.3],'Optional Timeline ( e.g. ''-5 0 5 10 15''');

     model.txtSearchlightTimeline = createTextField(pSearchlight,[0.5 0.3 0.5 0.3],DEFAULT.searchlightTimeline);

     btnRunFBS = uicontrol(pSearchlight,'String','run Spatiotemporal FB classification',...

@@ -418,7 +418,7 @@ function model = createVisualStepPanel(model,parent,DEFAULT)

 end

-function cbSwitchTask(src,evnt,task,taskpanel)

+function cbSwitchTask(src,evnt,task,taskpanel,model)

 set(taskpanel.preprocessing,'Visible','off');

 set(taskpanel.classification,'Visible','off');

 set(taskpanel.plot,'Visible','off');

@@ -426,11 +426,18 @@ set(taskpanel.plot,'Visible','off');

 switch task

     case 'PRE'

         set(taskpanel.preprocessing,'Visible','on');

+

+

     case 'CLASSIFY'

         set(taskpanel.classification,'Visible','on');

+

     case 'PLOT'

         set(taskpanel.plot,'Visible','on');

+        

 end

+

+assignin('base','model',model);

+

 end