Changeset 922 for trunk/src/series

Timestamp:

Nov 24, 2015, 10:48:46 AM (9 years ago)

Author:

sommeria

Message:

corrections quentin

File:

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

trunk/src/series/extract_rdvision.m

@@ -70 +70 @@
     ParamOut.ProjObject='off';...%can use projection object(option 'off'/'on',
     ParamOut.Mask='off';...%can use mask option   (option 'off'/'on', 'off' by default)
-    ParamOut.OutputSubDirMode='custom'; %output folder given by the program, not by the GUI series
+     ParamOut.OutputDirExt='.extract';%set the output dir extension
+    ParamOut.OutputSubDirMode='one'; %output folder given by the program, not by the GUI series
      % detect the set of image folder
     RootPath=Param.InputTable{1,1};
@@ -143 +144 @@
         msgbox_uvmat('ERROR',['the whole series of ' num2str(FileInfo.NumberOfFrames) ' images must be extracted at once'])
         %rmfield(OutputDir)
-        return
+%         return
     end
     %% interactive input of specific parameters (for RDvision system)
@@ -183 +184 @@
 checkpreserve=0;% if =1, will npreserve the original images, else it erases them at the end
 for iview=1:size(Param.InputTable,1)
-    filexml=[fullfile(RootPath,Param.InputTable{iview,2},Param.InputTable{iview,3}) '.xml'];%new convention: xml at the level of the image folder
+    for iview_xml=1:size(Param.InputTable,1)% loojk for the xml files in the different data directories
+    filexml=[fullfile(RootPath,Param.InputTable{iview_xml,2},Param.InputTable{iview,3}) '.xml'];%new convention: xml at the level of the image folder
+    if exist(filexml,'file')
+        break
+    end
+    end 
     if ~exist(filexml,'file')
         disp_uvmat('ERROR',[filexml ' missing'],checkrun)
@@ -275 +281 @@
     time_diff_min=min(diff_time');
     if max(time_diff_max)>0.005
-        disp_uvmat('WARNING',['timestamps exceeds xml time by' num2str(max(time_diff_max))],checkrun)
+        disp(['WARNING:timestamps exceeds xml time by' num2str(max(time_diff_max))])
         checkpreserve=1;
     elseif min(time_diff_min)<-0.005
-        disp_uvmat('WARNING',['timestamps is lower than xml time by' num2str(min(time_diff_min))],checkrun)
+        disp(['timestamps is lower than xml time by' num2str(min(time_diff_min))])
         checkpreserve=1;
     else
-        disp_uvmat('CONFIRMATION','time from xml file correct within better than 5 ms',checkrun)
+        disp('CONFIRMATION:time from xml file correct within better than 5 ms')
     end
     if checkpreserve
@@ -303 +309 @@
     % check images
     
-    delete(fullfile(RootPath,'Running.xml'))%delete the  xml file to indicate that processing is finished
-    if ~checkpreserve
-        for ibin=1:numel(BinList)
-            delete(BinList{ibin})
-        end
-        rmdir(fullfile(RootPath,Param.InputTable{iview,2}))
-    end
-end
+%     delete(fullfile(RootPath,'Running.xml'))%delete the  xml file to indicate that processing is finished
+%     if ~checkpreserve
+%         for ibin=1:numel(BinList)
+%             delete(BinList{ibin})
+%         end
+%         rmdir(fullfile(RootPath,Param.InputTable{iview,2}))
+%     end
+end
+delete(fullfile(RootPath,'Running.xml'))%delete the  xml file to indicate that processing is finished
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%