Changeset 371 for trunk/src/uvmat.m

Timestamp:

Jan 14, 2012, 1:44:13 PM (13 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:

• trunk/src/uvmat.m (modified) (3 diffs)

trunk/src/uvmat.m

@@ -509 +509 @@
 
 %% detect root name, nomenclature and indices in the input file name:
-[tild,SubDir,tild,i1,i2,j1,j2,FileExt]=fileparts_uvmat(fileinput);
+[RootPath,SubDir,tild,i1,i2,j1,j2]=fileparts_uvmat(fileinput);
+[tild,FileName,FileExt]=fileparts(fileinput);
 % detect the file type, get the movie object if relevant, and look for the corresponding file series:
-[RootPath,RootFile,i1_series,i2_series,j1_series,j2_series,NomType,FileType,MovieObject]=find_file_series(fileinput);
+[RootFile,i1_series,i2_series,j1_series,j2_series,NomType,FileType,MovieObject]=find_file_series(fullfile(RootPath,SubDir),[FileName FileExt]);
 if strcmp(NomType,'*')% movies will be opened at the first frame
     i1=1;
@@ -608 +609 @@
 % read the current input file name:
 [RootPath,SubDir,RootFile,FileIndices,FileExt]=read_file_boxes(handles);
-fileinput=[fullfile(RootPath,SubDir,RootFile) FileIndices FileExt];
+%fileinput=[fullfile(RootPath,SubDir,RootFile) FileIndices FileExt];
 % detect the file type, get the movie object if relevant, and look for the corresponding file series:
-[RootPath,RootFile,i1_series,i2_series,j1_series,j2_series,tild,FileType,MovieObject]=find_file_series(fileinput);
+[tild,i1_series,i2_series,j1_series,j2_series,tild,FileType,MovieObject]=find_file_series(fullfile(RootPath,SubDir),[RootFile FileIndices FileExt]);
 % initiate the input file series and refresh the current field view: 
 update_rootinfo(handles,i1_series,i2_series,j1_series,j2_series,FileType,MovieObject);
@@ -1099 +1100 @@
 % update_rootinfo_1(hObject,eventdata,handles)
 [RootPath,SubDir,RootFile,FileIndices,FileExt]=read_file_boxes_1(handles);
-fileinput=[fullfile(RootPath,SubDir,RootFile) FileIndices FileExt];
+%fileinput=[fullfile(RootPath,SubDir,RootFile) FileIndices FileExt];
 % detect the file type, get the movie object if relevant, and look for the corresponding file series:
-[tild,tild,i1_series,i2_series,j1_series,j2_series,tild,FileType,MovieObject]=find_file_series(fileinput);
+[tild,i1_series,i2_series,j1_series,j2_series,tild,FileType,MovieObject]=find_file_series(fullfile(RootPath,SubDir),[RootFile FileIndices FileExt]);
 % initiate the input file series and refresh the current field view: 
 update_rootinfo(handles,i1_series,i2_series,j1_series,j2_series,FileType,MovieObject,2);