Changeset 193

Timestamp:

Feb 20, 2011, 10:42:19 AM (13 years ago)

Author:

sommeria

Message:

improves the use of get_field, no projection object by default in uvmat( allows usual 1D plots),

various bug repairs, elimination of get_plot_handles.m (not useful)

Location:

trunk/src

Files:

• check_functions.m (modified) (3 diffs)
• get_field.m (modified) (2 diffs)
• mouse_up.m (modified) (4 diffs)
• plot_field.m (modified) (22 diffs)
• proj_field.m (modified) (1 diff)
• set_object.m (modified) (3 diffs)
• uvmat.fig (modified) (previous)
• uvmat.m (modified) (31 diffs)
• view_field.fig (modified) (previous)
• view_field.m (modified) (6 diffs)
• write_plot_param.m (modified) (3 diffs)

trunk/src/check_functions.m

@@ -47 +47 @@
           'get_field';...% choose and plot a field from a Netcdf file
           'get_field.fig';...%interface for get_field
-          'get_plot_handles';... %provides handles of elements setting the plotting parameters in the uvmat interface
           'griddata_uvmat';...%make 2D linear interpolation using griddata, with input appropriate for both Matlab 6.5 and 7
           'hist_update';...%  update of a current global histogram by inclusion of a new field  
@@ -92 +91 @@
 icount=0;
 % loop on the list of functions in the uvmat package
+datnum=zeros(1,length(list_fct));
  for i=1:length(list_fct)
     dir_fct=which(list_fct{i});% path to fct
@@ -104 +104 @@
        end
        datfile=dir(dir_fct);
-       date_str=datfile.date;%string of the date of last modification
-       datnum(i)=0;%default
-       try 
-           datnum(i)=datenum(date_str);
-       catch
-           datnum(i)=0;%in case of error with datenum (e.g. date in french)
+       if isfield(datfile,'datenum')
+          datnum(i)= datfile.datenum;
        end
+%        date_str=datfile.date;%string of the date of last modification
+%        datnum(i)=0;%default
+%        try 
+%            datnum(i)=datenum(date_str);
+%        catch
+%            datnum(i)=0;%in case of error with datenum (e.g. date in french)
+%        end
    end
 end

trunk/src/get_field.m

@@ -812 +812 @@
         uvmat(inputfile)
     else
+        set(huvmat,'Visible','on')%make uvmat visible (bugs can hide it in some cases)
         hhuvmat=guidata(huvmat);
         uvmat('run0_Callback',hObject,eventdata,hhuvmat); % display field in uvmat
@@ -835 +836 @@
 function plot_get_field(SubField,handles)
 %------------------------------------------------------------------------
-list_fig=get(handles.list_fig,'String');
+list_fig=get(handles.list_fig,'String')
 val=get(handles.list_fig,'Value');
 if strcmp(list_fig{val},'uvmat')

trunk/src/mouse_up.m

@@ -138 +138 @@
 %                 testmask=get(hmask,'Value');
 %              end
-%              if testmask
-%                  PlotHandles=[];%do not project data on the object during mask creation
-%              else
-           % PlotHandles=get_plot_handles(handles);%get the handles of the graphic objects setting the plotting parameters
-%              end
 
             %% update the object representation
@@ -153 +148 @@
             UvData.Object=update_obj(UvData,IndexObj_1,IndexObj_2);
 
-            %% plot the field projected on the object and store it on the corresponding figure
+            %% plot the field projected on the object 
             ProjData= proj_field(UvData.Field,ObjectData);%project the current interface field on ObjectData
             if ~isempty(ProjData)
                 if strcmp(tagfig,'uvmat')% uvmat plot selected, projection plot seen on view_field
-                    %             if strcmp(projview,'view_field')
                     hview_field=findobj(allchild(0),'tag','view_field');
                     if isempty(hview_field)
@@ -165 +159 @@
                     ViewFieldData.axes3=ProjData;
                     set(hview_field,'UserData',ViewFieldData)
-%                     PlotHandles=guidata(hview_field);
+                    hh_plotfield=guidata(hview_field);
                 else
                     UvData.axes3=ProjData;
-%                     PlotHandles=hhuvmat;
+                    hh_plotfield=hhuvmat;
                 end
-                [PlotType,PlotParam]=plot_field(ProjData,hhcurrentfig.axes3,hhcurrentfig);%update an existing field plot
-                write_plot_param(hhcurrentfig,PlotParam); %update the display of plotting parameters for the current object
-            end
-            %             if  isfield(UvData.Object{IndexObj},'PlotParam')
-            %                 write_plot_param(PlotHandles,UvData.Object{IndexObj}.PlotParam); %update the display of plotting parameters for the current object
-            %             end
+                [PlotType,PlotParam]=plot_field(ProjData,hh_plotfield.axes3,read_plot_param(hh_plotfield));%update an existing field plot
+                write_plot_param(hh_plotfield,PlotParam); %update the display of plotting parameters for the current object
+            end
             set(hhuvmat.edit_object,'BackgroundColor',[1 1 0]);% paint the edit text in yellow
             set(hhuvmat.edit_object,'Value',1);%
@@ -248 +239 @@
                 ChildAxeData.ParentRect=AxeData.CurrentRectZoom;%set the rectangle as a 'parent' associated to the new axe
                 PosRect=CurrentOrigin;
-                xy=get(currentaxes,'CurrentPoint')%xy(1,1),xy(1,2): current x,y positions in axes coordinates
+                xy=get(currentaxes,'CurrentPoint');%xy(1,1),xy(1,2): current x,y positions in axes coordinates
                 set(AxeData.ZoomAxes,'Xlim',[PosRect(1) xy(1,1)])
                 set(AxeData.ZoomAxes,'Ylim',[PosRect(2) xy(1,2)])

trunk/src/plot_field.m

@@ -134 +134 @@
 if testnewfig
     hfig=figure;
-%     if isfield(PlotParam,'text_display_1') && ishandle(PlotParam.text_display_1)
-%         set(hfig,'UserData',PlotParam)
-%     end
     set(hfig,'Units','normalized')
-%     set(hfig,'WindowButtonDownFcn','mouse_down')
-%     set(hfig,'WindowButtonMotionFcn','mouse_motion')%set mouse action function
-%     set(hfig,'WindowButtonUpFcn','mouse_up')%set mouse action function
     haxes=axes;
     set(haxes,'position',[0.13,0.2,0.775,0.73])
@@ -161 +155 @@
     %% check the cells of fields :
     [CellVarIndex,NbDim,VarType,errormsg]=find_field_indices(Data);
-
     if ~isempty(errormsg)
         msgbox_uvmat('ERROR',['input of plot_field/find_field_indices: ' errormsg]);
@@ -202 +195 @@
 errormsg=[];
 AxeData=get(haxes,'UserData');
+if isempty(index_2D)
+    plot_plane([],[],[],haxes);%removes images or vector plots if any
+else
+    [xx,PlotParamOut,PlotType,errormsg]=plot_plane(Data,CellVarIndex(index_2D),VarType(index_2D),haxes,PlotParam,PosColorbar);
+    AxeData.NbDim=2;
+    if testzoomaxes && isempty(errormsg)
+        [zoomaxes,PlotParamOut,xx,errormsg]=plot_plane(Data,CellVarIndex(index_2D),VarType(index_2D),zoomaxes,PlotParam,PosColorbar);
+        AxeData.ZoomAxes=zoomaxes;
+    end
+    %remove coordinates variables from 1D plot
+    for ivar=1:length(index_1D)
+        if isequal(CellVarIndex{index_1D(ivar)},VarType{index_1D(ivar)}.coord)
+            index_1D(ivar)=0;
+        end
+    end
+    index_1D=find(index_1D);
+end
+
 if isempty(index_1D)
      plot_profile([],[],[],haxes);%
@@ -211 +222 @@
         end
         PlotType='line';
-end
-
-if isempty(index_2D)
-    plot_plane([],[],[],haxes);%removes images or vector plots if any
-else
-         [xx,PlotParamOut,PlotType,errormsg]=plot_plane(Data,CellVarIndex(index_2D),VarType(index_2D),haxes,PlotParam,PosColorbar);
-         AxeData.NbDim=2;
-            if testzoomaxes && isempty(errormsg)
-                [zoomaxes,PlotParamOut,xx,errormsg]=plot_plane(Data,CellVarIndex(index_2D),VarType(index_2D),zoomaxes,PlotParam,PosColorbar);
-                AxeData.ZoomAxes=zoomaxes;
-            end
 end
 htext=findobj(hfig,'Tag','text_display');
@@ -374 +374 @@
     else
         coord_x_index_cell=VarType{icell}.coord(1);
-         if isequal(coord_x_index_cell,0)
+        if isequal(coord_x_index_cell,0)
              continue  % the cell has no abscissa, skip it
-         end
-%         if ~isempty(coord_x_index)&&~isequal(coord_x_index_cell,coord_x_index)
-%             %continue %all the selected variables must have the same first dimension
-%         else
-%             coord_x_index=coord_x_index_cell;
-%         end
-          coord_x_index=coord_x_index_cell;
+        end
+        coord_x_index=coord_x_index_cell;
     end
     testplot=ones(size(data.ListVarName));%default test for plotted variables
@@ -393 +388 @@
     end
     eval(['coord_x{icell}=data.' data.ListVarName{coord_x_index} ';']);%coordinate variable set as coord_x
+    XMin(icell)=min(coord_x{icell});
+    XMax(icell)=max(coord_x{icell});
     testplot(coord_x_index)=0;
     if ~isempty(VarType{icell}.ancillary')
@@ -425 +422 @@
             end
             eval(['data.' VarName '=squeeze(data.' VarName ');'])
+            eval(['YMin(ivar)=min(data.' VarName ');'])
+            eval(['YMax(ivar)=max(data.' VarName ');'])
             plotstr=[plotstr 'coord_x{' num2str(icell) '},data.' VarName ',' charplot_0 ','];
             eval(['nbcomponent2=size(data.' VarName ',2);']);
@@ -431 +430 @@
                 coord_x{icell}=linspace(coord_x{icell}(1),coord_x{icell}(2),nbcomponent1);
             end
-            %eval(['varmean=mean(double(data.' VarName '));']);%mean value
-            %textmean=[textmean; {[VarName 'mean= ' num2str(varmean,4)]}];
             if nbcomponent1==1|| nbcomponent2==1
                 legend_str=[legend_str {VarName}]; %variable with one component
@@ -442 +439 @@
         end
     end
+    YMin_cell(icell)=min(YMin);
+    YMax_cell(icell)=max(YMax);
 end
 
@@ -447 +446 @@
 if test_newplot && ~isequal(plotstr,'hhh=plot(')  
     set(hfig,'CurrentAxes',haxes)
-    tag=get(haxes,'tag');
-    
+    tag=get(haxes,'tag');    
     %%%
     plotstr=[plotstr '''tag'',''plot_line'');'];   
     eval(plotstr)                  %execute plot (instruction  plotstr)
     %%%
-    
     set(haxes,'tag',tag)
     grid(haxes, 'on')
@@ -499 +496 @@
 end
 
+%% determine axes bounds
+ fix_lim=isfield(PlotParam,'FixLimits') && PlotParam.FixLimits;
+if fix_lim
+    if ~isfield(PlotParam,'MinX')||~isfield(PlotParam,'MaxX')||~isfield(PlotParam,'MinY')||~isfield(PlotParam,'MaxY')
+        fix_lim=0; %free limits if lits are not set,
+    end  %else PlotParamOut.XMin =PlotParam.XMin...
+end
+if ~fix_lim
+    PlotParamOut.MinX=min(XMin);
+    PlotParamOut.MaxX=max(XMax);
+    PlotParamOut.MinY=min(YMin_cell);
+    PlotParamOut.MaxY=max(YMax_cell);
+end
 
 %-------------------------------------------------------------------
@@ -521 +531 @@
 hcol=findobj(hfig,'Tag','Colorbar'); %look for colorbar axes
 hima=findobj(haxes,'Tag','ima');% search existing image in the current axes
-errormsg=[];%default
+errormsg='';%default
 test_ima=0; %default: test for image or map plot
 test_vec=0; %default: test for vector plots
@@ -661 +671 @@
             end
             if test_interp_X  
-                npxy(1)=max([256 floor((AX(end)-AX(1))/DAX_min) floor((AX(end)-AX(1))/DAX_max)]);
+                npxy(2)=max([256 floor((AX(end)-AX(1))/DAX_min) floor((AX(end)-AX(1))/DAX_max)]);
                 xI=linspace(AX(1),AX(end),npxy(2));   
                 if ~test_interp_Y
@@ -1033 +1043 @@
 
 %store the coordinate extrema occupied by the field
-Data
 if ~isempty(Data)
     fix_lim=isfield(PlotParam,'FixLimits') && PlotParam.FixLimits;
@@ -1041 +1050 @@
         end  %else PlotParamOut.XMin =PlotParam.XMin...
     end
-    'TESTfix'
-    fix_lim
     if ~fix_lim
         XMin=[];
@@ -1110 +1117 @@
 rot=alpha*[cos(theta) -sin(theta); sin(theta) cos(theta)]';
 %find the existing lines
-%h=findobj(gca,'Type','Line');% search existing lines in the current axes
 h=findobj(haxes,'Tag','vel');% search existing lines in the current axes
 sizh=size(h);
 set(h,'EraseMode','xor');
 set(haxes,'NextPlot','replacechildren');
-      
+
 %drawnow
 %create lines (if no lines) or modify them
@@ -1125 +1131 @@
 
 for icolor=1:ncolor
-    %determine the line positions for each color icolor 
+    %determine the line positions for each color icolor
     ind=find(col_vec==icolor);
     xc=x(ind);
@@ -1134 +1140 @@
     xN=NaN*ones(size(xc));
     matx=[xc(:)-uc(:)/2 xc(:)+uc(:)/2 xN(:)]';
-%     matx=[xc(:) xc(:)+uc(:) xN(:)]';
+    %     matx=[xc(:) xc(:)+uc(:) xN(:)]';
     matx=reshape(matx,1,3*n(2));
     maty=[yc(:)-vc(:)/2 yc(:)+vc(:)/2 xN(:)]';
-%     maty=[yc(:) yc(:)+vc(:) xN(:)]';
+    %     maty=[yc(:) yc(:)+vc(:) xN(:)]';
     maty=reshape(maty,1,3*n(2));
     
@@ -1149 +1155 @@
     y2=yc+vc/2;
     y3=yc+vc/2-arrowmoins(2,:);
-%     x1=xc+uc-arrowplus(1,:);
-%     x2=xc+uc;
-%     x3=xc+uc-arrowmoins(1,:);
-%     y1=yc+vc-arrowplus(2,:);
-%     y2=yc+vc;
-%     y3=yc+vc-arrowmoins(2,:);
     matxar=[x1(:) x2(:) x3(:) xN(:)]';
     matxar=reshape(matxar,1,4*n(2));
@@ -1160 +1160 @@
     matyar=reshape(matyar,1,4*n(2));
     %draw the line or modify the existing ones
-  %    hx = [x1;x2;x3];
-  %    hy = [y1;y2;y3];
-    tri=reshape(1:3*length(uc),3,[])';
-    %d = tri(:,[1 2 3 1])'; 
-    
+    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
-        %axes(haxes)
-      %  hfig=get(haxes,'parent');
-%         axes(haxes)
-      %  set(0,'CurrentFigure',hfig)
-       % set(hfig,'CurrentAxes',haxes)
         if ~isn(1) %if the vectors are visible color not nan
             if n(2)>0
@@ -1177 +1168 @@
                 line(matx,maty,'Color',colorlist(icolor,:),'Tag','vel');% plot new lines
                 line(matxar,matyar,'Color',colorlist(icolor,:),'Tag','vel');% plot arrows
-%                 fill(hx(d),hy(d),colorlist(icolor,:),'EdgeColor','none','
-%                 Tag','Vel');
-          end
+            end
         end
     else
-        if isn(1) 
+        if isn(1)
             delete(h(2*icolor-1))
             delete(h(2*icolor))
@@ -1193 +1182 @@
             set(h(2*icolor),'EraseMode','xor');
         end
-     end
+    end
 end
 if sizh(1) > 2*ncolor

trunk/src/proj_field.m

@@ -2050 +2050 @@
                     ICOMB=(XIMA-1)*DimValue(1)+YIMA;
                     ICOMB=ICOMB(flagin);%index corresponding to XIMA and YIMA in the aligned original image vec_A
-                    vec_B(ind_in,[1:nbcolor])=vec_A(ICOMB,:); 
+                    vec_B(ind_in,1:nbcolor)=vec_A(ICOMB,:); 
                     for icolor=1:nbcolor
                         vec_B(ind_out,icolor)=zeros(size(ind_out));

trunk/src/set_object.m

@@ -703 +703 @@
 testnew=0;
 ObjectData=read_set_object(handles);%read the input parameters defining the object in the GUI set_object
-PlotHandles=get_plot_handles(hhuvmat);
-projview='view_field';%default
 if strcmp(ListObject{IndexObj_1},ObjectName)% we are editing the object whose projection is viewed in the uvmat frame
     IndexObj=IndexObj_1;
     projview='uvmat';
-     plotaxes=hhuvmat.axes3;%handle of axes3 in view_field
 elseif ~isempty(IndexObj_2) && IndexObj_2<=numel(ListObject)&& strcmp(ListObject{IndexObj_2},ObjectName)% we are editing the object whose projection is viewed in view_field  
     IndexObj=IndexObj_2;
+    projview='view_field';
 else %new object 
     testnew=1;
     IndexObj=numel(ListObject)+1;
-    hview_field=findobj(allchild(0),'tag','view_field');
-    if ~isempty(hview_field)
-        PlotHandles=guidata(hview_field);
-        plotaxes=PlotHandles.axes3;%handle of axes3 in view_field
-    end
+    projview='view_field';
 end
 if strcmp(projview,'view_field')
@@ -728 +722 @@
     PlotHandles=guidata(hview_field);
     plotaxes=PlotHandles.axes3;%handle of axes3 in view_field
+else
+    PlotHandles=hhuvmat;
+    plotaxes=hhuvmat.axes3;%handle of axes3 in view_field
 end   
-
 
 %% naming the object
@@ -780 +776 @@
 %% plot the field projected on the object and store in the corresponding figue
 ProjData= proj_field(UvData.Field,ObjectData);%project the current interface field on ObjectData
-[PlotType,Object_out{IndexObj}.PlotParam,plotaxes]=plot_field(ProjData,plotaxes,PlotHandles);%update an existing field plot
+PlotParam=read_plot_param(PlotHandles);
+[PlotType,Object_out{IndexObj}.PlotParam,plotaxes]=plot_field(ProjData,plotaxes,PlotParam);%update an existing field plot
 
 %% update the GUI uvmat

trunk/src/uvmat.m

@@ -201 +201 @@
 function uvmat_OpeningFcn(hObject, eventdata, handles, input )
 %------------------------------------------------------------------------
-global nb_builtin
-
-% Choose default command menuline output for uvmat
+
+%% Choose default command menuline output for uvmat (standard GUI)
 handles.output = hObject;
 
-% Update handles structure
+%% Update handles structure (standard GUI)
 guidata(hObject, handles);
 
-% set the position of colorbar and ancillary GUIs:
+%% set the position of colorbar and ancillary GUIs:
 set(hObject,'Units','Normalized')
 movegui(hObject,'center')
@@ -223 +222 @@
 set(handles.axes3,'UserData',AxeData)
 
-%functions for the mouse and keyboard
+%% set functions for the mouse and keyboard
 set(handles.histo_u,'NextPlot','replacechildren');
 set(handles.histo_v,'NextPlot','replacechildren');
@@ -232 +231 @@
 set(hObject,'DeleteFcn',{@closefcn})%
 
-%refresh projection plane
-UvData.Object{1}.Style='plane';%main plotting plane
+%% refresh projection plane
+%UvData.Object{1}.Style='plane';%main plotting plane
 UvData.Object{1}.ProjMode='projection';%main plotting plane
 if ~isfield(UvData.Object{1},'plotaxes')
     UvData.Object{1}.plotaxes=handles.axes3;%default plotting axis
     set(handles.list_object_1,'Value',1);
-    set(handles.list_object_1,'String',{'1-PLANE'});
+   % set(handles.list_object_1,'String',{'1-PLANE'});
+   set(handles.list_object_1,'String',{''});
 end
 set(handles.Fields,'Value',1)
-set(handles.Fields,'string',{''})%TODO:  PUT IN THE GUI
-
-%TRANSFORM menu: builtin fcts
+set(handles.Fields,'string',{''})
+
+%% TRANSFORM menu: builtin fcts
 menu_str={'';'phys';'px';'phys_polar'};
-nb_builtin=numel(menu_str); %number of functions
+UvData.OpenParam.NbBuiltin=numel(menu_str); %number of functions
 path_uvmat=fileparts(which('uvmat'));
 addpath(fullfile(path_uvmat,'transform_field'))
@@ -261 +261 @@
 rmpath(fullfile(path_uvmat,'transform_field'))
 
-%load the list of previously browsed files in menus Open and Open_1
+%% load the list of previously browsed files in menus Open and Open_1
  dir_perso=prefdir; % path to the directory .matlab for personal data
  profil_perso=fullfile(dir_perso,'uvmat_perso.mat');% personal data file uvmauvmat_perso.mat' in .matlab
@@ -291 +291 @@
                 [path,file]=fileparts(h.transform_fct{ilist});
                 addpath(path)
-%              if exist(file,'file')
                 h_func=str2func(file);
                 rmpath(path)
@@ -311 +310 @@
 set(handles.transform_fct,'UserData',fct_handle)% store the list of path in UserData of ACTION
 set(handles.uvmat,'UserData',UvData)
-%set(handles.FixEqual,'Value',1)% by default: axes free to adapt in aspect ratio
-%set(handles.FixEqual,'BackgroundColor',[1 1 0])
-
-%check the path and date of modification of all functions in uvmat
+
+%% check the path and date of modification of all functions in uvmat
 path_to_uvmat=which ('uvmat');% check the path detected for source file uvmat
 [errormsg,date_str]=check_functions;%check the path of the functions called by uvmat.m
 date_str=['last modification: ' date_str];
-%case of an input argument for uvmat
+
+%% case of an input argument for uvmat
 testinputfield=0;
 inputfile=[];
@@ -349 +347 @@
     end
     if ~isempty(inputfile)
+        %%%%% display the indput field %%%%%%%
         display_file_name(hObject, eventdata, handles,inputfile)
+        %%%%%%%
         testinputfield=1;
     end
@@ -366 +366 @@
    end
 end
-% UvData.NewSeries=1;
-set(handles.uvmat,'UserData',UvData)
+% set(handles.uvmat,'UserData',UvData)
+
+%% plot input field if exists
 if testinputfield
     %delete drawn objects
@@ -604 +605 @@
         set(handles.list_object_1,'Visible','on')
         set(handles.frame_object,'Visible','on')
-         % initiate input file: 
+         %%%%%% initiate input file: 
         update_rootinfo(hObject,eventdata,handles);  
     otherwise
@@ -743 +744 @@
         XmlData.GeometryCalib
         if isfield(XmlData.GeometryCalib,'VolumeScan') && isequal(XmlData.GeometryCalib.VolumeScan,'y')
-            'TESTvol'
             set (handles.nb_slice,'String','volume')
         end
@@ -872 +872 @@
 
 if testima
-%   set(handles.Fields,'Value',1) % set menu to 'image'
-%    set(handles.Fields,'String',{'image';'get_field...';'velocity';'vort';'div';'more...'})
 elseif isequal(FileExt,'.nc')||isequal(FileExt,'.cdf')
    Data=nc2struct(FileName,'ListGlobalAttribute','absolut_time_T0','civ');
@@ -901 +899 @@
 end  
 
-% set index navigation options and refresh plots
+%% set index navigation options and refresh plots
 set(handles.RootPath,'BackgroundColor',[1 1 1])
 drawnow
@@ -923 +921 @@
 NomTypeRaw=regexprep(NomType(2:end), '-', '');
 if numel(regexp(NomTypeRaw,'\D'))>=1 
-%     case {'_i_j','_i_j1-j2','_i1-i2_j','#_ab','#A','%01dA','%02dA','%03dA','%04dA'},% two navigation indices
         state_j='on';
         if isequal(nbfield,1)
@@ -932 +929 @@
     NomTypeRaw=regexprep(NomType_1(2:end), '-', '');
     if numel(regexp(NomTypeRaw,'\D'))>=1
-%     switch NomType_1
-%         case {'_i_j','_i_j1-j2','_i1-i2_j','#_ab'},% two navigation indices
             state_j='on';
             if isequal(nbfield,1)
@@ -954 +949 @@
 set(handles.j_text,'Visible',state_j);
 
-% view the field  
+%% view the field  
 run0_Callback(hObject, eventdata, handles); %view field
 mask_test=get(handles.mask_test,'value');
@@ -1169 +1164 @@
 set(handles.FileExt_1,'String',FileExt_1);
 
-% default choice of fields
-if isequal(ext_test,'.image')
-%    set(handles.Fields_1,'String',{'';'image';'get_field...';'velocity';'vort';'div';'more...'})
-%    set(handles.Fields_1,'Value',2) % set menu to 'image'
-elseif strcmp(FileExt_1,'.nc')||strcmp(FileExt_1,'.cdf')
-   Data=nc2struct(fileinput_1,[]);
-%    if isfield(Data,'absolut_time_T0')
-%        set(handles.Fields_1,'String',{'';'image';'get_field...';'velocity';'vort';'div';'more...'})
-%        set(handles.Fields_1,'Value',4) % set menu to 'velocity'
-%    else   
-%        set(handles.Fields_1,'Value',2) % set menu to 'get_field...'
-%        set(handles.Fields_1,'String',{'';'get_field...'});
-%    end
-end  
+% % default choice of fields
+% if isequal(ext_test,'.image')
+% %    set(handles.Fields_1,'String',{'';'image';'get_field...';'velocity';'vort';'div';'more...'})
+% %    set(handles.Fields_1,'Value',2) % set menu to 'image'
+% elseif strcmp(FileExt_1,'.nc')||strcmp(FileExt_1,'.cdf')
+%    Data=nc2struct(fileinput_1,[]);
+% %    if isfield(Data,'absolut_time_T0')
+% %        set(handles.Fields_1,'String',{'';'image';'get_field...';'velocity';'vort';'div';'more...'})
+% %        set(handles.Fields_1,'Value',4) % set menu to 'velocity'
+% %    else   
+% %        set(handles.Fields_1,'Value',2) % set menu to 'get_field...'
+% %        set(handles.Fields_1,'String',{'';'get_field...'});
+% %    end
+% end  
 set(handles.SubField,'Visible','on')
 set(handles.SubField,'Value',1)
@@ -2405 +2400 @@
     eval(['nbvec=length(UvData.Field.' XName ');'])%nbre of measurement points (e.g. vectors)
     test_x=1;%test for unstructured coordinates
-else %structured coordinate
-    YName=UvData.Field.ListVarName{VarType{imax}.coord(NbDim-1)}; %structured coordinates
+elseif VarType{imax}.coord(NbDim)>0 %structured coordinate  
     XName=UvData.Field.ListVarName{VarType{imax}.coord(NbDim)};
+    if NbDim>1
+        YName=UvData.Field.ListVarName{VarType{imax}.coord(NbDim-1)}; %structured coordinates
+    end
 end
 if NbDim==3
@@ -2419 +2416 @@
     end
 end
+if exist('XName','var')
 eval(['XMax=max(UvData.Field.' XName ');'])
 eval(['XMin=min(UvData.Field.' XName ');'])
-eval(['YMax=max(UvData.Field.' YName ');'])
-eval(['YMin=min(UvData.Field.' YName ');'])
+UvData.Field.NbDim=NbDim;
+UvData.Field.XMax=XMax;
+UvData.Field.XMin=XMin;
+if NbDim >1
+    eval(['YMax=max(UvData.Field.' YName ');'])
+    eval(['YMin=min(UvData.Field.' YName ');'])
+    UvData.Field.YMax=YMax;
+    UvData.Field.YMin=YMin;
+end
 eval(['nbvec=length(UvData.Field.' XName ');'])
 if test_x %unstructured coordinates
@@ -2434 +2439 @@
     VarIndex=CellVarIndex{imax}; % list of variable indices
     DimIndex=UvData.Field.VarDimIndex{VarIndex(1)}; %list of dim indices for the variable
-    nbpoints_y=UvData.Field.DimValue(DimIndex(NbDim-1));
     nbpoints_x=UvData.Field.DimValue(DimIndex(NbDim));
     DX=(XMax-XMin)/(nbpoints_x-1);
-    DY=(YMax-YMin)/(nbpoints_y-1);
+    if NbDim >1
+        nbpoints_y=UvData.Field.DimValue(DimIndex(NbDim-1));
+        DY=(YMax-YMin)/(nbpoints_y-1);
+    end
     if NbDim==3
         nbpoints_z=UvData.Field.DimValue(DimIndex(1));
@@ -2448 +2455 @@
     end
 end
-UvData.Field.NbDim=NbDim;
-UvData.Field.XMax=XMax;
-UvData.Field.XMin=XMin;
-UvData.Field.YMax=YMax;
-UvData.Field.YMin=YMin;
-
+end
 
 %% 3D case (menuvolume)
@@ -2511 +2513 @@
 else
     % create a default projection menuplane
-    UvData.Object{1}.Style='plane';%main plotting plane
+    %UvData.Object{1}.Style='none';%main plotting plane
     UvData.Object{1}.ProjMode='projection';%main plotting plane
     UvData.Object{1}.DisplayHandle_uvmat=[]; %plane not visible in uvmat
     set(handles.list_object_1,'Value',1);
-    set(handles.list_object_1,'String',{'1-PLANE'});
+    set(handles.list_object_1,'String',{''});
 end
 if ~isfield(UvData.Object{1},'plotaxes')
@@ -2553 +2555 @@
         haxes(2)=plot_handles{2}.axes3;
         PlotParam{2}=read_plot_param(plot_handles{2});%read plotting parameters on the uvmat interface
-        keeplim(2)=get(plot_handles{2}.FixedLimits,'Value');
+        keeplim(2)=get(plot_handles{2}.FixLimits,'Value');
         PosColorbar{2}='*'; %TODO: deal with colorbar position on view_field
     end
@@ -2829 +2831 @@
 if ~isequal(hhh,'')% case of new builtin Matlab netcdf library
     nc=netcdf.open(filename,'NC_WRITE'); 
-    netcdf.reDef(nc)
-    netcdf.putAtt(nc,netcdf.getConstant('NC_GLOBAL'),attrname,1)
+    netcdf.reDef(nc);
+    netcdf.putAtt(nc,netcdf.getConstant('NC_GLOBAL'),attrname,1);
     dimid = netcdf.inqDimID(nc,nbname); 
     try
@@ -2837 +2839 @@
         varid=netcdf.defVar(nc,flagname,'double',dimid);%create fixflag variable if it does not exist
     end
-    netcdf.endDef(nc)
+    netcdf.endDef(nc);
     netcdf.putVar(nc,varid,UvData.axes3.FF);
-    netcdf.close(nc)  
+    netcdf.close(nc);  
 else %old netcdf library
     netcdf_toolbox(filename,AxeData,attrname,nbname,flagname)
@@ -3819 +3821 @@
 function transform_fct_Callback(hObject, eventdata, handles)
 %-------------------------------------------------------------
-global nb_builtin
-
-huvmat=get(handles.transform_fct,'parent');
+
+UvData=get(handles.uvmat,'UserData');
 menu=get(handles.transform_fct,'String');
 ind_coord=get(handles.transform_fct,'Value');
@@ -3859 +3860 @@
    profil_perso=fullfile(dir_perso,'uvmat_perso.mat');
    if exist(profil_perso,'file')
+       nb_builtin=UvData.OpenParam.NbBuiltin;
        for ilist=nb_builtin+1:numel(list_transform)
            ff=functions(list_transform{ilist});
@@ -3877 +3879 @@
 set(handles.FixLimits,'Value',0)
 set(handles.FixLimits,'BackgroundColor',[0.7 0.7 0.7])
-
-UvData=get(huvmat,'UserData');
 
 %delete drawn objects
@@ -3911 +3911 @@
    UvData=rmfield(UvData,'MaskName'); %will impose mask refresh  
 end
-set(huvmat,'UserData',UvData)
+set(handles.uvmat,'UserData',UvData)
 run0_Callback(hObject, eventdata, handles)
 
@@ -4179 +4179 @@
     colcode.colcode2=str2num(get(handles.colcode2,'String'));
 end
-% colcode.option=get(handles.vec_col_bar,'Value');
 colcode.FixedCbounds=0;
-% list_code=get(handles.col_vec,'String');% list menu fields
-% index_code=get(handles.col_vec,'Value');% selected string index
-% colcode.CName= list_code{index_code(1)}; % selected field used for vector color
 colcode.FixedCbounds=1;
 vec_C=colcode.MinC+(colcode.MaxC-colcode.MinC)*(0.5:width-0.5)/width;%sample of vec_C values from min to max
@@ -4203 +4199 @@
 UvData=get(handles.uvmat,'UserData');
 AxeData=UvData.axes3;
-'TESTupdateplot'
-PlotParam=read_plot_param(handles)
-PlotParam.Vectors
+PlotParam=read_plot_param(handles);
 [PP,PlotParamOut]= plot_field(AxeData,haxes,PlotParam);
-'TESTOUT'
-PlotParamOut
 write_plot_param(handles,PlotParamOut); %update the auto plot parameters
 
@@ -4214 +4206 @@
 % --- Executes on button press in grid.
 function grid_Callback(hObject, eventdata, handles)
-
 
 

trunk/src/view_field.m

@@ -266 +266 @@
 
 %-------------------------------------------------------------------
-% --- Executes on button press in 'FixedLimits'.
-%-------------------------------------------------------------------
-function FixedLimits_Callback(hObject, eventdata, handles)
-test=get(handles.FixedLimits,'Value');
+% --- Executes on button press in 'FixLimits'.
+%-------------------------------------------------------------------
+function FixLimits_Callback(hObject, eventdata, handles)
+test=get(handles.FixLimits,'Value');
 if test
-    set(handles.FixedLimits,'BackgroundColor',[1 1 0])
+    set(handles.FixLimits,'BackgroundColor',[1 1 0])
 else
-    set(handles.FixedLimits,'BackgroundColor',[0.7 0.7 0.7])
-end
-
-%-------------------------------------------------------------------
-% --- Executes on button press in auto_xy.
-function auto_xy_Callback(hObject, eventdata, handles)
-test=get(handles.auto_xy,'Value');
+    set(handles.FixLimits,'BackgroundColor',[0.7 0.7 0.7])
+end
+
+%-------------------------------------------------------------------
+% --- Executes on button press in FixEqual.
+function FixEqual_Callback(hObject, eventdata, handles)
+test=get(handles.FixEqual,'Value');
 if test
-    set(handles.auto_xy,'BackgroundColor',[1 1 0])
+    set(handles.FixEqual,'BackgroundColor',[1 1 0])
     cla(handles.axes3)
     update_plot(handles)
 else
-    set(handles.auto_xy,'BackgroundColor',[0.7 0.7 0.7])
+    set(handles.FixEqual,'BackgroundColor',[0.7 0.7 0.7])
     update_plot(handles)
 end
@@ -298 +298 @@
 if (get(handles.zoom,'Value') == 1); 
     set(handles.zoom,'BackgroundColor',[1 1 0])
-    set(handles.FixedLimits,'Value',1)% propose by default fixed limits for the plotting axes
-    set(handles.FixedLimits,'BackgroundColor',[1 1 0])
+    set(handles.FixLimits,'Value',1)% propose by default fixed limits for the plotting axes
+    set(handles.FixLimits,'BackgroundColor',[1 1 0])
 else
     set(handles.zoom,'BackgroundColor',[0.7 0.7 0.7])
@@ -532 +532 @@
 function MinA_Callback(hObject, eventdata, handles)
 %------------------------------------------
-set(handles.AutoScal,'Value',1) %suppress auto mode
-set(handles.AutoScal,'BackgroundColor',[1 1 0])
+set(handles.FixScal,'Value',1) %suppress auto mode
+set(handles.FixScal,'BackgroundColor',[1 1 0])
 update_plot(handles)
 
@@ -539 +539 @@
 function MaxA_Callback(hObject, eventdata, handles)
 %--------------------------------------------
-set(handles.AutoScal,'Value',1) %suppress auto mode
-set(handles.AutoScal,'BackgroundColor',[1 1 0])
+set(handles.FixScal,'Value',1) %suppress auto mode
+set(handles.FixScal,'BackgroundColor',[1 1 0])
 update_plot(handles)
 
 %-----------------------------------------------
-function AutoScal_Callback(hObject, eventdata, handles)
+function FixScal_Callback(hObject, eventdata, handles)
 %--------------------------------------------
-test=get(handles.AutoScal,'Value');
+test=get(handles.FixScal,'Value');
 if test
-    set(handles.AutoScal,'BackgroundColor',[1 1 0])
+    set(handles.FixScal,'BackgroundColor',[1 1 0])
 else
-    set(handles.AutoScal,'BackgroundColor',[0.7 0.7 0.7])
+    set(handles.FixScal,'BackgroundColor',[0.7 0.7 0.7])
     update_plot(handles);
 %     set(handles.MinA,'String',num2str(ScalOut.MinA,3))
@@ -592 +592 @@
 function VecScale_Callback(hObject, eventdata, handles)
 %-------------------------------------------------------------------
-set(handles.AutoVec,'Value',1);
-set(handles.AutoVec,'BackgroundColor',[1 1 0])
-update_plot(handles)
-
-%-------------------------------------------------------------------
-function AutoVec_Callback(hObject, eventdata, handles)
-%-------------------------------------------------------------------
-test=get(handles.AutoVec,'Value');
+set(handles.FixVec,'Value',1);
+set(handles.FixVec,'BackgroundColor',[1 1 0])
+update_plot(handles)
+
+%-------------------------------------------------------------------
+function FixVec_Callback(hObject, eventdata, handles)
+%-------------------------------------------------------------------
+test=get(handles.FixVec,'Value');
 if test
-    set(handles.AutoVec,'BackgroundColor',[1 1 0])
+    set(handles.FixVec,'BackgroundColor',[1 1 0])
 else
     update_plot(handles);
     %set(handles.VecScale,'String',num2str(ScalOut.VecScale,3))
-    set(handles.AutoVec,'BackgroundColor',[0.7 0.7 0.7])
+    set(handles.FixVec,'BackgroundColor',[0.7 0.7 0.7])
 end
 
@@ -819 +819 @@
 
 
+
+
+
+function MinX_Callback(hObject, eventdata, handles)
+% hObject    handle to MinX (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hints: get(hObject,'String') returns contents of MinX as text
+%        str2double(get(hObject,'String')) returns contents of MinX as a double
+
+
+% --- Executes during object creation, after setting all properties.
+function MinX_CreateFcn(hObject, eventdata, handles)
+% hObject    handle to MinX (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    empty - handles not created until after all CreateFcns called
+
+% Hint: edit controls usually have a white background on Windows.
+%       See ISPC and COMPUTER.
+if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor'))
+    set(hObject,'BackgroundColor','white');
+end
+
+
+
+function MaxX_Callback(hObject, eventdata, handles)
+% hObject    handle to MaxX (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hints: get(hObject,'String') returns contents of MaxX as text
+%        str2double(get(hObject,'String')) returns contents of MaxX as a double
+
+
+% --- Executes during object creation, after setting all properties.
+function MaxX_CreateFcn(hObject, eventdata, handles)
+% hObject    handle to MaxX (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    empty - handles not created until after all CreateFcns called
+
+% Hint: edit controls usually have a white background on Windows.
+%       See ISPC and COMPUTER.
+if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor'))
+    set(hObject,'BackgroundColor','white');
+end
+
+
+
+function MinY_Callback(hObject, eventdata, handles)
+% hObject    handle to MinY (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hints: get(hObject,'String') returns contents of MinY as text
+%        str2double(get(hObject,'String')) returns contents of MinY as a double
+
+
+% --- Executes during object creation, after setting all properties.
+function MinY_CreateFcn(hObject, eventdata, handles)
+% hObject    handle to MinY (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    empty - handles not created until after all CreateFcns called
+
+% Hint: edit controls usually have a white background on Windows.
+%       See ISPC and COMPUTER.
+if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor'))
+    set(hObject,'BackgroundColor','white');
+end
+
+
+
+function MaxY_Callback(hObject, eventdata, handles)
+% hObject    handle to MaxY (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hints: get(hObject,'String') returns contents of MaxY as text
+%        str2double(get(hObject,'String')) returns contents of MaxY as a double
+
+
+% --- Executes during object creation, after setting all properties.
+function MaxY_CreateFcn(hObject, eventdata, handles)
+% hObject    handle to MaxY (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    empty - handles not created until after all CreateFcns called
+
+% Hint: edit controls usually have a white background on Windows.
+%       See ISPC and COMPUTER.
+if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor'))
+    set(hObject,'BackgroundColor','white');
+end
+
+

trunk/src/write_plot_param.m

@@ -1 +1 @@
 %'write_plot_param': update the plotting parameters on the uvmat interface after a plotting operation
 function write_plot_param(handles,PlotParam)
-'TESTwrite'
-PlotParam
 %coordinates
 if isfield(PlotParam,'FixEqual')
@@ -13 +11 @@
     end
 end
+if isfield(PlotParam,'MinX')
 set(handles.MinX,'String',num2str(PlotParam.MinX,4));
 set(handles.MaxX,'String',num2str(PlotParam.MaxX,4));
 set(handles.MinY,'String',num2str(PlotParam.MinY,4));
 set(handles.MaxY,'String',num2str(PlotParam.MaxY,4));
+else
+    set(handles.MinX,'String','');
+set(handles.MaxX,'String','');
+set(handles.MinY,'String','');
+set(handles.MaxY,'String','');
+end
 
 %scalar or image parameters
@@ -91 +96 @@
 set(handles.min_title,'Visible',state)
 set(handles.max_title,'Visible',state)
-set(handles.frame_scal,'Visible',state)
+%set(handles.frame_scal,'Visible',state)
 set(handles.npx,'Visible',state)
 set(handles.npy,'Visible',state)