Changeset 871

Timestamp:

Feb 16, 2015, 12:15:23 AM (10 years ago)

Author:

sommeria

Message:

histo improved

Location:

trunk/src

Files:

• find_field_bounds.m (modified) (3 diffs)
• get_file_series.m (modified) (2 diffs)
• mouse_up.m (modified) (1 diff)
• nc2struct.m (modified) (1 diff)
• plot_field.m (modified) (6 diffs)
• proj_field.m (modified) (8 diffs)
• read_civdata.m (modified) (1 diff)
• read_field.m (modified) (3 diffs)
• series/aver_stat.m (modified) (12 diffs)
• series/histo_diff.m (deleted)
• series/time_series.m (modified) (12 diffs)
• set_object.fig (modified) (previous)
• set_object.m (modified) (2 diffs)
• transform_field/phys.m (modified) (4 diffs)
• uvmat.fig (modified) (previous)
• uvmat.m (modified) (22 diffs)

trunk/src/find_field_bounds.m

@@ -1 @@
-%'find_field_bounds': % find the boounds and typical meshs of coordinates
+%'find_field_bounds': % find the bounds and typical meshs of coordinates
 %-----------------------------------------------------------------------
 %function  FieldOut=find_field_bounds(Field)
@@ -9 +9 @@
 %
 %INPUT
-% Field
-
+% Field: Matlab structure describing the input field
+%
 %=======================================================================
 % Copyright 2008-2014, LEGI UMR 5519 / CNRS UJF G-INP, Grenoble, France
@@ -41 +41 @@
 NbDim=max(NbDimArray);% spatial dimension of the input field
 imax=find(NbDimArray==NbDim);% indices of field cells to consider
-% if isfield(Field,'NbDim')
-%     NbDim=double(Field.NbDim);% deal with plane fields containing z coordinates
-% end
 FieldOut.NbDim=NbDim;
 if  NbDim<=1; return; end% stop here for 1D fields

trunk/src/get_file_series.m

@@ -60 +60 @@
             Param.IndexRange.PairString={Param.IndexRange.PairString};
         end
-        if ~isempty(Param.IndexRange.PairString{iview,1})
-        r=regexp(Param.IndexRange.PairString{iview,1},'(?<mode>(Di=)|(Dj=)) -*(?<num1>\d+)\|(?<num2>\d+)','names');%look for mode=Dj or Di
-        if isempty(r)
-            r=regexp(Param.IndexRange.PairString{iview,1},'(?<num1>\d+)(?<mode>-)(?<num2>\d+)','names');%look for burst pairs
-        end
+        if size(Param.IndexRange.PairString,1)>=iview && ~isempty(Param.IndexRange.PairString{iview,1})
+            r=regexp(Param.IndexRange.PairString{iview,1},'(?<mode>(Di=)|(Dj=)) -*(?<num1>\d+)\|(?<num2>\d+)','names');%look for mode=Dj or Di
+            if isempty(r)
+                r=regexp(Param.IndexRange.PairString{iview,1},'(?<num1>\d+)(?<mode>-)(?<num2>\d+)','names');%look for burst pairs
+            end
         end
         % TODO case of free pairs:
@@ -72 +72 @@
         r(1).num1='';
         r(1).num2='';
-        if isfield (Param.IndexRange,'PairString') && strcmp(Param.IndexRange.PairString{iview,1},'j=*-*')
+        if isfield (Param.IndexRange,'PairString') && size(Param.IndexRange.PairString,1)>=iview &&...
+                                                           strcmp(Param.IndexRange.PairString{iview,1},'j=*-*')
             r(1).mode='*-*';
         else

trunk/src/mouse_up.m

@@ -123 +123 @@
     %show object coordinates in the GUI set_object
     if strcmp(ObjectData.Type,'rectangle')||strcmp(ObjectData.Type,'ellipse')
+        set(hh_set_object.Coord,'Data',ObjectData.Coord);
         set(hh_set_object.num_RangeX_2,'String',num2str(ObjectData.RangeX,4));
         set(hh_set_object.num_RangeY_2,'String',num2str(ObjectData.RangeY,4));

trunk/src/nc2struct.m

@@ -233 +233 @@
             end
             try
-                if isempty(valuestr)
+                if ~isempty(valuestr)
                     Data.VarAttribute{ivar}.(attname)=valuestr;
                 end

trunk/src/plot_field.m

@@ -202 +202 @@
     end       
     PlotParamOut.Axes=plot_profile(Data,CellInfo(index_1D),haxes,PlotParamOut.Axes,CheckHold);%
+    if isfield(PlotParamOut,'Vectors')
+        PlotParamOut=rmfield(PlotParamOut,'Vectors');
+    end
+    if isfield(PlotParamOut,'Scalar')
+        PlotParamOut=rmfield(PlotParamOut,'Scalar');
+    end   
     if testzoomaxes
         [zoomaxes,PlotParamOut.Axes]=plot_profile(Data,CellInfo(index_1D),zoomaxes,PlotParamOut.Axes,CheckHold);
@@ -216 +222 @@
 htext=findobj(hfig,'Tag','TableDisplay');
 hchecktable=findobj(hfig,'Tag','CheckTable');
-% if isempty(index_2D) && isempty(index_1D)%text display alone
-%     htext=findobj(hfig,'Tag','TableDisplay');
-% else  %text display added to plot
-%     %htext=findobj(hfig,'Tag','text_display');
-% end
 if ~isempty(htext)&&~isempty(hchecktable)
     if isempty(index_0D)
-        set(htext,'Data',{})
-        set(htext,'visible','off')
-        set(hchecktable,'visible','off')
-        set(hchecktable,'Value',0)
+%         set(htext,'Data',{})
+%         set(htext,'visible','off')
+%         set(hchecktable,'visible','off')
+%         set(hchecktable,'Value',0)
     else
         errormsg=plot_text(Data,CellInfo(index_0D),htext);
@@ -384 +385 @@
 ColorOrder=[1 0 0;0 1 0;0 0 1;0 0.75 0.75;0.75 0 0.75;0.75 0.75 0;0.25 0.25 0.25];
 set(hfig,'DefaultAxesColorOrder',ColorOrder)
-% if isfield(Coordinates,'NextPlot')
-%     set(haxes,'NextPlot',Coordinates.NextPlot)
-% end
 if CheckHold
     set(haxes,'NextPlot','add')
@@ -395 +393 @@
 %% prepare the string for plot command
 plotstr='hhh=plot(';
-% coord_x_index=[];
 xtitle='';
 ytitle='';
@@ -403 +400 @@
 MinY_cell=[];
 MaxY_cell=[];
+testplot=ones(size(data.ListVarName));%default test for plotted variables
 %loop on input  fields
 for icell=1:numel(CellInfo)
     VarIndex=CellInfo{icell}.VarIndex;%  indices of the selected variables in the list data.ListVarName
     coord_x_index=CellInfo{icell}.CoordIndex;
-    testplot=ones(size(data.ListVarName));%default test for plotted variables
     coord_x_name{icell}=data.ListVarName{coord_x_index};
     coord_x{icell}=data.(data.ListVarName{coord_x_index});%coordinate variable set as coord_x
@@ -573 +570 @@
 end
 
+%% give statistics for pdf
+ind_var=find(testplot);
+if numel(ind_var)==1 && isfield(data,'VarAttribute') && isfield(data.VarAttribute{ind_var},'Role') &&...
+        strcmp(data.VarAttribute{ind_var}.Role,'histo')
+    pdf_val=data.(data.ListVarName{ind_var});
+    x=coord_x{1};
+    TableData=cell(12,2);
+    TableData(:,1)={'SampleNbr';'Mean';'RMS';'Skewness';'Kurtosis';...
+        'Min';'FirstCentile';'FirstDecile';'Median';'LastDecile';'LastCentile';'Max'};
+    Val=zeros(12,1);
+    Val(1)=sum(pdf_val);% total sample number
+    pdf_val=pdf_val/Val(1);% normalised pdf
+    Val(2)=sum(x.*pdf_val);%Mean
+    x=x-Val(2); %centered variable
+    Variance=sum(x.*x.*pdf_val);
+    Val(3)=sqrt(Variance);
+    Val(4)=(sum(x.*x.*x.*pdf_val))/(Variance*Val(3));%skewness
+    Val(5)=(sum(x.*x.*x.*x.*pdf_val))/(Variance*Variance);%kurtosis
+    Val(6)=min(x);
+    cumpdf=cumsum(pdf_val);
+    ind_centile=find(cumpdf>=0.01,1);
+    Val(7)=x(ind_centile);
+    ind_decile=find(cumpdf>=0.1,1);
+    Val(8)=x(ind_decile);
+    ind_median=find(cumpdf>= 0.5,1);
+    Val(9)=x(ind_median);
+    ind_decile=find(cumpdf>=0.9,1);
+    Val(10)=x(ind_decile);
+    ind_centile=find(cumpdf>=0.99,1);
+    Val(11)=x(ind_centile);
+    Val(12)=max(x);   
+    TableData(:,2)=mat2cell(Val,ones(12,1),1)
+    TableData=[TableData(1:5,:);{'   -- centered','stat: --'};TableData(6:12,:)];
+    htable=findobj(hfig,'Tag','TableDisplay')
+    set(htable,'Data',TableData)
+    set(htable,'Visible','on')
+    drawnow
+end
+    
 %-------------------------------------------------------------------
 function [haxes,PlotParamOut,PlotType,errormsg]=plot_plane(Data,CellInfo,haxes,PlotParam)

trunk/src/proj_field.m

@@ -1 +1 @@
 %'proj_field': projects the field on a projection object
 %--------------------------------------------------------------------------
-%  function [ProjData,errormsg]=proj_field(FieldData,ObjectData)
+%  function [ProjData,errormsg]=proj_field(FieldData,ObjectData,VarMesh)
 %
 % OUTPUT:
@@ -82 +82 @@
 %=======================================================================
 
-function [ProjData,errormsg]=proj_field(FieldData,ObjectData)
+function [ProjData,errormsg]=proj_field(FieldData,ObjectData,VarMesh)
 errormsg='';%default
 ProjData=[];
@@ -110 +110 @@
     case {'polygon','rectangle','ellipse'}
         if isequal(ObjectData.ProjMode,'inside')||isequal(ObjectData.ProjMode,'outside')
-            [ProjData,errormsg] = proj_patch(FieldData,ObjectData);
+            if ~exist('VarMesh','var')
+                VarMesh=[];
+            end
+            [ProjData,errormsg] = proj_patch(FieldData,ObjectData,VarMesh);
         else
             [ProjData,errormsg] = proj_line(FieldData,ObjectData);
@@ -342 +345 @@
 %-----------------------------------------------------------------
 %project in a patch
-function  [ProjData,errormsg]=proj_patch(FieldData,ObjectData)%%
+function  [ProjData,errormsg]=proj_patch(FieldData,ObjectData,VarMesh)%%
 %-------------------------------------------------------------------
 [ProjData,errormsg]=proj_heading(FieldData,ObjectData);
@@ -365 +368 @@
 
 CoordMesh=zeros(1,numel(FieldData.ListVarName));
+%VarMesh=nan(1,numel(FieldData.ListVarName));
+% MinValue=nan(1,numel(FieldData.ListVarName));
+% MaxValue=nan(1,numel(FieldData.ListVarName));
 if isfield (FieldData,'VarAttribute')
     for iattr=1:length(FieldData.VarAttribute)%initialization of variable attribute values
@@ -373 +379 @@
             CoordMesh(iattr)=FieldData.VarAttribute{iattr}.CoordMesh;
         end
+%         if isfield(FieldData.VarAttribute{iattr},'Mesh')
+%             VarMesh(iattr)=FieldData.VarAttribute{iattr}.Mesh;
+%         end
+%         if isfield(FieldData.VarAttribute{iattr},'MinValue')
+%             VarMesh(iattr)=FieldData.VarAttribute{iattr}.MinValue;
+%         end
+%         if isfield(FieldData.VarAttribute{iattr},'MaxValue')
+%             VarMesh(iattr)=FieldData.VarAttribute{iattr}.MaxValue;
+%         end
     end
 end
@@ -496 +511 @@
     end
     indsel=find(testin);
+    nbvar=0;
+    VarSize=zeros(size(VarIndex));
     for ivar=VarIndex
         VarName=FieldData.ListVarName{ivar};
-        ProjData.([VarName 'Mean'])=mean(double(FieldData.(VarName)(indsel,:))); % take the mean in the selected region, for each color component
+        ProjData.([VarName 'Mean'])=mean(double(FieldData.(VarName)(indsel,:))); % take the mean in the selected region, for each co
         ProjData.([VarName 'Min'])=min(double(FieldData.(VarName)(indsel,:))); % take the min in the selected region , for each color component
-        ProjData.([VarName 'Max'])=max(double(FieldData.(VarName)(indsel,:))); % take the max in the selected region , for each color component
-        if isequal(CoordMesh(ivar),0)
-            [ProjData.([VarName 'Histo']),ProjData.(VarName)]=hist(double(FieldData.(VarName)(indsel,:,:)),100); % default histogram with 100 bins
+        ProjData.([VarName 'Max'])=max(double(FieldData.(VarName)(indsel,:))); % take the max in the selected region , for each color co
+        nbvar=nbvar+1;
+        VarSize(nbvar)=mean((ProjData.([VarName 'Max'])-ProjData.([VarName 'Min']))/100);
+    end
+    if  isempty(VarMesh) || isnan(VarMesh) % mesh not specified as input, estimate from the bounds
+        VarMesh=mean(VarSize);
+        ord=10^(floor(log10(VarMesh)));%order of magnitude
+        if VarMesh/ord >=5
+            VarMesh=5*ord;
+        elseif VarMesh/ord >=2
+            VarMesh=2*ord;
         else
-            ProjData.(VarName)=ProjData.([VarName 'Min'])+CoordMesh(ivar)/2:CoordMesh(ivar):ProjData.([VarName 'Max']); % list of bin values
-            ProjData.([VarName 'Histo'])=hist(double(FieldData.(VarName)(indsel,:)),ProjData.(VarName)); % histogram at predefined bin positions
-        end
+            VarMesh=ord;
+        end
+    end
+    for ivar=VarIndex
+        VarName=FieldData.ListVarName{ivar};
+        LowBound=VarMesh*ceil(ProjData.([VarName 'Min'])/VarMesh);
+        UpperBound=VarMesh*floor(ProjData.([VarName 'Max'])/VarMesh);
+        ProjData.(VarName)=LowBound:VarMesh:UpperBound; % list of bin values
+        ProjData.([VarName 'Histo'])=hist(double(FieldData.(VarName)(indsel,:)),ProjData.(VarName)); % histogram at predefined bin positions
         ProjData.ListVarName=[ProjData.ListVarName {VarName} {[VarName 'Histo']} {[VarName 'Mean']} {[VarName 'Min']} {[VarName 'Max']}];
         if test_Amat && testcolor
@@ -513 +544 @@
             ProjData.VarDimName=[ProjData.VarDimName {VarName} {VarName} {'one'} {'one'} {'one'}];
         end
+        VarAttribute_var=[];
         if isfield(FieldData,'VarAttribute')&& numel(FieldData.VarAttribute)>=ivar
-            ProjData.VarAttribute=[ProjData.VarAttribute FieldData.VarAttribute{ivar} {[]} {[]} {[]} {[]}];
-        end
+            VarAttribute_var=FieldData.VarAttribute{ivar};
+        end
+      %  VarAttribute_var.Role='coord_x';% the variable is now used as an absissa
+        VarAttribute_histo.Role='histo';
+        ProjData.VarAttribute=[ProjData.VarAttribute {VarAttribute_var} {VarAttribute_histo} {[]} {[]} {[]}];
     end
 end

trunk/src/read_civdata.m

@@ -151 +151 @@
 for ivar=1:numel(var_ind)
     Field.VarAttribute{ivar}.Role=role{var_ind(ivar)};
-    Field.VarAttribute{ivar}.Mesh=0.1;%typical mesh for histograms O.1 pixel
+    %Field.VarAttribute{ivar}.Mesh=0.025;%typical mesh for histograms O.025 pixel (used in series)
     Field.VarAttribute{ivar}.ProjModeRequest=ProjModeRequest;
     if strcmp(role{var_ind(ivar)},'vector_x')

trunk/src/read_field.m

@@ -265 +265 @@
                 ParamOut.Npy=npxy(1);
             end
-            Field.VarAttribute{3}.Mesh=1;
+%             Field.VarAttribute{3}.Mesh=1;
         else
             Field.NbDim=3;
@@ -277 +277 @@
                 ParamOut.Npy=npxy(2);
             end
-            Field.VarAttribute{4}.Mesh=1;
+%             Field.VarAttribute{4}.Mesh=1;
         end
     else
@@ -285 +285 @@
         ParamOut.Npx=npxy(2);% display image size on the interface
         ParamOut.Npy=npxy(1);
-        Field.VarAttribute{3}.Mesh=1;
+%         Field.VarAttribute{3}.Mesh=1;
     end
     Field.A=A;

trunk/src/series/aver_stat.m

@@ -71 +71 @@
     ParamOut.OutputDirExt='.stat';%set the output dir extension
     ParamOut.OutputFileMode='NbSlice';% '=NbInput': 1 output file per input file index, '=NbInput_i': 1 file per input file index i, '=NbSlice': 1 file per slice
-    % check the existence of the first file in the series
+     % check for selection of a projection object
+    hseries=findobj(allchild(0),'Tag','series');% handles of the GUI series
+    if  ~isfield(Param,'ProjObject')
+        answer=msgbox_uvmat('INPUT_Y-N','use a projection object?');
+        if strcmp(answer,'Yes')
+            hhseries=guidata(hseries);
+            set(hhseries.CheckObject,'Visible','on')
+            set(hhseries.CheckObject,'Value',1)
+            Param.CheckObject=1;
+            series('CheckObject_Callback',hseries,[],hhseries); %file input with xml reading  in uvmat, show the image in phys coordinates
+        end
+    end
+    % introduce bin size for histograms
+    if Param.CheckObject
+        SeriesData=get(hseries,'UserData');
+        if ismember(SeriesData.ProjObject.ProjMode,{'inside','outside'})
+            answer=msgbox_uvmat('INPUT_TXT','set bin size for histograms (or keep ''auto'' by default)?','auto');
+            ParamOut.ActionInput.VarMesh=str2double(answer);
+        end
+    end
+    % check the existence of the first and last file in the series
     first_j=[];
     if isfield(Param.IndexRange,'first_j'); first_j=Param.IndexRange.first_j; end
@@ -87 +107 @@
         LastFileName=fullfile_uvmat(Param.InputTable{1,1},Param.InputTable{1,2},Param.InputTable{1,3},...
         Param.InputTable{1,5},Param.InputTable{1,4},i1,i2,j1,j2);
-        if ~exist(FirstFileName,'file')
+        if ~exist(LastFileName,'file')
              msgbox_uvmat('WARNING',['the last input file ' LastFileName ' does not exist'])
         end
@@ -170 +190 @@
  % EDIT FROM HERE
 
-%% check the validity of  input file types
+%% check the validity of  input file types and set the output file type
 if CheckImage{1}
     FileExtOut='.png'; % write result as .png images for image inputs
@@ -182 +202 @@
     disp_uvmat('ERROR','input must be two image series or two netcdf file series',checkrun)
     return
+end
+if isfield(Param,'ProjObject') && ~strcmp(Param.ProjObject.Type,'plane')
+      FileExtOut='.nc';% write result as .nc files (even for image input)
 end
 
@@ -212 +235 @@
     end
 end
-% for i_slice=1:NbSlice
-% index_slice=i_slice:NbSlice:nbfield;% select file indices of the slice
-nbfiles=0;
-% nbmissing=0;
-
+nbfiles=0;%counter of the successfully read files (bad files are skipped)
+VarMesh=NaN;
+if isfield(Param,'ProjObject') && ismember(Param.ProjObject.ProjMode,{'inside','outside'})&& isfield(Param.ActionInput,'VarMesh')%case of histograms 
+     VarMesh=Param.ActionInput.VarMesh;
+end
 %%%%%%%%%%%%%%%% loop on field indices %%%%%%%%%%%%%%%%
 for index=1:NbField
@@ -243 +266 @@
     if isempty(errormsg)
         Field=Data{1}; % default input field structure
+        nbfiles=nbfiles+1; %increment the file counter
         %% coordinate transform (or other user defined transform)
         if ~isempty(transform_fct)
@@ -265 +289 @@
         end
         
-        %% calculate tps coefficients if needed
-        if isfield(Param,'ProjObject')&&isfield(Param.ProjObject,'ProjMode')&& strcmp(Param.ProjObject.ProjMode,'interp_tps')
-            Field=tps_coeff_field(Field,check_proj_tps);
-        end
-        
-        %field projection on an object
+        %% field projection on an object
         if Param.CheckObject
-            [Field,errormsg]=proj_field(Field,Param.ProjObject);
+            if strcmp(Param.ProjObject.ProjMode,'interp_tps')
+                Field=tps_coeff_field(Field,check_proj_tps);% calculate tps coefficients if needed
+            end
+            [Field,errormsg]=proj_field(Field,Param.ProjObject,VarMesh);
             if ~isempty(errormsg)
                 disp_uvmat('ERROR',['error in aver_stat/proj_field:' errormsg],checkrun)
@@ -278 +300 @@
             end
         end
-        nbfiles=nbfiles+1;
-        
+             
         %%%%%%%%%%%% MAIN RUNNING OPERATIONS  %%%%%%%%%%%%
         if nbfiles==1 %first field
@@ -286 +307 @@
                 time_1=Field.Time(1);
             end
-            DataOut=Field;%default
-            DataOut.Conventions='uvmat'; %suppress Conventions='uvmat/civdata' for civ input files
-            errorvar=zeros(numel(Field.ListVarName));%index of errorflag associated to each variable
-            for ivar=1:numel(Field.ListVarName)
-                VarName=Field.ListVarName{ivar};
-                DataOut.(VarName)=zeros(size(DataOut.(VarName)));% initiate each field to zero
-                NbData.(VarName)=zeros(size(DataOut.(VarName)));% initiate the nbre of good data to zero
-                for iivar=1:length(Field.VarAttribute)
-                    if isequal(Field.VarDimName{iivar},Field.VarDimName{ivar})&& isfield(Field.VarAttribute{iivar},'Role')...
-                            && strcmp(Field.VarAttribute{iivar}.Role,'errorflag')
-                        errorvar(ivar)=iivar; % index of the errorflag variable corresponding to ivar
+            DataOut=Field;%outcome reproduces the first (projected) field by default
+            DataOut.Conventions='uvmat'; %suppress Conventions='uvmat/civdata' for civ input files         
+            if ismember(Param.ProjObject.ProjMode,{'inside','outside'})%case of histograms
+                for ivar=1:numel(Field.ListVarName)% list of variable names before projection (histogram)
+                    VarName=Field.ListVarName{ivar};
+                    if isfield(Data{1},VarName)
+                        DataOut.(VarName)=Field.(VarName);
+                        DataOut.([VarName 'Histo'])=zeros(size(DataOut.(VarName)));
+                        VarMesh=DataOut.(VarName)(2)-DataOut.(VarName)(1);
                     end
                 end
-            end
-            DataOut.ListVarName(errorvar(errorvar~=0))=[]; %remove errorflag from result
-            DataOut.VarDimName(errorvar(errorvar~=0))=[]; %remove errorflag from result
-            DataOut.VarAttribute(errorvar(errorvar~=0))=[]; %remove errorflag from result
+                disp(['mesh for histogram = ' num2str(VarMesh)])
+            else
+                errorvar=zeros(numel(Field.ListVarName));%index of errorflag associated to each variable
+                for ivar=1:numel(Field.ListVarName)
+                    VarName=Field.ListVarName{ivar};
+                    DataOut.(VarName)=zeros(size(DataOut.(VarName)));% initiate each field to zero
+                    NbData.(VarName)=zeros(size(DataOut.(VarName)));% initiate the nbre of good data to zero
+                    for iivar=1:length(Field.VarAttribute)
+                        if isequal(Field.VarDimName{iivar},Field.VarDimName{ivar})&& isfield(Field.VarAttribute{iivar},'Role')...
+                                && strcmp(Field.VarAttribute{iivar}.Role,'errorflag')
+                            errorvar(ivar)=iivar; % index of the errorflag variable corresponding to ivar
+                        end
+                    end
+                end
+                DataOut.ListVarName(errorvar(errorvar~=0))=[]; %remove errorflag from result
+                DataOut.VarDimName(errorvar(errorvar~=0))=[]; %remove errorflag from result
+                DataOut.VarAttribute(errorvar(errorvar~=0))=[]; %remove errorflag from result
+            end
         end   %current field
         for ivar=1:length(DataOut.ListVarName)
-            VarName=Field.ListVarName{ivar};
+            VarName=DataOut.ListVarName{ivar};
             sizmean=size(DataOut.(VarName));
             siz=size(Field.(VarName));
-            if ~isequal(DataOut.(VarName),0)&& ~isequal(siz,sizmean)
+            if ismember(Param.ProjObject.ProjMode,{'inside','outside'})
+                if isfield(Data{1},VarName)
+                    MaxValue=max(DataOut.(VarName));% current max of histogram absissa
+                    MinValue=min(DataOut.(VarName));% current min of histogram absissa
+%                     VarMesh=Field.VarAttribute{ivar}.Mesh;
+                    MaxIndex=round(MaxValue/VarMesh);
+                    MinIndex=round(MinValue/VarMesh);
+                    MaxIndex_new=round(max(Field.(VarName)/VarMesh));% max of the current field
+                    MinIndex_new=round(min(Field.(VarName)/VarMesh));
+                    if MaxIndex_new>MaxIndex% the variable max for the current field exceeds the previous one
+                        DataOut.(VarName)=[DataOut.(VarName) VarMesh*(MaxIndex+1:MaxIndex_new)];% append the new variable values
+                        DataOut.([VarName 'Histo'])=[DataOut.([VarName 'Histo']) zeros(1,MaxIndex_new-MaxIndex)]; % append the new histo values                    
+                    end
+                    if MinIndex_new <= MinIndex-1
+                        DataOut.(VarName)=[VarMesh*(MinIndex_new:MinIndex-1) DataOut.(VarName)];% insert the new variable values
+                        DataOut.([VarName 'Histo'])=[zeros(1,MinIndex-MinIndex_new) DataOut.([VarName 'Histo'])];% insert the new histo values
+                        ind_start=1;
+                    else
+                        ind_start=MinIndex_new-MinIndex+1;
+                    end
+                    DataOut.([VarName 'Histo'])(ind_start:ind_start+MaxIndex_new-MinIndex_new)=...
+                        DataOut.([VarName 'Histo'])(ind_start:ind_start+MaxIndex_new-MinIndex_new)+Field.([VarName 'Histo']);   
+                end
+            elseif ~isequal(DataOut.(VarName),0)&& ~isequal(siz,sizmean)
                 disp_uvmat('ERROR',['unequal size of input field ' VarName ', need to project  on a grid'],checkrun)
                 return
@@ -328 +384 @@
 end
 %%%%%%%%%%%%%%%% end loop on field indices %%%%%%%%%%%%%%%%
-
-for ivar=1:length(Field.ListVarName)
-    VarName=Field.ListVarName{ivar};
-    DataOut.(VarName)=DataOut.(VarName)./NbData.(VarName); % normalize the mean
+if ~ismember(Param.ProjObject.ProjMode,{'inside','outside'})
+    for ivar=1:length(Field.ListVarName)
+        VarName=Field.ListVarName{ivar};
+        DataOut.(VarName)=DataOut.(VarName)./NbData.(VarName); % normalize the mean
+    end
 end
 nbmissing=NbField-nbfiles;
 if nbmissing~=0
-    disp_uvmat('WARNING',[num2str(nbmissing) ' input files are missing or skipted'],checkrun)
+    disp_uvmat('WARNING',[num2str(nbmissing) ' input files are missing or skipped'],checkrun)
 end
 if isempty(time) % time is read from files
@@ -352 +409 @@
 %% writing the result file
 OutputFile=fullfile_uvmat(RootPath{1},OutputDir,RootFile{1},FileExtOut,NomTypeOut,first_i,last_i,first_j,last_j);
-if CheckImage{1} %case of images
+if strcmp(FileExtOut,'.png') %case of images
     if isequal(FileInfo{1}.BitDepth,16)||(numel(FileInfo)==2 &&isequal(FileInfo{2}.BitDepth,16))
         DataOut.A=uint16(DataOut.A);
@@ -361 +418 @@
     end
     disp([OutputFile ' written']);
-else %case of netcdf input file , determine global attributes
+else %case of netcdf  file , determine global attributes
     errormsg=struct2nc(OutputFile,DataOut); %save result file
     if isempty(errormsg)

trunk/src/series/time_series.m

@@ -73 +73 @@
     ParamOut.OutputDirExt='.tseries';%set the output dir extension
     ParamOut.OutputFileMode='NbSlice';% '=NbInput': 1 output file per input file index, '=NbInput_i': 1 file per input file index i, '=NbSlice': 1 file per slice
-    % check the existence of the first file in the series
-        first_j=[];
+    % check for selection of a projection object
+    hseries=findobj(allchild(0),'Tag','series');% handles of the GUI series
+    if  ~isfield(Param,'ProjObject')
+        answer=msgbox_uvmat('INPUT_Y-N','use a projection object for the time_series?');
+        if strcmp(answer,'Yes')
+            hhseries=guidata(hseries);
+            set(hhseries.CheckObject,'Visible','on')
+            set(hhseries.CheckObject,'Value',1)
+            series('CheckObject_Callback',hseries,[],hhseries); %file input with xml reading  in uvmat, show the image in phys coordinates
+        end
+    end
+    % introduce bin size for histograms
+    if Param.CheckObject
+        SeriesData=get(hseries,'UserData');
+        if checkhisto
+             answer=msgbox_uvmat('INPUT_TXT','set bin size for histograms (or keep ''auto'' by default)?','auto');
+            ParamOut.ActionInput.VarMesh=str2double(answer);
+        end
+    end
+    % check the existence of the first and last file in the series
+     first_j=[];
     if isfield(Param.IndexRange,'first_j'); first_j=Param.IndexRange.first_j; end
     last_j=[];
@@ -85 +104 @@
     if ~exist(FirstFileName,'file')
         msgbox_uvmat('WARNING',['the first input file ' FirstFileName ' does not exist'])
-    elseif isequal(size(Param.InputTable,1),1) && ~isfield(Param,'ProjObject')
-        msgbox_uvmat('WARNING','a projection object may be needed to select points for the time_series')
+    else
+        [i1,i2,j1,j2] = get_file_index(Param.IndexRange.last_i,last_j,PairString);
+        LastFileName=fullfile_uvmat(Param.InputTable{1,1},Param.InputTable{1,2},Param.InputTable{1,3},...
+            Param.InputTable{1,5},Param.InputTable{1,4},i1,i2,j1,j2);
+        if ~exist(LastFileName,'file')
+            msgbox_uvmat('WARNING',['the last input file ' LastFileName ' does not exist'])
+        end
     end
     return
@@ -251 +275 @@
 end
 
-nbmissing=0; %number of undetected files
-% for i_slice=1:NbSlice
-%index_slice=i_slice:NbSlice:nbfield;% select file indices of the slice
-nbfile=0;
+nbfile=0;% not used , to check
 nbmissing=0;
-
+VarMesh=NaN;
+checkhisto=0;
+if isfield(Param,'ProjObject') && ismember(Param.ProjObject.ProjMode,{'inside','outside'})
+    checkhisto=1;
+    if isfield(Param.ActionInput,'VarMesh')%case of histograms
+    VarMesh=Param.ActionInput.VarMesh;
+    end
+end
 %%%%%%%%%%%%%%%% loop on field indices %%%%%%%%%%%%%%%%
 for index=1:nbfield
-            update_waitbar(WaitbarHandle,index/nbfield)
+    update_waitbar(WaitbarHandle,index/nbfield)
     if ~isempty(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
         disp('program stopped by user')
@@ -304 +332 @@
         end
         
-        %field projection on an object 
+        %field projection on an object
         if Param.CheckObject
             % calculate tps coefficients if needed
@@ -310 +338 @@
                 Field=tps_coeff_field(Field,check_proj_tps);
             end
-            [Field,errormsg]=proj_field(Field,Param.ProjObject);
+            [Field,errormsg]=proj_field(Field,Param.ProjObject,VarMesh);
             if ~isempty(errormsg)
                 msgbox_uvmat('ERROR',['time_series / proj_field / ' errormsg])
@@ -316 +344 @@
             end
         end
-        nbfile=nbfile+1;
+%         nbfile=nbfile+1;
         
         % initiate the time series at the first iteration
-        if nbfile==1
+        if index==1
             % stop program if the first field reading is in error
             if ~isempty(errormsg)
@@ -326 +354 @@
             end
             DataOut=Field;%default
-%             DataOut.NbDim=Field.NbDim+1; %add the time dimension for plots
             nbvar=length(Field.ListVarName);
             if nbvar==0
@@ -332 +359 @@
                 return
             end
-            testsum=2*ones(1,nbvar);%initiate flag for action on each variable
-            if isfield(Field,'VarAttribute') % look for coordinate and flag variables
+            if checkhisto%case of histograms
+                testsum=zeros(1,nbvar);%initiate flag for action on each variable
+                for ivar=1:numel(Field.ListVarName)% list of variable names before projection (histogram)
+                    VarName=Field.ListVarName{ivar};
+                    if isfield(Data{1},VarName)
+                        testsum(ivar)=1;
+                        DataOut.(VarName)=Field.(VarName);
+                        DataOut.([VarName 'Histo'])=zeros([nbfield numel(DataOut.(VarName))]);
+                        VarMesh=Field.(VarName)(2)-Field.(VarName)(1);
+                    end
+                end
+                disp(['mesh for histogram = ' num2str(VarMesh)])
+            else
+                testsum=2*ones(1,nbvar);%initiate flag for action on each variable
+                if isfield(Field,'VarAttribute') % look for coordinate and flag variables
+                    for ivar=1:nbvar
+                        if length(Field.VarAttribute)>=ivar && isfield(Field.VarAttribute{ivar},'Role')
+                            var_role=Field.VarAttribute{ivar}.Role;%'role' of the variable
+                            if isequal(var_role,'errorflag')
+                                disp_uvmat('ERROR','do not handle error flags in time series',checkrun)
+                                return
+                            end
+                            if isequal(var_role,'warnflag')
+                                testsum(ivar)=0;  % not recorded variable
+                                eval(['DataOut=rmfield(DataOut,''' Field.ListVarName{ivar} ''');']);%remove variable
+                            end
+                            if strcmp(var_role,'coord_x')||strcmp(var_role,'coord_y')||strcmp(var_role,'coord_z')||strcmp(var_role,'coord')
+                                testsum(ivar)=1; %constant coordinates, record without time evolution
+                            end
+                        end
+                        % check whether the variable ivar is a dimension variable
+                        DimCell=Field.VarDimName{ivar};
+                        if ischar(DimCell)
+                            DimCell={DimCell};
+                        end
+                        if numel(DimCell)==1 && isequal(Field.ListVarName{ivar},DimCell{1})%detect dimension variables
+                            testsum(ivar)=1;
+                        end
+                    end
+                end
                 for ivar=1:nbvar
-                    if length(Field.VarAttribute)>=ivar && isfield(Field.VarAttribute{ivar},'Role')
-                        var_role=Field.VarAttribute{ivar}.Role;%'role' of the variable
-                        if isequal(var_role,'errorflag')
-                            disp_uvmat('ERROR','do not handle error flags in time series',checkrun)
-                            return
-                        end
-                        if isequal(var_role,'warnflag')
-                            testsum(ivar)=0;  % not recorded variable
-                            eval(['DataOut=rmfield(DataOut,''' Field.ListVarName{ivar} ''');']);%remove variable
-                        end
-                        if strcmp(var_role,'coord_x')||strcmp(var_role,'coord_y')||strcmp(var_role,'coord_z')||strcmp(var_role,'coord')
-                            testsum(ivar)=1; %constant coordinates, record without time evolution
-                        end
-                    end
-                    % check whether the variable ivar is a dimension variable
-                    DimCell=Field.VarDimName{ivar};
-                    if ischar(DimCell)
-                        DimCell={DimCell};
-                    end
-                    if numel(DimCell)==1 && isequal(Field.ListVarName{ivar},DimCell{1})%detect dimension variables
-                        testsum(ivar)=1;
-                    end
-                end
-            end
-            for ivar=1:nbvar
-                if testsum(ivar)==2
-                    eval(['DataOut.' Field.ListVarName{ivar} '=[];'])
+                    if testsum(ivar)==2
+                        VarName=Field.ListVarName{ivar};
+                        siz=size(Field.(VarName));
+                        DataOut.(VarName)=zeros([nbfield siz]);
+                    end
                 end
             end
@@ -368 +411 @@
         
         % add data to the current field
-        for ivar=1:length(Field.ListVarName)
-            VarName=Field.ListVarName{ivar};
-            VarVal=Field.(VarName);
-            if testsum(ivar)==2% test for recorded variable
-                if isempty(errormsg)
-                    if Param.CheckObject && strcmp(Param.ProjObject.ProjMode,'inside')% take the average in the domain for 'inside' projection mode
-                        if isempty(VarVal)
-                            disp_uvmat('ERROR',['empty result at frame index ' num2str(i1_series{iview}(index))],checkrun)
-                            return
-                        end
-                        VarVal=mean(VarVal,1);
-                    end
-                    VarVal=shiftdim(VarVal,-1); %shift dimension
-                    DataOut.(VarName)=cat(1,DataOut.(VarName),VarVal);%concanete the current field to the time series
-                else
-                    DataOut.(VarName)=cat(1,DataOut.(VarName),0);% put each variable to 0 in case of input reading error
+        if checkhisto
+            for ivar=1:length(Field.ListVarName)
+                VarName=Field.ListVarName{ivar};
+                if isfield(Data{1},VarName)
+                    MaxValue=max(DataOut.(VarName));% current max of histogram absissa
+                    MinValue=min(DataOut.(VarName));% current min of histogram absissa
+                    MaxIndex=round(MaxValue/VarMesh);
+                    MinIndex=round(MinValue/VarMesh);
+                    MaxIndex_new=round(max(Field.(VarName)/VarMesh));% max of the current field
+                    MinIndex_new=round(min(Field.(VarName)/VarMesh));
+                    if MaxIndex_new>MaxIndex% the variable max for the current field exceeds the previous one
+                        DataOut.(VarName)=[DataOut.(VarName) VarMesh*(MaxIndex+1:MaxIndex_new)];% append the new variable values
+                        DataOut.([VarName 'Histo'])=[DataOut.([VarName 'Histo']) zeros(nbfield,MaxIndex_new-MaxIndex)]; % append the new histo values
+                    end
+                    if MinIndex_new <= MinIndex-1
+                        DataOut.(VarName)=[VarMesh*(MinIndex_new:MinIndex-1) DataOut.(VarName)];% insert the new variable values
+                        DataOut.([VarName 'Histo'])=[zeros(nbfield,MinIndex-MinIndex_new) DataOut.([VarName 'Histo'])];% insert the new histo values
+                        ind_start=1;
+                    else
+                        ind_start=MinIndex_new-MinIndex+1;
+                    end
+                    DataOut.([VarName 'Histo'])(index,ind_start:ind_start+MaxIndex_new-MinIndex_new)=...
+                        DataOut.([VarName 'Histo'])(index,ind_start:ind_start+MaxIndex_new-MinIndex_new)+Field.([VarName 'Histo']);
                 end
-            elseif testsum(ivar)==1% variable representing fixed coordinates
-                VarInit=DataOut.(VarName);
-                if isempty(errormsg) && ~isequal(VarVal,VarInit)
-                    disp_uvmat('ERROR',['time series requires constant coordinates ' VarName ': use projection mode interp'],checkrun)
-                    return
+            end
+        else
+            for ivar=1:length(Field.ListVarName)
+                VarName=Field.ListVarName{ivar};
+                VarVal=Field.(VarName);
+                if testsum(ivar)==2% test for recorded variable
+                    if isempty(errormsg)                     
+                        VarVal=shiftdim(VarVal,-1); %shift dimension
+                        DataOut.(VarName)(index,:,:)=VarVal;%concanete the current field to the time series
+                    end
+                elseif testsum(ivar)==1% variable representing fixed coordinates
+                    VarInit=DataOut.(VarName);
+                    if isempty(errormsg) && ~isequal(VarVal,VarInit)
+                        disp_uvmat('ERROR',['time series requires constant coordinates ' VarName ': use projection mode interp'],checkrun)
+                        return
+                    end
                 end
             end
@@ -397 +458 @@
         if isempty(time)% time not set by xml filer(s)
             if isfield(Data{1},'Time')
-                DataOut.Time(nbfile,1)=Field.Time;
+                DataOut.Time(index,1)=Field.Time;
             else
-                DataOut.Time(nbfile,1)=index;%default
+                DataOut.Time(index,1)=index;%default
             end
         else % time from ImaDoc prevails  TODO: correct
-            DataOut.Time(nbfile,1)=time(index);%
+            DataOut.Time(index,1)=time(index);%
         end
         
@@ -411 +472 @@
         end
     end
-    
 end
 %%%%%%% END OF LOOP WITHIN A SLICE
@@ -456 +516 @@
 end
 
+%case of histograms
+if checkhisto
+    for ivar=1:numel(Field.ListVarName)
+        VarName=Field.ListVarName{ivar};
+        if isfield(Data{1},VarName)
+            DataOut.ListVarName=[DataOut.ListVarName {[VarName 'Histo']}];
+            DataOut.VarDimName=[DataOut.VarDimName {{'Time',VarName}}];
+        end
+    end
+end
 % display nbmissing
 if ~isequal(nbmissing,0)

trunk/src/set_object.m

@@ -455 +455 @@
 %% read the object parameters in the GUI set_object
 ObjectData=read_GUI(handles.set_object);%read the parameters defining the object in the GUI set_object
+if isfield(ObjectData,'CoordLine')% remove CoordLine (not used as object feature)
+    ObjectData=rmfield(ObjectData,'CoordLine');
+end
 if iscell(ObjectData.Coord)%check for empty line
     ObjectData.Coord=[0 0 0];
@@ -650 +653 @@
 % ------------------------------------------------------
 Object=read_GUI(handles.set_object);
+if isfield(Object,'CoordLine')% remove CoordLine (not used as object feature)
+    Object=rmfield(Object,'CoordLine');
+end
 huvmat=findobj('Tag','uvmat');
 if isempty(huvmat)

trunk/src/transform_field/phys.m

@@ -86 +86 @@
         return % transform only fields in pixel coordinates
     end
-    DataOut=phys_1(DataIn,Calib{1},ZIndex);% transform coordiantes and velocity components
+    DataOut=phys_1(DataIn,Calib{1},ZIndex);% transform coordinates and velocity components
     %case of images or scalar: in case of two input fields, we need to project the transform  on the same regular grid
     if isfield(DataIn,'A') && isfield(DataIn,'Coord_x') && ~isempty(DataIn.Coord_x) && isfield(DataIn,'Coord_y')&&...
@@ -117 +117 @@
     end
     if (isfield(DataIn_1,'CoordUnit')&& strcmp(DataIn_1.CoordUnit,'pixel'))
-%         return % transform only fields in pixel coordinates
-%     end
-    DataOut_1=phys_1(DataOut_1,Calib{2},ZIndex);
+        DataOut_1=phys_1(DataOut_1,Calib{2},ZIndex);
     end
     if isfield(Calib{1},'SliceCoord')
@@ -125 +123 @@
             DataOut_1.Txt='different plane positions for the two input fields';
             return
-        end        
+        end
         DataOut_1.PlaneCoord=DataOut.PlaneCoord;% same plane position for the two input fields
         if isfield(Calib{1},'SliceAngle')
@@ -190 +188 @@
         DataOut.V=(YOut_2-YOut_1)/Dt;
     end
-%     if ~strcmp(Calib.CalibrationType,'rescale') && isfield(Data,'X_tps') && isfield(Data,'Y_tps') 
-%         [DataOut.X_tps,DataOut.Y_tps]=phys_XYZ(Calib,Data.X,Data.Y,ZIndex);
-%     end
 end
 

trunk/src/uvmat.m

@@ -44 +44 @@
 %          .Field: cell array of 1 or 2 structures representing the current  input field(s)
 %          .PlotAxes: field structure representing the current field plotted  on the main axes  (used for mouse operations)
-%          .HistoAxes: idem for histogram axes
+%          .HistoAxes: idem for Histogram axes
 
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%   DATA FLOW  (for REFRESH_Callback) %%%%%%%%%%%%%%%%%%%%:
@@ -69 +69 @@
 %                        (tps_coeff_field.m)               calculate tps coefficients (for filter projection or spatial derivatives).
 %                            |
-%                       UvData.Field-------------->histogram
+%                       UvData.Field-------------->Histogram
 %               _____________|____________
 %              |                          |                    
@@ -358 +358 @@
 %% reset position of text_display and TableDisplay
 set(handles.text_display,'Units','pixels')
+set(handles.TableDisplay,'Units','pixels')
 pos_1=get(handles.text_display,'Position');% [lower x lower y width height] for text_display
     pos_1(3)=1.2*ColumnWidth;
@@ -363 +364 @@
 pos_1(2)=size_fig(4)-pos_InputFile(4)-pos_1(4);             % set text display to the top of the fig
 set(handles.text_display,'Position',pos_1)
-set(handles.TableDisplay,'Position',pos_1)
+set(handles.TableDisplay,'Position',[pos_1(1) 10 pos_1(3) 5*pos_1(4)])
 % reset position of CheckTable
 set(handles.CheckTable,'Units','pixels')
@@ -2556 +2557 @@
     msgbox_uvmat('ERROR',errormsg);
 end
+set(handles.runplus,'BackgroundColor',[1 0 0])%paint the command button back in red
 
 %------------------------------------------------------------------------
@@ -2574 +2576 @@
     msgbox_uvmat('ERROR',errormsg);
 end
+set(handles.runmin,'BackgroundColor',[1 0 0])%paint the command button back in red
 
 %------------------------------------------------------------------------
@@ -3614 +3617 @@
 if UvData.Field.NbDim<=1
     set(handles.Objects,'Visible','off')
+    set(handles.CheckFixAspectRatio,'Value',0)
     [PlotType,PlotParamOut,haxes]=plot_field(UvData.Field,handles.PlotAxes,read_GUI(handles.uvmat));
     UvData.PlotAxes=UvData.Field; %store data for further plot modifications
@@ -3622 +3626 @@
         end
     end
+    set(handles.Histogram,'Visible','off')
+    set(handles.HistoMenu,'Visible','off')
+    set(handles.HistoAxes,'Visible','off')
+    hlegend=findobj(handles.uvmat,'Tag','HistoLegend');
+    if ~isempty(hlegend)
+        delete(hlegend)
+    end
+    cla(handles.HistoAxes)% clear the curves and legend in histogram axes
     set(handles.uvmat,'UserData',UvData)
 %% 2D or 3D fieldname are generally projected
@@ -3690 +3702 @@
         PlotParam{1}.Vectors.ColorCode= {'rgb'};
     end
-    %PosColorbar{1}=UvData.OpenParam.PosColorbar;%prescribe the colorbar position on the uvmat interface
     
     %% second projection object (view_field display)
@@ -3699 +3710 @@
             haxes(2)=plot_handles{2}.PlotAxes;
             PlotParam{2}=read_GUI(view_field_handle);
-            %PosColorbar{2}='*'; %TODO: deal with colorbar position on view_field
         end
     end
     
-    %% loop on the projection objects: one or two
-    
+    %% loop on the projection objects: one or two 
     for imap=1:numel(IndexObj)
         iobj=IndexObj(imap);
@@ -3758 +3767 @@
         set(handles.uvmat,'UserData',UvData)
         if ~isempty(ObjectData)
-            %PlotType='none'; %default
             if imap==2 && isempty(view_field_handle)
                 view_field(ObjectData)
@@ -3772 +3780 @@
                         set_object('ProjMode_Callback',hset_object,[],hhset_object); 
                     end
-%                     errormsg=PlotType;
                     return
                 end
@@ -3797 +3804 @@
     end
     
-    %% prepare the menus of histograms and plot them (histogram of the whole volume in 3D case)
+    %% prepare the menus of histograms and plot them (Histogram of the whole volume in 3D case)
     menu_histo=(UvData.Field.ListVarName)';%list of field variables to be displayed for the menu of histogram display
     ind_skip=[];
@@ -3803 +3810 @@
     Ustring='';
     Vstring='';
-    % suppress axes from the histogram menu
+    % suppress axes from the Histogram menu
     for ivar=1:numel(menu_histo)%l loop on field variables:
         if isfield(UvData.Field,'VarAttribute') && numel(UvData.Field.VarAttribute)>=ivar && isfield(UvData.Field.VarAttribute{ivar},'Role')
@@ -3838 +3845 @@
     test_v=0;
     if ~isempty(menu_histo)
-        set(handles.histo1_menu,'Value',1)
-        set(handles.histo1_menu,'String',menu_histo)
-        histo1_menu_Callback(handles.histo1_menu, [], handles)% plot first histogram
+        set(handles.HistoMenu,'Value',1)
+        set(handles.HistoMenu,'String',menu_histo)
+        set(handles.Histogram,'Visible','on')
+        set(handles.HistoMenu,'Visible','on')
+        set(handles.HistoAxes,'Visible','on')
+        HistoMenu_Callback(handles.HistoMenu, [], handles)% plot first histogram
     end
 end
@@ -3852 +3862 @@
 
 %------------------------------------------------------------------------
-function histo1_menu_Callback(hObject, eventdata, handles)
+function HistoMenu_Callback(hObject, eventdata, handles)
 %--------------------------------------------
 %% get the current field stored in uvmat user data
@@ -3858 +3868 @@
 Field=UvData.Field;
 
-%% get from the menu 'histo1_menu' the name(s) of the fields to use
-histo_menu=get(handles.histo1_menu,'String');
-histo_value=get(handles.histo1_menu,'Value');
+%% get from the menu 'HistoMenu' the name(s) of the fields to use
+histo_menu=get(handles.HistoMenu,'String');
+histo_value=get(handles.HistoMenu,'Value');
 FieldName=histo_menu{histo_value};
 r=regexp(FieldName,'(?<var1>.*)(?<sep>,)(?<var2>.*)','names');
@@ -3902 +3912 @@
 end
 
-%% calculate and plot histogram
+%% calculate and plot Histogram
 if isempty(Field)
     msgbox_uvmat('ERROR',['empty field ' FieldName])
@@ -3935 +3945 @@
             Histo.VarAttribute{1}.units=units;
         end
-        Histo.(FieldName)=linspace(Amin,Amax,50); %absissa values for histo
+        VarMesh=(Amax-Amin)/100;
+        ord=10^(floor(log10(VarMesh)));%order of magnitude
+        if VarMesh/ord >=5
+            VarMesh=5*ord;
+        elseif VarMesh/ord >=2
+            VarMesh=2*ord;
+        else
+            VarMesh=ord;
+        end
+        Amin=VarMesh*(ceil(Amin/VarMesh));
+        Amax=VarMesh*(floor(Amax/VarMesh));
+        Histo.(FieldName)=Amin:VarMesh:Amax; %absissa values for histo
         if isfield(Field,'NbDim') && isequal(Field.NbDim,3)
             C=reshape(double(FieldHisto),1,[]);% reshape in a vector
@@ -3947 +3968 @@
         end
         plot_field(Histo,handles.HistoAxes);
-        hlegend=legend;
+        hlegend=findobj(handles.uvmat,'Tag','HistoLegend');
+        if isempty(hlegend)
+            hlegend=legend;
+            set(hlegend,'Tag','HistoLegend')
+        end
         if isempty(FieldName_2)
-        set(hlegend,'String',FieldName)
+            set(hlegend,'String',FieldName)
         else
             set(hlegend,'String',{FieldName;FieldName_2})
@@ -4677 +4702 @@
         data.CoordType=UvData.CoordType;
     end
-    if isfield(UvData.Field,'CoordMesh')&~isempty(UvData.Field.CoordMesh)
+    if isfield(UvData.Field,'CoordMesh')&& ~isempty(UvData.Field.CoordMesh)
         data.RangeX=[UvData.Field.XMin UvData.Field.XMax];
         data.RangeY=[UvData.Field.YMin UvData.Field.YMax];
         data.DX=UvData.Field.CoordMesh;
         data.DY=UvData.Field.CoordMesh;
-    elseif isfield(UvData.Field,'Coord_x')&isfield(UvData.Field,'Coord_y')& isfield(UvData.Field,'A')%only image
+    elseif isfield(UvData.Field,'Coord_x')&& isfield(UvData.Field,'Coord_y') && isfield(UvData.Field,'A')%only image
         np=size(UvData.Field.A);
         meshx=(UvData.Field.Coord_x(end)-UvData.Field.Coord_x(1))/np(2);
@@ -5686 +5711 @@
     set(handles.PlotAxes,'Visible','on')
     set(handles.text_display,'Visible','on')
-    if isfield(handles,'TableDisplay')
-    set(handles.TableDisplay,'Visible','off')
-    end
+%     if isfield(handles,'TableDisplay')
+%     set(handles.TableDisplay,'Visible','off')
+%     end
     Coordinates=PlotParam.Axes;
     if isfield(Coordinates,'CheckFixAspectRatio')