Changeset 894

Timestamp:

May 4, 2015, 9:59:57 PM (9 years ago)

Author:

sommeria

Message:

extract rdvision new

Location:

trunk/src

Files:

• series/civ_series.m (modified) (2 diffs)
• series/extract_rdvision_new.m (modified) (1 diff)
• uvmat.m (modified) (1 diff)

trunk/src/series/civ_series.m

@@ -324 +324 @@
 %%%%% MAIN LOOP %%%%%%
 maskname='';% initiate the mask name
-tic;
+tstart=tic;
 for ifield=1:NbField
     if ~isempty(RUNHandle)% update the waitbar in interactive mode with GUI series  (checkrun=1)
@@ -851 +851 @@
             disp(errormsg)
         end
-    end
-end
-disp(['ellapsed time ' num2str(toc) ' s'])
+        disp(['ellapsed time ' num2str(toc) ' s'])
+    end
+end
+
 
 % 'civ': function piv.m adapted from PIVlab http://pivlab.blogspot.com/

trunk/src/series/extract_rdvision_new.m

@@ -185 +185 @@
 
 for iview=1:size(Param.InputTable,1)
-     filexml=[fullfile(RootPath,Param.InputTable{iview,3}) '.xml'];%new convention: xml at the level of the image folder
+     filexml=[fullfile(RootPath,Param.InputTable{iview,2},Param.InputTable{iview,3}) '.xml'];%new convention: xml at the level of the image folder
     if ~exist(filexml,'file')
         disp_uvmat('ERROR',[filexml ' missing'],checkrun)
         return
     end
-%     %[XmlData,error]=imadoc2struct_special(filexml);
      [XmlData,error]=imadoc2struct(filexml);
-%     if ~isempty(error)
-%         disp(error)
-%     end
-%     if isfield(XmlData,'Time')
-%         itime=itime+1;
-%         timecell{itime}=XmlData.Time;
-%     end
-%     if isfield(XmlData,'GeometryCalib') && isfield(XmlData.GeometryCalib,'SliceCoord')
-%         NbSlice_calib{1}=size(XmlData.GeometryCalib.SliceCoord,1);%nbre of slices for Zindex in phys transform
-%         if ~isequal(NbSlice_calib{1},NbSlice_calib{1})
-%             msgbox_uvmat('WARNING','inconsistent number of Z indices for the two field series');
-%         end
-%     end
+     
+     newxml=[fullfile(RootPath,Param.InputTable{iview,3}) '.xml']
+     
+    [SUCCESS] = copyfile(filexml,newxml); %copy the xml file in the upper folder
     
     

trunk/src/uvmat.m

@@ -3485 +3485 @@
 % time in the input file, not defined in a xml file or movie
 if isempty(abstime)
-    if strcmp(TimeName,'civdata')||strcmp(TimeName,'civx')||strcmp(TimeName,'timestamp')
+    if (strcmp(TimeName,'civdata')||strcmp(TimeName,'civx')||strcmp(TimeName,'timestamp'))&&isfield(Field{1},'Time')
         abstime=Field{1}.Time;
     elseif ~isempty(regexp(TimeName,'^att:', 'once'))