Christoph Budziszewski commited on 2009-04-16 17:00:50
Zeige 4 geänderte Dateien mit 14 Einfügungen und 6 Löschungen.
git-svn-id: https://svn.discofish.de/MATLAB/spmtoolbox/SVMCrossVal@176 83ab2cfd-5345-466c-8aeb-2b2739fb922d
| ... | ... |
@@ -11,14 +11,14 @@ function pst = calculatePST(timeline,pstopts,data) |
| 11 | 11 |
edur = 12; |
| 12 | 12 |
pre = timeline.psthStart; |
| 13 | 13 |
post = timeline.psthEnd; |
| 14 |
- res = 1; |
|
| 14 |
+ tr = timeline.tr; |
|
| 15 |
+ res = tr * timeline.trFactor; |
|
| 15 | 16 |
|
| 16 | 17 |
normz = 'file'; |
| 17 | 18 |
pm = 0; |
| 18 | 19 |
|
| 19 | 20 |
lsess = getNumberOfScans(des); |
| 20 | 21 |
nSessions = getNumberOfSessions(des); |
| 21 |
- tr = 2; |
|
| 22 | 22 |
|
| 23 | 23 |
[evntrow evntcol]=size(eventList); |
| 24 | 24 |
|
| ... | ... |
@@ -8,4 +8,6 @@ timelineParams.psthStart = getDouble(paramModel.txtPSTHStart); % -25; |
| 8 | 8 |
timelineParams.psthEnd = getDouble(paramModel.txtPSTHEnd); % 20; |
| 9 | 9 |
timelineParams.baselineStart = getDouble(paramModel.txtBaselineStart); % -22; |
| 10 | 10 |
timelineParams.baselineEnd = getDouble(paramModel.txtBaselineEnd); % -20; |
| 11 |
+timelineParams.tr = 2; |
|
| 12 |
+timelineParams.trFactor = getDouble(paramModel.txtTrFactor); |
|
| 11 | 13 |
end |
| ... | ... |
@@ -6,6 +6,7 @@ DEFAULT.pststart = -15; |
| 6 | 6 |
DEFAULT.pstend = 40; |
| 7 | 7 |
DEFAULT.baselinestart = -3; |
| 8 | 8 |
DEFAULT.baselineend = -1; |
| 9 |
+DEFAULT.trfactor = 0.5; |
|
| 9 | 10 |
DEFAULT.frameshiftstart = -5; |
| 10 | 11 |
DEFAULT.frameshiftend = 35; |
| 11 | 12 |
DEFAULT.frameshiftdur = 0; |
| ... | ... |
@@ -187,9 +188,9 @@ function model = createFirstStepPanel(model,parent,DEFAULT) |
| 187 | 188 |
tl_grid{2,4} = [0.4 0.33 grid_w grid_h];
|
| 188 | 189 |
tl_grid{3,4} = [0.7 0.33 grid_w grid_h];
|
| 189 | 190 |
|
| 190 |
- tl_grid{1,5} = [0.0 0.16 0.5 grid_h];
|
|
| 191 |
- tl_grid{2,5} = [0.5 0.16 grid_w grid_h];
|
|
| 192 |
- tl_grid{3,5} = [0.75 0.16 grid_w grid_h];
|
|
| 191 |
+ tl_grid{1,5} = [0.0 0.16 grid_w grid_h];
|
|
| 192 |
+ tl_grid{2,5} = [0.4 0.16 grid_w grid_h];
|
|
| 193 |
+ tl_grid{3,5} = [0.7 0.16 grid_w grid_h];
|
|
| 193 | 194 |
|
| 194 | 195 |
tl_grid{1,6} = [0.0 0.0 0.5 grid_h];
|
| 195 | 196 |
tl_grid{2,6} = [0.5 0.0 grid_w grid_h];
|
| ... | ... |
@@ -199,12 +200,14 @@ function model = createFirstStepPanel(model,parent,DEFAULT) |
| 199 | 200 |
lEnd = createLabel(pPSTH, cell2mat(tl_grid(3,1)) ,'End [sec]'); |
| 200 | 201 |
lPSTH = createLabel(pPSTH, cell2mat(tl_grid(1,2)),'PSTH Range'); |
| 201 | 202 |
lBaseline = createLabel(pPSTH, cell2mat(tl_grid(1,3)),'Baseline'); |
| 203 |
+ lTRF = createLabel(pPSTH, cell2mat(tl_grid(1,5)),'TR Factor'); |
|
| 202 | 204 |
|
| 203 | 205 |
model.txtPSTHStart = createTextField(pPSTH,cell2mat(tl_grid(2,2)),DEFAULT.pststart); |
| 204 | 206 |
model.txtPSTHEnd = createTextField(pPSTH,cell2mat(tl_grid(3,2)),DEFAULT.pstend); |
| 205 | 207 |
model.txtBaselineStart = createTextField(pPSTH,cell2mat(tl_grid(2,3)),DEFAULT.baselinestart); |
| 206 | 208 |
model.txtBaselineEnd = createTextField(pPSTH,cell2mat(tl_grid(3,3)),DEFAULT.baselineend); |
| 207 |
- |
|
| 209 |
+ model.txtTrFactor = createTextField(pPSTH,cell2mat(tl_grid(2,5)),DEFAULT.trfactor); |
|
| 210 |
+ model.labelTR = createTextField(pPSTH, cell2mat(tl_grid(3,5)),''); |
|
| 208 | 211 |
|
| 209 | 212 |
% images |
| 210 | 213 |
pImage = uipanel(parent,'Title','Image Options','Position',cell2mat(main_grid(2,2))); |
| 211 | 214 |