Changeset 682 for trunk/src/mouse_motion.m

Timestamp:

Sep 2, 2013, 7:44:19 PM (12 years ago)

Author:

sommeria

Message:

various bugs repaired

File:

• trunk/src/mouse_motion.m (modified) (7 diffs)

trunk/src/mouse_motion.m

@@ -26 +26 @@
 
 if ~exist('handles','var')
+    set(hCurrentFig,'Pointer','arrow');
     return
 end
@@ -63 +64 @@
     if ~ishandle(FigData.CivHandle)
         delete(hObject)
+        set(hCurrentFig,'Pointer','arrow');
         return
     end
@@ -91 +93 @@
 end
 if size(PosChildren,2)~=4
+    set(hCurrentFig,'Pointer','arrow');
     return
 end
@@ -100 +103 @@
 
 %if the mouse is over an axis, look at the data
-if strcmp(get(hchild,'Type'),'axes')
+htype=get(hchild,'Type');
+if strcmp(htype,'axes')
     CurrentAxes=hchild;
     xy=get(CurrentAxes,'CurrentPoint');%xy(1,1),xy(1,2): current x,y positions in axes coordinates
@@ -323 +327 @@
 %%%%%%%%%%%%%%%%%
 %% create or modify an object
-if ~isempty(huvmat) && test_object
+if strcmp(htype,'axes') && ~isempty(huvmat) && test_object
     UvData=get(huvmat,'UserData');
     PlotData=get(AxeData.CurrentObject,'UserData');
     if ~isfield(PlotData,'IndexObj')
+        set(hCurrentFig,'Pointer','arrow');
         return
     end
@@ -375 +380 @@
 %% detect calibration points if the GUI geometry_calib is opened
 h_geometry_calib=findobj(allchild(0),'Name','geometry_calib'); %find the geomterty_calib GUI
-if ~CheckZoom && ~isempty(h_geometry_calib)
+if strcmp(htype,'axes') && ~CheckZoom && ~isempty(h_geometry_calib)
     pointershape='crosshair';%default for geometry_calib: ready to create new points
     hh_geometry_calib=guidata(h_geometry_calib);
@@ -415 +420 @@
                     Data(index_point,6)=1;%mrk the point on the GUI geometry_calib
                     set(h_ListCoord,'Data',Data);
-                   % set(h_ListCoord,'Value',index_point)%mrk the point on the GUI geometry_calib
                     hhh=findobj('Tag','calib_marker');%look for handle of point marker (circle)
                     if ~isempty(hhh)