Changeset 398 for trunk/src/uvmat.m


Ignore:
Timestamp:
Apr 26, 2012, 12:12:43 PM (9 years ago)
Author:
sommeria
Message:

find_file_series corrected and rationalised, with induced transforms in uvmat, civ, series

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/uvmat.m

    r397 r398  
    504504
    505505%% detect root name, nomenclature and indices in the input file name:
    506 [RootPath,SubDir,tild,i1,i2,j1,j2]=fileparts_uvmat(fileinput);
    507 [tild,FileName,FileExt]=fileparts(fileinput);
     506%[RootPath,SubDir]=fileparts_uvmat(fileinput);
     507[FilePath,FileName,FileExt]=fileparts(fileinput);
    508508% detect the file type, get the movie object if relevant, and look for the corresponding file series:
    509 [RootFile,i1_series,i2_series,j1_series,j2_series,NomType,FileType,MovieObject]=find_file_series(fullfile(RootPath,SubDir),[FileName FileExt]);
    510 if strcmp(NomType,'*')% movies will be opened at the first frame
    511     i1=1;
    512     i2=[];
    513     j1=[];
    514     j2=[];
    515 end 
     509% the root name and indices may be corrected by including the first index i1 if a corresponding xml file exists
     510[RootPath,SubDir,RootFile,i1_series,i2_series,j1_series,j2_series,NomType,FileType,MovieObject,i1,i2,j1,j2]=find_file_series(FilePath,[FileName FileExt]);
     511% if strcmp(NomType,'*')% movies will be opened at the first frame
     512%     i1=1;
     513%     i2=[];
     514%     j1=[];
     515%     j2=[];
     516% end 
    516517
    517518%% open the file or fill the GUI uvmat according to the detected file type
     
    606607%fileinput=[fullfile(RootPath,SubDir,RootFile) FileIndices FileExt];
    607608% detect the file type, get the movie object if relevant, and look for the corresponding file series:
    608 [tild,i1_series,i2_series,j1_series,j2_series,tild,FileType,MovieObject]=find_file_series(fullfile(RootPath,SubDir),[RootFile FileIndices FileExt]);
     609[RootPath,SubDir,RootFile,i1_series,i2_series,j1_series,j2_series,tild,FileType,MovieObject]=find_file_series(fullfile(RootPath,SubDir),[RootFile FileIndices FileExt]);
    609610% initiate the input file series and refresh the current field view:
    610611update_rootinfo(handles,i1_series,i2_series,j1_series,j2_series,FileType,MovieObject);
     
    10921093%fileinput=[fullfile(RootPath,SubDir,RootFile) FileIndices FileExt];
    10931094% detect the file type, get the movie object if relevant, and look for the corresponding file series:
    1094 [tild,i1_series,i2_series,j1_series,j2_series,tild,FileType,MovieObject]=find_file_series(fullfile(RootPath,SubDir),[RootFile FileIndices FileExt]);
     1095[RootPath,SubDir,RootFile,i1_series,i2_series,j1_series,j2_series,tild,FileType,MovieObject]=find_file_series(fullfile(RootPath,SubDir),[RootFile FileIndices FileExt]);
    10951096% initiate the input file series and refresh the current field view:
    10961097update_rootinfo(handles,i1_series,i2_series,j1_series,j2_series,FileType,MovieObject,2);
     
    24462447for imap=1:numel(IndexObj)
    24472448    iobj=IndexObj(imap);
    2448     [ObjectData,errormsg]=proj_field(UvData.Field,UvData.Object{iobj})% project field on the object
     2449    [ObjectData,errormsg]=proj_field(UvData.Field,UvData.Object{iobj});% project field on the object
    24492450
    24502451    if ~isempty(errormsg)
Note: See TracChangeset for help on using the changeset viewer.