Changeset 461 for trunk/src/series.m


Ignore:
Timestamp:
Jun 20, 2012, 2:13:34 PM (9 years ago)
Author:
sommeria
Message:

a few bug repairs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series.m

    r460 r461  
    485485MaxIndex_i=max(find(i_sum>0))-1;
    486486MinIndex_i=min(find(i_sum>0))-1;
    487 if isequal(MinIndex_i,1) && exist (fullfile_uvmat(RootPath,SubDir,RootFile,FileExt,NomType,0,i2_series(2,2),j1_series(2,2),j2_series(2,2)),'file')
     487i2_min=[];
     488if ~isempty(i2_series)
     489    i2_min=i2_series(1,2);
     490end
     491j1_min=[];
     492if ~isempty(j1_series)
     493    j1_min=j1_series(1,2);
     494end
     495j2_min=[];
     496if ~isempty(j2_series)
     497    j2_min=j2_series(1,2);
     498end
     499if isequal(MinIndex_i,1) && exist (fullfile_uvmat(RootPath,SubDir,RootFile,FileExt,NomType,0,i2_min, j1_min,j2_min),'file')
    488500    MinIndex_i=0;
    489501end
     
    13671379%------------------------------------------------------------------------
    13681380% --- Main launch command, called by RUN and BATCH
    1369 function [h_fun,Series,filexml,errormsg]=prepare_jobs(handles)
    1370 %------------------------------------------------------------------------
     1381function [h_fun,Series,filexml,errormsg]=prepare_jobs(handles,run)
     1382%------------------------------------------------------------------------
     1383h_fun=[];
    13711384filexml='';
    13721385errormsg='';
     1386if ~exist('run','var')
     1387    run=1;
     1388end
    13731389%% Read parameters from series
    13741390Series=read_GUI(handles.series);
     
    14251441end
    14261442
     1443if ~run
     1444    return
     1445end
     1446
    14271447%% defining the ActionName function handle
    14281448list_action=get(handles.ActionName,'String');% list menu action
    14291449index=get(handles.ActionName,'Value');
    14301450action= list_action{index}; % selected string
    1431 Series.Action=action;%name of the processing programme
     1451%Series.Action=action;%name of the processing programme
    14321452Series.hseries=handles.series; % handles to the series GUI
    14331453path_series=which('series');
     
    14371457    eval(['spath=which(''' action ''');']) %spath = current path of the selected function ACTION
    14381458    if ~exist(fct_path,'dir')
    1439         errormsg=['The prescibed function path ' fct_path ' does not exist'];
     1459        errormsg=['The prescribed function path ' fct_path ' does not exist'];
    14401460        return
    14411461    end
     
    22872307function MenuExportConfig_Callback(hObject, eventdata, handles)
    22882308global Series
    2289 [tild,Series,errormsg]=prepare_jobs(handles);
     2309[tild,Series,errormsg]=prepare_jobs(handles,0);
    22902310% Series=read_GUI(handles.series);
    22912311
Note: See TracChangeset for help on using the changeset viewer.