Changeset 411 for trunk/src/plot_field.m

Timestamp:

May 7, 2012, 3:32:21 PM (12 years ago)

Author:

sommeria

Message:

bugs corrected in uvmat: fixed x/y and calc_field for the new PIV data

File:

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

trunk/src/plot_field.m

@@ -100 +100 @@
 PlotType='text'; %default
 PlotParamOut=PlotParam;%default
-Coordinates=[];
-if isfield(PlotParam,'Coordinates')
-Coordinates=PlotParam.Coordinates;
+if ~isfield(PlotParam,'Coordinates')
+    PlotParam.Coordinates=[];
 end
 
@@ -193 +192 @@
     
     %% set axes properties
-    if isfield(Coordinates,'CheckFixLimits') && isequal(Coordinates.CheckFixLimits,1)  %adjust the graph limits
+    if isfield(PlotParam.Coordinates,'CheckFixLimits') && isequal(PlotParam.Coordinates.CheckFixLimits,1)  %adjust the graph limits
         set(haxes,'XLimMode', 'manual')
         set(haxes,'YLimMode', 'manual')
@@ -200 +199 @@
         set(haxes,'YLimMode', 'auto')
     end
-    if ~isfield(Coordinates,'CheckFixEqual')&& isfield(Data,'CoordUnit')
-        Coordinates.CheckFixEqual=1;
-    end
-    if isfield(Coordinates,'CheckFixEqual') && isequal(Coordinates.CheckFixEqual,1)
+    if ~isfield(PlotParam.Coordinates,'CheckFixEqual')&& isfield(Data,'CoordUnit')
+        PlotParam.Coordinates.CheckFixEqual=1;% if CoordUnit is defined, the two coordiantes should be plotted with equal scale by default
+    end
+    if isfield(PlotParam.Coordinates,'CheckFixEqual') && isequal(PlotParam.Coordinates.CheckFixEqual,1)
         set(haxes,'DataAspectRatioMode','manual')
         set(haxes,'DataAspectRatio',[1 1 1])
@@ -228 +227 @@
         end
     else
-        Coordinates=plot_profile(Data,CellVarIndex(index_1D),VarType(index_1D),haxes,Coordinates);%
+        Coordinates=plot_profile(Data,CellVarIndex(index_1D),VarType(index_1D),haxes,PlotParam.Coordinates);%
         if testzoomaxes
             [zoomaxes,Coordinates]=plot_profile(Data,CellVarIndex(index_1D),VarType(index_1D),zoomaxes,PlotParam.Coordinates);
@@ -499 +498 @@
 function [haxes,PlotParamOut,PlotType,errormsg]=plot_plane(Data,CellVarIndex,VarTypeCell,haxes,PlotParam,PosColorbar)
 %-------------------------------------------------------------------
-grid(haxes, 'off')
+
+grid(haxes, 'off')% remove grid (possibly remaining from other graphs)
 %default plotting parameters
 PlotType='plane';%default
@@ -505 +505 @@
     PlotParam=[];
 end
-if ~isfield(PlotParam,'Coordinates')
-    PlotParam.Coordinates=[];
-end
+
 if ~isfield(PlotParam,'Scalar')
     PlotParam.Scalar=[];
@@ -866 +864 @@
                 hima=imagesc(AX,AY,B,[MaxA-1 MaxA]);
             end
-            set(hima,'Tag','ima','HitTest','off')
+            % the function imagesc reset the axes 'DataAspectRatioMode'='auto', change if .CheckFixEqual is
+            % requested:
+           if isfield(PlotParam.Coordinates,'CheckFixEqual') && isequal(PlotParam.Coordinates.CheckFixEqual,1)
+                set(haxes,'DataAspectRatioMode','manual')
+                set(haxes,'DataAspectRatio',[1 1 1])
+           end 
+            set(hima,'Tag','ima')
+            set(hima,'HitTest','off')
             set(haxes,'Tag',tag);%preserve the axes tag (removed by image fct !!!)     
             uistack(hima, 'bottom')