Changeset 382 for trunk/src/uvmat.m


Ignore:
Timestamp:
Feb 6, 2012, 11:46:39 PM (9 years ago)
Author:
sommeria
Message:

several bugs corrected
function filter_tps introduced (spline thin shell)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/uvmat.m

    r380 r382  
    16751675    if ~isempty(UvData.j1_series{1})
    16761676        if get(handles.scan_i,'Value')==1% case of scanning along index i
    1677             j1_subseries=UvData.j1_series{1}(ref_i+1,:,:)
     1677            j1_subseries=UvData.j1_series{1}(ref_i+1,:,:);
    16781678        else
    1679             j1_subseries=UvData.j1_series{1}(:,ref_j+1,:)
     1679            j1_subseries=UvData.j1_series{1}(:,ref_j+1,:);
    16801680        end
    16811681        j1_subseries=j1_subseries(j1_subseries>0);
     
    16841684    if ~isempty(UvData.j2_series{1})
    16851685        if get(handles.scan_i,'Value')==1% case of scanning along index i
    1686             j2_subseries=UvData.j2_series{1}(ref_i+1,:,:)
     1686            j2_subseries=UvData.j2_series{1}(ref_i+1,:,:);
    16871687        else
    1688             j2_subseries=UvData.j2_series{1}(:,ref_j+1,:)
     1688            j2_subseries=UvData.j2_series{1}(:,ref_j+1,:);
    16891689        end
    16901690        j2_subseries=j2_subseries(j2_subseries>0);
     
    19961996                ParamIn.Npx=UvData.XmlData.Npx;
    19971997            else
     1998               
    19981999                errormsg='Npx and Npy need to be defined in the xml file for volume images .vol';
    19992000                return
     
    20072008        errormsg=['error in reading ' filename ': ' errormsg];
    20082009        return
    2009     end       
     2010    end 
    20102011    if isfield(ParamOut,'Npx')&& isfield(ParamOut,'Npy')
    20112012        set(handles.num_Npx,'String',num2str(ParamOut.Npx));% display image size on the interface
     
    22132214end
    22142215
     2216
     2217%% update tps in phys coordinates if needed
     2218if (strcmp(VelType,'filter1')||strcmp(VelType,'filter2'))&& isfield(Field{1},'U')&& isfield(Field{1},'V')
     2219    [Field{1}.SubRange,Field{1}.NbSites,Field{1}.Coord_tps,Field{1}.U_tps,Field{1}.V_tps]=filter_tps([Field{1}.X Field{1}.Y],Field{1}.U,Field{1}.V,[],1500,0);
     2220end
     2221
    22152222%% calculate scalar
    22162223if strcmp(FileType(1:3),'civ') && ~isequal(ParamOut.CivStage,0)%&&~isempty(FieldName)%
    2217     Field{1}=calc_field([{ParamOut.FieldName} {ParamOut.ColorVar}],Field{1});
     2224    Field{1}=calc_field([{ParamOut.FieldName} {ParamOut.ColorVar}],Field{1},VelType);
    22182225end
    22192226if numel(Field)==2 && ~test_keepdata_1 && isequal(FileType_1(1:3),'civ') && ~isequal(ParamOut_1.FieldName,'get_field...')%&&~isempty(FieldName_1)
    2220     Field{2}=calc_field([{ParamOut_1.FieldName} {ParamOut_1.ColorVar}],Field{2});
     2227    Field{2}=calc_field([{ParamOut_1.FieldName} {ParamOut_1.ColorVar}],Field{2},VelType_1);
    22212228end
    22222229
Note: See TracChangeset for help on using the changeset viewer.