Changeset 705 for trunk/src/series.m

Timestamp:

Feb 12, 2014, 12:02:04 AM (10 years ago)

Author:

sommeria

Message:

several bugs repaired

File:

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

trunk/src/series.m

@@ -1424 +1424 @@
 %% settings of the button RUN
 set(handles.RUN,'BusyAction','queue');% activation of STOP button will set BusyAction to 'cancel'
-%set(0,'CurrentFigure',handles.series); % display the GUI series
 set(handles.RUN, 'Enable','Off')% avoid further RUN action until the current one is finished
 set(handles.RUN,'BackgroundColor',[1 1 0])%show activation of RUN by yellow color
@@ -1875 +1874 @@
 function ActionName_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
+
 %% stop any ongoing series processing
 if isequal(get(handles.RUN,'Value'),1)
@@ -2187 +2187 @@
 %% Expected nbre of output files
 if isfield(ParamOut,'OutputFileMode')
-StatusData.OutputFileMode=ParamOut.OutputFileMode;
-set(handles.status,'UserData',StatusData)
+    StatusData.OutputFileMode=ParamOut.OutputFileMode;
+    set(handles.status,'UserData',StatusData)
 end
 
@@ -2216 +2216 @@
 %------------------------------------------------------------------------
 if get(handles.ActionInputView,'Value')
-ActionName_Callback(hObject, eventdata, handles)
+    ActionName_Callback(hObject, eventdata, handles)
 end
 
@@ -2652 +2652 @@
 
 InputTable=get(handles.InputTable,'Data');
-filexml=uigetfile_uvmat('pick a xml parameter file',InputTable{1,1},'.xml');
+filexml=uigetfile_uvmat('pick a xml parameter file',InputTable{1,1},'.xml');% get the xml file containing processing parameters
 if ~isempty(filexml)%abandon if no file is introduced by the browser
     Param=xml2struct(filexml);
-    fill_GUI(Param,handles.series)
+    % stop current Action if button RUN has been activated
+    if isequal(get(handles.RUN,'Value'),1)
+        answer= msgbox_uvmat('INPUT_Y-N','stop current Action process?');
+        if strcmp(answer,'Yes')
+            STOP_Callback(hObject, eventdata, handles)
+        else
+            return
+        end
+    end
+    Param.Action.RUN=0; %deactivate the RUN button
+    fill_GUI(Param,handles.series)% fill the elements of the GUI series with the input parameters
     REFRESH_Callback([],[],handles)% refresh data relative to the input files
     SeriesData=get(handles.series,'UserData');
-    if isfield(Param,'ActionInput')
+    if isfield(Param,'ActionInput')%  introduce  parameters specific to an Action fct, for instance PIV parameters
         set(handles.ActionInput,'Visible','on')
         set(handles.ActionInput_title,'Visible','on')
@@ -2665 +2675 @@
         SeriesData.ActionInput=Param.ActionInput;
     end
-    if isfield(Param,'ProjObject')
+    if isfield(Param,'ProjObject') %introduce projection object if relevant
         SeriesData.ProjObject=Param.ProjObject;
     end
     set(handles.series,'UserData',SeriesData)
-    ActionName_Callback([],[],handles)
+    %ActionName_Callback([],[],handles)
 end
 
@@ -2724 +2734 @@
     set(handles.status,'BackgroundColor',[1 1 0])
     drawnow
-    %StatusData.time_ref=get(handles.RUN,'UserData');% get the time of launch
     Param=read_GUI(handles.series);
     RootPath=Param.InputTable{1,1};