Changeset 483 for trunk/src/mouse_up.m

Timestamp:

Jun 26, 2012, 11:50:19 PM (13 years ago)

Author:

sommeria

Message:

civ set to accept automatic input in the absence of PARAM.xml. Still problem with run time address
zoom improved to deal with elongated plots
better link between PIV and images in uvmat.

File:

• trunk/src/mouse_up.m (modified) (3 diffs)

trunk/src/mouse_up.m

@@ -244 +244 @@
     xlim=get(currentaxes,'XLim');
     ylim=get(currentaxes,'YLim');
- % if left mouse button has been pressed, zoom in by a factor of 2
+    % if left mouse button has been pressed, zoom in by a factor of 2
     if  isequal(get(currentfig,'SelectionType'),'normal');%if left button has been pressed, zoom in by a factor of 2
-        xlim(1)=0.5*xy(1,1)+0.5*xlim(1);
-        xlim(2)=0.5*xy(1,1)+0.5*xlim(2);%double the field whith the middle at the selected points
-        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)
- % if right mouse button has been pressed, zoom out by a factor of 2
+        PlotBoxAspectRatio=get(currentaxes,'PlotBoxAspectRatio');
+        yoverx=PlotBoxAspectRatio(2)/PlotBoxAspectRatio(1);
+        if yoverx <2
+            xlim(1)=0.5*xy(1,1)+0.5*xlim(1);
+            xlim(2)=0.5*xy(1,1)+0.5*xlim(2);%double the field whith the middle at the selected points
+            set(currentaxes,'XLim',xlim)
+        end
+        if yoverx >0.5
+            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)
+        end
+        
+        % if right mouse button has been pressed, zoom out by a factor of 2
     else
         xlim(1)=2*xlim(1)-xy(1,1);% reverse of the zoom on action
@@ -267 +274 @@
                 ylim=AxeData.RangeY;
             end
-         % desactivate the zoom if the full field is visible within the axes
+            % desactivate the zoom if the full field is visible within the axes
             if isequal(xlim,AxeData.RangeX) && isequal(ylim,AxeData.RangeY)
                 set(hhuvmat.CheckZoom,'Value',0)
@@ -323 +330 @@
 %% finalising ruler
 if test_ruler
-    set(hhuvmat.MenuRuler,'checked','off')%desable the ruler option in uvmat  
-    xy=get(currentaxes,'CurrentPoint');% get the current mouse coordinates 
-    RulerCoord=[AxeData.RulerCoord ;xy(1,1:2)];% append the recorded ruler origin to the current mouse coordinates 
+    set(hhuvmat.MenuRuler,'checked','off')%desable the ruler option in uvmat
+    xy=get(currentaxes,'CurrentPoint');% get the current mouse coordinates
+    RulerCoord=[AxeData.RulerCoord ;xy(1,1:2)];% append the recorded ruler origin to the current mouse coordinates
     RulerCoord=diff(RulerCoord,1);% coordiante difference between segment end and beginning
     RulerCoord=RulerCoord(1)+i*RulerCoord(2);