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

Timestamp:

Apr 21, 2023, 11:01:06 AM (14 months ago)

Author:

sommeria

Message:

various updates

File:

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

trunk/src/series/civ_series.m

@@ -377 +377 @@
         end
     end
+    ImageName_A='';ImageName_B='';%default
+    VideoObject_A=[];VideoObject_B=[];
     %% Civ1
     % if Civ1 computation is requested
@@ -650 +652 @@
             par_civ2.ImageB=[];
             if strcmp(Param.ActionInput.ListCompareMode,'displacement')
-                    ImageName_A_Civ2=Param.ActionInput.RefFile;
-                else
-            ImageName_A_Civ2=fullfile_uvmat(RootPath_A,SubDir_A,RootFile_A,FileExt_A,NomType_A,i1_civ2,[],j1_civ2);
+                ImageName_A_Civ2=Param.ActionInput.RefFile;
+            else
+                ImageName_A_Civ2=fullfile_uvmat(RootPath_A,SubDir_A,RootFile_A,FileExt_A,NomType_A,i1_civ2,[],j1_civ2);
             end
             if strcmp(ImageName_A_Civ2,ImageName_A) && isequal(FrameIndex_A_Civ1(ifield),FrameIndex_A_Civ2(ifield))
@@ -665 +667 @@
                 [par_civ2.ImageB,VideoObject_B] = read_image(ImageName_B_Civ2,FileType_B,VideoObject_B,FrameIndex_B_Civ2(ifield));
             end
+            [FileInfo_A,VideoObject_A]=get_file_info(ImageName_A_Civ2);
             par_civ2.ImageWidth=FileInfo_A.Width;
             par_civ2.ImageHeight=FileInfo_A.Height;