Changeset 86


Ignore:
Timestamp:
Apr 26, 2010, 11:26:09 PM (11 years ago)
Author:
sommeria
Message:

sub_field: bug corrected for comparing velocity and scalar (eg vort)
uvmat: bug corrected for comparing velocity and scalar
set_grid.fig: unused callbacks desactivated$
civ.m: bug correction for the new civx (civAll): no grid ='none' instead of 'n'

Location:
trunk/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/civ.m

    r85 r86  
    24582458                end
    24592459            else
    2460                    patch1.gridPatch='n';
     2460                   patch1.gridPatch='none';
    24612461                   patch1.gridflag='n';
    24622462                  patch1.m=nx_patch1;
     
    26302630                    end
    26312631                else
    2632                       patch2.gridPatch='n';
     2632                      patch2.gridPatch='none';
    26332633                      patch2.gridflag='n';
    26342634                      patch2.m=nx_patch2;
  • trunk/src/sub_field.m

    r19 r86  
    228228       XName_1=Field_1.ListVarName{VarType_1.coord_x};
    229229       YName_1=Field_1.ListVarName{VarType_1.coord_y};
    230        SubData.ListVarName=[SubData.ListVarName {XName_1} {YName_1}];
     230       %SubData.ListVarName=[SubData.ListVarName {XName_1} {YName_1}];
    231231       DimCell=Field_1.VarDimName([VarType_1.coord_x VarType_1.coord_y ]);
    232232       if isfield(Field_1,'VarAttribute')
  • trunk/src/uvmat.m

    r85 r86  
    23002300            set(hhget_field.attributes,'String',Tabchar);%update list of global attributes in get_field
    23012301        else
    2302             [Field{2},VelType_out_1]=read_civxdata(filename_1,[],VelType_1);
     2302            [Field{2},VelType_out_1]=read_civxdata(filename_1,InputField_1,VelType_1);
    23032303            CivStage_1=Field{2}.CivStage;
    23042304        end
     
    30653065function [FileName_1,RootPath_1,FileBase_1,FileIndices_1,FileExt_1,SubDir_1]=read_file_boxes_1(handles)
    30663066%------------------------------------------------------------------------
    3067 RootPath_1=get(handles.RootPath_1,'String') % read the data from the file1_input window
     3067RootPath_1=get(handles.RootPath_1,'String'); % read the data from the file1_input window
    30683068if isequal(get(handles.RootPath_1,'Visible'),'off') || isequal(RootPath_1,'"')
    30693069    RootPath_1=get(handles.RootPath,'String');
     
    31433143            NomTypeNew='_i';
    31443144        end 
    3145         imagename=name_generator(FileBase,str2double(str1),str2double(str_a),'.png',NomTypeNew,1,str2double(str2),str2double(str_b),'')
     3145        imagename=name_generator(FileBase,str2double(str1),str2double(str_a),'.png',NomTypeNew,1,str2double(str2),str2double(str_b),'');
    31463146        if ~exist(imagename,'file')
    31473147                [FileName,PathName] = uigetfile( ...
     
    31533153            '*.vol','.volume images (png)'; ...
    31543154            '*.*',  'All Files (*.*)'}, ...
    3155             'Pick an image',imagename)           
     3155            'Pick an image',imagename);           
    31563156            % display the selected field and related information
    31573157           imagename=[PathName FileName];
     
    31693169            '*.nc',' netcdf files'; ...
    31703170            '*.*',  'All Files (*.*)'}, ...
    3171             'Pick a netcdf file',FileBase)           
     3171            'Pick a netcdf file',FileBase);           
    31723172            % display the selected field and related information
    31733173           filename=[PathName FileName];
     
    33023302            '*.vol','.volume images (png)'; ...
    33033303            '*.*',  'All Files (*.*)'}, ...
    3304             'Pick an image',imagename)
     3304            'Pick an image',imagename);
    33053305        % display the selected field and related information
    33063306        imagename=[PathName FileName];
     
    33553355        [Path,Name]=fileparts(filebase_1);
    33563356        set(handles.FileExt_1,'String','.nc');
    3357         if ~isempty(SubDir_1) & ~isequal(SubDir_1,'''')& ~isequal(SubDir_1,'"')
     3357        if ~isempty(SubDir_1) && ~strcmp(SubDir_1,'''')&& ~strcmp(SubDir_1,'"')&& ~strcmp(SubDir_1(1),'/')
    33583358            SubDir_1=['/' SubDir_1];
    33593359        end
     
    47514751        colormap(map)
    47524752        image(imflag);
    4753         answer=msgbox_uvmat('INPUT_TXT','mask file name:', mask_name)
     4753        answer=msgbox_uvmat('INPUT_TXT','mask file name:', mask_name);
    47544754        if ~strcmp(answer,'Cancel')
    47554755            imwrite(imflag,answer,'BitDepth',8);
Note: See TracChangeset for help on using the changeset viewer.