Changeset 354 for trunk/src/civ.m
- Timestamp:
- Dec 30, 2011, 5:00:25 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/civ.m
r353 r354 1210 1210 nbslice_mask=str2double(Param.Civ1.Mask(1:end-4)); % 1211 1211 i1_mask=mod(i1_civ1(ifile)-1,nbslice_mask)+1; 1212 Param.Civ1.Mask=name_generator(maskbase,i1_mask,1,'.png','_i'); 1212 [RootPathMask,RootFileMask]=fileparts(maskbase); 1213 Param.Civ1.Mask=fullfile_uvmat(RootPathMask,[],RootFileMask,'.png','_1',i1_mask); 1214 % Param.Civ1.Mask=name_generator(maskbase,i1_mask,1,'.png','_i'); 1213 1215 end 1214 1216 end … … 1219 1221 if ~isnan(nbslice_grid) 1220 1222 i1_grid=mod(i1_civ1(ifile)-1,nbslice_grid)+1; 1221 Param.Civ1.Grid=[filecell.filebase '_' name_generator(Param.Civ1.Grid,i1_grid,1,'.grid','_i')]; 1223 Param.Civ1.Grid=[filecell.filebase '_' fullfile_uvmat('','',Param.Civ1.Grid,'.grid','_1',i1_grid)]; 1224 % Param.Civ1.Grid=[filecell.filebase '_' name_generator(Param.Civ1.Grid,i1_grid,1,'.grid','_i')]; 1222 1225 if ~exist(Param.Civ1.GridName,'file') 1223 1226 msgbox_uvmat('ERROR','grid file absent for civ1') … … 1297 1300 if ~isnan(nbslice_grid) 1298 1301 i1_grid=mod(i1_civ1(ifile)-1,nbslice_grid)+1; 1299 patch1.gridPatch=[filecell.filebase '_' name_generator(gridname,i1_grid,1,'.grid','_i')]; 1302 patch1.gridPatch=[filecell.filebase '_' fullfile_uvmat('','',gridname,'.grid','_1',i1_grid)]; 1303 % patch1.gridPatch=[filecell.filebase '_' name_generator(gridname,i1_grid,1,'.grid','_i')]; 1300 1304 if ~exist(patch1.gridPatch,'file') 1301 1305 msgbox_uvmat('ERROR','grid file absent for patch1') … … 1346 1350 nbslice_mask=str2double(Param.Civ2.Mask(1:end-4)); % 1347 1351 i1_mask=mod(i1_civ2(ifile)-1,nbslice_mask)+1; 1348 Param.Civ2.Mask=name_generator(maskbase,i1_mask,1,'.png','_i'); 1352 [RootPathMask,RootFileMask]=fileparts(maskbase); 1353 Param.Civ2.Mask=fullfile_uvmat(RootPathMask,[],RootFileMask,'.png','_1',i1_mask); 1354 % Param.Civ2.Mask=name_generator(maskbase,i1_mask,1,'.png','_i'); 1349 1355 end 1350 1356 end … … 1355 1361 if ~isnan(nbslice_grid) 1356 1362 i1_grid=mod(i1_civ2(ifile)-1,nbslice_grid)+1; 1357 Param.Civ2.Grid=[filecell.filebase '_' name_generator(gridname,i1_grid,1,'.grid','_i')]; 1363 Param.Civ2.Grid=[filecell.filebase '_' fullfile_uvmat('','',gridname,'.grid','_1',i1_grid)]; 1364 % Param.Civ2.Grid=[filecell.filebase '_' name_generator(gridname,i1_grid,1,'.grid','_i')]; 1358 1365 end 1359 1366 end … … 1431 1438 if ~isnan(nbslice_grid) 1432 1439 i1_grid=mod(i1_civ2(ifile)-1,nbslice_grid)+1; 1433 patch2.gridPatch=[filecell.filebase '_' name_generator(gridname,i1_grid,1,'.grid','_i')]; 1440 patch2.gridPatch=[filecell.filebase '_' fullfile_uvmat('','',gridname,'.grid','_1',i1_grid)]; 1441 % patch2.gridPatch=[filecell.filebase '_' name_generator(gridname,i1_grid,1,'.grid','_i')]; 1434 1442 if ~exist(patch2.gridPatch,'file') 1435 1443 msgbox_uvmat('ERROR','grid file absent for patch2') … … 1654 1662 fprintf(fid,['sh ' batch_file_list{p} '\n']); 1655 1663 else 1656 fprintf(fid,['@call "' regexprep( filename_bat,'\\','\\\\') '"' '\n']);1664 fprintf(fid,['@call "' regexprep(batch_file_list{p},'\\','\\\\') '"' '\n']); 1657 1665 end 1658 1666 end … … 1809 1817 filebase_nc=filebase_B; 1810 1818 end 1811 [RootPath_ima1,RootFile_ima1]=fileparts(filebase_ima1); 1812 [RootPath_ima2,RootFile_ima2]=fileparts(filebase_ima2); 1813 [RootPath_nc,RootFile_ima1]=fileparts(filebase_nc); 1819 [RootPath_ima1,RootFile_ima1]=fileparts(filebase_ima1); 1820 [RootPath_ima2,RootFile_ima2]=fileparts(filebase_ima2); 1821 [RootPath_nc,RootFile_nc]=fileparts(filebase_nc); 1822 [RootPath_A,RootFile_A]=fileparts(filebase_A); 1823 [RootPath_AB,RootFile_AB]=fileparts(filebase_AB); 1814 1824 1815 1825 %determine reference files for fix: … … 1955 1965 for ifile=1:nbfield 1956 1966 for j=1:nbslice 1957 [RootPath,RootFile]=fileparts(ref.filebase_nc); 1958 filename=name_generator(filebase_nc,num1_civ1(ifile),num_a_civ1(j),'.nc',nom_type_nc,1,num2_civ1(ifile),num_b_civ1(j),subdir_civ1_new); 1967 [RootPath,RootFile]=fileparts(filebase_nc); 1968 filename=fullfile_uvmat(RootPath_nc,subdir_civ1_new,RootFile_nc,'.nc',nom_type_nc,num1_civ1(ifile),num2_civ1(ifile),num_a_civ1(j),num_b_civ1(j)); 1969 % filename=name_generator(filebase_nc,num1_civ1(ifile),num_a_civ1(j),'.nc',nom_type_nc,1,num2_civ1(ifile),num_b_civ1(j),subdir_civ1_new); 1959 1970 detect=exist(filename,'file')==2; 1960 1971 if detect% if a netcdf file already exists … … 1999 2010 for ifile=1:nbfield 2000 2011 for j=1:nbslice 2001 filename=name_generator(filebase_A,num1_civ1(ifile),num_a_civ1(j),'.nc',nom_type_nc,1,num2_civ1(ifile),num_b_civ1(j),subdir_civ1_new);% 2012 filename=fullfile_uvmat(RootPath_A,subdir_civ1_new,RootFile_A,'.nc',nom_type_nc,num1_civ1(ifile),num2_civ1(ifile),num_a_civ1(j),num_b_civ1(j)); 2013 % filename=name_generator(filebase_A,num1_civ1(ifile),num_a_civ1(j),'.nc',nom_type_nc,1,num2_civ1(ifile),num_b_civ1(j),subdir_civ1_new);% 2002 2014 detect=exist(filename,'file')==2; 2003 2015 if detect% if a netcdf file already exists … … 2045 2057 for ifile=1:nbfield 2046 2058 for j=1:nbslice 2047 filename=name_generator(filebase_ima1, num1_civ1(ifile),num_a_civ1(j),ext_ima,nom_type_ima1); 2059 filename=fullfile_uvmat(RootPath_ima1,'',RootFile_ima1,ext_ima,nom_type_ima1,num1_civ1(ifile),[],num_a_civ1(j)); 2060 % filename=name_generator(filebase_ima1, num1_civ1(ifile),num_a_civ1(j),ext_ima,nom_type_ima1); 2048 2061 idetect(j)=exist(filename,'file')==2; 2049 2062 filecell.ima1.civ1(ifile,j)={filename}; %first image 2050 filename=name_generator(filebase_ima2, num2_civ1(ifile),num_b_civ1(j),ext_ima,nom_type_ima2); 2063 filename=fullfile_uvmat(RootPath_ima2,'',RootFile_ima2,ext_ima,nom_type_ima2,num2_civ1(ifile),[],num_b_civ1(j)); 2064 % filename=name_generator(filebase_ima2, num2_civ1(ifile),num_b_civ1(j),ext_ima,nom_type_ima2); 2051 2065 idetect_1(j)=exist(filename,'file')==2; 2052 2066 filecell.ima2.civ1(ifile,j)={filename};%second image … … 2070 2084 for ifile=1:nbfield 2071 2085 for j=1:nbslice 2072 filename=name_generator(filebase_A, num1_civ1(ifile),num_a_civ1(j),ext_ima,nom_type_ima1); 2086 filename=fullfile_uvmat(RootPath_A,'',RootFile_A,ext_ima,nom_type_ima1,num1_civ1(ifile),[],num_a_civ1(j)); 2087 % filename=name_generator(filebase_A, num1_civ1(ifile),num_a_civ1(j),ext_ima,nom_type_ima1); 2073 2088 idetect(j)=exist(filename,'file')==2; 2074 2089 filecell.imaA1.civ1(ifile,j)={filename} ;%first image 2075 filename=name_generator(filebase_A, num2_civ1(ifile),num_b_civ1(j),ext_ima,nom_type_ima2); 2090 filename=fullfile_uvmat(RootPath_A,'',RootFile_A,ext_ima,nom_type_ima2,num2_civ1(ifile),[],num_b_civ1(j)); 2091 % filename=name_generator(filebase_A, num2_civ1(ifile),num_b_civ1(j),ext_ima,nom_type_ima2); 2076 2092 idetect_1(j)=exist(filename,'file')==2; 2077 2093 filecell.imaA2.civ1(ifile,j)={filename};%second image … … 2098 2114 for ifile=1:nbfield 2099 2115 for j=1:nbslice 2100 filename=name_generator(filebase_nc,num1_civ1(ifile),num_a_civ1(j),'.nc',... 2101 nom_type_nc,1,num2_civ1(ifile),num_b_civ1(j),subdir_civ1);% 2116 filename=fullfile_uvmat(RootPath_nc,subdir_civ1,RootFile_nc,'.nc',nom_type_nc,num1_civ1(ifile),num2_civ1(ifile),num_a_civ1(j),num_b_civ1(j)); 2117 % filename=name_generator(filebase_nc,num1_civ1(ifile),num_a_civ1(j),'.nc',... 2118 % nom_type_nc,1,num2_civ1(ifile),num_b_civ1(j),subdir_civ1);% 2102 2119 detect=exist(filename,'file')==2; 2103 2120 if detect==0 … … 2113 2130 for ifile=1:nbfield 2114 2131 for j=1:nbslice 2115 filename=name_generator(filebase_A,num1_civ1(ifile),num_a_civ1(j),'.nc',nom_type_nc,1,num2_civ1(ifile),num_b_civ1(j),subdir_civ1);% 2132 filename=fullfile_uvmat(RootPath_A,subdir_civ1,RootFile_A,'.nc',nom_type_nc,num1_civ1(ifile),num2_civ1(ifile),num_a_civ1(j),num_b_civ1(j)); 2133 % filename=name_generator(filebase_A,num1_civ1(ifile),num_a_civ1(j),'.nc',nom_type_nc,1,num2_civ1(ifile),num_b_civ1(j),subdir_civ1);% 2116 2134 filecell.ncA.civ1(ifile,j)={filename}; 2117 2135 if ~exist(filename,'file') … … 2139 2157 for ifile=1:nbfield 2140 2158 for j=1:nbslice 2141 filename=name_generator(filebase_nc,num1_civ2(ifile),num_a_civ2(j),'.nc',nom_type_nc,1,num2_civ2(ifile),num_b_civ2(j),subdir_civ2_new);% 2159 filename=fullfile_uvmat(RootPath_nc,subdir_civ2_new,RootFile_nc,'.nc',nom_type_nc,num1_civ2(ifile),num2_civ2(ifile),num_a_civ2(j),num_b_civ2(j)); 2160 % filename=name_generator(filebase_nc,num1_civ2(ifile),num_a_civ2(j),'.nc',nom_type_nc,1,num2_civ2(ifile),num_b_civ2(j),subdir_civ2_new);% 2142 2161 detect=exist(filename,'file')==2; 2143 2162 if detect% if a netcdf file already exists … … 2172 2191 for ifile=1:nbfield 2173 2192 for j=1:nbslice 2174 filename=name_generator(filebase_A,num1_civ2(ifile),num_a_civ2(j),'.nc',... 2175 nom_type_nc,1,num2_civ2(ifile),num_b_civ1(j),subdir_civ2_new);% 2193 filename=fullfile_uvmat(RootPath_A,subdir_civ2_new,RootFile_A,'.nc',nom_type_nc,num1_civ2(ifile),num2_civ2(ifile),num_a_civ2(j),num_b_civ2(j)); 2194 % filename=name_generator(filebase_A,num1_civ2(ifile),num_a_civ2(j),'.nc',... 2195 % nom_type_nc,1,num2_civ2(ifile),num_b_civ1(j),subdir_civ2_new);% 2176 2196 detect=exist(filename,'file')==2; 2177 2197 if detect% if a netcdf file already exists … … 2289 2309 for ifile=1:nbfield 2290 2310 for j=1:nbslice 2291 filename=fullfile_uvmat(RootPath_ima1,[],RootFile_ima1,ext_ima,nom_type_ima1,num1_civ2(ifile), num2_civ2(ifile),num_a_civ2(j),num_b_civ2(j));2311 filename=fullfile_uvmat(RootPath_ima1,[],RootFile_ima1,ext_ima,nom_type_ima1,num1_civ2(ifile),[],num_a_civ2(j)); 2292 2312 %filename=name_generator(filebase_ima1, num1_civ2(ifile),num_a_civ2(j),ext_ima,nom_type_ima1); 2293 2313 idetect_2(j)=exist(filename,'file')==2; … … 2309 2329 for ifile=1:nbfield 2310 2330 for j=1:nbslice 2311 filename=fullfile_uvmat(RootPath_ima2,[],RootFile_ima2,ext_ima,nom_type_ima2,num 1_civ2(ifile),num2_civ2(ifile),num_a_civ2(j),num_b_civ2(j));2331 filename=fullfile_uvmat(RootPath_ima2,[],RootFile_ima2,ext_ima,nom_type_ima2,num2_civ2(ifile),[],num_b_civ2(j)); 2312 2332 % filename=name_generator(filebase_ima2, num2_civ2(ifile),num_b_civ2(j),ext_ima,nom_type_ima2); 2313 2333 idetect_3(j)=exist(filename,'file')==2; … … 2450 2470 waitbar(ifile/nbfield); 2451 2471 for j=1:nbslice 2452 filename=fullfile_uvmat(RootPath_ima1,[],RootFile_ima1,'.png',nom_type_imanew1,num1_civ1(ifile), num2_civ1(ifile),num_a_civ1(j),num_b_civ1(j));2472 filename=fullfile_uvmat(RootPath_ima1,[],RootFile_ima1,'.png',nom_type_imanew1,num1_civ1(ifile),[],num_a_civ1(j)); 2453 2473 % filename=name_generator(filebase_ima1,num1_civ1(ifile),num_a_civ1(j),'.png',nom_type_imanew1); 2454 2474 if ~exist(filename,'file') … … 2457 2477 end 2458 2478 filecell.ima1.civ1(ifile,j)={filename}; 2459 filename=fullfile_uvmat(RootPath_ima2,[],RootFile_ima2,'.png',nom_type_imanew2,num2_civ1(ifile), num2_civ1(ifile),num_b_civ1(j),num_b_civ1(j));2479 filename=fullfile_uvmat(RootPath_ima2,[],RootFile_ima2,'.png',nom_type_imanew2,num2_civ1(ifile),[],num_b_civ1(j)); 2460 2480 %filename=name_generator(filebase_ima2, num2_civ1(ifile),num_b_civ1(j),'.png',nom_type_imanew2); 2461 2481 if ~exist(filename,'file') … … 2473 2493 waitbar(ifile/nbfield); 2474 2494 for j=1:nbslice 2475 filename=fullfile_uvmat(RootPath_ima1,[],RootFile_ima1,'.png',nom_type_imanew1,num1_civ2(ifile),[],num_a_civ 1(j));2495 filename=fullfile_uvmat(RootPath_ima1,[],RootFile_ima1,'.png',nom_type_imanew1,num1_civ2(ifile),[],num_a_civ2(j)); 2476 2496 %filename=name_generator(filebase_ima1,num1_civ2(ifile),num_a_civ2(j),'.png',nom_type_imanew1); 2477 2497 if ~exist(filename,'file') … … 2480 2500 end 2481 2501 filecell.ima1.civ2(ifile,j)={filename}; 2482 filename=name_generator(filebase_ima2, num2_civ2(ifile),num_b_civ2(j),'.png',nom_type_imanew2); 2502 filename=fullfile_uvmat(RootPath_ima2,[],RootFile_ima2,'.png',nom_type_imanew2,num2_civ2(ifile),[],num_b_civ2(j)); 2503 % filename=name_generator(filebase_ima2, num2_civ2(ifile),num_b_civ2(j),'.png',nom_type_imanew2); 2483 2504 if ~exist(filename,'file') 2484 2505 A=read_image(cell2mat(filecell.ima2.civ2(ifile,j)),type_ima2,num2_civ2(ifile)); … … 3054 3075 3055 3076 %% case with no Civ1 operation, netcdf files need to exist for reading 3077 [RootPath,RootFile]=fileparts(filebase); 3056 3078 if ~get(handles.CheckCiv1,'Value') % 3057 3079 if ~exist(fullfile(filepath,subdir_civ1,ext_dir),'dir') … … 3061 3083 end 3062 3084 for ipair=1:nbpair 3063 filename=name_generator(filebase,ref_i+displ_num(3,ipair),ref_j+displ_num(1,ipair),'.nc',nom_type_nc,1,... 3064 ref_i+displ_num(4,ipair),ref_j+displ_num(2,ipair),subdir_civ1); 3085 filename=fullfile_uvmat(RootPath,subdir_civ1,RootFile,'.nc',nom_type_nc,... 3086 ref_i+displ_num(3,ipair),ref_i+displ_num(4,ipair),ref_j+displ_num(1,ipair),ref_j+displ_num(2,ipair)); 3087 % filename=name_generator(filebase,ref_i+displ_num(3,ipair),ref_j+displ_num(1,ipair),'.nc',nom_type_nc,1,... 3088 % ref_i+displ_num(4,ipair),ref_j+displ_num(2,ipair),subdir_civ1); 3065 3089 select(ipair)=exist(filename,'file')==2;% put flag to 0 if the file does not exist 3066 3090 end … … 3072 3096 num_j1=ref_j-floor(browse.incr_pair(2)/2); 3073 3097 num_j2=ref_j+ceil(browse.incr_pair(2)/2); 3074 filename=name_generator(filebase,num_i1,num_j1,'.nc',nom_type_nc,1,num_i2,num_j2,subdir_civ1); 3098 filename=fullfile_uvmat(RootPath,subdir_civ1,RootFile,'.nc',nom_type_nc,num_i1,num_i2,num_j1,num_j2); 3099 %filename=name_generator(filebase,num_i1,num_j1,'.nc',nom_type_nc,1,num_i2,num_j2,subdir_civ1); 3075 3100 select(1)=exist(filename,'file')==2; 3076 3101 testpair=1; … … 3251 3276 displ_pair={''}; %default 3252 3277 select=ones(size(1:nbpair));%default =1 for numbers of displayed pairs 3278 [RootPath,RootFile]=fileparts(filebase); 3253 3279 if ~get(handles.CheckCiv2,'Value') && ~get(handles.CheckCiv1,'Value') && ~get(handles.CheckFix1,'Value') && ~get(handles.CheckPatch1,'Value') 3254 3280 if ~exist(fullfile(filepath,subdir_civ2,ext_dir),'dir') … … 3259 3285 end 3260 3286 for ipair=1:nbpair 3261 filename=name_generator(filebase,ref_i+displ_num(3,ipair),ref_j+displ_num(1,ipair),'.nc',nom_type_nc,1,... 3262 ref_i+displ_num(4,ipair),ref_j+displ_num(2,ipair),subdir_civ1); 3287 filename=fullfile_uvmat(RootPath,subdir_civ1,RootFile,'.nc',nom_type_nc,... 3288 ref_i+displ_num(3,ipair),ref_i+displ_num(4,ipair),ref_j+displ_num(1,ipair),ref_j+displ_num(2,ipair)); 3289 % filename=name_generator(filebase,ref_i+displ_num(3,ipair),ref_j+displ_num(1,ipair),'.nc',nom_type_nc,1,... 3290 % ref_i+displ_num(4,ipair),ref_j+displ_num(2,ipair),subdir_civ1); 3263 3291 select(ipair)=exist(filename,'file')==2; 3264 3292 end … … 3269 3297 num_j1=ref_j-floor(browse.incr_pair(2)/2); 3270 3298 num_j2=ref_j+floor((browse.incr_pair(2)+1)/2); 3271 filename=name_generator(filebase,num_i1,num_j1,'.nc',nom_type_nc,1,num_i2,num_j2,subdir_civ2); 3299 filename=fullfile_uvmat(RootPath,subdir_civ2,RootFile,'.nc',nom_type_nc,num_i1,num_i2,num_j1,num_j2); 3300 %filename=name_generator(filebase,num_i1,num_j1,'.nc',nom_type_nc,1,num_i2,num_j2,subdir_civ2); 3272 3301 select(1)=exist(filename,'file')==2; 3273 3302 else 3274 3303 if isequal(mode,'series(Dj)')% | isequal(mode,'st_series(Dj)') 3275 errordlg(['no civ2 file available for the selected reference index j=' num2str(ref_j) ' and subdirectory ' subdir_civ2])3304 msgbox_uvmat('ERROR',['no civ2 file available for the selected reference index j=' num2str(ref_j) ' and subdirectory ' subdir_civ2]) 3276 3305 else 3277 errordlg(['no civ2 file available for the selected reference index i=' num2str(ref_i) ' and subdirectory ' subdir_civ2])3306 msgbox_uvmat('ERROR',['no civ2 file available for the selected reference index i=' num2str(ref_i) ' and subdirectory ' subdir_civ2]) 3278 3307 end 3279 3308 set(handles.ListPairCiv2,'Value',1);
Note: See TracChangeset
for help on using the changeset viewer.