Changeset 131

Timestamp:

Nov 25, 2010, 9:42:34 AM (14 years ago)

Author:

sommeria

Message:

bug repair for scalar image update, systematic replacement of command axes(haxes), replaced by
set(0, 'CurrentFigure?', hfig)

File:

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

trunk/src/plot_field.m

@@ -139 +139 @@
     end
 end
-
+if isfield(PlotParam,'text_display_1') && ishandle(PlotParam.text_display_1)
+    PlotParam=read_plot_param(PlotParam);   
+end
 if testnewfig% create a new figure and axes if the plotting axes does not exist
     hfig=figure;
@@ -158 +160 @@
     haxes=axes;
     set(haxes,'position',[0.13,0.2,0.775,0.73])
-end
-if isfield(PlotParam,'text_display_1') && ishandle(PlotParam.text_display_1)
-    PlotParam=read_plot_param(PlotParam);   
-end
-if testnewfig
-  PlotParam.NextPlot='add'; %parameter for plot_profile and plot_hist
-end
+     PlotParam.NextPlot='add'; %parameter for plot_profile and plot_his
+else
+    hfig=get(haxes,'parent');
+    set(0,'CurrentFigure',hfig)
+    set(hfig,'CurrentAxes',haxes)
+end
+
 if isfield(PlotParam,'Auto_xy') && isequal(PlotParam.Auto_xy,1) 
     set(haxes,'DataAspectRatioMode','auto')%automatic aspect ratio
@@ -428 +430 @@
 if test_newplot && ~isequal(plotstr,'hhh=plot(')
     plotstr=[plotstr '''tag'',''plot_line'');'];
-                %execute plot (instruction  plotstr)  
-    axes(haxes)% select the plotting axes for plot operation
+                %execute plot (instruction  plotstr)
+%     set(hfig,'CurrentAxes',haxes)
+%     axes(haxes)% select the plotting axes for plot operation
     eval(plotstr)
    
@@ -758 +761 @@
             x_cont=AX(1):sizpx:AX(end); % pixel x coordinates for image display 
             y_cont=AY(1):-sizpy:AY(end); % pixel x coordinates for image display
+           % axes(haxes)% set the input axes handle as current axis
             txt=ver;%version of Matlab
             Release=txt(1).Release;
@@ -828 +832 @@
         if isempty(hima)
            % axes(haxes)% set haxes the current axes for image creation
-            set(hfig,'CurrentAxes',haxes) % set haxes the current axes for image creation 
+         %   set(hfig,'CurrentAxes',haxes) % set haxes the current axes for image creation 
             tag=get(haxes,'Tag');
             if MinA<MaxA
@@ -841 +845 @@
             set(hima,'CData',B);
             if MinA<MaxA
-                caxis([MinA MaxA])
+                set(haxes,'CLim',[MinA MaxA])
+                %caxis([MinA MaxA])
             else
-                caxis([MaxA-1 MaxA])
+                set(haxes,'CLim',[MinA MaxA])
+                %caxis([MaxA-1 MaxA])
             end
             set(hima,'XData',AX);
@@ -1169 +1175 @@
     if 2*icolor > sizh(1) %if icolor exceeds the number of existing ones
         %axes(haxes)
-        hfig=get(haxes,'parent');
+      %  hfig=get(haxes,'parent');
 %         axes(haxes)
-        set(0,'CurrentFigure',hfig)
-        set(hfig,'CurrentAxes',haxes)
+      %  set(0,'CurrentFigure',hfig)
+       % set(hfig,'CurrentAxes',haxes)
         if ~isn(1) %if the vectors are visible color not nan
             if n(2)>0