Changeset 41 for trunk/src/civ.m

Timestamp:

Mar 10, 2010, 11:03:36 AM (15 years ago)

Author:

sommeria

Message:

-relabel_i_j: improve the question dlg box for image transform
-aver_stat,time_series,merge_proj: include modification of field transform and call of set_object.
-series: introduce a browser for set_object
-ima2vol: create volume images (png images of a slice concacened along y) for PIV 3D
-set_object: suppress TITLE, introduce Tooltip helps for parameters
-civ: fixed bug on BATCH sequences

File:

• trunk/src/civ.m (modified) (9 diffs)

trunk/src/civ.m

@@ -721 +721 @@
 
         %%%%%%%%%%%  set the menus of image pairs and default selection for civ   %%%%%%%%%%%%%%%%%%%
-if isequal(nom_type_ima,'_i')| isequal(nom_type_nc,'_i1-i2')|~exist('nbfield2','var')|(nbfield2==1)
+if isequal(nom_type_ima,'_i')|| isequal(nom_type_nc,'_i1-i2')||~(exist('nbfield2','var')&&(nbfield2~=1))
     set(handles.mode,'String',{'series(Di)'})
     set(handles.mode,'Value',1)
-elseif isequal(nom_type_ima,'png_old')|isequal(nom_type_nc,'netc_old')
+elseif isequal(nom_type_ima,'png_old')||isequal(nom_type_nc,'netc_old')
     set(handles.mode,'String',{'pair j1-j2'})
     set(handles.mode,'Value',1)
@@ -732 +732 @@
 else
     set(handles.mode,'String',{'pair j1-j2';'series(Dj)';'series(Di)'})%multiple choice
-    if isequal(mode,'volume')
-        set(handles.mode,'Value',3)
-    elseif nbfield2 <= 5
-        set(handles.mode,'Value',1)% advice 'pair j1-j2' for small bursts
-    else
-        set(handles.mode,'Value',2)% advice series Dj for long bursts, not volume
-    end
+    if nbfield2 <= 5
+         set(handles.mode,'Value',1)% advice 'pair j1-j2' for small burst
+    end
+%     else
+%     if isequal(mode,'volume')
+%         set(handles.mode,'Value',3)
+%     elseif nbfield2 <= 5
+%         set(handles.mode,'Value',1)% advice 'pair j1-j2' for small bursts
+%     else
+%         set(handles.mode,'Value',2)% advice series Dj for long bursts, not volume
+%     end
 end
 
@@ -1331 +1335 @@
 list_civ1=get(handles.list_pair_civ1,'String');
 index_civ1=get(handles.list_pair_civ1,'Value');
-[num_i,num_j]=meshgrid(num_i,num_j);
 str_civ1=list_civ1{index_civ1};%string defining the image pairs for civ1
 if isempty(str_civ1)||isequal(str_civ1,'')
@@ -1457 +1460 @@
 end
 
+
 %------------------------------------------------------------------------
 % --- Executes on selection change in list_pair_civ1.
@@ -1660 +1664 @@
 [filecell,num1_civ1,num2_civ1,num_a_civ1,num_b_civ1,num1_civ2,num2_civ2,num_a_civ2,num_b_civ2,nom_type_nc,file_ref_fix1,file_ref_fix2]=...
        set_civ_filenames(handles,compare,box_test);
-nbfield=size(num1_civ1,2);
-nbslice=size(num1_civ1,1);
+nbfield=numel(num1_civ1);
+nbslice=size(num_a_civ1);
 
 if isempty(filecell)
@@ -2179 +2183 @@
 [filecell,num1_civ1,num2_civ1,num_a_civ1,num_b_civ1,num1_civ2,num2_civ2,num_a_civ2,num_b_civ2,nom_type_nc,file_ref_fix1,file_ref_fix2]=...
        set_civ_filenames(handles,compare,box_test);
+ 
 display('files OK, processing...')  
-nbfield=size(num1_civ1,2);
-nbslice=size(num1_civ1,1);
+nbfield=numel(num1_civ1);
+nbslice=numel(num_a_civ1);
 
 %GET PARAMETERS:
@@ -2314 +2319 @@
 time=get(handles.displ_filebase,'UserData'); %get the set of times
 civAll=get(handles.Experimental,'Value'); % Boolean for new civ excution method 
+'TESTbatch'
+size(filecell.nc.civ1)
+nbslice
+nbfield
 for ifile=1:nbfield
     for j=1:nbslice
@@ -2330 +2339 @@
         end
 %         filecell.nc.civ1
-        filename_cmx=cell2mat(filecell.nc.civ1(ifile,j));%output netcdf file
-        filename_cmx([end-1:end])='cm';%name of cmx file
+        filename_cmx=filecell.nc.civ1{ifile,j}%output netcdf file
+        filename_cmx(end-1:end)='cm';%name of cmx file
         filename_cmx=[filename_cmx 'x'];
         
    %CIV1
         if box_test(1)==1
-            par_civ1.filename_ima_a=cell2mat(filecell.ima1.civ1(ifile,j));
+            par_civ1.filename_ima_a=filecell.ima1.civ1{ifile,j};
            % par_civ1.filename_ima_a([end-3:end])=[];%remove .png extension
-            par_civ1.filename_ima_b=cell2mat(filecell.ima2.civ1(ifile,j));
+            par_civ1.filename_ima_b=filecell.ima2.civ1{ifile,j};
            % par_civ1.filename_ima_b([end-3:end])=[];%remove .png extension
          
@@ -2741 +2750 @@
 %         .ncA.civ1{i,j}, .ncA.civ2{i,j}; set of nc files for PIV results with camA (then .nc corresponds to camB)
 %         .st{i,j};   set of nc files for the combined stereo fields
+% num1_civ1(i),num2_civ1(i): lists of first and last i indices for civ1
+% num_a_civ1(j),num_b_civ1(j): lists of first and last j indices for civ1
+% num1_civ2(i),num2_civ2(i): lists of first and last i indices for civ2
+% num_a_civ2(j),num_b_civ2(j): lists of first and last j indices for civ2
+% nom_type_nc: nomenclature type for velocity files 
+% file_ref_fix1,file_ref_fix2: reference files possibly used by Fix1 and 2
 function [filecell,num1_civ1,num2_civ1,num_a_civ1,num_b_civ1,num1_civ2,num2_civ2,num_a_civ2,num_b_civ2,nom_type_nc,file_ref_fix1,file_ref_fix2]=...
     set_civ_filenames(handles,compare,box_test)