Changeset 332 for trunk/src/civ.m


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/civ.m

    r326 r332  
    552552%%  set the menus of image pairs and default selection for civ   %%%%%%%%%%%%%%%%%%%
    553553test_ima_i=numel(nom_type_ima)>1 && isempty(regexp(nom_type_ima(2:end),'\D','once'));%images with single indexing
    554 if test_ima_i || isequal(nom_type_nc,'_i1-i2')||~(exist('nbfield2','var')&&(nbfield2~=1))
     554if test_ima_i || isequal(nom_type_nc,'_1-2')||~(exist('nbfield2','var')&&(nbfield2~=1))
    555555    set(handles.ListPairMode,'Value',1)
    556556    set(handles.ListPairMode,'String',{'series(Di)'})   
     
    16951695end
    16961696if isempty(nom_type_ima2),nom_type_ima2='1';end; %default
    1697 if isempty(nom_type_nc),nom_type_nc='_i1-i2';end; %default
     1697if isempty(nom_type_nc),nom_type_nc='_1-2';end; %default
    16981698[num1_civ1,num2_civ1,num_a_civ1,num_b_civ1,num1_civ2,num2_civ2,num_a_civ2,num_b_civ2]=...
    16991699    find_pair_indices(handles,ref_i,ref_j,mode);
     
    30853085    nom_type_ima=browse.nom_type_ima;
    30863086end
    3087 nom_type_nc='_i1-i2';%default
     3087nom_type_nc='_1-2';%default
    30883088if isfield(browse,'nom_type_nc')
    30893089    nom_type_nc=browse.nom_type_nc;
     
    30933093elseif isequal(nom_type_ima,'none')||isequal(nom_type_nc,'none')
    30943094    nom_type_nc='none';
    3095 elseif isequal(nom_type_ima,'avi')||isequal(nom_type_ima,'_i')||isequal(nom_type_ima,'ima_num')||isequal(nom_type_nc,'_i1-i2')
    3096     nom_type_nc='_i1-i2';
     3095elseif isequal(nom_type_ima,'avi')||isequal(nom_type_ima,'_i')||isequal(nom_type_ima,'ima_num')||isequal(nom_type_nc,'_1-2')
     3096    nom_type_nc='_1-2';
    30973097else
    30983098    if  isequal(mode,'series(Di)')%|isequal(mode,'st_series(Di)')
    3099         nom_type_nc='_i1-i2_j'; % PIV in volume
     3099        nom_type_nc='_1-2_1'; % PIV in volume
    31003100    else
    3101         nom_type_nc='_i_j1-j2';
     3101        nom_type_nc='_1_1-2';
    31023102    end
    31033103end
Note: See TracChangeset for help on using the changeset viewer.