Changeset 1110 for trunk

Timestamp:

Jan 20, 2022, 8:30:32 PM (2 years ago)

Author:

sommeria

Message:

calibration with plane angl corrected

Location:

trunk/src

Files:

• phys_XYZ.m (modified) (2 diffs)
• proj_field.m (modified) (1 diff)
• series/extract_rdvision.m (modified) (1 diff)
• series/time_series.m (modified) (2 diffs)
• toolbox_calib/go_calib_optim_iter.m (modified) (8 diffs)
• uvmat.m (modified) (4 diffs)

trunk/src/phys_XYZ.m

@@ -77 +77 @@
     R=(Calib.R)';
     c=Z0virt;
+    cvirt=Z0virt;
     if testangle
         % equation of the illumination plane: z=ax+by+c
@@ -90 +91 @@
         cvirt=Z0virt-avirt*Calib.SliceCoord(Zindex,1)-bvirt*Calib.SliceCoord(Zindex,2);% Z0 = (virtual) z coordinate on the rotation axis (assumed horizontal)
                                % c=z coordinate at (x,y)=(0,0)
+        c=Z0virt-a*Calib.SliceCoord(Zindex,1)-b*Calib.SliceCoord(Zindex,2);
         R(1)=R(1)+avirt*R(3);
         R(2)=R(2)+bvirt*R(3);

trunk/src/proj_field.m

@@ -1086 +1086 @@
         end
     else % the z coordinate is set only by the field plane (by calibration)
-        ProjData.ProjObjectCoord(3)=FieldData.PlaneCoord(3);
+        ProjData.ProjObjectCoord=FieldData.PlaneCoord;
     end
     if isfield(FieldData,'PlaneAngle')

trunk/src/series/extract_rdvision.m

@@ -209 +209 @@
                 if check_xml
                     [success,errormsg] = copyfile(filexml,[fullfile(RootPath,logdir,Param.InputTable{iview,3}) '.xml']); %copy the original xml file in the upper folder
+                else
+                    errormsg=[filexml ' missing'];
+                    return
                 end
             end

trunk/src/series/time_series.m

@@ -508 +508 @@
     
     % record the time:
+    if isempty(errormsg)
     if isempty(time)% time not set by xml filer(s)
         if isfield(Data{1},'Time')
@@ -516 +517 @@
     else % time from ImaDoc prevails  TODO: correct
         DataOut.Time(index,1)=time(index);%
+    end
     end
     index

trunk/src/toolbox_calib/go_calib_optim_iter.m

@@ -30 +30 @@
 %For now, if using a 3D calibration rig, quick_init is set to 1 for an easy initialization of the focal length
 
-if ~exist('desactivated_images'),
+if ~exist('desactivated_images','var')
     desactivated_images = [];
-end;
-
-
-
-if ~exist('est_aspect_ratio'),
+end
+
+if ~exist('est_aspect_ratio','var')
     est_aspect_ratio = 1;
-end;
-
-if ~exist('est_fc');
+end
+
+if ~exist('est_fc','var')
     est_fc = [1;1]; % Set to zero if you do not want to estimate the focal length (it may be useful! believe it or not!)
-end;
-
-if ~exist('recompute_extrinsic'),
+end
+
+if ~exist('recompute_extrinsic','var')
     recompute_extrinsic = 1; % Set this variable to 0 in case you do not want to recompute the extrinsic parameters
     % at each iterstion.
-end;
-
-if ~exist('MaxIter'),
+end
+
+if ~exist('MaxIter','var')
     MaxIter = 30; % Maximum number of iterations in the gradient descent
 end;
 
-if ~exist('check_cond'),
+if ~exist('check_cond','var'),
     check_cond = 1; % Set this variable to 0 in case you don't want to extract view dynamically
 end;
 
-if ~exist('center_optim'),
+if ~exist('center_optim','var'),
     center_optim = 1; %%% Set this variable to 0 if your do not want to estimate the principal point
 end;
 
-if exist('est_dist'),
+if exist('est_dist','var'),
     if length(est_dist) == 4,
         est_dist = [est_dist ; 0];
@@ -67 +65 @@
 end;
 
-if ~exist('est_dist'),
+if ~exist('est_dist','var'),
     est_dist = [1;1;1;1;0];
 end;
 
-if ~exist('est_alpha'),
+if ~exist('est_alpha','var'),
     est_alpha = 0; % by default, do not estimate skew
 end;
@@ -87 +85 @@
 fprintf(1,'\n');
 
-if ~exist('nx')&~exist('ny'),
+if ~exist('nx','var')&~exist('ny','var'),
     fprintf(1,'WARNING: No image size (nx,ny) available. Setting nx=640 and ny=480. If these are not the right values, change values manually.\n');
     nx = 640;
@@ -116 +114 @@
 end;
 
-if ~exist('dont_ask'),
+if ~exist('dont_ask','var'),
     dont_ask = 0;
 end;
@@ -161 +159 @@
 if ~center_optim, % In the case where the principal point is not estimated, keep it at the center of the image
     fprintf(1,'Principal point not optimized (center_optim=0). ');
-    if ~exist('cc'),
+    if ~exist('cc','var'),
         fprintf(1,'It is kept at the center of the image.\n');
         cc = [(nx-1)/2;(ny-1)/2];
@@ -228 +226 @@
 % Initialization of the intrinsic parameters (if necessary)
 
-if ~exist('cc'),
+if ~exist('cc','var')
     fprintf(1,'Initialization of the principal point at the center of the image.\n');
     cc = [(nx-1)/2;(ny-1)/2];
     alpha_smooth = 0.1; % slow convergence
-end;
-
-
-if exist('kc'),
-    if length(kc) == 4;
+end
+
+
+if exist('kc','var')
+    if length(kc) == 4
         fprintf(1,'Adding a new distortion coefficient to kc -> radial distortion model up to the 6th degree');
         kc = [kc;0];
-    end;
-end;
-
-if ~exist('alpha_c'),
+    end
+end
+
+if ~exist('alpha_c','var')
     fprintf(1,'Initialization of the image skew to zero.\n');
     alpha_c = 0;
     alpha_smooth = 0.1; % slow convergence
-end;
-
-if ~exist('fc') && quick_init,
+end
+
+if ~exist('fc','var') && quick_init
     FOV_angle = 35; % Initial camera field of view in degrees
     fprintf(1,['Initialization of the focal length to a FOV of ' num2str(FOV_angle) ' degrees.\n']);
@@ -254 +252 @@
     est_fc = [1;1];
     alpha_smooth = 0.1; % slow 
-end;
-
-
-if ~exist('fc'),
+end
+
+
+if ~exist('fc','var')
     % Initialization of the intrinsic parameters:
     fprintf(1,'Initialization of the intrinsic parameters using the vanishing points of planar patterns.\n')
@@ -263 +261 @@
     alpha_smooth = 0.1; % slow convergence
     est_fc = [1;1];
-end;
+end
 
 

trunk/src/uvmat.m

@@ -3419 +3419 @@
     if ~isempty(errormsg)
         msgbox_uvmat('ERROR',errormsg);
+        return
     end
     pause(1.02-get(handles.speed,'Value'));% wait for next image
@@ -3494 +3495 @@
 end
 UvData=get(handles.uvmat,'UserData');
-if ishandle(handles.UVMAT_title) %remove title panel on uvmat
+if ishandle(handles.UVMAT_title) %remove title panel on uvmat (which appears at the first openning of the GUI)
     delete(handles.UVMAT_title)
 end
@@ -3998 +3999 @@
      set(handles.Objects,'Visible','on')
     %if no projection object exists, create a default one
-    if isempty(UvData.ProjObject{1})
+    if isempty(UvData.ProjObject{1})% if no projection object is specified
         set(handles.ListObject,'Value',1)
         set(handles.ListObject,'String',{'plane'})
@@ -4015 +4016 @@
                 UvData.ProjObject{1}.CoordUnit=UvData.Field.CoordUnit;
             end
-        elseif isfield(UvData,'Z')
+        %elseif isfield(UvData,'Z')
+        else
             %multilevel case (single menuplane in a 3D space)
             if isfield(UvData,'CoordType')&& isequal(UvData.CoordType,'phys') && isfield(UvData,'XmlData')