Changeset 625 for trunk/src/mouse_motion.m

Timestamp:

May 2, 2013, 7:51:42 PM (11 years ago)

Author:

sommeria

Message:

system of object creation by mouse ilmproved

File:

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

trunk/src/mouse_motion.m

@@ -30 +30 @@
 FigData=get(hObject,'UserData');
 if ishandle(FigData)% case of a zoom plot, the handle of the parent rectangle is stored in UserData, its parent is the plotting axes of the rectangle
-    CurrentFig=get(get(FigData,'parent'),'parent');
+    hCurrentFig=get(get(FigData,'parent'),'parent');
 else
-    CurrentFig=hObject;%usual plot
-end
-hhCurrentFig=guidata(CurrentFig);%handles of the elements in the GUI containing the current figure (uvmat or view_field)
+    hCurrentFig=hObject;%usual plot
+end
+hhCurrentFig=guidata(hCurrentFig);%handles of the elements in the GUI containing the current figure (uvmat or view_field)
 CheckZoom=get(hhCurrentFig.CheckZoom,'Value');% check for zoom on mode
 CheckZoomFig=get(hhCurrentFig.CheckZoomFig,'Value');% check for zoom sub fig creation mode
+hPlotAxes=hhCurrentFig.PlotAxes';% handles of the main plot axes
+AxeData=get(hPlotAxes,'UserData');% data attached to the axis
+test_draw=0;%test for mouse drawing of object, =0 by default
+if isfield(AxeData,'Drawing')&& ~isempty(AxeData.Drawing)
+    test_draw=~isequal(AxeData.Drawing,'off');%=1 if mouse drawing of object is active
+end
 test_zoom_draw=0;
-test_draw=0;%test for mouse drawing of object, =0 by default
 test_object=0; %test for object editing or creation 
 test_edit_object=0;% edit test for mouse shap: an arrow
@@ -64 +69 @@
 text_displ_4='';
 
-AxeData=[];%default
+% AxeData=[];%default
 xy=[];%default
 xy_fig=get(hObject,'CurrentPoint');% current point of the current figure (gcbo)
@@ -92 +97 @@
     CurrentAxes=hchild;
     xy=get(CurrentAxes,'CurrentPoint');%xy(1,1),xy(1,2): current x,y positions in axes coordinates
-    AxeData=get(CurrentAxes,'UserData');% data attached to the axis
-    if isfield(AxeData,'Drawing')&& ~isempty(AxeData.Drawing)
-        test_draw=~isequal(AxeData.Drawing,'off');%=1 if mouse drawing of object is active
-    end
     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_zoom_draw && ~test_ruler
     if ~test_edit_object  && ~test_ruler && ~CheckZoom
         pointershape='crosshair';%set pointer with cross shape (default when mouse is over an axis)
     end
-    FigData=get(CurrentFig,'UserData');
+    FigData=get(hCurrentFig,'UserData');
     tagaxes=get(CurrentAxes,'tag');
     if isfield(FigData,tagaxes)
@@ -130 +130 @@
                                 pointershape='arrow'; %mouse indicates  the detection of a vector
                                 if isempty(hhh)
-                                    set(0,'CurrentFigure',CurrentFig)
-                                    set(CurrentFig,'CurrentAxes',CurrentAxes)
+                                    set(0,'CurrentFigure',hCurrentFig)
+                                    set(hCurrentFig,'CurrentAxes',CurrentAxes)
                                     rectangle('Curvature',[1 1],...
                                         'Position',[X(ivec)-Field.CoordMesh/2 Y(ivec)-Field.CoordMesh/2 Field.CoordMesh Field.CoordMesh],'EdgeColor','m',...
@@ -232 +232 @@
                 hhhh=findobj(CurrentAxes,'Tag','PIV_search_marker');
                 if isempty(hhh)
-                    set(0,'CurrentFigure',CurrentFig)
-                    set(CurrentFig,'CurrentAxes',CurrentAxes)
+                    set(0,'CurrentFigure',hCurrentFig)
+                    set(hCurrentFig,'CurrentAxes',CurrentAxes)
                     rectangle('Curvature',[0 0],...
                         'Position',[xround-ibx2 yround-iby2 2*ibx2 2*iby2],'EdgeColor','m',...
@@ -420 +420 @@
 
 %% update the mouse pointer
-set(CurrentFig,'Pointer',pointershape);
+set(hCurrentFig,'Pointer',pointershape);