Index: /trunk/src/mouse_up.m =================================================================== --- /trunk/src/mouse_up.m (revision 510) +++ /trunk/src/mouse_up.m (revision 511) @@ -143,9 +143,9 @@ else hhview_field=guidata(hview_field); - [PlotType,PlotParam]=plot_field(ProjData,hhview_field.axes3,read_GUI(hview_field));%update an existing plot in view_field + [PlotType,PlotParam]=plot_field(ProjData,hhview_field.PlotAxes,read_GUI(hview_field));%update an existing plot in view_field write_plot_param(hhview_field,PlotParam); %update the display of plotting parameters for the current object end ViewFieldData=get(hview_field,'UserData'); - % ViewFieldData.axes3=ProjData; + % ViewFieldData.PlotAxes=ProjData; haxes=findobj(hview_field,'tag','axes3'); if strcmp(get(haxes,'Visible'),'off')%sempty(PlotParam.Coordinates)% case of no plot display (pure text table) @@ -160,6 +160,6 @@ end else - UvData.axes3=ProjData; - [PlotType,PlotParam]=plot_field(ProjData,hhuvmat.axes3,read_GUI(hhuvmat));%update an existing field plot + UvData.PlotAxes=ProjData; + [PlotType,PlotParam]=plot_field(ProjData,hhuvmat.PlotAxes,read_GUI(hhuvmat));%update an existing field plot write_plot_param(hhuvmat,PlotParam); %update the display of plotting parameters for the current object end Index: /trunk/src/plot_field.m =================================================================== --- /trunk/src/plot_field.m (revision 510) +++ /trunk/src/plot_field.m (revision 511) @@ -255,10 +255,6 @@ if ~isempty(index_2D)|| ~isempty(index_1D) FigData=get(hfig,'UserData'); -% if strcmp(get(hfig,'tag'),'view_field') -% set(hfig,'UserData',[]); % refresh user data in view_field (set by civ/TestCiv ) -% end - tagaxes=get(haxes,'tag');% tag of the current plot axis - if isfield(FigData,tagaxes) - FigData.(tagaxes)=Data; + if strcmp(get(hfig,'tag'),'view_field')||strcmp(get(hfig,'tag'),'uvmat') + FigData.(get(haxes,'tag'))=Data; set(hfig,'UserData',FigData) end Index: /trunk/src/series/merge_proj.m =================================================================== --- /trunk/src/series/merge_proj.m (revision 510) +++ /trunk/src/series/merge_proj.m (revision 511) @@ -225,27 +225,6 @@ end end - if strcmp(Param.ProjObject.ProjMode,'filter') - check_tps=1; - end - if check_tps - SubDomain=1500; %default, estimated nbre of vectors in a subdomain used for tps - if isfield(Data{iview},'SubDomain') - SubDomain=Data{iview}.SubDomain;% - end - [Data{iview}.SubRange,Data{iview}.NbSites,Data{iview}.Coord_tps,Data{iview}.U_tps,Data{iview}.V_tps,tild,U_smooth,V_smooth,W_smooth,FF] =... - filter_tps([Data{iview}.X(Data{iview}.FF==0) Data{iview}.Y(Data{iview}.FF==0)],Data{iview}.U(Data{iview}.FF==0),Data{iview}.V(Data{iview}.FF==0),[],SubDomain,0); - nbvar=numel(Data{iview}.ListVarName); - Data{iview}.ListVarName=[Data{iview}.ListVarName {'SubRange','NbSites','Coord_tps','U_tps','V_tps'}]; - Data{iview}.VarDimName=[Data{iview}.VarDimName {{'nb_coord','nb_bounds','nb_subdomain'},{'nb_subdomain'},... - {'nb_tps','nb_coord','nb_subdomain'},{'nb_tps','nb_subdomain'},{'nb_tps','nb_subdomain'}}]; - Data{iview}.VarAttribute{nbvar+3}.Role='coord_tps'; - Data{iview}.VarAttribute{nbvar+4}.Role='vector_x'; - Data{iview}.VarAttribute{nbvar+5}.Role='vector_y'; - if isfield(Data{iview},'ListDimName')%cleaning - Data{iview}=rmfield(Data{iview},'ListDimName'); - end - if isfield(Data{iview},'DimValue')%cleaning - Data{iview}=rmfield(Data{iview},'DimValue'); - end + if ~isempty(Param.ProjObject)&& strcmp(Param.ProjObject.ProjMode,'filter')&&~isfield(Data{iview},'Coord_tps') + Data{iview}=calc_tps(Data{iview}); end Index: /trunk/src/set_object.m =================================================================== --- /trunk/src/set_object.m (revision 510) +++ /trunk/src/set_object.m (revision 511) @@ -192,5 +192,5 @@ set(hhuvmat.ListObject,'Value',ObjIndex) % draw all object colors in blue (unselected) in uvmat - hother=[findobj(hhuvmat.axes3,'Tag','proj_object');findobj(hhuvmat.axes3,'Tag','DeformPoint')];%find all the proj object and deform point representations + hother=[findobj(hhuvmat.PlotAxes,'Tag','proj_object');findobj(hhuvmat.PlotAxes,'Tag','DeformPoint')];%find all the proj object and deform point representations for iobj=1:length(hother) if isequal(get(hother(iobj),'Type'),'rectangle')||isequal(get(hother(iobj),'Type'),'patch') @@ -475,5 +475,5 @@ UvData.Object{IndexObj}.DisplayHandle.uvmat=obj_handle; %preserve the object plot handle if valid else - UvData.Object{IndexObj}.DisplayHandle.uvmat=hhuvmat.axes3; %axes taken as object display handle by defualt + UvData.Object{IndexObj}.DisplayHandle.uvmat=hhuvmat.PlotAxes; %axes taken as object display handle by defualt end %set(hhuvmat.edit_object,'Value',1)% set the current object to edit mode @@ -496,5 +496,5 @@ end if isequal(IndexObj_1,IndexObj) % if the projection is in uvmat - PlotType=plot_field(ProjData,hhuvmat.axes3,read_GUI(get(hhuvmat.axes3,'parent')));%update the current uvmat plot + PlotType=plot_field(ProjData,hhuvmat.PlotAxes,read_GUI(get(hhuvmat.PlotAxes,'parent')));%update the current uvmat plot else % if the projection is in view_field hview_field=findobj(allchild(0),'tag','view_field'); @@ -503,5 +503,5 @@ else hhview_field=guidata(hview_field); - [PlotType,PlotParam]=plot_field(ProjData,hhview_field.axes3,read_GUI(hview_field));%update an existing plot in view_field + [PlotType,PlotParam]=plot_field(ProjData,hhview_field.PlotAxes,read_GUI(hview_field));%update an existing plot in view_field write_plot_param(hhview_field,PlotParam); %update the display of plotting parameters for the current object end Index: /trunk/src/uvmat.m =================================================================== --- /trunk/src/uvmat.m (revision 510) +++ /trunk/src/uvmat.m (revision 511) @@ -28,52 +28,22 @@ %AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA % -% Information stored on the interface: -% 'Strings' of all edit boxes and menus: get(handles.Tag,'String') -% 'Values' of all menus and toggle buttons: get(handles.Tag,'Value') -% Matlab structure called UvData stored as 'UserData' of the figure uvmat.fig,(can be obtained by right mouse click on the interface). -% It contains the following fields: -% - Fixed specifiacation of plotting figures and axes (defined bu uvmat_OpeningFcn) -% .PosColorbar: [0.8210 0.4710 0.0190 0.4450]; specified position of the colorbar on figures -% - Information read in the documentation open of a series (activated by RootPath_Callback) : -% .XmlData, with fields: -% .Time: matrix of times of the images with index i and j -% .GeometryCalib: [1x1 struct] -% - Information defined from the interface: -% .NewSeries: =1 when the first view of a new field series is displayed, else 0 -% .FileName:(char string) -% .FieldName: (char string) main field selected('image', 'velocity'...) -% .CName: (char string)name of the scalar used for vector colors -% .MovieObject{1}: movie object representing an input movie -% .MovieObject{2}: idem for a second input series (_1) -% .FileName_1 : last second input file name (to deal with a constant second input without reading again the file) -% .ZMin, .ZMax: range of the z coordinate -%..... to complement -% - Information on projection objects -% .Object: {[1x1 struct]} -% .CurrentObjectIndex: index of the projection object .Object currently selected for editing -% -Information on the current field (Field{i}) -% .Txt : text information to display (e.g. error message) -% .NbDim: number of dimensions (=0 by default) -% .NbCoord: number of vector components -% .CoordType: expresses the type of coordinate ('px' for image, 'sig' for instruments, or 'phys') -% .dt: time interval for the corresponding image pair -% .Mesh: estimated typical distance between vectors -% .ZMax: -% .ZMin: -% .X, .Y, .Z: set of vector coordinates -% .U,.V,.W: corresponding set of vector components -% .F: corresponding set of warning flags -% .FF: corresponding set of false flags, =0 for good vectors -% .C: corresponding values of the scalar used for vector color -% (.X, .Y, .Z,.U,.V,.W,.F,.FF,.C are matlab vectors of the same length, -% equal to the number of vectors stored in the input open) -% .CName: name of the scalar .C -% .CType: type of the scalar .C, setting how the scalar is obtained (see 'Scalars' below) -% .A image or scalar -% .AX: vector of dimension 2 representing the first and last values -% of the X coordinates for the image or scalar known on a regular grid, -% or vector of dimension .A for a scaler defined on irregular grid. -% .AY: same as .AX along the Y direction -% .AName: name of the scalar, ='image' for an image +% Information stored on the interface:(use 'Export/field in workspace' in +% the menu bar of uvmat to retrieve it) +% .OpenParam: structure containing parameters defined when uvmat is opened +% .PosColorbar: position (1x4 vector)of the colorbar (relative to the fig uvmat) +% .PosSetObject: position of set_object +% .PosGeometryCalib: size of set_object +% .NbBuiltin: nbre of functions always displayed in transform_fct menu +% .Object: cell array of structures representing the current projection objects, as produced by 'set_object.m'={[]} by default +% .NewSeries: =0/1 flag telling whether a new field series has been opened +% .FileName_1: name of the current second field (used to detect a constant field during file scanning) +% .FileType: current file type, as defined by the fct get_file_type.m) +% .i1_series,.i2_series,.j1_series,.j1_series: series of i1,i2,j1,j2 indices detected in the input dir,set by the fct find_file_series +% .MovieObject: current movie object +% .TimeUnit: unit for time +% .XmlData: cell array of 1 or 2 structures representing the xml files associated with the input fields (containing timing and geometry calibration) +% .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 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% DATA FLOW (for run0_Callback) %%%%%%%%%%%%%%%%%%%%: @@ -111,5 +81,5 @@ % | % plot_field.m: plot the projected fields and store them as | -% UvData.axes3 | +% UvData.PlotAxes | % | % AxeData @@ -214,13 +184,12 @@ movegui(hObject,'center') UvData.OpenParam.PosColorbar=[0.805 0.022 0.019 0.445]; -UvData.OpenParam.SetObjectOrigin=[-0.05 -0.03]; %position for set_object -UvData.OpenParam.SetObjectSize=[0.3 0.7]; -UvData.OpenParam.CalOrigin=[0.95 -0.03];%position for geometry_calib (TO IMPROVE) -UvData.OpenParam.CalSize=[0.28 1]; -UvData.axes3=[];%initiate the record of plotted field -UvData.axes2=[]; -UvData.axes1=[]; +UvData.OpenParam.PosSetObject=[-0.05 -0.03 0.3 0.7]; %position for set_object +UvData.OpenParam.PosGeometryCalic=[0.95 -0.03 0.28 1 ];%position for geometry_calib (TO IMPROVE) +% UvData.OpenParam.CalSize=[0.28 1]; +% UvData.PlotAxes=[];%initiate the record of plotted field +% UvData.axes2=[]; +% UvData.axes1=[]; AxeData.LimEditBox=1; %initialise AxeData -set(handles.axes3,'UserData',AxeData) +set(handles.PlotAxes,'UserData',AxeData) %% set functions for the mouse and keyboard @@ -231,5 +200,5 @@ set(hObject,'DeleteFcn',{@closefcn})% -%% refresh projection plane +%% initialisation % set(handles.ListObject,'Value',1)% default: empty projection objectproj_field % set(handles.ListObject,'String',{''}) @@ -238,4 +207,5 @@ set(handles.Fields,'Value',1) set(handles.Fields,'string',{''}) +UvData.Object={[]}; %% TRANSFORM menu: builtin fcts @@ -332,5 +302,5 @@ if testinputfield %delete drawn objects - hother=findobj(handles.axes3,'Tag','proj_object');%find all the proj objects + hother=findobj(handles.PlotAxes,'Tag','proj_object');%find all the proj objects for iobj=1:length(hother) delete_object(hother(iobj)) @@ -806,5 +776,5 @@ UvData=get(handles.uvmat,'UserData');%huvmat=handles of the uvmat interface UvData.NewSeries=1; %flag for run0: begin a new series -UvData.TestInputFile=1; +UvData.FileName_1='';% name of the current second field (used to detect a constant field during file scanning) UvData.FileType{index}=FileType; UvData.i1_series{index}=i1_series; @@ -1059,5 +1029,5 @@ end if isequal (diff_ref_i,diff_ref_i(1)*ones(size(diff_ref_i))) - set(handles.increment_scan,'String',num2str(diff_ref_i(1))) + set(handles.num_IndexIncrement,'String',num2str(diff_ref_i(1))) end set(handles.scan_i,'Value',1) @@ -1069,5 +1039,5 @@ end if isequal (diff_ref_j,diff_ref_j(1)*ones(size(diff_ref_j))) - set(handles.increment_scan,'String',num2str(diff_ref_j(1))) + set(handles.num_IndexIncrement,'String',num2str(diff_ref_j(1))) end set(handles.scan_j,'Value',1) @@ -1395,5 +1365,5 @@ % uistack(hmask,'top') else - axes(handles.axes3) + axes(handles.PlotAxes) hold on size(flagmask) @@ -1420,7 +1390,7 @@ drawnow %TODO: introduce the option: increment ='*' to move to the next available view -increment=str2num(get(handles.increment_scan,'String')); %get the field increment d +increment=str2num(get(handles.num_IndexIncrement,'String')); %get the field increment d % if isnan(increment) -% set(handles.increment_scan,'String','1')%default value +% set(handles.num_IndexIncrement,'String','1')%default value % increment=1; % end @@ -1439,7 +1409,7 @@ set(handles.runmin,'BackgroundColor',[1 1 0])%paint the command button in yellow drawnow -increment=-str2num(get(handles.increment_scan,'String')); %get the field increment d +increment=-str2num(get(handles.num_IndexIncrement,'String')); %get the field increment d % if isnan(increment) -% set(handles.increment_scan,'String','1')%default value +% set(handles.num_IndexIncrement,'String','1')%default value % increment=1; % end @@ -1456,7 +1426,7 @@ set(handles.Movie,'BackgroundColor',[1 1 0])%paint the command button in yellow drawnow -increment=str2num(get(handles.increment_scan,'String')); %get the field increment d +increment=str2num(get(handles.num_IndexIncrement,'String')); %get the field increment d % if isnan(increment) -% set(handles.increment_scan,'String','1')%default value +% set(handles.num_IndexIncrement,'String','1')%default value % increment=1; % end @@ -1487,5 +1457,5 @@ set(handles.MovieBackward,'BackgroundColor',[1 1 0])%paint the command button in yellow drawnow -increment=-str2num(get(handles.increment_scan,'String')); %get the field increment d +increment=-str2num(get(handles.num_IndexIncrement,'String')); %get the field increment d set(handles.STOP,'Visible','on') set(handles.speed,'Visible','on') @@ -1554,5 +1524,4 @@ [InputFile.RootPath_1,InputFile.SubDir_1,InputFile.RootFile_1,InputFile.FileIndex_1,InputFile.FileExt_1,InputFile.NomType_1]=read_file_boxes_1(handles); [tild,tild,tild,i1_1,i2_1,j1_1,j2_1]=fileparts_uvmat(InputFile.FileIndex_1); -% InputFile.NomType_1=get(handles.NomType_1,'String'); else filename_1=[]; @@ -1585,6 +1554,5 @@ end -% the pair i1-i2 or j1-j2 is free (check box CheckFixPair not selected): -% the list of existing indices recorded in UvData is used +% the pair i1-i2 or j1-j2 is free (check box CheckFixPair not selected): the list of existing indices recorded in UvData is used else UvData=get(handles.uvmat,'UserData'); @@ -1607,5 +1575,6 @@ end else % free increment - if isequal(get(handles.runplus,'BackgroundColor'),[1 1 0])% if runplus is activated + runaction=get(gcbo,'tag'); + if strcmp(runaction,'runplus')||strcmp(runaction,'Movie')% if runplus or movie is activated step=1; else @@ -1629,16 +1598,15 @@ errormsg='minimum j index reached'; elseif ref_i+1>size(UvData.i1_series{1},1) - errormsg='maximum i index reached'; + errormsg='maximum i index reached (reload the input file to update the index bound)'; elseif ref_j+1>size(UvData.i1_series{1},2) - errormsg='maximum j index reached'; - end - if ~isempty(errormsg) - return - end + errormsg='maximum j index reached (reload the input file to update the index bound)'; + end + if ~isempty(errormsg),return,end i1_subseries=UvData.i1_series{1}(ref_i+1,ref_j+1,:); i1_subseries=i1_subseries(i1_subseries>0); - if isempty(i1_subseries) - errormsg='no next file'; - return + if isempty(i1_subseries)% case of pairs + i1_subseries=UvData.i1_series{1}(ref_i+1,:,:); + end + if isempty(i1_subseries),errormsg='no next frame: set num_IndexIncrement =''*'' to reach the next existing file';return else i1=i1_subseries(end); @@ -1850,5 +1818,5 @@ % make movie until movie speed is set to 0 or STOP is activated -hima=findobj(handles.axes3,'Tag','ima');% %handles.axes3 =main plotting window (A GENERALISER) +hima=findobj(handles.PlotAxes,'Tag','ima');% %handles.PlotAxes =main plotting window (A GENERALISER) set(handles.STOP,'Visible','on') set(handles.speed,'Visible','on') @@ -2313,5 +2281,5 @@ %% check whether tps is needed, then calculate tps coefficients if needed check_proj_tps=0; -if isfield(UvData,'Object')&& (strcmp(UvData.FileType{1},'civdata')||strcmp(UvData.FileType{1},'civx')) +if (strcmp(UvData.FileType{1},'civdata')||strcmp(UvData.FileType{1},'civx')) for iobj=1:numel(UvData.Object) if isfield(UvData.Object{iobj},'ProjMode')&& strcmp(UvData.Object{iobj}.ProjMode,'filter') @@ -2475,5 +2443,5 @@ end % default projection plane - if ~isfield(UvData,'Object')||isempty(UvData.Object{1}) + if isempty(UvData.Object{1}) UvData.Object{1}.Type='plane';%main plotting plane UvData.Object{1}.ProjMode='projection';%main plotting plane @@ -2538,5 +2506,5 @@ set(handles.ListObject_1_title,'Visible','off') set(handles.ListObject_1,'Visible','off') - [PlotType,PlotParamOut]=plot_field(UvData.Field,handles.axes3,read_GUI(handles.uvmat)); + [PlotType,PlotParamOut]=plot_field(UvData.Field,handles.PlotAxes,read_GUI(handles.uvmat)); write_plot_param(handles,PlotParamOut) %update the auto plot parameters @@ -2573,5 +2541,5 @@ haxes(1)=UvData.plotaxes; else - haxes(1)=handles.axes3; + haxes(1)=handles.PlotAxes; end PlotParam{1}=read_GUI(handles.uvmat); @@ -2593,5 +2561,5 @@ if ~isempty(view_field_handle) plot_handles{2}=guidata(view_field_handle); - haxes(2)=plot_handles{2}.axes3; + haxes(2)=plot_handles{2}.PlotAxes; PlotParam{2}=read_GUI(handles.uvmat);%read plotting parameters on the uvmat interface PosColorbar{2}='*'; %TODO: deal with colorbar position on view_field @@ -2732,5 +2700,5 @@ histo_value=get(handles.histo1_menu,'Value'); FieldName=histo_menu{histo_value}; -% update_histo(handles.histo_u,handles.uvmat,FieldName) +% update_histo(handles.HistoAxes,handles.uvmat,FieldName) % % %------------------------------------------------------------------------ @@ -2777,5 +2745,5 @@ Amax=double(max(max(max(FieldHisto))));%max of field value if isequal(Amin,Amax) - cla(handles.histo_u) + cla(handles.HistoAxes) else Histo.ListVarName={FieldName,'histo'}; @@ -2813,5 +2781,5 @@ end end - plot_field(Histo,handles.histo_u); + plot_field(Histo,handles.HistoAxes); hlegend=legend; if isempty(FieldName_2) @@ -2820,5 +2788,5 @@ set(hlegend,'String',{FieldName;FieldName_2}) end -% hh=get(handles.histo_u,'children'); +% hh=get(handles.HistoAxes,'children'); % get(hh(1)) % get(hh(2)) @@ -2925,5 +2893,5 @@ end netcdf.endDef(nc); - netcdf.putVar(nc,varid,UvData.axes3.FF); + netcdf.putVar(nc,varid,UvData.PlotAxes.FF); netcdf.close(nc); else %old netcdf library @@ -3370,14 +3338,8 @@ [hset_object,UvData.sethandles]=set_object(data,PlotHandles);% call the set_object interface with action on haxes, % associate the set_object interface handle to the plotting axes - if isfield(UvData.OpenParam,'SetObjectOrigin') - pos_uvmat=get(handles.uvmat,'Position'); - pos_set_object(1:2)=UvData.OpenParam.SetObjectOrigin + pos_uvmat(1:2); - pos_set_object(3:4)=UvData.OpenParam.SetObjectSize .* pos_uvmat(3:4); - set(hset_object,'Position',pos_set_object) - end + set(hset_object,'Position',get(handles.uvmat,'Position')+UvData.OpenParam.PosSetObject) UvData.MouseAction='create_object'; else set(handles.VOLUME,'BackgroundColor',[0 1 0]) -% UvData.MouseAction='none'; end set(handles.uvmat,'UserData',UvData) @@ -3973,7 +3935,7 @@ %------------------------------------------------------------------- UvData=get(handles.uvmat,'UserData'); -AxeData=UvData.axes3;% retrieve the current plotted data +AxeData=UvData.PlotAxes;% retrieve the current plotted data PlotParam=read_GUI(handles.uvmat); -[tild,PlotParamOut]= plot_field(AxeData,handles.axes3,PlotParam); +[tild,PlotParamOut]= plot_field(AxeData,handles.PlotAxes,PlotParam); write_plot_param(handles,PlotParamOut); %update the auto plot parameters @@ -3992,5 +3954,5 @@ %% update the projection plot on uvmat ProjData= proj_field(UvData.Field,ObjectData);%project the current input field on object ObjectData -plot_field(ProjData,handles.axes3,read_GUI(handles.uvmat));% plot the projected field; +plot_field(ProjData,handles.PlotAxes,read_GUI(handles.uvmat));% plot the projected field; %replot all the objects within the new projected field for IndexObj=1:numel(list_str) @@ -3998,5 +3960,5 @@ hobject=UvData.Object{IndexObj}.DisplayHandle.uvmat if isempty(hobject) || ~ishandle(hobject) - hobject=handles.axes3 + hobject=handles.PlotAxes end if isequal(IndexObj,get(handles.ListObject,'Value')) @@ -4054,10 +4016,10 @@ hview_field=findobj(allchild(0),'tag','view_field'); if isempty(hview_field) - hhview_field.axes3=[]; + hhview_field.PlotAxes=[]; else Data=get(hview_field,'UserData'); hhview_field=guidata(hview_field); ProjData= proj_field(UvData.Field,ObjectData);%project the current interface field on ObjectData - [PlotType,PlotParam]=plot_field(ProjData,hhview_field.axes3,read_GUI(hview_field));%read plotting parameters on the uvmat interfachhview_fiel + [PlotType,PlotParam]=plot_field(ProjData,hhview_field.PlotAxes,read_GUI(hview_field));%read plotting parameters on the uvmat interfachhview_fiel write_plot_param(hhview_field,PlotParam); %update the display of plotting parameters for the current object haxes=findobj(hview_field,'tag','axes3'); @@ -4075,5 +4037,5 @@ %% update the color of the graphic object representation: the selected object in magenta, others in blue -update_object_color(handles.axes3,hhview_field.axes3,UvData.Object{IndexObj}.DisplayHandle.uvmat) +update_object_color(handles.PlotAxes,hhview_field.PlotAxes,UvData.Object{IndexObj}.DisplayHandle.uvmat) %------------------------------------------------------------------------ @@ -4254,5 +4216,5 @@ end hhview_field=guidata(hview_field); - [PlotType,PlotParam]=plot_field(ProjData,hhview_field.axes3,read_GUI(hview_field));%read plotting parameters on the GUI view_field); + [PlotType,PlotParam]=plot_field(ProjData,hhview_field.PlotAxes,read_GUI(hview_field));%read plotting parameters on the GUI view_field); write_plot_param(hhview_field,PlotParam); %update the display of plotting parameters for the current object haxes=findobj(hview_field,'tag','axes3'); @@ -4310,6 +4272,6 @@ % huvmat=get(handles.MenuExport,'parent'); hfig=figure; -copyobj(handles.axes3,hfig); -map=colormap(handles.axes3); +copyobj(handles.PlotAxes,hfig); +map=colormap(handles.PlotAxes); colormap(map);%transmit the current colormap to the zoom fig colorbar @@ -4319,5 +4281,5 @@ answer=msgbox_uvmat('CONFIRMATION','select a figure/axis on which the current uvmat plot will be exported') if strcmp(answer,'Yes') -hchild=get(handles.axes3,'children'); +hchild=get(handles.PlotAxes,'children'); copyobj(hchild,gca); end @@ -4362,10 +4324,10 @@ %display first view for tests newfig=figure; -newaxes=copyobj(handles.axes3,newfig);%new plotting axes in the new figure +newaxes=copyobj(handles.PlotAxes,newfig);%new plotting axes in the new figure set(newaxes,'Tag','movieaxes') nbpix=[512 384]*str2double(answer{3}); set(gcf,'Position',[1 1 nbpix])% resolution XVGA set(newaxes,'Position',eval(answer{4})); -map=colormap(handles.axes3); +map=colormap(handles.PlotAxes); colormap(map);%transmit the current colormap to the zoom fig msgbox_uvmat('INPUT_Y-N',{['adjust figure ' num2str(newfig) ' with its matlab edit menu '] ;... @@ -4373,5 +4335,5 @@ UvData.plotaxes=newaxes;% the axis in the new figure becomes the current main plotting axes set(huvmat,'UserData',UvData); -increment=str2num(get(handles.increment_scan,'String')); %get the field increment d +increment=str2num(get(handles.num_IndexIncrement,'String')); %get the field increment d set(handles.STOP,'Visible','on') set(handles.speed,'Visible','on') @@ -4403,5 +4365,5 @@ aviobj=close(aviobj); UvData=rmfield(UvData,'plotaxes'); -%UvData.Object{1}.plotaxes=handles.axes3; +%UvData.Object{1}.plotaxes=handles.PlotAxes; set(huvmat,'UserData',UvData); msgbox_uvmat('CONFIRMATION',{['movie ' aviname ' created '];['with ' num2str(imax) ' frames']}) @@ -4510,5 +4472,5 @@ UvData=get(handles.uvmat,'UserData'); UvData.Object{IndexObj}=[]; %create a new empty object -UvData.Object{IndexObj}.DisplayHandle.uvmat=handles.axes3; % axes for plot_object +UvData.Object{IndexObj}.DisplayHandle.uvmat=handles.PlotAxes; % axes for plot_object UvData.Object{IndexObj}.DisplayHandle.view_field=[]; %no plot handle before plot_field operation data.Name=data.Type;% default name=type @@ -4626,7 +4588,7 @@ if isfield(UvData.OpenParam,'CalOrigin') pos_uvmat=get(handles.uvmat,'Position'); - pos_cal(1)=pos_uvmat(1)+UvData.OpenParam.CalOrigin(1)*pos_uvmat(3); - pos_cal(2)=pos_uvmat(2)+UvData.OpenParam.CalOrigin(2)*pos_uvmat(4); - pos_cal(3:4)=UvData.OpenParam.CalSize .* pos_uvmat(3:4); + pos_cal(1)=pos_uvmat(1)+UvData.OpenParam.PosGeometryCalib(1)*pos_uvmat(3); + pos_cal(2)=pos_uvmat(2)+UvData.OpenParam.PosGeometryCalib(2)*pos_uvmat(4); + pos_cal(3:4)=UvData.OpenParam.PosGeometryCalib(3:4).* pos_uvmat(3:4); end geometry_calib(FileName,pos_cal);% call the geometry_calib interface @@ -4798,7 +4760,7 @@ end if isequal(get(handles.scan_i,'Value'),1) - param.incr_i=str2num(get(handles.increment_scan,'String')); + param.incr_i=str2num(get(handles.num_IndexIncrement,'String')); elseif isequal(get(handles.scan_j,'Value'),1) - param.incr_j=str2num(get(handles.increment_scan,'String')); + param.incr_j=str2num(get(handles.num_IndexIncrement,'String')); end param.list_fields=get(handles.Fields,'String');% list menu fields @@ -4844,5 +4806,2 @@ ProjectDir = uigetdir(fileparts(fileparts(RootPath)), 'select the project source directory'); datatree_browser(ProjectDir) - - - Index: /trunk/src/view_field.m =================================================================== --- /trunk/src/view_field.m (revision 510) +++ /trunk/src/view_field.m (revision 511) @@ -76,7 +76,7 @@ set(handles.view_field,'UserData',ViewFieldData);%store the initial fig size in UserData AxeData.LimEditBox=1; %initialise AxeData, the parent figure sets plot parameters -set(handles.axes3,'UserData',AxeData) +set(handles.PlotAxes,'UserData',AxeData) if exist('Field','var') - [PlotType,PlotParamOut]= plot_field(Field,handles.axes3);%,PlotParam,KeepLim,PosColorbar) + [PlotType,PlotParamOut]= plot_field(Field,handles.PlotAxes);%,PlotParam,KeepLim,PosColorbar) set(handles.Coordinates,'Visible','on') if isfield(PlotParamOut,'Vectors') @@ -149,5 +149,5 @@ pos(3)=max(1,pos_1(1)-pos(1)-bord(3)); pos(4)=max(1,size_fig(4)-bord(4)); -set(handles.axes3,'Position',pos) +set(handles.PlotAxes,'Position',pos) %------------------------------------------------------------------------ @@ -157,5 +157,5 @@ %------------------------------------------------------------------------ varargout{1} = handles.output;% the only output argument is the handle to the GUI figure -varargout{2} = strcmp(get(handles.axes3,'Visible'),'on');% check active plot axis +varargout{2} = strcmp(get(handles.PlotAxes,'Visible'),'on');% check active plot axis %------------------------------------------------------------------------ @@ -280,5 +280,5 @@ % uistack(hmask,'top') else - axes(handles.axes3) + axes(handles.PlotAxes) hold on MaskData.maskhandle=image(Mask.AX,Mask.AY,imflag,'Tag','mask','HitTest','off','AlphaData',0.6*flagmask); @@ -296,6 +296,6 @@ UvData=get(huvmat,'UserData'); hfig=figure; -newaxes=copyobj(handles.axes3,hfig); -map=colormap(handles.axes3); +newaxes=copyobj(handles.PlotAxes,hfig); +map=colormap(handles.PlotAxes); colormap(map);%transmit the current colormap to the zoom fig colorbar @@ -774,5 +774,5 @@ AxeData=Data.axes3;% retrieve the current plotted data PlotParam=read_GUI(handles.view_field); -[PP,PlotParamOut]= plot_field(AxeData,handles.axes3,PlotParam); +[PP,PlotParamOut]= plot_field(AxeData,handles.PlotAxes,PlotParam); write_plot_param(handles,PlotParamOut); %update the auto plot parameters @@ -798,6 +798,6 @@ UvData=get(huvmat,'UserData'); hfig=figure; -newaxes=copyobj(handles.axes3,hfig); -map=colormap(handles.axes3); +newaxes=copyobj(handles.PlotAxes,hfig); +map=colormap(handles.PlotAxes); colormap(map);%transmit the current colormap to the zoom fig colorbar Index: /trunk/src/write_plot_param.m =================================================================== --- /trunk/src/write_plot_param.m (revision 510) +++ /trunk/src/write_plot_param.m (revision 511) @@ -4,10 +4,10 @@ if isempty(PlotParam.Coordinates) set(handles.Coordinates,'Visible','off') - set(handles.axes3,'Visible','off') + set(handles.PlotAxes,'Visible','off') set(handles.text_display,'Visible','off') set(handles.TableDisplay,'Visible','on') else set(handles.Coordinates,'Visible','on') - set(handles.axes3,'Visible','on') + set(handles.PlotAxes,'Visible','on') set(handles.text_display,'Visible','on') if isfield(handles,'TableDisplay')