Commit 53692aab authored by jayd1860's avatar jayd1860
Browse files

v1.14.3

-- Fixed type causing matlab exception in InitGuiControls.m
-- Fixed problem with StimEditGUI.m where it calculates correctly but doesn't display because we were using the status variable to tell us if anything changed in the stim incorrectly
parent a92434a1
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ end

% Decide which of the data type listboxes (Hb vs wavlength) is visible 
datatype = GetDatatype(handles);
if datatype == maingui.buttonVals.RAW || maingui.datatype == maingui.buttonVals.RAW_HRF
if datatype == maingui.buttonVals.RAW || datatype == maingui.buttonVals.RAW_HRF
    set(handles.listboxPlotWavelength, 'visible','on');
    set(handles.listboxPlotConc, 'visible','off');
elseif datatype == maingui.buttonVals.OD || maingui.datatype == maingui.buttonVals.OD_HRF
+8 −7
Original line number Diff line number Diff line
@@ -123,8 +123,6 @@ set(get(handles.axes1,'children'), 'ButtonDownFcn', @axes1_ButtonDownFcn);
zoom(hObject,'off');
StimEditGUI_Update(handles);
StimEditGUI_EnableGuiObjects('on', handles);


stimEdit.status=0;


@@ -161,7 +159,8 @@ StimEditGUI_Display(handles);
stimEdit.updateParentGui('StimEditGUI');
figure(handles.figure);

% Reset status
% Reset status only should be set/reset in top-level gui functions (ie
% callbacks)
stimEdit.status=0;


@@ -323,6 +322,10 @@ end
function EditSelectTpts(tPts_select)
global stimEdit
t = stimEdit.dataTree.currElem.GetTime();
if isempty(t)
    MessageBox('Current processing element has no time course data for stim editing. In MainGUI, change current processing element to Run to edit stim marks.');
    return;
end
tPts_idxs_select = [];
for ii=1:length(tPts_select)
    tPts_idxs_select(ii) = binaraysearchnearest(t, tPts_select(ii));
@@ -341,9 +344,6 @@ if stimEdit.status==0
    return;
end

% Reset status
stimEdit.status=0;



% ------------------------------------------------
@@ -536,11 +536,12 @@ stimEdit.dataTree.currElem.SetStimDuration(icond, data(:,2));
stimEdit.dataTree.currElem.SetStimValues(icond, data(:,3));



% -------------------------------------------------------------------
function StimEditGUI_DeleteFcn(hObject, eventdata, handles)
edit ProcStreamOptionsGUI.m


edit ProcStreamOptionsGUI.m

% --------------------------------------------------------------------
function menuItemChangeGroup_Callback(hObject, eventdata, handles)
+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ function vrnnum = getVernum()

vrnnum{1} = '1';   % Major version #
vrnnum{2} = '14';  % Major sub-version #
vrnnum{3} = '2';   % Minor version #
vrnnum{3} = '3';   % Minor version #
vrnnum{4} = '0';   % Minor sub-version # or patch #: 'p1', 'p2', etc