Changeset 910 for trunk/src/series/civ_input.m

Timestamp:

Jun 13, 2015, 7:20:37 PM (9 years ago)

Author:

sommeria

Message:

bugs corrected in fix in civ_series. vectors set to 0 inside mask

File:

• trunk/src/series/civ_input.m (modified) (2 diffs)

trunk/src/series/civ_input.m

@@ -130 +130 @@
             return
         end
+        if isfield(Data,'.Civ1_ImageA')
         [PathCiv1_ImageA,Civ1_ImageA,FileExtA]=fileparts(Data.Civ1_ImageA);%look for the source image A
         [PathCiv1_ImageB,Civ1_ImageB,FileExtA]=fileparts(Data.Civ1_ImageB);%look for the source image B
+        end
         if isfield(Data,'Civ2_ImageA')
             [PathCiv2_ImageA,Civ2_ImageA,FileExtA]=fileparts(Data.Civ2_ImageA);
@@ -137 +139 @@
         end
         if size(Param.InputTable,1)==1
+             if isfield(Data,'.Civ1_ImageA')
             series('display_file_name',hhseries,Data.Civ1_ImageA,'append');%append the image series to the input list
-        end
-        [RootPath,SubDir,RootFile,i1,i2,j1,j2,FileExt,NomTypeImaA]=fileparts_uvmat(Data.Civ1_ImageA);
+                    [RootPath,SubDir,RootFile,i1,i2,j1,j2,FileExt,NomTypeImaA]=fileparts_uvmat(Data.Civ1_ImageA);
         [RootPath,SubDir,RootFile,i1,i2,j1,j2,FileExt,NomTypeImaB]=fileparts_uvmat(Data.Civ1_ImageB);
+             else
+                 series('display_file_name',hhseries,Data.Civ2_ImageA,'append');%append the image series to the input list
+                         [RootPath,SubDir,RootFile,i1,i2,j1,j2,FileExt,NomTypeImaA]=fileparts_uvmat(Data.Civ2_ImageA);
+        [RootPath,SubDir,RootFile,i1,i2,j1,j2,FileExt,NomTypeImaB]=fileparts_uvmat(Data.Civ2_ImageB);
+             end
+        end
+
         iview_image=2;%line # for the input images
     case 'civxdata'% case of  civx data,