Changeset 149


Ignore:
Timestamp:
Nov 4, 2010, 9:23:07 AM (9 years ago)
Author:
tjniskan
Message:
  • Fixed: Mouse scroll wheel input generated errors if no data was open

in Aedes

M aedes.m
M aedes_revision.m

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • aedes.m

    r148 r149  
    320320             'CloseRequestFcn',@l_quit,...
    321321             'Handlevisibility','off');
    322 if Dat.MatlabVersion>=7.05
    323   set(H.FIG,'WindowScrollWheelFcn',@l_MouseWheelFcn)
    324 end
    325322
    326323
     
    27652762set(H.UIVIEW_TIMESERIES,'checked','off')
    27662763
     2764%% Remove callback for Mouse scroll wheel
     2765if Dat.MatlabVersion>=7.05
     2766  set(H.FIG,'WindowScrollWheelFcn','')
     2767end
     2768
    27672769% Delete all ROIs and related images and axes
    27682770if ~PreserveData
     
    28662868end
    28672869
    2868 % Clear internal variables
    2869 Dat = [];
    2870 
    28712870% disable uicontrols
    28722871set(H.UICH_ENABLED,'enable','off')
     
    28782877set(H.BLANK_FRAME,'visible','on')
    28792878%drawnow
     2879
     2880% Clear internal variables
     2881Dat = [];
    28802882
    28812883catch
     
    34353437l_ResizeFcn([],[])
    34363438
    3437 % $$$ %% Rotate images if necessary
    3438 % $$$ if ( ~all(Dat.DataRotation==0) || ~all(Dat.DataFlip==0) ) ...
    3439 % $$$       && Dat.LoadRoiAtStartUp
    3440 % $$$   
    3441 % $$$   for ii=1:Dat.DataL
    3442 % $$$     if Dat.DataRotation(ii)~=0
    3443 % $$$       DATA{ii}.FTDATA = rot90(DATA{ii}.FTDATA,Dat.DataRotation(ii));
    3444 % $$$     end
    3445 % $$$     
    3446 % $$$     if Dat.DataFlip(ii)~=0
    3447 % $$$       if Dat.DataFlip(ii)==1
    3448 % $$$         DATA{ii}.FTDATA = flipud(DATA{ii}.FTDATA);
    3449 % $$$       elseif Dat.DataFlip(ii)==2
    3450 % $$$         DATA{ii}.FTDATA = fliplr(DATA{ii}.FTDATA);
    3451 % $$$       end
    3452 % $$$     end
    3453 % $$$   end
    3454 % $$$ end
    3455 % $$$
    3456 % $$$ %% If the ROI-structure has been given in file load time, refresh ROIs
    3457 % $$$ if ~isempty(ROI)
    3458 % $$$   l_RoiLoad([],[],'')
    3459 % $$$ end
     3439%% Set callback for Mouse scroll wheel
     3440if Dat.MatlabVersion>=7.05
     3441  set(H.FIG,'WindowScrollWheelFcn',@l_MouseWheelFcn)
     3442end
     3443
     3444
    34603445
    34613446catch
  • aedes_revision.m

    r148 r149  
    9393% bash-script every time it is called so that this file "aedes_revision.m" is
    9494% always in the list of committed files. DO NOT EDIT THE NEXT LINE!!!
    95 % - Svn Hook -
     95% - SVN Hook -
Note: See TracChangeset for help on using the changeset viewer.

Powered by Trac 1.0.9.Copyright © Juha-Pekka Niskanen 2008