Changeset 372 for trunk

Timestamp:

Jan 16, 2012, 12:28:26 AM (13 years ago)

Author:

sommeria

Message:

many bugs repaired.

Location:

trunk/src

Files:

• civ.m (modified) (1 diff)
• civ_matlab.m (modified) (1 diff)
• find_file_series.m (modified) (3 diffs)
• fullfile_uvmat.m (modified) (1 diff)
• proj_field.m (modified) (2 diffs)
• read_civdata.m (modified) (1 diff)
• series.fig (modified) (previous)
• series.m (modified) (19 diffs)

trunk/src/civ.m

@@ -1348 +1348 @@
             Param.Civ2.ImageB=filecell.ima2.civ2{ifile,j};
             if ~checkframe %&& size(time,1)>=i2_civ2(ifile) && size(time,2)>=j2_civ2(j)
-                Param.Civ2.Dt=num2str(time(i2_civ2(ifile)+1,j2_civ2(j)+1)-time(i1_civ2(ifile)+1,j1_civ2(j)+1));
+                Param.Civ2.Dt=time(i2_civ2(ifile)+1,j2_civ2(j)+1)-time(i1_civ2(ifile)+1,j1_civ2(j)+1);
             else
                 Param.Civ2.Dt=1;
             end
-            Param.Civ2.Time=num2str((time(i2_civ2(ifile)+1,j2_civ2(j)+1)+time(i1_civ2(ifile)+1,j1_civ2(j)+1))/2);
+            Param.Civ2.Time=(time(i2_civ2(ifile)+1,j2_civ2(j)+1)+time(i1_civ2(ifile)+1,j1_civ2(j)+1))/2;
             Param.Civ2.term_a=num2stra(j1_civ2(j),nom_type_nc);
             Param.Civ2.term_b=num2stra(j2_civ2(j),nom_type_nc);

trunk/src/civ_matlab.m

@@ -282 +282 @@
     end
     Data.ListGlobalAttribute=[Data.ListGlobalAttribute Civ2_param {'Civ2_Time','Civ2_Dt'}];
-    Data.Civ2_Time=str2double(par_civ2.Time);
-    Data.Civ2_Dt=str2double(par_civ2.Dt);
+%     Data.Civ2_Time=par_civ2.Time;
+%     Data.Civ2_Dt=par_civ2.Dt;
     nbvar=numel(Data.ListVarName);
     Data.ListVarName=[Data.ListVarName {'Civ2_X','Civ2_Y','Civ2_U','Civ2_V','Civ2_F','Civ2_C'}];%  cell array containing the names of the fields to record

trunk/src/find_file_series.m

@@ -37 +37 @@
 %AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 
-function [RootFile,i1_series,i2_series,j1_series,j2_series,NomType,FileType,Object]=find_file_series(RootPath,fileinput)
+function [RootFile,i1_series,i2_series,j1_series,j2_series,NomType,FileType,Object]=find_file_series(RootPath,fileinput,option)
 %------------------------------------------------------------------------
-
+if ~exist('option','var')
+    option='all';
+end
 %% get input root name and nomenclature type
 [tild,tild,RootFile,tild,i2_input,j1_input,j2_input,FileExt,NomType]=fileparts_uvmat(fileinput);
@@ -103 +105 @@
 end
 
-if strcmp(NomType,'')||strcmp(NomType,'*')
+if strcmp(NomType,'')||strcmp(NomType,'*')||strcmp(option,'filetype')
     if exist(fullfileinput,'file')
         [tild,RootFile]=fileparts(fileinput);% case of constant name (no indexing)
@@ -251 +253 @@
         NomType='';
     else
-        [tild,tild,tild,tild,tild,tild,tild,tild,NomType]=fileparts_uvmat(dirpair(ifile_min).name);
-    end
+        [tild,tild,tild,tild,tild,tild,tild,tild,NomType]=fileparts_uvmat(dirpair(ifile_min).name);% update the representation of indices (number of 0 before the number)
+    end
+end
+
+%% update the file type if the input file does not exist (pb of 0001)
+if strcmp(option,'filetype')
+    return
+elseif isempty(FileType)
+    [tild,tild, tild,tild,tild,tild,FileType,Object]=find_file_series(RootPath,dirpair(ifile_min).name,'filetype');
 end
 

trunk/src/fullfile_uvmat.m

@@ -48 +48 @@
     j2=[];
 end
+if ~exist('j1','var') 
+    j1=[];
+end
 if isequal(j1,j2)
     j2=[];% suppress the secodn index if equal to the first
-end
-if ~exist('j1','var') 
-    j1=1;
 end
 if ~exist('i2','var') 

trunk/src/proj_field.m

@@ -249 +249 @@
                     eval(['ProjData.' VarName '(ipoint,1)=mean(Var);'])
                     if isequal(ObjectData.ProjMode,'interp')
-                         eval(['ProjData.' VarName '(ipoint,1)=griddata_uvmat(coord_x(indsel),coord_y(indsel),Var,Xpoint(1),Xpoint(2)))';])
+                         ProjData.(VarName)(ipoint,1)=griddata_uvmat(coord_x(indsel),coord_y(indsel),Var,Xpoint(1),Xpoint(2));
                     end
                end
@@ -1556 +1556 @@
     end
 end
-ProjData
-ProjData.VarDimName{3}
 
 %-----------------------------------------------------------------

trunk/src/read_civdata.m

@@ -75 +75 @@
      return
 end
+switch vel_type_out_cell{ichoice}
+    case{'civ1','fix1','patch1'}
+        Field.dt=Field.Civ1_Dt;
+    case{'civ2','fix2','patch2'}
+        Field.dt=Field.Civ2_Dt;
+end
+Field.ListGlobalAttribute=[Field.ListGlobalAttribute {'dt'}];
 var_ind=find(vardetect);
 for ivar=1:min(numel(var_ind),numel(Field.VarAttribute))

trunk/src/series.m

@@ -454 +454 @@
 [RootPath,SubDir,RootFile,i1,i2,j1,j2,FileExt,NomType]=fileparts_uvmat(fileinput);
 
-%% determine reference field indices
+%% determine the selected reference field indices for pair dispaly
 ref_i=1; %default ref_i is a reference frame index used to find existing pairs from PIV
 if ~isempty(i1)
@@ -460 +460 @@
     if ~isempty(i2)
         ref_i=floor((ref_i+i2)/2);% reference image number corresponding to the file
-%         SeriesData.browse_Di=i2-i1;
     end
 end
 set(handles.ref_i,'String',num2str(ref_i));
-set(handles.num_first_i,'String',num2str(ref_i));
-set(handles.num_last_i,'String',num2str(ref_i));
 ref_j=1; %default  ref_j is a reference frame index used to find existing pairs from PIV
 if ~isempty(j1)
@@ -471 +468 @@
     if ~isempty(j2)
         ref_j=floor((j1+j2)/2);
-%         SeriesData.browse_Dj=j2-j1; 
     end          
 end
 set(handles.ref_j,'String',num2str(ref_j)); 
+ref_i_Callback([],[], handles)
+ref_j_Callback([],[], handles)
+
+%% update the first and last reference indices if empty
+first_i=str2num(get(handles.num_first_i,'String'));
+if isempty(first_i)
+set(handles.num_first_i,'String',num2str(ref_i));
+set(handles.num_last_i,'String',num2str(ref_i));
 set(handles.num_first_j,'String',num2str(ref_j))
 set(handles.num_last_j,'String',num2str(ref_j)); 
-TimeUnit=''; %default
-time=[];%default
-
-% read timing and total frame number from the current file (movie files) !! may be overrid by xml file
-FileBase=fullfile(RootPath,RootFile);
-
-testima=0; %test for image input
-if isequal(lower(FileExt),'.avi') %.avi file
-    testima=1;
-elseif ~isempty(imformats(FileExt(2:end))) 
-    testima=1;
-elseif isequal(FileExt,'.vol')
-     testima=1;
-end
+end
+
+% 
+% % FileBase=fullfile(RootPath,RootFile);
+% TimeUnit=''; %default
+% time=[];%default
+% testima=0; %test for image input
+% if isequal(lower(FileExt),'.avi') %.avi file
+%     testima=1;
+% elseif ~isempty(imformats(FileExt(2:end))) 
+%     testima=1;
+% elseif isequal(FileExt,'.vol')
+%      testima=1;
+% end
 
 %% fill the list of file series
-
-% insert the current file series at the head of the list
 InputTable=get(handles.InputTable,'Data');
-if addtest %insert the new data at the first line of the table
+if addtest % display the input data as a new line in the table
      val=size(InputTable,1)+1;
      InputTable(val,:)=[{RootPath},{SubDir},{RootFile},{NomType},{FileExt}];
@@ -502 +504 @@
 else % or re-initialise the list of  input  file series
     val=1;
-    InputTable=[{RootPath},{SubDir},{RootFile},{NomType},{FileExt}]
+    InputTable=[{RootPath},{SubDir},{RootFile},{NomType},{FileExt}];
     set(handles.TimeTable,'Data',[{[]},{[]},{[]},{[]}]) 
     set(handles.MinIndex,'Data',[{[]},{[]}])
@@ -510 +512 @@
 check_lines(val)=1; %select the edited line for refresh
 set(handles.REFRESH_INDICES,'UserData',check_lines);
+
+%% refresh menus with info fromthe new series
 REFRESH_INDICES_Callback([],[], handles)
 
-%store the root name for future opening of uvmat
+%% store the root name for future opening of uvmat
 dir_perso=prefdir;
 profil_perso=fullfile(dir_perso,'uvmat_perso.mat');
@@ -1088 +1092 @@
 %------------------------------------------------------------------------
 %% Read parameters from series
-Series=read_GUI(handles.series)%TODO: extend to all input param
+Series=read_GUI(handles.series);%TODO: extend to all input param
 Series.hseries=handles.series; % handles to the series GUI
 
@@ -1272 +1276 @@
 %% RUN ACTION
 Series.Action=action;%name of the processing programme
-Series
 set(handles.RUN,'BackgroundColor',[0.831 0.816 0.784])
 h_fun(Series);
@@ -1344 +1347 @@
 mode=mode_list{mode_value};
 SeriesData=get(handles.series,'UserData');
-%NomTypeCell=get(handles.NomType,'String');
-NomTypeCell=SeriesData.NomType;
-if ~isempty(NomTypeCell)
-Val=get(handles.NomType,'Value');
-NomType=NomTypeCell{Val};
-% for ilist=1:length(NomType)
-    if isequal(NomType,'_1_1-2')|| isequal(NomType,'_1-2_1')|| isequal(NomType,'_1-2')
-        if isequal(mode,'series(Di)') 
-            find_netcpair_civ(handles,Val);% update the menu of pairs depending on the available netcdf files
-%             break
-        end
+if ~isempty(SeriesData.i2_series)||~isempty(SeriesData.j2_series)
+    if isequal(mode,'series(Di)') 
+        find_netcpair_civ(handles,Val);% update the menu of pairs depending on the available netcdf files
     end
 end
@@ -1365 +1360 @@
 mode=mode_list{mode_value};
 SeriesData=get(handles.series,'UserData');
-NomTypeCell=SeriesData.NomType;
-if ~isempty(NomTypeCell)
-    Val=get(handles.NomType,'Value');
-    NomType=NomTypeCell{Val};
-    if isequal(NomType,'_1_1-2')|| isequal(NomType,'_1-2_1')|| isequal(NomType,'_1-2')
-        if isequal(mode,'series(Dj)') 
-            find_netcpair_civ(handles,Val);% update the menu of pairs depending on the available netcdf files
-        end
-    end
-end
+if ~isempty(SeriesData.i2_series)||~isempty(SeriesData.j2_series)
+    if isequal(mode,'series(Di)') 
+        find_netcpair_civ(handles,Val);% update the menu of pairs depending on the available netcdf files
+    end
+end
+% NomTypeCell=SeriesData.NomType;
+% if ~isempty(NomTypeCell)
+%     Val=get(handles.NomType,'Value');
+%     NomType=NomTypeCell{Val};
+%     if isequal(NomType,'_1_1-2')|| isequal(NomType,'_1-2_1')|| isequal(NomType,'_1-2')
+%         if isequal(mode,'series(Dj)') 
+%             find_netcpair_civ(handles,Val);% update the menu of pairs depending on the available netcdf files
+%         end
+%     end
+% end
 
 %------------------------------------------------------------------------
@@ -1497 +1497 @@
 % FileExt=get(handles.FileExt,'String');
 % nb_series=length(FileExt);
-InputFiles=get(handles.InputTable,'Data')
-FileExt=InputFiles(:,5);
-checkcell=find(cellfun('isempty',FileExt)~=0);
-nb_series=0;
-if ~isempty(checkcell)
-nb_series=checkcell(end);
-end
+InputTable=get(handles.InputTable,'Data');
+nb_series=size(InputTable,1);
+% if ~isempty(checkcell)
+% nb_series=checkcell(end);
+% end
 % nb_series=size(InputFiles,1)
 testima_series=1; %test for a list of images only
@@ -1510 +1508 @@
 testciv_series=1;
 for iview=1:nb_series
-     ext=FileExt{iview};
+     ext=InputTable{iview,5};
     if length(ext)<2
         ext='.none';
@@ -1527 +1525 @@
 for ilist=1:length(varargout)-1
     switch varargout{ilist}
+
                        %RootFile always visible
 %          case 'RootPath'   %visible by default
@@ -1559 +1558 @@
             end
         case 'VelTypeMenu'   %hidden by default
-            if isequal(lower(varargout{ilist+1}),'one') || isequal(lower(varargout{ilist+1}),'two')
+             if isequal(lower(varargout{ilist+1}),'one') || isequal(lower(varargout{ilist+1}),'two')
                 set(handles.VelTypeMenu,'Enable','on')
                 if nb_series >=1 && ~testima_series
                     set(handles.VelTypeMenu,'Visible','on')
                     set(handles.VelType_text,'Visible','on');
-                    set(handles.Field_frame,'Visible','on')
+%                     set(handles.Field_frame,'Visible','on')
                 end
-            end
+             end
             if isequal(lower(varargout{ilist+1}),'two')
                 set(handles.VelTypeMenu_1,'Enable','on')
@@ -2146 +2145 @@
         %fileinput=name_generator(fullfile(InputLine{1},InputLine{3}),1,1,InputLine{5},InputLine{4},1,2,2,InputLine{2})
         %update file series defined by the selected line
-        [InputTable{ind_list,1},InputTable{ind_list,3},InputTable{(ind_list),4},errormsg]=update_indices(handles,fileinput,ind_list);
+        [InputTable{ind_list,3},InputTable{(ind_list),4},errormsg]=update_indices(handles,fileinput,ind_list);
         if ~isempty(errormsg)
                 msgbox_uvmat('ERROR',errormsg)
@@ -2184 +2183 @@
     ListView_Callback(hObject,eventdata,handles)
 end
-set(handles.Pairs,'Visible',state_InputFields)
+set(handles.Pairs,'Visible',state_Pairs)
 enable_j(handles,state_j)
 set(handles.REFRESH_INDICES,'BackgroundColor',[1 0 0])
 set(handles.REFRESH_INDICES,'visible','off')
 
-% update min and max indices for a series
-function [RootPath,RootFile,NomType,errormsg]=update_indices(handles,fileinput,iview)
-
+% -----------------------------------------------------------------------
+% --- Update min and max indices of a file series by scanning with find_file_series
+% --- which also changes the root file and NomType in case of movie. Also adjust the string representation of indices (e.g;
+% --- 1 or 001 by the function find_file_series
+% --- This function also dispaly the set of availbale files in the series
+% --- and the menus appropriate to the file type as well as timing possibly set
+% --- by an xml image documentation file
+function [RootFile,NomType,errormsg]=update_indices(handles,fileinput,iview)
+% -----------------------------------------------------------------------
 %% look for min and max indices existing in the file series and update SeriesData
 errormsg='';
-[RootPath,FileName,FileExt]=fileparts(fileinput);
-[RootFile,i1_series,i2_series,j1_series,j2_series,NomType,FileType,Object]=find_file_series(RootPath,[FileName FileExt]);
+[RootPathSub,FileName,FileExt]=fileparts(fileinput);
+[RootFile,i1_series,i2_series,j1_series,j2_series,NomType,FileType,Object]=find_file_series(RootPathSub,[FileName FileExt]);
 if isempty(RootFile)&&isempty(i1_series)
     errormsg='no input file in the series';
@@ -2229 +2234 @@
 SeriesData.FileType{iview}=FileType;
 
-%% represents the set of existing files as an image
+%% display the set of existing files as an image
 set(handles.waitbar_frame,'Units','pixels')
 pos=get(handles.waitbar_frame,'Position');
@@ -2259 +2264 @@
 testveltype_1=isequal(get(handles.VelTypeMenu_1,'enable'),'on');
 testtransform=isequal(get(handles.transform_fct,'Enable'),'on');
-testnc=0;
-testnc_1=0;
-testcivx=0;
-testcivx_1=0;
+% testnc=0;
+% testnc_1=0;
+% testcivx=0;
+% testcivx_1=0;
+% testima=0; %test for image input
+% if isequal(lower(FileExt),'.avi') %.avi file
+%     testima=1;
+% elseif ~isempty(imformats(FileExt(2:end))) 
+%     testima=1;
+% elseif isequal(FileExt,'.vol')
+%      testima=1;
+% end
 %TODO: update
 % if length(FileExtCell)==1 || length(FileExtCell)>2
@@ -2279 +2292 @@
 %     testcivx_1=isequal(FileTypeCell{2},'civx');
 % end
-if testfield && testnc 
+switch FileType
+    case {'civx','civdata'}
     view_FieldMenu(handles,'on')
-    if testcivx
-        menustr=get(handles.FieldMenu,'String');
-        if isequal(menustr,{'get_field...'})
-            set(handles.FieldMenu,'String',{'get_field...';'velocity';'vort';'div';'more...'})
-        end
-    else
-        set(handles.FieldMenu,'Value',1)
-        set(handles.FieldMenu,'String',{'get_field...'}) 
-    end
-else
+    menustr=get(handles.FieldMenu,'String');
+    if isequal(menustr,{'get_field...'})
+        set(handles.FieldMenu,'String',{'get_field...';'velocity';'vort';'div';'more...'})
+    end
+    set(handles.VelTypeMenu,'Visible','on')
+    set(handles.FieldTransform,'Visible','on')
+    %      view_TRANSFORM(handles,'on')
+    %     TODO: second menu
+    %           view_FieldMenu_1(handles,'on')
+    %     if testcivx_1
+    %         menustr=get(handles.FieldMenu_1,'String');
+    %         if isequal(menustr,{'get_field...'})
+    %             set(handles.FieldMenu_1,'String',{'get_field...';'velocity';'vort';'div';'more...'})
+    %         end
+    %     else
+    %         set(handles.FieldMenu_1,'Value',1)
+    %         set(handles.FieldMenu_1,'String',{'get_field...'})
+    %     set(handles.VelTypeMenu_1,'Visible','on')
+    %     set(handles.VelType_text_1,'Visible','on');
+    %     end
+    %     view_FieldMenu_1(handles,'off')
+    case 'netcdf'
+    view_FieldMenu(handles,'on')
+    set(handles.FieldMenu,'Value',1)
+    set(handles.FieldMenu,'String',{'get_field...'})
+    set(handles.FieldTransform,'Visible','off')
+    %     view_TRANSFORM(handles,'off')
+    case {'image','multimage','video'}
     view_FieldMenu(handles,'off')
-end
-if testfield_1 && testnc_1
-    view_FieldMenu_1(handles,'on')
-    if testcivx_1
-        menustr=get(handles.FieldMenu_1,'String');
-        if isequal(menustr,{'get_field...'})
-            set(handles.FieldMenu_1,'String',{'get_field...';'velocity';'vort';'div';'more...'})
-        end
-    else
-        set(handles.FieldMenu_1,'Value',1)
-        set(handles.FieldMenu_1,'String',{'get_field...'}) 
-    end
-else
     view_FieldMenu_1(handles,'off')
-end
-if testveltype && testcivx
-    set(handles.VelTypeMenu,'Visible','on')
-    set(handles.VelType_text,'Visible','on');
-else
     set(handles.VelTypeMenu,'Visible','off')
     set(handles.VelType_text,'Visible','off');
 end
-if testveltype_1 && testcivx_1
-    set(handles.VelTypeMenu_1,'Visible','on')
-    set(handles.VelType_text_1,'Visible','on');
-else
-    set(handles.VelTypeMenu_1,'Visible','off')
-    set(handles.VelType_text_1,'Visible','off');
-end
-if testtransform && (testcivx || testima)
-    set(handles.FieldTransform,'Visible','on')
-%      view_TRANSFORM(handles,'on')
-else
-    set(handles.FieldTransform,'Visible','off')
-%     view_TRANSFORM(handles,'off')
-end
+
+
 %TODO:update
 % if ~isequal(FileExt,'.nc') && ~isequal(FileExt,'.cdf') && ~testima
@@ -2336 +2338 @@
 %%  read image documentation file  if found%%%%%%%%%%%%%%%%%%%%%%%%%%%
 ext_imadoc='';
-FileBase=fullfile(RootPath,RootFile);
+FileBase=fullfile(RootPathSub,RootFile);
 if isequal(FileExt,'.xml')||isequal(FileExt,'.civ')
     ext_imadoc=FileExt;