Changeset 67 for trunk/src/geometry_calib.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/geometry_calib.m (modified) (5 diffs)

trunk/src/geometry_calib.m

@@ -78 +78 @@
 % Update handles structure
 guidata(hObject, handles);
-movegui(hObject,'east');% position the GUI ton the right of the screen
-if exist('handles_uvmat','var') %& isfield(data,'ParentButton')
-     set(hObject,'DeleteFcn',{@closefcn,handles_uvmat})%
-end
+%movegui(hObject,'east');% position the GUI ton the right of the screen
+% if exist('handles_uvmat','var') %& isfield(data,'ParentButton')
+      set(hObject,'DeleteFcn',{@closefcn})%
+% end
 %set the position of the interface
 if exist('pos','var')& length(pos)>2
@@ -100 +100 @@
     end   
 end
-set(handles.ListCoord,'String',{''})
+set(handles.ListCoord,'String',{'...'})
 if exist(inputxml,'file')
     loadfile(handles,inputxml)% load the point coordiantes existing in the xml file
@@ -213 +213 @@
         CoordCell{iline,j}=num2str(Coord(iline,j),4);
     end
-end        
+end
+CoordCell=[CoordCell;{' ',' ',' ',' ',' '}];
 Tabchar=cell2tab(CoordCell,'    |    ');%transform cells into table ready for display
 set(handles.ListCoord,'Value',1)
 set(handles.ListCoord,'String',Tabchar)
 
-
+% 
 %------------------------------------------------------------------------
 % executed when closing: set the parent interface button to value 0
-function closefcn(gcbo,eventdata,handles_uvmat)
+function closefcn(gcbo,eventdata)
 %------------------------------------------------------------------------
 huvmat=findobj(allchild(0),'Name','uvmat');
-if exist('handles_uvmat','var')
-    set(handles_uvmat.cal,'Value',0)
-    uvmat('cal_Callback',huvmat,[],handles_uvmat);
-%     set(parent_button,'Value',0)%put unactivated buttons to green
-%     set(parent_button,'BackgroundColor',[0 1 0]);
+if ~isempty(huvmat)
+    handles=guidata(huvmat);
+    set(handles.MenuTools,'enable','on')
+    set(handles.MenuObject,'enable','on')
+    set(handles.MenuEdit,'enable','on')
+    set(handles.edit,'enable','on')
+    hobject=findobj(handles.axes3,'tag','calib_points');
+    if ~isempty(hobject)
+        delete(hobject)
+    end
+    hobject=findobj(handles.axes3,'tag','calib_marker');
+    if ~isempty(hobject)
+        delete(hobject)
+    end    
 end
 
@@ -582 +592 @@
 %update the plot 
 ListCoord_Callback(hObject, eventdata, handles)
-
+MenuPlot_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
 % --- Executes on selection change in ListCoord.
@@ -1017 +1027 @@
 set(handles.ListCoord,'Value',1)
 set(handles.ListCoord,'String',Tabchar)
-
+MenuPlot_Callback(hObject, eventdata, handles)
 
 %%%%%%%%%%%%%%%%%%%%