Changeset 67 for trunk/src/mouse_up.m

Timestamp:

Mar 25, 2010, 6:48:48 PM (14 years ago)

Author:

sommeria

Message:

civ: RUN civ lounched out of the Matlab work space. RUN and BATCH now runned by a unique sub-function lounch.m.
FiLE PARAM.xml modified to provide different paths for Batch and Run !!!!!
RUN_FIX: minor error message modif
geometry_calib: calib point editing by the mouse
improvement of the interactions between the different GUIs. Close function...

File:

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

trunk/src/mouse_up.m

@@ -37 +37 @@
     zoomstate=get(hhuvmat.zoom,'Value');
 end
-if isequal(MouseAction,'calib') && ~zoomstate
-    return
-end
+% if isequal(MouseAction,'calib') && ~zoomstate
+%     return
+% end
 currentfig=gcbo;
 AxeData=get(gca,'UserData');
@@ -138 +138 @@
             set(hhuvmat.edit,'Value',1);%
             set(hhuvmat.edit,'Enable','on');%
+            set(hhuvmat.MenuEditObject,'Enable','on');%
             set(hhuvmat.MenuEdit,'Enable','on');%
-            set(hhuvmat.MenuEdit,'Enable','on');%
-            set(hhuvmat.MenuObject,'Enable','on');%
+%             set(hhuvmat.MenuObject,'Enable','on');%
             UvData.MouseAction='edit_object'; % set the edit button to 'on'
         end
@@ -261 +261 @@
       end
 end
-if isequal(MouseAction,'ruler')
+
+% 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           
+    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)
+end
+
+% finalising ruler
+if strcmp(MouseAction,'ruler')
     UvData.MouseAction='none';
     UvData=rmfield(UvData,'RulerHandle');