SVMCrossVal.git

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

+function s = getClassDefString(model)

+s =get(model.txtClassDef,'String');

+end

\ No newline at end of file

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

+function classes = getClasses(model)

+classes = parseClassDef(model);

+end

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

+function s = getCoordDefString(model)

+s = get(model.txtVoxelDef,'String');

+end

\ No newline at end of file

@@ -1,7 +1,7 @@

 function runROIImageMaskMode(subjects,timeline)

-        imageStruct = loadImageFileNamesData(loadParams);

-        assignin('base','imageStruct',imageStruct);

+%         imageStruct = loadImageFileNamesData(loadParams);

+%         assignin('base','imageStruct',imageStruct);

 %         coordinateStruct = computeCoordinates(imageStruct);

 %         assignin('base','coordinateStruct',coordinateStruct);

@@ -6,7 +6,7 @@ set(model.subjectSelector,'String',subjectNames);

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

 set(model.subjectSelector,'Value',model.selectedSubject);

-subjectNames(model.selectedSubject)

+%subjectNames(model.selectedSubject)

 imageMask = imageMaskNames(fullfile(model.baseDir,cell2mat(subjectNames(model.selectedSubject))));

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

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

+function model = setClassDefString(model,s)

+set(model.txtClassDef,'String',s);

+end

\ No newline at end of file

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

+function model = setCoordDefString(model,s)

+set(model.txtVoxelDef,'String',s);

+end

\ No newline at end of file

@@ -27,23 +27,31 @@ DEFAULT.wd  = fullfile('d:','Analyze','Choice','24pilot');

     set(frame,'Name','SVMCrossVal Decode Performance 4 SPM');

     set(frame,'NumberTitle','off');

     set(frame,'MenuBar','none');

-    set(frame,'Color',get(0,'defaultUicontrolBackgroundColor'));

+%     set(frame,'Color',get(0,'defaultUicontrolBackgroundColor'));

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

     set(frame,'Units','normalized');

+    set(frame,'Color','w');

-    pFirstStep   = uipanel(frame,'Title','Preprocessing','Position',[0 0.3 1 0.7]);

+    model = struct;

+    model.baseDir = DEFAULT.wd;

+

+    model.txtBaseDir = createLabel(frame,[0 0.97 1 0.03],model.baseDir);

+    set(model.txtBaseDir,'BackgroundColor','w');

+    

+    pFirstStep   = uipanel(frame,'Title','Preprocessing','Position',[0 0.25 1 0.720]);

     set(pFirstStep,'BackgroundColor','w');

     set(pFirstStep,'Units','normalized');

-    model = struct;

-    model.baseDir = DEFAULT.wd;

+    

+

+    

     model.selectedSubject = DEFAULT.selectedSubject;

     model = createFirstStepPanel(model,pFirstStep,DEFAULT);

     %Classification Step

     secondStepBaseColor = 'w';

-    pSecondStep = uipanel(frame,'Title','Classification','Position',[0 0 1 0.3]);

+    pSecondStep = uipanel(frame,'Title','Classification','Position',[0 0 1 0.25]);

     set(pSecondStep,'BackgroundColor',secondStepBaseColor);

@@ -53,6 +61,8 @@ DEFAULT.wd  = fullfile('d:','Analyze','Choice','24pilot');

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

     uimenu(savemenu,'Label','Load','Callback',{@mcb_load,model});

+    cdmenu = uimenu(frame,'Label','change Study');

+    

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

     % fill with data

@@ -65,19 +75,23 @@ disp('SAVE');

 baseDir  = model.baseDir;

 timeLine = getTimeLineParams(model);

 subjects = getSubjectCellList(model);

-% classDef

+classDefString = getClassDefString(model);

+coordDefString = getCoordDefString(model);

 % images

 % normalization

 [file path] = uiputfile('*.mat','Save current Params ...',model.baseDir);

-save( fullfile(path,file),'baseDir','timeLine','subjects') ;

+save( fullfile(path,file),'baseDir','timeLine','subjects','classDefString','coordDefString') ;

 end

 function model = mcb_load(src,evnt,model)

 disp('LOAD');

 [file path] = uigetfile('*.mat','Save current Params ...',model.baseDir);

 l = load(fullfile(path,file));

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

 model = setTimeLineParams(model,l.timeLine);

+model = setClassDefString(model,l.classDefString);

+model = setCoordDefString(model,l.coordDefString);

 end

@@ -117,6 +131,7 @@ pSOM = uipanel(parent,'Units','normalized','Position',[0.5 0.0 0.5 1]);

         'Units','normalized',...

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

     set(btnRunSVM,'Callback',{@cbRunSVM,model}); % set here, because of model.

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

     btnRunXSVM = uicontrol(pSVM,'String','run SVM X-Subject validation',...

         'Units','normalized',...

@@ -295,13 +310,13 @@ function model = createFirstStepPanel(model,parent,DEFAULT)

         btnRunButton1 = uicontrol(pButtons,'String','run coord-Table',...

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

-        set(btnRunButton1,'Callback',{@cbRunCoordTable,model}); % set here, because of model.    

-        set(btnRunButton1,'Enable','off');

+        set(btnRunButton1,'Callback',{@cbRunPreprocessing,model,'COORD'}); % set here, because of model.    

+        set(btnRunButton1,'Enable','on');

         btnRunButton2 = uicontrol(pButtons,'String','run full Brain Searchlight',...

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

-        set(btnRunButton2,'Callback',{@cbRunFBS,model}); % set here, because of model.  

-        set(btnRunButton2,'Enable','off');

+        set(btnRunButton2,'Callback',{@cbRunPreprocessing,model,'FBS'}); % set here, because of model.  

+        set(btnRunButton2,'Enable','on');

         btnRunButton3 = uicontrol(pButtons,'String','run ROI-Image processing',...

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

@@ -317,33 +332,35 @@ function cbRunPreprocessing(src,evnt,model,task)

 disp('RUN');

 timeLine = getTimeLineParams(model);

 subjects = getSubjectCellList(model);

-% classDef

+classDef = parseClassDef(model);

 % images

 % normalization

 switch task

     case 'COORD'

-        coordinates=3

+        disp('COORD');

+        coordinates= 'parse me'

     case 'ROI'

         disp('ROI');

         runROIImageMaskMode(subjects,timeLine)

     case 'FBS'

+        disp('FBS')

 end

 end

-function cbRunCoordTable(src,evnt,model)

-    display('RUN Coord-Table Mode');

-    main('COORD-LOOKUP-TABLE',model);

-end

-function cbRunROIImage(src,evnt,model)

-    display('RUN Image-Mask Mode');

-    main('ROI-IMAGE-MASK', model);

-end

-function cbRunFBS(src,evnt,model)

-    display('RUN Full Brain Searchlight Mode');

-    display('not implemented.');

-end

+% function cbRunCoordTable(src,evnt,model)

+%     display('RUN Coord-Table Mode');

+%     main('COORD-LOOKUP-TABLE',model);

+% end

+% function cbRunROIImage(src,evnt,model)

+%     display('RUN Image-Mask Mode');

+%     main('ROI-IMAGE-MASK', model);

+% end

+% function cbRunFBS(src,evnt,model)

+%     display('RUN Full Brain Searchlight Mode');

+%     display('not implemented.');

+% end

 function label = createLabel(parent,  pos, labelText)