Changeset 317 for trunk/src

Timestamp:

Dec 5, 2011, 7:48:37 PM (13 years ago)

Author:

sommeria

Message:

bug repaired in name2display (names in _000001) and civ.m

Location:

trunk/src

Files:

• civ.fig (modified) (previous)
• civ.m (modified) (2 diffs)
• civ_matlab.m (modified) (4 diffs)
• name2display.m (modified) (1 diff)

trunk/src/civ.m

@@ -23 +23 @@
 %TODO: search range
 
-% Last Modified by GUIDE v2.5 04-Dec-2011 08:42:47
+% Last Modified by GUIDE v2.5 04-Dec-2011 18:52:13
 % Begin initialization code - DO NOT EDIT
 gui_Singleton = 1;
@@ -4340 +4340 @@
 civ2.pixcmy='1';
 civ2.convectFlow='n';
+
+
+% --- Executes on button press in TestPatch1.
+function TestPatch1_Callback(hObject, eventdata, handles)
+set(handles.TestPatch1,'BackgroundColor',[1 1 0])
+drawnow
+if get(handles.TestPatch1,'Value')
+    ref_i=str2double(get(handles.ref_i,'String'));
+    if strcmp(get(handles.ref_j,'Visible'),'on')
+        ref_j=str2double(get(handles.ref_j,'String'));
+    else
+        ref_j=1;%default
+    end
+    [filecell,i1,i21,j1,j2,i1_civ2,i2_civ2,j1_civ2,j2_civ2,nom_type_nc,file_ref_fix1,file_ref_fix2]=...
+        set_civ_filenames(handles,ref_i,ref_j,[0 0 1 0 0 0]);
+    
+    Data.ListVarName={'ny','nx','A'};
+    Data.VarDimName= {'ny','nx',{'ny','nx'}};
+
+    Param=read_GUI(handles.civ)
+    Param.CheckOutputFile=0;
+    [Data,errormsg]=civ_matlab(Param,filecell.nc.civ1{1})% get the grid of x, y positions set for PIV 
+    if ~isempty(errormsg)
+        msgbox_uvmat('ERROR',Data.Txt)
+        return
+    end
+    set(handles.TestCiv1,'BackgroundColor',[1 0 0])
+else
+    corrfig=findobj(allchild(0),'tag','corrfig');% look for a current figure for image correlation display
+    if ~isempty(corrfig)
+        delete(corrfig)
+    end
+    hview_field=findobj(allchild(0),'tag','view_field');% look for view_field    
+    if ~isempty(hview_field)
+        delete(hview_field)
+    end
+end
+

trunk/src/civ_matlab.m

@@ -79 +79 @@
 
 else
-    Data=nc2struct(ncfile,'ListGlobalAttribute','absolut_time_T0'); %look for the constant 'absolut_time_T0' to detect old civx data format 
+    Data=nc2struct(ncfile,'ListGlobalAttribute','absolut_time_T0') %look for the constant 'absolut_time_T0' to detect old civx data format 
+    if isfield(Data,'Txt')
+            errormsg=Data.Txt;
+        return
+    end
     if ~isempty(Data.absolut_time_T0')%read civx file
         check_civx=1;% test for old civx data format
@@ -90 +94 @@
         end
     end
-    if isfield(Data,'Txt')
-        msgbox_uvmat('ERROR',Data.Txt)
-        return
-    end
+
 end
 
@@ -295 +296 @@
 
 %% write result in a netcdf file if requested
-if exist('ncfile','var')
+if exist('ncfile','var') && ~(isfield(Param,'CheckOuputFile')&&Param.CheckOuputFile)
     errormsg=struct2nc(ncfile,Data);
 end
@@ -413 +414 @@
 
 %% compute image correlations: MAINLOOP on velocity vectors
-% corrmax=0;
-% sum_square=1;% default
+corrmax=0;
+sum_square=1;% default
 % vector=[0 0];%default
 for ivec=1:nbvec

trunk/src/name2display.m

@@ -184 +184 @@
 
 %resolve ambigous nomenclature types when the number of 0 is unknown (type %0...):
-ind_zero=findstr('0',nom_type);
-nb_zero=numel(ind_zero);
-if ~isempty(ind_zero)
-    for itest=0:nb_zero-1
-        filename=name_generator(fullfile(RootPath,RootFile),1,1,ext,nom_type,1,1,1,subdir);
-        if exist(filename,'file')
-            break
-        else
-            nom_type(ind_zero(1))=[]; % remove a zero in nom_type
-        end
-    end
-end
+% ind_zero=findstr('0',nom_type);
+% nb_zero=numel(ind_zero);
+% if ~isempty(ind_zero)
+%     for itest=0:nb_zero-1
+%         filename=name_generator(fullfile(RootPath,RootFile),1,1,ext,nom_type,1,1,1,subdir)
+%         if exist(filename,'file')
+%             break
+%         else
+%             nom_type(ind_zero(1))=[]; % remove a zero in nom_type
+%         end
+%     end
+% end