Changeset 701 for trunk/src/mouse_motion.m

Timestamp:

Dec 13, 2013, 10:51:21 PM (11 years ago)

Author:

sommeria

Message:

several bugs repaired

File:

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

trunk/src/mouse_motion.m

@@ -50 +50 @@
 test_zoom_draw=0;
 test_object=0; %test for object editing or creation 
+test_create_object=0;
 test_edit_object=0;% edit test for mouse shape: an arrow
 test_ruler=0;%test for active ruler 
@@ -56 +57 @@
 if ~isempty(huvmat)
     hhuvmat=guidata(huvmat);%handles of the elements in uvma
+    test_create_object=strcmp(get(hhuvmat.MenuObject,'checked'),'on');
     test_edit_object=get(hhuvmat.CheckEditObject,'Value');
     test_ruler=isequal(get(hhuvmat.MenuRuler,'checked'),'on');
@@ -109 +111 @@
     test_zoom_draw=test_draw && isequal(AxeData.Drawing,'zoom')&& isfield(AxeData,'CurrentOrigin') && isequal(get(gcf,'SelectionType'),'normal');
     test_object=test_draw && isfield(AxeData,'CurrentObject') && ~isempty(AxeData.CurrentObject) && ishandle(AxeData.CurrentObject);
-    if ~test_edit_object  && ~test_ruler 
+    if CheckZoom
+           pointershape='zoom';
+    elseif CheckZoomFig
+            pointershape='zoomfig';
+    elseif ~test_edit_object  && ~test_ruler 
         if CheckZoom
            pointershape='zoom';
-        elseif CheckZoomFig
-            pointershape='zoomfig';
-        elseif test_draw
-            pointershape='crosshair';%set pointer with cross shape (default when mouse is over an axis)
+        elseif test_draw|| test_create_object
+            pointershape='crosshair';%set pointer with cross shape 
         else
-        pointershape='fullcross';%set pointer with cross shape (default when mouse is over an axis)
+        pointershape='fullcross';%set pointer with large cross (default when mouse is over an axis)
         end
     end