Changeset 709 for trunk


Ignore:
Timestamp:
Feb 16, 2014, 9:09:13 AM (11 years ago)
Author:
sommeria
Message:

improve check svn with command "&"
improve import config in series

Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/check_files.m

    r705 r709  
    167167        svn_info.cur_rev=str2double(t.rev); %version nbre of the current package
    168168    end
    169     [tild,result]=system(['svn info -r ''HEAD'' '  pathuvmat]);
     169    [tild,result]=system(['svn info -r ''HEAD'' '  pathuvmat ' &']);
    170170    t=regexp(result,'R.vision\s*:\s*(?<rev>\d+)','names');
    171171    if ~isempty(t)
    172172        svn_info.rep_rev=str2double(t.rev); % version nbre available on the svn repository
    173173    end
    174     [tild,result]=system(['svn status '  pathuvmat]);
     174    [tild,result]=system(['svn status '  pathuvmat ' &']);% '&' prevents the program to stop when the system asks password
    175175    svn_info.status=result;
    176176    checkmsg =[checkmsg {['SVN revision : ' num2str(svn_info.cur_rev)]}];%display version nbre of the current uvmat package
  • trunk/src/series.m

    r708 r709  
    243243
    244244%% introduce the input file name(s) if defined from input Param
    245 if isfield(Param,'FileName')
     245if isfield(Param,'FileName')&&~isempty(Param.FileName)
    246246    %InputTable={'','','','',''}; % refresh the file input table
    247247    InputTable={}
  • trunk/src/uvmat.m

    r706 r709  
    18701870    if isequal(FieldName,'image')
    18711871        index=2;
    1872         [RootPath,tild,RootFile,FileIndex_1,Ext,NomType]=read_file_boxes_1(handles);
     1872        [RootPath,SubDir,RootFile,FileIndex_1,Ext,NomType]=read_file_boxes_1(handles);% get info from the second input line
    18731873    else
    18741874        msgbox_uvmat('ERROR','an image or movie must be first introduced as input')
     
    19091909if isempty(num_i2)
    19101910    num_i2=num_i1;%repeat the index i1 by default
     1911end
     1912if isempty(num_j1)
     1913    num_j1=1;
     1914end
     1915if isempty(num_j2)
     1916    num_j2=num_j1;%repeat the index i1 by default
    19111917end
    19121918imaname_1=fullfile_uvmat(RootPath,SubDir,RootFile,Ext,NomType,num_i2,[],num_j2);
Note: See TracChangeset for help on using the changeset viewer.