Changeset 844

Timestamp:

Dec 15, 2014, 10:03:23 PM (10 years ago)

Author:

sommeria

Message:

various bugs repaired

Location:

trunk/src

Files:

• series.m (modified) (5 diffs)
• series/civ_input.fig (modified) (previous)
• series/extract_rdvision.m (modified) (1 diff)
• series/stereo_civ.m (modified) (7 diffs)
• uvmat.m (modified) (1 diff)

trunk/src/series.m

@@ -279 +279 @@
             Param.HiddenData.FileInfo{2},Param.HiddenData.MovieObject{2},2)
     end
+    %% enable field and veltype menus, in accordance with the current action
+ActionName_Callback([],[], handles)
+
+%% set length of waitbar
+displ_time(handles)
+
 else
     set(handles.REFRESH,'BackgroundColor',[1 0 1])% set REFRESH button to magenta color to indicate that input refresh is needed
@@ -592 +598 @@
     end
 end
+%% enable field and veltype menus, in accordance with the current action
+ActionName_Callback([],[], handles)
+
+%% set length of waitbar
+displ_time(handles)
+
 set(handles.REFRESH,'BackgroundColor',[1 0 0])% set REFRESH  button to red color (indicate activation finished)
 set(handles.series,'Pointer','arrow') % set the mouse pointer to 'watch'
@@ -764 +776 @@
 %% initiate input file series and refresh the current field view:     
 update_rootinfo(handles,i1_series,i2_series,j1_series,j2_series,FileInfo,MovieObject,iview);
+%% enable field and veltype menus, in accordance with the current action
+ActionName_Callback([],[], handles)
+
+%% set length of waitbar
+displ_time(handles)
+
 set(handles.REFRESH,'BackgroundColor',[1 0 0])% set REFRESH  button to red color (end of activation)
 
@@ -1042 +1060 @@
 CData=cat(3,zeros(size(CData)),CData,zeros(size(CData)));%make color images r=0,g,b=0
 set(handles.FileStatus,'CData',CData);
-
-%% enable field and veltype menus, in accordance with the current action
-ActionName_Callback([],[], handles)
-
-%% set length of waitbar
-displ_time(handles)
-
 
 %-----------------------------------------------------------guide -------------
@@ -2175 +2186 @@
 
 %% definition of the directory containing the output files 
-SubDirOut='';%default
-OutputDirExt='.series'; %default
-if isfield(ParamOut,'OutputDirExt')&&~isempty(ParamOut.OutputDirExt)
-    OutputDirExt=ParamOut.OutputDirExt;
-end
-set(handles.OutputDirExt,'String',OutputDirExt)
-OutputDirVisible='off';
-OutputSubDirMode='auto';%default
-if isfield(ParamOut,'OutputSubDirMode')
-    OutputSubDirMode=ParamOut.OutputSubDirMode;
-end
-switch OutputSubDirMode
-    case 'auto';%default
-        OutputDirVisible='on';
-        SubDir=InputTable(1:end,2); %set of subdirectories 
-        SubDirOut=SubDir{1};
-        if numel(SubDir)>1
-            for ilist=2:numel(SubDir)
-                SubDirOut=[SubDirOut '-' SubDir{ilist}];
+if  ~(isfield(SeriesData,'ActionName') && strcmp(ActionName,SeriesData.ActionName))
+    OutputDirExt='.series'; %default
+    if isfield(ParamOut,'OutputDirExt')&&~isempty(ParamOut.OutputDirExt)
+        OutputDirExt=ParamOut.OutputDirExt;
+    end
+    set(handles.OutputDirExt,'String',OutputDirExt)
+    OutputDirVisible='off';
+    OutputSubDirMode='auto';%default
+    SubDirOut='';
+    if isfield(ParamOut,'OutputSubDirMode')
+        OutputSubDirMode=ParamOut.OutputSubDirMode;
+    end
+    switch OutputSubDirMode
+        case 'auto';%default
+            OutputDirVisible='on';
+            SubDir=InputTable(1:end,2); %set of subdirectories
+            SubDirOut=SubDir{1};
+            if numel(SubDir)>1
+                for ilist=2:numel(SubDir)
+                    SubDirOut=[SubDirOut '-' SubDir{ilist}];
+                end
             end
-        end
-    case 'first'
-        OutputDirVisible='on';
-        SubDirOut=InputTable{1,2}; %use the first subdir name (+OutputDirExt) as output  subdirectory
-    case 'last'
-        OutputDirVisible='on';
-        SubDirOut=InputTable{end,2}; %use the last subdir name (+OutputDirExt) as output  subdirectory
-end
-set(handles.OutputSubDir,'String',SubDirOut)
-set(handles.OutputDirExt,'Visible',OutputDirVisible)
-set(handles.OutputSubDir,'Visible',OutputDirVisible)
-set(handles.OutputDir_title,'Visible',OutputDirVisible)
-
-%% visibility of the run mode (local or background or cluster)
-if strcmp(OutputSubDirMode,'none')
-    RunModeVisible='off';% only local mode available if no output file is produced
-else
-     RunModeVisible='on';
-end
-set(handles.RunMode,'Visible',RunModeVisible)
-set(handles.ActionExt,'Visible',RunModeVisible)
-set(handles.RunMode_title,'Visible',RunModeVisible)
-set(handles.ActionExt_title,'Visible',RunModeVisible)
-
+        case 'first'
+            OutputDirVisible='on';
+            SubDirOut=InputTable{1,2}; %use the first subdir name (+OutputDirExt) as output  subdirectory
+        case 'last'
+            OutputDirVisible='on';
+            SubDirOut=InputTable{end,2}; %use the last subdir name (+OutputDirExt) as output  subdirectory
+    end
+    set(handles.OutputSubDir,'String',SubDirOut)
+    set(handles.OutputDirExt,'Visible',OutputDirVisible)
+    set(handles.OutputSubDir,'Visible',OutputDirVisible)
+    set(handles.OutputDir_title,'Visible',OutputDirVisible)
+    SeriesData.ActionName=ActionName;%record ActionName for next use
+    
+    
+    %% visibility of the run mode (local or background or cluster)
+    if strcmp(OutputSubDirMode,'none')
+        RunModeVisible='off';% only local mode available if no output file is produced
+    else
+        RunModeVisible='on';
+    end
+    set(handles.RunMode,'Visible',RunModeVisible)
+    set(handles.ActionExt,'Visible',RunModeVisible)
+    set(handles.RunMode_title,'Visible',RunModeVisible)
+    set(handles.ActionExt_title,'Visible',RunModeVisible)
+end
 
 %% Expected nbre of output files

trunk/src/series/extract_rdvision.m

@@ -361 +361 @@
 NbBinFile=0;
 BinSize=0;
+fid=0;
 errormsg='';
 classname=sprintf('uint%d',SeqData.bytesperpixel*8);

trunk/src/series/stereo_civ.m

@@ -87 +87 @@
 [tild,i1_series,i2_series,j1_series,j2_series]=get_file_series(Param);
 for iview=1:size(Param.InputTable,1)
-    XmlFileName=find_imadoc(Param.InputTable{1,1},Param.InputTable{1,2},Param.InputTable{1,3},Param.InputTable{1,5});
+    XmlFileName=find_imadoc(Param.InputTable{iview,1},Param.InputTable{iview,2},Param.InputTable{iview,3},Param.InputTable{iview,5});
     if isempty(XmlFileName)
         disp_uvmat('ERROR', [XmlFileName ' not found'],checkrun)
@@ -285 +285 @@
         end
         [A,Rangx,Rangy]=phys_ima(A,XmlData,1);
+        
+
+        PhysImageA=fullfile_uvmat(RootPath_A,Civ1Dir,RootFile_A,'.png','_1a',i1_series_Civ1(ifield),[],1);
+        PhysImageB=fullfile_uvmat(RootPath_A,Civ1Dir,RootFile_A,'.png','_1a',i1_series_Civ1(ifield),[],2);
+        imwrite(A{1},PhysImageA)
+        imwrite(A{2},PhysImageB)
         par_civ1.ImageA=A{1};
         par_civ1.ImageB=A{2};
@@ -414 +420 @@
     if isfield (Param.ActionInput,'Civ2')
         par_civ2=Param.ActionInput.Civ2;
-        par_civ2.ImageA=[];
-        par_civ2.ImageB=[];
+        par_civ2.ImageA=par_civ1.ImageA;
+        par_civ2.ImageB=par_civ1.ImageB;
         %         if ~isfield(Param.Civ1,'ImageA')
         i1=i1_series_Civ2(ifield);
@@ -430 +436 @@
             j2=j2_series_Civ2(ifield);
         end
-        ImageName_A_Civ2=fullfile_uvmat(RootPath_A,SubDir_A,RootFile_A,FileExt_A,NomType_A,i1,[],j1);
-        
-        if strcmp(ImageName_A_Civ2,ImageName_A) && isequal(FrameIndex_A_Civ1(ifield),FrameIndex_A_Civ2(ifield))
-            par_civ2.ImageA=par_civ1.ImageA;
-        else
-            [par_civ2.ImageA,VideoObject_A] = read_image(ImageName_A_Civ2,FileType_A,VideoObject_A,FrameIndex_A_Civ2(ifield));
-        end
-        ImageName_B_Civ2=fullfile_uvmat(RootPath_B,SubDir_B,RootFile_B,FileExt_B,NomType_B,i2,[],j2);
-        if strcmp(ImageName_B_Civ2,ImageName_B) && isequal(FrameIndex_B_Civ1(ifield),FrameIndex_B_Civ2)
-            par_civ2.ImageB=par_civ1.ImageB;
-        else
-            [par_civ2.ImageB,VideoObject_B] = read_image(ImageName_B_Civ2,FileType_B,VideoObject_B,FrameIndex_B_Civ2(ifield));
-        end
-        
-        ncfile=fullfile_uvmat(RootPath_A,OutputDir,RootFile_A,'.nc',NomTypeNc,i1,i2,...
-            j1,j2);
         par_civ2.ImageWidth=FileInfo_A.Width;
         par_civ2.ImageHeight=FileInfo_A.Height;
@@ -498 +488 @@
         ibx2=ceil(par_civ2.CorrBoxSize(1)/2);
         iby2=ceil(par_civ2.CorrBoxSize(2)/2);
-        par_civ2.SearchBoxSize(1)=2*ibx2+9;% search ara +-4 pixels around the guess
-        par_civ2.SearchBoxSize(2)=2*iby2+9;
-        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)];
+%         par_civ2.SearchBoxSize(1)=2*ibx2+9;% search ara +-4 pixels around the guess
+%         par_civ2.SearchBoxSize(2)=2*iby2+9;
+        par_civ2.SearchBoxShift=[Shiftx(nbval>=1)./nbval(nbval>=1) Shifty(nbval>=1)./nbval(nbval>=1)];
         par_civ2.Grid=[par_civ2.Grid(nbval>=1,1)-par_civ2.SearchBoxShift(:,1)/2 par_civ2.Grid(nbval>=1,2)-par_civ2.SearchBoxShift(:,2)/2];% grid taken at the extrapolated origin of the displacement vectors
         if par_civ2.CheckDeformation
@@ -509 +498 @@
             par_civ2.DVDY=DVDY./nbval;
         end
-        % caluclate velocity data (y and v in indices, reverse to y component)
+        % calculate velocity data (y and v in indices, reverse to y component)
         [xtable ytable utable vtable ctable F] = civ (par_civ2);
         list_param=(fieldnames(Param.ActionInput.Civ2))';
@@ -518 +507 @@
         Data.Civ2_ImageB=ImageName_B;
         Data.Civ2_Time=(time(i2+1,j2+1)+time(i1+1,j1+1))/2;
-        Data.Civ2_Dt=Civ2_Dt;
-        %         Data.Civ2_Time=1;
-        %         Data.Civ2_Dt=1;
+        Data.Civ2_Dt=0;
         for ilist=1:length(list_param)
             Data.(Civ2_param{4+ilist})=Param.ActionInput.Civ2.(list_param{ilist});

trunk/src/uvmat.m

@@ -1217 +1217 @@
 GeometryCalib.SliceCoord=Z_plane'*[0 0 1];
 GeometryCalib.SliceAngle=zeros(GeometryCalib.NbSlice,3);
-GeometryCalib.SliceAngle(:,1)=SliceData.SliceAngle(1)*ones(GeometryCalib.NbSlice,1);%rotation around x axis (to generalise)
-GeometryCalib.SliceAngle(:,2)=SliceData.SliceAngle(2)*ones(GeometryCalib.NbSlice,1);%rotation around y axis (to generalise)
+Angle_1=linspace(SliceData.SliceAngle_1(1),SliceData.SliceAngle_1(2),SliceData.NbSlice);
+Angle_2=linspace(SliceData.SliceAngle_2(1),SliceData.SliceAngle_2(2),SliceData.NbSlice);
+GeometryCalib.SliceAngle(:,1)=Angle_1';%rotation around x axis (to generalise)
+GeometryCalib.SliceAngle(:,2)=Angle_2';%rotation around y axis (to generalise)
 GeometryCalib.SliceAngle(:,3)=0;
 if SliceData.CheckRefraction