Changeset 455


Ignore:
Timestamp:
Jun 13, 2012, 6:26:26 PM (9 years ago)
Author:
sommeria
Message:

a few bug corrected

Location:
trunk/src/series
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series/check_data_files.m

    r451 r455  
    8787    NbSlice=Param.IndexRange.NbSlice;
    8888end
    89 nbview=size(i1_series,1);%number of input file series (lines in InputTable)
    90 nbfield_j=size(i1_series,2); %nb of consecutive fields at each level(burst
    91 nbfield=nbfield_j*size(i1_series,3); %total number of files or frames
     89nbview=numel(i1_series);%number of input file series (lines in InputTable)
     90nbfield_j=size(i1_series{1},1); %nb of consecutive fields at each level(burst
     91nbfield=nbfield_j*size(i1_series{1},2); %total number of files or frames
    9292nbfield_i=floor(nbfield/NbSlice);%total number of i indexes (adjusted to an integer number of slices)
    9393nbfield=nbfield_i*nbfield_j; %total number of fields after adjustement
     
    104104%% MAIN LOOP ON VIEWS (INPUT LINES)
    105105for iview=1:nbview
    106     if isequal(FileType{iview},'mmreader')||isequal(FileType{iview},'video')
    107         info=aviinfo(filecell{iview,1});
    108         message{1}=info.Filename;
    109         message{2}=info.FileModDate;
    110         message{3}=[num2str(info.FramesPerSecond) ' frames/s '];
    111         message{4}=info.ImageType;
    112         message{5}=['  compression' info.VideoCompression];
    113         message{6}=[ 'quality ' num2str(info.Quality)];   
     106    if isequal(FileType{iview},'mmreader')||isequal(FileType{iview},'video')||isequal(FileType{iview},'multimage')
     107        [tild,FileInfo]=get_file_type(filecell{iview,1})
     108      %  info=aviinfo(filecell{iview,1});
     109        message{1}=filecell{iview,1};%info.Filename;
     110        message{2}=FileInfo.FileModDate;
     111        message{3}=[num2str(FileInfo.FramesPerSecond) ' frames/s '];
     112        message{4}=FileInfo.ImageType;
     113        message{5}=['  compression' FileInfo.VideoCompression];
     114        message{6}=[ 'quality ' num2str(FileInfo.Quality)];   
    114115        Tabchar=message;
    115116    else
  • trunk/src/series/sub_background.m

    r454 r455  
    4646
    4747   
    48 function GUI_config=sub_background (Param,get_param)
     48function GUI_config=sub_background (Param)
    4949
    5050%% set the input elements needed on the GUI series when the action is selected in the menu ActionName
     
    6666%% get input parameters, file names and indices
    6767% BATCH  case: read the xml file for batch case
    68 if exist('get_param','var') && isequal(get_param,0)
    69     checkrun=-1; %the function is just used to define to complement the input parameters
    70 elseif ischar(Param) && ~isempty(find(regexp(Param,'.xml$'))) %batch mode
     68if ischar(Param) && ~isempty(find(regexp(Param,'.xml$'))) %batch mode
    7169        Param=xml2struct(Param);
    7270        checkrun=0;
     
    165163
    166164%% set processing parameters
    167 if checkrun ==-1
     165if ~isfield(Param,'Specific')
    168166    prompt = {'volume scan mode (Yes/No)';'Number of images for the sliding background (MUST FIT IN COMPUTER MEMORY)';...
    169167        'the luminosity rank chosen to define the background (0.1=for dense particle seeding, 0.5 (median) for sparse particles'};
     
    203201    GUI_config.CheckLevelTransform=strcmp(answer,'Yes');
    204202   
    205     % return to BATCH mode
    206     if checkrun==-1
     203%     % return to BATCH mode
     204%     if checkrun==-1
    207205        return %transfer to BATCH mode
    208     end
     206%     end
    209207else
    210208    GUI_config=Param.Specific;
Note: See TracChangeset for help on using the changeset viewer.