Changeset 961 for trunk/src/uvmat.m


Ignore:
Timestamp:
Jun 28, 2016, 9:05:33 AM (5 years ago)
Author:
sommeria
Message:

NomType? level introduced

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/uvmat.m

    r956 r961  
    991991                data.RangeY=UvData.Field.CoordMesh;
    992992            case 'plane_z'
    993                 data.Angle=[0 0 0];
    994                 data.DX=10*UvData.Field.CoordMesh;
    995                 data.DY=10*UvData.Field.CoordMesh;
     993                data.Angle=[90 0];
     994                data.DX=UvData.Field.CoordMesh;
     995                data.DY=UvData.Field.CoordMesh;
    996996                data.RangeZ=UvData.Field.CoordMesh;
    997997            otherwise
     
    23552355NomType=get(handles.NomType,'String');
    23562356indices=get(handles.FileIndex,'String');
    2357 [tild,tild,tild,i1,i2,j1,j2]=fileparts_uvmat(indices);% the indices for the second series taken from FileIndex
    2358 switch index_rank
    2359     case 1
    2360         indices=fullfile_uvmat('','','','',NomType,stra2num(get(handles.i1,'String')),i2,j1,j2);
    2361 %        set(handles.i1,'BackgroundColor',[0.7 0.7 0.7])% mark the edit box in grey, then RUN0 will mark it in white for confirmation
    2362     case 2
    2363         indices=fullfile_uvmat('','','','',NomType,i1,stra2num(get(handles.i2,'String')),j1,j2);
    2364 %        set(handles.i2,'BackgroundColor',[0.7 0.7 0.7])% mark the edit box in grey, then RUN0 will mark it in white for confirmation
    2365     case 3
    2366         indices=fullfile_uvmat('','','','',NomType,i1,i2,stra2num(get(handles.j1,'String')),j2);
    2367 %        set(handles.j1,'BackgroundColor',[0.7 0.7 0.7])% mark the edit box in grey, then RUN0 will mark it in white for confirmation
    2368     case 4
    2369         indices=fullfile_uvmat('','','','',NomType,i1,i2,j1,stra2num(get(handles.j2,'String')));
    2370 %        set(handles.j2,'BackgroundColor',[0.7 0.7 0.7])% mark the edit box in grey, then RUN0 will mark it in white for confirmation
     2357if strcmp(NomType,'level')
     2358    indices=get(handles.i1,'String');
     2359else
     2360    [tild,tild,tild,i1,i2,j1,j2]=fileparts_uvmat(indices);% the indices for the second series taken from FileIndex
     2361    switch index_rank
     2362        case 1
     2363            indices=fullfile_uvmat('','','','',NomType,stra2num(get(handles.i1,'String')),i2,j1,j2);
     2364        case 2
     2365            indices=fullfile_uvmat('','','','',NomType,i1,stra2num(get(handles.i2,'String')),j1,j2);
     2366        case 3
     2367            indices=fullfile_uvmat('','','','',NomType,i1,i2,stra2num(get(handles.j1,'String')),j2);
     2368        case 4
     2369            indices=fullfile_uvmat('','','','',NomType,i1,i2,j1,stra2num(get(handles.j2,'String')));
     2370    end
    23712371end
    23722372set(handles.FileIndex,'String',indices)
    2373 %set(handles.FileIndex,'BackgroundColor',[0.7 0.7 0.7])% mark the edit box in grey, then RUN0 will mark it in white for confirmation
     2373
    23742374% update the second index if relevant
    23752375if strcmp(get(handles.FileIndex_1,'Visible'),'on')
     
    29442944        set(handles.j2,'String',num2stra(j2,NomType,2));
    29452945    end
     2946    if strcmp(NomType,'level')
     2947       indices=num2str(i1);
     2948    else
    29462949    indices=fullfile_uvmat('','','','',NomType,i1,i2,j1,j2);
     2950    end
    29472951    set(handles.FileIndex,'String',indices);
    29482952    if ~isempty(filename_1)
     
    31513155if isempty(i2), set(handles.i2,'String',''); end % suppress the second i index display if not used
    31523156if isempty(j2), set(handles.j2,'String',''); end % suppress the second j index display if not used
     3157if strcmp(get(handles.NomType,'String'),'level')
     3158    jindex=str2num(get(handles.j1,'String'));
     3159    filename=[fullfile(RootPath,SubDir,['level' num2str(jindex)],RootFile) FileIndex FileExt];% build the input file name (first line)
     3160else
    31533161filename=[fullfile(RootPath,SubDir,RootFile) FileIndex FileExt];% build the input file name (first line)
     3162end
    31543163filename_1='';%default second file name
    31553164FileIndex_1='';
Note: See TracChangeset for help on using the changeset viewer.