Commit a8e600b8 authored by Jay Dubb's avatar Jay Dubb
Browse files

v1.25.9 

-- Fix but found in StimEditGUI. When changing current element from one run to another, an unsaved change made to the stims of the previous run remains in effect even though the user clicked NO to Save question before the current element is changed.

-- Added function errorCheck() in extractButtondownPoints() to check the coherence of a user button down selection in StimEditGUI axes (or any other GUI). There seems to be a bug in Matlab R2020a where you select an axes region, rbbox correctly reports that a rectangle was selected - in other words, the 3rd number in finalRect is > 0 - BUT p2 is equal to p1 (meaning only a point has been selected), contradicting what rbbox shows. This problem does not exist in say R2017b. So to compensate for this bug we check finalRect against {p1,p2} and if finalRect is showing a size > 0 then we add the comparable size to p2.
parent 3b50f2bd

StimEditGUI/StimEditGUI.m

+8 −3
Original line number Diff line number Diff line
@@ -657,8 +657,12 @@ end 
if ~ishandles(handles.figure)

    return;

end

idx = stimEdit.dataTree.currElem.GetIndexID();

stimEdit.locDataTree.SetCurrElem(idx(1), idx(2), idx(3))

idx1 = stimEdit.dataTree.currElem.GetIndexID();

idx2 = stimEdit.locDataTree.currElem.GetIndexID();

if ~all(idx1==idx2)

    % Reload data tree into local copy if the current element has changed

    stimEdit.locDataTree = DataTreeClass(stimEdit.dataTree);    

end



conditions =  stimEdit.locDataTree.currElem.GetConditions();

filename = stimEdit.locDataTree.currElem.GetName();
@@ -910,6 +914,7 @@ for i = (lpf_len + 1):length(time_filt) % Exclude LPF artifact 
    last = aux_filt(i);

end





% --------------------------------------------------------------------

function editThresh_Callback(hObject, eventdata, handles)

val = str2double(hObject.String);

Utils/extractButtondownPoints.m

+70 −8
Original line number Diff line number Diff line 
function [p1, p2, err] = extractButtondownPoints()



err = 0;



p1 = get(gca,'CurrentPoint');    % button down detected

finalRect = rbbox;                   % return figure units

p2 = get(gca,'CurrentPoint');



count=0;

if all(p1==p2) & all(finalRect(3:4)==0)

    dispSelectedPts(p1,p2,finalRect,count);

[err, p1, p2] = errorCheck(p1, p2, finalRect);

if err<1

    dispSelectedPts(p1,p2,finalRect);

    return;

end



count=0;

maxiter = 10;

while all(p1==p2)

    pause(.01);
@@ -22,12 +21,75 @@ while all(p1==p2) 
    p2 = get(gca,'CurrentPoint');

end



dispSelectedPts(p1,p2,finalRect,count);

dispSelectedPts(p1, p2, finalRect);







% ----------------------------------------------------------

function [err, p1, p2] = errorCheck(p1, p2, finalRect)



% NOTE - bug alert! Oct 2, 2020, JD:

% This function was added to check the coherence of a user button down 

% selection in GUI axes. There seems to be a bug in Matlab R2020a where 

% you select an axes region, rbbox correctly reports that a rectangle was 

% selected - in other words, the 3rd number in finalRect is > 0 - BUT p2 

% is equal to p1 (meaning only a point has been selected), contradicting 

% what rbbox shows. This problem does not exist in say R2017b. So to 

% compensate for this bug we check finalRect against {p1,p2} and if 

% finalRect is showing a size > 0 then we add the comparable size to p2. 

%

err = 0;



u = get(gcf, 'units');

u0 = get(gcf, 'units');

set(gca, 'units',u);

p = get(gca, 'position');

xlim = get(gca, 'xlim');



axesSize_guiUnits  = p(3);

axesSize_userUnits = xlim(2) - xlim(1);



scalingFactor = axesSize_userUnits / axesSize_guiUnits;



rectSize_finalRect    = scalingFactor * finalRect(3);

rectSize_CurrentPoint = p2(1) - p1(1);



if all(p1==0) & all(p2==0)

    err = -1;

    set(gca, 'units',u0);

    return

end



p2 = p1 + rectSize_finalRect;



fprintf('\n');

fprintf('Selection rectangle from finalRect    :  %0.1f\n', rectSize_finalRect);

fprintf('Selection rectangle from CurrentPoint :  %0.1f\n', rectSize_CurrentPoint );



set(gca, 'units',u0);







% ----------------------------------------------------------

function dispSelectedPts(p1,p2,finalRect,count)

function dispSelectedPts(p1, p2, finalRect)

u = get(gcf, 'units');

u0 = get(gcf, 'units');

set(gca, 'units',u);

p = get(gca, 'position');

xlim = get(gca, 'xlim');



fprintf('\n');



fprintf('axes size:  [%0.2f, %0.2f, %0.2f, %0.2f]\n', p(1), p(2), p(3), p(4));

fprintf('axes xlim:  [%0.2f, %0.2f]\n', xlim(1), xlim(2));

fprintf('finalRect: [%0.2f, %0.2f, %0.2f, %0.2f]\n', finalRect(1), finalRect(2), finalRect(3), finalRect(4));

fprintf('p1:        [%0.2f, %0.2f]\n', p1(1), p1(2));

fprintf('p2:        [%0.2f, %0.2f]\n', p2(1), p2(2));

fprintf('count:     %d\n', count);
 


fprintf('\n');



set(gca, 'units',u0);

Utils/getVernum.m

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ function vrnnum = getVernum() 


vrnnum{1} = '1';   % Major version #

vrnnum{2} = '25';  % Major sub-version #

vrnnum{3} = '8';   % Minor version #

vrnnum{3} = '9';   % Minor version #

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE