Changeset 491 for trunk/src/uvmat.m


Ignore:
Timestamp:
Jul 11, 2012, 2:56:40 PM (9 years ago)
Author:
sommeria
Message:

fix the the way to deal with filter fields using tps
fix the main projection plane in uvmat

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/uvmat.m

    r484 r491  
    23582358
    23592359%% calculate scalar
    2360 if isstruct(ParamOut)&&~strcmp(ParamOut.FieldName,'get_field...')&& (strcmp(UvData.FileType{1},'civdata')||strcmp(UvData.FileType{1},'civx'))%&&~strcmp(ParamOut.FieldName,'velocity')&& ~strcmp(ParamOut.FieldName,'get_field...');% ~isequal(ParamOut.CivStage,0)%&&~isempty(FieldName)%
     2360if isstruct(ParamOut)&&~strcmp(ParamOut.FieldName,'get_field...')&& (strcmp(UvData.FileType{1},'civdata')||strcmp(UvData.FileType{1},'civx'))
     2361    if isfield(Field{1},'Coord_tps')
     2362        Field{1}.FieldList=[{ParamOut.FieldName} {ParamOut.ColorVar}];
     2363    else
    23612364    Field{1}=calc_field([{ParamOut.FieldName} {ParamOut.ColorVar}],Field{1});
    2362 end
    2363 if isstruct(ParamOut_1)&& numel(Field)==2 && ~strcmp(ParamOut_1.FieldName,'get_field...')&& ~test_keepdata_1 && (strcmp(UvData.FileType{2},'civdata')||strcmp(UvData.FileType{2},'civx'))  &&~strcmp(ParamOut_1.FieldName,'velocity') && ~strcmp(ParamOut_1.FieldName,'get_field...')
     2365    end
     2366end
     2367if isstruct(ParamOut_1)&& numel(Field)==2 && ~strcmp(ParamOut_1.FieldName,'get_field...')&& ~test_keepdata_1 && (strcmp(UvData.FileType{2},'civdata')||strcmp(UvData.FileType{2},'civx'))...
     2368        &&~strcmp(ParamOut_1.FieldName,'velocity') && ~strcmp(ParamOut_1.FieldName,'get_field...')
     2369    if isfield(Field{2},'Coord_tps')
     2370        Field{2}.FieldList=[{ParamOut_1.FieldName} {ParamOut_1.ColorVar}];
     2371    else
    23642372     Field{2}=calc_field([{ParamOut_1.FieldName} {ParamOut_1.ColorVar}],Field{2});
     2373    end
    23652374end
    23662375
     
    23682377%Field{1}.FieldList=[{ParamOut.FieldName} {ParamOut.ColorVar}];
    23692378if numel(Field)==2
    2370 %    Field{2}.FieldList=[{ParamOut_1.FieldName} {ParamOut_1.ColorVar}];
    23712379   [UvData.Field,errormsg]=sub_field(Field{1},Field{2}); 
    23722380   UvData.Field_1=Field{2}; %store the second field for possible use at next RUN
     
    24952503        UvData.Field.Mesh=ord;
    24962504    end
    2497     UvData.Object{1}.Type='plane';%main plotting plane
    2498     UvData.Object{1}.ProjMode='projection';%main plotting plane
    2499     UvData.Object{1}.DisplayHandle.uvmat=[]; %plane not visible in uvmat
    2500     UvData.Object{1}.DisplayHandle.view_field=[]; %plane not visible in uvmat
    2501    
     2505    % default projection plane
     2506    if ~isfield(UvData,'Object')
     2507        UvData.Object{1}.Type='plane';%main plotting plane
     2508        UvData.Object{1}.ProjMode='projection';%main plotting plane
     2509        UvData.Object{1}.DisplayHandle.uvmat=[]; %plane not visible in uvmat
     2510        UvData.Object{1}.DisplayHandle.view_field=[]; %plane not visible in uvmat
     2511    end
    25022512    %% 3D case (menuvolume)
    25032513    if NbDim==3% && UvData.NewSeries
Note: See TracChangeset for help on using the changeset viewer.