Changeset 638 for trunk/src/uvmat.m

Timestamp:

May 20, 2013, 10:14:24 AM (11 years ago)

Author:

sommeria

Message:

bug with mask corrected in uvmat. Update of browser in series

File:

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

trunk/src/uvmat.m

@@ -1284 +1284 @@
 if isequal(get(handles.CheckMask,'Value'),1)
      [RootPath,SubDir,RootFile,FileIndices,FileExt]=read_file_boxes(handles);
-     FileBase=fullfile(RootPath,RootFile);
+     FileBase=fullfile(RootPath,SubDir,RootFile);
     num_i1=stra2num(get(handles.i1,'String'));
     num_j1=stra2num(get(handles.j1,'String'));
@@ -1338 +1338 @@
     errormsg=[];%default
     if mdetect==0
-        [FileName, PathName, filterindex] = uigetfile( ...
-            {'*.png', ' (*.png)';
-            '*.png',  '.png files '; ...
-            '*.*', 'All Files (*.*)'}, ...
-            'Pick a mask file *.png',FileBase);
-        if ~ischar(FileName),return,end %abandon if the browser is cancelled
-        maskname=fullfile(PathName,FileName);
+        maskname=uigetfile_uvmat('pick a mask image file:',fullfile(RootPath,SubDir));
+
+%% display the selected field and related information
+if isempty(maskname)
+    set(handles.CheckMask,'Value',0)
+    return
+end
+%         [FileName, PathName, filterindex] = uigetfile( ...
+%             {'*.png', ' (*.png)';
+%             '*.png',  '.png files '; ...
+%             '*.*', 'All Files (*.*)'}, ...
+%             'Pick a mask file *.png',FileBase);
+%         if ~ischar(FileName),return,end %abandon if the browser is cancelled
+%         maskname=fullfile(PathName,FileName);
         [RootDir,SubDir,RootFile,tild,tild,tild,tild,tild,Mask.NomType]=fileparts_uvmat(maskname);
         Mask.Base=fullfile(RootDir,SubDir,RootFile);
-        Mask.NbSlice=1;
+ %       Mask.NbSlice=1;
         set(handles.CheckMask,'UserData',Mask);
-        set(handles.CheckMask,'BackgroundColor',[1 1 0])
+%         set(handles.CheckMask,'BackgroundColor',[1 1 0])
     end
     if isempty(errormsg)