Changeset 755 for trunk

Timestamp:

Apr 27, 2014, 11:58:49 PM (10 years ago)

Author:

sommeria

Message:

 

Location:

trunk/src

Files:

• geometry_calib.m (modified) (3 diffs)
• nc2struct.m (modified) (1 diff)

trunk/src/geometry_calib.m

@@ -506 +506 @@
     coord_files={};
 end
+%retrieve the calibration points stored in the files listed in the popup list ListCoordFiles
+x_1=Coord(:,4:5)';%px coordinates of the ref points
+if ~strcmp(get(hhuvmat.Scalar,'Visible'),'on')
+    msgbox_uvmat('ERROR','An image needs to be opened in uvmat for calibration')
+  return
+end
+nx=str2num(get(hhuvmat.num_Npx,'String'));
+ny=str2num(get(hhuvmat.num_Npy,'String'));
+x_1(2,:)=ny-x_1(2,:);%reverse the y image coordinates
+X_1=Coord(:,1:3)';%phys coordinates of the ref points
+n_ima=numel(coord_files)+1;
+if ~isempty(coord_files) 
+    msgbox_uvmat('CONFIRMATION',['The xy coordinates of the calibration points in ' num2str(n_ima) ' planes will be used'])
+    for ifile=1:numel(coord_files)
+    t=xmltree(coord_files{ifile});
+    s=convert(t);%convert to matlab structure
+        if isfield(s,'GeometryCalib')
+            if isfield(s.GeometryCalib,'SourceCalib')
+                if isfield(s.GeometryCalib.SourceCalib,'PointCoord')
+                PointCoord=s.GeometryCalib.SourceCalib.PointCoord;
+                Coord_file=zeros(length(PointCoord),5);%default
+                for i=1:length(PointCoord)
+                    line=str2num(PointCoord{i});
+                    Coord_file(i,4:5)=line(4:5);%px x
+                    Coord_file(i,1:3)=line(1:3);%phys x
+                end
+                eval(['x_' num2str(ifile+1) '=Coord_file(:,4:5)'';']);
+                eval(['x_' num2str(ifile+1) '(2,:)=ny-x_' num2str(ifile+1) '(2,:);' ]);
+                eval(['X_' num2str(ifile+1) '=Coord_file(:,1:3)'';']);
+                end
+            end
+        end
+    end
+end
+n_ima=numel(coord_files)+1;
+est_dist=[0;0;0;0;0];
+est_aspect_ratio=0;
+est_fc=[1;1];
+center_optim=0;
+run(fullfile(path_UVMAT,'toolbox_calib','go_calib_optim'));% apply fct 'toolbox_calib/go_calib_optim'
+if exist('Rc_1','var')
+    GeometryCalib.CalibrationType='3D_linear';
+    GeometryCalib.fx_fy=fc';
+    GeometryCalib.Cx_Cy=cc';
+    GeometryCalib.kc=kc(1);
+    GeometryCalib.CoordUnit=[];% default value, to be updated by the calling function
+    GeometryCalib.Tx_Ty_Tz=Tc_1';
+    GeometryCalib.R=Rc_1;
+    GeometryCalib.R(2,1:3)=-GeometryCalib.R(2,1:3);%inversion of the y image coordinate
+    GeometryCalib.Tx_Ty_Tz(2)=-GeometryCalib.Tx_Ty_Tz(2);%inversion of the y image coordinate
+    GeometryCalib.Cx_Cy(2)=ny-GeometryCalib.Cx_Cy(2);%inversion of the y image coordinate
+    GeometryCalib.omc=(180/pi)*omc_1;%angles in degrees
+    GeometryCalib.ErrorRMS=[];
+    GeometryCalib.ErrorMax=[];
+else
+    msgbox_uvmat('ERROR',['calibration function ' fullfile('toolbox_calib','go_calib_optim') ' did not converge: use multiple views or option 3D_extrinsic'])
+    GeometryCalib=[];
+end
+
+%------------------------------------------------------------------------
+function GeometryCalib=calib_3D_quadr(Coord,handles)
+%------------------------------------------------------------------
+
+path_uvmat=which('uvmat');% check the path detected for source file uvmat
+path_UVMAT=fileparts(path_uvmat); %path to UVMAT
+huvmat=findobj(allchild(0),'Tag','uvmat');
+hhuvmat=guidata(huvmat);
+if ~strcmp(get(hhuvmat.Scalar,'Visible'),'on')
+    msgbox_uvmat('ERROR','An image needs to be opened in uvmat for calibration')
+  return
+end
+% check_cond=0;
+coord_files=get(handles.ListCoordFiles,'String');
+if ischar(coord_files)
+    coord_files={coord_files};
+end
+if isempty(coord_files{1}) || isequal(coord_files,{''})
+    coord_files={};
+end
+
 %retrieve the calibration points stored in the files listed in the popup list ListCoordFiles
 x_1=Coord(:,4:5)';%px coordinates of the ref points
@@ -537 +617 @@
 end
 n_ima=numel(coord_files)+1;
-est_dist=[0;0;0;0;0];
-est_aspect_ratio=0;
-est_fc=[1;1];
-center_optim=0;
-run(fullfile(path_UVMAT,'toolbox_calib','go_calib_optim'));% apply fct 'toolbox_calib/go_calib_optim'
-if exist('Rc_1','var')
-    GeometryCalib.CalibrationType='3D_linear';
-    GeometryCalib.fx_fy=fc';
-    GeometryCalib.Cx_Cy=cc';
-    GeometryCalib.kc=kc(1);
-    GeometryCalib.CoordUnit=[];% default value, to be updated by the calling function
-    GeometryCalib.Tx_Ty_Tz=Tc_1';
-    GeometryCalib.R=Rc_1;
-    GeometryCalib.R(2,1:3)=-GeometryCalib.R(2,1:3);%inversion of the y image coordinate
-    GeometryCalib.Tx_Ty_Tz(2)=-GeometryCalib.Tx_Ty_Tz(2);%inversion of the y image coordinate
-    GeometryCalib.Cx_Cy(2)=ny-GeometryCalib.Cx_Cy(2);%inversion of the y image coordinate
-    GeometryCalib.omc=(180/pi)*omc_1;%angles in degrees
-    GeometryCalib.ErrorRMS=[];
-    GeometryCalib.ErrorMax=[];
-else
-    msgbox_uvmat('ERROR',['calibration function ' fullfile('toolbox_calib','go_calib_optim') ' did not converge: use multiple views or option 3D_extrinsic'])
-    GeometryCalib=[];
-end
-
-%------------------------------------------------------------------------
-function GeometryCalib=calib_3D_quadr(Coord,handles)
-%------------------------------------------------------------------
-
-path_uvmat=which('uvmat');% check the path detected for source file uvmat
-path_UVMAT=fileparts(path_uvmat); %path to UVMAT
-huvmat=findobj(allchild(0),'Tag','uvmat');
-hhuvmat=guidata(huvmat);
-% check_cond=0;
-coord_files=get(handles.ListCoordFiles,'String');
-if ischar(coord_files)
-    coord_files={coord_files};
-end
-if isempty(coord_files{1}) || isequal(coord_files,{''})
-    coord_files={};
-end
-
-%retrieve the calibration points stored in the files listed in the popup list ListCoordFiles
-x_1=Coord(:,4:5)';%px coordinates of the ref points
-nx=str2num(get(hhuvmat.num_Npx,'String'));
-ny=str2num(get(hhuvmat.num_Npy,'String'));
-x_1(2,:)=ny-x_1(2,:);%reverse the y image coordinates
-X_1=Coord(:,1:3)';%phys coordinates of the ref points
-n_ima=numel(coord_files)+1;
-if ~isempty(coord_files) 
-    msgbox_uvmat('CONFIRMATION',['The xy coordinates of the calibration points in ' num2str(n_ima) ' planes will be used'])
-    for ifile=1:numel(coord_files)
-    t=xmltree(coord_files{ifile});
-    s=convert(t);%convert to matlab structure
-        if isfield(s,'GeometryCalib')
-            if isfield(s.GeometryCalib,'SourceCalib')
-                if isfield(s.GeometryCalib.SourceCalib,'PointCoord')
-                PointCoord=s.GeometryCalib.SourceCalib.PointCoord;
-                Coord_file=zeros(length(PointCoord),5);%default
-                for i=1:length(PointCoord)
-                    line=str2num(PointCoord{i});
-                    Coord_file(i,4:5)=line(4:5);%px x
-                    Coord_file(i,1:3)=line(1:3);%phys x
-                end
-                eval(['x_' num2str(ifile+1) '=Coord_file(:,4:5)'';']);
-                eval(['x_' num2str(ifile+1) '(2,:)=ny-x_' num2str(ifile+1) '(2,:);' ]);
-                eval(['X_' num2str(ifile+1) '=Coord_file(:,1:3)'';']);
-                end
-            end
-        end
-    end
-end
-n_ima=numel(coord_files)+1;
 est_dist=[1;0;0;0;0];
 est_aspect_ratio=1;
@@ -642 +650 @@
 huvmat=findobj(allchild(0),'Tag','uvmat');
 hhuvmat=guidata(huvmat);
+if ~strcmp(get(hhuvmat.Scalar,'Visible'),'on')
+    msgbox_uvmat('ERROR','An image needs to be opened in uvmat for calibration')
+  return
+end
 ny=str2double(get(hhuvmat.num_Npy,'String'));
 x_1(2,:)=ny-x_1(2,:);%reverse the y image coordinates

trunk/src/nc2struct.m

@@ -3 +3 @@
 % The corresponding dimensions and variable attributes are then extracted
 %----------------------------------------------------------------------
-% function [Data,var_detect,ichoice]=nc2struct(nc,varargin)
+% function [Data,var_detect,ichoice,errormsg]=nc2struct(nc,varargin)
 %
 % OUTPUT: