Changeset 215 for trunk/src/uvmat.m

Timestamp:

Mar 8, 2011, 11:36:29 PM (13 years ago)

Author:

sommeria

Message:

proj_field: correct the projection mode filter on a line
uvmat: correct bug for avi movies extraction
imadoc2struct: cleaning

File:

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

trunk/src/uvmat.m

@@ -234 +234 @@
 %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',{''});
-end
+% 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',{''});
+% end
 set(handles.Fields,'Value',1)
 set(handles.Fields,'string',{''})
@@ -2529 +2529 @@
     set(handles.list_object_1,'String',{''});
 end
-if ~isfield(UvData.Object{1},'plotaxes')
-    UvData.Object{1}.plotaxes=handles.axes3;%default plotting axis 
-end
+% if ~isfield(UvData.Object{1},'plotaxes')
+%     UvData.Object{1}.plotaxes=handles.axes3;%default plotting axis 
+% end
 testnewseries=UvData.NewSeries;
 UvData.NewSeries=0;% put to 0 the test for a new field series (set by RootPath_callback)
@@ -2551 +2551 @@
 end
 plot_handles{1}=handles;
-haxes(1)=handles.axes3;
+if isfield(UvData,'plotaxes')%case of movies
+    haxes(1)=UvData.plotaxes;
+else
+    haxes(1)=handles.axes3;
+end
 PlotParam{1}=read_plot_param(handles);%read plotting parameters on the uvmat interfac
 keeplim(1)=get(handles.FixLimits,'Value');% test for fixed graph limits
@@ -4475 +4479 @@
 msgbox_uvmat('INPUT_Y-N',{['adjust figure ' num2str(newfig) ' with its matlab edit menu '] ;...
         ['then press OK to get the avi movie as a copy of figure ' num2str(newfig) ' display']});
-UvData.Object{1}.plotaxes=newaxes;% the axis in the new figure becomes the current main plotting axes
+UvData.plotaxes=newaxes;% the axis in the new figure becomes the current main plotting axes
 set(huvmat,'UserData',UvData);
 increment=str2double(get(handles.increment_scan,'String')); %get the field increment d
@@ -4509 +4513 @@
     end
 end
-close(aviobj);
-UvData.Object{1}.plotaxes=handles.axes3;
+aviobj=close(aviobj);
+UvData=rmfield(UvData,'plotaxes');
+%UvData.Object{1}.plotaxes=handles.axes3;
 set(huvmat,'UserData',UvData);
 msgbox_uvmat('CONFIRMATION',{['movie ' aviname ' created '];['with ' num2str(imax) ' frames']})