Changeset 116 for trunk/src/series


Ignore:
Timestamp:
Oct 16, 2010, 5:56:00 PM (13 years ago)
Author:
sommeria
Message:

geometry_calib is now updated when a new image is viewed by uvmat
imadoc2struct corrected for time reading

File:
1 edited

Legend:

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

    r109 r116  
    2323WaitbarPos=get(hseries.waitbar_frame,'Position'); %positiopn of waitbar frame
    2424%-------------------------------------------------
     25
     26
    2527
    2628%projection object
     
    229231if ~exist(res_subdir,'dir')
    230232    dircur=pwd;
    231     cd(fulldir)
    232     error=mkdir(subdir);
    233     cd(dircur)
     233    cd(fulldir);
     234    succeed=mkdir(subdir);
     235    if succeed
     236    cd(dircur);
     237    else
     238    msgbox_uvmat('ERROR',['Cannot create directory ' fulldir])
     239    return
     240    end       
    234241end
    235242filebasesub=fullfile(res_subdir,Series.RootFile{1});
     
    286293            % coord transform
    287294            % z index
     295     
    288296            if ~isempty(NbSlice_calib)
    289                 Field{iview}.ZIndex=mod(num_i1{iview}(ifile)-1,NbSlice_calib{1})+1;
    290             end
     297                Field{iview}.ZIndex=mod(num_i1{iview}(ifile)-1,NbSlice_calib{1})+1
     298            end
     299%              Field{iview}.ZIndex=1;
    291300            if ~isempty(transform_fct)
    292                 Field{iview}=transform_fct(Field{iview},XmlData{iview});%transform to phys if requested
     301                XmlData{iview}.GeometryCalib
     302                Field{iview}=transform_fct(Field{iview},XmlData{iview});               
     303                %transform to phys if requested
    293304            end
    294305            if testcivx
     
    301312            end
    302313        end   
    303        
    304314         %----------END LOOP ON VIEWS----------------------
    305315         
     
    376386            %MergeData.dt=1;
    377387            MergeData.Time=time_i;
    378             error=struct2nc(mergename,MergeData); %save result file
     388            error=struct2nc(mergename,MergeData);%save result file
    379389            if isempty(error)
    380390                display(['output file ' mergename ' written'])
Note: See TracChangeset for help on using the changeset viewer.