Changeset 894 for trunk


Ignore:
Timestamp:
May 4, 2015, 9:59:57 PM (6 years ago)
Author:
sommeria
Message:

extract rdvision new

Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series/civ_series.m

    r886 r894  
    324324%%%%% MAIN LOOP %%%%%%
    325325maskname='';% initiate the mask name
    326 tic;
     326tstart=tic;
    327327for ifield=1:NbField
    328328    if ~isempty(RUNHandle)% update the waitbar in interactive mode with GUI series  (checkrun=1)
     
    851851            disp(errormsg)
    852852        end
    853     end
    854 end
    855 disp(['ellapsed time ' num2str(toc) ' s'])
     853        disp(['ellapsed time ' num2str(toc) ' s'])
     854    end
     855end
     856
    856857
    857858% 'civ': function piv.m adapted from PIVlab http://pivlab.blogspot.com/
  • trunk/src/series/extract_rdvision_new.m

    r889 r894  
    185185
    186186for iview=1:size(Param.InputTable,1)
    187      filexml=[fullfile(RootPath,Param.InputTable{iview,3}) '.xml'];%new convention: xml at the level of the image folder
     187     filexml=[fullfile(RootPath,Param.InputTable{iview,2},Param.InputTable{iview,3}) '.xml'];%new convention: xml at the level of the image folder
    188188    if ~exist(filexml,'file')
    189189        disp_uvmat('ERROR',[filexml ' missing'],checkrun)
    190190        return
    191191    end
    192 %     %[XmlData,error]=imadoc2struct_special(filexml);
    193192     [XmlData,error]=imadoc2struct(filexml);
    194 %     if ~isempty(error)
    195 %         disp(error)
    196 %     end
    197 %     if isfield(XmlData,'Time')
    198 %         itime=itime+1;
    199 %         timecell{itime}=XmlData.Time;
    200 %     end
    201 %     if isfield(XmlData,'GeometryCalib') && isfield(XmlData.GeometryCalib,'SliceCoord')
    202 %         NbSlice_calib{1}=size(XmlData.GeometryCalib.SliceCoord,1);%nbre of slices for Zindex in phys transform
    203 %         if ~isequal(NbSlice_calib{1},NbSlice_calib{1})
    204 %             msgbox_uvmat('WARNING','inconsistent number of Z indices for the two field series');
    205 %         end
    206 %     end
     193     
     194     newxml=[fullfile(RootPath,Param.InputTable{iview,3}) '.xml']
     195     
     196    [SUCCESS] = copyfile(filexml,newxml); %copy the xml file in the upper folder
    207197   
    208198   
  • trunk/src/uvmat.m

    r892 r894  
    34853485% time in the input file, not defined in a xml file or movie
    34863486if isempty(abstime)
    3487     if strcmp(TimeName,'civdata')||strcmp(TimeName,'civx')||strcmp(TimeName,'timestamp')
     3487    if (strcmp(TimeName,'civdata')||strcmp(TimeName,'civx')||strcmp(TimeName,'timestamp'))&&isfield(Field{1},'Time')
    34883488        abstime=Field{1}.Time;
    34893489    elseif ~isempty(regexp(TimeName,'^att:', 'once'))
Note: See TracChangeset for help on using the changeset viewer.