Changeset 192

Timestamp:

Feb 14, 2011, 7:03:10 PM (13 years ago)

Author:

sommeria

Message:

civ: version working for all systems: windows, linux, mac
plots: introduction of axes limits , bug repairs (still further work needed)

Location:

trunk/src

Files:

• civ.m (modified) (2 diffs)
• keyboard_callback.m (modified) (1 diff)
• mouse_up.m (modified) (5 diffs)
• plot_field.m (modified) (6 diffs)
• uvmat.m (modified) (3 diffs)
• view_field.m (modified) (1 diff)
• write_plot_param.m (modified) (1 diff)

trunk/src/civ.m

@@ -1672 +1672 @@
         return
     end
-else
-    if isunix
-        [xx,w]=unix('ps faux |grep civ|wc -l');
-        w(end)=[];
-        if str2double(w)+numel(num1_civ1)> 50
-            msgbox_uvmat('ERROR',{['There are already ' w ' civ processes running locally'];'Use BATCH or submit RUN later'})
-            return
-        end
-    end
+% else
+%     if isunix
+%         [xx,w]=unix('ps faux |grep civ|wc -l');
+%         w(end)=[];
+%         if str2double(w)+numel(num1_civ1)> 50
+%             msgbox_uvmat('ERROR',{['There are already ' w ' civ processes running locally'];'Use BATCH or submit RUN later'})
+%             return
+%         end
+%     end
 end
 
@@ -2253 +2253 @@
     fprintf(fid,super_cmd');
     fclose(fid);
-    if(isunix)
-        eval(['!. ' filename_superbat ' &']);
-    else
-        eval(['!' filename_superbat ' &']);
-    end
+%     if(isunix)
+        %system(['chmod +x ' filename_superbat])
+     system([filename_superbat ' &'])% execute main commmand
+%     else
+%         eval(['!' filename_superbat ' &']);
+%     end
 end
 

trunk/src/keyboard_callback.m

@@ -2 +2 @@
 %-----------------------------------
 function keyboard_callback(hObject,eventdata,handleshaxes)
+cur_axes=get(hObject,'CurrentAxes');%current plotting axes of the figure with handle hObject
 xx=double(get(hObject,'CurrentCharacter')); %get the keyboard character
-cur_axes=get(gcbf,'CurrentAxes');
-if ~isempty(cur_axes)
-    xlimit=get(cur_axes,'XLim');
-    ylimit=get(cur_axes,'Ylim');
-    dx=(xlimit(2)-xlimit(1))/10;
-    dy=(ylimit(2)-ylimit(1))/10;
-   
-    if isequal(xx,29)%move arrow right
-        xlimit=xlimit+dx;
-    elseif isequal(xx,28)%move arrow left
-        xlimit=xlimit-dx;
-    elseif isequal(xx,30)%move arrow up
-        ylimit=ylimit+dy;
-    elseif isequal(xx,31)%move arrow down
-        ylimit=ylimit-dy;
-    end
-    set(cur_axes,'XLim',xlimit)
-    set(cur_axes,'YLim',ylimit)
-end
-if ismember(xx,[8 127]) %if the delete or suppr key is pressed, delete the current object 
-    currentobject=gco;
-    huvmat=findobj(allchild(0),'tag','uvmat');
-%     UvData=get(huvmat,'UserData');%Data associated to the current uvmat interface
-    hlist_object=findobj(huvmat,'Tag','list_object_1');
-    ObjIndex=get(hlist_object,'Value')
-    if ObjIndex>1 
-        delete_object(ObjIndex)
-    end
-    if ishandle(currentobject)
-        tag=get(currentobject,'Tag');%tag of the current selected object
-        if isequal(tag,'proj_object')
-            delete_object(currentobject)
+switch xx
+    case {29,28,30,31}    %arrows for displacement
+        if ~isempty(cur_axes)
+            xlimit=get(cur_axes,'XLim');
+            ylimit=get(cur_axes,'Ylim');
+            dx=(xlimit(2)-xlimit(1))/10;
+            dy=(ylimit(2)-ylimit(1))/10;
+            if isequal(xx,29)%move arrow right
+                xlimit=xlimit+dx;
+            elseif isequal(xx,28)%move arrow left
+                xlimit=xlimit-dx;
+            elseif isequal(xx,30)%move arrow up
+                ylimit=ylimit+dy;
+            elseif isequal(xx,31)%move arrow down
+                ylimit=ylimit-dy;
+            end
+            set(cur_axes,'XLim',xlimit)
+            set(cur_axes,'YLim',ylimit)
+            hfig=hObject; %master figure
+            AxeData=get(cur_axes,'UserData');
+            if isfield(AxeData,'ParentRect')% update the position of the parent rectangle representing the field
+                hparentrect=AxeData.ParentRect;
+                rect([1 2])=[xlimit(1) ylimit(1)];
+                rect([3 4])=[xlimit(2)-xlimit(1) ylimit(2)-ylimit(1)];
+                set(hparentrect,'Position',rect)
+                hfig=get(hparentrect,'parent');
+                hfig=get(hfig,'parent');
+            elseif isfield(AxeData,'LimEditBox')&& isequal(AxeData.LimEditBox,1)% update display of the GUI containing the axis (uvmat or view_field)
+                hh=guidata(hfig);
+                if isfield(hh,'MinX')
+                    set(hh.MinX,'String',num2str(xlimit(1)))
+                    set(hh.MaxX,'String',num2str(xlimit(2)))
+                    set(hh.MinY,'String',num2str(ylimit(1)))
+                    set(hh.MaxY,'String',num2str(ylimit(2)))
+                end
+            end
         end
-    end
-elseif isequal(xx,112)%  key 'p'
-    uvmat('runplus_Callback',hObject,eventdata,handleshaxes)
-elseif isequal(xx,109)%  key 'm'
-    uvmat('runmin_Callback',hObject,eventdata,handleshaxes)
+    case {8, 127} %if the delete or suppr key is pressed, delete the current object 
+        currentobject=gco;
+        huvmat=findobj(allchild(0),'tag','uvmat');
+        hlist_object=findobj(huvmat,'Tag','list_object_1');
+        ObjIndex=get(hlist_object,'Value');
+        if ObjIndex>1 
+            delete_object(ObjIndex)
+        end
+        if ishandle(currentobject)
+            tag=get(currentobject,'Tag');%tag of the current selected object
+            if isequal(tag,'proj_object')
+                delete_object(currentobject)
+            end
+        end
+    case 112%  key 'p'
+        uvmat('runplus_Callback',hObject,eventdata,handleshaxes)
+    case 109%  key 'm'
+        uvmat('runmin_Callback',hObject,eventdata,handleshaxes)
 end
 
-AxeData=get(cur_axes,'UserData');
-if isfield(AxeData,'ParentRect')% update the position of the parent rectangle represneting the field
-    hparentrect=AxeData.ParentRect;
-    rect([1 2])=[xlimit(1) ylimit(1)];
-    rect([3 4])=[xlimit(2)-xlimit(1) ylimit(2)-ylimit(1)];
-    set(hparentrect,'Position',rect)
-end

trunk/src/mouse_up.m

@@ -28 +28 @@
 currentfig=hObject;
 tagfig=get(currentfig,'tag');
-hhcurrentfig=guidata(currentfig);
+currentaxes=gca; %store the current axes handle
+AxeData=get(currentaxes,'UserData');
+if isfield(AxeData,'CurrentOrigin')
+    CurrentOrigin=AxeData.CurrentOrigin;
+end
+if isfield(AxeData,'ParentRect')% case of a zoom plot as current axis
+    parentaxes=get(AxeData.ParentRect,'parent');
+    AxeData=get(parentaxes,'UserData');
+    controlGUI=get(parentaxes,'parent');%handles of the GUI parent of the zoom plot
+    hhcurrentfig=guidata(controlGUI);
+    testsubplot=1;
+else
+    hhcurrentfig=guidata(currentfig);%the current figure is a GUI (uvmat or view_field)
+    testsubplot=0;
+end
 test_zoom=get(hhcurrentfig.zoom,'Value');
 
-% if ~exist('handles','var')
-%    handles=get(gcbo,'UserData');
-% end
 huvmat=findobj(allchild(0),'tag','uvmat');%find the uvmat interface handle
 if ~isempty(huvmat)
     hhuvmat=guidata(huvmat);
     UvData=get(huvmat,'UserData');
-%     if isfield(UvData,'MouseAction')
-%         MouseAction=UvData.MouseAction;% set the mouse action (edit, create objects...)
-%     end
    test_ruler=~test_zoom && isequal(get(hhuvmat.MenuRuler,'checked'),'on');%test for ruler  action, second priority
 end
-currentfig=hObject;
-currentaxes=gca; %store the current axes handle
-AxeData=get(currentaxes,'UserData');
-
 test_drawing=0;%default
 
@@ -161 +165 @@
                     ViewFieldData.axes3=ProjData;
                     set(hview_field,'UserData',ViewFieldData)
-                    PlotHandles=guidata(hview_field);
+%                     PlotHandles=guidata(hview_field);
                 else
                     UvData.axes3=ProjData;
-                    PlotHandles=hhuvmat;
+%                     PlotHandles=hhuvmat;
                 end
-                [PlotType,PlotParam]=plot_field(ProjData,PlotHandles.axes3,PlotHandles);%update an existing field plot
-                write_plot_param(PlotHandles,PlotParam); %update the display of plotting parameters for the current object
+                [PlotType,PlotParam]=plot_field(ProjData,hhcurrentfig.axes3,hhcurrentfig);%update an existing field plot
+                write_plot_param(hhcurrentfig,PlotParam); %update the display of plotting parameters for the current object
             end
             %             if  isfield(UvData.Object{IndexObj},'PlotParam')
@@ -190 +194 @@
 
 %% creation of a new zoom plot
-test_replot=0;
 if isequal(get(currentfig,'SelectionType'),'normal');%if left button has been pressed
-%         FigData=get(currentfig,'UserData');
-        hparentfig=currentfig;
-        %open or update a new zoom figure if a rectangle has been drawn
-        if ishandle(currentaxes);
-            if isfield(AxeData,'CurrentRectZoom') && ~isempty(AxeData.CurrentRectZoom) && ishandle(AxeData.CurrentRectZoom)
-                PosRect=get(AxeData.CurrentRectZoom,'Position');
-                if isfield(AxeData,'CurrentVec') && ~isempty(AxeData.CurrentVec) && ishandle(AxeData.CurrentVec)
-                    delete(AxeData.CurrentVec)
-                end
+    hparentfig=currentfig;
+    %open or update a new zoom figure if a rectangle has been drawn
+    if ishandle(currentaxes);
+        if isfield(AxeData,'CurrentRectZoom') && ~isempty(AxeData.CurrentRectZoom) && ishandle(AxeData.CurrentRectZoom)
+            PosRect=get(AxeData.CurrentRectZoom,'Position');
+            if isfield(AxeData,'CurrentVec') && ~isempty(AxeData.CurrentVec) && ishandle(AxeData.CurrentVec)
+                delete(AxeData.CurrentVec)
+            end
+            if ~testsubplot
                 hfig2=figure;%create new figure
                 set(hfig2,'name','zoom')
@@ -207 +210 @@
                 map=colormap(currentaxes);
                 colormap(map);%transmit the current colormap to the zoom fig
-                set(hfig2,'Position',[0.2 0.33 0.6 0.6]);
-                if test_replot==0
-                    set(hfig2,'Unit','normalized')
-                    set(hfig2,'KeyPressFcn',{@keyboard_callback,handles})%set keyboard action function
-                    set(hfig2,'WindowButtonMotionFcn',{@mouse_motion,handles})%set mouse action function
-                    set(hfig2,'WindowButtonDownFcn',{@mouse_down})%set mouse click action function
-                    set(hfig2,'WindowButtonUpFcn',{@mouse_up,handles})  
-                    set(hfig2,'DeleteFcn',{@close_fig,AxeData.CurrentRectZoom,'zoom'})
-                    set(hfig2,'UserData',AxeData.CurrentRectZoom)% record the parent object (zoom rectangle) in the new fig
-                    AxeData.ZoomAxes=copyobj(currentaxes,hfig2); %copy the current graph axes to the zoom figure 
-                    figure(hfig2)
-                    set(AxeData.ZoomAxes,'Position',[0.1300    0.1100    0.7750    0.8150])% standard axes position on a figure
-                    hcol=findobj(hparentfig,'Tag','Colorbar'); %look for colorbar axes
-                    if ~isempty(hcol)             
-                        hcol_new=colorbar;
-                        YTick=get(hcol,'YTick');
-                        YTicklabel=get(hcol,'Yticklabel');  
-                        colbarlim=get(hcol,'YLim'); 
-                        newcolbarlim=get(hcol_new,'YLim');
-                        scale_bar=(newcolbarlim(2)-newcolbarlim(1))/(colbarlim(2)-colbarlim(1));                
-                        YTick_rescaled=newcolbarlim(1)+scale_bar*(YTick-colbarlim(1));
-                        set(hcol_new,'YTick',YTick_rescaled);
-                        set(hcol_new,'Yticklabel',YTicklabel);
-                    end
+                set(hfig2,'Position',[0.2 0.33 0.6 0.6]);          
+                set(hfig2,'Unit','normalized')
+                set(hfig2,'KeyPressFcn',{@keyboard_callback,handles})%set keyboard action function
+                set(hfig2,'WindowButtonMotionFcn',{@mouse_motion,handles})%set mouse action function
+                set(hfig2,'WindowButtonDownFcn',{@mouse_down})%set mouse click action function
+                set(hfig2,'WindowButtonUpFcn',{@mouse_up,handles})
+                set(hfig2,'DeleteFcn',{@close_fig,AxeData.CurrentRectZoom,'zoom'})
+                set(hfig2,'UserData',AxeData.CurrentRectZoom)% record the parent object (zoom rectangle) in the new fig
+                AxeData.ZoomAxes=copyobj(currentaxes,hfig2); %copy the current graph axes to the zoom figure
+                ChildAxeData=get(AxeData.ZoomAxes,'UserData');
+                if isfield(ChildAxeData,'ParentGUI')
+                    ChildAxeData=rmfield(ChildAxeData,'ParentGUI');%no parent GUI, e.g. uvmat,  for the new plot
                 end
-                if ishandle(AxeData.ZoomAxes)
-                    hnew_rect=findobj(AxeData.ZoomAxes,'Tag','rect_zoom');
-                    if ~isempty(hnew_rect)
-                        delete(hnew_rect);
-                        ChildAxeData=get(AxeData.ZoomAxes,'UserData');
-                        ChildAxeData.CurrentRectZoom=[]; % no rect zoom in the new window
-                        ChildAxeData.Drawing='off';
-                        ChildAxeData.ParentRect=AxeData.CurrentRectZoom;%set the rectangle as a 'parent' associated to the new axes
-                        set(AxeData.ZoomAxes,'UserData',ChildAxeData);%update the AxeData of the new axes
-                        set(AxeData.ZoomAxes,'Xlim',[PosRect(1) PosRect(1)+PosRect(3)])
-                        set(AxeData.ZoomAxes,'Ylim',[PosRect(2) PosRect(2)+PosRect(4)])
-                    end
+                %figure(hfig2)
+                %set(0,'CurrentFigure',hfig2)% the zoom figure becomes the current figure
+                set(AxeData.ZoomAxes,'Position',[0.1300    0.1100    0.7750    0.8150])% standard axes position on a figure
+                hcol=findobj(hparentfig,'Tag','Colorbar'); %look for colorbar axes
+                if ~isempty(hcol)
+                    hcol_new=colorbar;
+                    YTick=get(hcol,'YTick');
+                    YTicklabel=get(hcol,'Yticklabel');
+                    colbarlim=get(hcol,'YLim');
+                    newcolbarlim=get(hcol_new,'YLim');
+                    scale_bar=(newcolbarlim(2)-newcolbarlim(1))/(colbarlim(2)-colbarlim(1));
+                    YTick_rescaled=newcolbarlim(1)+scale_bar*(YTick-colbarlim(1));
+                    set(hcol_new,'YTick',YTick_rescaled);
+                    set(hcol_new,'Yticklabel',YTicklabel);
                 end
             end
-        end
+    %             if ishandle(AxeData.ZoomAxes)
+%             hnew_rect=findobj(AxeData.ZoomAxes,'Tag','rect_zoom');
+%             if ~isempty(hnew_rect)
+%                 delete(hnew_rect);
+
+                ChildAxeData.CurrentRectZoom=[]; % no rect zoom in the new window
+                ChildAxeData.Drawing='off';
+                ChildAxeData.ParentRect=AxeData.CurrentRectZoom;%set the rectangle as a 'parent' associated to the new axe
+                PosRect=CurrentOrigin;
+                xy=get(currentaxes,'CurrentPoint')%xy(1,1),xy(1,2): current x,y positions in axes coordinates
+                set(AxeData.ZoomAxes,'Xlim',[PosRect(1) xy(1,1)])
+                set(AxeData.ZoomAxes,'Ylim',[PosRect(2) xy(1,2)])
+%             end
+            set(AxeData.ZoomAxes,'UserData',ChildAxeData);%update the AxeData of the new axes
+        end
+    end
 end
 
@@ -252 +260 @@
 if test_zoom
     xy=get(currentaxes,'CurrentPoint');%xy(1,1),xy(1,2): current x,y positions in axes coordinates
-     if  isequal(get(currentfig,'SelectionType'),'normal');%if left button has been pressed
-        xlim=get(currentaxes,'XLim');
-        xlim_new(2)=0.5*xy(1,1)+0.5*xlim(2);
-        xlim_new(1)=0.5*xy(1,1)+0.5*xlim(1);
-        set(currentaxes,'XLim',xlim_new)
-        ylim=get(currentaxes,'YLim'); 
-        ylim_new(2)=0.5*xy(1,2)+0.5*ylim(2);
-        ylim_new(1)=0.5*xy(1,2)+0.5*ylim(1);
-        set(currentaxes,'YLim',ylim_new)
-        if isfield(AxeData,'ParentRect')% update the position of the parent rectangle represneting the field
-            hparentrect=AxeData.ParentRect;
-            xlim=get(currentaxes,'XLim');
-            ylim=get(currentaxes,'YLim');
-            rect([1 2])=[xlim(1) ylim(1)];
-            rect([3 4])=[xlim(2)-xlim(1) ylim(2)-ylim(1)];
-            set(hparentrect,'Position',rect)
-        end
-     %zoom out by a factor of 2 out when the right mouse button has been used 
-     elseif isequal(get(currentfig,'SelectionType'),'alt'); %if right button has been pressed
-%             alpha=2; %zoom factor (zoom out by a factor 2)
-            xlim=get(currentaxes,'XLim');
-            xlim_new(1)=2*xlim(1)-xy(1,1);
-            xlim_new(2)=2*xlim(2)-xy(1,1);
-%             xlim_new(1)=(1+alpha)*xlim(1)/2+(1-alpha)*xlim(2)/2;
-%             xlim_new(2)=(1-alpha)*xlim(1)/2+(1+alpha)*xlim(2)/2;
-            ylim=get(currentaxes,'YLim');
-            ylim_new(1)=2*ylim(1)-xy(1,2);
-            ylim_new(2)=2*ylim(2)-xy(1,2);
-%             ylim_new(1)=(1+alpha)*ylim(1)/2+(1-alpha)*ylim(2)/2;
-%             ylim_new(2)=(1-alpha)*ylim(1)/2+(1+alpha)*ylim(2)/2;
-            if isfield(AxeData,'RangeX') && isfield(AxeData,'RangeY')
-                xlim_new(1)=max(AxeData.RangeX(1),xlim_new(1));
-                xlim_new(2)=min(AxeData.RangeX(2),xlim_new(2));
-                ylim_new(1)=max(AxeData.RangeY(1),ylim_new(1));
-                ylim_new(2)=min(AxeData.RangeY(2),ylim_new(2));
-                if isequal(xlim_new,AxeData.RangeX) && isequal(ylim_new,AxeData.RangeY)
-                    set(hhuvmat.zoom,'Value',0)
-                    set(hhuvmat.zoom,'BackgroundColor',[0.7 0.7 0.7])
-                    set(hhuvmat.FixedLimits,'Value',0)
-                    set(hhuvmat.FixedLimits,'BackgroundColor',[0.7 0.7 0.7])
-                end
-            end
-            set(currentaxes,'XLim',xlim_new)
-            set(currentaxes,'YLim',ylim_new)
-            %test whther zoom out is operating (to inactivate AxedAta
-            if ~isfield(AxeData,'CurrentXLim')|| ~isequal(xlim,AxeData.CurrentXLim)
-                AxeData.CurrentXLim=xlim;%
-            end
-            if isfield(AxeData,'ParentRect')% update the position of the parent rectangle represneting the field
-                hparentrect=AxeData.ParentRect;
-                xlim=get(currentaxes,'XLim');
-                ylim=get(currentaxes,'YLim');
-                rect([1 2])=[xlim(1) ylim(1)];
-                rect([3 4])=[xlim(2)-xlim(1) ylim(2)-ylim(1)];
-                set(hparentrect,'Position',rect)
-            end
-      end
+    xlim=get(currentaxes,'XLim');
+    ylim=get(currentaxes,'YLim');
+    if  isequal(get(currentfig,'SelectionType'),'normal');%if left button has been pressed
+        xlim(1)=0.5*xy(1,1)+0.5*xlim(1);
+        xlim(2)=0.5*xy(1,1)+0.5*xlim(2);
+        set(currentaxes,'XLim',xlim)
+        ylim(2)=0.5*xy(1,2)+0.5*ylim(2);
+        ylim(1)=0.5*xy(1,2)+0.5*ylim(1);
+        set(currentaxes,'YLim',ylim)
+        %zoom out by a factor of 2 out when the right mouse button has been used
+    else%if isequal(get(currentfig,'SelectionType'),'alt'); %if right button has been pressed
+        xlim(1)=2*xlim(1)-xy(1,1);
+        xlim(2)=2*xlim(2)-xy(1,1);
+        ylim(1)=2*ylim(1)-xy(1,2);
+        ylim(2)=2*ylim(2)-xy(1,2);
+        %             ylim_new(1)=(1+alpha)*ylim(1)/2+(1-alpha)*ylim(2)/2;
+        %             ylim_new(2)=(1-alpha)*ylim(1)/2+(1+alpha)*ylim(2)/2;
+        if isfield(AxeData,'RangeX') && isfield(AxeData,'RangeY')
+            xlim(1)=max(AxeData.RangeX(1),xlim(1));
+            xlim(2)=min(AxeData.RangeX(2),xlim(2));
+            ylim(1)=max(AxeData.RangeY(1),ylim(1));
+            ylim(2)=min(AxeData.RangeY(2),ylim(2));
+            if isequal(xlim,AxeData.RangeX) && isequal(ylim,AxeData.RangeY)
+                set(hhuvmat.zoom,'Value',0)
+                set(hhuvmat.zoom,'BackgroundColor',[0.7 0.7 0.7])
+                set(hhuvmat.FixedLimits,'Value',0)
+                set(hhuvmat.FixedLimits,'BackgroundColor',[0.7 0.7 0.7])
+            end
+        end
+        set(currentaxes,'XLim',xlim)
+        set(currentaxes,'YLim',ylim)
+        %test whther zoom out is operating (to inactivate AxedAta
+        if ~isfield(AxeData,'CurrentXLim')|| ~isequal(xlim,AxeData.CurrentXLim)
+            AxeData.CurrentXLim=xlim;%
+        end
+    end
+%     if isfield(AxeData,'ParentRect')% update the position of the parent rectangle represneting the field
+%         hparentrect=AxeData.ParentRect;
+%         xlim=get(currentaxes,'XLim');
+%         ylim=get(currentaxes,'YLim');
+%         rect([1 2])=[xlim(1) ylim(1)];
+%         rect([3 4])=[xlim(2)-xlim(1) ylim(2)-ylim(1)];
+%         set(hparentrect,'Position',rect)
+    if isfield(AxeData,'LimEditBox')&& AxeData.LimEditBox% update display of the GUI containing the axis (uvmat or view_field)
+        set(hhcurrentfig.MinX,'String',num2str(xlim(1)))
+        set(hhcurrentfig.MaxX,'String',num2str(xlim(2)))
+        set(hhcurrentfig.MinY,'String',num2str(ylim(1)))
+        set(hhcurrentfig.MaxY,'String',num2str(ylim(2)))
+    end
 end
 

trunk/src/plot_field.m

@@ -128 +128 @@
     end
 end
-if isfield(PlotParam,'text_display_1') && ishandle(PlotParam.text_display_1)
-    PlotParam=read_plot_param(PlotParam);   
-end
+% if isfield(PlotParam,'text_display_1') && ishandle(PlotParam.text_display_1)
+%     PlotParam=read_plot_param(PlotParam);   
+% end
 % create a new figure and axes if the plotting axes does not exist
 if testnewfig
     hfig=figure;
-    if isfield(PlotParam,'text_display_1') && ishandle(PlotParam.text_display_1)
-        set(hfig,'UserData',PlotParam)
-    end
+%     if isfield(PlotParam,'text_display_1') && ishandle(PlotParam.text_display_1)
+%         set(hfig,'UserData',PlotParam)
+%     end
     set(hfig,'Units','normalized')
-    set(hfig,'WindowButtonDownFcn','mouse_down')
-    set(hfig,'WindowButtonMotionFcn','mouse_motion')%set mouse action function
-    set(hfig,'WindowButtonUpFcn','mouse_up')%set mouse action function
+%     set(hfig,'WindowButtonDownFcn','mouse_down')
+%     set(hfig,'WindowButtonMotionFcn','mouse_motion')%set mouse action function
+%     set(hfig,'WindowButtonUpFcn','mouse_up')%set mouse action function
     haxes=axes;
     set(haxes,'position',[0.13,0.2,0.775,0.73])
@@ -146 +146 @@
 else
     hfig=get(haxes,'parent');
-    set(0,'CurrentFigure',hfig)
-    set(hfig,'CurrentAxes',haxes)
+    set(0,'CurrentFigure',hfig)% the parent of haxes becomes the current figure
+    set(hfig,'CurrentAxes',haxes)%  haxes becomes the current axes of the parent figure 
 end
 
@@ -153 +153 @@
 if ~isempty(Data)
     [Data,errormsg]=check_field_structure(Data);
-
     if ~isempty(errormsg)
         msgbox_uvmat('ERROR',['input of plot_field/check_field_structure: ' errormsg])
@@ -213 +212 @@
         PlotType='line';
 end
+
 if isempty(index_2D)
     plot_plane([],[],[],haxes);%removes images or vector plots if any
@@ -330 +330 @@
 function PlotParamOut=plot_profile(data,CellVarIndex,VarType,haxes,PlotParam)
 %-------------------------------------------------------------------
+if ~exist('PlotParam','var')
+    PlotParam=[];
+end
 PlotParamOut=PlotParam; %default
 hfig=get(haxes,'parent');
@@ -1030 +1033 @@
 
 %store the coordinate extrema occupied by the field
+Data
 if ~isempty(Data)
-    test_lim=0;
-    if test_vec
-        Xlim=[min(vec_X) max(vec_X)];
-        Ylim=[min(vec_Y) max(vec_Y)];
-        test_lim=1;
+    fix_lim=isfield(PlotParam,'FixLimits') && PlotParam.FixLimits;
+    if fix_lim
+        if ~isfield(PlotParam,'MinX')||~isfield(PlotParam,'MaxX')||~isfield(PlotParam,'MinY')||~isfield(PlotParam,'MaxY')
+            fix_lim=0; %free limits if lits are not set,
+        end  %else PlotParamOut.XMin =PlotParam.XMin...
+    end
+    'TESTfix'
+    fix_lim
+    if ~fix_lim
+        XMin=[];
+        XMax=[];
+        YMin=[];
+        YMax=[];
         if test_ima%both background image and vectors coexist, take the wider bound
-            Xlim(1)=min(AX(1),Xlim(1));
-            Xlim(2)=max(AX(end),Xlim(2));
-            Ylim(1)=min(AY(end),Ylim(1));
-            Ylim(2)=max(AY(1),Ylim(2));
-        end
-    elseif test_ima %only image plot
-        Xlim(1)=min(AX(1),AX(end));
-        Xlim(2)=max(AX(1),AX(end));
-        Ylim(1)=min(AY(1),AY(end));
-        Ylim(2)=max(AY(1),AY(end));
-        test_lim=1;
-    end
-    AxeData.RangeX=Xlim;
-    AxeData.RangeY=Ylim;
-
-%    adjust the size of the plot to include the whole field, except if PlotParam.FixedLimits=1
-    if ~(isfield(PlotParam,'FixLimits') && PlotParam.FixLimits) && test_lim 
-        PlotParamOut.MinX=Xlim(1);
-        PlotParamOut.MaxX=Xlim(2);
-        PlotParamOut.MinY=Ylim(1);
-        PlotParamOut.MaxY=Ylim(2);
-        if Xlim(2)>Xlim(1)
-            set(haxes,'XLim',Xlim);% set x limits of frame in axes coordinates
-        end
-        if Ylim(2)>Ylim(1)
-            set(haxes,'YLim',Ylim);% set y limits of frame in axes coordinate
-        end
-    end
-
-    set(haxes,'YDir','normal') 
+            XMin=min(AX);
+            XMax=max(AX);
+            YMin=min(AY);
+            YMax=max(AY);
+        end
+        if test_vec
+            XMin=[XMin min(vec_X)];
+            XMax=[XMax max(vec_X)];
+            YMin=[YMin min(vec_Y)];
+            YMax=[YMax max(vec_Y)];
+        end
+        PlotParamOut.MinX=min(XMin);
+        PlotParamOut.MaxX=max(XMax);
+        PlotParamOut.MinY=min(YMin);
+        PlotParamOut.MaxY=max(YMax);
+        if XMax>XMin
+            set(haxes,'XLim',[XMin XMax]);% set x limits of frame in axes coordinates
+        end
+        if YMax>YMin
+            set(haxes,'YLim',[YMin YMax]);% set x limits of frame in axes coordinates
+        end
+    end
+%     if Ylim(2)>Ylim(1)
+%         set(haxes,'YLim',Ylim);% set y limits of frame in axes coordinate
+%     end
+%     end
+    %    adjust the size of the plot to include the whole field, except if PlotParam.FixLimits=1
+    %     if ~(isfield(PlotParam,'FixLimits') && PlotParam.FixLimits) && test_lim
+    %         PlotParamOut.MinX=Xlim(1);
+    %         PlotParamOut.MaxX=Xlim(2);
+    %         PlotParamOut.MinY=Ylim(1);
+    %         PlotParamOut.MaxY=Ylim(2);
+%     if Xlim(2)>Xlim(1)
+%         set(haxes,'XLim',Xlim);% set x limits of frame in axes coordinates
+%     end
+%     if Ylim(2)>Ylim(1)
+%         set(haxes,'YLim',Ylim);% set y limits of frame in axes coordinate
+%     end
+    %     end
+
+    set(haxes,'YDir','normal')
     set(get(haxes,'XLabel'),'String',[XName ' (' x_units ')']);
     set(get(haxes,'YLabel'),'String',[YName ' (' y_units ')']);

trunk/src/uvmat.m

@@ -220 +220 @@
 UvData.axes2=[];
 UvData.axes1=[];
+AxeData.LimEditBox=1; %initialise AxeData
+set(handles.axes3,'UserData',AxeData)
 
 %functions for the mouse and keyboard
@@ -4201 +4203 @@
 UvData=get(handles.uvmat,'UserData');
 AxeData=UvData.axes3;
-PlotParam=read_plot_param(handles);
-PlotParam.Scalar
+'TESTupdateplot'
+PlotParam=read_plot_param(handles)
+PlotParam.Vectors
 [PP,PlotParamOut]= plot_field(AxeData,haxes,PlotParam);
+'TESTOUT'
+PlotParamOut
 write_plot_param(handles,PlotParamOut); %update the auto plot parameters
 
@@ -4947 +4952 @@
     delete(handles.UVMAT_title)%delete the initial display of uvmat if no field has been entered
 end
-PlotHandles=get_plot_handles(handles);%get the handles of the interface elements setting the plotting parameters
-set_object(data,PlotHandles);% call the set_object interface
+%PlotHandles=get_plot_handles(handles);%get the handles of the interface elements setting the plotting parameters
+set_object(data,handles);% call the set_object interface
 set(handles.MenuObject,'checked','on')
 set(handles.uvmat,'UserData',UvData)

trunk/src/view_field.m

@@ -92 +92 @@
 ViewFieldData.axes3=[];%initiates the record of the current field (will be updated by plot_field)
 set(handles.view_field,'UserData',ViewFieldData);%store the current field
+AxeData.LimEditBox=1; %initialise AxeData, the parent figure sets plot parameters
+set(handles.axes3,'UserData',AxeData)
 if ~exist('Field','var')
     return
 end
-'TESviewfield'
 [PlotType,PlotParamOut]= plot_field(Field,handles.axes3);%,PlotParam,KeepLim,PosColorbar)
 

trunk/src/write_plot_param.m

@@ -1 +1 @@
 %'write_plot_param': update the plotting parameters on the uvmat interface after a plotting operation
 function write_plot_param(handles,PlotParam)
-
+'TESTwrite'
+PlotParam
 %coordinates
 if isfield(PlotParam,'FixEqual')