Changeset 71 for trunk/src/mouse_up.m

Timestamp:

Mar 29, 2010, 6:34:55 PM (14 years ago)

Author:

sommeria

Message:

civ3D updated: introduction of image size
imadoc2struct: reding of image size from the xml file
set_object, view_field and related functions: improvement of projection object editing
mouse: possibility of adjusting the calibrations points with the mouse

File:

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

trunk/src/mouse_up.m

@@ -1 +1 @@
 %'mouse_up': function  activated when the mouse button is released
 %----------------------------------------------------------------
-% function mouse_up(ggg,eventdata,handles)
+% function mouse_up(hObject,eventdata,handles)
 % activated by the command:
 % set(hObject,'WindowButtonUpFcn',{'mouse_up'}), 
@@ -22 +22 @@
 %AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 
-function mouse_up(ggg,eventdata,handles)
+function mouse_up(hObject,eventdata,handles)
 MouseAction='none'; %default
 zoomstate=0;%default
@@ -37 +37 @@
     zoomstate=get(hhuvmat.zoom,'Value');
 end
-% if isequal(MouseAction,'calib') && ~zoomstate
-%     return
-% end
-currentfig=gcbo;
-AxeData=get(gca,'UserData');
+currentfig=hObject;
 currentaxes=gca; %store the current axes handle
+AxeData=get(currentaxes,'UserData');
+
 test_drawing=0;%default
 
@@ -52 +50 @@
     IndexObj=PlotData.IndexObj;
     ObjectData=UvData.Object{IndexObj};    
+    ObjectData.enable_plot=1;
     if isequal(AxeData.Drawing,'translate')
         XYData=AxeData.CurrentOrigin;
@@ -264 +263 @@
 % editing calibration point
 if strcmp(MouseAction,'calib') 
-    xy=get(currentaxes,'CurrentPoint');%xy(1,1),xy(1,2): current x,y positions in axes coordinates
-    hh=findobj('Tag','calib_points')%look for handle of calibration points           
+    hh=findobj(currentaxes,'Tag','calib_points')%look for handle of calibration points           
     if ~isempty(hh)
         set(hh,'UserData',[])%remove edit mode
-    end   
-    strline=[ '    |    '  '    |    '  '    |    ' num2str(xy(1,1),4) '    |    ' num2str(xy(1,2),4)];
-    h_geometry_calib=findobj(allchild(0),'Name','geometry_calib'); %find the geomterty_calib GUI
-    hh_geometry_calib=guidata(h_geometry_calib);
-    h_ListCoord=hh_geometry_calib.ListCoord; %findobj(h_geometry_calib,'Tag','ListCoord');
-    Coord=get(h_ListCoord,'String');
-    val=get(h_ListCoord,'Value');
-%     if length(Coord)>=val
-%         Coord(val+1:length(Coord)+1)=Coord(val:length(Coord));% push the list forward beyond the current point
-%     end
-    Coord{val}=strline;
-    set(h_ListCoord,'String',Coord)
-    %set(h_ListCoord,'Value',val+1)
-    %geometry_calib('ListCoord_Callback',hObject,eventdata,hh_geometry_calib)
-    %data=read_geometry_calib(Coord);%transform char cell to numbers
-    %XCoord=data.Coord(:,4);
-    %YCoord=data.Coord(:,5)
+        h_geometry_calib=findobj(allchild(0),'Name','geometry_calib'); %find the geomterty_calib GUI
+        hh_geometry_calib=guidata(h_geometry_calib);
+        h_ListCoord=hh_geometry_calib.ListCoord; %handles of the coordinate list
+        Coord=get(h_ListCoord,'String');
+        val=get(h_ListCoord,'Value');
+        coord_str=Coord{val}; %current line (string)
+        k=findstr('|',coord_str);%find separator indices on the string
+        xy=get(currentaxes,'CurrentPoint');%xy(1,1),xy(1,2): current x,y positions in axes coordinates 
+        if numel(k)>=3
+            coord_str=[coord_str(1:k(3)-1) '|    ' num2str(xy(1,1),4) '    |    ' num2str(xy(1,2),4)]; %update the pixel information while preserving phys coord
+        else
+            coord_str=[ '    |    '  '    |    '  '    |    ' num2str(xy(1,1),4) '    |    ' num2str(xy(1,2),4)];
+        end
+        Coord{val}=coord_str;        
+        set(h_ListCoord,'String',Coord)
+    end
 end
 
@@ -301 +298 @@
     hruler=findobj(currentaxes,'Tag','ruler');
     delete(hruler)
+    AxeData.Drawing='off';%stop current drawing a
 end