Changeset 979 for trunk/src


Ignore:
Timestamp:
Jan 12, 2017, 7:45:20 PM (4 years ago)
Author:
sommeria
Message:

phantom added, series corrected

Location:
trunk/src
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/get_file_info.m

    r977 r979  
    5959            FileInfo.CivStage=6; % A MODIFIER
    6060        end
     61    case '.cine'
     62        [FileInfo,BitmapInfoHeader, CameraSetup]=readCineHeader(fileinput);
     63        FileInfo.FileType='cine_phantom';
     64        FileInfo.NumberOfFrames=FileInfo.ImageCount;
     65        FileInfo.FrameRate=CameraSetup.FrameRate;
     66        FileInfo.Height=BitmapInfoHeader.biHeight;
     67        FileInfo.Width=BitmapInfoHeader.biWidth;
    6168    otherwise
    6269        if ~isempty(FileExt)% exclude empty extension
  • trunk/src/read_image.m

    r977 r979  
    4646ObjectOut=VideoObject;%default
    4747switch FileType
    48          case 'video'
    49             if strcmp(class(VideoObject),'VideoReader')
    50                 A=read(VideoObject,num);
    51             else
    52                 ObjectOut=VideoReader(FileName);
    53                 A=read(ObjectOut,num);
    54             end
    55         case 'mmreader'
    56             if strcmp(class(VideoObject),'mmreader')
    57                 A=read(VideoObject,num);
    58             else
    59                 ObjectOut=mmreader(FileName);
    60                 A=read(ObjectOut,num);
    61             end
     48    case 'video'
     49        if strcmp(class(VideoObject),'VideoReader')
     50            A=read(VideoObject,num);
     51        else
     52            ObjectOut=VideoReader(FileName);
     53            A=read(ObjectOut,num);
     54        end
     55    case 'mmreader'
     56        if strcmp(class(VideoObject),'mmreader')
     57            A=read(VideoObject,num);
     58        else
     59            ObjectOut=mmreader(FileName);
     60            A=read(ObjectOut,num);
     61        end
     62    case 'cine_phantom'
     63        A = read_cine_phantom(FileName,num );
    6264    case 'multimage'
    6365        A=imread(FileName,num);
    64     case 'image'   
     66    case 'image'
    6567        A=imread(FileName);
    6668end
  • trunk/src/series.m

    r977 r979  
    18221822                    case {'PCWIN','PCWIN64'} %Windows system
    18231823                        filexml=regexprep(filexml,'\\','\\\\');% add '\' so that '\' are left as characters
    1824                         system([ActionFullName ' ' RunTime ' ' filexml]);% TODO: adapt to DOS system
     1824                        system([ActionFullName ' ' RunTime ' ' filexml{iprocess}]);% TODO: adapt to DOS system
    18251825                    case {'GLNX86','GLNXA64','MACI64'}%Linux  system
    1826                         system([ActionFullName ' ' RunTime ' ' filexml]);
     1826                        system([ActionFullName ' ' RunTime ' ' filexml{iprocess}]);
    18271827                end
    18281828        end
  • trunk/src/series/civ_input.m

    r977 r979  
    111111iview_image=1;%line # for the input images
    112112switch FileType
    113     case {'image','multimage','video','mmreader','netcdf'}
     113    case {'image','multimage','video','mmreader','cine_phantom','netcdf'}
    114114%         NomTypeImaA=NomTypeInput;
    115115%         iview_image=1;%line # for the input images
  • trunk/src/series/extract_rdvision.m

    r977 r979  
    283283        return
    284284    end
    285     difftime=XmlData.Time(2:end,2:end)-(reshape(timestamp,nbfield2,[]))';
     285    difftime=XmlData.Time(2:end,2:end)-(reshape(timestamp(1:end-1),nbfield2,[]))';
    286286    disp(['time from xml and timestamp differ by ' num2str(max(max(abs(difftime))))])
    287287    if max(abs(difftime))>0.01
Note: See TracChangeset for help on using the changeset viewer.