Changeset 332 for trunk/src/civ.m

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

File:

• trunk/src/civ.m (modified) (4 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