Index: /trunk/src/civ_uvmat.m =================================================================== --- /trunk/src/civ_uvmat.m (revision 242) +++ /trunk/src/civ_uvmat.m (revision 242) @@ -0,0 +1,431 @@ +% To develop.... +function [Data,errormsg]= civ_uvmat(Param,ncfile) +Data.ListGlobalAttribute={'Conventions','Program','CivStage'}; +Data.Conventions='uvmat/civdata';% states the conventions used for the description of field variables and attributes +Data.Program='civ_uvmat'; +Data.CivStage=0;%default + +%% Civ1 +if isfield (Param,'Civ1') + par_civ1=Param.Civ1; + str2num(par_civ1.rho) + image1=imread(par_civ1.filename_ima_a); + image2=imread(par_civ1.filename_ima_b); + stepx=str2num(par_civ1.dx); + stepy=str2num(par_civ1.dy); + ibx2=ceil(str2num(par_civ1.ibx)/2); + iby2=ceil(str2num(par_civ1.iby)/2); + isx2=ceil(str2num(par_civ1.isx)/2); + isy2=ceil(str2num(par_civ1.isy)/2); + shiftx=str2num(par_civ1.shiftx); + shifty=str2num(par_civ1.shifty); + miniy=max(1+isy2-shifty,1+iby2); + minix=max(1+isx2-shiftx,1+ibx2); + maxiy=min(size(image1,1)-isy2-shifty,size(image1,1)-iby2); + maxix=min(size(image1,2)-isx2-shiftx,size(image1,2)-ibx2); + [GridX,GridY]=meshgrid(minix:stepx:maxix,miniy:stepy:maxiy); + PointCoord(:,1)=reshape(GridX,[],1); + PointCoord(:,2)=reshape(GridY,[],1); + + % caluclate velocity data (y and v in indices, reverse to y component) + [xtable ytable utable vtable ctable F] = pivlab (image1,image2,ibx2,iby2,isx2,isy2,shiftx,shifty,PointCoord,str2num(par_civ1.rho), []); + list_param=(fieldnames(par_civ1))'; + list_remove={'pxcmx','pxcmy','npx','npy','gridflag','maskflag','term_a','term_b','T0'}; + index=zeros(size(list_param)); + for ilist=1:length(list_remove) + index=strcmp(list_remove{ilist},list_param); + if ~isempty(find(index,1)) + list_param(index)=[]; + end + end + for ilist=1:length(list_param) + Civ1_param{ilist}=['Civ1_' list_param{ilist}]; + eval(['Data.Civ1_' list_param{ilist} '=Param.Civ1.' list_param{ilist} ';']) + end + if isfield(Data,'Civ1_gridname') && strcmp(Data.Civ1_gridname(1:6),'noFile') + Data.Civ1_gridname=''; + end + if isfield(Data,'Civ1_maskname') && strcmp(Data.Civ1_maskname(1:6),'noFile') + Data.Civ1_maskname=''; + end + Data.ListGlobalAttribute=[Data.ListGlobalAttribute Civ1_param {'Civ1_Time','Civ1_Dt'}]; + Data.Civ1_Time=str2double(par_civ1.T0); + Data.Civ1_Dt=str2double(par_civ1.Dt); + Data.ListVarName={'Civ1_X','Civ1_Y','Civ1_U','Civ1_V','Civ1_C','Civ1_F'};% cell array containing the names of the fields to record + Data.VarDimName={'nbvec1','nbvec1','nbvec1','nbvec1','nbvec1','nbvec1'}; + Data.VarAttribute{1}.Role='coord_x'; + Data.VarAttribute{2}.Role='coord_y'; + Data.VarAttribute{3}.Role='vector_x'; + Data.VarAttribute{4}.Role='vector_y'; + Data.VarAttribute{5}.Role='warnflag'; + Data.Civ1_X=reshape(xtable,[],1); + Data.Civ1_Y=reshape(size(image1,1)-ytable+1,[],1); + Data.Civ1_U=reshape(utable,[],1); + Data.Civ1_V=reshape(-vtable,[],1); + Data.Civ1_C=reshape(ctable,[],1); + Data.Civ1_F=reshape(F,[],1); + Data.CivStage=1; +else + Data=nc2struct(ncfile)%read existing netcdf file + if isfield(Data,'absolut_time_T0')%read civx file + var={'Civ1_X','Civ1_Y','Civ1_U','Civ1_V','Civ1_C','Civ1_F','Civ1_FF';'vec_X','vec_Y','vec_U','vec_V','vec_C','vec_F','vec_FixFlag'}; + %var=varcivx_generator('velocity','Civ1');%determine the names of constants and variables to read + [Data,vardetect,ichoice]=nc2struct(ncfile,var);%read the variables in the netcdf file + Data.ListGlobalAttribute=[{'Conventions','Program','CivStage'} Data.ListGlobalAttribute {'Civ1_Time','Civ1_Dt'}]; + Data.Conventions='uvmat/civdata';% states the conventions used for the description of field variables and attributes + Data.Program='civ_uvmat'; + Data.Civ1_Time=double(Data.absolut_time_T0); + Data.Civ1_Dt=double(Data.dt); + Data.VarDimName={'nbvec1','nbvec1','nbvec1','nbvec1','nbvec1','nbvec1','nbvec1'}; + Data.VarAttribute{1}.Role='coord_x'; + Data.VarAttribute{2}.Role='coord_y'; + Data.VarAttribute{3}.Role='vector_x'; + Data.VarAttribute{4}.Role='vector_y'; + Data.VarAttribute{5}.Role='ancillary'; + Data.VarAttribute{6}.Role='warnflag'; + Data.VarAttribute{7}.Role='errorflag'; + Data.CivStage=1; + end +end + +%% Fix1 +if isfield (Param,'Fix1') + ListFixParam=fieldnames(Param.Fix1); + for ilist=1:length(ListFixParam) + ParamName=ListFixParam{ilist}; + ListName=['Fix1_' ParamName]; + ['Data.ListGlobalAttribute=[Data.ListGlobalAttribute ''' ParamName '''];'] + eval(['Data.ListGlobalAttribute=[Data.ListGlobalAttribute ''' ParamName '''];']) + eval(['Data.' ListName '=Param.Fix1.' ParamName ';']) + end +% Data.ListGlobalAttribute=[Data.ListGlobalAttribute {'Fix1_WarnFlags','Fix1_TreshCorr','Fix1_TreshVel','Fix1_UpperBoundTest'}]; +% Data.Fix1_WarnFlags=Param.Fix1.WarnFlags; +% Data.Fix1_ThreshCorr=Param.Fix1.ThreshCorr; +% Data.Fix1_ThreshVel=Param.Fix1.ThreshVel; +% Data.Fix1_UpperBoundTest=Param.Fix1.UpperBoundTest; + Data.ListVarName=[Data.ListVarName {'Civ1_FF'}]; + Data.VarDimName=[Data.VarDimName {'nbvec1'}]; + nbvar=length(Data.ListVarName); + Data.VarAttribute{nbvar}.Role='errorflag'; + [Data.Civ1_FF]=fix_uvmat(Param.Fix1,Data.Civ1_F,Data.Civ1_C,Data.Civ1_U,Data.Civ1_V); + Data.CivStage=2; +end +%% Patch1 +if isfield (Param,'Patch1') + Data.ListGlobalAttribute=[Data.ListGlobalAttribute {'Patch1_Rho','Patch1_Threshold','Patch1_SubDomain'}]; + Data.Patch1_Rho=str2double(Param.Patch1.Rho); + Data.Patch1_Threshold=str2double(Param.Patch1.Threshold); + Data.Patch1_SubDomain=str2double(Param.Patch1.SubDomain); + Data.ListVarName=[Data.ListVarName {'Patch1_U','Patch1_V'}]; + Data.VarDimName=[Data.VarDimName {'nbvec1','nbvec1'}]; + nbvar=length(Data.ListVarName); + Data.VarAttribute{nbvar-1}.Role='vector_x'; + Data.VarAttribute{nbvar}.Role='vector_y'; + Data.Patch1_U=zeros(size(Data.Civ1_X)); + Data.Patch1_V=zeros(size(Data.Civ1_X)); + if isfield(Data,'Civ1_FF') + ind_good=find(Data.Civ1_FF==0); + else + ind_good=1:numel(Data.Civ1_X); + end + [Ures, Vres,FFres]=... + patch_uvmat(Data.Civ1_X(ind_good)',Data.Civ1_Y(ind_good)',Data.Civ1_U(ind_good)',Data.Civ1_V(ind_good)',Data.Patch1_Rho,Data.Patch1_Threshold,Data.Patch1_SubDomain); + size(Ures) + size(Vres) + size(FFres) + size(ind_good) + Data.Patch1_U(ind_good)=Ures; + Data.Patch1_V(ind_good)=Vres; + Data.Civ1_FF(ind_good)=FFres + Data.CivStage=3; +end +%% write result +errormsg=struct2nc(ncfile,Data); + + + +%'RUN_FIX': function for fixing velocity fields: +%----------------------------------------------- +% RUN_FIX(filename,field,flagindex,thresh_vecC,thresh_vel,iter,flag_mask,maskname,fileref,fieldref) +% +%filename: name of the netcdf file (used as input and output) +%field: structure specifying the names of the fields to fix (depending on civ1 or civ2) + %.vel_type='civ1' or 'civ2'; + %.nb=name of the dimension common to the field to fix ('nb_vectors' for civ1); + %.fixflag=name of fix flag variable ('vec_FixFlag' for civ1) +%flagindex: flag specifying which values of vec_f are removed: + % if flagindex(1)=1: vec_f=-2 vectors are removed + % if flagindex(2)=1: vec_f=3 vectors are removed + % if flagindex(3)=1: vec_f=2 vectors are removed (if iter=1) or vec_f=4 vectors are removed (if iter=2) +%iter=1 for civ1 fields and iter=2 for civ2 fields +%thresh_vecC: threshold in the image correlation vec_C +%flag_mask: =1 mask used to remove vectors (0 else) +%maskname: name of the mask image file for fix +%thresh_vel: threshold on velocity, or on the difference with the reference file fileref if exists +%inf_sup=1: remove values smaller than threshold thresh_vel, =2, larger than threshold +%fileref: .nc file name for a reference velocity (='': refrence 0 used) +%fieldref: 'civ1','filter1'...feld used in fileref + +function FF=fix_uvmat(Param,F,C,U,V) +%error=[]; %default +FF=zeros(size(F));%default + +%criterium on warn flags +if isfield (Param,'WarnFlags') + for iflag=1:numel(Param.WarnFlags) + FF=(FF==1| F==Param.WarnFlags(iflag)); + end +end + +%criterium on correlation values +if isfield (Param,'LowerBoundCorr') + FF=FF==1 | Cthresh; +end + +% +% % criterium on velocity values +% delta_u=Field.U;%default without ref file +% delta_v=Field.V; +% if exist('fileref','var') && ~isempty(fileref) +% if ~exist(fileref,'file') +% error='reference file not found in RUN_FIX.m'; +% display(error); +% return +% end +% FieldRef=read_civxdata(fileref,[],fieldref); +% if isfield(FieldRef,'FF') +% index_true=find(FieldRef.FF==0); +% FieldRef.X=FieldRef.X(index_true); +% FieldRef.Y=FieldRef.Y(index_true); +% FieldRef.U=FieldRef.U(index_true); +% FieldRef.V=FieldRef.V(index_true); +% end +% if ~isfield(FieldRef,'X') || ~isfield(FieldRef,'Y') || ~isfield(FieldRef,'U') || ~isfield(FieldRef,'V') +% error='reference file is not a velocity field in RUN_FIX.m '; %bad input file +% return +% end +% if length(FieldRef.X)<=1 +% errordlg('reference field with one vector or less in RUN_FIX.m') +% return +% end +% vec_U_ref=griddata_uvmat(FieldRef.X,FieldRef.Y,FieldRef.U,Field.X,Field.Y); %interpolate vectors in the ref field +% vec_V_ref=griddata_uvmat(FieldRef.X,FieldRef.Y,FieldRef.V,Field.X,Field.Y); %interpolate vectors in the ref field to the positions of the main field +% delta_u=Field.U-vec_U_ref;%take the difference with the interpolated ref field +% delta_v=Field.V-vec_V_ref; +% end +% thresh_vel_x=thresh_vel; +% thresh_vel_y=thresh_vel; +% if isequal(inf_sup,1) +% flag5=abs(delta_u)thresh_vel_x | abs(delta_v)>thresh_vel_y) &(flag1~=1)&(flag2~=1)&(flag3~=1)&(flag4~=1); +% end +% +% % flag7 introduce a grey mask, matrix M +% if isequal (flag_mask,1) +% M=imread(maskname); +% nxy=size(M); +% M=reshape(M,1,nxy(1)*nxy(2)); +% rangx0=[0.5 nxy(2)-0.5]; +% rangy0=[0.5 nxy(1)-0.5]; +% vec_x1=Field.X-Field.U/2;%beginning points +% vec_x2=Field.X+Field.U/2;%end points of vectors +% vec_y1=Field.Y-Field.V/2;%beginning points +% vec_y2=Field.Y+Field.V/2;%end points of vectors +% indx=1+round((nxy(2)-1)*(vec_x1-rangx0(1))/(rangx0(2)-rangx0(1)));% image index x at abcissa vec_x +% indy=1+round((nxy(1)-1)*(vec_y1-rangy0(1))/(rangy0(2)-rangy0(1)));% image index y at ordinate vec_y +% test_in=~(indx < 1 |indy < 1 | indx > nxy(2) |indy > nxy(1)); %=0 out of the mask image, 1 inside +% indx=indx.*test_in+(1-test_in); %replace indx by 1 out of the mask range +% indy=indy.*test_in+(1-test_in); %replace indy by 1 out of the mask range +% ICOMB=((indx-1)*nxy(1)+(nxy(1)+1-indy));%determine the indices in the image reshaped in a Matlab vector +% Mvalues=M(ICOMB); +% flag7b=((20 < Mvalues) & (Mvalues < 200))| ~test_in'; +% indx=1+round((nxy(2)-1)*(vec_x2-rangx0(1))/(rangx0(2)-rangx0(1)));% image index x at abcissa Field.X +% indy=1+round((nxy(1)-1)*(vec_y2-rangy0(1))/(rangy0(2)-rangy0(1)));% image index y at ordinate vec_y +% test_in=~(indx < 1 |indy < 1 | indx > nxy(2) |indy > nxy(1)); %=0 out of the mask image, 1 inside +% indx=indx.*test_in+(1-test_in); %replace indx by 1 out of the mask range +% indy=indy.*test_in+(1-test_in); %replace indy by 1 out of the mask range +% ICOMB=((indx-1)*nxy(1)+(nxy(1)+1-indy));%determine the indices in the image reshaped in a Matlab vector +% Mvalues=M(ICOMB); +% flag7e=((Mvalues > 20) & (Mvalues < 200))| ~test_in'; +% flag7=(flag7b|flag7e)'; +% else +% flag7=0; +% end +% flagmagenta=flag1|flag2|flag3|flag4|flag5|flag7; +% fixflag_unit=Field.FF-10*floor(Field.FF/10); %unity term of fix_flag + + + +%------------------------------------------------------------------------ +% patch function +function [U_smooth,V_smooth,FF] =patch_uvmat(X,Y,U,V,Rho,Threshold,SubDomain) +%subdomain decomposition +warning off +nbvec=numel(X); +NbSubDomain=ceil(nbvec/SubDomain); +MinX=min(X); +MinY=min(Y); +MaxX=max(X); +MaxY=max(Y); +RangX=MaxX-MinX; +RangY=MaxY-MinY; +AspectRatio=RangY/RangX; +NbSubDomainX=ceil(sqrt(NbSubDomain/AspectRatio)) +NbSubDomainY=ceil(sqrt(NbSubDomain*AspectRatio)) + +SizX=RangX/NbSubDomainX;%width of subdomains +SizY=RangY/NbSubDomainY;%height of subdomains +CentreX=linspace(MinX+SizX/2,MaxX-SizX/2,NbSubDomainX); +CentreY=linspace(MinY+SizY/2,MaxY-SizY/2,NbSubDomainY); +SubIndexX=ceil((X-MinX)/SizX);%subdomain index of vectors +SubIndexY=ceil((Y-MinY)/SizY); +rho=RangX*RangY*Rho;%optimum rho increase as teh area of the subdomain +U_tps=zeros(length(X)+3,1);%default spline +V_tps=zeros(length(X)+3,1);%default spline +for isubx=1:NbSubDomainX + for isuby=1:NbSubDomainY + SubRangx(isuby,isubx,:)=[CentreX(isubx)-SizX/2 CentreX(isubx)+SizX/2] + SubRangy(isuby,isubx,:)=[CentreY(isubx)-SizY/2 CentreY(isubx)+SizY/2] + for iter=1:3 %increase the subdomain during three iterations at most + ind_sel=find(X>SubRangx(isuby,isubx,1) & XSubRangy(isuby,isubx,1) & YThreshold);%put FF value to 20 to identify the criterium of elimmination + ind_ind_false=find(FF(ind_sel)~=0); + ind_ind_sel=find(FF(ind_sel)==0); + U_smooth(ind_sel(ind_ind_false))=zeros(numel(ind_ind_false),1); + V_smooth(ind_sel(ind_ind_false))=zeros(numel(ind_ind_false),1); + [U_smooth(ind_sel(ind_ind_sel))]=tps_uvmat(X(ind_sel(ind_ind_sel)),Y(ind_sel(ind_ind_sel)),U(ind_sel(ind_ind_sel)),rho); + [V_smooth(ind_sel(ind_ind_sel))]=tps_uvmat(X(ind_sel(ind_ind_sel)),Y(ind_sel(ind_ind_sel)),V(ind_sel(ind_ind_sel)),rho); + if numel(ind_ind_sel)0 - epsilon=1; -GeometryCalib.fx_fy(1)=sqrt((a_X1(2)/a_Y1(3))*norm); + GeometryCalib.fx_fy(1)=sqrt((a_X1(2)/a_Y1(3))*norm); else - GeometryCalib.fx_fy(1)=-sqrt((-a_X1(2)/a_Y1(3))*norm); - epsilon=-1; + GeometryCalib.fx_fy(1)=-sqrt(-(a_X1(2)/a_Y1(3))*norm); end GeometryCalib.fx_fy(2)=(a_Y1(3)/a_X1(2))*GeometryCalib.fx_fy(1); @@ -469,9 +470,9 @@ %GeometryCalib.Tx_Ty_Tz=[a_X1(1) a_Y1(1) 1]; GeometryCalib.Tx_Ty_Tz=[a_X1(1)/GeometryCalib.fx_fy(1) a_Y1(1)/GeometryCalib.fx_fy(2) 1]; -R(1,:)=epsilon*R(1,:)/GeometryCalib.fx_fy(1); +R(1,:)=R(1,:)/GeometryCalib.fx_fy(1); R(2,:)=R(2,:)/GeometryCalib.fx_fy(2); R=[R;[0 0]]; -GeometryCalib.R=[R [0;0;-1]]; -GeometryCalib.omc=(180/pi)*[acos(GeometryCalib.R(1,1)) 0 0] +GeometryCalib.R=[R [0;0;-epsilon]]; +GeometryCalib.omc=(180/pi)*[acos(GeometryCalib.R(1,1)) 0 0]; %------------------------------------------------------------------------ % determine the tsai parameters for a view normal to the grid plane Index: /trunk/src/phys_XYZ.m =================================================================== --- /trunk/src/phys_XYZ.m (revision 242) +++ /trunk/src/phys_XYZ.m (revision 242) @@ -0,0 +1,126 @@ +%------------------------------------------------------------------------ +%'phys_XYZ':transforms image (px) to real world (phys) coordinates using geometric calibration parameters +% function [Xphys,Yphys]=phys_XYZ(Calib,X,Y,Z) +% +%OUTPUT: +% +%INPUT: +%Z: index of plane +function [Xphys,Yphys,Zphys]=phys_XYZ(Calib,X,Y,Zindex) +%------------------------------------------------------------------------ +testangle=0; +test_refraction=0; +if exist('Zindex','var')&& isequal(Zindex,round(Zindex))&& Zindex>0 && isfield(Calib,'SliceCoord')&&length(Calib.SliceCoord)>=Zindex + if isfield(Calib, 'SliceAngle') && ~isequal(Calib.SliceAngle,[0 0 0]) + testangle=1; + om=norm(Calib.SliceAngle(Zindex,:));%norm of rotation angle in radians + OmAxis=Calib.SliceAngle(Zindex,:)/om; %unit vector marking the rotation axis + cos_om=cos(pi*om/180); + sin_om=sin(pi*om/180); + coeff=OmAxis(3)*(1-cos_om); + norm_plane(1)=OmAxis(1)*coeff+OmAxis(2)*sin_om; + norm_plane(2)=OmAxis(2)*coeff-OmAxis(1)*sin_om; + norm_plane(3)=OmAxis(3)*coeff+cos_om; + Z0=norm_plane*Calib.SliceCoord(Zindex,:)'/norm_plane(3); + else + Z0=Calib.SliceCoord(Zindex,3);%horizontal plane z=cte + end + Z0virt=Z0; + if isfield(Calib,'InterfaceCoord') && isfield(Calib,'RefractionIndex') + H=Calib.InterfaceCoord(3); + if H>Z0 + Z0virt=H-(H-Z0)/Calib.RefractionIndex; %corrected z (virtual object) + test_refraction=1; + end + end +else + Z0=0; + Z0virt=0; +end +if ~exist('X','var')||~exist('Y','var') + Xphys=[]; + Yphys=[];%default + return +end +%coordinate transform +if ~isfield(Calib,'fx_fy') + Calib.fx_fy=[1 1]; +end +if ~isfield(Calib,'Tx_Ty_Tz') + Calib.Tx_Ty_Tz=[0 0 1]; +end +if ~isfield(Calib,'Cx_Cy') + Calib.Cx_Cy=[0 0]; +end +if ~isfield(Calib,'kc') + Calib.kc=0; +end +if isfield(Calib,'R') + R=(Calib.R)'; + if testangle + a=-norm_plane(1)/norm_plane(3); + b=-norm_plane(2)/norm_plane(3); + if test_refraction + a=a/Calib.RefractionIndex; + b=b/Calib.RefractionIndex; + end + R(1)=R(1)+a*R(3); + R(2)=R(2)+b*R(3); + R(4)=R(4)+a*R(6); + R(5)=R(5)+b*R(6); + R(7)=R(7)+a*R(9); + R(8)=R(8)+b*R(9); + end + Tx=Calib.Tx_Ty_Tz(1); + Ty=Calib.Tx_Ty_Tz(2); + Tz=Calib.Tx_Ty_Tz(3); + f=Calib.fx_fy(1);%dpy=1; sx=1 + %dpx=Calib.fx_fy(2)/Calib.fx_fy(1); + Dx=R(5)*R(7)-R(4)*R(8); + Dy=R(1)*R(8)-R(2)*R(7); + D0=(R(2)*R(4)-R(1)*R(5)); + Z11=R(6)*R(8)-R(5)*R(9); + Z12=R(2)*R(9)-R(3)*R(8); + Z21=R(4)*R(9)-R(6)*R(7); + Z22=R(3)*R(7)-R(1)*R(9); + Zx0=R(3)*R(5)-R(2)*R(6); + Zy0=R(1)*R(6)-R(3)*R(4); + A11=R(8)*Ty-R(5)*Tz+Z11*Z0virt; + A12=R(2)*Tz-R(8)*Tx+Z12*Z0virt; + A21=-R(7)*Ty+R(4)*Tz+Z21*Z0virt; + A22=-R(1)*Tz+R(7)*Tx+Z22*Z0virt; + % X0=Calib.fx_fy(1)*(R(5)*Tx-R(2)*Ty+Zx0*Z0virt); + % Y0=Calib.fx_fy(2)*(-R(4)*Tx+R(1)*Ty+Zy0*Z0virt); + X0=(R(5)*Tx-R(2)*Ty+Zx0*Z0virt); + Y0=(-R(4)*Tx+R(1)*Ty+Zy0*Z0virt); + %px to camera: + % Xd=dpx*(X-Calib.Cx_Cy(1)); % sensor coordinates + % Yd=(Y-Calib.Cx_Cy(2)); + Xd=(X-Calib.Cx_Cy(1))/Calib.fx_fy(1); % sensor coordinates + Yd=(Y-Calib.Cx_Cy(2))/Calib.fx_fy(2); + dist_fact=1+Calib.kc*(Xd.*Xd+Yd.*Yd);%/(f*f); %distortion factor + Xu=Xd./dist_fact;%undistorted sensor coordinates + Yu=Yd./dist_fact; + denom=Dx*Xu+Dy*Yu+D0; + Xphys=(A11.*Xu+A12.*Yu+X0)./denom;%world coordinates + Yphys=(A21.*Xu+A22.*Yu+Y0)./denom; + if testangle + Zphys=Z0+a*Xphys+b*Yphys; + else + Zphys=Z0; + end +else + Xphys=-Calib.Tx_Ty_Tz(1)+X/Calib.fx_fy(1); + Yphys=-Calib.Tx_Ty_Tz(2)+Y/Calib.fx_fy(2); +end + +%'px_XYZ': transform phys coordinates to image coordinates (px) +% +% OUPUT: +% X,Y: array of coordinates in the image cooresponding to the input physical positions +% (origin at lower leftcorner, unit=pixel) + +% INPUT: +% Calib: structure containing the calibration parameters (read from the ImaDoc .xml file) +% Xphys, Yphys: array of x,y physical coordinates +% [Z0]: corresponding array of z physical coordinates (0 by default) Index: /trunk/src/uvmat.m =================================================================== --- /trunk/src/uvmat.m (revision 241) +++ /trunk/src/uvmat.m (revision 242) @@ -4308,6 +4308,6 @@ function list_object_2_Callback(hObject, eventdata, handles) %------------------------------------------------------------------------ -list_str=get(handles.list_object_2,'String') -IndexObj=get(handles.list_object_2,'Value') +list_str=get(handles.list_object_2,'String'); +IndexObj=get(handles.list_object_2,'Value'); if ischar(list_str) || isempty(list_str{IndexObj})% || strcmp(list_str{IndexObj},'...') hview_field=findobj(allchild(0),'Tag','view_field');