Changeset 332 for trunk/src

Timestamp:

Dec 13, 2011, 11:20:07 AM (13 years ago)

Author:

sommeria

Message:

NomType? changed from _i1-i2 ... to _1-2 ... (bugs to be expected!)
bug corrected in geometry_calib
series changed by introducing a from FileIndices?, introduction of find_file_series to detect the file series corresponding to an input file

Location:

trunk/src

Files:

• civ.m (modified) (4 diffs)
• find_file_series.m (added)
• geometry_calib.m (modified) (6 diffs)
• mouse_down.m (modified) (2 diffs)
• name2display.m (modified) (6 diffs)
• name_generator.m (modified) (8 diffs)
• num2stra.m (modified) (2 diffs)
• series.fig (modified) (previous)
• series.m (modified) (56 diffs)
• uvmat.m (modified) (6 diffs)

trunk/src/civ.m

@@ -552 +552 @@
 %%  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,'_i1-i2')||~(exist('nbfield2','var')&&(nbfield2~=1))
+if test_ima_i || isequal(nom_type_nc,'_1-2')||~(exist('nbfield2','var')&&(nbfield2~=1))
     set(handles.ListPairMode,'Value',1)
     set(handles.ListPairMode,'String',{'series(Di)'})   
@@ -1695 +1695 @@
 end
 if isempty(nom_type_ima2),nom_type_ima2='1';end; %default
-if isempty(nom_type_nc),nom_type_nc='_i1-i2';end; %default
+if isempty(nom_type_nc),nom_type_nc='_1-2';end; %default
 [num1_civ1,num2_civ1,num_a_civ1,num_b_civ1,num1_civ2,num2_civ2,num_a_civ2,num_b_civ2]=...
     find_pair_indices(handles,ref_i,ref_j,mode);
@@ -3085 +3085 @@
     nom_type_ima=browse.nom_type_ima;
 end
-nom_type_nc='_i1-i2';%default
+nom_type_nc='_1-2';%default
 if isfield(browse,'nom_type_nc')
     nom_type_nc=browse.nom_type_nc;
@@ -3093 +3093 @@
 elseif isequal(nom_type_ima,'none')||isequal(nom_type_nc,'none')
     nom_type_nc='none';
-elseif isequal(nom_type_ima,'avi')||isequal(nom_type_ima,'_i')||isequal(nom_type_ima,'ima_num')||isequal(nom_type_nc,'_i1-i2')
-    nom_type_nc='_i1-i2';
+elseif isequal(nom_type_ima,'avi')||isequal(nom_type_ima,'_i')||isequal(nom_type_ima,'ima_num')||isequal(nom_type_nc,'_1-2')
+    nom_type_nc='_1-2';
 else
     if  isequal(mode,'series(Di)')%|isequal(mode,'st_series(Di)')
-        nom_type_nc='_i1-i2_j'; % PIV in volume
+        nom_type_nc='_1-2_1'; % PIV in volume
     else
-        nom_type_nc='_i_j1-j2';
+        nom_type_nc='_1_1-2';
     end
 end

trunk/src/geometry_calib.m

@@ -275 +275 @@
         delete(hhh);
     end
-    set(hhuvmat.FixLimits,'Value',0)% put FixedLimits option to 'off'
-    set(hhuvmat.FixLimits,'BackgroundColor',[0.7 0.7 0.7])
+    set(hhuvmat.CheckFixLimits,'Value',0)% put FixedLimits option to 'off'
+    set(hhuvmat.CheckFixLimits,'BackgroundColor',[0.7 0.7 0.7])
     UserData=get(handles.geometry_calib,'UserData');
     UserData.XmlInputFile=outputfile;%save the current xml file name
@@ -499 +499 @@
     huvmat=findobj(allchild(0),'Tag','uvmat');
     hhuvmat=guidata(huvmat);
-    Calib.Cx=str2num(get(hhuvmat.npx,'String'))/2;
-    Calib.Cx=str2num(get(hhuvmat.npy,'String'))/2;
+    Calib.Cx=str2num(get(hhuvmat.num_Npx,'String'))/2;
+    Calib.Cx=str2num(get(hhuvmat.num_Npy,'String'))/2;
 end   
 %tsai parameters
@@ -557 +557 @@
 %retrieve the calibration points stored in the files listed in the popup list coord_files
 x_1=Coord(:,4:5)';%px coordinates of the ref points
-nx=str2num(get(hhuvmat.npx,'String'));
-ny=str2num(get(hhuvmat.npy,'String'));
+nx=str2num(get(hhuvmat.num_Npx,'String'));
+ny=str2num(get(hhuvmat.num_Npy,'String'));
 x_1(2,:)=ny-x_1(2,:);%reverse the y image coordinates
 X_1=Coord(:,1:3)';%phys coordinates of the ref points
@@ -629 +629 @@
 %retrieve the calibration points stored in the files listed in the popup list coord_files
 x_1=Coord(:,4:5)';%px coordinates of the ref points
-nx=str2num(get(hhuvmat.npx,'String'));
-ny=str2num(get(hhuvmat.npy,'String'));
+nx=str2num(get(hhuvmat.num_Npx,'String'));
+ny=str2num(get(hhuvmat.num_Npy,'String'));
 x_1(2,:)=ny-x_1(2,:);%reverse the y image coordinates
 X_1=Coord(:,1:3)';%phys coordinates of the ref points
@@ -693 +693 @@
 huvmat=findobj(allchild(0),'Tag','uvmat');
 hhuvmat=guidata(huvmat);
-ny=str2double(get(hhuvmat.npy,'String'));
+ny=str2double(get(hhuvmat.num_Npy,'String'));
 x_1(2,:)=ny-x_1(2,:);%reverse the y image coordinates
 n_ima=1;
@@ -1596 +1596 @@
 %     f2=1000;
 %     hhuvmat=guidata(findobj(allchild(0),'Name','uvmat'));
-%     Cx=str2num(get(hhuvmat.npx,'String'))/2;
-%     Cy=str2num(get(hhuvmat.npy,'String'))/2;
+%     Cx=str2num(get(hhuvmat.num_Npx,'String'))/2;
+%     Cy=str2num(get(hhuvmat.num_Npy,'String'))/2;
 Tabchar={};%default
 val_cal=1;%default

trunk/src/mouse_down.m

@@ -24 +24 @@
 function xy=mouse_down(hObject,eventdata)
 
-huvmat=findobj(allchild(0),'tag','uvmat');%find the uvmat interface handle which controls theoption of  mouse action
-if isempty(huvmat)
-    return
-end
-hhuvmat=guidata(huvmat);%handles of elements in uvmat
-UvData=get(huvmat,'UserData');
+AxeData=[];%default
 FigData=get(hObject,'UserData');
 if ishandle(FigData)% case of a zoom plot, the handle of the parent rectangle is stored in UserData, its parent is the plotting axes of the rectangle
@@ -41 +36 @@
 hhcurrentfig=guidata(hcurrentfig);
 if isfield(hhcurrentfig,'CheckZoom')
-test_zoom=get(hhcurrentfig.CheckZoom,'Value');%test for zoom action, first priority
+    test_zoom=get(hhcurrentfig.CheckZoom,'Value');%test for zoom action, first priority
 else
     test_zoom=0;
 end
-test_ruler=isequal(get(hhuvmat.MenuRuler,'checked'),'on');%test for ruler  action, second priority;
-test_edit=get(hhuvmat.edit_object,'Value');%test for object editing, third priority
-test_edit_vect=get(hhuvmat.edit_vect,'Value');%test for vector editing,  priority 4
-test_create=isequal(get(hhuvmat.MenuObject,'checked'),'on');% test for object creation,  priority 5
-if test_create
-    hset_object=findobj(allchild(0),'tag','set_object');
-    test_create=~isempty(hset_object)&&~test_edit;
-end
-test_cal=isequal(get(hhuvmat.MenuCalib,'checked'),'on');% test for calibration
-if test_cal% test for calibration popints,  priority 6
-    h_calib=findobj(allchild(0),'tag','geometry_calib');
-    if isempty(h_calib)
-        test_cal=0;
-        set(hhuvmat.MenuCalib,'checked','off');% test for calibration off
-    else
-        hh_calib=guidata(h_calib);
-        test_cal=get(hh_calib.edit_append,'Value');
-    end
-end
-AxeData=[];%default
+
+%% look for parameters set by the GUI uvmat
+test_ruler=0;
+test_edit=0;
+test_create=0;
+huvmat=findobj(allchild(0),'tag','uvmat');%find the uvmat interface handle which controls theoption of  mouse action
+if ~isempty(huvmat)
+    hhuvmat=guidata(huvmat);%handles of elements in uvmat
+    UvData=get(huvmat,'UserData');
+    test_ruler=isequal(get(hhuvmat.MenuRuler,'checked'),'on');%test for ruler  action, second priority;
+    test_edit=get(hhuvmat.edit_object,'Value');%test for object editing, third priority
+    test_edit_vect=get(hhuvmat.edit_vect,'Value');%test for vector editing,  priority 4
+    test_create=isequal(get(hhuvmat.MenuObject,'checked'),'on');% test for object creation,  priority 5
+    if test_create
+        hset_object=findobj(allchild(0),'tag','set_object');
+        test_create=~isempty(hset_object)&&~test_edit;
+    end
+    test_cal=isequal(get(hhuvmat.MenuCalib,'checked'),'on');% test for calibration
+    if test_cal% test for calibration popints,  priority 6
+        h_calib=findobj(allchild(0),'tag','geometry_calib');
+        if isempty(h_calib)
+            test_cal=0;
+            set(hhuvmat.MenuCalib,'checked','off');% test for calibration off
+        else
+            hh_calib=guidata(h_calib);
+            test_cal=get(hh_calib.edit_append,'Value');
+        end
+    end
+end
 
 %% determine the currently selected items

trunk/src/name2display.m

@@ -18 +18 @@
 %   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='_i1-i2': from pairs from a single index (e.g. 'aa_45-47.nc')
-%   nom_type='_i_j1-j2': pairs of j indices (e.g. 'aa_45_2-3.nc')
-%   nom_type='_i1-i2_j': pairs of i indices (e.g. 'aa_45-46_2.nc')
+%   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
@@ -69 +69 @@
 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)  
-elseif  penult >= 48 && penult <= 57 && ((last >= 65 && last <= 90)||(last >= 97 && last <= 122))
+% % 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
@@ -98 +98 @@
     str_a=num2;
     str_b=num3;
-    nom_type='_i1-i2_j1-j2';
+    nom_type='_1-2_1-2';
     testsub=1;
     indcur=separ0-1;
@@ -105 +105 @@
     str2=num2;
     str_a=num3;
-    nom_type='_i1-i2_j';
+    nom_type='_1-2_1';
     testsub=1;
     indcur=separ1-1;
@@ -113 +113 @@
     str_a=num2;
     str_b=num3;
-    nom_type='_i_j1-j2';
+    nom_type='_1_1-2';
     testsub=1;
 elseif strcmp(filelit(end-1:end),'_-')
@@ -120 +120 @@
     str2=num3;
     str_a='';
-    nom_type='_i1-i2';
+    nom_type='_1-2';
     testsub=1;
 elseif strcmp(filelit(end-1:end),'__')

trunk/src/name_generator.m

@@ -26 +26 @@
 %   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='_i1-i2': from pairs from a single index (e.g. 'aa_45-47.nc')
-%   nom_type='_i_j1-j2': pairs of j indices (e.g. 'aa_45_2-3.nc')
-%   nom_type='_i1-i2_j': pairs of i indices (e.g. 'aa_45-46_2.nc')
+%   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_1': 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'
 %'comp_input' (for nom_type involving index pairs (e.g. netc))
@@ -71 +71 @@
 num_i2_out=num_i2;%default output
 num_j2_out=num_j2;%default output
-test_pairs=numel(nom_type)>=2 &&(strcmp(nom_type,'_i1-i2_j1-j2')|| strcmp(nom_type(end-1:end),'ab')|| strcmp(nom_type(end-1:end),'AB')||...
-                strcmp(nom_type,'_i_j1-j2')|| strcmp(nom_type,'_i1-i2_j')||strcmp(nom_type,'_i1-i2'));
-%test_2D= strcmp(nom_type(end-1:end),'ab')|| strcmp(nom_type(end-1:end),'AB') ||strcmp(nom_type,'_i_j1-j2');
-%test_3D=strcmp(nom_type,'_i1-i2_j')|| strcmp(nom_type,'_i1-i2');
+test_pairs=numel(nom_type)>=2 &&(strcmp(nom_type,'_1-2_1-2')|| strcmp(nom_type(end-1:end),'ab')|| strcmp(nom_type(end-1:end),'AB')||...
+                strcmp(nom_type,'_1_1-2')|| strcmp(nom_type,'_1-2_1')||strcmp(nom_type,'_1-2'));
+%test_2D= strcmp(nom_type(end-1:end),'ab')|| strcmp(nom_type(end-1:end),'AB') ||strcmp(nom_type,'_1_1-2');
+%test_3D=strcmp(nom_type,'_1-2_1')|| strcmp(nom_type,'_1-2');
 if ~isequal(subdir,'') && ~isequal(subdir,'?') 
       [Path,Name]=fileparts(filebase);
@@ -144 +144 @@
                 filename=[filename num2str(num_i1,numstr) num_j_str ext];
                 num_i2_out=num_i1;
-            elseif isequal(nom_type,'i_j1-j2')
+            elseif isequal(nom_type,'1_1-2')
                 if isequal(num2str(num_j1),num2str(num_j2))% case of displacements at the same time
                     filename=[filename num2str(num_i1) '_' num2str(num_j1) ext];
@@ -151 +151 @@
                 end
                 num_i2_out=num_i1;
-            elseif  isequal(nom_type,'i1-i2_j')
+            elseif  isequal(nom_type,'1-2_1')
                 if isequal(num2str(num_i1),num2str(num_i2))% case of displacements at the same time
                       filename=[filename num2str(num_i1) '_' num2str(num_j1) ext];
@@ -158 +158 @@
                 end
                 num_j2_out=num_j1;
-            elseif  isequal(nom_type,'i1-i2')
+            elseif  isequal(nom_type,'1-2')
                 if isequal(num2str(num_i1),num2str(num_i2))% case of displacements at the same time
                      filename=[filename num2str(num_i1) ext];
@@ -165 +165 @@
                 end
                 num_j2_out=num_j1;
-            elseif isequal(nom_type,'i1-i2_j1-j2')
+            elseif isequal(nom_type,'1-2_1-2')
                 if isequal(num2str(num_i1),num2str(num_i2))% case of displacements at the same time
                     app1= num2str(num_i1);
@@ -215 +215 @@
             if isequal(nom_type,'#_ab')
                 filename=[filebasesub num2str(num_i1,'%03d') '_' num2stra(num_j1,nom_type) num2stra(num_j2,nom_type) ext];
-            elseif isequal(nom_type,'_i1_j1-j2')
+            elseif isequal(nom_type,'_1_1-2')
                 filename=[filebasesub '_' num2str(num_i1) '_' num2str(num_j1) '-' num2str(num_i2) ext];
-            elseif isequal(nom_type,'_i1-i2_j')
+            elseif isequal(nom_type,'_1-2_1')
                 filename=[filebasesub '_' num2str(num_i1) '-' num2str(num_i2) '_' num2str(num_j1) ext];
-            elseif isequal(nom_type,'_i1-i2')
+            elseif isequal(nom_type,'_1-2')
                 filename=[filebasesub '_' num2str(num_i1) '-' num2str(num_i2) ext];
             end
@@ -246 +246 @@
 if isequal(nom_type,'#_ab')
     dirpair=dir([filebasesub num2str(num_i1,'%03d') '_*.nc']);
-elseif isequal(nom_type,'_i_j1-j2')
+elseif isequal(nom_type,'_1_1-2')
     dirpair=dir([filebasesub '_' num2str(num_i1) '_*-*.nc']);
-elseif isequal(nom_type,'_i1-i2_j')
+elseif isequal(nom_type,'_1-2_1')
     dirpair=dir([filebasesub '_' num2str(num_i1) '-*_' num2str(num_j1) '.nc']);
-elseif isequal(nom_type,'_i1-i2')
+elseif isequal(nom_type,'_1-2')
     dirpair=dir([filebasesub '_' num2str(num_i1) '-*.nc']);
     if isempty(dirpair)

trunk/src/num2stra.m

@@ -13 +13 @@
 
 function str=num2stra(num,nom_type,index)
+str='';
 if ~exist('index','var')
     index=2; %index 1 or 2 of the file indices
@@ -18 +19 @@
 switch index
     case 1
-        if length(nom_type)>=4 && isequal(nom_type(1:2),'%0') && isequal(nom_type(4),'d') 
-           str=num2str(num,nom_type(1:4)); 
-        else
+%         if length(nom_type)>=4 && isequal(nom_type(1:2),'%0') && isequal(nom_type(4),'d') 
+%            str=num2str(num,nom_type(1:4)); 
+%         else
            str=num2str(num); 
-        end
+%         end
     case 2
-        if isempty(nom_type)
-            nom_type='none';
-        end
-        if isequal(nom_type,'png_old') || isequal(nom_type,'netc_old') || isequal(nom_type,'raw_SMD')||...
-            isequal(nom_type(end),'a')||isequal(nom_type(end),'b')
+        if isequal(nom_type(end),'a')||isequal(nom_type(end),'b')
             str=char(96+num);
         elseif isequal(nom_type(end),'A')|isequal(nom_type(end),'B')
             str=char(64+num);
-        elseif isequal(nom_type,'series_i')|isequal(nom_type,'netc_series')...
-                |isequal(nom_type,'ima_num')| isequal(nom_type,'avi')| isequal(nom_type,'none')...
-                isequal(nom_type,'_i')|isequal(nom_type,'_i1-i2')
-            str='';
+%         elseif isequal(nom_type,'series_i')|isequal(nom_type,'netc_series')...
+%                 |isequal(nom_type,'ima_num')| isequal(nom_type,'avi')| isequal(nom_type,'none')...
+%                 isequal(nom_type,'_i')|isequal(nom_type,'_i1-i2')
+%             str='';
         else
             str=num2str(num);

trunk/src/series.m

@@ -65 +65 @@
 % set(0,'Units','pixels')
 % screensize=get(0,'ScreenSize'); %screen size in pixels
-set(hObject,'Position',[150 100 1000 600] );%position and size in pixels (get adjusted to the screen size in case of excess)
+set(hObject,'WindowButtonDownFcn',{'mouse_down'})%allows mouse action with right button (zoom for uicontrol display)
+%set(hObject,'Position',[150 100 1000 600] );%position and size in pixels (get adjusted to the screen size in case of excess)
 %load the list of previously browsed files in menus Open and Open_1
 dir_perso=prefdir;
@@ -112 +113 @@
 if isfield(param,'FileName')
     if isfield(param,'FileName_1')
-        update_file(hObject, eventdata, handles,param.FileName_1,0)
-        update_file(hObject, eventdata, handles,param.FileName,1)
+        update_file(handles,param.FileName_1,0)
+        update_file(handles,param.FileName,1)
     else
-        update_file(hObject, eventdata, handles,param.FileName,0)
+        update_file(handles,param.FileName,0)
     end
 end  
@@ -125 +126 @@
     FieldCell{1}=param.list_fields{param.index_fields};
 end
-set(hObject,'WindowButtonDownFcn',{'mouse_down'})%allows mouse action with right button (zoom for uicontrol display)
 NomType_Callback(hObject, eventdata, handles)
 
@@ -135 +135 @@
 [path_series,name,ext]=fileparts(which('series'));
 path_series=fullfile(path_series,'series');%path of the function 'series'
-addpath path_series ; %add the path to UVMAT, (useful in case of change of working directory after civ has been s opened in the working directory)
+addpath (path_series) ; %add the path to UVMAT, (useful in case of change of working directory after civ has been s opened in the working directory)
 path_transform=fullfile(path_series,'transform_field');%path to the field transform functions 
 for ilist=1:length(fct_menu)
@@ -256 +256 @@
     warndlg_uvmat('ERROR','input file type not implemented')%A Faire: ouvrir le fichier pour naviguer
 else
-    update_file(hObject, eventdata, handles,fileinput,0)
+    update_file(handles,fileinput,0)
      %update list of recent files in the menubar
     MenuFile_1=fileinput;
@@ -293 +293 @@
 function MenuFile_1_Callback(hObject, eventdata, handles)
 fileinput=get(handles.MenuFile_1,'Label');
-update_file(hObject, eventdata, handles,fileinput,0)
+update_file(handles,fileinput,0)
 
 % --------------------------------------------------------------------
 function MenuFile_2_Callback(hObject, eventdata, handles)
 fileinput=get(handles.MenuFile_2,'Label');
-update_file(hObject, eventdata, handles,fileinput,0)
+update_file(handles,fileinput,0)
 
 % --------------------------------------------------------------------
 function MenuFile_3_Callback(hObject, eventdata, handles)
 fileinput=get(handles.MenuFile_3,'Label');
-update_file(hObject, eventdata, handles,fileinput,0)
+update_file( handles,fileinput,0)
 
 % --------------------------------------------------------------------
 function MenuFile_4_Callback(hObject, eventdata, handles)
 fileinput=get(handles.MenuFile_4,'Label');
-update_file(hObject, eventdata, handles,fileinput,0)
+update_file(handles,fileinput,0)
 
 % --------------------------------------------------------------------
 function MenuFile_5_Callback(hObject, eventdata, handles)
 fileinput=get(handles.MenuFile_5,'Label');
-update_file(hObject, eventdata, handles,fileinput,0)
+update_file(handles,fileinput,0)
 
 % --------------------------------------------------------------------
@@ -360 +360 @@
     msgbox_uvmat('ERROR','input file type not implemented')%A Faire: ouvrir le fichier pour naviguer
 else
-    update_file(hObject, eventdata, handles,fileinput,1)
+    update_file(handles,fileinput,1)
     %update list of recent files in the menubar
     MenuFile_1=fileinput;
@@ -397 +397 @@
 function MenuFile_insert_1_Callback(hObject, eventdata, handles)
 fileinput=get(handles.MenuFile_insert_1,'Label');
-update_file(hObject, eventdata, handles,fileinput,1)
+update_file(handles,fileinput,1)
 
 % --------------------------------------------------------------------
 function MenuFile_insert_2_Callback(hObject, eventdata, handles)
 fileinput=get(handles.MenuFile_insert_2,'Label');
-update_file(hObject, eventdata, handles,fileinput,1)
+update_file(handles,fileinput,1)
 
 % --------------------------------------------------------------------
 function MenuFile_insert_3_Callback(hObject, eventdata, handles)
 fileinput=get(handles.MenuFile_insert_3,'Label');
-update_file(hObject, eventdata, handles,fileinput,1)
+update_file( handles,fileinput,1)
 
 % --------------------------------------------------------------------
 function MenuFile_insert_4_Callback(hObject, eventdata, handles)
 fileinput=get(handles.MenuFile_insert_4,'Label');
-update_file(hObject, eventdata, handles,fileinput,1)
+update_file( handles,fileinput,1)
 
 % --------------------------------------------------------------------
 function MenuFile_insert_5_Callback(hObject, eventdata, handles)
 fileinput=get(handles.MenuFile_insert_5,'Label');
-update_file(hObject, eventdata, handles,fileinput,1)
+update_file(handles,fileinput,1)
 
 %------------------------------------------------------------------------
 % ---  refresh the GUI data after introduction of a new file series
-function update_file(hObject, eventdata, handles,fileinput,addtest)
+% INPUT:
+% handles: 
+% fileinput: name of the input file
+% addtest: =0 to refresh the list of file series, =1 to append a new series to the list (from the menu bar option 'Open_insert')
+function update_file(handles,fileinput,addtest)
 %------------------------------------------------------------------------  
+
+%% enable other menus and uicontrols
+set(handles.MenuOpen_insert,'Enable','on')
+set(handles.MenuFile_insert_1,'Enable','on')
+set(handles.MenuFile_insert_2,'Enable','on')
+set(handles.MenuFile_insert_3,'Enable','on')
+set(handles.MenuFile_insert_4,'Enable','on')
+set(handles.MenuFile_insert_5,'Enable','on')
+set(handles.RUN, 'Enable','On')
+set(handles.RUN,'BackgroundColor',[1 0 0])% set RUN button to red 
+set(handles.RootPath,'BackgroundColor',[1 1 0]) % set RootPath edit box  to yellow
+drawnow
+
+%% get the input root name, indices, file extension and nomenclature NomType
 if ~exist(fileinput,'file')
     msgbox_uvmat('ERROR',['input file ' fileinput  ' does not exist'])
     return
 end
-
-% refresh input root name, indices, file extension and nomenclature
-[RootPath,RootFile,field_count,str2,str_a,str_b,FileExt,NomType,SubDir]=name2display(fileinput);
-
-%check for movie image files
-if ~isempty(FileExt)
-    if ~isempty(imformats(FileExt(2:end)))
-        imainfo=imfinfo(fileinput);
-        if length(imainfo) >1 %case of image with multiple frames
-            NomType='*';
-            [RootPath,RootFile]=fileparts(fileinput);
-        end
-    end
-end
-NcType='none';%default
-if isequal(FileExt,'.nc')
-   Data=nc2struct(fileinput,[]);
-   if isfield(Data,'absolut_time_T0')
-       NcType='civx'; % test for civx velocity fields
-   end
-end
-
-set(handles.RootPath,'Value',1)
-set(handles.SubDir,'Value',1)
-set(handles.RootFile,'Value',1)
-set(handles.NomType,'Value',1)
-set(handles.FileExt,'Value',1)
-set(handles.nb_field,'Value',1)
-set(handles.nb_field2,'Value',1)
-if addtest
-    SeriesData=get(handles.figure1,'UserData');
-    SeriesData.displ_num=[0 0 0 0;SeriesData.displ_num];
-    SeriesData.CurrentInputFile_1=SeriesData.CurrentInputFile;
-    RootPathCell=[{RootPath}; get(handles.RootPath,'String')] ; 
-    SubDirCell=[{SubDir}; get(handles.SubDir,'String')];
-    RootFileCell=[{RootFile}; get(handles.RootFile,'String')]; 
-    NomTypeCell=[{NomType}; SeriesData.NomType];
-    FileExtCell=[{FileExt}; get(handles.FileExt,'String')];
-    NcTypeCell=[{NcType};SeriesData.NcType];
-    set(handles.NomType,'String',[{};get(handles.NomType,'String')])
-else
-    SeriesData=[];%re-initialisation 
-    SeriesData.displ_num=[0 0 0 0];
-    RootPathCell={RootPath};
-    SubDirCell={SubDir};
-    RootFileCell={RootFile};   
-    NomTypeCell={NomType};
-    FileExtCell={FileExt};   
-    NcTypeCell={NcType};
-end
-
-SeriesData.NomType=NomTypeCell;
-SeriesData.NcType=NcTypeCell;
-SeriesData.CurrentInputFile=fileinput;
-set(handles.RootPath,'String',RootPathCell);
-set(handles.SubDir,'String',SubDirCell);
-set(handles.RootFile,'String',RootFileCell);
-set(handles.NomType,'String',NomTypeCell);
-set(handles.FileExt,'String',FileExtCell);  
-
-%determine field indices
+[RootPath,RootFile,i1,str2,str_a,str_b,FileExt,NomType,SubDir]=name2display(fileinput);
+
+%% look for min and max indices existing in the file series and update NomType
+[num_i1,num_i2,num_j1,num_j2,NomType,FileType,Object]=find_file_series(fileinput);
+ if strcmp(NomType,'*')
+     MinIndex_i=1;
+     MinIndex_j=1;
+     nb_field=num_i2;
+     nb_field2=1;
+ else
+    MinIndex_i=min(floor((min(num_i1)+min(num_i2))/2));
+    MinIndex_j=min(floor((min(num_j1)+min(num_j2))/2));
+    nb_field=max(floor((max(num_i1)+max(num_i2))/2));
+    nb_field2=max(floor((max(num_j1)+max(num_j2))/2));
+ end
+if isnan(nb_field)
+    nb_field_str='?';
+    nb_field_str2='?';
+else
+    MinIndex_i_str=num2str(MinIndex_i);
+    MinIndex_j_str=num2str(MinIndex_j);
+    nb_field_str=num2str(nb_field);
+    nb_field_str2=num2str(nb_field2);  
+end
+if addtest% case of insertion of a new series (menu bar option Open_insert)
+    MinIndex_i_cell=[{MinIndex_i_str} ;get(handles.MinIndex_i,'String')];
+    MinIndex_j_cell=[{MinIndex_j_str} ;get(handles.MinIndex_j,'String')];
+    nb_field_cell=[{nb_field_str} ;get(handles.nb_field,'String')];
+    nb_field2_cell=[{nb_field_str2} ;get(handles.nb_field2,'String')];
+else % refresh the list (menu bar option Open)
+    MinIndex_i_cell={MinIndex_i_str};
+    MinIndex_j_cell={MinIndex_j_str};
+    nb_field_cell={nb_field_str};
+    nb_field2_cell={nb_field_str2};
+end
+set(handles.MinIndex_i,'String',MinIndex_i_cell);
+set(handles.MinIndex_j,'String',MinIndex_j_cell);
+set(handles.nb_field,'String',nb_field_cell);
+set(handles.nb_field2,'String',nb_field2_cell);
+
+
+%% determine reference field indices
 ref_i=1; %default ref_i is a reference frame index used to find existing pairs from PIV
-if ~isempty(str2num(field_count))
-    ref_i=str2num(field_count);
+if ~isempty(str2num(i1))
+    ref_i=str2num(i1);
     if ~isempty(str2num(str2))
         ref_i=floor((ref_i+str2num(str2))/2);% reference image number corresponding to the file
-        SeriesData.browse_Di=str2num(str2)-str2num(field_count);
+        SeriesData.browse_Di=str2num(str2)-str2num(i1);
     end
 end
@@ -511 +510 @@
 set(handles.last_j,'String',num2str(ref_j)); 
 
-%enable other menus and uicontrols
-set(handles.MenuOpen_insert,'Enable','on')
-set(handles.MenuFile_insert_1,'Enable','on')
-set(handles.MenuFile_insert_2,'Enable','on')
-set(handles.MenuFile_insert_3,'Enable','on')
-set(handles.MenuFile_insert_4,'Enable','on')
-set(handles.MenuFile_insert_5,'Enable','on')
-set(handles.RUN, 'Enable','On')
-set(handles.RUN,'BackgroundColor',[1 0 0])% set RUN button to red 
-set(handles.RootPath,'BackgroundColor',[1 1 0]) % set RootPath edit box  to yellow
-drawnow
-
 TimeUnit=''; %default
 time=[];%default
@@ -536 +523 @@
 if isequal(lower(FileExt),'.avi') %.avi file
     testima=1;
-    info=aviinfo([FileBase FileExt]);
-    time=(0:1/info.FramesPerSecond:(info.NumFrames-1)/info.FramesPerSecond)';
-    nb_field=info.NumFrames;
-    nb_field2=1;
+%     info=aviinfo([FileBase FileExt]);
+%     time=(0:1/info.FramesPerSecond:(info.NumFrames-1)/info.FramesPerSecond)';
+%     nb_field=info.NumFrames;
+%     nb_field2=1;
 elseif ~isempty(imformats(FileExt(2:end))) 
     testima=1;
-    if isequal(NomType,'*')% multi-frame image
-        imainfo=imfinfo([FileBase FileExt]);     
-        if length(imainfo) >1 %case of image with multiple frames
-            nb_field=length(imainfo);
-            nb_field2=1;
-        end
-    end
+%     if isequal(NomType,'*')% multi-frame image
+%         imainfo=imfinfo([FileBase FileExt]);     
+%         if length(imainfo) >1 %case of image with multiple frames
+%             nb_field=length(imainfo);
+%             nb_field2=1;
+%         end
+%     end
 elseif isequal(FileExt,'.vol')
      testima=1;
 end
 
-% enable field and veltype menus
+
+%% fill the list of file series
+% select the first line in the list 
+set(handles.RootPath,'Value',1)
+set(handles.SubDir,'Value',1)
+set(handles.RootFile,'Value',1)
+set(handles.NomType,'Value',1)
+set(handles.FileExt,'Value',1)
+set(handles.nb_field,'Value',1)
+set(handles.nb_field2,'Value',1)
+% append the current file series to the list
+if addtest 
+    SeriesData=get(handles.series,'UserData');
+    SeriesData.displ_num=[0 0 0 0;SeriesData.displ_num];
+    SeriesData.CurrentInputFile_1=SeriesData.CurrentInputFile;
+    RootPathCell=[{RootPath}; get(handles.RootPath,'String')] ; 
+    SubDirCell=[{SubDir}; get(handles.SubDir,'String')];
+    RootFileCell=[{RootFile}; get(handles.RootFile,'String')]; 
+    NomTypeCell=[{NomType}; SeriesData.NomType];
+    FileExtCell=[{FileExt}; get(handles.FileExt,'String')];
+    FileTypeCell=[{FileType};SeriesData.FileType];
+    set(handles.NomType,'String',[{};get(handles.NomType,'String')])
+% or re-initialise the list of  input  file series   
+else 
+    SeriesData=[];%re-initialisation 
+    SeriesData.displ_num=[0 0 0 0];
+    RootPathCell={RootPath};
+    SubDirCell={SubDir};
+    RootFileCell={RootFile};   
+    NomTypeCell={NomType};
+    FileExtCell={FileExt};   
+    FileTypeCell={FileType};
+end
+SeriesData.NomType=NomTypeCell;
+SeriesData.FileType=FileTypeCell;
+SeriesData.CurrentInputFile=fileinput;
+set(handles.RootPath,'String',RootPathCell);
+set(handles.SubDir,'String',SubDirCell);
+set(handles.RootFile,'String',RootFileCell);
+set(handles.NomType,'String',NomTypeCell);
+set(handles.FileExt,'String',FileExtCell); 
+
+%% enable field and veltype menus
 testfield=isequal(get(handles.FieldMenu,'enable'),'on');
 testfield_1=isequal(get(handles.FieldMenu_1,'enable'),'on');
@@ -568 +597 @@
             testnc=1;
         end
-        if isequal(NcTypeCell{iview},'civx')
+        if isequal(FileTypeCell{iview},'civx')
             testcivx=1;
         end
@@ -575 +604 @@
     testnc=isequal(FileExtCell{1},'.nc');
     testnc_1=isequal(FileExtCell{2},'.nc');
-    testcivx=isequal(NcTypeCell{1},'civx');
-    testcivx_1=isequal(NcTypeCell{2},'civx');
+    testcivx=isequal(FileTypeCell{1},'civx');
+    testcivx_1=isequal(FileTypeCell{2},'civx');
 end
 if testfield && testnc 
@@ -630 +659 @@
 end  
 
-%%%%%%%%   read image documentation file  if found%%%%%%%%%%%%%%%%%%%%%%%%%%%
-      %look for the file existence
+%%  read image documentation file  if found%%%%%%%%%%%%%%%%%%%%%%%%%%%
 ext_imadoc='';
 if isequal(FileExt,'.xml')||isequal(FileExt,'.civ')
@@ -640 +668 @@
     ext_imadoc='.civ';
 end
-      %read the ImaDoc file
+%read the ImaDoc file
 XmlData=[];
 NbSlice_calib={};
@@ -672 +700 @@
     end  
 end  
+
+
+
+%% display times
 if addtest
     SeriesData.Time=[{time} SeriesData.Time];
@@ -677 +709 @@
    SeriesData.Time={time};
 end
-
-
-% if ~isempty(time)
-%     siztime=size(time);
-%     nb_field=siztime(1);
-%     nb_field2=siztime(2);
-% end   
 set(handles.TimeUnit,'String',TimeUnit)
-%look for max indices
-if ~strcmp(NomType,'*')
-    [num_i1,num_i2,num_j1,num_j2]=find_indexseries(fileinput);
-    nb_field=max(floor((max(num_i1)+max(num_i2))/2));
-    nb_field2=max(floor((max(num_j1)+max(num_j2))/2));
-end
-if isnan(nb_field)
-    nb_field_str='?';
-    nb_field_str2='?';
-else
-    nb_field_str=num2str(nb_field);
-    nb_field_str2=num2str(nb_field2);
-end
-if addtest
-    nb_field_cell=[{nb_field_str} ;get(handles.nb_field,'String')];
-    nb_field2_cell=[{nb_field_str2} ;get(handles.nb_field2,'String')];
-else
-    nb_field_cell={nb_field_str};
-    nb_field2_cell={nb_field_str2};
-end
-set(handles.nb_field,'String',nb_field_cell);
-set(handles.nb_field2,'String',nb_field2_cell);
-set(handles.figure1,'UserData',SeriesData);
-
-%number of slices
+set(handles.series,'UserData',SeriesData);
+
+%% number of slices
 if isfield(XmlData,'GeometryCalib') && isfield(XmlData.GeometryCalib,'SliceCoord')
        siz=size(XmlData.GeometryCalib.SliceCoord);
@@ -721 +724 @@
 
 % set menus of index pairs
-NomType_Callback(hObject, eventdata, handles)
+NomType_Callback([], [], handles)
 
 %store the root name for future opening of uvmat
@@ -739 +742 @@
 end
 set(handles.RootPath,'BackgroundColor',[1 1 1])
-set(handles.PathCampaign,'String',SeriesData.PathCampaign)
-last_j_Callback(hObject, eventdata, handles)
-last_i_Callback(hObject, eventdata, handles)
+% set(handles.PathCampaign,'String',SeriesData.PathCampaign)
+last_j_Callback([], [], handles)
+last_i_Callback([], [], handles)
 
 %------------------------------------------------------------------------
@@ -819 +822 @@
 function NomType_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-hseries=get(handles.ProjObject,'Parent');
-SeriesData=get(hseries,'UserData');
+SeriesData=get(handles.series,'UserData');
 if isfield(SeriesData,'NomType')
     NomTypeCell=SeriesData.NomType;
@@ -853 +855 @@
     NomType=NomTypeCell{Val};
     switch NomType  
-            case {'_i1-i2_j', '_i1-i2'}
+            case {'_1-2_1', '_1-2'}
                 set(handles.mode,'String',{'series(Di)'})
                 set(handles.mode,'Value',1);
@@ -862 +864 @@
                 set(handles.mode,'Value',1);
                 testpair=1;
-            case '_i_j1-j2'
+            case '_1_1-2'
                 set(handles.mode,'String',{'bursts';'series(Dj)'})%multiple choice
                 if ~isempty(nbfield) && ~isempty(nbfield2) && ((nbfield2>10) || (nbfield==1))
@@ -873 +875 @@
     end
     switch NomType   
-            case {'_1_1','_i_j1-j2','_i1-i2_j','1_ab','01_ab'},% two navigation indices
+            case {'_1_1','_1_1-2','_1-2_1','1_ab','01_ab'},% two navigation indices
                 state_j='on';
     end
@@ -881 +883 @@
 else
     set(handles.NomType,'String',NomTypeCell)
+    set(handles.j_txt,'Visible',state_j)
+    set(handles.MinIndex_j,'Visible',state_j)
     set(handles.first_j,'Visible',state_j)
     set(handles.incr_j,'Visible',state_j)
     set(handles.last_j,'Visible',state_j)
-    set(handles.nb_field2,'Visible',state_j)
+    set(handles.nb_field2,'Visible',state_j) 
 end
 
@@ -892 +896 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 function mode_Callback(hObject, eventdata, handles)
-%hseries=get(handles.mode,'parent');
-hseries=handles.figure1;
-SeriesData=get(hseries,'UserData');
+SeriesData=get(handles.series,'UserData');
 mode_list=get(handles.mode,'String');
 mode_value=get(handles.mode,'Value');
@@ -904 +906 @@
     Val=get(handles.NomType,'Value');
     NomType=NomTypeCell{Val};
-    test_find_pair=isequal(NomType,'_i_j1-j2')|| isequal(NomType,'_i1-i2_j')|| isequal(NomType,'_i1-i2')|| isequal(NomType,'#_ab');
+    test_find_pair=isequal(NomType,'_1_1-2')|| isequal(NomType,'_1-2_1')|| isequal(NomType,'_1-2')|| isequal(NomType,'#_ab');
 end
 time=[];
@@ -917 +919 @@
     enable_i(handles,'On')
     enable_j(handles,'Off') %do not display j index scanning in burst mode (j is fixed by the burst choice)  
-elseif  isequal(NomType,'_i_j1-j2')|| isequal(NomType,'_i1-i2_j')
+elseif  isequal(NomType,'_1_1-2')|| isequal(NomType,'_1-2_1')
     enable_i(handles,'On')
     enable_j(handles,'On') % allow both i and j index scanning
@@ -925 +927 @@
 end    
 set(handles.list_pair_civ,'Value',indchosen);%set the default choice of image pairs for civ1
-set(hseries,'UserData',SeriesData)
+set(handles.series,'UserData',SeriesData)
 
 %list pairs if relevant
@@ -945 +947 @@
 function enable_j(handles,state)
 set(handles.j_txt,'Visible',state)
+set(handles.MinIndex_j,'Visible',state)
 set(handles.first_j,'Visible',state)
 set(handles.last_j,'Visible',state)
@@ -974 +977 @@
 %----------------------------------------------------------------
 function find_netcpair_civ(hObject, eventdata, handles,Val)
-%hseries=get(handles.list_pair_civ,'parent');
-SeriesData=get(handles.figure1,'UserData'); 
+SeriesData=get(handles.series,'UserData'); 
 % NomTypeCell=get(handles.NomType,'String');
 NomTypeCell=SeriesData.NomType;
@@ -1080 +1082 @@
     for numod_a=1:nbfield2-1 %nbfield2 always >=2 for 'bursts' mode
         for numod_b=(numod_a+1):nbfield2
-            [filename]=name_generator(filebase,ref_i,numod_a,'.nc',NomType,1,ref_i,numod_b,subdir);
-            select=(exist(filename,'file')==2);
+            [filename]=name_generator(filebase,ref_i,numod_a,'.nc',NomType,1,ref_i,numod_b,subdir)
+            select=(exist(filename,'file')==2)
             if select==1
                 ind_exist=ind_exist+1;
@@ -1104 +1106 @@
                         nom_type_ima='#A';
                     otherwise
-                         nom_type_ima='_i_j';
+                         nom_type_ima='_1_1';
                 end
                displ_pair{ind_exist}=['j= ' num2stra(numod_a,nom_type_ima,2) '-' num2stra(numod_b,nom_type_ima,2) ...
@@ -1145 +1147 @@
 SeriesData.displ_num(iview,:)=(displ_num(:,val))';
 SeriesData.ref_time=ref_time;
-set(handles.figure1,'UserData',SeriesData)
+set(handles.series,'UserData',SeriesData)
 list_pair_civ_Callback(hObject, eventdata, handles)
 
@@ -1157 +1159 @@
 Val=get(handles.RootPath,'Value');
 IndexCell=get(handles.NomType,'String');
-%hseries=get(handles.list_pair_civ,'parent');
-SeriesData=get(handles.figure1,'UserData');
+SeriesData=get(handles.series,'UserData');
 NomType=SeriesData.NomType{Val};
 list_pair=get(handles.list_pair_civ,'String');%get the menu of image pairs
@@ -1184 +1185 @@
     end
     switch NomType
-       case {'_i1-i2_j'}
+       case {'_1-2_1'}
            if isequal(num1_str(1),'0')
                IndexCell{Val}=['_(i-(i+' num2_str ')_j'];
@@ -1192 +1193 @@
            displ_num(3)=num1;
            displ_num(4)=num2;
-       case {'_i1-i2'}
+       case {'_1-2'}
            if isequal(num1_str(1),'0')
                IndexCell{Val}=['_(i' num1_str ')-(i+' num2_str ')'];
@@ -1200 +1201 @@
            displ_num(3)=num1;
            displ_num(4)=num2;
-       case '_i_j1-j2'
+       case '_1_1-2'
           if test_bursts
               IndexCell{Val}=['_i_' num1_str '-' num2_str ];
@@ -1219 +1220 @@
 set(handles.NomType,'String',IndexCell)
 SeriesData.displ_num(Val,:)=displ_num;
-set(handles.figure1,'UserData',SeriesData)
+set(handles.series,'UserData',SeriesData)
 % set(handles.NomType,'Value',Val)
 
@@ -1270 +1271 @@
 %read root name and field type
 set(handles.RUN,'BusyAction','queue');
-%hseries=get(handles.RUN,'parent');
-set(0,'CurrentFigure',handles.figure1)
+set(0,'CurrentFigure',handles.series)
 if isequal(get(handles.GetObject,'Visible'),'on') && isequal(get(handles.GetObject,'Value'),1) 
     Series.GetObject=1;
@@ -1278 +1278 @@
     Series.GetObject=0;
 end
-SeriesData=get(handles.figure1,'UserData');
+SeriesData=get(handles.series,'UserData');
 
 %reinitiate waitbar position
@@ -1324 +1324 @@
     Series.transform_fct=transform_list{menu_index};% transform function handles
 end
-Series.hseries=handles.figure1; % handles to the series GUI
+Series.hseries=handles.series; % handles to the series GUI
 
 %read the set of field numbers
@@ -1387 +1387 @@
     %case of pairs (.nc files)
     
-    if isequal(NomType{iview},'_i_j1-j2')|| isequal(NomType{iview},'_i1-i2_j')|| isequal(NomType{iview},'_i1-i2')|| isequal(NomType{iview},'#_ab')
+    if isequal(NomType{iview},'_1_1-2')|| isequal(NomType{iview},'_1-2_1')|| isequal(NomType{iview},'_1-2')|| isequal(NomType{iview},'#_ab')
         ind_shift=SeriesData.displ_num(iview,:);
         if isequal(ind_shift,[0 0 0 0]) % undefined pairs
@@ -1490 +1490 @@
 function last_i_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-%     hseries=get(handles.last_i,'parent');
-% first_i=str2num(get(handles.first_i,'String'));
-% last_i=str2num(get(handles.last_i,'String'));
-% ref_i=ceil((first_i+last_i)/2);
-% set(handles.ref_i,'String', num2str(ref_i))
-% ref_i_Callback(hObject, eventdata, handles)
-SeriesData=get(handles.figure1,'UserData');
+SeriesData=get(handles.series,'UserData');
 if ~isfield(SeriesData,'Time')
     SeriesData.Time{1}=[];
@@ -1515 +1509 @@
 set(handles.ref_j,'String', num2str(ref_j))
 ref_j_Callback(hObject, eventdata, handles)
-SeriesData=get(handles.figure1,'UserData');
+SeriesData=get(handles.series,'UserData');
 if ~isfield(SeriesData,'Time')
     SeriesData.Time{1}=[];
@@ -1528 +1522 @@
 mode_value=get(handles.mode,'Value');
 mode=mode_list{mode_value};
-%hseries=get(handles.ref_i,'parent');
-SeriesData=get(handles.figure1,'UserData');
+SeriesData=get(handles.series,'UserData');
 %NomTypeCell=get(handles.NomType,'String');
 NomTypeCell=SeriesData.NomType;
@@ -1536 +1529 @@
 NomType=NomTypeCell{Val};
 % for ilist=1:length(NomType)
-    if isequal(NomType,'_i_j1-j2')|| isequal(NomType,'_i1-i2_j')|| isequal(NomType,'_i1-i2')
+    if isequal(NomType,'_1_1-2')|| isequal(NomType,'_1-2_1')|| isequal(NomType,'_1-2')
         if isequal(mode,'series(Di)') 
             find_netcpair_civ(hObject, eventdata, handles,Val);% update the menu of pairs depending on the available netcdf files
@@ -1550 +1543 @@
 mode_value=get(handles.mode,'Value');
 mode=mode_list{mode_value};
-%hseries=get(handles.ref_i,'parent');
-SeriesData=get(handles.figure1,'UserData');
+SeriesData=get(handles.series,'UserData');
 NomTypeCell=SeriesData.NomType;
 if ~isempty(NomTypeCell)
     Val=get(handles.NomType,'Value');
     NomType=NomTypeCell{Val};
-    if isequal(NomType,'_i_j1-j2')|| isequal(NomType,'_i1-i2_j')|| isequal(NomType,'_i1-i2')
+    if isequal(NomType,'_1_1-2')|| isequal(NomType,'_1-2_1')|| isequal(NomType,'_1-2')
         if isequal(mode,'series(Dj)') 
             find_netcpair_civ(hObject, eventdata, handles,Val);% update the menu of pairs depending on the available netcdf files
@@ -1807 +1799 @@
          delete(hget_field)%delete opened versions of get_field
      end
-     %hseries=get(handles.FieldMenu,'parent');
-     SeriesData=get(handles.figure1,'UserData');
+     SeriesData=get(handles.series,'UserData');
      filename=SeriesData.CurrentInputFile;
      if exist(filename,'file')
@@ -1835 +1826 @@
          delete(hget_field)
      end
-     %hseries=get(handles.FieldMenu,'parent');
-     SeriesData=get(handles.figure1,'UserData');
+     SeriesData=get(handles.series,'UserData');
      filename=SeriesData.CurrentInputFile_1;
      if exist(filename,'file')
@@ -1888 +1878 @@
 num_i_out=num_i;
 num_j_out=num_j;
-if isequal (NomType,'_i1-i2_j') || isequal (NomType,'_i1-i2')
+if isequal (NomType,'_1-2_1') || isequal (NomType,'_1-2')
     num_i1_line=num_i+ind_shift(3);% set of first image numbers
     num_i2_line=num_i+ind_shift(4);
@@ -1900 +1890 @@
     [xx,num_i1]=meshgrid(num_j,num_i1_line);
     [xx,num_i2]=meshgrid(num_j,num_i2_line);
-elseif isequal (NomType,'_i_j1-j2') || isequal (NomType,'#_ab')
+elseif isequal (NomType,'_1_1-2') || isequal (NomType,'#_ab')
     if isequal(mode,'bursts') %case of bursts (png_old or png_2D)
         num_j1=ind_shift(1)*ones(size(num_i));
@@ -1921 +1911 @@
 function displ_time(handles,times)
 %------------------------------------------------------------------------
-hseries=get(handles.last_i,'parent');
-SeriesData=get(hseries,'UserData');%
+SeriesData=get(handles.series,'UserData');%
 first_i=str2num(get(handles.first_i,'String'));
 first_j=str2num(get(handles.first_j,'String'));
 last_i=str2num(get(handles.last_i,'String'));
 last_j=str2num(get(handles.last_j,'String'));
-% index_civ=get(handles.list_pair_civ,'Value');
-% NomType=get(handles.NomType,'String');
 NomType=SeriesData.NomType;
 mode_list=get(handles.mode,'String');
 index_mode=get(handles.mode,'Value');
 mode=mode_list{index_mode};
-% ind_shift=0;%default
 
 time_first=[];
@@ -1944 +1930 @@
     time_last_cell{iview}='?';%default
     time=SeriesData.Time{iview};
-    if isequal(NomType{iview},'_i1-i2_j')|isequal(NomType{iview},'_i_j1-j2')|isequal(NomType{iview},'#_ab')|isequal(NomType{iview},'_i1-i2')
+    if isequal(NomType{iview},'_1-2_1')|isequal(NomType{iview},'_1_1-2')|isequal(NomType{iview},'#_ab')|isequal(NomType{iview},'_1-2')
         if isfield(SeriesData,'displ_num')& ~isempty(SeriesData.displ_num)
             ind_shift=SeriesData.displ_num(iview,:);
@@ -2021 +2007 @@
 function GetObject_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-hseries=get(handles.GetObject,'parent');
-SeriesData=get(hseries,'UserData');
+SeriesData=get(handles.series,'UserData');
 value=get(handles.GetObject,'Value');
 if value
@@ -2075 +2060 @@
 %     end
 end
-set(hseries,'UserData',SeriesData)
+set(handles.series,'UserData',SeriesData)
 
 %--------------------------------------------------------------
@@ -2114 +2099 @@
 global nb_transform
 
-% huvmat=get(handles.transform_fct,'parent');
 menu=get(handles.transform_fct,'String');
 ind_coord=get(handles.transform_fct,'Value');
@@ -2305 +2289 @@
 end
 
-%------------------------------------------------------------------------
-% --- generates series of file indices corresponding to a file fileinput
-function [num_i1,num_i2,num_j1,num_j2]=find_indexseries(fileinput)
-%------------------------------------------------------------------------
-num_i1=NaN;%default
-num_i2=NaN;%default
-num_j1=NaN;%default
-num_j2=NaN;%default
-% refresh input root name, indices, file extension and nomenclature
-[RootPath,RootFile,field_count,str2,str_a,str_b,FileExt,NomType,SubDir]=name2display(fileinput);
-if strcmp(SubDir,'')
-    filebasesub=fullfile(RootPath,RootFile);
-else
-    filebasesub=fullfile(RootPath,SubDir,RootFile);
-end
-dirpair=[]; %default
-switch NomType
-    case '_1'
-        dirpair=dir([filebasesub '_*' FileExt]);
-    case '_1_1'
-        dirpair=dir([filebasesub '_*_*' FileExt]);
-    case '_i1-i2'
-        dirpair=dir([filebasesub '_*-*' FileExt]);
-    case '1_ab'
-        dirpair=dir([filebasesub '*_*' FileExt]);
-    case '_i_j1-j2'
-        dirpair=dir([filebasesub '*_*-*' FileExt]);   
-    case '_i1-i2_j'
-        dirpair=dir([filebasesub '*-*_*' FileExt]);   
-end
-for ifile=1:length(dirpair)
-    [RootPath,RF,str_1,str_2,str_a,str_b]=name2display(dirpair(ifile).name);
-    num_i1(ifile)=str2double(str_1);
-    num_i2(ifile)=str2double(str_2);
-    if isnan(num_i2(ifile))
-        num_i2(ifile)=num_i1(ifile);
-    end
-    num_j1(ifile)=stra2num(str_a);
-    if isnan(num_j1(ifile))
-        num_j1(ifile)=1;
-    end
-    num_j2(ifile)=stra2num(str_b);
-    if isnan(num_j2(ifile))
-        num_j2(ifile)=num_j1(ifile);
-    end
-end
-
+
+

trunk/src/uvmat.m

@@ -660 +660 @@
     end 
 end
-if ~strcmp(hhh,'')&& mmreader.isPlatformSupported()% if the function is found (recent version of matlab)
+if ~strcmp(hhh,'')% if the function mmreader is found (recent version of matlab)
     UvData.MovieObject=mmreader([FileBase FileIndices FileExt]);
 elseif isfield(UvData,'MovieObject')
@@ -1360 +1360 @@
 %     NomType=get(handles.FileIndex,'UserData');
     switch NomType
-    case {'_i_j1-j2','#_ab','%3dab'},% pair with j index
+    case {'_1_1-2','#_ab','%3dab'},% pair with j index
         set(handles.fix_pair,'Visible','on')% option fixed pair on/off made visible (choice of avaible pair with buttons + and - if ='off')
     otherwise
@@ -1778 +1778 @@
 %% read the current input file name(s) and field indices
 InputFile=read_GUI(handles.InputFile);
-InputFile.RootFile=regexprep(InputFile.RootFile,'\<[\\/]|[\\/]\>','');%suppress possible / or \ separator at the beginning or the end of the string
-InputFile.SubDir=regexprep(InputFile.SubDir,'\<[\\/]|[\\/]\>','');%suppress possible / or \ separator at the beginning or the end of the string
+InputFile.RootFile=regexprep(InputFile.RootFile,'^[\\/]|[\\/]$','');%suppress possible / or \ separator at the beginning or the end of the string
+InputFile.SubDir=regexprep(InputFile.SubDir,'^[\\/]|[\\/]$','');%suppress possible / or \ separator at the beginning or the end of the string
 if isempty(InputFile.RootFile)
     filebase=InputFile.RootPath;
@@ -3149 +3149 @@
 NomTypeNew=NomType;%default
 if isequal(field,'image')
-    if isequal(NomType,'_i1-i2_j')||isequal(NomType,'_i_j1-j2')
-        NomTypeNew='_i_j';
+    if isequal(NomType,'_1-2_1')||isequal(NomType,'_1_1-2')
+        NomTypeNew='_1_1';
     elseif isequal(NomType,'#_ab')
         NomTypeNew='#a';
-    elseif isequal(NomType,'_i1-i2')
-        NomTypeNew='_i';
+    elseif isequal(NomType,'_1-2')
+        NomTypeNew='_1';
     end
     imagename=name_generator(FileBase,str2double(str1),str2double(str_a),'.png',NomTypeNew,1,str2double(str2),str2double(str_b),'');
@@ -3270 +3270 @@
 if isequal(field_1,'image') 
     % transform netc type to the corresponding image type
-    if isequal(NomType_1,'_i1-i2_j')||isequal(NomType_1,'_i_j1-j2')|| isequal(NomType_1,'#_ab')|| isequal(NomType_1,'_i1-i2')
+    if isequal(NomType_1,'_1-2_1')||isequal(NomType_1,'_1_1-2')|| isequal(NomType_1,'#_ab')|| isequal(NomType_1,'_1-2')
         UvData.SubDir_1=get(handles.SubDir_1,'String'); %preserve the InputFile.SubDir in memory    
-        if isequal(NomType_1,'_i1-i2_j')||isequal(NomType_1,'_i_j1-j2')
-            NomTypeNew='_i_j';
+        if isequal(NomType_1,'_1-2_1')||isequal(NomType_1,'_1_1-2')
+            NomTypeNew='_1_1';
         elseif isequal(NomType_1,'#_ab')
             NomTypeNew='#a';
-        elseif isequal(NomType_1,'_i1-i2')
-            NomTypeNew='_i';
+        elseif isequal(NomType_1,'_1-2')
+            NomTypeNew='_1';
         end  
     end
@@ -3321 +3321 @@
         str1=get(handles.i1,'String');
         str_a=get(handles.j1,'String');
-        if isequal(NomType_1,'#_ab')||isequal(NomType_1,'_i1-i2_j')||isequal(NomType_1,'_i_j1-j2')||isequal(NomType_1,'_i1-i2')
+        if isequal(NomType_1,'#_ab')||isequal(NomType_1,'_1-2_1')||isequal(NomType_1,'_1_1-2')||isequal(NomType_1,'_1-2')
             NomTypeNew=NomType_1;
         elseif isequal(NomType_1,'#a')
              [filename, n1,na,n2,nb,SubDir_1]=name_generator(filebase_1, str2num(str1),stra2num(str_a),'.nc','#_ab',0,[],[],SubDir_1);
              NomTypeNew='#_ab';
-        elseif isequal(NomType_1,'_i_j')
-             [filename,n1,na,n2,nb,SubDir_1]=name_generator(filebase_1,str2num(str1),stra2num(str_a),'.nc','_i1-i2_j',0,str2num(str1),[],SubDir_1);
+        elseif isequal(NomType_1,'_1_1')
+             [filename,n1,na,n2,nb,SubDir_1]=name_generator(filebase_1,str2num(str1),stra2num(str_a),'.nc','_1-2_1',0,str2num(str1),[],SubDir_1);
             if idetect==1
-                NomTypeNew='_i1-i2_j';
+                NomTypeNew='_1-2_1';
             else
-                NomTypeNew='_i_j1-j2';
+                NomTypeNew='_1_1-2';
             end
         else %for instance avi files or any ima_num series
-            [filename,n1,na,n2,nb,SubDir_1]=name_generator(filebase_1,str2num(str1),stra2num(str_a),'.nc','_i1-i2',0,str2num(str1),[],SubDir_1);
-            NomTypeNew='_i1-i2';
+            [filename,n1,na,n2,nb,SubDir_1]=name_generator(filebase_1,str2num(str1),stra2num(str_a),'.nc','_1-2',0,str2num(str1),[],SubDir_1);
+            NomTypeNew='_1-2';
         end            
         [Path,Name]=fileparts(filebase_1);