Changeset 517 for trunk/src/plot_field.m

Timestamp:

Aug 17, 2012, 11:47:16 PM (11 years ago)

Author:

sommeria

Message:

various bugs corrected. get_field now used in a passive way from uvmat: variable names are transferred from get_field to uvmat.

File:

• trunk/src/plot_field.m (modified) (3 diffs)

trunk/src/plot_field.m

@@ -540 +540 @@
 for icell=1:length(CellVarIndex) % length(CellVarIndex) =1 or 2 (from the calling function)
     VarType=VarTypeCell{icell};
-    if ~isempty(VarType.coord_tps)
+    if ~isempty(VarType.coord_tps) %do not plot directly tps data (used for projection only)
         continue
     end
@@ -566 +566 @@
             vec_U=Data.(Data.ListVarName{ivar_U}); 
             vec_V=Data.(Data.ListVarName{ivar_V});
-            if ~isempty(ivar_X) && ~isempty(ivar_Y)% 2D field (with unstructured coordinates or structured ones (then ivar_X and ivar_Y empty)
+            if ~isempty(ivar_X) && ~isempty(ivar_Y)% 2D field with unstructured coordinates 
                 XName=Data.ListVarName{ivar_X};
                 YName=Data.ListVarName{ivar_Y};
-                eval(['vec_X=reshape(Data.' XName ',[],1);']) 
-                eval(['vec_Y=reshape(Data.' YName ',[],1);'])
+                vec_X=reshape(Data.(XName),[],1); %transform vectors in column matlab vectors
+                vec_Y=reshape(Data.(YName),[],1);
             elseif numel(VarType.coord)==2 && ~isequal(VarType.coord,[0 0]);%coordinates defines by dimension variables
-                eval(['y=Data.' Data.ListVarName{VarType.coord(1)} ';']) 
-                eval(['x=Data.' Data.ListVarName{VarType.coord(2)} ';'])
+                y=Data.(Data.ListVarName{VarType.coord(1)});
+                x=Data.(Data.ListVarName{VarType.coord(2)});
                 if numel(y)==2 % y defined by first and last values on aregular mesh
                     y=linspace(y(1),y(2),size(vec_U,1));
@@ -585 +585 @@
                 return
             end
-            if ~isempty(ivar_C)
-                 eval(['vec_C=Data.' Data.ListVarName{ivar_C} ';']) ;
-                 vec_C=reshape(vec_C,1,numel(vec_C));
+            if isfield(PlotParam.Vectors,'ColorScalar') && ~isempty(PlotParam.Vectors.ColorScalar)
+                [VarVal,ListVarName,VarAttribute,errormsg]=calc_field_interp([],Data,PlotParam.Vectors.ColorScalar);
+%             if ~isempty(ivar_C)
+                 %vec_C=Data.(Data.ListVarName{ivar_C});
+                 if ~isempty(VarVal)
+                 vec_C=reshape(VarVal{1},1,numel(VarVal{1}));
                  test_C=1;
+                 end
             end
             if ~isempty(ivar_F)%~(isfield(PlotParam.Vectors,'HideWarning')&& isequal(PlotParam.Vectors.HideWarning,1))