Changeset 150


Ignore:
Timestamp:
Nov 4, 2010, 4:55:36 PM (9 years ago)
Author:
tjniskan
Message:
  • Fixed a small figure resize bug in aedes_resviewer
  • Added a quick hack for disabling mouse wheel zooming, which

apparently has some issues in OSX with magic mouse. Zooming can be
disabled by setting the DisableMouseWheel? preference to true, i.e.
setpref('Aedes','DisableMouseWheel?',true)

M aedes_resviewer.m
M aedes.m
M aedes_revision.m

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • aedes.m

    r149 r150  
    9999% Detect Matlab version
    100100[Dat.MatlabVersion,Dat.isImageProc] = aedes_getmatlabversion;
     101
    101102
    102103% Show license and warranty notification ----------------
     
    34373438l_ResizeFcn([],[])
    34383439
     3440% A quick hack option for disabling mouse wheel zooming, which apparently
     3441% has issues in OSX with magic mouse...
     3442try
     3443  Dat.DisableMouseWheel = getpref('Aedes','DisableMouseWheel');
     3444catch
     3445  Dat.DisableMouseWheel = false;
     3446end
     3447
    34393448%% Set callback for Mouse scroll wheel
    3440 if Dat.MatlabVersion>=7.05
     3449if Dat.MatlabVersion>=7.05 && ~Dat.DisableMouseWheel
    34413450  set(H.FIG,'WindowScrollWheelFcn',@l_MouseWheelFcn)
    34423451end
  • aedes_resviewer.m

    r147 r150  
    473473    return
    474474  end
    475   set(H.MAIN_UIPANEL,'position',...
    476                     [10 10 300 fig_pos(4)-2*10]);
     475  tmp=get(H.MAIN_UIPANEL,'position');
     476  set(H.MAIN_UIPANEL,'position',[tmp(1) fig_pos(4)-tmp(4)-10 tmp(3:4)]);
     477  %set(H.MAIN_UIPANEL,'position',...
     478  %                  [10 10 300 fig_pos(4)-2*10]);
    477479  main_panel_pos = get(H.MAIN_UIPANEL,'position');
    478480  set(H.RESTABLE,'position',[main_panel_pos(1)+main_panel_pos(3)+10 10 fig_pos(3)-2.5*10-main_panel_pos(3) fig_pos(4)-3*10]);
     
    481483  set(H.RESTABLE_TX,'position',[tmp(1) tmp(2)+tmp(4) tmp(3) 15])
    482484 
    483   % Reposition uipanels
    484   tmp=get(H.MAIN_UIPANEL,'position');
    485   set(H.OUTDIR_EDIT,'position',[10 tmp(4)-20-20 240 20])
    486   tmp = get(H.OUTDIR_EDIT,'position');
    487   set(H.OUTDIR_TX,'position',[tmp(1) tmp(2)+tmp(4)+2 100 12])
    488   set(H.OUTPUT_BROWSE,'position',[tmp(1)+tmp(3)+5 tmp(2) 35 20])
    489  
    490   tmp = get(H.OUTDIR_EDIT,'position');
    491   set(H.SELFILES_UIPANEL,'position',[tmp(1) tmp(2)-10-185 280 185])
    492   tmp = get(H.SELFILES_UIPANEL,'position');
    493   set(H.EXPORT_FILETYPES_GRP,'position',[10 tmp(2)-70-10 280 70])
    494   tmp = get(H.EXPORT_FILETYPES_GRP,'position');
    495   set(H.EXPORT_OPTIONS_GRP,'position',[10 tmp(2)-10-220 280 220])
     485%   % Reposition uipanels
     486%   tmp=get(H.MAIN_UIPANEL,'position');
     487%   set(H.OUTDIR_EDIT,'position',[10 tmp(4)-20-20 240 20])
     488%   tmp = get(H.OUTDIR_EDIT,'position');
     489%   set(H.OUTDIR_TX,'position',[tmp(1) tmp(2)+tmp(4)+2 100 12])
     490%   set(H.OUTPUT_BROWSE,'position',[tmp(1)+tmp(3)+5 tmp(2) 35 20])
     491%  
     492%   tmp = get(H.OUTDIR_EDIT,'position');
     493%   set(H.SELFILES_UIPANEL,'position',[tmp(1) tmp(2)-10-185 280 185])
     494%   tmp = get(H.SELFILES_UIPANEL,'position');
     495%   set(H.EXPORT_FILETYPES_GRP,'position',[10 tmp(2)-70-10 280 70])
     496%   tmp = get(H.EXPORT_FILETYPES_GRP,'position');
     497%   set(H.EXPORT_OPTIONS_GRP,'position',[10 tmp(2)-10-220 280 220])
    496498 
    497499  Dat.OldFigSize = fig_pos;
  • aedes_revision.m

    r149 r150  
    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