Changeset 979

Timestamp:

Jan 12, 2017, 7:45:20 PM (8 years ago)

Author:

sommeria

Message:

phantom added, series corrected

Location:

trunk/src

Files:

• get_file_info.m (modified) (1 diff)
• readCineHeader.m (added)
• read_cine_phantom.m (added)
• read_image.m (modified) (1 diff)
• series.m (modified) (1 diff)
• series/civ_input.m (modified) (1 diff)
• series/extract_rdvision.m (modified) (1 diff)

trunk/src/get_file_info.m

@@ -59 +59 @@
             FileInfo.CivStage=6; % A MODIFIER
         end
+    case '.cine'
+        [FileInfo,BitmapInfoHeader, CameraSetup]=readCineHeader(fileinput);
+        FileInfo.FileType='cine_phantom';
+        FileInfo.NumberOfFrames=FileInfo.ImageCount;
+        FileInfo.FrameRate=CameraSetup.FrameRate;
+        FileInfo.Height=BitmapInfoHeader.biHeight;
+        FileInfo.Width=BitmapInfoHeader.biWidth;
     otherwise
         if ~isempty(FileExt)% exclude empty extension

trunk/src/read_image.m

@@ -46 +46 @@
 ObjectOut=VideoObject;%default
 switch FileType
-         case 'video'
-            if strcmp(class(VideoObject),'VideoReader')
-                A=read(VideoObject,num);
-            else
-                ObjectOut=VideoReader(FileName);
-                A=read(ObjectOut,num);
-            end
-        case 'mmreader'
-            if strcmp(class(VideoObject),'mmreader')
-                A=read(VideoObject,num);
-            else
-                ObjectOut=mmreader(FileName);
-                A=read(ObjectOut,num);
-            end
+    case 'video'
+        if strcmp(class(VideoObject),'VideoReader')
+            A=read(VideoObject,num);
+        else
+            ObjectOut=VideoReader(FileName);
+            A=read(ObjectOut,num);
+        end
+    case 'mmreader'
+        if strcmp(class(VideoObject),'mmreader')
+            A=read(VideoObject,num);
+        else
+            ObjectOut=mmreader(FileName);
+            A=read(ObjectOut,num);
+        end
+    case 'cine_phantom'
+        A = read_cine_phantom(FileName,num );
     case 'multimage'
         A=imread(FileName,num);
-    case 'image'    
+    case 'image'
         A=imread(FileName);
 end

trunk/src/series.m

@@ -1822 +1822 @@
                     case {'PCWIN','PCWIN64'} %Windows system
                         filexml=regexprep(filexml,'\\','\\\\');% add '\' so that '\' are left as characters
-                        system([ActionFullName ' ' RunTime ' ' filexml]);% TODO: adapt to DOS system
+                        system([ActionFullName ' ' RunTime ' ' filexml{iprocess}]);% TODO: adapt to DOS system
                     case {'GLNX86','GLNXA64','MACI64'}%Linux  system
-                        system([ActionFullName ' ' RunTime ' ' filexml]);
+                        system([ActionFullName ' ' RunTime ' ' filexml{iprocess}]);
                 end
         end

trunk/src/series/civ_input.m

@@ -111 +111 @@
 iview_image=1;%line # for the input images
 switch FileType
-    case {'image','multimage','video','mmreader','netcdf'}
+    case {'image','multimage','video','mmreader','cine_phantom','netcdf'}
 %         NomTypeImaA=NomTypeInput;
 %         iview_image=1;%line # for the input images

trunk/src/series/extract_rdvision.m

@@ -283 +283 @@
         return
     end
-    difftime=XmlData.Time(2:end,2:end)-(reshape(timestamp,nbfield2,[]))';
+    difftime=XmlData.Time(2:end,2:end)-(reshape(timestamp(1:end-1),nbfield2,[]))';
     disp(['time from xml and timestamp differ by ' num2str(max(max(abs(difftime))))])
     if max(abs(difftime))>0.01