Changeset 1199 for trunk/src/series/civ_series.m

Timestamp:

Mar 18, 2026, 12:44:56 PM (3 hours ago)

Author:

sommeria

Message:

bugs repaired

File:

• trunk/src/series/civ_series.m (modified) (5 diffs)

trunk/src/series/civ_series.m

@@ -103 +103 @@
 hseries=findobj(allchild(0),'Tag','series');
 RUNHandle=findobj(hseries,'Tag','RUN');%handle of RUN button in GUI series
-WaitbarHandle=findobj(hseries,'Tag','Waitbar');%handle of waitbar in GUI series
+% WaitbarHandle=findobj(hseries,'Tag','Waitbar');%handle of waitbar in GUI series
 MaxIndex_i=Param.IndexRange.MaxIndex_i;
 MinIndex_i=Param.IndexRange.MinIndex_i;
@@ -332 +332 @@
         par_civ1=Param.ActionInput.Civ1;% parameters for civ1
         %if CheckInputFile % read input images (except in mode Test where it is introduced directly in Param.ActionInput.Civ1.ImageNameA and B)
-        try
+        % try
             if strcmp(Param.ActionInput.ListCompareMode,'displacement')
                 ImageName_A=Param.ActionInput.RefFile;
@@ -351 +351 @@
                     [FileInfo_A,VideoObject_A]=get_file_info(ImageName_A);
                     FileType_A=FileInfo_A.FileType;
-                    if isempty(Time) && ~isempty(find(strcmp(FileType_A,{'mmreader','video','cine_phantom','telopsIR'}), 1))% case of video inputFrameIndex_A
+                    if isempty(Time) && ismember(FileType_A,{'video','cine_phantom','telopsIR'})% case of video inputFrameIndex_A
                         Time=zeros(FileInfo_A.NumberOfFrames+1,2);
                         Time(:,2)=(0:1/FileInfo_A.FrameRate:(FileInfo_A.NumberOfFrames)/FileInfo_A.FrameRate)';
-                        if ~isempty(j1_series_Civ1) && j1_series_Civ1~=1
+                        if ~isempty(j1_series_Civ1) & j1_series_Civ1~=1
                             Time=Time';
                         end
@@ -392 +392 @@
             [par_civ1.ImageB,VideoObject_B] = read_image(ImageName_B,FileType_B,VideoObject_B,FrameIndex_B);
             
-        catch ME % display errors in reading input images
-            if ~isempty(ME.message)
-                disp_uvmat('ERROR', ['error reading input image: ' ME.message],checkrun)
-                continue
-            end
-        end
+        % catch ME % display errors in reading input images
+        %     if ~isempty(ME.message)
+        %         disp_uvmat('ERROR', ['error reading input image: ' ME.message],checkrun)
+        %         continue
+        %     end
+        % end
         
         % case of background image to subtract
@@ -1009 +1009 @@
     if exist('time_input','var')
         disp(['time image reading ' num2str(time_input,2) ' s'])
-        disp(['time other ' num2str((time_total-time_input-time_civ1-time_patch1-time_civ2-time_patch2),2) ' s'])
+        disp(['time other ' num2str((time_total-time_civ1-time_patch1-time_civ2-time_patch2),2) ' s'])
     end
 end