Changeset 869 for trunk/src


Ignore:
Timestamp:
Feb 13, 2015, 4:39:15 PM (6 years ago)
Author:
sommeria
Message:

bug_repaired

Location:
trunk/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/plot_field.m

    r866 r869  
    13691369        dxy=[-dxymod/4 dxymod/4];% increase the resolution 4 times
    13701370    end
    1371     xi=[rangx(1):dxy(2):rangx(2)];
    1372     yi=[rangy(1):dxy(1):rangy(2)];
    1373     A=griddata_uvmat(vec_X,vec_Y,vec_A,xi,yi');
     1371    xi=rangx(1):dxy(2):rangx(2);
     1372    yi=rangy(1):dxy(1):rangy(2);
     1373    A=griddata(vec_X,vec_Y,vec_A,xi,yi');
    13741374    A=reshape(A,length(yi),length(xi));
    13751375else
  • trunk/src/proj_field.m

    r867 r869  
    386386for icell=1:length(CellInfo)
    387387    CoordType=CellInfo{icell}.CoordType;
    388 %     testY=0;
    389388    test_Amat=0;
    390389    if NbDim(icell)~=2% proj_patch acts only on fields of space dimension 2
     
    12921291                        end
    12931292                    end
     1293                    if isfield (CellInfo{icell},'VarIndex_vector_x')&& isfield (CellInfo{icell},'VarIndex_vector_y')
    12941294                    vector_x_proj=CellInfo{icell}.VarIndex_vector_x; %preserve for next cell
    12951295                    vector_y_proj=CellInfo{icell}.VarIndex_vector_y; %preserve for next cell
     1296                    end
    12961297            end
    12971298           
  • trunk/src/series.m

    r868 r869  
    234234    set(handles.FieldName,'Value',Param.index_fields);% selected string index
    235235end
    236 if isfield(Param,'Coord_x_str') && ischar(Param.Coord_x_str)
    237         set(handles.Coord_x,'String',Param.Coord_x_str);% list menu fields
    238 end
    239 if isfield(Param,'Coord_y_str')&& ischar(Param.Coord_y_str)
    240         set(handles.Coord_y,'String',Param.Coord_y_str);% list menu fields
    241 end
     236if isfield(Param,'Coordinates')
     237    if isfield(Param.Coordinates,'Coord_x')
     238        set(handles.Coord_x,'String',Param.Coordinates.Coord_x)
     239    end
     240    if isfield(Param.Coordinates,'Coord_y')
     241        set(handles.Coord_y,'String',Param.Coordinates.Coord_y)
     242    end
     243    if isfield(Param.Coordinates,'Coord_z')
     244        set(handles.Coord_z,'String',Param.Coordinates.Coord_z)
     245    end
     246end
     247% if isfield(Param,'Coord_x_str') && ischar(Param.Coord_x_str)
     248%         set(handles.Coord_x,'String',Param.Coord_x_str);% list menu fields
     249% end
     250% if isfield(Param,'Coord_y_str')&& ischar(Param.Coord_y_str)
     251%         set(handles.Coord_y,'String',Param.Coord_y_str);% list menu fields
     252% end
    242253
    243254%% introduce the input file name(s) if defined from input Param,
     
    275286    update_rootinfo(handles,Param.HiddenData.i1_series{1},Param.HiddenData.i2_series{1},Param.HiddenData.j1_series{1},Param.HiddenData.j2_series{1},...
    276287        Param.HiddenData.FileInfo{1},Param.HiddenData.MovieObject{1},1)
    277     if isfield(Param,'FileName_1')       
     288    if isfield(Param,'FileName_1')
    278289        %         display_file_name(handles,Param,2)
    279290        update_rootinfo(handles,Param.HiddenData.i1_series{2},Param.HiddenData.i2_series{2},Param.HiddenData.j1_series{2},Param.HiddenData.j2_series{2},...
     
    281292    end
    282293    %% enable field and veltype menus, in accordance with the current action
    283 ActionName_Callback([],[], handles)
    284 
    285 %% set length of waitbar
    286 displ_time(handles)
    287 
     294    ActionName_Callback([],[], handles)
     295   
     296    %% set length of waitbar
     297    displ_time(handles)
     298   
    288299else
    289300    set(handles.REFRESH,'BackgroundColor',[1 0 1])% set REFRESH button to magenta color to indicate that input refresh is needed
  • trunk/src/series/aver_stat.m

    r867 r869  
    197197%% Set field names and velocity types
    198198InputFields{1}=[];%default (case of images)
     199if NbView==2
     200    InputFields{2}=[];%default (case of images)
     201end
    199202if isfield(Param,'InputFields')
    200203    InputFields{1}=Param.InputFields;
    201 end
    202 if NbView==2
    203     InputFields{2}=[];%default (case of images)
    204     if isfield(Param,'InputFields')
    205         InputFields{2}=Param.InputFields{1};%default
     204    if NbView==2
     205        InputFields{2}=Param.InputFields;%default
    206206        if isfield(Param.InputFields,'FieldName_1')
    207207            InputFields{2}.FieldName=Param.InputFields.FieldName_1;
     
    212212    end
    213213end
    214 
    215214% for i_slice=1:NbSlice
    216215% index_slice=i_slice:NbSlice:nbfield;% select file indices of the slice
Note: See TracChangeset for help on using the changeset viewer.