Changeset 453 for trunk/src/series.m


Ignore:
Timestamp:
Jun 13, 2012, 5:03:06 PM (9 years ago)
Author:
sommeria
Message:

series adapted to BATCH mode. Tests still needed.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series.m

    r450 r453  
    12591259set(handles.RUN, 'Enable','Off')
    12601260set(handles.RUN,'BackgroundColor',[0.831 0.816 0.784])
    1261 [h_fun,Series,errormsg]=prepare_jobs(handles);
     1261[h_fun,Series,filexml,errormsg]=prepare_jobs(handles);
    12621262if ~isempty(errormsg)
    12631263    msgbox_uvmat('ERROR',errormsg)
    12641264else
     1265   Series.Specific=h_fun(Series,0);   
     1266   t=struct2xml(Series);
     1267    t=set(t,1,'name','Series');
     1268    save(t,filexml);
    12651269    h_fun(Series);
    12661270end
     
    12831287set(handles.BATCH, 'Enable','Off')
    12841288set(handles.BATCH,'BackgroundColor',[0.831 0.816 0.784])
    1285 [h_fun,Series,errormsg]=prepare_jobs(handles);
     1289[h_fun,Series,filexml,errormsg]=prepare_jobs(handles);
    12861290if ~isempty(errormsg)
    12871291    msgbox_uvmat('ERROR',errormsg)
    12881292    return
    12891293end
     1294% update the xml file after interactive input with the function
     1295Series.Specific=h_fun(Series,0);   
     1296t=struct2xml(Series);
     1297t=set(t,1,'name','Series');
     1298save(t,filexml);
    12901299path_series=fileparts(which('series'));
    12911300filename_xml=fullfile(Series.OutputDir,[Series.OutputRootFile '.xml']);
     
    12961305    return
    12971306end
     1307fctpath=get(handles.ActionPath,'String');
    12981308text_matlabscript=[...
    12991309    '#!/bin/bash \n'...
     
    13011311    'matlab -nodisplay -nosplash -nojvm <<END_MATLAB \n'...
    13021312    'cd(''' path_series '''); \n'...
     1313    'addpath(''' fctpath '''); \n'...
    13031314    '' Series.Action  '( ''' filename_xml '''); \n'...
    13041315    'exit \n'...
     
    13231334%------------------------------------------------------------------------
    13241335% --- Main lauch command, called by RUN and BATCH
    1325 function [h_fun,Series,errormsg]=prepare_jobs(handles)
     1336function [h_fun,Series,filexml,errormsg]=prepare_jobs(handles)
    13261337%------------------------------------------------------------------------
    13271338errormsg='';
     
    16881699         delete(hget_field)%delete opened versions of get_field
    16891700     end
    1690      [filecell,i1_series,i2_series,j1_series,j2_series]=get_file_series(read_GUI(handles.series));
     1701     filecell=get_file_series(read_GUI(handles.series));
    16911702     if exist(filecell{1,1},'file')
    16921703        get_field(filecell{1,1})
Note: See TracChangeset for help on using the changeset viewer.