Changeset 1200 for trunk/src/plot_field.m

Timestamp:

Mar 20, 2026, 4:42:36 PM (22 hours ago)

Author:

sommeria

Message:

bug repaired for civ image rescale

File:

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

trunk/src/plot_field.m

@@ -178 +178 @@
 AxeData=get(haxes,'UserData');
 
-%% 2D plots 
-if isempty(index_2D)
-    plot_plane([],[],haxes,[]);%removes images or vector plots in the absence of 2D field plot
+%% 2D plots
+if isempty(index_2D) %removes images or vector plots in the absence of 2D field plot
+    hima=findobj(haxes,'Tag','ima');% search existing image in the current axes
+    if  ishandle(hima)
+        delete(hima)
+    end
+    hvec=findobj(haxes,'Tag','vel');% search existing vectors in the current axes
+    if ~isempty(hvec)
+        delete(hvec);
+    end
 else  %plot 2D field
-%     if ~exist('PosColorbar','var'),PosColorbar=[];end;
+    %     if ~exist('PosColorbar','var'),PosColorbar=[];end;
     [~,PlotParamOut,PlotType,errormsg]=plot_plane(Data,CellInfo(index_2D),haxes,PlotParamOut);
     AxeData.NbDim=2;
-    if testzoomaxes && isempty(errormsg)
-        [zoomaxes,PlotParamOut,~,errormsg]=plot_plane(Data,CellInfo(index_2D),zoomaxes,PlotParamOut);
+    if testzoomaxes && isempty(errormsg)% updater the plot on the attached axis
+        PlotParamZoom=PlotParamOut;
+        PlotParamZoom.Axes.CheckFixLimits=1;
+        XLim=get(zoomaxes,'XLim');
+        YLim=get(zoomaxes,'YLim');
+        PlotParamZoom.Axes.MinX=XLim(1);
+        PlotParamZoom.Axes.MaxX=XLim(2);
+        PlotParamZoom.Axes.MinY=YLim(1);
+        PlotParamZoom.Axes.MaxY=YLim(2);
+        PlotParamZoom.Axes.CheckZoomFig=0;
+        [zoomaxes,~,~,errormsg]=plot_plane(Data,CellInfo(index_2D),zoomaxes,PlotParamZoom);
         AxeData.ZoomAxes=zoomaxes;
     end
@@ -275 +291 @@
 % --- plot 0D fields: display data values without plot
 %------------------------------------------------------------------
-function errormsg=plot_text(FieldData,CellInfo,htext)
+function errormsg=plot_text(FieldData,CellInfo,~)
 
 errormsg='';
-txt_cell={};
-Data={};
 VarIndex=[];
-for icell=1:length(CellInfo)
-    
+for icell=1:length(CellInfo)    
     % select types of  variables to be projected
     ListProj={'VarIndex_scalar','VarIndex_image','VarIndex_color','VarIndex_vector_x','VarIndex_vector_y'};
@@ -617 +630 @@
         end
         Val=pdf2stat(x,pdf_val);
-        Column=mat2cell(Val,ones(13,1),ones(1,size(Val,2)));
+        Column=num2cell(Val,ones(13,1),ones(1,size(Val,2)));
         if size(Val,2)==1%single component
             TitleBar={VarName};
@@ -665 +678 @@
 test_ima=0; %default: test for image or map plot
 test_vec=0; %default: test for vector plots
-test_black=0;
 test_false=0;
 test_C=0;
@@ -681 +693 @@
     ivar_Y=CellInfo{icell}.CoordIndex(end-1); % defines (unique)index for the variable representing unstructured y coordinate (default =[])
     ivar_C=[];
-    if isfield(CellInfo{icell},'VarIndex_scalar')
-        ivar_C=[ivar_C CellInfo{icell}.VarIndex_scalar];
-    end
-    if isfield(CellInfo{icell},'VarIndex_image')
-        ivar_C=[ivar_C CellInfo{icell}.VarIndex_image];
-    end
-    if isfield(CellInfo{icell},'VarIndex_color')
-        ivar_C=[ivar_C CellInfo{icell}.VarIndex_color];
-    end
-    if isfield(CellInfo{icell},'VarIndex_ancillary')
-        ivar_C=[ivar_C CellInfo{icell}.VarIndex_ancillary];
-    end
-    if numel(ivar_C)>1
-        errormsg= 'error in plot_field: too many scalar inputs';
-        return
-    end
+    ListFields=fields(CellInfo{icell});
+    for ilist=1:numel(ListFields)
+        if ismember(ListFields{ilist},{'VarIndex_scalar','VarIndex_image','VarIndex_color','VarIndex_ancillary'})
+            ivar_C=CellInfo{icell}.(ListFields{ilist});
+            break % do not allow more than one scalar 
+        end
+    end 
     ivar_F=[];
     if isfield(CellInfo{icell},'VarIndex_warnflag')
@@ -734 +737 @@
             end
             if isfield(PlotParam.Vectors,'ColorScalar') && ~isempty(PlotParam.Vectors.ColorScalar)
-                [VarVal,ListVarName,VarAttribute,errormsg]=calc_field_interp([],Data,PlotParam.Vectors.ColorScalar);
+                [VarVal,~,~,errormsg]=calc_field_interp([],Data,PlotParam.Vectors.ColorScalar);
                 if ~isempty(VarVal)
                     vec_C=reshape(VarVal{1},1,numel(VarVal{1}));
@@ -745 +748 @@
                 if ~isempty(ivar_F)%~(isfield(PlotParam.Vectors,'HideWarning')&& isequal(PlotParam.Vectors.HideWarning,1))
                     vec_F=Data.(Data.ListVarName{ivar_F}); % warning flags for  dubious vectors
-                    vec_FF(find(vec_F==-2))=1;%set alseFlag to 1(edge of the search box)
+                    vec_FF(vec_F==-2)=1;%set FalseFlag to 1(edge of the search box)
                 end
             end
@@ -790 +793 @@
                 DCoord_y_min=min(DCoord_y);
                 DCoord_y_max=max(DCoord_y);
-                if sign(DCoord_y_min)~=sign(DCoord_y_max);% =1 for increasing values, 0 otherwise
+                if sign(DCoord_y_min)~=sign(DCoord_y_max)% =1 for increasing values, 0 otherwise
                     errormsg=['errror in plot_field.m: non monotonic dimension variable ' YName ];
                     return
@@ -877 +880 @@
     if isfield(PlotParam.Scalar,'CheckBW') && ~isempty(PlotParam.Scalar.CheckBW)
         ColorMap=PlotParam.Scalar.CheckBW;%PlotParam.Scalar.CheckBW is char string indicating the colormap type
-    elseif ((siz==2) && (isa(A,'uint8')|| isa(A,'uint16')))% non color images represented in gray scale by default
+    elseif siz==2 && (isa(A,'uint8')||isa(A,'uint16'))% non color images represented in gray scale by default
         ColorMap='grayscale';
     end
@@ -962 +965 @@
         % fill the space between contours if opacity is undefined or =1
         if isequal(Opacity,1)
-            [var,hcontour]=contour(haxes,x_cont,y_cont,A,cont_pos);% determine all contours
+            [~,hcontour]=contour(haxes,x_cont,y_cont,A,cont_pos);% determine all contours
             set(hcontour,'Fill','on')% fill the space between contours
             set(hcontour,'LineStyle','none')
             hold on
         end
-        [var_p,hcontour_p]=contour(haxes,x_cont,y_cont,A,cont_pos_plus,'k-');% draw the contours for positive values as solid lines
+        [~,~]=contour(haxes,x_cont,y_cont,A,cont_pos_plus,'k-');% draw the contours for positive values as solid lines
         hold on
-        [var_m,hcontour_m]=contour(haxes,x_cont,y_cont,A,cont_pos_min,'--');% draw the contours for negative values as dashed lines
+        [~,hcontour_m]=contour(haxes,x_cont,y_cont,A,cont_pos_min,'--');% draw the contours for negative values as dashed lines
         if isequal(Opacity,1)
             set(hcontour_m,'LineColor',[1 1 1])% draw negative contours in white (better visibility in dark background)
@@ -977 +980 @@
         
         %determine the color scale and map
-        caxis([abscontmin abscontmax])
+        clim([abscontmin abscontmax])
         if strcmp(ColorMap,'grayscale')
             vec=linspace(0,1,(abscontmax-abscontmin)/interval);%define a greyscale colormap with steps interval
@@ -1005 +1008 @@
                     A=uint8(255*double(A)/double(MaxA));
                 end
-%             otherwise
-%                 colormap(ColorMap);
+            otherwise
+                colormap(ColorMap);
         end
   
@@ -1088 +1091 @@
             end
             if length(PosColorbar)==4
-                set(hcol,'Position',PosColorbar)
+                % set(hcol,'Units','pixel')
+                 set(hcol,'Position',PosColorbar)
             end
             %YTick=0;%default
@@ -1126 +1130 @@
     end
 else%no scalar plot
-    if ~isempty(hima) && ishandle(hima)
+    if  ishandle(hima)
         delete(hima)
     end
-    if ~isempty(PosColorbar) && ~isempty(hcol)&& ishandle(hcol)
+    if ~isempty(PosColorbar) && ~isempty(hcol) && ishandle(hcol)
         delete(hcol)
     end
@@ -1217 +1221 @@
     % take flags into account: add flag colors to the list of colors
     nbcolor=size(colorlist,1);
-% % %     if test_black 
-% % %        nbcolor=nbcolor+1;
-% % %        colorlist(nbcolor,:)=[0 0 0]; %add black to the list of colors
-% % %        if ~isempty(ivar_FF_vec)
-% % %             col_vec(vec_F~=1 & vec_F~=0 & vec_FF==0)=nbcolor;
-% % %        else
-% % %             col_vec(vec_F~=1 & vec_F~=0)=nbcolor;
-% % %        end
-% % %     end
     nbcolor=nbcolor+1;
     if ~isempty(ivar_FF_vec)
@@ -1349 +1344 @@
     arrowplus=rot*[uc;vc];
     arrowmoins=rot'*[uc;vc];
-    % x1=xc+uc/2-arrowplus(1,:);
-    % x2=xc+uc/2;
-    % x3=xc+uc/2-arrowmoins(1,:);
-    % y1=yc+vc/2-arrowplus(2,:);
-    % y2=yc+vc/2;
-    % y3=yc+vc/2-arrowmoins(2,:);
     x1=xc+uc-arrowplus(1,:);
     x2=xc+uc;
@@ -1366 +1355 @@
     matyar=reshape(matyar,1,4*n(2));
     %draw the line or modify the existing ones
-%     tri=reshape(1:3*length(uc),3,[])';   
     isn=isnan(colorlist(icolor,:));%test if color NaN
     if 2*icolor > sizh(1) %if icolor exceeds the number of existing ones
@@ -1432 +1420 @@
 diffy=diff(vec_Y); %difference dy=vec_Y(i+1)-vec_Y(i)
 index=find(diffy);% find the indices of vec_Y after wich a change of horizontal line occurs(diffy non zero)
-if isempty(index); msgbox_uvmat('ERROR','points aligned along abscissa in proj_grid.m'); return; end;%points aligned% A FAIRE: switch to line plot.
+if isempty(index); msgbox_uvmat('ERROR','points aligned along abscissa in proj_grid.m'); return; end%points aligned% A FAIRE: switch to line plot.
 diff2=diff(diffy(index));% diff2 = fluctuations of the detected vertical grid mesh dy 
 if max(abs(diff2))>0.001*abs(diffy(index(1))) % if max(diff2) is larger than 1/1000 of the first mesh dy
@@ -1489 +1477 @@
     end
     if test_interp==1%if we interpolate
-        xi=[rangx(1):(rangx(2)-rangx(1))/(npxy(2)-1):rangx(2)];
-        yi=[rangy(1):(rangy(2)-rangy(1))/(npxy(1)-1):rangy(2)];
+        xi=rangx(1):(rangx(2)-rangx(1))/(npxy(2)-1):rangx(2);
+        yi=rangy(1):(rangy(2)-rangy(1))/(npxy(1)-1):rangy(2);
         [XI,YI]=meshgrid(xi,yi);
         A = interp2(X,Y,B,XI,YI);