Changeset 601 for trunk/src/series

Timestamp:

Apr 3, 2013, 1:39:53 PM (12 years ago)

Author:

sommeria

Message:

a few bugs corrected

File:

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

trunk/src/series/civ_series.m

@@ -168 +168 @@
             %         if ~isfield(Param.Civ1,'ImageA')
             ImageName_A=fullfile_uvmat(RootPath,SubDir,RootFile,FileExt,NomType,i1_series_Civ1(ifield),[],j1_series_Civ1(ifield));
-            [par_civ1.ImageA,MovieObject_A] = read_image(ImageName_A,FileType_A,MovieObject_A,FrameIndex_A_Civ1);
+            [par_civ1.ImageA,MovieObject_A] = read_image(ImageName_A,FileType_A,MovieObject_A,FrameIndex_A_Civ1(ifield));
             %         elseif ischar(Param.Civ1.ImageA)
             %             Param.Civ1.ImageA=regexprep(Param.Civ1.ImageA,'''','\');
@@ -175 +175 @@
             %         if ~isfield(Param.Civ1,'ImageB')
             ImageName_B=fullfile_uvmat(RootPath,SubDir,RootFile,FileExt,NomType,i2_series_Civ1(ifield),[],j2_series_Civ1(ifield));
-            [par_civ1.ImageB,MovieObject_B] = read_image(ImageName_B,FileType_B,MovieObject_B,FrameIndex_B_Civ1);
+            [par_civ1.ImageB,MovieObject_B] = read_image(ImageName_B,FileType_B,MovieObject_B,FrameIndex_B_Civ1(ifield));
             %         elseif isfield(Param.Civ1,'ImageB')&& ischar(Param.Civ1.ImageB)
             %              Param.Civ1.ImageB=regexprep(Param.Civ1.ImageB,'''','\');
@@ -328 +328 @@
         ImageName_A_Civ2=fullfile_uvmat(RootPath,SubDir,RootFile,FileExt,NomType,i1_series_Civ2(ifield),[],j1_series_Civ2(ifield));
 
-        if strcmp(ImageName_A_Civ2,ImageName_A) && isequal(FrameIndex_A_Civ1,FrameIndex_A_Civ2)
+        if strcmp(ImageName_A_Civ2,ImageName_A) && isequal(FrameIndex_A_Civ1(ifield),FrameIndex_A_Civ2)
             par_civ2.ImageA=par_civ1.ImageA;
         else
@@ -334 +334 @@
         end
         ImageName_B_Civ2=fullfile_uvmat(RootPath,SubDir,RootFile,FileExt,NomType,i2_series_Civ2(ifield),[],j2_series_Civ2(ifield));
-        if strcmp(ImageName_B_Civ2,ImageName_B) && isequal(FrameIndex_B_Civ1,FrameIndex_B_Civ2)
+        if strcmp(ImageName_B_Civ2,ImageName_B) && isequal(FrameIndex_B_Civ1(ifield),FrameIndex_B_Civ2)
             par_civ2.ImageB=par_civ1.ImageB;
         else
@@ -915 +915 @@
         NomTypeNc='_1-2';
     else
+        j1_series=j_series;
+        j2_series=j_series;
         NomTypeNc='_1-2_1';
     end