Changeset 707 for trunk/src

Timestamp:

Feb 12, 2014, 11:16:03 AM (11 years ago)

Author:

sommeria

Message:

bug repaired for civ_series

Location:

trunk/src/series

Files:

• civ_input.m (modified) (3 diffs)
• civ_series.m (modified) (3 diffs)

trunk/src/series/civ_input.m

@@ -89 +89 @@
 FileType=SeriesData.FileType{1};%type of the first input file series
 FileInfo=SeriesData.FileInfo{1};
-FileInput=SeriesData.RefFile{1};
+
 
 %% case of netcdf file as input, get the processing stage and look for corresponding images
@@ -115 +115 @@
         end
         imageinput='';
+        FileInput=SeriesData.RefFile{1};
         Data=nc2struct(FileInput,'ListGlobalAttribute','Civ2_ImageA','Civ1_ImageA','Civ2_ImageB','Civ1_ImageB');
         [PathCiv1_ImageA,Civ1_ImageA,FileExtA]=fileparts(Data.Civ1_ImageA);
@@ -122 +123 @@
             [PathCiv2_ImageB,Civ2_ImageB,FileExtA]=fileparts(Data.Civ2_ImageB);
         end
-        hhseries=guidata(gcbf);
+        hhseries=guidata(hseries);
         if size(Param.InputTable,1)==1
             series('display_file_name',hhseries,Data.Civ1_ImageA,'append');%append the image series to the input list

trunk/src/series/civ_series.m

@@ -279 +279 @@
         break
     end
+    if strcmp(Param.ActionInput.ListCompareMode,'PIV')
+        ncfile=fullfile_uvmat(RootPath_A,OutputDir,RootFile_A,'.nc',NomTypeNc,i1_series_Civ1(ifield),i2_series_Civ1(ifield),...
+            j1_series_Civ1(ifield),j2_series_Civ1(ifield));
+    else
+        ncfile=fullfile_uvmat(RootPath_A,OutputDir,RootFile_A,'.nc',NomTypeNc,i2_series_Civ1(ifield),[],...
+            j1_series_Civ1(ifield),j2_series_Civ1(ifield));
+    end
+
     %% Civ1
+    % if Civ1 computation is requested
     if isfield (Param.ActionInput,'Civ1')
         par_civ1=Param.ActionInput.Civ1;
@@ -297 +306 @@
             ImageName_B=fullfile_uvmat(RootPath_B,SubDir_B,RootFile_B,FileExt_B,NomType_B,i2_series_Civ1(ifield),[],j2_series_Civ1(ifield));
             [par_civ1.ImageB,VideoObject_B] = read_image(ImageName_B,FileType_B,VideoObject_B,FrameIndex_B_Civ1(ifield));
-        end
-        if strcmp(Param.ActionInput.ListCompareMode,'PIV')
-        ncfile=fullfile_uvmat(RootPath_A,OutputDir,RootFile_A,'.nc',NomTypeNc,i1_series_Civ1(ifield),i2_series_Civ1(ifield),...
-            j1_series_Civ1(ifield),j2_series_Civ1(ifield));
-        else
-                   ncfile=fullfile_uvmat(RootPath_A,OutputDir,RootFile_A,'.nc',NomTypeNc,i2_series_Civ1(ifield),[],...
-            j1_series_Civ1(ifield),j2_series_Civ1(ifield));
         end
         par_civ1.ImageWidth=FileInfo_A.Width;
@@ -376 +378 @@
             Data.Civ1_F=reshape(F,[],1);
         end
-    else
+    else% we use existing Civ1 data
         if exist('ncfile','var')
             CivFile=ncfile;