Changeset 188

Timestamp:

Feb 2, 2011, 1:22:05 AM (13 years ago)

Author:

sommeria

Message:

various bug repairs and cleaning

Location:

trunk/src

Files:

• civ.fig (modified) (previous)
• civ.m (modified) (4 diffs)
• get_field.m (modified) (2 diffs)
• nc2struct.m (modified) (1 diff)
• plot_field.m (modified) (1 diff)
• series.m (modified) (3 diffs)
• uvmat.fig (modified) (previous)

trunk/src/civ.m

@@ -4625 +4625 @@
     hwaitbar=uicontrol('Style','frame','Units','normalized', 'Position',BarPosition ,'BackgroundColor',[1 0 0],'tag','waitbar');
 end
-datnum=[];
+% datnum=[];
 Tabchar={};
 nbfiles=numel(civ_files);
 count=0;
+testrecent=0;
 while count<nbfiles
     count=0;
+    datnum=zeros(1,nbfiles);
     for ifile=1:nbfiles
         detect=exist(civ_files{ifile},'file'); % check the existence of the file
@@ -4637 +4639 @@
             option_str='not created';
         else
-            datfile=dir(civ_files{ifile});
-            datnum(ifile)=datenum(datfile.date);
+            datfile=dir(civ_files{ifile})
+            if isfield(datfile,'datenum')
+                datnum(ifile)=datfile.datenum;%only available in recent matlab versions
+                testrecent=1;
+            end
             filefound(ifile)={datfile.name};
             lastfield='';
@@ -4669 +4674 @@
         Tabchar{ifile,1}=[fullfile([subdir extdir],filename) ext  '...' option_str];
     end
-    if isempty(datnum)
-         message='no civ result created yet';
+    datnum=datnum(find(datnum));%keep the non zero values corresponding to existing files
+    if isempty(datnum) 
+        if testrecent
+            message='no civ result created yet';
+        else
+            message='';
+        end
     else
         datnum=datnum(find(datnum));%keep the non zero values corresponding to existing files
@@ -4708 +4718 @@
      ind_dot=findstr(filename,'...');
      filename=filename(1:ind_dot-1);
-      filename=fullfile(rootroot,filename)
+      filename=fullfile(rootroot,filename);
       if exist(filename,'file')%visualise the vel field if it exists
         %[Field,VelTypeOut]=read_civxdata(filename);

trunk/src/get_field.m

@@ -810 +810 @@
     huvmat=findobj(allchild(0),'tag','uvmat');
     if isempty(huvmat)
-        inputfile=get(handles.inputfile,'String');
         uvmat(inputfile)
     else
@@ -830 +829 @@
     browse_fig(handles.list_fig); %update the list of new existing figures
 end
+set(handles.RUN,'BackgroundColor',[1 0 0])
 
 %------------------------------------------------------------------------

trunk/src/nc2struct.m

@@ -103 +103 @@
         indstr1=regexp(keystr,'\\','once');%detect '\\'
         indstr2=regexp(keystr,'\.','once');%detect '\.'
-        if isempty(indstr1) && isempty(indstr2)
+        %indtitle=regexp(keystr,'title','once');%detect 'title'(bad characters)
+        if isempty(indstr1) && isempty(indstr2)%&&isempty(indtitle)
            valuestr = netcdf.getAtt(nc,netcdf.getConstant('NC_GLOBAL'),keystr);
-           if ischar(valuestr) && length(valuestr)<200
+           if ischar(valuestr) & length(valuestr)<200 & double(valuestr)<=122 & double(valuestr)>=48 %usual characters
                 iatt_g=iatt_g+1;
                 indstr1=regexp(keystr,'\\','once');%detect '\\'

trunk/src/plot_field.m

@@ -239 +239 @@
 tagaxes=get(haxes,'tag');
 if isfield(FigData,tagaxes)
-    eval(['FigData.' tagaxes '=Data'])
+    eval(['FigData.' tagaxes '=Data;'])
     set(hfig,'UserData',FigData)
 end

trunk/src/series.m

@@ -1015 +1015 @@
 ref_i=str2num(get(handles.ref_i,'String'));
 ref_j=str2num(get(handles.ref_j,'String'));
-% time=[];
-% ref_time=[];
- ref_time=0;
-% if isfield(SeriesData,'Time')&~isempty(SeriesData.Time{Val})&~isequal(SeriesData.Time{Val},0)
-%     time=SeriesData.Time{Val}; %get the set of times
-%     siztime=size(time);
-%     nbfield=siztime(1);
-%     nbfield2=siztime(2);
-% %     test_imadoc=1;
-% else
-%     test_imadoc=0;%no image documentation file
-    nbfield=50;
-    nbfield2=50;%default max number of pairs
-% end
+ref_time=0;
+nbfield=50;
+nbfield2=50;%default max number of pairs
+
 %look for existing processed pairs involving the field at the middle of the series if civ1 will not 
 % be performed, while the result is needed for next steps.
@@ -1041 +1031 @@
 end
 if strcmp(mode,'series(Di)') 
-    nbfield
      for index=1:min(nbfield-1,50)
          filename=name_generator(filebase,ref_i-floor(index/2),ref_j,'.nc',NomType,1,ref_i+ceil(index/2),ref_j,subdir);
@@ -1079 +1068 @@
                 displ_num(3,ind_exist)=0;
                 displ_num(4,ind_exist)=0;
-                %[cte_detect,vdt,cte_read]=read_netcdf(filename,{'dt','dt2','absolut_time_T0','absolute_time_TO_2'});
                 [Cte,var_detect,ichoice]=nc2struct(filename,{});
                 if isfield(Cte,'dt2')