Changeset 187 for trunk/src/proj_field.m

Timestamp:

Feb 1, 2011, 1:07:28 AM (13 years ago)

Author:

sommeria

Message:

various bug repairs

File:

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

trunk/src/proj_field.m

@@ -139 +139 @@
 end
 
-
 %-----------------------------------------------------------------
 %project on a set of points
@@ -346 +345 @@
                 ProjData.X(ipoint,1)=ObjectData.Coord(ipoint,1);
                 ProjData.Y(ipoint,1)=ObjectData.Coord(ipoint,2);
-                i_int=[i_min:i_plus];
-                j_int=[j_min:j_plus];
+                i_int=(i_min:i_plus);
+                j_int=(j_min:j_plus);
                 ProjData.NbVal(ipoint,1)=length(j_int)*length(i_int);
-                if isempty(i_int) | isempty(j_int)
+                if isempty(i_int) || isempty(j_int)
                    for ivar=VarIndex   
                         eval(['ProjData.' FieldData.ListVarName{ivar} '(ipoint,:)=NaN;']);
@@ -387 +386 @@
 ProjData.ListVarName={};
 ProjData.VarDimName={};
+ProjData.VarAttribute={};
 
 Mesh=zeros(1,numel(FieldData.ListVarName));
 if isfield (FieldData,'VarAttribute')
-    ProjData.VarAttribute=FieldData.VarAttribute;%list of variable attribute names
-    for iattr=1:length(ProjData.VarAttribute)%initialization of variable attribute values
+    %ProjData.VarAttribute=FieldData.VarAttribute;%list of variable attribute names
+    for iattr=1:length(FieldData.VarAttribute)%initialization of variable attribute values
 %         ProjData.VarAttribute{iattr}={};
-        if isfield(ProjData.VarAttribute{iattr},'Unit')
-            unit{iattr}=ProjData.VarAttribute{iattr}.Unit;
-        end
-        if isfield(ProjData.VarAttribute{iattr},'Mesh')
-            Mesh(iattr)=ProjData.VarAttribute{iattr}.Mesh;
+        if isfield(FieldData.VarAttribute{iattr},'Unit')
+            unit{iattr}=FieldData.VarAttribute{iattr}.Unit;
+        end
+        if isfield(FieldData.VarAttribute{iattr},'Mesh')
+            Mesh(iattr)=FieldData.VarAttribute{iattr}.Mesh;
         end
     end
@@ -549 +549 @@
                 eval(['ProjData.' VarName 'Histo=hist(double(FieldData.' VarName '(indsel,:)),ProjData.' VarName ');']); % histogram at predefined bin positions
             end
-            ProjData.ListVarName=[ProjData.ListVarName {VarName} {[VarName 'Histo']} {[VarName 'Mean']}];
+            ProjData.ListVarName=[ProjData.ListVarName {VarName} {[VarName 'Histo']} {[VarName 'Mean']} {[VarName 'Min']} {[VarName 'Max']}];
             if test_Amat && testcolor
                  ProjData.VarDimName=[ProjData.VarDimName  {VarName} {{VarName,'rgb'}} {'rgb'}];%{{'nb_point','rgb'}};
             else
-               ProjData.VarDimName=[ProjData.VarDimName {VarName} {VarName} {'nbpoint'}];
-            end
+               ProjData.VarDimName=[ProjData.VarDimName {VarName} {VarName} {'nbpoint'} {'nbpoint'} {'nbpoint'}];
+            end
+            ProjData.VarAttribute=[ProjData.VarAttribute FieldData.VarAttribute{ivar} {[]} {[]} {[]} {[]}];
         end
     end 
@@ -2076 +2077 @@
                             eval(['ProjData.' VarName '=squeeze(FieldData.' VarName '(iz,:,:));'])% select the z index iz
                             %TODO : do a vertical average for a thick plane
-                            if test_interp(2) | test_interp(3)
+                            if test_interp(2) || test_interp(3)
                                 eval(['ProjData.' VarName '=interp2(Coord{3},Coord{2},ProjData.' VarName ',Coord_x,Coord_y'');']) 
                             end