Changeset 605 for trunk/src/series.m

Timestamp:

Apr 5, 2013, 1:17:53 PM (11 years ago)

Author:

sommeria

Message:

bugs corrected to get an advancement bar with status

File:

• trunk/src/series.m (modified) (9 diffs)

trunk/src/series.m

@@ -417 +417 @@
 %------------------------------------------------------------------------
 set(handles.REFRESH,'Visible','on')
+set(handles.REFRESH_title,'Visible','on')
 iview=eventdata.Indices(1);
 view_set=get(handles.REFRESH,'UserData');
@@ -432 +433 @@
 set(handles.RUN,'BackgroundColor',[1 0 0])% set RUN button to red 
 
-%update the output dir
-% SubDir=sort(InputTable(:,2)); %set of subdirectories sorted in alphabetical order
-% SubDirOut=SubDir{1};
-% if numel(SubDir)>1
-%     for ilist=2:numel(SubDir)
-%         SubDirOut=[SubDirOut '-' SubDir{ilist}];
-%     end
-% end
-% set(handles.OutputSubDir,'String',SubDirOut)
-
 %------------------------------------------------------------------------
 % --- Executes on button press in REFRESH.
@@ -448 +439 @@
 InputTable=get(handles.InputTable,'Data');
 view_set=get(handles.REFRESH,'UserData');
-set(handles.REFRESH,'BackgroundColor',[0.7 0.7 0.7])% set REFRESH  button to grey color
+set(handles.REFRESH,'BackgroundColor',[1 1 0])% set REFRESH  button to yellow color (indicate activation)
 drawnow
 for iview=view_set
@@ -460 +451 @@
     end
     if isempty(i1_series)
-        [FileName, PathName, filterindex] = uigetfile( ...
+        [FileName, PathName] = uigetfile( ...
             {'*.xml;*.xls;*.png;*.tif;*.avi;*.AVI;*.nc', ' (*.xml,*.xls, *.png,*.tif, *.avi,*.nc)';
             '*.xml',  '.xml files '; ...
@@ -469 +460 @@
             '*.nc','.netcdf files'; ...
             '*.*',  'All Files (*.*)'}, ...
-            ['unvalid entry at line ' num2str(iview) ', pick a file'],RootPath);
+            ['unvalid entry at line ' num2str(iview) ', pick a new input file'],RootPath);
         fileinput=[PathName FileName];%complete file name
-        if isempty(fileinput),return;end %abandon if the operation has been cancelled: no input from browser
+        if isempty(fileinput) %abandon if the operation has been cancelled: no input from browser
+            set(handles.REFRESH,'BackgroundColor',[1 0 0])% set REFRESH  back to red color
+            return;
+        end 
         [path,name,ext]=fileparts(fileinput);
         display_file_name(handles,fileinput,iview)
@@ -478 +472 @@
     end
 end
-set(handles.REFRESH,'BackgroundColor',[1 0 0])% set REFRESH  button to grey color
 set(handles.REFRESH,'Visible','off')
+set(handles.REFRESH_title,'Visible','off')
 set(handles.REFRESH,'UserData',[])
 
@@ -1462 +1456 @@
 %% record nbre of output files and starting time for computation for status
 StatusData=get(handles.status,'UserData');
+if isfield(StatusData,'OutputFileMode')
     switch StatusData.OutputFileMode
         case 'NbInput'
@@ -1470 +1465 @@
             StatusData.NbOutputFile=str2num(get(handles.num_NbSlice,'String'));
     end
+end
 StatusData.TimeStart=now;
 set(handles.status,'UserData',StatusData)
@@ -2742 +2738 @@
 NbSlice=str2num(get(handles.num_NbSlice,'String'));
 set(handles.num_NbProcess,'String',num2str(NbSlice))
-
-