Changeset 681 for trunk/src/mouse_down.m

Timestamp:

Sep 2, 2013, 2:42:52 PM (11 years ago)

Author:

sommeria

Message:

mouse action improved for translations, use of magenta color to indicate that REFRESH is needed

File:

• trunk/src/mouse_down.m (modified) (9 diffs)

trunk/src/mouse_down.m

@@ -59 +59 @@
     UvData=get(huvmat,'UserData');
     test_ruler=isequal(get(hhuvmat.MenuRuler,'checked'),'on');%test for ruler  action, second priority;
-    test_edit=get(hhuvmat.CheckEditObject,'Value')&& (isequal(obj_tag,'proj_object')||isequal(obj_tag,'DeformPoint'));%test for object editing, third priority
+    test_edit=get(hhuvmat.CheckEditObject,'Value');%&& (isequal(obj_tag,'proj_object')||isequal(obj_tag,'DeformPoint'));%test for object editing, third priority
     hset_object=findobj(allchild(0),'Name','set_object');
     if ~isempty(hset_object)
@@ -97 +97 @@
 ind_object=find(check_pos(:,1) & check_pos(:,2),1);% select the index of the (first) object under the mouse
 hchild=hchildren(ind_object);% corresponding object handle
+htype='';
 if ~isempty(hchild)
     htype=get(hchild,'Type');%type of object child of the current figure
@@ -105 +106 @@
             xy=get(hchild,'CurrentPoint');%xy(1,1),xy(1,2): current x,y positions in axes coordinates
             AxeData=get(hchild,'UserData');% data attached to the axis
-%             if isfield(AxeData,'ObjectCoord') && size(AxeData.ProjObjectCoord,2)==3
-%                 xy(1,3)=AxeData.ProjObjectCoord(1,3); % z coordinate of the mouse: to generalise ...
-%             else
-%                 xy(1,3)=0; % z coordinate set to 0 by default
-%             end
+            AxeData.Enable='on';% unable current axes for mouse up action
             AxeData.CurrentOrigin=xy(1,1:2);% The current point set by the mouse becomes the current origin
             
@@ -135 +132 @@
                 end
             end
-            %break% leave the loop once an axes has been selected
-            
+            set(hchild,'UserData',AxeData)
             %if the mouse is over a uicontrol, with right mouse button activated, duplicate the display in an editable  zoom window
         case 'uicontrol'
@@ -153 +149 @@
                 hhchildren=get(hchild,'Children');%handles of all objects in the selected panel
                 check_visible=strcmp(get(hhchildren,'Visible'),'on');%=1 if visible='on', =0 otherwise
-                hhchildren=hhchildren(check_visible); %keep only the visible children
-                
+                hhchildren=hhchildren(check_visible); %keep only the visible children               
                 PosChildren=get(hhchildren,'Position');
                 PosLength=cellfun('length',PosChildren);
@@ -171 +166 @@
                     end
                 end
-            end
-            %   return %leave the function once a uicontrol has been selected
-    end
-end
-
+            end            
+    end
+end
+    if ~strcmp(htype,'axes')
+        currentaxes=get(hObject,'CurrentAxes');
+        if ~isempty(currentaxes)
+        AxeData=get(currentaxes,'UserData');% data attached to the axis
+        AxeData.Enable='off';% desactivate current axes for mouse up action
+        set(currentaxes,'UserData',AxeData);
+        end
+    end
+    
 %% zoom has first priority, stop here
 if CheckZoom 
@@ -236 +238 @@
 %% selection of an existing projection object (third priority)
 if  test_edit 
+    testdeform=0;
     if ~(isfield(AxeData,'Drawing') && isequal(AxeData.Drawing,'create'))
         userdata=get(hcurrentobject,'UserData');
@@ -293 +296 @@
             set_object(UvData.ProjObject{IndexObj})
             axes(hchild);%set back the current axes haxes
-            testdeform=0;
             set(gcbo,'Pointer','circle'); 
             AxeData.Drawing='deform';
@@ -307 +309 @@
                end
             end
-            if testdeform==0
+%             if testdeform==0
+%                 AxeData.Drawing='translate';
+%                 set(AxeData.CurrentObject,'Selected','on')
+%                 set(gcbo,'Pointer','fleur');
+%             end
+        else
+            if strcmp(get(hCurrentGUI,'tag'),'uvmat') %if the uvmat graph has been selected, object projection is on the other frame view_field
+               IndexObj=get(hhuvmat.ListObject,'Value');
+               AxeData.CurrentObject=UvData.ProjObject{IndexObj}.DisplayHandle.uvmat;
+            else
+                IndexObj=get(hhuvmat.ListObject_1,'Value');
+                AxeData.CurrentObject=UvData.ProjObject{IndexObj}.DisplayHandle.view_field;
+            end   
+            ObjectData=get(AxeData.CurrentObject,'UserData');
+            ObjectData.IndexObj=IndexObj;
+            set(AxeData.CurrentObject,'UserData',ObjectData)
+        end
+        if testdeform==0
                 AxeData.Drawing='translate';
                 set(AxeData.CurrentObject,'Selected','on')
                 set(gcbo,'Pointer','fleur');
-            end
         end
     end