Changeset 368 for trunk/src

Timestamp:

Jan 12, 2012, 3:55:07 PM (13 years ago)

Author:

sommeria

Message:

various bugs fixed

Location:

trunk/src

Files:

• civ.m (modified) (4 diffs)
• civ_matlab.m (modified) (3 diffs)
• fill_GUI.m (modified) (2 diffs)
• uvmat.m (modified) (1 diff)
• xml2struct.m (modified) (1 diff)

trunk/src/civ.m

@@ -308 +308 @@
 NomType=get(handles.NomType,'String');
 ImaExt=get(handles.ImaExt,'String');
-fileinput=fullfile_uvmat(RootPath,'',RootFile,ImaExt,NomType,ref_i,[],ref_j)
+fileinput=fullfile_uvmat(RootPath,'',RootFile,ImaExt,NomType,ref_i,[],ref_j);
 errormsg=display_file_name(handles,fileinput);
 if ~isempty(errormsg)
@@ -604 +604 @@
 end
 
-%% update the subdirectory display
+%% scan files to update the subdirectory list display
 listot=dir(RootPath);%directory of RootPath
 idir=0;
@@ -618 +618 @@
     end
 end
-Value=find(strcmp(SubDir,listdir));%search the index of subdir in the cell listdir
-if isempty(Value)% if the input subdir is not found
-    ValueCiv1=get(handles.ListSubdirCiv1,'Value');%read the currrently selected dir name
-    if ValueCiv1>numel(listdir)
-        ValueCiv1=1;
-    end
-    set(handles.SubdirCiv1,'String',listdir{ValueCiv1})
-    ValueCiv2=get(handles.ListSubdirCiv2,'Value');
-    if ValueCiv2>numel(listdir)
-        ValueCiv2=1;
-    end
-    set(handles.SubdirCiv2,'String',listdir{ValueCiv2})
-else
-    ValueCiv1=Value;
-    ValueCiv2=Value;
-     set(handles.SubdirCiv1,'String',listdir{Value})
-     set(handles.SubdirCiv2,'String',listdir{Value})
-end
+
+%% update the selection for civ1 and civ2 
+if ~isempty(SubDir)% subdir for civ1 and civ2 initiated by the input
+    SubdirCiv1=SubDir;
+    SubdirCiv2=SubDir;
+    set(SubdirCiv1,'String',SubDir)
+    set(SubdirCiv2,'String',SubDir)
+else% currently selected subdir preserved
+    SubDirCiv1=get(handles.SubdirCiv1,'String');
+    SubDirCiv2=get(handles.SubdirCiv2,'String');
+    if isempty(SubDirCiv1)% default subdir name='CIV'
+        set(handles.SubdirCiv1,'String','CIV');
+        SubDirCiv1='CIV';
+    end
+    if isempty(SubDirCiv2)% default subdir name='CIV'
+        set(handles.SubdirCiv2,'String','CIV');
+        SubDirCiv2='CIV';
+    end
+end
+
+%% update the subdirectory menus
+ValueCiv1=find(strcmp(SubDirCiv1,listdir));%search the index of subdir in the cell listdir
+if isempty(ValueCiv1)% if the input subdir is not found
+    ValueCiv1=numel(listdir)+1;%new subdirectory requested for civ1
+end
+ValueCiv2=find(strcmp(SubDirCiv2,listdir));%search the index of subdir in the cell listdir
+if isempty(ValueCiv2)% if the input subdir is not found
+    ValueCiv2=numel(listdir)+1;%new subdirectory requested for civ2
+end
+set(handles.ListSubdirCiv1,'String',[listdir;'new...'])
+set(handles.ListSubdirCiv2,'String',[listdir;'new...'])
 set(handles.ListSubdirCiv1,'Value',ValueCiv1)
 set(handles.ListSubdirCiv2,'Value',ValueCiv2)
-set(handles.ListSubdirCiv1,'String',[listdir;'new...'])
-set(handles.ListSubdirCiv2,'String',[listdir;'new...'])
 if isempty(listdir)
     set(handles.SubdirCiv1,'String','CIV')
@@ -1497 +1508 @@
                 if ~strcmp(compare,'stereo PIV')
                     filename_xml=[OutputFile '.civ.xml'];
-                    t=struct2xml(Param);
+                    t=struct2xml(Param);           
                     save(t,filename_xml)
                     if batch   

trunk/src/civ_matlab.m

@@ -490 +490 @@
 corrmax=0;
 sum_square=1;% default
+mesh=1;% default
+CheckDecimal=isfield(par_civ,'CheckDecimal')&& par_civ.CheckDecimal==1;
+if CheckDecimal
+    mesh=0.2;%mesh in pixels for subpixel image interpolation
+end
 % vector=[0 0];%default
 for ivec=1:nbvec
@@ -515 +520 @@
             image1_crop=image1_crop-image1_mean;%substract the mean
             image2_crop=image2_crop-image2_mean;
+            if isfield(par_civ,'CheckDecimal')&& par_civ.CheckDecimal==1
+                xi=(1:mesh:size(image1_crop,2));
+                yi=(1:mesh:size(image1_crop,1))';
+                image1_crop=interp2(image1_crop,xi,yi);
+                image2_crop=interp2(image2_crop,xi,yi);
+            end
             sum_square=sum(sum(image1_crop.*image1_crop));
             %reference: Oliver Pust, PIV: Direct Cross-Correlation
@@ -529 +540 @@
                         [vector,F(ivec)] = SUBPIX2DGAUSS (result_conv,x,y);
                     end
-                    utable(ivec)=vector(1)+shiftx(ivec);
-                    vtable(ivec)=vector(2)+shifty(ivec);                 
+                    utable(ivec)=vector(1)*mesh+shiftx(ivec);
+                    vtable(ivec)=vector(2)*mesh+shifty(ivec);                 
                     xtable(ivec)=iref+utable(ivec)/2;% convec flow (velocity taken at the point middle from imgae1 and 2)
                     ytable(ivec)=jref+vtable(ivec)/2;

trunk/src/fill_GUI.m

@@ -3 +3 @@
 function errormsg=fill_GUI(Param,handles)
 %------------------------------------------------------------------------
+
 errormsg='';
 fields=fieldnames(Param);
@@ -29 +30 @@
         if ~isempty(hh)
             set(hh,'Visible','on')
-            get(hh,'style')
-            input_data
+%             input_data
             switch get(hh,'style')
                 case {'checkbox','radiobutton','togglebutton'}

trunk/src/uvmat.m

@@ -1652 +1652 @@
         return
     end
-    i1=UvData.i1_series{1}(ref_i+1,ref_j+1,1);
+    if get(handles.scan_i,'Value')==1% case of scanning along index i
+        i1_subseries=UvData.i1_series{1}(ref_i+1,:,:);
+    else
+        i1_subseries=UvData.i1_series{1}(:,ref_j+1,:);
+    end
+    i1_subseries=i1_subseries(i1_subseries>0);
+    if isempty(i1_subseries)
+        errormsg='no next file';
+        return
+    end
+    i1=i1_subseries(end);
     if ~isempty(UvData.i2_series{1})
-        i2=UvData.i2_series{1}(ref_i+1,ref_j+1,1);
+        if get(handles.scan_i,'Value')==1% case of scanning along index i
+            i2_subseries=UvData.i2_series{1}(ref_i+1,:,:);
+        else
+            i2_subseries=UvData.i2_series{1}(:,ref_j+1,:);
+        end
+        i2_subseries=i2_subseries(i2_subseries>0);
+        i2=i2_subseries(end);
     end
     if ~isempty(UvData.j1_series{1})
-        j1=UvData.j1_series{1}(ref_i+1,ref_j+1,1);
+        if get(handles.scan_i,'Value')==1% case of scanning along index i
+            j1_subseries=UvData.j1_series{1}(ref_i+1,:,:)
+        else
+            j1_subseries=UvData.j1_series{1}(:,ref_j+1,:)
+        end
+        j1_subseries=j1_subseries(j1_subseries>0);
+        j1=j1_subseries(end);
     end
     if ~isempty(UvData.j2_series{1})
-        j2=UvData.j2_series{1}(ref_i+1,ref_j+1,1);
-    end
+        if get(handles.scan_i,'Value')==1% case of scanning along index i
+            j2_subseries=UvData.j2_series{1}(ref_i+1,:,:)
+        else
+            j2_subseries=UvData.j2_series{1}(:,ref_j+1,:)
+        end
+        j2_subseries=j2_subseries(j2_subseries>0);
+        j2=j2_subseries(end);
+    end
+    
 end
 filename=fullfile_uvmat(InputFile.RootPath,InputFile.SubDir,InputFile.RootFile,FileExt,NomType,i1,i2,j1,j2);

trunk/src/xml2struct.m

@@ -24 +24 @@
         end
     case 'char'
-        if isempty(regexp(s,'\<\d+\>'))
+        if isempty(regexp(s,'^\d+$'))
             out=s;
         else