Changeset 822 for trunk/src/series

Timestamp:

Oct 10, 2014, 10:11:30 AM (10 years ago)

Author:

sommeria

Message:

various

Location:

trunk/src/series

Files:

• civ_input.m (modified) (1 diff)
• civ_series.m (modified) (12 diffs)

trunk/src/series/civ_input.m

@@ -473 +473 @@
 
 handles.output.ActionInput=read_GUI(handles.civ_input);
+% correct mask or grid name for Windows system (replace '\' by '/')
+if isfield(handles.output.ActionInput,'Civ1')
+    if isfield(handles.output.ActionInput.Civ1,'Mask')
+        handles.output.ActionInput.Civ1.Mask=regexprep(handles.output.ActionInput.Civ1.Mask,'\','/');
+    end
+    if isfield(handles.output.ActionInput.Civ1,'Grid')
+        handles.output.ActionInput.Civ1.Grid=regexprep(handles.output.ActionInput.Civ1.Grid,'\','/');
+    end
+end
+if isfield(handles.output.ActionInput,'Civ2')
+    if isfield(handles.output.ActionInput.Civ2,'Mask')
+        handles.output.ActionInput.Civ2.Mask=regexprep(handles.output.ActionInput.Civ2.Mask,'\','/');
+    end
+    if isfield(handles.output.ActionInput.Civ2,'Grid')
+        handles.output.ActionInput.Civ2.Grid=regexprep(handles.output.ActionInput.Civ2.Grid,'\','/');
+    end
+end
 guidata(hObject, handles);% Update handles structure
 uiresume(handles.civ_input);

trunk/src/series/civ_series.m

@@ -78 +78 @@
 if ischar(Param)
     Param=xml2struct(Param);% read Param as input file (batch case)
-    Param.InputTable{1}
-    Param.InputTable{2}
-     Param.InputTable{3}
     checkrun=0;
 end
@@ -153 +150 @@
                     [i1_series_Civ2,i2_series_Civ2,j1_series_Civ2,j2_series_Civ2,check_bounds,NomTypeNc]=...
                         find_pair_indices(PairCiv2,i1_series{2},j1_series{2},MinIndex_i(2),MaxIndex_i(2),MinIndex_j(2),MaxIndex_j(2));
-%                     check_bounds=check_bounds | check_bounds_Civ2;
                 end
             end
@@ -204 +200 @@
             FrameIndex_A_Civ2=i1_series_Civ2;
             FrameIndex_B_Civ2=i2_series_Civ2;
+            j1_series_Civ2=ones(size(i1_series_Civ2));
+            j2_series_Civ2=ones(size(i1_series_Civ2));
         else
             FrameIndex_A_Civ2=j1_series_Civ2;
@@ -253 +251 @@
             return
         end
-        [FileType_A,FileInfo_A,VideoObject_A]=get_file_info(ImageName_A);
+        [FileInfo_A,VideoObject_A]=get_file_info(ImageName_A);
+        FileType_A=FileInfo_A.FileType;
         [par_civ1.ImageA,VideoObject_A] = read_image(ImageName_A,FileInfo_A.FileType,VideoObject_A,FrameIndex_A_Civ2(1));
         ImageName_B=fullfile_uvmat(RootPath_B,SubDir_B,RootFile_B,FileExt_B,NomType_B,i2_series_Civ2(1),[],j2_series_Civ2(1));
@@ -264 +263 @@
         [par_civ1.ImageB,VideoObject_B] = read_image(ImageName_B,FileType_B,VideoObject_B,FrameIndex_B_Civ2(1));
         NbField=numel(i1_series_Civ2);
+    else
+        NbField=numel(i1_series_Civ1);% no image used (only fix or patch) TO CHECK
     end
 catch ME
@@ -280 +281 @@
 Data.Program='civ_series';
 Data.CivStage=0;%default
-% ListVarCiv1={'Civ1_X','Civ1_Y','Civ1_U','Civ1_V','Civ1_C','Civ1_F'}; %variables to read
-% ListVarFix1={'Civ1_X','Civ1_Y','Civ1_U','Civ1_V','Civ1_C','Civ1_F','Civ1_FF'};
-% mask='';
 maskname='';%default
 check_civx=0;%default
-% check_civ1=0;%default
-% check_patch1=0;%default
 
 %% get timing from the ImaDoc file or input video
+if iview_A~=0
 XmlFileName=find_imadoc(RootPath_A,SubDir_A,RootFile_A,FileExt_A);
 time=[];
@@ -316 +313 @@
 end
 if isempty(time)% time = index i +0.001 index j by default
-    time=(MinIndex_i:MaxIndex_i)'*ones(1,MaxIndex_j-MinIndex_j+1);
-    time=time+0.001*ones(MaxIndex_i-MinIndex_i+1,1)*(MinIndex_j:MaxIndex_j);
-    time=[zeros(1,MaxIndex_j-MinIndex_j+1);time];% insert a first line of zeros
-    time=[zeros(MaxIndex_i-MinIndex_i+2,1) time];% insert a first column of zeros
+    %MinIndex_i=min(i1_series_Civ1);
+    MaxIndex_i=max(i2_series_Civ1);
+    %MinIndex_j=min(j1_series_Civ1);
+    MaxIndex_j=max(j2_series_Civ1);
+    time=(1:MaxIndex_i)'*ones(1,MaxIndex_j);
+    time=time+0.001*ones(MaxIndex_i,1)*(1:MaxIndex_j);
+    time=[zeros(1,MaxIndex_j);time];% insert a first line of zeros
+    time=[zeros(MaxIndex_i+1,1) time];% insert a first column of zeros
 end
     
@@ -325 +326 @@
     nbfield=length(FileInfo_A);
     nbfield_j=1;
+end
 end
 
@@ -334 +336 @@
         break
     end
-    if iview_A==1% if Civ1 is performed
-        Civ1Dir=OutputDir;
+    if iview_A==0
+        ncfile=fullfile_uvmat(Param.InputTable{1,1},Param.InputTable{1,2},Param.InputTable{1,3},Param.InputTable{1,5},...
+            NomTypeNc,i1_series_Civ1(ifield),i2_series_Civ1(ifield),j1_series_Civ1(ifield),j2_series_Civ1(ifield));
     else
-        Civ1Dir=Param.InputTable{1,2};
-    end
-    if strcmp(Param.ActionInput.ListCompareMode,'PIV')
-        ncfile=fullfile_uvmat(RootPath_A,Civ1Dir,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,Civ1Dir,RootFile_A,'.nc',NomTypeNc,i2_series_Civ1(ifield),[],...
-            j1_series_Civ1(ifield),j2_series_Civ1(ifield));
-    end
-
+        if iview_A==1% if Civ1 is performed
+            Civ1Dir=OutputDir;
+        else
+            Civ1Dir=Param.InputTable{1,2};
+        end
+        if strcmp(Param.ActionInput.ListCompareMode,'PIV')
+            ncfile=fullfile_uvmat(RootPath_A,Civ1Dir,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,Civ1Dir,RootFile_A,'.nc',NomTypeNc,i2_series_Civ1(ifield),[],...
+                j1_series_Civ1(ifield),j2_series_Civ1(ifield));
+        end
+    end
     %% Civ1
     % if Civ1 computation is requested
@@ -466 +472 @@
     %% Fix1
     if isfield (Param.ActionInput,'Fix1')
+        if ~isfield (Param.ActionInput,'Civ1')% if we use existing Civ1, remove previous data beyond Civ1
+            Fix1_attr=find(strcmp('Fix1',Data.ListGlobalAttribute));
+            Data.ListGlobalAttribute(Fix1_attr)=[];
+            for ilist=1:numel(Fix1_attr)
+                Data=rmfield(Data,Data.ListGlobalAttribute{Fix1_attr(ilist)});
+            end
+        end 
         ListFixParam=fieldnames(Param.ActionInput.Fix1);
         for ilist=1:length(ListFixParam)
@@ -615 +628 @@
         par_civ2.SearchBoxSize(1)=2*ibx2+9;% search ara +-4 pixels around the guess
         par_civ2.SearchBoxSize(2)=2*iby2+9;
-%         i1=i1_series_Civ2(ifield);
-%         i2=i1;
-%         if ~isempty(i2_series_Civ2)
-%             i2=i2_series_Civ2(ifield);
-%         end
-%         j1=1;
-%         if ~isempty(j1_series_Civ2)
-%             j1=j1_series_Civ2(ifield);
-%         end
-%         j2=j1;
-%         if ~isempty(j2_series_Civ1)
-%             j2=j2_series_Civ2(ifield);
-%         end
         Civ2_Dt=time(i2+1,j2+1)-time(i1+1,j1+1);
         par_civ2.SearchBoxShift=(Civ2_Dt/Data.Civ1_Dt)*[Shiftx(nbval>=1)./nbval(nbval>=1) Shifty(nbval>=1)./nbval(nbval>=1)];
@@ -693 +693 @@
             nbvar=length(Data.ListVarName);
             Data.VarAttribute{nbvar}.Role='errorflag';
-            Data.Civ2_FF=fix(Param.ActionInput.Fix2,Data.Civ2_F,Data.Civ2_C,Data.Civ2_U,Data.Civ2_V);
+            Data.Civ2_FF=double(fix(Param.ActionInput.Fix2,Data.Civ2_F,Data.Civ2_C,Data.Civ2_U,Data.Civ2_V));
             Data.CivStage=Data.CivStage+1;
         end