Changeset 93 for trunk/src/plot_field.m

Timestamp:

May 27, 2010, 7:25:58 PM (15 years ago)

Author:

sommeria

Message:

FFT: improved to deal with NaN data
merge_proj: corrected to reproduce dt if unique
uvmat.fig: tooltip corrected
plot_field: bug for isocontour corrected,
im_filter: cleaning
phys_polar: spatial derivative included (still to check)
set_obeject.fig: minor correction
struct2nc: comments improved
uvmat: button NB implemented
read_civxdata: error message improved

File:

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

trunk/src/plot_field.m

@@ -172 +172 @@
 % check the cells of fields :
 % testnbdim=1;
-[CellVarIndex,NbDim,VarType,errormsg]=find_field_indices(Data);
+[CellVarIndex,NbDim,VarType,errormsg]=find_field_indices(Data)
 
 if ~isempty(errormsg)
@@ -324 +324 @@
 coord_x_index=[];
 test_newplot=1;
-hh=findobj(haxes,'tag','plot_line');
+% hh=findobj(haxes,'tag','plot_line');
 % num_curve=numel(hh);
-icurve=0;
+% icurve=0;
 for icell=1:length(CellVarIndex)
     testfalse=0;
@@ -362 +362 @@
     end
     eval(['coord_x{icell}=data.' data.ListVarName{coord_x_index} ';']);%coordinate variable set as coord_x
-    testcoordvar=1;
+%     testcoordvar=1;
     testplot(coord_x_index)=0;
     if ~isempty(VarType{icell}.ancillary')
@@ -425 +425 @@
                 eval(['varmean=mean(double(data.' VarName '));']);%mean value
                 textmean=[textmean; {[VarName 'mean= ' num2str(varmean,4)]}];
-                if nbcomponent1==1| nbcomponent2==1
+                if nbcomponent1==1|| nbcomponent2==1
                     legend_str=[legend_str {VarName}]; %variable with one component
                 else  %variable with severals  components
@@ -553 +553 @@
         VarType.coord=VarType.coord(ind_coord);
     end
-    idim_Y=[];  
+%     idim_Y=[];  
     test_grid=0;
     if ~isempty(ivar_U) && ~isempty(ivar_V)% vector components detected
@@ -563 +563 @@
             eval(['vec_U=Data.' Data.ListVarName{ivar_U} ';']) 
             eval(['vec_V=Data.' Data.ListVarName{ivar_V} ';']) 
-            'TESTplot'
-            VarType.coord
             if ~isempty(ivar_X) && ~isempty(ivar_Y)% 2D field (with unstructured coordinates or structured ones (then ivar_X and ivar_Y empty)     
                 eval(['vec_X=Data.' Data.ListVarName{ivar_X} ';']) 
@@ -748 +746 @@
             end
             if ~isfield(PlotParam.Scalar,'IncrA')
-                PlotParam.Scalar.IncrA=[];
-            end
-            if isempty(PlotParam.Scalar.IncrA)% | PlotParam.Scalar.AutoScal==0
+                PlotParam.Scalar.IncrA=NaN;
+            end
+            if isnan(PlotParam.Scalar.IncrA)% | PlotParam.Scalar.AutoScal==0
                 cont=colbartick(MinA,MaxA);
                 intercont=cont(2)-cont(1);%default
@@ -767 +765 @@
             sizpx=(AX(end)-AX(1))/(np(2)-1);
             sizpy=(AY(1)-AY(end))/(np(1)-1);
-            x_cont=[AX(1):sizpx:AX(end)]; % pixel x coordinates for image display 
+            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
             txt=ver;%version of Matlab
@@ -857 +855 @@
     %display the colorbar code for B/W images if Poscolorbar not empty
     if siz==2 && exist('PosColorbar','var')&& ~isempty(PosColorbar)
-        if isempty(hcol)|~ishandle(hcol)
+        if isempty(hcol)||~ishandle(hcol)
              hcol=colorbar;%create new colorbar
         end
@@ -981 +979 @@
         end
         nb_sel=length(ind_sel);
-        ind_sel=ind_sel([1:2:nb_sel]);% take half the points on a line
+        ind_sel=ind_sel(1:2:nb_sel);% take half the points on a line
         vec_X=vec_X(ind_sel);
         vec_Y=vec_Y(ind_sel);