SVMCrossVal.git

@@ -5,5 +5,9 @@ uimenu(menu,...

 end

 function mcb_load_study(src,blah,filename,uimodel)

+    %save current study

+    studyID = get(uimodel.txtStudyID,'String');

+    saveStudy(studyID,uimodel);

+    %load selected study

     load_study(filename,uimodel);

 end

@@ -26,7 +26,7 @@ StudyArgs.frameshiftstart = '0';

 StudyArgs.frameshiftend = '0';

 StudyArgs.frameshiftdur = '0';

-StudyArgs.svmoptstring = '';

+StudyArgs.svmoptstring = '-s 0 -t 0 -c 1';

 StudyArgs.svmnfold = '0';

 StudyArgs.svmrnd = 1;

@@ -35,11 +35,11 @@ StudyArgs.somN = '0';

 StudyArgs.latticeModelValue = 1;

 StudyArgs.somnfold = '0';

-StudyArgs.searchlightradius = '0';

+StudyArgs.searchlightradius = '3';

 StudyArgs.searchlightTimeline = '';

-% file = strcat(studyID,'.mat');

-% save(fullfile('D:\SPM\spm2\toolbox\SVMCrossVal\study',file),'-Struct','StudyArgs') ;

+file = strcat(studyID,'.mat');

+save(fullfile('D:\SPM\spm2\toolbox\SVMCrossVal\study',file),'-Struct','StudyArgs') ;

 ret=StudyArgs;

 end

\ No newline at end of file

@@ -4,8 +4,8 @@ switch getSPMVersion

     case 'SPM5'

         filter = '^.*\.hdr$';

         [files, dirs] = spm_select('List', fullfile(subjectDir,'a'), filter);

-%     case 'SPM2'

-%         files = 'swrfandersen-0003-00001-000001.hdr';

+    case 'SPM2x'

+        files = 'swrfandersen-0003-00001-000001.hdr';

     otherwise

         filter = '^.*\.hdr$';

         files = getFilteredFileList(fullfile(subjectDir,'a'),filter,0);

@@ -29,6 +29,25 @@ function StudyArgs = load_study(studyFile,model)

     set(model.selNormPST, 'Value',StudyArgs.selNormPSTValue);

     set(model.chkColBias, 'Value',StudyArgs.chkColBiasValue);

+    

+    %%%% 

+    

+    set(model.txtFrameShiftStart,'String', StudyArgs.frameshiftstart );

+    set(model.txtFrameShiftEnd,'String',StudyArgs.frameshiftend);

+    set(model.txtFrameShiftDur,'String',StudyArgs.frameshiftdur);

+

+    set(model.txtSVMopts,'String',StudyArgs.svmoptstring );

+    set(model.txtSVMnfold,'String',StudyArgs.svmnfold );

+    set(model.chkSVMrnd,'Value',StudyArgs.svmrnd );

+

+    set(model.txtSomM,'String',StudyArgs.somM);

+    set(model.txtSomN,'String',StudyArgs.somN);

+    set(model.selSomLattice,'Value',StudyArgs.latticeModelValue);

+    set(model.txtSOMnfold,'String',StudyArgs.somnfold );

+

+    set(model.txtSearchlightRadius,'String',StudyArgs.searchlightradius );

+    set(model.txtSearchlightTimeline,'String',StudyArgs.searchlightTimeline);

+

 end

@@ -42,7 +42,7 @@ switch task

         coordargs = struct;

         coordargs.subjects      = subjects;

         coordargs.timeline      = timeLine;

-        coordargs.basedir       = model.baseDir;

+        coordargs.basedir       = getBaseDir(model);

         coordargs.sessionList   = 1:3;

         coordargs.eventList     = classDef.eventMatrix;

         coordargs.coords        = parseCoordinateTextField(model);

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

 function ret = saveStudy(studyID,model)

+if strcmp(studyID,'')

+    ret = 0;

+    return

+end

 display(['SAVE ' studyID]);

 StudyArgs.baseDir             = getBaseDir(model);

@@ -15,10 +15,6 @@ function ui_main(varargin)

     task = struct;

-%     studyID = getPreviousStudyID();

-    

-%     StudyArgs = load_study(studyID);

-

     model = struct;

     model.txtBaseDir = createLabel(frame,[0 0.97 0.8 0.03],'');

@@ -35,12 +31,8 @@ function ui_main(varargin)

     task.preprocessing   = uipanel(frame,'Title','Preprocessing','Position',[0 0.0 1 TASK_HEIGHT]);

     set(task.preprocessing,'BackgroundColor','w');

     set(task.preprocessing,'Units','normalized');

-    

     model = createFirstStepPanel(model,task.preprocessing);

-    % fill with data

-%     model = scanDirs(model);

-    

     % CLASSIFICATION

     task.classification = uipanel(frame,'Title','Classification','Position',[0 0.0 1 TASK_HEIGHT]);

     set(task.classification,'BackgroundColor','w');

@@ -51,7 +43,7 @@ function ui_main(varargin)

     set(task.plot,'BackgroundColor','w');

     model = createVisualStepPanel(model,task.plot);

-    % TASK

+    % TASK SWITCH BUTTONS

     task.taskSwitch = uibuttongroup(frame,'Position',[0 1-0.13 1 0.10]);

     % controlls togglebuttons

         set(task.taskSwitch,'BackgroundColor','w');

@@ -76,7 +68,7 @@ function ui_main(varargin)

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

-    % menus

+    % MENUS

     savemenu = uimenu(frame,'Label','Save ...','Enable','on');

         uimenu(savemenu,'Label','Save All','Callback',{@mcb_save,model},'Enable','on');

@@ -85,8 +77,9 @@ function ui_main(varargin)

         uimenu(studySelectMenu,'Label','*new Study*','Callback',{@mcb_new_study,studySelectMenu,model});

         fillStudyMenu(studySelectMenu,model);

-    updateMenu = uimenu(frame,'Label','update ...','Enable','off');

-        uimenu(updateMenu,'Label','scan dirs','Callback',{@ssss,studySelectMenu});

+    updateMenu = uimenu(frame,'Label','update ...','Enable','on');

+        uimenu(updateMenu,'Label','rescan subject dir','Callback',{@mcb_update_subjects,model});

+        uimenu(updateMenu,'Label','rescan images','Callback',{@mcb_update_imagebase,model});

 %     newStudyMenu = uimenu(frame,'Label','new Study','Enable','on');

@@ -346,7 +339,7 @@ pSearchlight = uipanel(parent,'Units','normalized','Position',[0.0 0.1 0.5 0.3])

     set(pSearchlight,'Title','Spatiotemporal FB classification');

     set(pSearchlight,'BackgroundColor',basecolor);

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

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

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

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

@@ -441,7 +434,37 @@ studyID = get(model.txtStudyID,'String');

 saveStudy(studyID,model);

 end

+function mcb_update_subjects(src,evnt,model)

+studyID = get(model.txtStudyID,'String');

+baseDir = getBaseDir(model);

+subjectNames = listDirNames(baseDir);

+

+set(model.subjectSelector,'String',subjectNames);

+set(model.subjectSelector,'UserData',subjectNames);

+set(model.subjectSelector,'Value',1);

+

+saveStudy(studyID,model);

+end

+

+function mcb_update_imagebase(src,evnt,model)

+studyID = get(model.txtStudyID,'String');

+

+subjectNames = getSubjectCellList(model);

+imageDir = fullfile(getBaseDir(model),cell2mat(subjectNames(1)));

+imageMask = imageMaskNames(imageDir);

+

+set(model.imageTypeSelection,'String',imageMask);

+set(model.imageTypeSelection,'UserData',imageMask);

+set(model.imageTypeSelection,'Value',1);

+

+saveStudy(studyID,model);

+end

+

+

 function mcb_new_study(src,evnt,studymenu,uimodel)

+studyID = get(uimodel.txtStudyID,'String');

+saveStudy(studyID,uimodel);

+

 display('CREATE STUDY');

     ui_createStudy(studymenu,uimodel);

 end

@@ -15,6 +15,8 @@ end

 global SVMCROSSVAL_DEBUG;

 defineGlobals();

+%reset defaults to _my_ liking ;)

+bootstrap('default');

 switch nargin

     case 0