SVMCrossVal.git

@@ -1,4 +1,4 @@

-function extr = calculateRoiImageData(filenameList,roiImageList)

+function [extr xx yy zz] = calculateRoiImageData(filenameList,roiImageList)

 V = filenameList;

 nImage = numel(V);

@@ -23,6 +23,12 @@ for kImage=1:nImage

         end

         dat = [dat spm_sample_vol(V(kImage), x, y, z,0)];

+        if kImage == 1 % sample coordinates from first image

+            xx = x;

+            yy = y;

+            zz = z;

+        end

+

     end

     extr(kImage).dat = dat;

 end

@@ -74,7 +74,31 @@ switch task

         assignin('base','preprocessedData',out);

     case 'FBS'

-        disp('not implemented')

+        disp('FSB');

+        out = struct;

+        out.header = struct;

+        out.header.type = 'FBS';

+        out.header.timeline = timeLine;

+        out.header.classDef = classDef;

+        

+        fbsargs = struct;

+        fbsargs.subject         = subjects;

+        

+        if(size(subjects,2)>1)

+            display(sprintf('No BATCH Support for Searchlight!'));

+            return

+        end

+        

+        fbsargs.timeline        = timeLine;

+        fbsargs.classes         = classDef;

+        fbsargs.mask            = mask;

+        fbsargs.basedir         = model.baseDir;

+        fbsargs.sessionList     = 1:3;

+        fbsargs.eventList       = classDef.eventMatrix;

+        fbsargs.psthOpts        = psthOpts;

+        

+        out.subjectdata = runFBSImageMaskMode(fbsargs);

+                

 end

 end

@@ -95,7 +95,7 @@ DEFAULT.wd  = fullfile('d:','Analyze','Choice','24pilot');

     % menu

-    savemenu = uimenu(frame,'Label','Save/Load');

+    savemenu = uimenu(frame,'Label','Save/Load','Enable','off');

         uimenu(savemenu,'Label','Save Preprocessing Parameter','Callback',{@mcb_save,model1},'Enable','off');

         uimenu(savemenu,'Label','Load Preprocessing Parameter','Callback',{@mcb_load,model1},'Enable','off');

         uimenu(savemenu,'Label','Save Decode Parameter','Callback',{@mcb_save,model2},'Enable','off');

@@ -346,7 +346,7 @@ pSOM = uipanel(parent,'Units','normalized','Position',[0.5 0.4 0.5 0.4]);

     btnRunSOM = uicontrol(pSOM,'String','run SOM Crossvalidation',...

         'Units','normalized',...

         'Position',[0.0 0.25 1 0.25]);

-    set(btnRunSOM,'Enable','on');

+    set(btnRunSOM,'Enable','off');

     btnRunXSOM = uicontrol(pSOM,'String','run SOM X-Subject validation',...

         'Units','normalized',...