Changeset 275 for trunk

Timestamp:

Nov 18, 2011, 1:18:08 AM (12 years ago)

Author:

sommeria

Message:

further cleaning after new GUI civ

Location:

trunk/src

Files:

• civ.fig (modified) (previous)
• civ.m (modified) (17 diffs)

trunk/src/civ.m

@@ -246 +246 @@
 end
 
-
-%TESTS
-
-
-struct=read_panel(handles.panel_Patch2)
-
 %------------------------------------------------------------------------
 % --- Outputs from this function are returned to the command line.
@@ -737 +731 @@
     end
     first_i=max(field_i,1); 
-    nom_type_search
     if numel(regexp(nom_type_search,'\D'))>=1%two indices i and j
         field_i=browse.num_i1;
@@ -1026 +1019 @@
 set(gcf,'Pointer','watch')
 %nomenclature types
-'TESTpair'
 filebase=get(handles.RootName,'String');
 [filepath,Nme,ext_dir]=fileparts(filebase);
@@ -1108 +1100 @@
     % case of no displayed pair
     if isequal(select,zeros(size(1:nbpair)))
-        'TESTzero'
-        browse
         if isfield(browse,'incr_pair') && ~isequal(browse.incr_pair,[0 0])
             num_i1=ref_i-floor(browse.incr_pair(1)/2);
@@ -1214 +1204 @@
     mode='displacement';
 else
-    mode_list=get(handles.CivMode,'String')
+    mode_list=get(handles.CivMode,'String');
     if isempty(mode_list)
         msgbox_uvmat('ERROR','please enter an input image or netcdf file')
         return
     end
-    mode_value=get(handles.CivMode,'Value')
+    mode_value=get(handles.CivMode,'Value');
     mode=mode_list{mode_value};
 end
@@ -1677 +1667 @@
 %% get fix1 parameters 
 if box_test(2)
-    param.fix1=read_param_fix1(handles,filecell)
+    param.fix1=read_param_fix1(handles,filecell);
 end
 
@@ -1710 +1700 @@
 if box_test(6)==1
     param.Patch2=read_panel(handles.panel_Patch1);
-%     rho_patch2=str2double(get(handles.num_SmoothParam,'String'));
-%     if isnan(rho_patch2)
-%         rho_patch2='1000';
-%         set(handles.num_SmoothParam,'String','1')
-%     else
-%         rho_patch2=num2str(1000*rho_patch2);
-%     end
-%     nx_patch2=get(handles.num_Nx,'String');
-%     ny_patch2=get(handles.num_Ny,'String');
-%     if isnan(str2double(nx_patch2))
-%         nx_patch2='50' ;%default
-%         set(handles.num_Nx,'String','50');
-%     end
-%     if isnan(str2double(ny_patch2))
-%         ny_patch2='50' ;%default
-%         set(handles.num_Ny,'String','50');
-%     end
-%     subdomain_patch2=get(handles.num_SubdomainSize,'String');
-%     thresh_patch2=get(handles.num_MaxDiff,'String');
 end
 
@@ -1981 +1952 @@
             switch CivMode
                 case 'CivX'
-                    cmd_CIV2=CIV2_CMD(filecell.nc.civ2{ifile,j},[],param);%creates the cmx file [fullfile(Rootbat,Filebat) '.civ2.cmx]
+                    cmd_CIV2=CIV2_CMD(filecell.nc.civ2{ifile,j},param);%creates the cmx file [fullfile(Rootbat,Filebat) '.civ2.cmx]
                     cmd=[cmd cmd_CIV2 '\n'];
                 case 'CivAll'
@@ -2047 +2018 @@
             switch CivMode
                 case 'CivX'
-                    cmd_PATCH=cmd_path(filecell.nc.civ2{ifile,j},param);
+                    cmd_PATCH=cmd_patch(filecell.nc.civ2{ifile,j},param.Patch2,param.global.PatchBin);
                     cmd=[cmd cmd_PATCH '\n'];
                 case 'CivAll'
@@ -2868 +2839 @@
                         end
                     elseif box_test(3)==0; %check the existence of patch if it is not calculated
-                        Data=nc2struct(filename,'ListGlobalAttribute','CivStage','patch')
+                        Data=nc2struct(filename,'ListGlobalAttribute','CivStage','patch');
                         if ~isempty(Data.CivStage)
                             if Data.CivStage<3 %test for civ files
@@ -3223 +3194 @@
         ' -n ' num2str(Param.Ny) ' -ro ' num2str(Param.SmoothingParam)...
         ' -nopt ' num2str(Param.SubdomainSize) ...
-        '  > ' namelog ' 2>&1'] % redirect standard output to the log file
+        '  > ' namelog ' 2>&1']; % redirect standard output to the log file
     else
       cmd=['"' param.global.PatchBin...
@@ -3450 +3421 @@
 function get_mask_civ1_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-maskval=get(handles.get_mask_civ1,'Value')
+maskval=get(handles.get_mask_civ1,'Value');
 if isequal(maskval,0)
     set(handles.mask_civ1,'String','')
@@ -4399 +4370 @@
 %changes : filename_cmx -> filename ( no extension )
 
-filename=regexprep(filename,'.nc','')
+filename=regexprep(filename,'.nc','');
 
 if isequal(param.civ1.Dt,'0')
@@ -4505 +4476 @@
 %pixels per cm and matrix of the image times, read from the .civ file by uvmat
 %global CivBin%name of the executable for civ1 calculation
+
 filename=regexprep(filename,'.nc','');
 
@@ -4558 +4530 @@
 %pixels per cm and matrix of the image times, read from the .civ file by uvmat
 % global civ2Bin sge%name of the executable for civ1 calculation
-if isequal(par.Dt,'0')
+filename=regexprep(filename,'.nc','');
+if isequal(param.civ2.Dt,'0')
     param.civ2.Dt='1' ;%case of 'displacement' mode
 end
@@ -4722 +4695 @@
     sizf=size(fileinput);
     if (~ischar(fileinput)||~isequal(sizf(1),1)),return;end %stop if fileinput not a character string
-    [path,name,ext]=fileparts(fileinput)
+    [path,name,ext]=fileparts(fileinput);
     [path1]=fileparts(filebase);
     if isunix
@@ -5334 +5307 @@
     end
     if check_input
-        key
         eval(['struct.' key '=input;'])
     end