Changeset 107 for trunk/src/series

Timestamp:

Jul 26, 2010, 11:20:39 PM (14 years ago)

Author:

sommeria

Message:

aver_stat and time_series: bug repairs for reading images, for time series, the projection of images on a line now works
get_field: various bug repairs, export field on work space activated
struct2nc and struct2nc_toolbox.m: small bug repaired
nomtype2pair: test on string input introduced to avoid error
cell2tab: test on multiline input introduced
civ: pb about cell repair (bug with recent versions of matlab)

Location:

trunk/src/series

Files:

• aver_stat.m (modified) (2 diffs)
• time_series.m (modified) (9 diffs)

trunk/src/series/aver_stat.m

@@ -323 +323 @@
                             A=imread(filename);
                     end 
-                    Data{iview}.ListVarName={'coord_y','coord_x','A'}; % 
+                    Data{iview}.ListVarName={'AY','AX','A'}; % 
                     Atype{iview}=class(A);
                     npy=size(A,1);
@@ -329 +329 @@
                     nbcolor=size(A,3);
                     if nbcolor==3
-                         Data{iview}.VarDimName={'coord_y','coord_x',{'coord_y','coord_x','rgb'}};
+                         Data{iview}.VarDimName={'AY','AX',{'AY','AX','rgb'}};
                     else
-                         Data{iview}.VarDimName={'coord_y','coord_x',{'coord_y','coord_x'}};
+                         Data{iview}.VarDimName={'AY','AX',{'AY','AX'}};
                     end  
-                    Data{iview}.coord_y=[npy-0.5 0.5];
-                    Data{iview}.coord_x=[0.5 npx-0.5];
+                    Data{iview}.AY=[npy-0.5 0.5];
+                    Data{iview}.AX=[0.5 npx-0.5];
                     Data{iview}.A=double(A);
                     Data{iview}.CoordType='px';

trunk/src/series/time_series.m

@@ -186 +186 @@
 end
 
-% Root name of output files (TO GENERALISE FOR TWO INPUT SERIES)
-% filebasesub=fullfile(RootPath{1},RootFile{1});
-% if NbSlice==1
-%     filebase_out=[filebasesub '_time'];
-% else
-%     filebase_out=[filebasesub '_' NbSlice_name 'mtim'];
-%     increment=num_i1{1}(2)-num_i1{1}(1);
-%     if ~isequal(increment,1) % if an increment is set
-%         answeryes=msgbox_uvmat('INPUT_Y-N',['will take time series in ' num2str(NbSlice) 'slices with increment = ' num2str(increment) '!']); 
-%     else    
-%         answeryes=msgbox_uvmat('INPUT_Y-N',{['will take time series in ' num2str(NbSlice) ' slices'];['results stored as files ' filebase_out ' ...']});
-%     end
-%     if ~isequal(answeryes,'Yes')
-%         return
-%     end
-% end
 VelType_str=get(hseries.VelTypeMenu,'String');
 VelType_val=get(hseries.VelTypeMenu,'Value');
@@ -288 +272 @@
 % Root name of output files (TO GENERALISE FOR TWO INPUT SERIES)
 subdir_result='time_series';
-% filebasesub=fullfile(RootPath{1},subdir_result,RootFile{1});
-% if isempty(SubDir{1}) % create a subdirectory '/aver_stat'
-%     subdir_result='aver_stat';
-%     filebasemean=fullfile(RootPath{1},subdir_result);
 if ~exist(fullfile(RootPath{1},subdir_result),'dir')
     dircur=pwd; %record current working directory
@@ -351 +331 @@
                             A=imread(filename);
                     end 
-                    Data{iview}.ListVarName={'coord_y','coord_x','A'}; % 
+                    Data{iview}.ListVarName={'AY','AX','A'}; % 
                     npy=size(A,1);
                     npx=size(A,2);
                     nbcolor=size(A,3);
                     if nbcolor==3
-                         Data{iview}.VarDimName={'coord_y','coord_x',{'coord_y','coord_x','rgb'}};
+                         Data{iview}.VarDimName={'AY','AX',{'AY','AX','rgb'}};
                     else
-                         Data{iview}.VarDimName={'coord_y','coord_x',{'coord_y','coord_x'}};
+                         Data{iview}.VarDimName={'AY','AX',{'AY','AX'}};
                     end  
-                    Data{iview}.coord_y=[npy-0.5 0.5];
-                    Data{iview}.coord_x=[0.5 npx-0.5];
+                    Data{iview}.AY=[npy-0.5 0.5];
+                    Data{iview}.AX=[0.5 npx-0.5];
                     Data{iview}.A=double(A);
                     Data{iview}.CoordType='px';
@@ -426 +406 @@
                         for ivar=1:nbvar
                             if length(Field.VarAttribute)>=ivar && isfield(Field.VarAttribute{ivar},'Role')
+                               %Field.ListVarName{ivar}
                                 var_role=Field.VarAttribute{ivar}.Role;%'role' of the variable
                                 if isequal(var_role,'errorflag')
@@ -439 +420 @@
                                     testsum(ivar)=1; %constant coordinates, record without time evolution
                                 end
-                                % check whether the variable ivar is a dimension variable
-                                DimCell=Field.VarDimName{ivar};
-                                if ischar(DimCell)
-                                    DimCell={DimCell};
-                                end
-                                if numel(DimCell)==1 && isequal(Field.ListVarName{ivar},DimCell{1})%detect dimension variables
-                                   testsum(ivar)=1;
-                                end
+                            end
+                            % check whether the variable ivar is a dimension variable
+                            DimCell=Field.VarDimName{ivar};
+                            if ischar(DimCell)
+                                DimCell={DimCell};
+                            end
+                            if numel(DimCell)==1 && isequal(Field.ListVarName{ivar},DimCell{1})%detect dimension variables
+                               testsum(ivar)=1;
                             end
                         end
@@ -506 +487 @@
     end
         % add time dimension and update VarDimIndex:
-   %if ~isequal(Series.ProjObject.ProjMode,'inside')% take the average in the domain for 'inside' mode
         for ivar=1:length(Field.ListVarName)
-%              vardimindex=Field.VarDimIndex{ivar};% array of dimension indices for variable VarIndex(ivar)
              DimCell=Field.VarDimName(ivar);
              if testsum(ivar)==2%variable used as time series
-%                  RecordData.VarDimIndex{ivar}=[1 vardimindex+1];
                   RecordData.VarDimName{ivar}=[{'Time'} DimCell];
              elseif testsum(ivar)==1
-%                  RecordData.VarDimIndex{ivar}=[vardimindex+1];
                  RecordData.VarDimName{ivar}=DimCell;
              end
         end
-   % end
     indexremove=find(~testsum);
     if ~isempty(indexremove)
@@ -527 +503 @@
         end
     end
-    %RecordData.VarDimIndex=[{[1]} RecordData.VarDimIndex]; %time dimension
+
     %shift variable attributes
     if isfield(RecordData,'VarAttribute')
@@ -534 +510 @@
     RecordData.VarDimName=[{'Time'} RecordData.VarDimName];
     RecordData.Action=Series.Action;%name of the processing programme
+    
     %name of result file
     [filemean]=...
@@ -544 +521 @@
     end
 end
+
 figure
 haxes=axes;