Ignore:
Timestamp:
Jun 21, 2024, 4:51:59 PM (3 months ago)
Author:
sommeria
Message:

civ_3D corrected

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/series/civ_input.m

    r1147 r1148  
    6767
    6868%% set visibility options depending on the calling function (Param.Action.ActionName):
    69 if strcmp(Param.Action.ActionName,'civ_series')||strcmp(Param.Action.ActionName,'stereo_civ')
    70      set(handles.num_MaxDiff,'Visible','on')
    71     set(handles.num_MaxVel,'Visible','on')
    72     set(handles.title_MaxVel,'Visible','on')
    73     set(handles.title_MaxDiff,'Visible','on')
    74     set(handles.num_Nx,'Visible','off')
    75     set(handles.num_Ny,'Visible','off')
    76     set(handles.title_Nx,'Visible','off')
    77     set(handles.title_Ny,'Visible','off')
    78     set(handles.num_CorrSmooth,'Style','popupmenu')
    79     set(handles.num_CorrSmooth,'Value',1)
    80     set(handles.num_CorrSmooth,'String',{'1';'2'})
    81     set(handles.CheckThreshold,'Visible','on')
    82     set(handles.CheckDeformation,'Value',0)% desactivate
    83 %     set(handles.num_SubDomainSize(1),'String','250')
    84 %     set(handles.num_SubDomainSize(2),'String','500')
    85 end
    8669switch Param.Action.ActionName
    8770    case 'stereo_civ'
    … …  
    9174        set(handles.ListCompareMode,'Visible','on')
    9275        set(handles.PairIndices,'Visible','on')
     76    case 'civ_3D'
     77        set(handles.ListCompareMode,'Visible','on')
     78        set(handles.PairIndices,'Visible','on')
     79        set(handles.title_z,'Visible','on')
     80        set(handles.num_CorrBoxSize_3,'Visible','on')
     81        set(handles.num_SearchBoxSize_3,'Visible','on')
     82        set(handles.num_SearchBoxShift_3,'Visible','on')
     83        set(handles.num_Dz,'Visible','on')
     84        set(handles.title_Dz,'Visible','on')
    9385end
    9486
    … …  
    157149        end
    158150end
    159 
    160 %% reinitialise menus
    161 set(handles.ListPairMode,'Value',1)
    162 set(handles.ListPairMode,'String',{''})
    163 set(handles.ListPairCiv1,'Value',1)
    164 set(handles.ListPairCiv1,'String',{''})
    165 set(handles.ListPairCiv2,'Value',1)
    166 set(handles.ListPairCiv2,'String',{''})
    167151       
    168152%% prepare the GUI with input parameters
    … …  
    321305end
    322306
     307%% reinitialise pair menus
     308set(handles.ListPairMode,'Value',1)
     309set(handles.ListPairMode,'String',{''})
     310set(handles.ListPairCiv1,'Value',1)
     311set(handles.ListPairCiv1,'String',{''})
     312set(handles.ListPairCiv2,'Value',1)
     313set(handles.ListPairCiv2,'String',{''})
     314
    323315%% set the menu and default choice of civ pairs
    324 if isequal(MaxIndex_j,MinIndex_j)% no possibility of j pairs
     316if isequal(MaxIndex_j,MinIndex_j)|| strcmp(Param.Action.ActionName,'civ_3D')% no possibility of j pairs
    325317    PairMenu={'series(Di)'};
    326318elseif MaxIndex_j-MinIndex_j==1
    … …  
    338330    PairIndex=find(strcmp(Param.ActionInput.PairIndices.ListPairMode,PairMenu));%retrieve the previous option
    339331end
    340 if isempty(PairIndex)
    341     if ~isfield(Param.IndexRange,'first_j')||isequal(MaxIndex_j,MinIndex_j)% no possibility of j pairs
    342         PairIndex=1;
    343     elseif  MaxIndex_i==1 && MaxIndex_j>1% simple series in j
    344         if  MaxIndex_j <= 10
    345             PairIndex=1;% advice 'pair j1-j2' except in MaxIndex_j is large
    346         end
    347     else
    348         if strcmp(NomTypeNc,'_1-2_1')
    349             PairIndex=3;% advise 'series(Di)'
    350         elseif  MaxIndex_j <= 10
    351             PairIndex=1;% advice 'pair j1-j2' except in MaxIndex_j is large
     332if strcmp(Param.Action.ActionName,'civ_3D')
     333    PairIndex=1
     334else
     335    if isempty(PairIndex)
     336        if ~isfield(Param.IndexRange,'first_j')||isequal(MaxIndex_j,MinIndex_j)% no possibility of j pairs
     337            PairIndex=1;
     338        elseif  MaxIndex_i==1 && MaxIndex_j>1% simple series in j
     339            if  MaxIndex_j <= 10
     340                PairIndex=1;% advice 'pair j1-j2' except in MaxIndex_j is large
     341            end
    352342        else
    353             PairIndex=2;% advice 'Dj'
    354         end
    355     end
    356 end
    357 set(handles.ListPairMode,'Value',PairIndex); 
     343            if strcmp(NomTypeNc,'_1-2_1')
     344                PairIndex=3;% advise 'series(Di)'
     345            elseif  MaxIndex_j <= 10
     346                PairIndex=1;% advice 'pair j1-j2' except in MaxIndex_j is large
     347            else
     348                PairIndex=2;% advice 'Dj'
     349            end
     350        end
     351    end
     352end
     353set(handles.ListPairMode,'Value',PairIndex);
    358354
    359355%% indicate the min and max indices i and j on the GUI
    … …  
    407403%% Civ1 parameters
    408404%Param.CheckCiv1=1;
    409 Param.Civ1.CorrBoxSize=[25 25];
    410 Param.Civ1.SearchBoxSize=[55 55];
     405Param.Civ1.CorrBoxSize=[25 25 1];
     406Param.Civ1.SearchBoxSize=[55 55 5];
    411407Param.Civ1.SearchBoxShift=[0 0];
    412408Param.Civ1.CorrSmooth=1;
    … …  
    420416
    421417%% Fix1 parameters
    422 %Param.CheckFix1=1;
    423 Param.Fix1.CheckFmin2=1;
    424 Param.Fix1.CheckF3=1;
    425418Param.Fix1.MinCorr=0.2000;
    426419
    427420%% Patch1 parameters
    428421%Param.CheckPatch1=1;
    429 Param.Patch1.FieldSmooth=10;
    430 Param.Patch1.MaxDiff=1.5000;
    431 Param.Patch1.SubDomainSize=250;
    432 Param.Patch1.TestPatch1=0;
     422Param.Patch1.FieldSmooth=20;
     423Param.Patch1.MaxDiff=2;
     424Param.Patch1.SubDomainSize=125;
    433425
    434426%% Civ2 parameters
    … …  
    443435Param.Civ2.Mask='';
    444436Param.Civ2.CheckThreshold=0;
    445 Param.Civ2.TestCiv2=0;
    446437
    447438%% Fix2 parameters
    448 %Param.CheckFix2=1;
    449 Param.Fix2.CheckFmin2=1;
    450 Param.Fix2.CheckF4=1;
    451 Param.Fix2.CheckF3=1;
    452439Param.Fix2.MinCorr=0.2000;
    453440
    454441%% Patch2 parameters
    455 %Param.CheckPatch2=1;
    456 Param.Patch2.FieldSmooth=2;
     442Param.Patch2.FieldSmooth=5;
    457443Param.Patch2.MaxDiff=1.5000;
    458 Param.Patch2.SubDomainSize=500;
     444Param.Patch2.SubDomainSize=250;
    459445Param.Patch2.TestPatch2=0;
    460446
    … …  
    611597    checkeven=(mod(ActionInput.Civ1.CorrBoxSize,2)==0);
    612598    ActionInput.Civ1.CorrBoxSize(checkeven)=ActionInput.Civ1.CorrBoxSize(checkeven)+1;% set correlation box sizes to odd values
    613     ActionInput.Civ1.SearchBoxSize=max(ActionInput.Civ1.SearchBoxSize,ActionInput.Civ1.CorrBoxSize+8);% insure that the search box size is large enough
     599    ActionInput.Civ1.SearchBoxSize(1:2)=max(ActionInput.Civ1.SearchBoxSize(1:2),ActionInput.Civ1.CorrBoxSize(1:2)+8);% insure that the search box size is large enough
    614600    checkeven=(mod(ActionInput.Civ1.SearchBoxSize,2)==0);
    615601    ActionInput.Civ1.SearchBoxSize(checkeven)=ActionInput.Civ1.SearchBoxSize(checkeven)+1;% set search box sizes to odd values
    … …  
    669655    case 'PIV'
    670656        PairIndices='on';% needs to define index pairs for PIV       
    671     case 'PIV volume'
    672         PairIndices='on';% needs to define index pairs for PIV
    673         set(handles.ListPairMode,'Value',1)
    674         set(handles.ListPairMode,'String',{'series(Di)'})
    675         ListPairMode_Callback(hObject, eventdata, handles)
     657    % case 'PIV volume'
     658    %     PairIndices='on';% needs to define index pairs for PIV
     659    %     set(handles.ListPairMode,'Value',1)
     660    %     set(handles.ListPairMode,'String',{'series(Di)'})
     661    %     ListPairMode_Callback(hObject, eventdata, handles)
    676662    case 'displacement'
    677663        OriginIndex='on';%define a frame origin for displacement
    … …  
    23632349    drawnow
    23642350end
     2351
     2352
     2353function num_CorrBoxSize_3_Callback(hObject, eventdata, handles)
     2354
     2355
     2356function num_SearchBoxSize_3_Callback(hObject, eventdata, handles)
     2357
     2358
     2359function MinIndex_j_Callback(hObject, eventdata, handles)
     2360
     2361
     2362% --- Executes on selection change in field_ref2.
     2363function field_ref2_Callback(hObject, eventdata, handles)
     2364
     2365
     2366
Note: See TracChangeset for help on using the changeset viewer.