Changeset 187 for trunk/src/uvmat.m

Timestamp:

Feb 1, 2011, 1:07:28 AM (13 years ago)

Author:

sommeria

Message:

various bug repairs

File:

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

trunk/src/uvmat.m

@@ -217 +217 @@
 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=[];
 
 %functions for the mouse and keyboard
@@ -2520 +2523 @@
     UvData.Object{1}.plotaxes=handles.axes3;%default plotting axis 
 end
+UvData.NewSeries=0;% put to 0 the test for a new field series (set by RootPath_callback)
+set(handles.uvmat,'UserData',UvData)
 
 %% reset the min and max of scalar if only the mask is displayed(TODO: check the need)
@@ -2612 +2617 @@
             view_field(ObjectData)
         else
-            [PlotType,PlotParamOut]=plot_field(ObjectData,haxes(imap),PlotParam{imap},keeplim(imap),PosColorbar{imap});
+            [PlotType,PlotParamOut]=plot_field(ObjectData,haxes(imap),PlotParam{imap},PosColorbar{imap});
             write_plot_param(plot_handles{imap},PlotParamOut) %update the auto plot parameters
             if isfield(Field,'Mesh')&&~isempty(Field.Mesh)
                 ObjectData.Mesh=Field.Mesh; % gives an estimated mesh size (useful for mouse action on the plot)
             end
-            if imap==1            
-                UvData.axes3=ObjectData;
-            else
-                ViewFieldData=get(view_field_handle,'UserData');
-                ViewFieldData.axes3=ObjectData;
-                set(view_field_handle,'UserData',ViewFieldData)
-            end
+%             if imap==1            
+%                 UvData.axes3=ObjectData;
+%             else
+%                 ViewFieldData=get(view_field_handle,'UserData');
+%                 ViewFieldData.axes3=ObjectData;
+%                 set(view_field_handle,'UserData',ViewFieldData)
+%             end
         end
         if isequal(PlotType,'none')
@@ -2636 +2641 @@
 end
 
-%write_plot_param(handles,UvData.Object{1}.PlotParam);% update the display of the plotting parameters
-UvData.NewSeries=0;% put to 0 the test for a new field series (set by RootPath_callback)
-set(handles.uvmat,'UserData',UvData)
 
 %% update the mask
@@ -3928 +3930 @@
 histo_value=get(handles.histo1_menu,'Value');
 FieldName=histo_menu{histo_value};
-% UvData=get(huvmat,'UserData');
 update_histo(handles.histo_u,huvmat,FieldName)
 
@@ -3939 +3940 @@
 histo_value=get(handles.histo2_menu,'Value');
 FieldName=histo_menu{histo_value};
-% UvData=get(huvmat,'UserData');
 update_histo(handles.histo_v,huvmat,FieldName)
 
@@ -4002 +4002 @@
             end
         end
-        set(haxes,'XLimMode','auto')%reset auto mode (after zoom effect)
-        set(haxes,'YLimMode','auto')
-        plot_field(Histo,haxes);
+%         set(haxes,'XLimMode','auto')%reset auto mode (after zoom effect)
+%         set(haxes,'YLimMode','auto')
+        PlotParam.Auto_xy=1;
+        plot_field(Histo,haxes,PlotParam);
     end
 end
@@ -4186 +4187 @@
 AxeData=UvData.axes3;
 PlotParam=read_plot_param(handles);
-[PlotType,PlotParamOut]= plot_field(AxeData,haxes,PlotParam,1);
+[PP,PlotParamOut]= plot_field(AxeData,haxes,PlotParam);
 write_plot_param(handles,PlotParamOut); %update the auto plot parameters
 
@@ -4307 +4308 @@
     PlotHandles=guidata(hview_field);
 end
-if ~isempty(ProjData)
+% if ~isempty(ProjData)
+'TEST'
+ProjData
     plot_field(ProjData,PlotHandles.axes3,PlotHandles);
-end
+% end
 set(handles.uvmat,'UserData',UvData)
 hother=findobj('Tag','proj_object');%find all the proj objects
@@ -4363 +4366 @@
     %     end
 end
-pause(0.1)
+% pause(0.1)
 figure(hset_object)%put set_object in front