Changeset 452 for trunk/src/uvmat.m
- Timestamp:
- Jun 12, 2012, 8:53:51 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/uvmat.m
r450 r452 1458 1458 axes(handles.axes3) 1459 1459 hold on 1460 MaskData.maskhandle=image(Mask.AX,Mask.AY,imflag,'Tag','mask','HitTest','off','AlphaData',0.6*flagmask); 1460 size(flagmask) 1461 % MaskData.maskhandle=image(Mask.AX,Mask.AY,imflag,'Tag','mask','HitTest','off','AlphaData',0.6*flagmask); 1462 MaskData.maskhandle=image(Mask.AX,Mask.AY,imflag,'Tag','mask','HitTest','off','AlphaData',0.6*ones(size(flagmask))); 1461 1463 % set(MaskData.maskhandle,'AlphaData',0.6*flagmask) 1462 1464 set(handles.CheckMask,'UserData',MaskData) … … 2054 2056 end 2055 2057 end 2058 if isstruct (ParamIn) 2056 2059 ParamIn.FieldName=FieldName; 2057 2060 ParamIn.VelType=VelType; 2058 2061 ParamIn.GUIName='get_field'; 2062 end 2059 2063 [Field{1},ParamOut,errormsg] = read_field(FileName,UvData.FileType{1},ParamIn,frame_index); 2060 2064 if ~isempty(errormsg) … … 2186 2190 end 2187 2191 % display the Fields menu from the input file and pick the selected one: 2192 if isstruct(ParamOut) 2188 2193 field_index=strcmp(ParamOut.FieldName,ParamOut.FieldList); 2189 2194 set(handles.Fields,'String',ParamOut.FieldList); %update the field menu 2190 2195 set(handles.Fields,'Value',find(field_index,1)) 2196 end 2191 2197 2192 2198 %% update the display menu for the second velocity type (second menuline) … … 2194 2200 if isempty(FileName_1) 2195 2201 set(handles.Fields_1,'Value',1); %update the field menu 2202 if isstruct(ParamOut) 2196 2203 set(handles.Fields_1,'String',[{''};ParamOut.FieldList]); %update the field menu 2204 end 2197 2205 elseif ~test_keepdata_1 2198 2206 if (~strcmp(UvData.FileType{2},'netcdf')&&~strcmp(UvData.FileType{2},'civdata')&&~strcmp(UvData.FileType{2},'civx'))|| isequal(FieldName_1,'get_field...') … … 2385 2393 2386 2394 %% calculate scalar 2387 if ~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)%2395 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)% 2388 2396 Field{1}=calc_field([{ParamOut.FieldName} {ParamOut.ColorVar}],Field{1}); 2389 2397 end 2390 if 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...')2398 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...') 2391 2399 Field{2}=calc_field([{ParamOut_1.FieldName} {ParamOut_1.ColorVar}],Field{2}); 2392 2400 end
Note: See TracChangeset
for help on using the changeset viewer.