Changeset 404 for trunk/src/read_field.m


Ignore:
Timestamp:
Apr 30, 2012, 6:46:45 PM (11 years ago)
Author:
sommeria
Message:

various bugs corrected. nc2struct_toolbox suppressed (correspond to obsolete versions of Matlab)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/read_field.m

    r397 r404  
    5050            GUIName=ParamIn.GUIName;
    5151        end
    52         test_civx=0;
     52        CivStage=0;
    5353        if ~strcmp(ParamIn.FieldName,'get_field...')% if get_field is not requested, look for Civx data
    5454            FieldList=calc_field;%list of possible fields for Civx data
     
    6363                    InputField=[{ParamOut.FieldName} {ParamOut.ColorVar}];
    6464                    [Field,ParamOut.VelType,errormsg]=read_civdata(ObjectName,InputField,ParamIn.VelType,Data.CivStage);
    65                     test_civx=Field.CivStage;
     65                    CivStage=Field.CivStage;
    6666                    %case of old civx conventions
    6767                elseif ~isempty(Data.absolut_time_T0)&& ~isequal(Data.civ,0)
     
    7070                    InputField=[{ParamOut.FieldName} {ParamOut.ColorVar}];
    7171                    [Field,ParamOut.VelType]=read_civxdata(ObjectName,InputField,ParamIn.VelType);
    72                     test_civx=Field.CivStage;
     72                    CivStage=Field.CivStage;
    7373                    ParamOut.CivStage=Field.CivStage;
    7474                    % not cvix file, fields will be chosen through the GUI get_field
     
    9090                    return
    9191                end
    92                 test_civx=Field.CivStage;
     92                CivStage=Field.CivStage;
    9393                ParamOut.CivStage=Field.CivStage;
    9494            end
    9595        end
    96         if ~test_civx% read the field names on the interface get_field.
     96        ParamOut.FieldList=[{'image'};FieldList;{'get_field...'}];
     97        if CivStage==0% read the field names on the interface get_field.
    9798            hget_field=findobj(allchild(0),'Name',GUIName);%find the get_field... GUI
    9899            if isempty(hget_field)% open the GUI get_field if it is not found
     
    140141                ParamOut.TimeValue=Field.TimeValue;
    141142            end
    142         end
    143         if test_civx
    144             ParamOut.FieldList=[{'image'};FieldList;{'get_field...'}];
    145         else
    146143            ParamOut.FieldList={'get_field...'};
    147144        end
    148        
     145%         if CivStage~=0
     146%             ParamOut.FieldList=[{'image'};FieldList;{'get_field...'}];
     147%         else
     148% %             ParamOut.FieldList={'get_field...'};
     149%         end   
    149150    case 'video'
    150151        try
Note: See TracChangeset for help on using the changeset viewer.