Changeset 371 for trunk/src/uvmat.m


Ignore:
Timestamp:
Jan 14, 2012, 1:44:13 PM (9 years ago)
Author:
sommeria
Message:

various bug fixes with file indexing. mode displacement from a fixed image introduced.
PIV stereo suppressed (todo: introduce in the GUI series).
find_file_series cleaned, with a change in the function arguments

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/uvmat.m

    r368 r371  
    509509
    510510%% detect root name, nomenclature and indices in the input file name:
    511 [tild,SubDir,tild,i1,i2,j1,j2,FileExt]=fileparts_uvmat(fileinput);
     511[RootPath,SubDir,tild,i1,i2,j1,j2]=fileparts_uvmat(fileinput);
     512[tild,FileName,FileExt]=fileparts(fileinput);
    512513% detect the file type, get the movie object if relevant, and look for the corresponding file series:
    513 [RootPath,RootFile,i1_series,i2_series,j1_series,j2_series,NomType,FileType,MovieObject]=find_file_series(fileinput);
     514[RootFile,i1_series,i2_series,j1_series,j2_series,NomType,FileType,MovieObject]=find_file_series(fullfile(RootPath,SubDir),[FileName FileExt]);
    514515if strcmp(NomType,'*')% movies will be opened at the first frame
    515516    i1=1;
     
    608609% read the current input file name:
    609610[RootPath,SubDir,RootFile,FileIndices,FileExt]=read_file_boxes(handles);
    610 fileinput=[fullfile(RootPath,SubDir,RootFile) FileIndices FileExt];
     611%fileinput=[fullfile(RootPath,SubDir,RootFile) FileIndices FileExt];
    611612% detect the file type, get the movie object if relevant, and look for the corresponding file series:
    612 [RootPath,RootFile,i1_series,i2_series,j1_series,j2_series,tild,FileType,MovieObject]=find_file_series(fileinput);
     613[tild,i1_series,i2_series,j1_series,j2_series,tild,FileType,MovieObject]=find_file_series(fullfile(RootPath,SubDir),[RootFile FileIndices FileExt]);
    613614% initiate the input file series and refresh the current field view:
    614615update_rootinfo(handles,i1_series,i2_series,j1_series,j2_series,FileType,MovieObject);
     
    10991100% update_rootinfo_1(hObject,eventdata,handles)
    11001101[RootPath,SubDir,RootFile,FileIndices,FileExt]=read_file_boxes_1(handles);
    1101 fileinput=[fullfile(RootPath,SubDir,RootFile) FileIndices FileExt];
     1102%fileinput=[fullfile(RootPath,SubDir,RootFile) FileIndices FileExt];
    11021103% detect the file type, get the movie object if relevant, and look for the corresponding file series:
    1103 [tild,tild,i1_series,i2_series,j1_series,j2_series,tild,FileType,MovieObject]=find_file_series(fileinput);
     1104[tild,i1_series,i2_series,j1_series,j2_series,tild,FileType,MovieObject]=find_file_series(fullfile(RootPath,SubDir),[RootFile FileIndices FileExt]);
    11041105% initiate the input file series and refresh the current field view:
    11051106update_rootinfo(handles,i1_series,i2_series,j1_series,j2_series,FileType,MovieObject,2);
Note: See TracChangeset for help on using the changeset viewer.