Changeset 340 for trunk/src

Timestamp:

Dec 19, 2011, 10:13:39 AM (13 years ago)

Author:

sommeria

Message:

small corrections to fit with the new GUI series;fig

Location:

trunk/src/series

Files:

• aver_stat.m (modified) (1 diff)
• check_data_files.m (modified) (3 diffs)
• clean_civ_cmx.m (modified) (1 diff)
• time_series.m (modified) (1 diff)

trunk/src/series/aver_stat.m

@@ -134 +134 @@
 
 %% number of slices
-NbSlice=str2num(get(hseries.NbSlice,'String'));
-if isempty(NbSlice)
-    NbSlice=1;
-end
+NbSlice=Series.IndexRange.NbSlice;
 NbSlice_name=num2str(NbSlice);
 

trunk/src/series/check_data_files.m

@@ -49 +49 @@
 
 % number of slices
-NbSlice=str2num(get(hseries.NbSlice,'String'));
-if isempty(NbSlice)
-    NbSlice=1;
-end
-NbSlice_name=num2str(NbSlice);
+% NbSlice=str2num(get(hseries.NbSlice,'String'));
+% if isempty(NbSlice)
+%     NbSlice=1;
+NbSlice=Series.IndexRange.NbSlice
+NbSlice_name=num2str(Series.IndexRange.NbSlice);
 if isequal(NbSlice,[]),NbSlice=1; end; %default
 
@@ -95 +95 @@
                 indselect(:,ifield)=((ifield-1)*NbSlice+(i_slice-1))*nbfield2+[1:nbfield2]';%selected indices on the list of files of a slice
             end 
+            filefound={};
             for index=1:nbfield*nbfield2
                 stopstate=get(hseries.RUN,'BusyAction');
                 if isequal(stopstate,'queue')% enable STOP command
-                    update_waitbar(hseries.waitbar,WaitbarPos,index/(nbfield*nbfield2))
+                    update_waitbar(hseries.waitbar_frame,WaitbarPos,index/(nbfield*nbfield2))
                     ifile=indselect(index);               
                     file=...
@@ -137 +138 @@
             end
         end
-        if isempty(datnum)
+%         if isempty(datnum)||isempty(filefound)
+        if isempty(filefound)
             if NbSlice>1
                 message=['no set of ' num2str(NbSlice) ' (NbSlices) files found'];

trunk/src/series/clean_civ_cmx.m

@@ -54 +54 @@
     hdir=dir(fullfile(Series.RootPath{iview},Series.SubDir{iview}));%list files
     for ilist=1:length(hdir)
-        update_waitbar(hseries.waitbar,WaitbarPos,ilist/length(hdir))
+%         update_waitbar(hseries.waitbar,WaitbarPos,ilist/length(hdir))
         FileName=hdir(ilist).name;
         [dd,ff,Ext]=fileparts(FileName);

trunk/src/series/time_series.m

@@ -98 +98 @@
 
 %% number of slices
-NbSlice=str2double(get(hseries.NbSlice,'String'));
-if isnan(NbSlice)
-    NbSlice=1;
-end
+NbSlice=Series.NbSlice;
 
 %% Field and velocity type (the same for the two views)