Changeset 78 for aedes.m


Ignore:
Timestamp:
Feb 17, 2009, 3:00:56 PM (9 years ago)
Author:
tjniskan
Message:
  • Moved fMRI related plugins to their own subdirectories
  • Created a subdirectory for map calculation plugins and added a few

basic plugins for those. At the moment these plugins do not support
masking etc. and I didn't test them at all so be cautious...

  • Made a minor memory optimation to an2_readfid.m
  • Fixed a few issues in files related updating via SVN
  • Disabled some annoying warnings that Matlab R2008a and higher

generate from uitree and uitreenode functions inan2_juigetfiles.m

  • Coded something minor to an2_maptool.m. This is still stub and does

not work at all. Please don't try to use it.

  • Fixed a bug that caused Aedes to fail without generating an error

when reading VNMR FID-files that don't have PROCPAR in the same folder.

  • Fixed a javaFrame -warning (with R2008a and higher) in aedes.m

M an2_revision.m
M an2_data_read.m
M an2_maptool.m
M aedes.m
D plugins/calculate_t2_map.m
D plugins/calculate_t1r_map.m
D plugins/basic_fmri_analysis.m
D plugins/resting_state_fc.m
A plugins/fmri_plugins
A plugins/fmri_plugins/basic_fmri_analysis.m
A plugins/fmri_plugins/resting_state_fc.m
A plugins/map_plugins
A plugins/map_plugins/t2.m
A plugins/map_plugins/t1_3_parameter_fit.m
A plugins/map_plugins/t1_saturation_recovery.m
A plugins/map_plugins/t1_rho.m
A plugins/map_plugins/t2_rho.m
A plugins/map_plugins/t1_inversion_recovery.m
M an2_readfid.m
M an2_check_updates.m
M an2_juigetfiles.m
M an2_update.m

File:
1 edited

Legend:

Unmodified
Added
Removed
  • aedes.m

    r77 r78  
    43134313 
    43144314  H.OVERLAY_CONTROL_FIG = figure('units','pixel',...
    4315         'position',...
    4316         [fig_left fig_bottom ...
    4317         fig_w fig_h],...
    4318         'Name','Image Overlay Controls',...
    4319         'numbertitle','off',...
    4320         'Toolbar','none',...
    4321         'Color',FigColor,...
    4322         'Menubar','none',...
    4323         'DoubleBuffer','on',...
    4324         'DockControls','off',...
    4325         'renderer','painters',...
    4326         'resize','off',...
    4327         'CloseRequestFcn',{@l_OverlayControlCB,'close_window'},...
    4328         'Handlevisibility','off');
     4315    'position',...
     4316    [fig_left fig_bottom ...
     4317    fig_w fig_h],...
     4318    'Name','Image Overlay Controls',...
     4319    'numbertitle','off',...
     4320    'Toolbar','none',...
     4321    'Color',FigColor,...
     4322    'Menubar','none',...
     4323    'DoubleBuffer','on',...
     4324    'DockControls','off',...
     4325    'renderer','painters',...
     4326    'resize','off',...
     4327    'CloseRequestFcn',{@l_OverlayControlCB,'close_window'},...
     4328    'Handlevisibility','off');
     4329 
     4330  % Suppress warning from get(fh,'javaFrame') generated in Matlab R2008a->
     4331  matlab_version = version;
     4332  matlab_version = str2num(matlab_version(1:3));
     4333  if matlab_version>=7.6
     4334    warning('off','MATLAB:HandleGraphics:ObsoletedProperty:JavaFrame');
     4335  end
    43294336 
    43304337  % Try to set the figure as floating i.e. "always on top"
    4331   try
    4332         % Matlab R2008a generates a warning from get(fh,'javaFrame'), suppress
    4333         % it with warning off
    4334         warning off
    4335         jf = get(H.OVERLAY_CONTROL_FIG,'javaFrame');
    4336         pause(0.1) % Make Matlab more stable...
    4337         wh = jf.fFigureClient.getWindow;
    4338         pause(0.1)
    4339         wh.setAlwaysOnTop(true);
    4340         pause(0.1)
    4341         warning on
    4342   catch
    4343         % Make sure that warnings are on
    4344         warning on
    4345   end
     4338  jf = get(H.OVERLAY_CONTROL_FIG,'javaFrame');
     4339  pause(0.1) % Make Matlab more stable...
     4340  wh = jf.fFigureClient.getWindow;
     4341  pause(0.1)
     4342  wh.setAlwaysOnTop(true);
     4343  pause(0.1)
    43464344                                                           
    43474345  uipanel_h = uipanel('parent',H.OVERLAY_CONTROL_FIG,...
     
    58825880    'closereq',@l_SaveTSfigPosition);
    58835881 
     5882  % Suppress warning from get(fh,'javaFrame') generated in Matlab R2008a->
     5883  matlab_version = version;
     5884  matlab_version = str2num(matlab_version(1:3));
     5885  if matlab_version>=7.6
     5886    warning('off','MATLAB:HandleGraphics:ObsoletedProperty:JavaFrame');
     5887  end
     5888 
    58845889  % Try to set the figure as floating i.e. "always on top"
    5885   try
    5886     % Matlab R2008a generates a warning from get(fh,'javaFrame'), suppress
    5887     % it with warning off
    5888     warning off
    5889     jf = get(H.TSFIG,'javaFrame');
    5890     pause(0.1) % Make Matlab more stable...
    5891     wh = jf.fFigureClient.getWindow;
    5892     pause(0.1)
    5893     wh.setAlwaysOnTop(true);
    5894     pause(0.1)
    5895     warning on
    5896   catch
    5897     % Make sure that warnings are on
    5898     warning on
    5899   end
     5890  jf = get(H.TSFIG,'javaFrame');
     5891  pause(0.05) % Make Matlab more stable...
     5892  wh = jf.fFigureClient.getWindow;
     5893  pause(0.05)
     5894  wh.setAlwaysOnTop(true);
     5895  pause(0.05)
    59005896 
    59015897  H.TSAX = axes('parent',H.TSFIG,...
Note: See TracChangeset for help on using the changeset viewer.

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