Changeset 340


Ignore:
Timestamp:
Dec 19, 2011, 10:13:39 AM (9 years ago)
Author:
sommeria
Message:

small corrections to fit with the new GUI series;fig

Location:
trunk/src/series
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series/aver_stat.m

    r255 r340  
    134134
    135135%% number of slices
    136 NbSlice=str2num(get(hseries.NbSlice,'String'));
    137 if isempty(NbSlice)
    138     NbSlice=1;
    139 end
     136NbSlice=Series.IndexRange.NbSlice;
    140137NbSlice_name=num2str(NbSlice);
    141138
  • trunk/src/series/check_data_files.m

    r330 r340  
    4949
    5050% number of slices
    51 NbSlice=str2num(get(hseries.NbSlice,'String'));
    52 if isempty(NbSlice)
    53     NbSlice=1;
    54 end
    55 NbSlice_name=num2str(NbSlice);
     51% NbSlice=str2num(get(hseries.NbSlice,'String'));
     52% if isempty(NbSlice)
     53%     NbSlice=1;
     54NbSlice=Series.IndexRange.NbSlice
     55NbSlice_name=num2str(Series.IndexRange.NbSlice);
    5656if isequal(NbSlice,[]),NbSlice=1; end; %default
    5757
     
    9595                indselect(:,ifield)=((ifield-1)*NbSlice+(i_slice-1))*nbfield2+[1:nbfield2]';%selected indices on the list of files of a slice
    9696            end
     97            filefound={};
    9798            for index=1:nbfield*nbfield2
    9899                stopstate=get(hseries.RUN,'BusyAction');
    99100                if isequal(stopstate,'queue')% enable STOP command
    100                     update_waitbar(hseries.waitbar,WaitbarPos,index/(nbfield*nbfield2))
     101                    update_waitbar(hseries.waitbar_frame,WaitbarPos,index/(nbfield*nbfield2))
    101102                    ifile=indselect(index);               
    102103                    file=...
     
    137138            end
    138139        end
    139         if isempty(datnum)
     140%         if isempty(datnum)||isempty(filefound)
     141        if isempty(filefound)
    140142            if NbSlice>1
    141143                message=['no set of ' num2str(NbSlice) ' (NbSlices) files found'];
  • trunk/src/series/clean_civ_cmx.m

    r171 r340  
    5454    hdir=dir(fullfile(Series.RootPath{iview},Series.SubDir{iview}));%list files
    5555    for ilist=1:length(hdir)
    56         update_waitbar(hseries.waitbar,WaitbarPos,ilist/length(hdir))
     56%         update_waitbar(hseries.waitbar,WaitbarPos,ilist/length(hdir))
    5757        FileName=hdir(ilist).name;
    5858        [dd,ff,Ext]=fileparts(FileName);
  • trunk/src/series/time_series.m

    r330 r340  
    9898
    9999%% number of slices
    100 NbSlice=str2double(get(hseries.NbSlice,'String'));
    101 if isnan(NbSlice)
    102     NbSlice=1;
    103 end
     100NbSlice=Series.NbSlice;
    104101
    105102%% Field and velocity type (the same for the two views)
Note: See TracChangeset for help on using the changeset viewer.