Changeset 455 for trunk/src/series

Timestamp:

Jun 13, 2012, 6:26:26 PM (13 years ago)

Author:

sommeria

Message:

a few bug corrected

Location:

trunk/src/series

Files:

• check_data_files.m (modified) (2 diffs)
• sub_background.m (modified) (4 diffs)

trunk/src/series/check_data_files.m

@@ -87 +87 @@
     NbSlice=Param.IndexRange.NbSlice;
 end
-nbview=size(i1_series,1);%number of input file series (lines in InputTable)
-nbfield_j=size(i1_series,2); %nb of consecutive fields at each level(burst
-nbfield=nbfield_j*size(i1_series,3); %total number of files or frames
+nbview=numel(i1_series);%number of input file series (lines in InputTable)
+nbfield_j=size(i1_series{1},1); %nb of consecutive fields at each level(burst
+nbfield=nbfield_j*size(i1_series{1},2); %total number of files or frames
 nbfield_i=floor(nbfield/NbSlice);%total number of i indexes (adjusted to an integer number of slices)
 nbfield=nbfield_i*nbfield_j; %total number of fields after adjustement
@@ -104 +104 @@
 %% MAIN LOOP ON VIEWS (INPUT LINES)
 for iview=1:nbview
-    if isequal(FileType{iview},'mmreader')||isequal(FileType{iview},'video')
-        info=aviinfo(filecell{iview,1});
-        message{1}=info.Filename;
-        message{2}=info.FileModDate;
-        message{3}=[num2str(info.FramesPerSecond) ' frames/s '];
-        message{4}=info.ImageType;
-        message{5}=['  compression' info.VideoCompression];
-        message{6}=[ 'quality ' num2str(info.Quality)];   
+    if isequal(FileType{iview},'mmreader')||isequal(FileType{iview},'video')||isequal(FileType{iview},'multimage')
+        [tild,FileInfo]=get_file_type(filecell{iview,1})
+      %  info=aviinfo(filecell{iview,1});
+        message{1}=filecell{iview,1};%info.Filename;
+        message{2}=FileInfo.FileModDate;
+        message{3}=[num2str(FileInfo.FramesPerSecond) ' frames/s '];
+        message{4}=FileInfo.ImageType;
+        message{5}=['  compression' FileInfo.VideoCompression];
+        message{6}=[ 'quality ' num2str(FileInfo.Quality)];   
         Tabchar=message;
     else

trunk/src/series/sub_background.m

@@ -46 +46 @@
 
     
-function GUI_config=sub_background (Param,get_param)
+function GUI_config=sub_background (Param)
 
 %% set the input elements needed on the GUI series when the action is selected in the menu ActionName
@@ -66 +66 @@
 %% get input parameters, file names and indices
 % BATCH  case: read the xml file for batch case
-if exist('get_param','var') && isequal(get_param,0)
-    checkrun=-1; %the function is just used to define to complement the input parameters
-elseif ischar(Param) && ~isempty(find(regexp(Param,'.xml$'))) %batch mode
+if ischar(Param) && ~isempty(find(regexp(Param,'.xml$'))) %batch mode
         Param=xml2struct(Param);
         checkrun=0;
@@ -165 +163 @@
 
 %% set processing parameters
-if checkrun ==-1
+if ~isfield(Param,'Specific')
     prompt = {'volume scan mode (Yes/No)';'Number of images for the sliding background (MUST FIT IN COMPUTER MEMORY)';...
         'the luminosity rank chosen to define the background (0.1=for dense particle seeding, 0.5 (median) for sparse particles'};
@@ -203 +201 @@
     GUI_config.CheckLevelTransform=strcmp(answer,'Yes');
     
-    % return to BATCH mode
-    if checkrun==-1
+%     % return to BATCH mode
+%     if checkrun==-1
         return %transfer to BATCH mode
-    end
+%     end
 else
     GUI_config=Param.Specific;