Changeset 193 for trunk/src/uvmat.m

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)

File:

• trunk/src/uvmat.m (modified) (31 diffs)

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)
-