Changeset 672 for trunk/src/series.m

Timestamp:

Aug 6, 2013, 3:47:07 PM (11 years ago)

Author:

sommeria

Message:

various bugs corrected

File:

• trunk/src/series.m (modified) (7 diffs)

trunk/src/series.m

@@ -243 +243 @@
 %% introduce the input file name(s) if defined from input Param
 if isfield(Param,'FileName')
-    InputTable={'','','','',''}; % refresh the file input table
+    %InputTable={'','','','',''}; % refresh the file input table
+    InputTable={}
     set(handles.InputTable,'Data',InputTable)
     if isfield(Param,'FileName_1')
@@ -584 +585 @@
 SeriesData=get(handles.series,'UserData');
 if strcmp(iview,'append') % display the input data as a new line in the table
-    iview=size(InputTable,1);% the next line in InputTable becomes the current line
-    InputTable(iview+1,:)={'','','','',''};
+    iview=size(InputTable,1)+1;% the next line in InputTable becomes the current line
+    %InputTable(iview+1,:)={'','','','',''};
     InputTable(iview,:)=[{RootPath},{SubDir},{RootFile},{NomType},{FileExt}];
 elseif strcmp(iview,'one') % refresh the list of  input  file series
     iview=1; %the first line in InputTable becomes the current line
-    InputTable=[{'','','','',''};{'','','','',''}];
+    InputTable={'','','','',''};
+    %InputTable=[{'','','','',''};{'','','','',''}];
     InputTable(iview,:)=[{RootPath},{SubDir},{RootFile},{NomType},{FileExt}];
     set(handles.TimeTable,'Data',[{[]},{[]},{[]},{[]}])
@@ -607 +609 @@
     SeriesData.Time={};
 end
-nbview=size(InputTable,1)-1;% rmq: the last line is set blank to allow manual addition of a line
+%nbview=size(InputTable,1)-1;% rmq: the last line is set blank to allow manual addition of a line
+nbview=size(InputTable,1);
 set(handles.ListView,'String',mat2cell((1:nbview)',ones(nbview,1)))
 set(handles.ListView,'Value',iview)
@@ -2156 +2159 @@
     set(handles.OutputDirExt,'String',ParamOut.OutputDirExt)
     OutputDirVisible='on';
-    SubDir=InputTable(1:end-1,2); %set of subdirectories sorted in alphabetical order
+    SubDir=InputTable(1:end,2); %set of subdirectories sorted in alphabetical order
     SubDirOut=SubDir{1};
     if numel(SubDir)>1
@@ -2485 +2488 @@
     nbview=size(InputTable,1);
     %     MaskTable=cell(nbview,1);
+    MaskTable=cell(nbview,1);%default
+    ListMask=cell(nbview,1);%default
     for iview=1:nbview
+        ListMask{iview,1}=num2str(iview);
         RootPath=InputTable{iview,1};
         if ~isempty(RootPath)
@@ -2500 +2506 @@
         end
     end
-    nbview=size(MaskTable,1);
+    %nbview=size(MaskTable,1);
     set(handles.MaskTable,'Data',MaskTable)
     %     set(handles.MaskTable,'ColumnFormat',{MaskTable'})
@@ -2507 +2513 @@
     set(handles.ListMask,'Visible','on')
     set(handles.ListMask,'String',ListMask)
-    set(handles.ListMask,'Value',numel(ListMask))
+    set(handles.ListMask,'Value',1)
 else
     set(handles.MaskTable,'Visible','off')