Changeset 76


Ignore:
Timestamp:
Mar 31, 2010, 8:18:15 PM (11 years ago)
Author:
sommeria
Message:

minor bug repairs. Projection on any abject inside the main uvmat axes is now possible
aver_stat, time_series, merge_proj: set_object now called by tag instead of name (which depends on the object)

Location:
trunk/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series.m

    r55 r76  
    20772077     set(handles.GetObject,'BackgroundColor',[1 1 0])%put unactivated buttons to yellow
    20782078%      DataInit.ParentButton=handles.GetObject;
    2079      hset_object=findobj(allchild(0),'Name','set_object');%find the set_object interface handle
     2079     hset_object=findobj(allchild(0),'tag','set_object');%find the set_object interface handle
    20802080     if ishandle(hset_object)
    20812081         uistack(hset_object,'top')
  • trunk/src/series/aver_stat.m

    r55 r76  
    3636test_object=get(hseries.GetObject,'Value');
    3737if test_object%isfield(Series,'sethandles')
    38     hset_object=findobj(allchild(0),'Name','set_object');
     38    hset_object=findobj(allchild(0),'tag','set_object');
    3939    ProjObject=read_set_object(guidata(hset_object));
    4040    %answeryes=questdlg({['field series projected on ' Series.ProjObject.Style]});
  • trunk/src/series/merge_proj.m

    r41 r76  
    2727test_object=get(hseries.GetObject,'Value');
    2828if test_object
    29     hset_object=findobj(allchild(0),'Name','set_object');
     29    hset_object=findobj(allchild(0),'tag','set_object');
    3030    ProjObject=read_set_object(guidata(hset_object));
    3131    if ~isfield(ProjObject,'Style')
  • trunk/src/series/time_series.m

    r44 r76  
    3535test_object=get(hseries.GetObject,'Value');
    3636if test_object
    37     hset_object=findobj(allchild(0),'Name','set_object');
     37    hset_object=findobj(allchild(0),'tag','set_object');
    3838    ProjObject=read_set_object(guidata(hset_object));
    3939    %answeryes=questdlg({['field series projected on ' Series.ProjObject.Style]});
  • trunk/src/uvmat.m

    r75 r76  
    42464246hset_object=set_object(ObjectData,PlotHandles,ZBounds);% call the set_object interface,
    42474247set(hset_object,'name',ObjectName)
    4248 pos_uvmat=get(handles.uvmat,'Position');
    4249 %position the set_object GUI with respect to uvmat
    4250 if isfield(UvData,'SetObjectOrigin')
    4251     pos_set_object(1:2)=UvData.SetObjectOrigin + pos_uvmat(1:2);
    4252     pos_set_object(3:4)=UvData.SetObjectSize .* pos_uvmat(3:4);
    4253     set(hset_object,'Position',pos_set_object)
    4254 end
     4248% pos_uvmat=get(handles.uvmat,'Position');
     4249% %position the set_object GUI with respect to uvmat
     4250% if isfield(UvData,'SetObjectOrigin')
     4251%     pos_set_object(1:2)=UvData.SetObjectOrigin + pos_uvmat(1:2);
     4252%     pos_set_object(3:4)=UvData.SetObjectSize .* pos_uvmat(3:4);
     4253%     set(hset_object,'Position',pos_set_object)
     4254% end
    42554255
    42564256%project the current field on the object and plot it
     
    42624262    UvData.Object{IndexObj}.plotaxes=view_field(ProjData);
    42634263end
    4264 
     4264set(handles.uvmat,'UserData',UvData)
    42654265hother=findobj('Tag','proj_object');%find all the proj objects
    42664266for iobj=1:length(hother)
Note: See TracChangeset for help on using the changeset viewer.