Changeset 76

Timestamp:

Mar 31, 2010, 8:18:15 PM (14 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:

• series.m (modified) (1 diff)
• series/aver_stat.m (modified) (1 diff)
• series/merge_proj.m (modified) (1 diff)
• series/time_series.m (modified) (1 diff)
• uvmat.m (modified) (2 diffs)

trunk/src/series.m

@@ -2077 +2077 @@
      set(handles.GetObject,'BackgroundColor',[1 1 0])%put unactivated buttons to yellow
 %      DataInit.ParentButton=handles.GetObject;
-     hset_object=findobj(allchild(0),'Name','set_object');%find the set_object interface handle
+     hset_object=findobj(allchild(0),'tag','set_object');%find the set_object interface handle
      if ishandle(hset_object)
          uistack(hset_object,'top')

trunk/src/series/aver_stat.m

@@ -36 +36 @@
 test_object=get(hseries.GetObject,'Value');
 if test_object%isfield(Series,'sethandles')
-    hset_object=findobj(allchild(0),'Name','set_object');
+    hset_object=findobj(allchild(0),'tag','set_object');
     ProjObject=read_set_object(guidata(hset_object));
     %answeryes=questdlg({['field series projected on ' Series.ProjObject.Style]});

trunk/src/series/merge_proj.m

@@ -27 +27 @@
 test_object=get(hseries.GetObject,'Value');
 if test_object
-    hset_object=findobj(allchild(0),'Name','set_object');
+    hset_object=findobj(allchild(0),'tag','set_object');
     ProjObject=read_set_object(guidata(hset_object));
     if ~isfield(ProjObject,'Style')

trunk/src/series/time_series.m

@@ -35 +35 @@
 test_object=get(hseries.GetObject,'Value');
 if test_object
-    hset_object=findobj(allchild(0),'Name','set_object');
+    hset_object=findobj(allchild(0),'tag','set_object');
     ProjObject=read_set_object(guidata(hset_object));
     %answeryes=questdlg({['field series projected on ' Series.ProjObject.Style]});

trunk/src/uvmat.m

@@ -4246 +4246 @@
 hset_object=set_object(ObjectData,PlotHandles,ZBounds);% call the set_object interface,
 set(hset_object,'name',ObjectName)
-pos_uvmat=get(handles.uvmat,'Position');
-%position the set_object GUI with respect to uvmat
-if isfield(UvData,'SetObjectOrigin')
-    pos_set_object(1:2)=UvData.SetObjectOrigin + pos_uvmat(1:2);
-    pos_set_object(3:4)=UvData.SetObjectSize .* pos_uvmat(3:4);
-    set(hset_object,'Position',pos_set_object)
-end
+% pos_uvmat=get(handles.uvmat,'Position');
+% %position the set_object GUI with respect to uvmat
+% if isfield(UvData,'SetObjectOrigin')
+%     pos_set_object(1:2)=UvData.SetObjectOrigin + pos_uvmat(1:2);
+%     pos_set_object(3:4)=UvData.SetObjectSize .* pos_uvmat(3:4);
+%     set(hset_object,'Position',pos_set_object)
+% end
 
 %project the current field on the object and plot it
@@ -4262 +4262 @@
     UvData.Object{IndexObj}.plotaxes=view_field(ProjData);
 end
-
+set(handles.uvmat,'UserData',UvData)
 hother=findobj('Tag','proj_object');%find all the proj objects
 for iobj=1:length(hother)