Changeset 1020 for trunk/src/series/civ_input.m

Timestamp:

Nov 18, 2017, 5:55:26 PM (6 years ago)

Author:

sommeria

Message:

mode displacement repaired

File:

• trunk/src/series/civ_input.m (modified) (27 diffs)

trunk/src/series/civ_input.m

@@ -60 +60 @@
 set(hObject,'WindowButtonDownFcn',{'mouse_down'}) % allows mouse action with right button (zoom for uicontrol display)
 set(hObject,'WindowKeyPressFcn',{@keyboard_callback,handles})%set keyboard action function
-%set(hObject,'KeyPressFcn',{@KeyPressFcn,handles})%set keyboard action function
 set(handles.ref_i,'KeyPressFcn',{@ref_i_KeyPressFcn,handles})%set keyboard action function
 set(handles.ref_j,'KeyPressFcn',{@ref_i_KeyPressFcn,handles})%set keyboard action function
-%set(hObject,'WindowKeyPressFcn',{'keyboard_callback',handles})%set keyboard action function
 hseries=findobj(allchild(0),'Tag','series');% find the parent GUI 'series'
 hhseries=guidata(hseries); %handles of the elements in 'series'
@@ -220 +218 @@
 if isfield(Param.IndexRange,'TimeUnit')&&~isempty(Param.IndexRange.TimeUnit)
     TimeUnit=Param.IndexRange.TimeUnit;
-end
-% if isfield(SeriesData,'TimeSource')
-%     set(handles.TimeSource,'String',SeriesData.TimeSource)
-% end  
+end 
 if isfield(SeriesData,'GeometryCalib')
     tsai=SeriesData.GeometryCalib;
@@ -317 +312 @@
 end
 
+       if strcmp(Param.ActionInput.ListCompareMode,'displacement')
+            set(handles.PairIndices,'Visible','off')
+        end
+
 %% set the menu and default choice of civ pairs
 if ~isfield(Param.IndexRange,'first_j')||isequal(MaxIndex_j,MinIndex_j)% no possibility of j pairs
@@ -668 +667 @@
 OriginIndex='off';
 PairIndices='off';
-DoubleInputSeries='off';
 switch option
     case 'PIV'
-        PairIndices='on';% needs to define index pairs for PIV
-        
+        PairIndices='on';% needs to define index pairs for PIV       
     case 'PIV volume'
         PairIndices='on';% needs to define index pairs for PIV
@@ -680 +677 @@
     case 'displacement'
         OriginIndex='on';%define a frame origin for displacement
-%     case 'shift'
-%         if numel(ImageType)==1
-%             fileinput=uigetfile_uvmat('pick a second file series for synchronous shift',InputTable{check_nc+1});
-%             if ~isempty(fileinput)
-%                 series( 'display_file_name',hhseries,fileinput,'append')
-%             end
-%             
-%             
-%         end
 end
 set(handles.num_OriginIndex,'Visible',OriginIndex)
 set(handles.OriginIndex_title,'Visible',OriginIndex)
+set(handles.CheckRefFile,'Visible',OriginIndex)
+set(handles.RefFile,'Visible',OriginIndex)
 set(handles.PairIndices,'Visible',PairIndices)
-ListPairMode_Callback(hObject, eventdata, handles)
+ListPairMode_Callback(hObject,eventdata,handles)
+if strcmp(OriginIndex,'on')
+    set(handles.CheckRefFile,'Value',1)
+    CheckRefFile_Callback(hObject,eventdata,handles)
+end
         
 
@@ -708 +702 @@
 compare=compare_list{val};
 if strcmp(compare,'displacement')||strcmp(compare,'shift')
-    mode='displacement';
+    mode_selected='displacement';
 else
     mode_list=get(handles.ListPairMode,'String');
@@ -718 +712 @@
         mode_value=1;
     end
-    mode=mode_list{mode_value};
+    mode_selected=mode_list{mode_value};
 end
 % displ_num=[];%default
@@ -734 +728 @@
 % in mode 'pair j1-j2', j1 and j2 are the file indices, else the indices
 % are relative to the reference indices ref_i and ref_j respectively.
-if isequal(mode,'pair j1-j2')
+if isequal(mode_selected,'pair j1-j2')
     dt=1;
     displ='';
@@ -764 +758 @@
     displ_num(4,:)=0;
     enable_j(handles, 'off')
-elseif isequal(mode,'series(Dj)') %| isequal(mode,'st_series(Dj)')
+elseif isequal(mode_selected,'series(Dj)') %| isequal(mode,'st_series(Dj)')
     index=1:200;
     displ_num(1,index)=-floor(index/2);
@@ -770 +764 @@
     displ_num(3:4,index)=zeros(2,200);
     enable_j(handles, 'on')
-elseif isequal(mode,'series(Di)') %| isequal(mode,'st_series(Di)')
+elseif isequal(mode_selected,'series(Di)') %| isequal(mode,'st_series(Di)')
 %     index=1:200;
 %     displ_num(1:2,index)=zeros(2,200);
@@ -781 +775 @@
         enable_j(handles, 'off')
     end
-elseif isequal(mode,'displacement')%the pairs have the same indices
+elseif isequal(mode_selected,'displacement')%the pairs have the same indices
     displ_num(1,1)=0;
     displ_num(2,1)=0;
@@ -855 +849 @@
 mode_list=get(handles.ListPairMode,'String');
 mode_value=get(handles.ListPairMode,'Value');
-mode=mode_list{mode_value};
+mode_selected=mode_list{mode_value};
 errormsg=find_netcpair_civ(handles,1);% update the menu of pairs depending on the available netcdf files
-if isequal(mode,'series(Di)') || ...% we do patch2 only
+if isequal(mode_selected,'series(Di)') || ...% we do patch2 only
         (get(handles.CheckCiv2,'Value')==0 && get(handles.CheckCiv1,'Value')==0 && get(handles.CheckFix1,'Value')==0 && get(handles.CheckPatch1,'Value')==0)
     errormsg=find_netcpair_civ( handles,2);
@@ -872 +866 @@
         
 % %------------------------------------------------------------------------
-% function ref_j_Callback(hObject, eventdata, handles)
-% %------------------------------------------------------------------------
-% mode_list=get(handles.ListPairMode,'String');
-% mode_value=get(handles.ListPairMode,'Value');
-% mode=mode_list{mode_value};
-% errormsg='';
-% if isequal(get(handles.CheckCiv1,'Value'),0)|| isequal(mode,'series(Dj)')
-%     errormsg=find_netcpair_civ(handles,1);% update the menu of pairs depending on the available netcdf files
-% end
-% if isequal(mode,'series(Dj)') || ...
-%         (get(handles.CheckCiv2,'Value')==0 && get(handles.CheckCiv1,'Value')==0 && get(handles.CheckFix1,'Value')==0 && get(handles.CheckPatch1,'Value')==0)
-%     errormsg=find_netcpair_civ(handles,2);
-% end
-% if ~isempty(errormsg)
-%     msgbox_uvmat('ERROR',errormsg)
-% end
-% 
-% function ref_j_KeyPressFcn(hObject, eventdata, handles)
-% set(handles.ref_j,'BackgroundColor',[1 0 1])
-%------------------------------------------------------------------------
-% determine the menu for checkciv1 pairs depending on existing netcdf file at the middle of
-% the field series set by MinIndex_i, incr, last_i
-% index=1: look for pairs for civ1
-% index=2: look for pairs for civ2
+
 function errormsg=find_netcpair_civ(handles,index)
 %------------------------------------------------------------------------
@@ -907 +878 @@
 val=get(handles.ListCompareMode,'Value');
 compare=compare_list{val};
+mode_selected='displacement';
 if ~strcmp(compare,'displacement')%||strcmp(compare,'shift')
  
@@ -917 +889 @@
         return
     end
-    mode=mode_list{mode_value};
+    mode_selected=mode_list{mode_value};
 end
 nom_type_ima=CivInputData.NomTypeIma;
@@ -935 +907 @@
 ref_i=str2double(get(handles.ref_i,'String'));
 ref_j=[];
-if isequal(mode,'pair j1-j2')%|isequal(mode,'st_pair j1-j2')
+if isequal(mode_selected,'pair j1-j2')%|isequal(mode,'st_pair j1-j2')
     ref_j=0;
 elseif strcmp(get(handles.ref_j,'Visible'),'on')
@@ -955 +927 @@
 
 %% determine the menu display in .ListPairCiv1
-switch mode
+switch mode_selected
     case 'series(Di)'
         for ipair=1:nbpair
@@ -995 +967 @@
         end
     case 'pair j1-j2'%case of pairs
-%         MinIndex_j=CivInputData.MinIndex_j;
-%         MaxIndex_j=min(CivInputData.MaxIndex_j,10);%limitate the number of pairs to 10x10
         MinIndex_j=str2num(get(handles.MinIndex_j,'String'));
         MaxIndex_j=str2num(get(handles.MaxIndex_j,'String'));
@@ -1131 +1101 @@
 end   
 if ~(isempty(umin)||isempty(umax)||isempty(vmin)||isempty(vmax))
-%     list_pair=get(handles.ListPairCiv1,'String');%get the menu of image pairs
-%     index=get(handles.ListPairCiv1,'Value');
-%     pair_string=list_pair{index};
-%     time=get(handles.TimeSource,'UserData'); %get the set of times
-%     pxcm=get(handles.SearchRange,'UserData');
-%     mode_list=get(handles.ListPairMode,'String');
-%     mode_value=get(handles.ListPairMode,'Value');
-%     mode=mode_list{mode_value};      
-%     if isequal (mode, 'series(Di)' )
-%         ref_i=str2double(get(handles.ref_i,'String'));
-%         num1=ref_i-floor(index/2);%  first image numbers
-%         num2=ref_i+ceil(index/2);
-%         num_a=1;
-%         num_b=1;
-%     elseif isequal (mode, 'series(Dj)')
-%         num1=1;
-%         num2=1;
-%         ref_j=str2double(get(handles.ref_j,'String'));
-%         num_a=ref_j-floor(index/2);%  first image numbers
-%         num_b=ref_j+ceil(index/2);
-%     elseif isequal(mode,'pair j1-j2') %case of bursts (png_old or png_2D)     
-%         ref_i=str2double(get(handles.ref_i,'String'));
-%         num1=ref_i;
-%         num2=ref_i;
-%                 r=regexp(pair_string,'(?<mode>(Di=)|(Dj=)) -*(?<num1>\d+)\|(?<num2>\d+)','names');
-%         if isempty(r)
-%             r=regexp(pair_string,'(?<num1>\d+)(?<mode>-)(?<num2>\d+)','names');
-%         end  
-%         num_a=str2num(r.num1);
-%         num_b=str2num(r.num2);
-%     end
-%     dt=time(num2+1,num_b+1)-time(num1+1,num_a+1);
-%     ibx=str2double(get(handles.num_CorrBoxSize_1,'String'));
-%     iby=str2double(get(handles.num_CorrBoxSize_2,'String'));
-%     umin=dt*pxcm*umin;
-%     umax=dt*pxcm*umax;
-%     vmin=dt*pxcm*vmin;
-%     vmax=dt*pxcm*vmax;
     shiftx=round((umin+umax)/2);
     shifty=round((vmin+vmax)/2);
@@ -1555 +1487 @@
         ind_A=2;
     end
-%     [nbslice, flag_mask]=get_mask(InputTable{ind_A,1},handles);% look for a mask with appropriate name
-%     if isequal(flag_mask,1)
-%         filemask=[num2str(nbslice) 'mask'];
-%         testmask=1;
-%     else % browse for a mask
+ % browse for a mask
         filemask= uigetfile_uvmat('pick a mask image file:',InputTable{ind_A,1},'image');
         [FilePath,FileName,Ext]=fileparts(filemask);    
@@ -1570 +1498 @@
         if ~isempty(filemask)
             testmask=1;
-         end
-%     end
+        end
 end
 if testmask
@@ -2194 +2121 @@
 %'nomtype2pair': creates nomencalture for index pairs knowing the image nomenclature
 %---------------------------------------------------------------------
-function NomTypeNc=nomtype2pair(NomTypeIma,mode)
+function NomTypeNc=nomtype2pair(NomTypeIma,mode_selected)
 %---------------------------------------------------------------------           
 % OUTPUT:
@@ -2203 +2130 @@
 
 NomTypeNc=NomTypeIma;%default
-switch mode
+switch mode_selected
     case 'pair j1-j2'      
     if ~isempty(regexp(NomTypeIma,'a$'))
@@ -2232 +2159 @@
 %------------------------------------------------------------------------
 % --- determine the list of index pairs of processing file
-function [ind1,ind2,mode]=...
+function [ind1,ind2,mode_selected]=...
     find_pair_indices(str_civ,i_series,j_series,MinIndex_i,MaxIndex_i,MinIndex_j,MaxIndex_j)
 %------------------------------------------------------------------------
@@ -2239 +2166 @@
 r=regexp(str_civ,'^\D(?<ind>[i|j])=( -| )(?<num1>\d+)\|(?<num2>\d+)','names');
 if ~isempty(r)
-    mode=['D' r.ind];
+    mode_selected=['D' r.ind];
     ind1=stra2num(r.num1);
     ind2=stra2num(r.num2);
 else
-    mode='burst';
+    mode_selected='burst';
     r=regexp(str_civ,'^j= (?<num1>[a-z])-(?<num2>[a-z])','names');
     if ~isempty(r)
@@ -2402 +2329 @@
 function CheckCiv3_Callback(hObject, eventdata, handles)
 
+% --- Executes on button press in CheckRefFile.
+function CheckRefFile_Callback(hObject, eventdata, handles)
+
+    hseries=findobj(allchild(0),'Tag','series');
+    hhseries=guidata(hseries);
+    InputTable=get(hhseries.InputTable,'Data');
+    InputFile=fullfile(InputTable{1,1},InputTable{1,2},[InputTable{1,3} InputTable{1,5}]);
+ % browse for a reference file for displacement
+    fileref= uigetfile_uvmat('pick a reference image file:',InputFile);
+        if ~isempty(fileref)
+    set(handles.RefFile,'String',fileref)
+    set(handles.ConfigSource,'String','NEW')
+    set(handles.ConfigSource,'BackgroundColor',[1 0 1])
+        end
 
 %------------------------------------------------------------------------
@@ -2414 +2355 @@
     drawnow
 end
-
-
-
-function num_NbSlice_Callback(hObject, eventdata, handles)
-% hObject    handle to num_NbSlice (see GCBO)
-% eventdata  reserved - to be defined in a future version of MATLAB
-% handles    structure with handles and user data (see GUIDATA)
-
-% Hints: get(hObject,'String') returns contents of num_NbSlice as text
-%        str2double(get(hObject,'String')) returns contents of num_NbSlice as a double
-
-
-% --- Executes during object creation, after setting all properties.
-function num_NbSlice_CreateFcn(hObject, eventdata, handles)
-% hObject    handle to num_NbSlice (see GCBO)
-% eventdata  reserved - to be defined in a future version of MATLAB
-% handles    empty - handles not created until after all CreateFcns called
-
-% Hint: edit controls usually have a white background on Windows.
-%       See ISPC and COMPUTER.
-if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor'))
-    set(hObject,'BackgroundColor','white');
-end