Changeset 177 for trunk/src/uvmat.m

Timestamp:

Jan 7, 2011, 1:53:05 AM (14 years ago)

Author:

sommeria

Message:

bug with mouse object editing resolved. Display feature 'satus' for PIV task advancement introduced. Various bug repair and cleaning

File:

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

trunk/src/uvmat.m

@@ -264 +264 @@
           set(handles.MenuFile_1_1,'Label',h.MenuFile_1);
       end
-      if isfield(h,'MenuFile_1')
+      if isfield(h,'MenuFile_2')
           set(handles.MenuFile_2,'Label',h.MenuFile_2);
           set(handles.MenuFile_2_1,'Label',h.MenuFile_2);
       end
-      if isfield(h,'MenuFile_1')
+      if isfield(h,'MenuFile_3')
           set(handles.MenuFile_3,'Label',h.MenuFile_3);
           set(handles.MenuFile_3_1,'Label',h.MenuFile_3);
       end
-      if isfield(h,'MenuFile_1')
+      if isfield(h,'MenuFile_4')
           set(handles.MenuFile_4,'Label',h.MenuFile_4);
           set(handles.MenuFile_4_1,'Label',h.MenuFile_4);
       end
-      if isfield(h,'MenuFile_1')
+      if isfield(h,'MenuFile_5')
           set(handles.MenuFile_5,'Label',h.MenuFile_5);
           set(handles.MenuFile_5_1,'Label',h.MenuFile_5);
@@ -282 +282 @@
       if isfield(h,'transform_fct') && iscell(h.transform_fct)
          for ilist=1:length(h.transform_fct);
-             [path,file]=fileparts(h.transform_fct{ilist});
-             addpath(path)
-             if exist(file,'file')
+             if exist(h.transform_fct{ilist},'file')
+                [path,file]=fileparts(h.transform_fct{ilist});
+                addpath(path)
+%              if exist(file,'file')
                 h_func=str2func(file);
+                rmpath(path)
                 testexist=[testexist 1]; 
              else
+                file='';
                 h_func=[];
                 testexist=[testexist 0]; 
              end
              fct_handle=[fct_handle; {h_func}]; %concatene the list of paths
-             rmpath(path)
              menu_str=[menu_str; {file}]; 
          end
@@ -4413 +4415 @@
     set(handles.zoom,'Value',0)
     zoom_Callback(hObject, eventdata, handles)
+    hgeometry_calib=findobj(allchild(0),'tag','geometry_calib');
+    if ishandle(hgeometry_calib)
+        hhgeometry_calib=guidata(hgeometry_calib);
+        set(hhgeometry_calib.edit_append,'Value',0)% desactivate mouse action in geometry_calib
+        set(hhgeometry_calib.edit_append,'BackgroundColor',[0.7 0.7 0.7])
+    end
 else 
     UvData.MouseAction='none';
@@ -5075 +5083 @@
     delete(hset_object)% delete existing version of set_object
 end
+hgeometry_calib=findobj(allchild(0),'tag','geometry_calib');
+if ishandle(hgeometry_calib)
+    hhgeometry_calib=guidata(hgeometry_calib);
+    set(hhgeometry_calib.edit_append,'Value',0)% desactivate mouse action in geometry_calib
+    set(hhgeometry_calib.edit_append,'BackgroundColor',[0.7 0.7 0.7])
+end
 UvData=get(handles.uvmat,'UserData');
 set(handles.edit_object,'Value',0); %suppress the object edit mode