Changeset 663 for trunk/src/mouse_motion.m

Timestamp:

Jul 11, 2013, 6:45:32 PM (12 years ago)

Author:

sommeria

Message:

bug corrected again in xml2struct, PLOT and copy of points improved in geometry_calib

File:

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

trunk/src/mouse_motion.m

@@ -51 +51 @@
 test_edit_object=0;% edit test for mouse shap: an arrow
 test_ruler=0;%test for active ruler 
+test_transform=0;
 huvmat=findobj(allchild(0),'tag','uvmat');%find the uvmat interface handle
 if ~isempty(huvmat)
@@ -56 +57 @@
     test_edit_object=get(hhuvmat.CheckEditObject,'Value');
     test_ruler=isequal(get(hhuvmat.MenuRuler,'checked'),'on');
+    test_transform=~isequal(get(hhuvmat.TransformName,'Value'),1)
 end
 test_piv=0;
@@ -379 +381 @@
         h_ListCoord=hh_geometry_calib.ListCoord; %findobj(h_geometry_calib,'Tag','ListCoord');
         data.Coord=get(h_ListCoord,'Data');
-%         data.Coord(:,6)=[];
-       % data=read_geometry_calib(Coord);%transform char cell to numbers
         if isnumeric(data.Coord)&&~isempty(data.Coord)
+            if test_transform
+                            XCoord=(data.Coord(:,1));
+            YCoord=(data.Coord(:,2));
+            else
             XCoord=(data.Coord(:,4));
             YCoord=(data.Coord(:,5));
+            end
             xy=get(CurrentAxes,'CurrentPoint');%xy(1,1),xy(1,2): current x,y positions in axes coordinates
             if ~isempty(xy)
@@ -397 +402 @@
                 end
                 hh=findobj('Tag','calib_points');%look for handle of calibration points
-               if ~isempty(hh) && ~isempty(get(hh,'UserData')) && get(hh_geometry_calib.CheckEnableMouse,'Value') 
+               if ~isempty(hh) && ~isempty(get(hh,'UserData')) %&& get(hh_geometry_calib.CheckEnableMouse,'Value') 
                    %set(hh,'UserData',index_point)
                     index_point=get(hh,'UserData');