Changeset 546 for trunk/src/proj_field.m

Timestamp:

Sep 17, 2012, 10:47:38 PM (12 years ago)

Author:

sommeria

Message:

bugs corrected for tps projection on a grid + pb of colorbar display solved

File:

• trunk/src/proj_field.m (modified) (14 diffs)

trunk/src/proj_field.m

@@ -149 +149 @@
 ProjData.NbDim=0;
 [CellInfo,NbDimArray,errormsg]=find_field_cells(FieldData);
-%[CellVarIndex,NbDimCell,VarTypeCell,errormsg]=find_field_cells(FieldData);
 if ~isempty(errormsg)
     errormsg=['error in proj_field/proj_points:' errormsg];
@@ -160 +159 @@
     end
     VarIndex=CellInfo{icell}.VarIndex;%  indices of the selected variables in the list FieldData.ListVarName
-   % VarType=CellInfo{icell}.VarType;% structure defining the types of variables in the cell
     ivar_X=CellInfo{icell}.CoordIndex(end);
     ivar_Y=CellInfo{icell}.CoordIndex(end-1);
@@ -167 +165 @@
         ivar_Z=CellInfo{icell}.CoordIndex(1);
     end
-%     ivar_rem=[];
-%     if isfield(CellInfo{icell},'VarIndex_ancillary')
-%         ivar_rem=CellInfo{icell}.VarIndex_ancillary;
-%     end
-%     if isfield(CellInfo{icell},'VarIndex_warnflag')
-%         ivar_rem=[ivar_rem CellInfo{icell}.VarIndex_warnflag];
-%     end
     ivar_FF=[];
     if isfield(CellInfo{icell},'VarIndex_errorflag')
@@ -181 +172 @@
             return
         end
-    end
-%     
+    end    
     % select types of  variables to be projected
    ListProj={'VarIndex_scalar','VarIndex_image','VarIndex_color','VarIndex_vector_x','VarIndex_vector_y'};
@@ -550 +540 @@
 
 %% group the variables (fields of 'FieldData') in cells of variables with the same dimensions
-%[CellVarIndex,NbDim,VarTypeCell,errormsg]=find_field_cells(FieldData);
 [CellInfo,NbDim,errormsg]=find_field_cells(FieldData);
 if ~isempty(errormsg)
@@ -561 +550 @@
 ProjData.VarDimName={};
 for icell=1:length(CellInfo)
-    %VarIndex=CellInfo{icell}.VarIndex;%  indices of the selected variables in the list FieldData.ListVarName
-   % VarType=VarTypeCell{icell}; %types of variables
     if NbDim(icell)~=2% proj_line acts only on fields of space dimension 2, TODO: check 3D case
         continue
@@ -722 +709 @@
         else
             test_Amat=1;%image or 2D matrix
-            test_interp2=0;%default
-%             if ~isempty(VarType.coord_y)  
+            test_interp2=0;%default 
             AYName=FieldData.ListVarName{CellInfo{icell}.CoordIndex(end-1)};
             AXName=FieldData.ListVarName{CellInfo{icell}.CoordIndex(end)};
@@ -985 +971 @@
 
 %% group the variables (fields of 'FieldData') in cells of variables with the same dimensions
-% CellVarIndex=cells of variable index arrays
-%[CellVarIndex,NbDimVec,VarTypeCell,errormsg]=find_field_cells(FieldData);
 [CellInfo,NbDimArray,errormsg]=find_field_cells(FieldData);
 if ~isempty(errormsg)
@@ -1043 +1027 @@
         ivar_V=CellInfo{icell}.VarIndex_vector_y;
     end
-%     if ~isempty(VarType.vector_x_tps)&&~isempty(VarType.vector_y_tps)
-%         ivar_U=VarType.vector_x_tps;
-%         ivar_V=VarType.vector_y_tps;
-%     end
     if isfield(CellInfo{icell},'VarIndex_vector_z')
-    ivar_W=CellInfo{icell}.VarIndex_vector_z;
-    end
-%     %type of coordinates
-%     if ~isempty(VarType.coord_x) && ~isempty(VarType.coord_y)
-%         CoordType='unstructured';
-%     elseif ~isempty(VarType.coord_tps)
-%         CoordType='tps';
-%     else
-%         CoordType='structured';
-%     end
-%     
+        ivar_W=CellInfo{icell}.VarIndex_vector_z;
+    end
     %dimensions
     DimCell=FieldData.VarDimName{VarIndex(1)};
@@ -1203 +1174 @@
                     if isfield(CellInfo{icell},'VarIndex_scalar')
                         VarName_scalar=FieldData.ListVarName{CellInfo{icell}.VarIndex_scalar};
-                        if ~isempty(VarType.errorflag)
+                        if isfield(CellInfo{icell},'errorflag') && ~isempty(CellInfo{icell}.errorflag)
                             FieldData.(VarName_scalar)=FieldData.(VarName_scalar)(indsel);
                         end
@@ -1236 +1207 @@
         case 'tps'
             if strcmp(ProjMode{icell},'filter')
-                Coord=FieldData.(FieldData.ListVarName{VarType.coord_tps});
-                NbSites=FieldData.(FieldData.ListVarName{VarType.nbsites_tps});
-                SubRange=FieldData.(FieldData.ListVarName{VarType.subrange_tps});
-                if isfield(VarType,'vector_x_tps')&&isfield(VarType,'vector_y_tps')
-                    FieldVar=cat(3,FieldData.(FieldData.ListVarName{VarType.vector_x_tps}),FieldData.(FieldData.ListVarName{VarType.vector_y_tps}));
+                Coord=FieldData.(FieldData.ListVarName{CellInfo{icell}.CoordIndex});
+                NbSites=FieldData.(FieldData.ListVarName{CellInfo{icell}.NbSite_tps});
+                SubRange=FieldData.(FieldData.ListVarName{CellInfo{icell}.SubRange_tps});
+                if isfield(CellInfo{icell},'VarIndex_vector_x_tps')&&isfield(CellInfo{icell},'VarIndex_vector_y_tps')
+                    FieldVar=cat(3,FieldData.(FieldData.ListVarName{CellInfo{icell}.VarIndex_vector_x_tps}),FieldData.(FieldData.ListVarName{CellInfo{icell}.VarIndex_vector_y_tps}));
                 end
                 coord_x_proj=XMin:DX:XMax;
@@ -1249 +1220 @@
                 XI=XI+ObjectData.Coord(1,1);
                 YI=YI+ObjectData.Coord(1,2);
-                [DataOut,VarAttribute,errormsg]=calc_field_tps(Coord,NbSites,SubRange,FieldVar,VarType.Operation,cat(3,XI,YI));   
+                [DataOut,VarAttribute,errormsg]=calc_field_tps(Coord,NbSites,SubRange,FieldVar,CellInfo{icell}.Operation,cat(3,XI,YI));   
                 ListFieldProj=(fieldnames(DataOut))';
                 VarDimName=cell(size(ListFieldProj));
@@ -1509 +1480 @@
                         end
                         %filter the field (image) if option 'filter' is used
-                        if test_filter
-                            Aclass=class(FieldData.A);
-                            eval(['ProjData.' VarName '=filter2(Mfilter,FieldData.' VarName ',''valid'');'])
-                            if ~isequal(Aclass,'double')
-                                eval(['ProjData.' VarName '=' Aclass '(FieldData.' VarName ');'])%revert to integer values
-                            end
-                        end
+%                         if test_filter
+%                             Aclass=class(FieldData.A);
+%                             eval(['ProjData.' VarName '=filter2(Mfilter,FieldData.' VarName ',''valid'');'])
+%                             if ~isequal(Aclass,'double')
+%                                 eval(['ProjData.' VarName '=' Aclass '(FieldData.' VarName ');'])%revert to integer values
+%                             end
+%                         end
                         eval(['vec_A=reshape(FieldData.' VarName ',[],nbcolor);'])%put the original image in line
                         %ind_in=find(flagin);
@@ -1702 +1673 @@
 %-----------------------------------------------------------------
 idimvar=0;
-% [CellVarIndex,NbDimVec,VarTypeCell,errormsg]=find_field_cells(FieldData);
-% if ~isempty(errormsg)
-%     errormsg=['error in proj_field/proj_plane:' errormsg];
-%     return
-% end
-
 % LOOP ON GROUPS OF VARIABLES SHARING THE SAME DIMENSIONS
 % CellVarIndex=cells of variable index arrays