Changeset 664 for trunk/src/uigetfile_uvmat.m

Timestamp:

Jul 11, 2013, 11:56:47 PM (11 years ago)

Author:

sommeria

Message:

a few bugs corrected: import and retrival of parameters in series. mask in civ_series

File:

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

trunk/src/uigetfile_uvmat.m

@@ -123 +123 @@
 function OK_Callback(option,filter_ext,hObject,event)
 hfig=get(hObject,'parent');%handle of the fig
-% if ~strcmp(get(hfig,'SelectionType'),'open')
-%     return %select double click
-% end
-%set(hObject,'BackgroundColor',[1 1 0])% paint list in yellow to indicate action
-%     drawnow
 htitlebox=findobj(hfig,'tag','titlebox');  % display the current dir name  
 DirName=get(htitlebox,'String');
@@ -135 +130 @@
     list=get(hlist,'String');
     index=get(hlist,'Value');
-    SelectName=regexprep(list{index},'^\+/','');% remove the +/ used to mark dir
+    if ~isempty(regexp(list{index},'^\+/'))
+        return % quit if a dir has been opened
+    end
+    %SelectName=regexprep(list{index},'^\+/','');% remove the +/ used to mark dir
+    SelectName=list{index};
     ind_dot=regexp(SelectName,'\s*\.\.\.');%remove what is beyond  '...'
     if ~isempty(ind_dot)
         SelectName=SelectName(1:ind_dot-1);
     end
-    % if strcmp(SelectName,'..')% the upward dir option has been selected
-    %     FullSelectName=fileparts(DirName);
-    % else
     FullSelectName=fullfile(DirName,SelectName);
-    % end
     if exist(FullSelectName,'file')
         switch option
@@ -164 +159 @@
     end
 end
-%set(hObject,'BackgroundColor',[0.7 0.7 0.7])% paint list in grey to indicate action end
 
 uiresume(get(hObject,'parent'))
@@ -253 +247 @@
 %------------------------------------------------------------------------
 hfig=get(hObject,'parent');%handle of the fig
-% if ~strcmp(get(hfig,'SelectionType'),'open')
-%     return %select double click
-% end
 set(hObject,'BackgroundColor',[1 1 0])% paint list in yellow to indicate action
     drawnow