Changeset 929 for trunk/src

Timestamp:

Mar 5, 2016, 9:33:35 PM (9 years ago)

Author:

sommeria

Message:

 

File:

• trunk/src/series/extract_rdvision.m (modified) (3 diffs)

trunk/src/series/extract_rdvision.m

@@ -71 +71 @@
     ParamOut.Mask='off';...%can use mask option   (option 'off'/'on', 'off' by default)
      ParamOut.OutputDirExt='.extract';%set the output dir extension
-    ParamOut.OutputSubDirMode='one'; %output folder given by the program, not by the GUI series
+    ParamOut.OutputSubDirMode='one'; %output folder given by the folder name of the first input line
      % detect the set of image folder
     RootPath=Param.InputTable{1,1};
@@ -212 +212 @@
             filename_seq=fullfile(RootPath,Param.InputTable{iview,2},[Param.InputTable{iview,3} '.seq']);
             filename_sqb=fullfile(RootPath,Param.InputTable{iview,2},[Param.InputTable{iview,3} '.sqb']);
-            [success,errormsg] = copyfile(filename_seq,[fullfile(RootPath,Param.InputTable{iview,3}) '.seq']); %copy the seq file in the upper folder
-            [success,errormsg] = copyfile(filename_sqb,[fullfile(RootPath,Param.InputTable{iview,3}) '.sqb']); %copy the sqb file in the upper folder
+            logdir=[Param.InputTable{1,2} .extract];
+            [success,errormsg] = copyfile(filename_seq,[fullfile(RootPath,logdir,Param.InputTable{iview,3}) '.seq']); %copy the seq file in the upper folder
+            [success,errormsg] = copyfile(filename_sqb,[fullfile(RootPath,logdir,Param.InputTable{iview,3}) '.sqb']); %copy the sqb file in the upper folder
         otherwise
             errormsg='input file extension must be .seq or .sqb';
@@ -301 +302 @@
     end
     % check the existence of the expected output image files (from the xml)
+    FileDir=SeqData.sequencename;
+     FileDir=regexprep(FileDir,'_Master_Dalsa_4M180$','');%suppress '_Master_Dalsa_4M180'
     for i1=1:npi-1
         for j1=1:npj-1
-            OutputFile=fullfile_uvmat(RootPath,SeqData.sequencename,'img','.png',NomTypeNew,i1,[],j1);% TODO: set NomTypeNew from SeqData.mode
+            OutputFile=fullfile_uvmat(RootPath,FileDir,'img','.png',NomTypeNew,i1,[],j1);% TODO: set NomTypeNew from SeqData.mode
             A=imread(OutputFile);% check image reading (stop if error)
         end