Changeset 143


Ignore:
Timestamp:
Oct 13, 2010, 10:18:52 AM (9 years ago)
Author:
tjniskan
Message:
  • Fixed a bug in detecting Matlab version in aedes_resviewer.m, which

resulted in a crash in Matlab R2010a and newer.

  • Fixed a bunch of warnings that were generated in aedes_juigetfiles.m with newer Matlab

versions

M aedes_resviewer.m
M aedes_revision.m
M aedes_juigetfiles.m

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • aedes_juigetfiles.m

    r141 r143  
    121121if version_number>=7.06
    122122  rootnode = uitreenode('v0','My Computer','My Computer',rooticonpath,false);
     123  tree = uitree('v0',fh,'Root',rootnode,'position',pos);%,'ExpandFcn',@l_ExpFcn);
    123124else
    124125  rootnode = uitreenode('My Computer','My Computer',rooticonpath,false);
    125 end
    126 tree = uitree(fh,'Root',rootnode,'position',pos);%,'ExpandFcn',@l_ExpFcn);
     126  tree = uitree(fh,'Root',rootnode,'position',pos);%,'ExpandFcn',@l_ExpFcn);
     127end
     128
    127129set(tree,'NodeExpandedCallback',{@l_ExpFcnAlt,tree})
    128130
    129131%% Create uitree for files ---------------------------
    130 filetree = uitree(fh,'position',[pos(1)+pos(3)+5 pos(2) 220 pos(4)]);
     132if version_number>=7.06
     133  filetree = uitree('v0',fh,'position',[pos(1)+pos(3)+5 pos(2) 220 pos(4)]);
     134else
     135  filetree = uitree(fh,'position',[pos(1)+pos(3)+5 pos(2) 220 pos(4)]);
     136end
    131137set(filetree,'MultipleSelectionEnabled',true,...
    132138             'NodeCollapsedCallback',{@l_FileTreeNodeCollapsed,filetree},...
     
    148154if version_number>=7.06
    149155  selfiletreeroot = uitreenode('v0','Selected Files','0 Files Selected','',false);
     156  selfiletree = uitree('v0',fh,'Root',selfiletreeroot,'position',[pos(1)+pos2(3)+pos(3)+100 pos(2) 220 pos(4)]);
    150157else
    151158  selfiletreeroot = uitreenode('Selected Files','0 Files Selected','',false);
    152 end
    153 selfiletree = uitree(fh,'Root',selfiletreeroot,'position',[pos(1)+pos2(3)+pos(3)+100 pos(2) 220 pos(4)]);
     159  selfiletree = uitree(fh,'Root',selfiletreeroot,'position',[pos(1)+pos2(3)+pos(3)+100 pos(2) 220 pos(4)]);
     160end
    154161set(selfiletree,'DndEnabled',true);
    155162set(selfiletree,'MultipleSelectionEnabled',true);
  • aedes_resviewer.m

    r133 r143  
    407407 
    408408  % Check Matlab version since uitable properties have changed in R2008a
    409   v=version;
    410   v=str2num(v(1:3));
    411   Dat.MatlabVersion = v;
    412   if Dat.MatlabVersion>=7.6
     409  Dat.MatlabVersion = aedes_getmatlabversion;
     410  if Dat.MatlabVersion>=7.06
    413411        set(H.RESTABLE,'Enable','on','visible','off');
    414412  else
     
    770768 
    771769  % Clear restable
    772   if Dat.MatlabVersion>=7.6
     770  if Dat.MatlabVersion>=7.06
    773771        set(H.RESTABLE,'data',[])
    774772        set(H.RESTABLE,'Data',ResTable,...
     
    820818  Dat.Res = [];
    821819  Dat.ReFileName = '';
    822   if Dat.MatlabVersion>=7.6
     820  if Dat.MatlabVersion>=7.06
    823821        set(H.RESTABLE,'visible','off',...
    824822          'Data',[]);
  • aedes_revision.m

    r142 r143  
    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