Changeset 453 for trunk/src/series.m

Timestamp:

Jun 13, 2012, 5:03:06 PM (13 years ago)

Author:

sommeria

Message:

series adapted to BATCH mode. Tests still needed.

File:

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

trunk/src/series.m

@@ -1259 +1259 @@
 set(handles.RUN, 'Enable','Off')
 set(handles.RUN,'BackgroundColor',[0.831 0.816 0.784])
-[h_fun,Series,errormsg]=prepare_jobs(handles);
+[h_fun,Series,filexml,errormsg]=prepare_jobs(handles);
 if ~isempty(errormsg)
     msgbox_uvmat('ERROR',errormsg)
 else
+   Series.Specific=h_fun(Series,0);   
+   t=struct2xml(Series);
+    t=set(t,1,'name','Series');
+    save(t,filexml);
     h_fun(Series);
 end
@@ -1283 +1287 @@
 set(handles.BATCH, 'Enable','Off')
 set(handles.BATCH,'BackgroundColor',[0.831 0.816 0.784])
-[h_fun,Series,errormsg]=prepare_jobs(handles);
+[h_fun,Series,filexml,errormsg]=prepare_jobs(handles);
 if ~isempty(errormsg)
     msgbox_uvmat('ERROR',errormsg)
     return
 end
+% update the xml file after interactive input with the function
+Series.Specific=h_fun(Series,0);   
+t=struct2xml(Series);
+t=set(t,1,'name','Series');
+save(t,filexml);
 path_series=fileparts(which('series'));
 filename_xml=fullfile(Series.OutputDir,[Series.OutputRootFile '.xml']);
@@ -1296 +1305 @@
     return
 end
+fctpath=get(handles.ActionPath,'String');
 text_matlabscript=[...
     '#!/bin/bash \n'...
@@ -1301 +1311 @@
     'matlab -nodisplay -nosplash -nojvm <<END_MATLAB \n'...
     'cd(''' path_series '''); \n'...
+    'addpath(''' fctpath '''); \n'...
     '' Series.Action  '( ''' filename_xml '''); \n'...
     'exit \n'...
@@ -1323 +1334 @@
 %------------------------------------------------------------------------
 % --- Main lauch command, called by RUN and BATCH
-function [h_fun,Series,errormsg]=prepare_jobs(handles)
+function [h_fun,Series,filexml,errormsg]=prepare_jobs(handles)
 %------------------------------------------------------------------------
 errormsg='';
@@ -1688 +1699 @@
          delete(hget_field)%delete opened versions of get_field
      end
-     [filecell,i1_series,i2_series,j1_series,j2_series]=get_file_series(read_GUI(handles.series));
+     filecell=get_file_series(read_GUI(handles.series));
      if exist(filecell{1,1},'file')
         get_field(filecell{1,1})