Changeset 206 for trunk/src/series.m


Ignore:
Timestamp:
Feb 27, 2011, 10:40:29 PM (10 years ago)
Author:
sommeria
Message:

bug fixes to deal with volumes, storage of ACTION menu in series fixed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series.m

    r205 r206  
    248248        'Pick a file',oldfile);
    249249fileinput=[PathName FileName];%complete file name
    250 testblank=findstr(fileinput,' ');%look for blanks
    251 if ~isempty(testblank)
    252     errordlg('forbidden input file name: contain blanks')
    253     return
    254 end
     250%testblank=findstr(fileinput,' ');%look for blanks
     251% if ~isempty(testblank)
     252%     errordlg('forbidden input file name: contain blanks')
     253%     return
     254% end
    255255sizf=size(fileinput);
    256256if (~ischar(fileinput)|~isequal(sizf(1),1)),return;end
     
    327327RootFileCell=get(handles.RootFile,'String');
    328328oldfile=''; %default
    329 if isempty(RootPathCell)|isequal(RootPathCell,{''})%loads the previously stored file name and set it as default in the file_input box
     329if isempty(RootPathCell)||isequal(RootPathCell,{''})%loads the previously stored file name and set it as default in the file_input box
    330330     dir_perso=prefdir;
    331331     profil_perso=fullfile(dir_perso,'uvmat_perso.mat');
     
    352352        'Pick a file',oldfile);
    353353fileinput=[PathName FileName];%complete file name
    354 testblank=findstr(fileinput,' ');%look for blanks
    355 if ~isempty(testblank)
    356     errordlg('forbidden input file name: contain blanks')
    357     return
    358 end
     354% testblank=findstr(fileinput,' ');%look for blanks
     355% if ~isempty(testblank)
     356%     errordlg('forbidden input file name: contain blanks')
     357%     return
     358% end
    359359sizf=size(fileinput);
    360360if (~ischar(fileinput)|~isequal(sizf(1),1)),return;end
     
    362362SeriesData=[];%dfault
    363363if isequal(ext,'.xml')
    364     errordlg('input file type not implemented')%A Faire: ouvrir le fichier pour naviguer
     364    msgbox_uvmat('ERROR','input file type not implemented')%A Faire: ouvrir le fichier pour naviguer
    365365elseif isequal(ext,'.xls')
    366     errordlg('input file type not implemented')%A Faire: ouvrir le fichier pour naviguer
     366    msgbox_uvmat('ERROR','input file type not implemented')%A Faire: ouvrir le fichier pour naviguer
    367367else
    368368    update_file(hObject, eventdata, handles,fileinput,1)
     
    16221622       series_fct{ilist-nb_builtin_ACTION}=fullfile(list_path{ilist},[menu_str{ilist} '.m']);     
    16231623   end
    1624    if nb_builtin_ACTION+1>=length(menu_str)-1
    1625    if exist(profil_perso,'file') && nb_builtin_ACTION+1>=length(menu_str)-1
    1626         save(profil_perso,'series_fct','-append')
    1627    else
    1628     txt=ver('MATLAB');
    1629     Release=txt.Release;
    1630         relnumb=str2num(Release(3:4));
    1631         if relnumb >= 14
    1632             save(profil_perso,'series_fct','-V6')
    1633         else
    1634             save(profil_perso, 'series_fct')
    1635         end
    1636    end
     1624   if nb_builtin_ACTION+1<=length(menu_str)-1
     1625       if exist(profil_perso,'file')% && nb_builtin_ACTION+1>=length(menu_str)-1
     1626           save(profil_perso,'series_fct','-append')
     1627       else
     1628           txt=ver('MATLAB');
     1629           Release=txt.Release;
     1630           relnumb=str2num(Release(3:4));
     1631           if relnumb >= 14%recent relaese of Matlab
     1632               save(profil_perso,'series_fct','-V6')
     1633           else
     1634               save(profil_perso, 'series_fct')
     1635           end
     1636       end
    16371637   end
    16381638end
Note: See TracChangeset for help on using the changeset viewer.