Changeset 741 for trunk/src/mouse_motion.m

Timestamp:

Apr 15, 2014, 9:06:46 AM (10 years ago)

Author:

sommeria

Message:

bugs corrected in browse_data and mouse_motion (z display)

File:

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

trunk/src/mouse_motion.m

@@ -25 +25 @@
 function mouse_motion(hObject,eventdata,handles)
 
-% if ~exist('handles','var')
-%     set(hCurrentFig,'Pointer','arrow');
-%     return
-% end
 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
@@ -84 +80 @@
 % AxeData=[];%default
 xy=[];%default
+set(hCurrentFig,'Units','normalized')
 xy_fig=get(hObject,'CurrentPoint');% current point of the current figure (gcbo)
 pointershape='arrow';% default pointer is an arrow 
@@ -218 +215 @@
             end
             %display the z coordinate if defined by the projection plane
-            if isfield(Field,'ObjectType') && strcmp(Field.ObjectType,'plane') && isfield(Field,'ObjectCoord') && length(Field.ObjectCoord)>=3
+            if isfield(Field,'ProjObjectType') && strcmp(Field.ProjObjectType,'plane') && isfield(Field,'ProjObjectCoord') && length(Field.ProjObjectCoord)>=3
                 pos=[xy(1,1) xy(1,2) 0];
-                if isfield(Field,'ObjectAngle')&&~isequal(Field.ObjectAngle,[0 0 0])
-                    om=norm(Field.ObjectAngle);%norm of rotation angle in radians
-                    OmAxis=Field.ObjectAngle/om; %unit vector marking the rotation axis
+                if isfield(Field,'ProjObjectAngle')&&~isequal(Field.ProjObjectAngle,[0 0 0])
+                    om=norm(Field.ProjObjectAngle);%norm of rotation angle in radians
+                    OmAxis=Field.ProjObjectAngle/om; %unit vector marking the rotation axis
                     cos_om=cos(pi*om/180);
                     sin_om=sin(pi*om/180);
@@ -228 +225 @@
                     pos=cos_om*pos+sin_om*cross(OmAxis,pos)+(1-cos_om)*(OmAxis*pos')*OmAxis;
                 end
-                pos=pos+[Field.ObjectCoord 0];
+               % pos=pos+[Field.ProjObjectCoord 0];
+               pos=pos+Field.ProjObjectCoord;
                 text_displ_3=[text_displ_3 'x,y,z=' num2str(pos,4)];
             end