Changeset 343 for trunk/src

Timestamp:

Dec 21, 2011, 10:12:13 AM (13 years ago)

Author:

sommeria

Message:

-bugs repaired in civ
-change in find_file_series to account for possible file index 0
-name2display suppressed in all functions, replaced by fileparts_uvmat (except incorporated in civ_3D)
-open_uvmat introduced to open files from a list

Location:

trunk/src

Files:

• civ.fig (modified) (previous)
• civ.m (modified) (55 diffs)
• civ_3D.m (modified) (1 diff)
• find_file_series.m (modified) (3 diffs)
• name2display.m (deleted)
• open_uvmat.m (added)
• read_xls.m (modified) (6 diffs)
• series.m (modified) (1 diff)

trunk/src/civ.m

@@ -23 +23 @@
 %TODO: search range
 
-% Last Modified by GUIDE v2.5 04-Dec-2011 18:52:13
+% Last Modified by GUIDE v2.5 21-Dec-2011 00:34:49
 % Begin initialization code - DO NOT EDIT
 gui_Singleton = 1;
@@ -119 +119 @@
 function MenuBrowse_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-%get the current input root file name to initiate the browser
+%% get the current input root file name to initiate the browser
 filebase=get(handles.RootName,'String');
 oldfile=''; %default
@@ -137 +137 @@
     oldfile=filebase;
 end
-ind_opening=1;%default
-browse.incr_pair=[0 0]; %default
+% ind_opening=1;%default
+% browse.incr_pair=[0 0]; %default
+%% get the new input fiel with the browser
 menu={'*.xml;*.civ;*.png;*.jpg;*.tif;*.avi;*.AVI;*.nc;', ' (*.xml,*.civ,*.png,*.jpg ,.tif, *.avi,*.nc)';
     '*.xml',  '.xml files '; ...
@@ -153 +154 @@
 if (~ischar(fileinput)||~isequal(sizf(1),1)),return;end %stop if fileinput not a character string
 
-%% prepare the GUI with parameters from the input file if opened from uvmat
-errormsg=display_file_name(handles,fileinput);
-if ~isempty(errormsg)
-    msgbox_uvmat('ERROR',erromsg)
-end
-
+%% case of the xml file opened as input (TODO: check and see whether it is useful)
 [path,name,ext]=fileparts(fileinput);
 testeditxml=0;
@@ -186 +182 @@
 [~,~,~,i1,i2,j1,j2,FileExt,NomType]=fileparts_uvmat(fileinput);
 % filebase=fullfile(RootPath,RootFile);
-if isempty(i1),i1=1;end
-if isempty(i2),i2=i1;end
-if isempty(j1),j1=1;end
-if isempty(j2),j2=j1;end
-if isequal(get(handles.ListCompareMode,'Value'),1)
-    browse=[];%initialisation
-else
-    browse=get(handles.RootName,'UserData');
-end
-browse.num_i1=i1;
-browse.num_i2=i2;
-browse.num_j1=j1;
-browse.num_j2=j2;
-if length(FileExt)>1 && (~isempty(imformats(FileExt(2:end)))||strcmpi(FileExt,'.avi'));%if an image file has been opened by uvmat
-    browse.nom_type_ima=NomType;
-    browse.ext_ima=FileExt;
-    set(handles.ImaExt,'String',FileExt)
-end
-set(handles.ImaDoc,'String',FileExt);
-
-set(handles.RootName,'UserData',browse);% store information from browser
+
+%% record the information obtained from the input file
+% if isempty(i1),i1=1;end
+% if isempty(i2),i2=i1;end
+% if isempty(j1),j1=1;end
+% if isempty(j2),j2=j1;end
+% if isequal(get(handles.ListCompareMode,'Value'),1)
+%     browse=[];%initialisation
+% else
+%     browse=get(handles.RootName,'UserData');
+% end
+% browse.num_i1=i1;
+% browse.num_i2=i2;
+% browse.num_j1=j1;
+% browse.num_j2=j2;
+% if length(FileExt)>1 && (~isempty(imformats(FileExt(2:end)))||strcmpi(FileExt,'.avi'));%if an image file has been opened by uvmat
+%     browse.nom_type_ima=NomType;
+%     browse.ext_ima=FileExt;
+%     set(handles.ImaExt,'String',FileExt)
+% end
+% set(handles.RootName,'UserData',browse);% store information from browser
+
+%% prepare the GUI with parameters from the input file 
+errormsg=display_file_name(handles,fileinput);
+if ~isempty(errormsg)
+    msgbox_uvmat('ERROR',erromsg)
+end
+
 
 %------------------------------------------------------------------------
@@ -332 +335 @@
 nom_type_ima='';%default
 nom_type_nc='';
-[RootPath,RootFile,i1_str,i2_str,j1_str,j2_str,ext_input,nom_type_input,subdir]=name2display(fileinput);
-%[RootPath,subdir,RootFile,i1,i2,j1,j2,ext_input,nom_type_input]=fileparts_uvmat(fileinput);TODO: use to replace name2display
+%[RootPath,RootFile,i1_str,i2_str,j1_str,j2_str,ext_input,nom_type_input,SubDir]=name2display(fileinput);
+[RootPath,SubDir,RootFile,i1,i2,j1,j2,ext_input,nom_type_input]=fileparts_uvmat(fileinput);
 RootName=fullfile(RootPath,RootFile);
 set(handles.RootName,'String',RootName)
 set(handles.RootName,'BackgroundColor',[1 1 0])%paint RootName edit box in yellow to indicate that the file input is proceeding
-i1=str2double(i1_str);
-i2=str2double(i2_str);
-j1=str2double(j1_str);
-j2=str2double(j2_str);
+% i1=str2double(i1_str);
+% i2=str2double(i2_str);
+% j1=str2double(j1_str);
+% j2=str2double(j2_str);
 num_ref_i=i1;%efaulmt ref index
 num_ref_j=j1;
@@ -350 +353 @@
     ext_ima=ext_input;
     nom_type_ima=nom_type_input;
+    imagename=fileinput;
 else %case of netcdf input file, look for corresponding images
     nom_type_nc=nom_type_input;
+    imagename=name_generator(fullfile(RootPath,RootFile),1,1,ext_ima,nom_type_ima);
+    i1_str='';
+    j1_str='';
     if ~isnan(i2)
         num_ref_i=floor((num_ref_i+i2)/2);% reference image number corresponding to the file
@@ -359 +366 @@
     %TODO: read the image name in the netcdf file (if documented)
     %look for double image series '_i_j'
+    check_letter=regexp(nom_type_nc,'[ab|AB]$');%detect pair label by letter
+    if ~isempty(check_letter)
+        j1_str=nom_type_nc(end-1);
+        r=regexp(nom_type_nc,'_(?<num1>\d+)','names');
+        if ~isempty(r)
+            i1_str=r.num1;
+        end
+    else
+        NomTypeIma=regexprep(nom_type_nc,'-\d','');%
+        r_end=regexp(NomTypeIma,'.\D(?<num2>\d+$','names');
+        if ~isempty(r_end)
+            j1_str=r.num2
+        end
+    end
+    r=regexp(NomTypeIma,'_(?<num1>\d+)','names');
+    if ~isempty(r)
+        i1_str=r.num1;
+    end  
     dirima=dir([RootName '_' i1_str '_' j1_str '.*']);
     if isempty(dirima)
@@ -374 +399 @@
     end
     for ilist=1:numel(dirima)
-        [pp,ff,i1_str,i2_str,j1_str,j2_str,ext_list,nom_type_list]=name2display(dirima(ilist).name);
+        %[pp,ff,i1_str,i2_str,j1_str,j2_str,ext_list,nom_type_list]=name2display(dirima(ilist).name);
+        [~,~,~,i1,i2,j1,j2,ext_list,nom_type_list]=fileparts_uvmat(dirima(ilist).name);
         form=imformats(ext_list(2:end));
         if ~isempty(form)% if the extension corresponds to an image format recognized by Matlab
             ext_ima=ext_list;
             nom_type_ima=nom_type_list;
-            i1=str2double(i1_str);
-            j1=str2double(j1_str);
-            i2=str2double(i2_str);
-            j2=str2double(j2_str);          
+%             i1=str2double(i1_str);
+%             j1=str2double(j1_str);
+%             i2=str2double(i2_str);
+%             j2=str2double(j2_str);          
             % set the range of fields (1:1 by default) and selected pair
-            if isequal(i2,i1)||isnan(i2)
+            if isempty(i2)
                 num_ref_i=i1;
             else
@@ -391 +417 @@
                 browse.incr_pair(2)=0;
             end
-            if isequal(j1,j2)||isnan(j2)
-                if isnan(j1)
+            if isempty(j2)
+                if isempty(j1)
                     num_ref_j=1;
                 else
@@ -405 +431 @@
     end
 end
+[RootPath,RootFile,i1_series,~,j1_series,~,NomType,FileType,Object]=find_file_series(imagename);
+MaxIndex_i=max(i1_series(i1_series>0));
+MaxIndex_j=max(j1_series(j1_series>0));
 
 %% look for an image documentation file
@@ -420 +449 @@
 end
 set(handles.ImaDoc,'String',ext_imadoc)% display the extension name for the image documentation file used
-set(handles.ImaDoc,'BackgroundColor',[1 1 0])
-drawnow
-%%%%%%%%   read image documentation file  %%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%%  read the time in the image documentation file  
 mode=''; %default
 time=[];
-TimeUnit='frame'; %default
-CoordUnit='px';%default
+TimeUnit=''; %default
+CoordUnit='';%default
 pxcmx_search=[];%default
 pxcmy_search=[];%default
-if isequal(ext_imadoc,'.civxml')%TO ABANDON
-    [nbfield,nbfield2,time]=read_civxml([RootName '.civxml']);
-    mode='pair j1-j2';
-    if isempty(nom_type_ima)% dtermine types by default if not already selected by browser or uvmat
-        nom_type_ima='_i_j';
-    end
-elseif isequal(ext_imadoc,'.xml')
-    [XmlData,warntext]=imadoc2struct([RootName '.xml']);
-    ext_ima_read=[];
-    nom_type_read=[];
-    if isfield(XmlData,'Heading')&&isfield(XmlData.Heading','ImageName')&&ischar(XmlData.Heading.ImageName)% get image nom type and extension from the xml file
-        [PP,FF,fc,str2,str_a,str_b,ext_ima_read,nom_type_read]=name2display(XmlData.Heading.ImageName);
-        fullname=fullfile(fileparts(RootName),XmlData.Heading.ImageName); %full name (including path) of the first image defined by the xmle file,
-        if ~exist(fullname,'file')
-            msgbox_uvmat('WARNING',['FirstImage ' fullname ' defined in the xml file does not exist'])
-        end
-    end
-    if isfield(XmlData,'Time')
-        time=XmlData.Time;
-        nbfield=size(time,1);
-        nbfield2=size(time,2);
-        %transform .Time to a column vector if it is a line vector thenomenclature uses a single index: correct possible bug in xml
-        if isequal(nbfield,1) && ~isequal(nbfield2,1)% .Time is a line vector
-            if numel(nom_type_read)>=2 && isempty(regexp(nom_type_read(2:end),'\D','once'))
-                time=time';
-                nbfield=nbfield2;
-                nbfield2=1;
-            end
-        end
-    end
-    if isfield(XmlData,'TimeUnit')
-        TimeUnit=XmlData.TimeUnit;
-    end
-    pxcmx_search=1;
-    pxcmy_search=1;
-    if isfield(XmlData,'GeometryCalib')
-        tsai=XmlData.GeometryCalib;
-        if isfield(tsai,'f') && isfield(tsai,'Tz') && isfield(tsai,'dpx') && isfield(tsai,'dpy')&& isfield(tsai,'R')
-            rot2D=tsai.R(1:2,[1,2]);
-            pxcmx_search=tsai.f * sqrt(det(rot2D))/(tsai.Tz*tsai.dpx);
-            pxcmy_search=tsai.f * sqrt(det(rot2D))/(tsai.Tz*tsai.dpy);
-        end
-        if isfield(tsai,'CoordUnit')
-            CoordUnit=tsai.CoordUnit;
-        end
-    end
-elseif strcmp(ext_imadoc,'.civ')% case of .civ image documentation file
-    [error,time,TimeUnit,mode,npx,npy]=read_imatext([RootName '.civ']);
-    if error==2, msgbox_uvmat('WARNING',['no file ' RootName '.civ']);
-    elseif error==1, msgbox_uvmat('WARNING','inconsistent number of fields in the .civ file');
-    end
-    nom_type_ima='001a';
-elseif strcmpi(ext_imadoc,'.avi')
-    nom_type_ima='*';
-    ext_ima=ext_imadoc;
-    set(handles.ListPairMode,'Value',1);
-    set(handles.ListPairMode,'String',{'series(Di)'})
-    dt=0.04;%default
-    if exist([RootName ext_imadoc],'file')==2
-        info=aviinfo([RootName ext_imadoc]);%read infos on the avi movie
-        dt=1/info.FramesPerSecond;%time interval between successive frames
-        nbfield=info.NumFrames;%number of frames
-    end
-    time=(dt*(0:nbfield-1))';%list of image times
-end
-if isempty(time)
-    set(handles.ImaDoc,'String',''); %xml file not used for timing
-end
-set(handles.ImaDoc,'BackgroundColor',[1 1 1])% set display box to yellow color
-
+if ~isempty(ext_imadoc)
+    set(handles.ImaDoc,'BackgroundColor',[1 1 0]) % set edit box to yellow cloro to indicate that the file reading is beginning
+    drawnow
+    switch ext_imadoc
+        case '.civxml'%OBSOLETE
+            [~,~,time]=read_civxml([RootName '.civxml']);
+            mode='pair j1-j2';
+            if isempty(nom_type_ima)% dtermine types by default if not already selected by browser or uvmat
+                nom_type_ima='_i_j';
+            end
+        case '.xml'
+            [XmlData,warntext]=imadoc2struct([RootName '.xml']);
+            ext_ima_read=[];
+            nom_type_read=[];
+            if isfield(XmlData,'Heading')&&isfield(XmlData.Heading','ImageName')&&ischar(XmlData.Heading.ImageName)% get image nom type and extension from the xml file
+                %[PP,FF,fc,str2,str_a,str_b,ext_ima_read,nom_type_read]=name2display(XmlData.Heading.ImageName);
+                [~,~,~,~,~,~,~,~,nom_type_read]=fileparts_uvmat(XmlData.Heading.ImageName);
+                fullname=fullfile(fileparts(RootName),XmlData.Heading.ImageName); %full name (including path) of the first image defined by the xmle file,
+                if ~exist(fullname,'file')
+                    msgbox_uvmat('WARNING',['FirstImage ' fullname ' defined in the xml file does not exist'])
+                end
+            end
+            if isfield(XmlData,'Time')
+                time=XmlData.Time;
+                %transform .Time to a column vector if it is a line vector thenomenclature uses a single index: correct possible bug in xml
+                if isequal(MaxIndex_i,1) && ~isequal(MaxIndex_j,1)% .Time is a line vector
+                    if numel(nom_type_read)>=2 && isempty(regexp(nom_type_read(2:end),'\D','once'))
+                        time=time';
+                        MaxIndex_i=MaxIndex_j;
+                        MaxIndex_j=1;
+                    end
+                end
+            end
+            if isfield(XmlData,'TimeUnit')
+                TimeUnit=XmlData.TimeUnit;
+            end
+            pxcmx_search=1;
+            pxcmy_search=1;
+            if isfield(XmlData,'GeometryCalib')
+                tsai=XmlData.GeometryCalib;
+                if isfield(tsai,'f') && isfield(tsai,'Tz') && isfield(tsai,'dpx') && isfield(tsai,'dpy')&& isfield(tsai,'R')
+                    rot2D=tsai.R(1:2,[1,2]);
+                    pxcmx_search=tsai.f * sqrt(det(rot2D))/(tsai.Tz*tsai.dpx);
+                    pxcmy_search=tsai.f * sqrt(det(rot2D))/(tsai.Tz*tsai.dpy);
+                end
+                if isfield(tsai,'CoordUnit')
+                    CoordUnit=tsai.CoordUnit;
+                end
+            end
+        case '.civ'% OBSOLETE: case of .civ image documentation file
+            [error,time,TimeUnit,mode,npx,npy]=read_imatext([RootName '.civ']);
+            if error==2, msgbox_uvmat('WARNING',['no file ' RootName '.civ']);
+            elseif error==1, msgbox_uvmat('WARNING','inconsistent number of fields in the .civ file');
+            end
+            nom_type_ima='001a';
+        case {'.avi','.AVI'}
+            nom_type_ima='*';
+            ext_ima=ext_imadoc;
+            set(handles.ListPairMode,'Value',1);
+            set(handles.ListPairMode,'String',{'series(Di)'})
+            dt=0.04;%default
+            if exist([RootName ext_imadoc],'file')==2
+                info=aviinfo([RootName ext_imadoc]);%read infos on the avi movie
+                dt=1/info.FramesPerSecond;%time interval between successive frames
+                MaxIndex_i=info.NumFrames;%number of frames
+            end
+            time=(dt*(0:MaxIndex_i-1))';%list of image times
+            TimeUnit='s';
+    end
+    set(handles.ImaDoc,'BackgroundColor',[1 1 1])% set display box back to whiter
+end
 
 %% timing display
 %show the reference image edit box if relevant (not needed for movies or in the absence of time information
-if ~isempty(time)
-    if size(time,1)+size(time,2)>=3 % if there are at least two time values to define dt
-        nbfield=size(time,1);
-        nbfield2=size(time,2);
-        set(handles.ImaDoc,'UserData',time); %store the set of times
-        set(handles.dt_unit,'String',['dt in m' TimeUnit]);
-        set(handles.TimeUnit,'String',TimeUnit);
-        set(handles.nb_field,'String',num2str(nbfield));
-        set(handles.nb_field2,'String',num2str(nbfield2));
-    end
-end
+if numel(time)>=2 % if there are at least two time values to define dt
+    MaxIndex_i=min(size(time,1),MaxIndex_i);
+    MaxIndex_j=min(size(time,2),MaxIndex_j);
+    time=[zeros(size(time,1),1) time]; %insert a vertical line of zeros (to deal with zero file indices)
+    time=[zeros(1,size(time,2)); time]; %insert a horizontal line of zeros
+    set(handles.ImaDoc,'UserData',time); %store the matrix of times
+    set(handles.dt_unit,'String',['dt in m' TimeUnit]);
+    set(handles.TimeUnit,'String',TimeUnit);
+else
+    set(handles.ImaDoc,'String',''); %xml file not used for timing
+    time=(i1_series(:,1)+0:size(i1_series,1)-1);% time=index i
+    time=time'*ones(1,size(i1_series,2),1); %makes a time matrix with the same time for all j indices
+    TimeUnit='frame';
+end
+set(handles.ImaDoc,'UserData',time); %store the matrix of times
+set(handles.dt_unit,'String',['dt in m' TimeUnit]);%display dt in unit 10-3 of the time (e.g ms)
+set(handles.TimeUnit,'String',TimeUnit);
+set(handles.nb_field,'String',num2str(MaxIndex_i));
+set(handles.nb_field2,'String',num2str(MaxIndex_j));
 set(handles.CoordUnit,'String',CoordUnit)
 set(handles.SearchRange,'UserData',[pxcmx_search pxcmy_search]);
@@ -545 +583 @@
     set(handles.(ListOptions{index}),'value',1)
 end
-update_CivOptions(handles)
+update_CivOptions(handles,1)
 
 
 %%  set the menus of image pairs and default selection for civ   %%%%%%%%%%%%%%%%%%%
-test_ima_i=numel(nom_type_ima)>1 && isempty(regexp(nom_type_ima(2:end),'\D','once'));%images with single indexing
-if test_ima_i || isequal(nom_type_nc,'_1-2')||~(exist('nbfield2','var')&&(nbfield2~=1))
+check_letter=~isempty(regexp(nom_type_ima,'[a|A]$'));
+check_separator=~isempty(regexp(nom_type_ima,'_'));
+% test_ima_i=numel(nom_type_ima)>1 && isempty(regexp(nom_type_ima(2:end),'\D','once'))%=1 for images with single indexing
+% TODO: determine MaxIndex_i and MaxIndex_j using find_file_series (in the absence of xml file)
+if (~check_letter&&~check_separator)|| isequal(nom_type_nc,'_1-2')|| (exist('MaxIndex_j','var')&&(MaxIndex_j==1))
     set(handles.ListPairMode,'Value',1)
     set(handles.ListPairMode,'String',{'series(Di)'})   
-elseif (nbfield==1)% simple series in j
-    set(handles.ListPairMode,'Value',1)
-    set(handles.ListPairMode,'String',{'series(Dj)'})
+elseif  MaxIndex_i==1 && MaxIndex_j% simple series in j
+    set(handles.ListPairMode,'String',{'pair j1-j2';'series(Dj)'})
+    if  MaxIndex_j <= 10
+        set(handles.ListPairMode,'Value',1)% advice 'pair j1-j2' except in MaxIndex_j is large
+    end
 else
     set(handles.ListPairMode,'String',{'pair j1-j2';'series(Dj)';'series(Di)'})%multiple choice
-    if nbfield2 <= 10
-        set(handles.ListPairMode,'Value',1)% advice 'pair j1-j2' for small burst
+    if  MaxIndex_j <= 10
+        set(handles.ListPairMode,'Value',1)% advice 'pair j1-j2' except in MaxIndex_j is large
     end
 end
@@ -577 +620 @@
     end
 end
-Value=find(strcmp(subdir,listdir));%search the index of subdir in the cell listdir
+Value=find(strcmp(SubDir,listdir));%search the index of subdir in the cell listdir
 if isempty(Value)% if the input subdir is not found
     ValueCiv1=get(handles.ListSubdirCiv1,'Value');%read the currrently selected dir name
@@ -610 +653 @@
 %% list the possible index pairs, depending on the option set in ListPairMode
 ListPairMode_Callback([], [], handles)
+'TESTin'
+browse=get(handles.RootName,'UserData')
 
 %% store the root input filename for future opening
@@ -632 +677 @@
 function txt_SubdirCiv1_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-subdir=get(handles.txt_SubdirCiv1,'String');
+SubDir=get(handles.txt_SubdirCiv1,'String');
 menu_str=get(handles.ListSubdirCiv1,'String');% read the list of subdirectories for update
-ichoice=find(strcmp(subdir,menu_str),1);
+ichoice=find(strcmp(SubDir,menu_str),1);
 if isempty(ichoice)
     ilist=numel(menu_str); %select 'new...' in the menu
@@ -642 +687 @@
 set(handles.ListSubdirCiv1,'Value',ilist)% select the selected subdir in the menu
 if get(handles.CheckCiv1,'Value')% if Civ1 is performed
-    set(handles.txt_SubdirCiv2,'String',subdir);% set by default civ2 directory the same as civ1 
+    set(handles.txt_SubdirCiv2,'String',SubDir);% set by default civ2 directory the same as civ1 
     set(handles.ListSubdirCiv2,'Value',ilist)
 else % if Civ1 data already exist
@@ -649 +694 @@
 
 %------------------------------------------------------------------------
-% --- Executes on carriage return on the subdir checkciv1 edit window
+% --- Executes on carriage return on the SubDir checkciv1 edit window
 function txt_SubdirCiv2_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-subdir=get(handles.txt_SubdirCiv1,'String');
+SubDir=get(handles.txt_SubdirCiv1,'String');
 menu_str=get(handles.ListSubdirCiv2,'String');% read the list of subdirectories for update
-ichoice=find(strcmp(subdir,menu_str),1);
+ichoice=find(strcmp(SubDir,menu_str),1);
 if isempty(ichoice)
     ilist=numel(menu_str); %select 'new...' in the menu
@@ -670 +715 @@
 function CheckCiv1_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-update_CivOptions(handles)
+update_CivOptions(handles,0)
 
 %------------------------------------------------------------------------
@@ -676 +721 @@
 function CheckFix1_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-update_CivOptions(handles)
+update_CivOptions(handles,0)
 
 %------------------------------------------------------------------------
@@ -682 +727 @@
 function CheckPatch1_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-update_CivOptions(handles)
+update_CivOptions(handles,0)
 
 %------------------------------------------------------------------------
@@ -688 +733 @@
 function CheckCiv2_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-update_CivOptions(handles)
+update_CivOptions(handles,0)
 
 %------------------------------------------------------------------------
@@ -694 +739 @@
 function CheckFix2_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-update_CivOptions(handles)
+update_CivOptions(handles,0)
 
 %------------------------------------------------------------------------
@@ -700 +745 @@
 function CheckPatch2_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-update_CivOptions(handles)
+update_CivOptions(handles,0)
 
 %------------------------------------------------------------------------
 % --- activated by any checkbox controling the selection of Civ1,Fix1,Patch1,Civ2,Fix2,Patch2
-function update_CivOptions(handles)
+function update_CivOptions(handles,opening)
 %------------------------------------------------------------------------
 checkbox=zeros(1,6);
@@ -718 +763 @@
     if isempty(RootName)
          msgbox_uvmat('ERROR','Please open an image or PIV .nc file with the upper bar menu Open/Browse...')
-        return
+        returnopening
     end
 end
@@ -724 +769 @@
 set(handles.txt_SubdirCiv1,'Visible','on')
 set(handles.ListSubdirCiv1,'Visible','on')
+if ~opening
 find_netcpair_civ1(handles) % select the available netcdf files
+end
 if max(checkbox(4:6))% case of civ2 pair choice needed
     set(handles.TitlePairCiv2,'Visible','on')
@@ -731 +778 @@
     set(handles.ListSubdirCiv2,'Visible','on')
     set(handles.ListPairCiv2,'Visible','on')
+    if ~opening
     find_netcpair_civ2(handles) % select the available netcdf files
+    end
 else
     set(handles.TitleSubdirCiv2,'Visible','off')
@@ -829 +878 @@
 end
 [root,filename,ext]=fileparts(civ_files{1});
-[rootroot,subdir,extdir]=fileparts(root);
+[rootroot,SubDir,extdir]=fileparts(root);
 hfig=findobj(allchild(0),'name','civ_status');
 if isempty(hfig)
     hfig=figure('DeleteFcn',@stop_status);
     set(hfig,'name','civ_status')
-    hlist=uicontrol('Style','listbox','Units','normalized', 'Position',[0.05 0.09 0.9 0.71], 'Callback', @open_view_field,'tag','list');
+    %hlist=uicontrol('Style','listbox','Units','normalized', 'Position',[0.05 0.09 0.9 0.71], 'Callback', @open_view_field,'tag','list');
+     uicontrol('Style','listbox','Units','normalized', 'Position',[0.05 0.09 0.9 0.71], 'Callback', {'open_uvmat'},'tag','list');
     uicontrol('Style','edit','Units','normalized', 'Position', [0.05 0.87 0.9 0.1],'tag','msgbox','Max',2,'String','checking files...');
     uicontrol('Style','frame','Units','normalized', 'Position', [0.05 0.81 0.9 0.05]);
@@ -895 +945 @@
         end
         [rr,filename,ext]=fileparts(civ_files{ifile});
-        Tabchar{ifile,1}=[fullfile([subdir extdir],filename) ext  '...' option_str];
+        Tabchar{ifile,1}=[fullfile([SubDir extdir],filename) ext  '...' option_str];
     end
     datnum=datnum(datnum~=0);%keep the non zero values corresponding to existing files
@@ -1103 +1153 @@
 %% MAIN LOOP
 time=get(handles.ImaDoc,'UserData'); %get the set of times
+TimeUnit=get(handles.TimeUnit,'String');
+checkframe=strcmp(TimeUnit,'frame');
 batch_file_list=[];%should be renamed file_list, can be used for xml or bash files
  
@@ -1136 +1188 @@
             Param.Civ1.ImageA=filecell.ima1.civ1{ifile,j};
             Param.Civ1.ImageB=filecell.ima2.civ1{ifile,j};
-            if size(time,1)>=i2_civ1(ifile) && size(time,2)>=j2_civ1(j)
-                Param.Civ1.Dt=(time(i2_civ1(ifile),j2_civ1(j))-time(i1_civ1(ifile),j1_civ1(j)));
-                Param.Civ1.Time=((time(i2_civ1(ifile),j2_civ1(j))+time(i1_civ1(ifile),j1_civ1(j)))/2);
+            if ~checkframe% && size(time,1)>=i2_civ1(ifile) && size(time,2)>=j2_civ1(j)
+                Param.Civ1.Dt=(time(i2_civ1(ifile)+1,j2_civ1(j)+1)-time(i1_civ1(ifile)+1,j1_civ1(j)+1));
             else
                 Param.Civ1.Dt=1;
-                Param.Civ1.Time=0;
-            end
+            end
+            Param.Civ1.Time=((time(i2_civ1(ifile)+1,j2_civ1(j)+1)+time(i1_civ1(ifile)+1,j1_civ1(j)+1))/2);
             Param.Civ1.term_a=num2stra(j1_civ1(j),nom_type_nc);%UTILITE?
             Param.Civ1.term_b=num2stra(j2_civ1(j),nom_type_nc);%    
@@ -1274 +1325 @@
             Param.Civ2.ImageA=filecell.ima1.civ2{ifile,j};
             Param.Civ2.ImageB=filecell.ima2.civ2{ifile,j};
-            if size(time,1)>=i2_civ2(ifile) && size(time,2)>=j2_civ2(j)
-                Param.Civ2.Dt=num2str(time(i2_civ2(ifile),j2_civ2(j))-time(i1_civ2(ifile),j1_civ2(j)));
-                Param.Civ2.Time=num2str((time(i2_civ2(ifile),j2_civ2(j))+time(i1_civ2(ifile),j1_civ2(j)))/2);
+            if ~checkframe %&& size(time,1)>=i2_civ2(ifile) && size(time,2)>=j2_civ2(j)
+                Param.Civ2.Dt=num2str(time(i2_civ2(ifile)+1,j2_civ2(j)+1)-time(i1_civ2(ifile)+1,j1_civ2(j)+1));
             else
                 Param.Civ2.Dt=1;
-                Param.Civ2.Time=0;
-            end
+            end
+            Param.Civ2.Time=num2str((time(i2_civ2(ifile)+1,j2_civ2(j)+1)+time(i1_civ2(ifile)+1,j1_civ2(j)+1))/2);
             Param.Civ2.term_a=num2stra(j1_civ2(j),nom_type_nc);
             Param.Civ2.term_b=num2stra(j2_civ2(j),nom_type_nc);
@@ -1620 +1670 @@
     end
 end
-[RootPath,RootFile,field_count,str2,str_a,str_b,ext,nom_type,subdir]=name2display(fileresu);
-namedoc=fullfile(RootPath,subdir,RootFile);
+%[RootPath,RootFile,field_count,str2,str_a,str_b,ext,nom_type,SubDir]=name2display(fileresu);
+[RootPath,SubDir,RootFile]=fileparts_uvmat(fileresu);
+namedoc=fullfile(RootPath,SubDir,RootFile);
 detect=1;
 while detect==1
@@ -2567 +2618 @@
      end
 %     set(handles.RootName_1,'String',name);
-    [RootPath,RootFile,field_count,str2,str_a,str_b,xx,nom_type,subdir]=name2display(name);
+    %[RootPath,RootFile,field_count,str2,str_a,str_b,xx,nom_type,SubDir]=name2display(name);
+    [~,~,RootFile,~,~,~,~,~,nom_type]=fileparts_uvmat(name);
     set(handles.RootName_1,'String',RootFile);
     browse=get(handles.RootName,'UserData');
@@ -2640 +2692 @@
 % last_i=str2num(get(handles.last_i,'String'));
 time=get(handles.ImaDoc,'UserData'); %get the set of times
+TimeUnit=get(handles.TimeUnit,'String');
+checkframe=strcmp(TimeUnit,'frame');
 siztime=size(time);
-nbfield=siztime(1);
-nbfield2=siztime(2);
+nbfield=siztime(1)-1;
+nbfield2=siztime(2)-1;
 indchosen=1;  %%first pair selected by default
 %displ_num used to define the indices of the civ pairs
@@ -2648 +2702 @@
 % are relative to the reference indices ref_i and ref_j respectively.
 if isequal(mode,'pair j1-j2')%| isequal(mode,'st_pair j1-j2')
+
     dt=1;
     displ='';
@@ -2661 +2716 @@
             numlist_a(index)=numod_a;
             numlist_b(index)=numod_b;
-            if ~isempty(time)
-                dt(numod_a,numod_b)=time(ref_i,numod_b)-time(ref_i,numod_a);%first time interval dt
+            if size(time,2)>1 && ~checkframe
+                dt(numod_a,numod_b)=time(ref_i+1,numod_b+1)-time(ref_i+1,numod_a+1);%first time interval dt
                 displ_dt(index)=dt(numod_a,numod_b);
             else
@@ -2699 +2754 @@
     set(handles.nb_field2,'Visible','On')
     set(handles.ref_j,'Visible','On')
-    if nbfield > 1
-        set(handles.itext,'Visible','On')
-        set(handles.first_i,'Visible','On')
-        set(handles.last_i,'Visible','On')
-        set(handles.incr_i,'Visible','On')
-        set(handles.nb_field,'Visible','On')
-        set(handles.ref_i,'Visible','On')
-    else
-        set(handles.itext,'Visible','Off')
-        set(handles.first_i,'Visible','Off')
-        set(handles.last_i,'Visible','Off')
-        set(handles.incr_i,'Visible','Off')
-        set(handles.nb_field,'Visible','Off')
-        set(handles.ref_i,'Visible','Off')
-    end
+%     if nbfield > 1
+%         set(handles.itext,'Visible','On')
+%         set(handles.first_i,'Visible','On')
+%         set(handles.last_i,'Visible','On')
+%         set(handles.incr_i,'Visible','On')
+%         set(handles.nb_field,'Visible','On')
+%         set(handles.ref_i,'Visible','On')
+%     else
+%         set(handles.itext,'Visible','Off')
+%         set(handles.first_i,'Visible','Off')
+%         set(handles.last_i,'Visible','Off')
+%         set(handles.incr_i,'Visible','Off')
+%         set(handles.nb_field,'Visible','Off')
+%         set(handles.ref_i,'Visible','Off')
+%     end
 elseif isequal(mode,'series(Di)') %| isequal(mode,'st_series(Di)')
     index=1:200;
@@ -2785 +2840 @@
 find_netcpair_civ1( handles)
 find_netcpair_civ2(handles)
+'TESTin'
+browse=get(handles.RootName,'UserData')
 
 %------------------------------------------------------------------------
@@ -2947 +3004 @@
 end
 time=get(handles.ImaDoc,'UserData');%get the set of times
-if isempty(time)
-    time=[0 1];
-end
-dt_unit=1000;%default
+% if isempty(time)
+%     time=[0 1];
+% end
+TimeUnit=get(handles.TimeUnit,'String');
+checkframe=strcmp(TimeUnit,'frame');
+
 displ_num=get(handles.ListPairCiv1,'UserData');
 
@@ -3022 +3081 @@
             if select(ipair)
                 displ_pair{ipair}=['Di= ' num2str(-floor(ipair/2)) '|' num2str(ceil(ipair/2))];
-                if size(time,1)>=ref_i+displ_num(4,ipair) && size(time,2)>=ref_j+displ_num(2,ipair)
-                    dt=time(ref_i+displ_num(4,ipair),ref_j+displ_num(2,ipair))-time(ref_i+displ_num(3,ipair),ref_j+displ_num(1,ipair));%time interval dt
-                    displ_pair{ipair}=[displ_pair{ipair} ' :dt= ' num2str(dt*1000)];
+                if ~checkframe && size(time,1)>=ref_i+1+displ_num(4,ipair) && size(time,2)>=ref_j+1+displ_num(2,ipair)&&displ_num(2,ipair)>=1 &&displ_num(1,ipair)>=1
+                    dt=time(ref_i+1+displ_num(4,ipair),ref_j+1+displ_num(2,ipair))-time(ref_i+1+displ_num(3,ipair),ref_j+1+displ_num(1,ipair));%time interval dt
+                else
+                    dt=1;
                 end
+                 displ_pair{ipair}=[displ_pair{ipair} ' :dt= ' num2str(dt*1000)];
             else
                 displ_pair{ipair}='...'; %pair not displayed in the menu
@@ -3038 +3099 @@
             if select(ipair)
                 displ_pair{ipair}=['Dj= ' num2str(-floor(ipair/2)) '|' num2str(ceil(ipair/2))];
-                if size(time,1)>=ref_i+displ_num(4,ipair) && size(time,2)>=ref_j+displ_num(2,ipair)
-                    dt=time(ref_i+displ_num(4,ipair),ref_j+displ_num(2,ipair))-time(ref_i+displ_num(3,ipair),ref_j+displ_num(1,ipair));%time interval dt
+                if ~checkframe && size(time,1)>=ref_i+1+displ_num(4,ipair) && size(time,2)>=ref_j+1+displ_num(2,ipair)
+                    dt=time(ref_i+1+displ_num(4,ipair),ref_j+1+displ_num(2,ipair))-time(ref_i+1+displ_num(3,ipair),ref_j+1+displ_num(1,ipair));%time interval dt
                     displ_pair{ipair}=[displ_pair{ipair} ' :dt= ' num2str(dt*1000)];
                 end
@@ -3050 +3111 @@
     for ipair=1:nbpair
         if select(ipair)
-            dt=time(ref_i+displ_num(4,ipair),displ_num(2,ipair))-time(ref_i+displ_num(3,ipair),displ_num(1,ipair));%time interval dt
+            if ~checkframe && size(time,2)>1 
+            dt=time(ref_i+1+displ_num(4,ipair),displ_num(2,ipair)+1)-time(ref_i+1+displ_num(3,ipair),displ_num(1,ipair)+1);%time interval dt
+            else % time set by default to i index
+                dt=1;
+            end
             displ_pair{ipair}=['j= ' num2stra(displ_num(1,ipair),nom_type_ima) '-' num2stra(displ_num(2,ipair),nom_type_ima) ...
                 ' :dt= ' num2str(dt*1000)];
@@ -3140 +3205 @@
 end
 time=get(handles.ImaDoc,'UserData'); %get the set of times
-if isempty(time)
-    time=[0 1];%default
-end
+TimeUnit=get(handles.TimeUnit,'String');
+checkframe=strcmp(TimeUnit,'frame');
+% if isempty(time)
+%     time=[0 1];%default
+% end
 displ_num=get(handles.ListPairCiv1,'UserData');
 
@@ -3198 +3265 @@
         if select(ipair)
             displ_pair{ipair}=['Di= ' num2str(-floor(ipair/2)) '|' num2str(ceil(ipair/2)) ];
-            if size(time,1)>=ref_i+displ_num(4,ipair) && size(time,2)>=ref_j+displ_num(2,ipair)
-                dt=time(ref_i+displ_num(4,ipair),ref_j+displ_num(2,ipair))-time(ref_i+displ_num(3,ipair),ref_j+displ_num(1,ipair));%time interval dt
+            if  ~checkframe && size(time,1)>=ref_i+displ_num(4,ipair) && size(time,2)>=ref_j+displ_num(2,ipair)
+                dt=time(ref_i+displ_num(4,ipair)+1,ref_j+displ_num(2,ipair)+1)-time(ref_i+displ_num(3,ipair)+1,ref_j+displ_num(1,ipair)+1);%time interval dt
                 displ_pair{ipair}=[displ_pair{ipair} ' :dt= ' num2str(dt*1000)];
             end
@@ -3210 +3277 @@
         if select(ipair)
             displ_pair{ipair}=['Di= ' num2str(-floor(ipair/2)) '|' num2str(ceil(ipair/2)) ];
-            if size(time,1)>=ref_i+displ_num(4,ipair) && size(time,2)>=ref_j+displ_num(2,ipair)
-                dt=time(ref_i+displ_num(4,ipair),ref_j+displ_num(2,ipair))-time(ref_i+displ_num(3,ipair),ref_j+displ_num(1,ipair));%time interval dt
+            if ~checkframe && size(time,1)>=ref_i+displ_num(4,ipair) && size(time,2)>=ref_j+displ_num(2,ipair)&& displ_num(1,ipair)>=1 && displ_num(2,ipair)>=1
+                dt=time(ref_i+displ_num(4,ipair)+1,ref_j+displ_num(2,ipair)+1)-time(ref_i+displ_num(3,ipair)+1,ref_j+displ_num(1,ipair)+1);%time interval dt
+            else
+                dt=1;
+            end
                 displ_pair{ipair}=[displ_pair{ipair} ' :dt= ' num2str(dt*1000)];
-            end
         else
             displ_pair{ipair}='...'; %pair not displayed in the menu
@@ -3221 +3290 @@
     for ipair=1:nbpair
         if select(ipair)
-            dt=time(ref_i+displ_num(4,ipair),displ_num(2,ipair))-time(ref_i+displ_num(3,ipair),displ_num(1,ipair));%time interval dt
-            displ_pair{ipair}=['j= ' num2stra(displ_num(1,ipair),nom_type_ima) '-' num2stra(displ_num(2,ipair),nom_type_ima) ...
+            if  ~checkframe && size(time,1)>=ref_i+displ_num(4,ipair) && size(time,2)>=ref_j+displ_num(2,ipair) && displ_num(1,ipair)>=1 && displ_num(2,ipair)>=1
+            dt=time(ref_i+displ_num(4,ipair)+1,displ_num(2,ipair)+1)-time(ref_i+displ_num(3,ipair)+1,displ_num(1,ipair)+1);%time interval dt
+            else
+                dt=1;
+            end
+            displ_pair{ipair}=['j= ' num2stra(displ_num(1,ipair)+1,nom_type_ima) '-' num2stra(displ_num(2,ipair)+1,nom_type_ima) ...
                 ' :dt= ' num2str(dt*1000)];
+                
         else
             displ_pair{ipair}='...'; %pair not displayed in the menu
@@ -3623 +3697 @@
 list_subdir_civ1=get(handles.ListSubdirCiv1,'String');
 val=get(handles.ListSubdirCiv1,'Value');
-subdir=list_subdir_civ1{val};
-if strcmp(subdir,'new...')
+SubDir=list_subdir_civ1{val};
+if strcmp(SubDir,'new...')
     if get(handles.CheckCiv1,'Value')
-        subdir='CIV'; %default subdirectory
+        SubDir='CIV'; %default subdirectory
     else
         msgbox_uvmat('ERROR','select CheckCiv1 to perform a new Civ operation')
@@ -3632 +3706 @@
     end    
 end
-set(handles.txt_SubdirCiv1,'String',subdir);
+set(handles.txt_SubdirCiv1,'String',SubDir);
 find_netcpair_civ1(handles) 
 
@@ -3641 +3715 @@
 list_subdir_civ2=get(handles.ListSubdirCiv2,'String');
 val=get(handles.ListSubdirCiv2,'Value');
-subdir=list_subdir_civ2{val};
-if strcmp(subdir,'new...')
+SubDir=list_subdir_civ2{val};
+if strcmp(SubDir,'new...')
     if get(handles.CheckCiv2,'Value')
-        subdir='CIV'; %default subdirectory
+        SubDir='CIV'; %default subdirectory
     else
         msgbox_uvmat('ERROR','select CheckCiv2 to perform a new Civ operation')
@@ -3650 +3724 @@
     end
 end
-set(handles.txt_SubdirCiv2,'String',subdir);
+set(handles.txt_SubdirCiv2,'String',SubDir);
 
 %------------------------------------------------------------------------
@@ -3860 +3934 @@
 sizf=size(fileinput);
 if (~ischar(fileinput)||~isequal(sizf(1),1)),return;end %stop if fileinput not a character string
-[Path,File,field_count,str2,str_a,str_b,ref.ext,ref.nom_type,ref.subdir]=name2display(fileinput);
+%[Path,File,field_count,str2,str_a,str_b,ref.ext,ref.nom_type,ref.subdir]=name2display(fileinput);
+[Path,ref.subdir,File,ref.num1,ref.num2,ref.num_a,ref.num_b,ref.ext,ref.nom_type]=fileparts_uvmat(fileinput);
 ref.filebase=fullfile(Path,File);
-ref.num_a=stra2num(str_a);
-ref.num_b=stra2num(str_b);
-ref.num1=str2double(field_count);
-ref.num2=str2double(str2);
+% ref.num_a=stra2num(str_a);
+% ref.num_b=stra2num(str_b);
+% ref.num1=str2double(field_count);
+% ref.num2=str2double(str2);
 browse=[];%initialisation
 if ~isequal(ref.ext,'.nc')
@@ -3904 +3979 @@
     sizf=size(fileinput);
     if (~ischar(fileinput)||~isequal(sizf(1),1)),return;end %stop if fileinput not a character string
-    [Path,File,field_count,str2,str_a,str_b,ref.ext,ref.nom_type,ref.subdir]=name2display(fileinput);
+    %[Path,File,field_count,str2,str_a,str_b,ref.ext,ref.nom_type,ref.subdir]=name2display(fileinput);
+    [Path,ref.subdir,File,ref.num1,ref.num2,ref.num_a,ref.num_b,ref.ext,ref.nom_type]=fileparts_uvmat(fileinput);
     ref.filebase=fullfile(Path,File);
-    ref.num_a=stra2num(str_a);
-    ref.num_b=stra2num(str_b);
-    ref.num1=str2num(field_count);
-    ref.num2=str2num(str2);
+%     ref.num_a=stra2num(str_a);
+%     ref.num_b=stra2num(str_b);
+%     ref.num1=str2num(field_count);
+%     ref.num2=str2num(str2);
     browse=[];%initialisation
     if ~isequal(ref.ext,'.nc')
@@ -4091 +4167 @@
 errormsg=''; %default
 filename=regexprep(filename,'.nc',''); %file name for the result 
-if isequal(Param.Civ1.Dt,'0')
-    Param.Civ1.Dt='1' ;%case of 'displacement' mode
+if isequal(Param.Civ1.Dt,0)
+    Param.Civ1.Dt=1 ;%case of 'displacement' mode
 end
 Param.Civ1.ImageA=regexprep(Param.Civ1.ImageA,'.png','');
@@ -4444 +4520 @@
     end
 end
-

trunk/src/civ_3D.m

@@ -3086 +3086 @@
 %        str2double(get(hObject,'String')) returns contents of npx as a double
 
-
-
-
+%TODO: replace name2display by fileparts_uvmat:
+
+
+%'name2display': extracts the root name and field numbers from an input filename 
+%--------------------------------------------------------------------
+%[RootPath,RootFile,field_count,str2,str_a,str_b,ext,nom_type,subdir]=name2display(fileinput)
+%
+%OUTPUT:
+%filebasesub: filename without appendix
+%field_count: string for the first number i
+%str2: string for the second number i (only for .nc files)
+%str_a: string for the first number j
+%str_b:string for the second number j (only for .nc files)
+%ext: file extension
+%nom_type: char chain characterizing the file nomenclature: with values
+%   nom_type='': constant name [filebase ext] (default output if 'nom_type' is undefined)
+%   nom_type='*':constant name for a file representing a series (e.g. avi movie)
+%   nom_type='1','01',or '001'...': series of files with a single index i without separator(e.g. 'aa045.png').
+%   nom_type='_1','_01','_001'...':  series of files with a single index i with separator '_'(e.g. 'aa_045.png').
+%   nom_type='1a','1A','01a','01A',... with a numerical index and an index letter(e.g.'aa45b.png') (lower or upper case)
+%   nom_type='_1a','_1A','_01a','_01A',...: idem, with a separator '_' before the index
+%   nom_type='_1_1','_01_1',...: matrix of files with two indices i and j separated by '_'(e.g. 'aa_45_2.png')
+%   nom_type='_1-2': from pairs from a single index (e.g. 'aa_45-47.nc')
+%   nom_type='_1_1-2': pairs of j indices (e.g. 'aa_45_2-3.nc')
+%   nom_type='_1-2_j': pairs of i indices (e.g. 'aa_45-46_2.nc')
+%   nom_type='_1_ab','1_ab','01_ab'..., from pairs of '#' images (e.g.'aa045bc.nc'), ext='.nc'
+%subdir: name of the subdirectory for netcdf files
+%
+%INPUT:
+%fileinput: complete name of the file, including path
+
+function [RootPath,RootFile,field_count,str2,str_a,str_b,ext,nom_type,subdir]=name2display(fileinput)
+% siz=length(fileinput);
+% indcur=siz;
+% default values:
+% test_=0;
+field_count='';%character string
+str2='';
+str_a='';
+str_b='';
+% ext='';
+nom_type='';
+subdir='';
+        %select file extension
+[RootPath,RootFile,ext]=fileparts(fileinput);
+indcur=length(RootFile);% nbre of characters in fileraw
+
+        %recognize the name form
+% filerawascii=double(RootFile);%ascci code
+% val=(48>filerawascii)|(filerawascii>57); % test for the non-numerical characters
+indsel=regexp(RootFile,'\D');% character indices of non numerical characters
+filelit=RootFile(indsel);% fileraw name with numbers removed
+nbchar=length(indsel);
+if nbchar<4% put '*' before the name (remove at the end)
+   prefilelit(1:4-nbchar)='*';%insert 3_nbchar '*' in the file name
+   filelit=[prefilelit filelit];
+   indsel=[1:4-nbchar indsel+4-nbchar];
+   RootFile=[prefilelit RootFile];
+   indcur=indcur+4-nbchar;
+end
+separ3=indsel(end);% index of last non numerical character in fileraw
+separ2=indsel(end-1);% index of previous non numerical character
+separ1=indsel(end-2);
+separ0=indsel(end-3);
+num1='';num2='';num3='';
+if separ1>=separ0+1,num0=RootFile(separ0+1:separ1-1);end
+if separ2>=separ1+1,num1=RootFile(separ1+1:separ2-1);end
+if separ3>=separ2+1,num2=RootFile(separ2+1:separ3-1);end
+if indcur>=separ3+1,num3=RootFile(separ3+1:indcur);end
+last_str=RootFile(indcur);%last character in fileraw
+last=double(last_str);%corresponding ascii code
+penult=double(RootFile(indcur-1));%ascii code of the penultimate character
+testsub=0; %default 
+% % case of an indexed series in a single file
+% if strcmpi(ext,'.avi')
+%      nom_type='*';
+% %case of a numerical index follewed by a lower case letter (e.g. a,b,c):
+% %the penultimate character is a number and the last one a letter (lower case: last >= 97 && last <= 122
+% %                                                                 capital
+% %                                                                 letter:  last >= 65 && last <= 90)  
+if  penult >= 48 && penult <= 57 && ((last >= 65 && last <= 90)||(last >= 97 && last <= 122))
+    str_a=last_str; %extract appendix a,b,c... or A,B,C... as output.
+    ind_end=indcur-1; %current index just before the suffix letter
+    indices_root=regexp(RootFile(1:indcur-1),'\D');%detect non digit characters
+    indcur=max(indices_root);
+    field_count=RootFile(indcur+1:ind_end);
+    charstring=['%0' num2str(length(field_count)) 'd'];
+    nom_type=num2str(1,charstring);
+    if strcmp(RootFile(indcur),'_')
+       nom_type=['_' nom_type];
+       indcur=indcur-1;
+    end
+    if (last >= 65 && last <= 90)
+        nom_type=[nom_type 'A'];
+    else
+        nom_type=[nom_type 'a'];
+    end   
+elseif strcmp(filelit(end-2:end),'-_-_')%new  nomenclature appendix num1-num2_num_a-num_b
+    field_count=num0;
+    str2=num1;
+    str_a=num2;
+    str_b=num3;
+    nom_type='_1-2_1-2';
+    testsub=1;
+    indcur=separ0-1;
+elseif strcmp(filelit(end-2:end),'_-_')%new  nomenclature appendix num1-num2_num_a
+    field_count=num1;
+    str2=num2;
+    str_a=num3;
+    nom_type='_1-2_1';
+    testsub=1;
+    indcur=separ1-1;
+elseif strcmp(filelit(end-2:end),'__-')%new  nomenclature appendix num1_num2-num2 
+    indcur=separ1-1;
+    field_count=num1;
+    str_a=num2;
+    str_b=num3;
+    nom_type='_1_1-2';
+    testsub=1;
+elseif strcmp(filelit(end-1:end),'_-')
+    indcur=separ2-1;
+    field_count=num2;
+    str2=num3;
+    str_a='';
+    nom_type='_1-2';
+    testsub=1;
+elseif strcmp(filelit(end-1:end),'__')
+    indcur=separ2-1;
+    field_count=num2;
+    str2='';
+    str_a=num3;
+    nom_type='_1_1';
+elseif strcmp(filelit(end),'_')
+    indcur=separ3-1;
+    str2='';
+    str_a='';
+    %detect zeros before the number
+    field_count=RootFile(separ3+1:end);% set the selected field number'%03d'
+    charstring=['%0' num2str(length(field_count)) 'd'];
+    nom_type=['_' num2str(1,charstring)];
+elseif RootFile(indcur-2)=='_'% search appendix a,b,c,d
+    lasts=RootFile(indcur-1:indcur);
+%     if isequal(length(last),2) 
+        str_a=lasts(1);%put appendix a,b,c, ou d
+        str_b=lasts(2);%put appendix a,b,c, ou d
+        separ0=indsel(end-3);
+        field_count=RootFile(separ0+1:separ1-1);
+        indcur=separ0;
+        if double(lasts) >= 97 & double(lasts)<= 122 
+            nom_type='_ab';
+            testsub=1;
+        elseif double(lasts) >= 65 & double(lasts) <= 90 
+            nom_type='_AB';
+            testsub=1;
+        end
+        charstring=['%0' num2str(length(field_count)) 'd'];
+        nom_type=[num2str(1,charstring) nom_type];
+%     end
+%search for other names with counter
+else
+    if length(ext)>1     
+            num=1;count=0; % extract the numerical appendix
+            while num==1;
+                filascii=double(RootFile(indcur));
+                if (48>filascii)||(filascii>57); % select the non-numerical characters
+                    num=0; 
+                else
+                    indcur=indcur-1; count=count+1;
+                end
+            end
+            if count~=0   
+                field_count=RootFile(indcur+1:indcur+count);% set the selected field number'%03d'
+                charstring=['%0' num2str(length(field_count)) 'd'];
+                nom_type=num2str(1,charstring);
+            end
+    end
+end
+            %select the root name in the file_input window
+RootFile=RootFile(1:indcur);
+if nbchar<4% put '*' before the name (remove at the end)
+   RootFile(1:4-nbchar)=[];
+end
+if testsub
+    [RootPath,subdir,extdir]=fileparts(RootPath);
+    subdir=[subdir extdir];
+end
+

trunk/src/find_file_series.m

@@ -5 +5 @@
 % OUTPUT:
 % RootPath,RootFile: root path and root name detected in fileinput, possibly modified for movies (indexing is then done on image view, not file)
-% i1_series(ref_i, ref_j,pair),i2_series,j1_series,j2_series: set of indices (i1,i2,j1,j2) sorted by ref index ref_i, ref_j, and pairindex in case of multiple pairs with the same ref
+% i1_series(ref_i+1, ref_j+1,pair),i2_series,j1_series,j2_series: set of indices (i1,i2,j1,j2) sorted by ref index ref_i, ref_j, and pairindex in case of multiple pairs with the same ref
+%  (ref_i+1 is used to deal with the image index zero sometimes used)
 % NomType: nomenclature type corrected after checking the first file (problem of 0 before the number string)
 % FileType: type of file, =
@@ -129 +130 @@
     for ifile=1:nbpair
         [~,~,~,i1,i2,j1,j2]=fileparts_uvmat(dirpair(ifile).name);
-        %             i1_series(ifile)=i1;
         ref_i=i1;
         if isempty(i2_input)
@@ -162 +162 @@
         nb_pairs=0;
         if ~isempty(i2_input)|| ~isempty(j2_input) %deals with  pairs
-            if size(i1_series,1)>=ref_i && size(i1_series,2)>=ref_j
-                nb_pairs=numel(find(i1_series(ref_i,ref_j,:)~=0));
-            end
-        end
-        i1_series(ref_i,ref_j,nb_pairs+1)=i1;
+            if size(i1_series,1)>=ref_i+1 && size(i1_series,2)>=ref_j+1
+                nb_pairs=numel(find(i1_series(ref_i+1,ref_j+1,:)~=0));
+            end
+        end
+        i1_series(ref_i+1,ref_j+1,nb_pairs+1)=i1;
         if ~isempty(i2_input)
-            i2_series(ref_i,ref_j,nb_pairs+1)=i2;
+            i2_series(ref_i+1,ref_j+1,nb_pairs+1)=i2;
         end
         if ~isempty(j1_input)
-            j1_series(ref_i,ref_j,nb_pairs+1)=j1;
+            j1_series(ref_i+1,ref_j+1,nb_pairs+1)=j1;
         end
         if ~isempty(j2_input)
-            j1_series(ref_i,ref_j,nb_pairs+1)=j1;
-            j2_series(ref_i,ref_j,nb_pairs+1)=j2;
+            j1_series(ref_i+1,ref_j+1,nb_pairs+1)=j1;
+            j2_series(ref_i+1,ref_j+1,nb_pairs+1)=j2;
         end
     end

trunk/src/read_xls.m

@@ -185 +185 @@
                        testrecord=0;%we have an image series without 'record' subdir
                     elseif isequal(Ext,'.png')
-                       [Path,Root,field_count,str2,str_a,str_b,ext,nom_type,subdir]=name2display(fname{ifile});
+                       %[Path,Root,field_count,str2,str_a,str_b,ext,nom_type,subdir]=name2display(fname{ifile});
+                       [~,~,Root]=fileparts_uvmat(fname{ifile});
                        if ~isequal(Root,RootIma)%only one image recorded for each root name
                            [t,ImaDocElement]=add(t,DeviceElement,'element','Image');
@@ -194 +195 @@
                        testrecord=0;%we have an image series without 'record' subdir
                     elseif isequal(Ext,'.nc')
-                       [Path,Root,field_count,str2,str_a,str_b,ext,nom_type,subdir]=name2display(fname{ifile});
+                       %[Path,Root,field_count,str2,str_a,str_b,ext,nom_type,subdir]=name2display(fname{ifile});
+                       [~,~,Root]=fileparts_uvmat(fname{ifile});
                        if ~isequal(Root,RootNc)%only one image recorded for each root name
                            [t,ImaDocElement]=add(t,DeviceElement,'element','Ncdata');
@@ -240 +242 @@
                                t=attributes(t,'add',ImaDocElement,'source','file');
                             elseif isequal(Ext,'.png')
-                               [Path,Root,field_count,str2,str_a,str_b,ext,nom_type,subdir]=name2display(fname{ifile});
+                              % [Path,Root,field_count,str2,str_a,str_b,ext,nom_type,subdir]=name2display(fname{ifile});
+                                [~,~,Root]=fileparts_uvmat(fname{ifile});
                                if ~isequal(Root,RootIma)
                                    [t,ImaDocElement]=add(t,DeviceElement,'element','Image');
@@ -248 +251 @@
                                end
                             elseif isequal(Ext,'.nc')
-                               [Path,Root,field_count,str2,str_a,str_b,ext,nom_type,subdir]=name2display(fname{ifile});
+                               %[Path,Root,field_count,str2,str_a,str_b,ext,nom_type,subdir]=name2display(fname{ifile});
+                               [~,~,Root]=fileparts_uvmat(fname{ifile});
                                if ~isequal(Root,RootNc)%only one image recorded for each root name
                                   [t,ImaDocElement]=add(t,DeviceElement,'element','Ncdata');
@@ -290 +294 @@
                             [Path,Name,Ext]=fileparts(fname{ifile});
                             if isequal(Ext,'.xml')
-                               [Path,Root,field_count,str2,str_a,str_b,ext,nom_type,subdir]=name2display(fname{ifile});
+                               %[Path,Root,field_count,str2,str_a,str_b,ext,nom_type,subdir]=name2display(fname{ifile});
+                               [~,~,Root]=fileparts_uvmat(fname{ifile});
                                if ~isequal(Root,RootXml)%only one image recorded for each root name
                                    [t,ImaDocElement]=add(t,RecordElement,'element','CivDoc');
@@ -298 +303 @@
                                end
                             elseif isequal(Ext,'.nc')
-                               [Path,Root,field_count,str2,str_a,str_b,ext,nom_type,subdir]=name2display(fname{ifile});
+                               %[Path,Root,field_count,str2,str_a,str_b,ext,nom_type,subdir]=name2display(fname{ifile});
+                               [~,~,Root]=fileparts_uvmat(fname{ifile});
                                if ~isequal(Root,RootNc)%only one image recorded for each root name
                                   [t,ImaDocElement]=add(t,RecordElement,'element','Ncdata');

trunk/src/series.m

@@ -449 +449 @@
 
 %% look for min and max indices existing in the file series and update NomType
-[RootPath,RootFile,i1_series,i2_series,j1_series,j2_series,NomType,FileType,Object]=find_file_series(fileinput);
+[RootPath,RootFile,i1_series,i2_series,j1_series,j2_series,NomType,FileType,Object]=find_file_series(fileinput)
 MinIndex_i=min(i1_series(i1_series>0));
 if ~isempty(i2_series)