Changeset 362

Timestamp:

Jan 9, 2012, 5:21:57 PM (13 years ago)

Author:

sommeria

Message:

various bugs corrected

Location:

trunk/src

Files:

• civ.m (modified) (17 diffs)
• find_file_series.m (modified) (2 diffs)
• tps_coeff.m (modified) (1 diff)

trunk/src/civ.m

@@ -423 +423 @@
 set(handles.RootName,'String',RootName)
 browse=get(handles.RootName,'UserData');
-browse.nom_type_nc=NomTypeNc;
+% browse.nom_type_nc=NomTypeNc;
 browse.incr_pair=[0 0];%default
 
@@ -433 +433 @@
 num_ref_j=j1;
 if ~isempty(j2)
-    num_ref_i=floor((num_ref_j+j2)/2);
+    num_ref_j=floor((num_ref_j+j2)/2);
 end
 
@@ -581 +581 @@
 
 %%  set the menus of image pairs and default selection for civ   %%%%%%%%%%%%%%%%%%%
-check_letter=~isempty(regexp(NomTypeIma,'[ab|AB]$'));%detect pair label by letter
-if ~check_letter|| isequal(NomTypeNc,'_1-2')|| (MaxIndex_j==1)
+%check_letter=~isempty(regexp(NomTypeIma,'[ab|AB]$'));%detect pair label by letter
+if  isequal(NomTypeNc,'_1-2')|| (MaxIndex_j==1)
     set(handles.ListPairMode,'Value',1)
     set(handles.ListPairMode,'String',{'series(Di)'})   
@@ -679 +679 @@
     set(handles.ListSubdirCiv2,'Value',ilist)
 else % if Civ1 data already exist
-    find_netcpair_civ(handles,1); %update the list of available pairs from netcdf files in the new directory
+    errormsg=find_netcpair_civ(handles,1); %update the list of available pairs from netcdf files in the new directory
+    if ~isempty(errormsg)
+    msgbox_uvmat('ERROR',errormsg)
+    end
 end
 
@@ -697 +700 @@
 %update the list of available pairs from netcdf files in the new directory
 if ~get(handles.CheckCiv2,'Value') && ~get(handles.CheckCiv1,'Value') && ~get(handles.CheckFix1,'Value') && ~get(handles.CheckPatch1,'Value')
-    find_netcpair_civ(handles,2);
+    errormsg=find_netcpair_civ(handles,2);
+        if ~isempty(errormsg)
+    msgbox_uvmat('ERROR',errormsg)
+    end
 end
 
@@ -749 +755 @@
 ind_selected=find(checkbox,1);
 if ~isempty(ind_selected)
-  RootName=get(handles.RootName,'String');
+    RootName=get(handles.RootName,'String');
     if isempty(RootName)
-         msgbox_uvmat('ERROR','Please open an image or PIV .nc file with the upper bar menu Open/Browse...')
-        returnopening
+        msgbox_uvmat('ERROR','Please open an image or PIV .nc file with the upper bar menu Open/Browse...')
+        return
     end
 end
@@ -759 +765 @@
 set(handles.ListSubdirCiv1,'Visible','on')
 if ~opening
-find_netcpair_civ(handles,1) % select the available netcdf files
+    errormsg=find_netcpair_civ(handles,1); % select the available netcdf files
+    if ~isempty(errormsg)
+        msgbox_uvmat('ERROR',errormsg)
+    end
 end
 if max(checkbox(4:6))% case of civ2 pair choice needed
@@ -768 +777 @@
     set(handles.ListPairCiv2,'Visible','on')
     if ~opening
-    find_netcpair_civ(handles,2) % select the available netcdf files
+        errormsg=find_netcpair_civ(handles,2); % select the available netcdf files
+        if ~isempty(errormsg)
+            msgbox_uvmat('ERROR',errormsg)
+        end
     end
 else
@@ -2771 +2783 @@
 end
 set(handles.ListPairCiv1,'UserData',displ_num);
-find_netcpair_civ( handles,1)
+errormsg=find_netcpair_civ( handles,1);
+    if ~isempty(errormsg)
+    msgbox_uvmat('ERROR',errormsg)
+    end
 % find_netcpair_civ2(handles)
 
@@ -2882 +2897 @@
 mode_value=get(handles.ListPairMode,'Value');
 mode=mode_list{mode_value};
-find_netcpair_civ(handles,1);% update the menu of pairs depending on the available netcdf files
+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
         (get(handles.CheckCiv2,'Value')==0 && get(handles.CheckCiv1,'Value')==0 && get(handles.CheckFix1,'Value')==0 && get(handles.CheckPatch1,'Value')==0)
-    find_netcpair_civ( handles,2);
-end
+    errormsg=find_netcpair_civ( handles,2);
+end
+    if ~isempty(errormsg)
+    msgbox_uvmat('ERROR',errormsg)
+    end
 
 %------------------------------------------------------------------------
@@ -2895 +2913 @@
 mode=mode_list{mode_value};
 if isequal(get(handles.CheckCiv1,'Value'),0)|| isequal(mode,'series(Dj)')
-    find_netcpair_civ(handles,1);% update the menu of pairs depending on the available netcdf files
+    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)
-    find_netcpair_civ(handles,2);
-end
-% 
+    errormsg=find_netcpair_civ(handles,2);
+end
+    if ~isempty(errormsg)
+    msgbox_uvmat('ERROR',errormsg)
+    end
 
 %------------------------------------------------------------------------
 % determine the menu for checkciv1 pairs depending on existing netcdf file at the middle of
 % the field series set by first_i, incr, last_i
-function find_netcpair_civ(handles,index)
-%------------------------------------------------------------------------
-set(gcf,'Pointer','watch')
+function errormsg=find_netcpair_civ(handles,index)
+%------------------------------------------------------------------------
+set(gcf,'Pointer','watch')% set the mouse pointer to 'watch' (clock)
+
+%% initialisation
+errormsg='';
 filebase=get(handles.RootName,'String');
 [filepath,Nme,ext_dir]=fileparts(filebase);
@@ -2928 +2951 @@
 
 %% determine nom_type_nc, nomenclature type of the .nc files:
-nom_type_nc='';%default
-if isfield(browse,'nom_type_nc')
-    nom_type_nc=browse.nom_type_nc;
-end
-if isempty(nom_type_nc)
+% nom_type_nc='';%default
+% if isfield(browse,'nom_type_nc')
+%     nom_type_nc=browse.nom_type_nc;
+% end
+% if isempty(nom_type_nc)
     [nom_type_nc]=nomtype2pair(nom_type_ima,mode);
-end
-browse.nom_type_nc=nom_type_nc;
-set(handles.RootName,'UserData',browse)
-
-%reads .nc subdirectoy and image numbers from the interface
+% end
+% browse.nom_type_nc=nom_type_nc;
+% set(handles.RootName,'UserData',browse)
+
+%% reads .nc subdirectoy and image numbers from the interface
 subdir_civ1=get(handles.txt_SubdirCiv1,'String');%subdirectory subdir_civ1 for the netcdf data
 subdir_civ2=get(handles.txt_SubdirCiv2,'String');%subdirectory subdir_civ2 for the netcdf data
@@ -2952 +2975 @@
 displ_num=get(handles.ListPairCiv1,'UserData');
 
-%eliminate the first pairs inconsistent with the position
+%% eliminate the first pairs inconsistent with the position
 if isempty(displ_num)
     nbpair=0;
@@ -2965 +2988 @@
 nbpair=min(200,nbpair);%limit the number of displayed pairs to 200
 
-%look for existing processed pairs involving the field at the middle of the series if checkciv1 will not
+%% case with no Civ1 operation, netcdf files need to exist for reading
 % be performed, while the result is needed for next steps.
 displ_pair={''};
 select=ones(size(1:nbpair));%flag for displayed pairs =1 for display
 testpair=0;
-
-%% case with no Civ1 operation, netcdf files need to exist for reading
 [RootPath,RootFile]=fileparts(filebase);
 if index==1 % case civ1
-if ~get(handles.CheckCiv1,'Value') %
-    if ~exist(fullfile(filepath,subdir_civ1,ext_dir),'dir')
-        msgbox_uvmat('ERROR',['no civ1 file available: subdirectory ' subdir_civ1 ' does not exist']);
-        set(handles.ListPairCiv1,'String',{});
-        return
-    end
-    for ipair=1:nbpair
-        filename=fullfile_uvmat(RootPath,subdir_civ1,RootFile,'.nc',nom_type_nc,...
-            ref_i+displ_num(3,ipair),ref_i+displ_num(4,ipair),ref_j+displ_num(1,ipair),ref_j+displ_num(2,ipair));
-        select(ipair)=exist(filename,'file')==2;% put flag to 0 if the file does not exist
-    end   
-    % case of no displayed pair
-    if isequal(select,zeros(size(1:nbpair)))
-        if isfield(browse,'incr_pair') && ~isequal(browse.incr_pair,[0 0])
-            num_i1=ref_i-floor(browse.incr_pair(1)/2);
-            num_i2=ref_i+ceil(browse.incr_pair(1)/2);
-            num_j1=ref_j-floor(browse.incr_pair(2)/2);
-            num_j2=ref_j+ceil(browse.incr_pair(2)/2);
-            filename=fullfile_uvmat(RootPath,subdir_civ1,RootFile,'.nc',nom_type_nc,num_i1,num_i2,num_j1,num_j2);
-            select(1)=exist(filename,'file')==2;
-            testpair=1;
-        else
-            if  isequal(mode,'series(Dj)')% | isequal(mode,'st_series(Dj)')
-                msgbox_uvmat('ERROR',['no civ1 file available for the selected reference index j=' num2str(ref_j) ' and subdirectory ' subdir_civ1]);
+    if ~get(handles.CheckCiv1,'Value') %
+        if ~exist(fullfile(filepath,subdir_civ1,ext_dir),'dir')
+            errormsg=['no civ1 file available: subdirectory ' subdir_civ1 ' does not exist'];
+            set(handles.ListPairCiv1,'String',{});
+            return
+        end
+        for ipair=1:nbpair
+            filename=fullfile_uvmat(RootPath,subdir_civ1,RootFile,'.nc',nom_type_nc,...
+                ref_i+displ_num(3,ipair),ref_i+displ_num(4,ipair),ref_j+displ_num(1,ipair),ref_j+displ_num(2,ipair));
+            select(ipair)=exist(filename,'file')==2;% put flag to 0 if the file does not exist
+        end
+        % case of no displayed pair
+        if isequal(select,zeros(size(1:nbpair)))
+            if isfield(browse,'incr_pair') && ~isequal(browse.incr_pair,[0 0])
+                num_i1=ref_i-floor(browse.incr_pair(1)/2);
+                num_i2=ref_i+ceil(browse.incr_pair(1)/2);
+                num_j1=ref_j-floor(browse.incr_pair(2)/2);
+                num_j2=ref_j+ceil(browse.incr_pair(2)/2);
+                filename=fullfile_uvmat(RootPath,subdir_civ1,RootFile,'.nc',nom_type_nc,num_i1,num_i2,num_j1,num_j2);
+                select(1)=exist(filename,'file')==2;
+                testpair=1;
             else
-                msgbox_uvmat('ERROR',['no civ1 file available for the selected reference index i=' num2str(ref_i) ' and subdirectory ' subdir_civ1]);
-            end
-            set(handles.ListPairCiv1,'String',{''});
-            %COMPLETER CAS STEREO
-            return
-        end
-    end
-end
-else %case civ2
-if ~get(handles.CheckCiv2,'Value') && ~get(handles.CheckCiv1,'Value') && ~get(handles.CheckFix1,'Value') && ~get(handles.CheckPatch1,'Value')
-    if ~exist(fullfile(filepath,subdir_civ2,ext_dir),'dir')
-        errordlg(['no civ2 file available: subdirectory ' subdir_civ2 ' does not exist'])
-        set(handles.ListPairCiv2,'Value',1);
-        set(handles.ListPairCiv2,'String',{''});
-        return
-    end
-    for ipair=1:nbpair
-        filename=fullfile_uvmat(RootPath,subdir_civ1,RootFile,'.nc',nom_type_nc,...
-            ref_i+displ_num(3,ipair),ref_i+displ_num(4,ipair),ref_j+displ_num(1,ipair),ref_j+displ_num(2,ipair));
-        select(ipair)=exist(filename,'file')==2;
-    end
-    if  isequal(select,zeros(size(1:nbpair)))
-        if isfield(browse,'incr_pair')
-            num_i1=ref_i-floor(browse.incr_pair(1)/2);
-            num_i2=ref_i+floor((browse.incr_pair(1)+1)/2);
-            num_j1=ref_j-floor(browse.incr_pair(2)/2);
-            num_j2=ref_j+floor((browse.incr_pair(2)+1)/2);
-            filename=fullfile_uvmat(RootPath,subdir_civ2,RootFile,'.nc',nom_type_nc,num_i1,num_i2,num_j1,num_j2);
-            select(1)=exist(filename,'file')==2;
-        else
-            if  isequal(mode,'series(Dj)')% | isequal(mode,'st_series(Dj)')
-                msgbox_uvmat('ERROR',['no civ2 file available for the selected reference index j=' num2str(ref_j) ' and subdirectory ' subdir_civ2])
-            else
-                msgbox_uvmat('ERROR',['no civ2 file available for the selected reference index i=' num2str(ref_i) ' and subdirectory ' subdir_civ2])
-            end
+                if  isequal(mode,'series(Dj)')% | isequal(mode,'st_series(Dj)')
+                    errormsg=['no civ1 file available for the selected reference index j=' num2str(ref_j) ' and subdirectory ' subdir_civ1];
+                else
+                    errormsg=['no civ1 file available for the selected reference index i=' num2str(ref_i) ' and subdirectory ' subdir_civ1];
+                end
+                set(handles.ListPairCiv1,'String',{''});
+                %COMPLETER CAS STEREO
+                return
+            end
+        end
+    end
+else %case civ2 alone
+    if ~get(handles.CheckCiv2,'Value') && ~get(handles.CheckCiv1,'Value') && ~get(handles.CheckFix1,'Value') && ~get(handles.CheckPatch1,'Value')
+        if ~exist(fullfile(filepath,subdir_civ2,ext_dir),'dir')
+            errordlg(['no civ2 file available: subdirectory ' subdir_civ2 ' does not exist'])
             set(handles.ListPairCiv2,'Value',1);
             set(handles.ListPairCiv2,'String',{''});
             return
         end
-    end
-end
+        for ipair=1:nbpair
+            filename=fullfile_uvmat(RootPath,subdir_civ1,RootFile,'.nc',nom_type_nc,...
+                ref_i+displ_num(3,ipair),ref_i+displ_num(4,ipair),ref_j+displ_num(1,ipair),ref_j+displ_num(2,ipair));
+            select(ipair)=exist(filename,'file')==2;
+        end
+        if  isequal(select,zeros(size(1:nbpair)))
+            if isfield(browse,'incr_pair')
+                num_i1=ref_i-floor(browse.incr_pair(1)/2);
+                num_i2=ref_i+floor((browse.incr_pair(1)+1)/2);
+                num_j1=ref_j-floor(browse.incr_pair(2)/2);
+                num_j2=ref_j+floor((browse.incr_pair(2)+1)/2);
+                filename=fullfile_uvmat(RootPath,subdir_civ2,RootFile,'.nc',nom_type_nc,num_i1,num_i2,num_j1,num_j2);
+                select(1)=exist(filename,'file')==2;
+            else
+                if  isequal(mode,'series(Dj)')% | isequal(mode,'st_series(Dj)')
+                    errormsg=['no civ2 file available for the selected reference index j=' num2str(ref_j) ' and subdirectory ' subdir_civ2];
+                else
+                    errormsg=['no civ2 file available for the selected reference index i=' num2str(ref_i) ' and subdirectory ' subdir_civ2];
+                end
+                set(handles.ListPairCiv2,'Value',1);
+                set(handles.ListPairCiv2,'String',{''});
+                return
+            end
+        end
+    end
 end
 
@@ -3101 +3122 @@
     displ_pair={'Di=Dj=0'};
 end
+if index==1
 set(handles.ListPairCiv1,'String',displ_pair');
+end
 
 %% determine the default selection in the pair menu
@@ -3685 +3708 @@
 end
 set(handles.txt_SubdirCiv1,'String',SubDir);
-find_netcpair_civ(handles,1) 
-
+errormsg=find_netcpair_civ(handles,1);
+if ~isempty(errormsg)
+    msgbox_uvmat('ERROR',errormsg)
+end
+    
 %------------------------------------------------------------------------
 % --- Executes on button press in ListSubdirCiv2.
@@ -4482 +4508 @@
         Data.Civ1_V_Diff=Data.Civ1_V_Diff(Data.Civ1_FF==0);
         DiffVel(irho)=sqrt(mean(Data.Civ1_U_Diff.*Data.Civ1_U_Diff+Data.Civ1_V_Diff.*Data.Civ1_V_Diff))
-        NbSites(irho)=Data.Civ1_NbSites/numel(Data.Civ1_U_Diff);
+        NbSites(irho,:)=Data.Civ1_NbSites*numel(Data.Civ1_NbSites)/numel(Data.Civ1_U_Diff);
         Param.Patch1.SmoothingParam=2*Param.Patch1.SmoothingParam;
     end

trunk/src/find_file_series.m

@@ -181 +181 @@
     for ifile=1:nbpair
         rr=regexp(dirpair(ifile).name,detect_string,'names');
+        if ~isempty(rr)
         i1=str2num(rr.i1);
         i2=str2num(rr.i2);
@@ -232 +233 @@
             j2_series(ref_i+1,ref_j+1,nb_pairs+1)=j2;
         end
+        end
     end
     % look for the numerical string of the first files to update the NomType (take into account the 0 before the number)

trunk/src/tps_coeff.m

@@ -26 +26 @@
 % X=reshape(X,[],1);
 % Y=reshape(Y,[],1);
-% N=numel(X);
+N=size(ctrs,1);
 % rhs = reshape(U,[],1);
 U = [U; zeros(3,1)];