Changeset 922 for trunk/src/series


Ignore:
Timestamp:
Nov 24, 2015, 10:48:46 AM (8 years ago)
Author:
sommeria
Message:

corrections quentin

File:
1 edited

Legend:

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

    r909 r922  
    7070    ParamOut.ProjObject='off';...%can use projection object(option 'off'/'on',
    7171    ParamOut.Mask='off';...%can use mask option   (option 'off'/'on', 'off' by default)
    72     ParamOut.OutputSubDirMode='custom'; %output folder given by the program, not by the GUI series
     72     ParamOut.OutputDirExt='.extract';%set the output dir extension
     73    ParamOut.OutputSubDirMode='one'; %output folder given by the program, not by the GUI series
    7374     % detect the set of image folder
    7475    RootPath=Param.InputTable{1,1};
     
    143144        msgbox_uvmat('ERROR',['the whole series of ' num2str(FileInfo.NumberOfFrames) ' images must be extracted at once'])
    144145        %rmfield(OutputDir)
    145         return
     146%         return
    146147    end
    147148    %% interactive input of specific parameters (for RDvision system)
     
    183184checkpreserve=0;% if =1, will npreserve the original images, else it erases them at the end
    184185for iview=1:size(Param.InputTable,1)
    185     filexml=[fullfile(RootPath,Param.InputTable{iview,2},Param.InputTable{iview,3}) '.xml'];%new convention: xml at the level of the image folder
     186    for iview_xml=1:size(Param.InputTable,1)% loojk for the xml files in the different data directories
     187    filexml=[fullfile(RootPath,Param.InputTable{iview_xml,2},Param.InputTable{iview,3}) '.xml'];%new convention: xml at the level of the image folder
     188    if exist(filexml,'file')
     189        break
     190    end
     191    end
    186192    if ~exist(filexml,'file')
    187193        disp_uvmat('ERROR',[filexml ' missing'],checkrun)
     
    275281    time_diff_min=min(diff_time');
    276282    if max(time_diff_max)>0.005
    277         disp_uvmat('WARNING',['timestamps exceeds xml time by' num2str(max(time_diff_max))],checkrun)
     283        disp(['WARNING:timestamps exceeds xml time by' num2str(max(time_diff_max))])
    278284        checkpreserve=1;
    279285    elseif min(time_diff_min)<-0.005
    280         disp_uvmat('WARNING',['timestamps is lower than xml time by' num2str(min(time_diff_min))],checkrun)
     286        disp(['timestamps is lower than xml time by' num2str(min(time_diff_min))])
    281287        checkpreserve=1;
    282288    else
    283         disp_uvmat('CONFIRMATION','time from xml file correct within better than 5 ms',checkrun)
     289        disp('CONFIRMATION:time from xml file correct within better than 5 ms')
    284290    end
    285291    if checkpreserve
     
    303309    % check images
    304310   
    305     delete(fullfile(RootPath,'Running.xml'))%delete the  xml file to indicate that processing is finished
    306     if ~checkpreserve
    307         for ibin=1:numel(BinList)
    308             delete(BinList{ibin})
    309         end
    310         rmdir(fullfile(RootPath,Param.InputTable{iview,2}))
    311     end
    312 end
     311%     delete(fullfile(RootPath,'Running.xml'))%delete the  xml file to indicate that processing is finished
     312%     if ~checkpreserve
     313%         for ibin=1:numel(BinList)
     314%             delete(BinList{ibin})
     315%         end
     316%         rmdir(fullfile(RootPath,Param.InputTable{iview,2}))
     317%     end
     318end
     319delete(fullfile(RootPath,'Running.xml'))%delete the  xml file to indicate that processing is finished
    313320
    314321%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Note: See TracChangeset for help on using the changeset viewer.