Changeset 242

Timestamp:

Apr 19, 2011, 10:24:16 AM (14 years ago)

Author:

sommeria

Message:

phys_XYZ introduced as a main function, geometry_calib corrected to deal with reverse x axis in mode linear

Location:

trunk/src

Files:

• civ_uvmat.m (added)
• geometry_calib.m (modified) (3 diffs)
• phys_XYZ.m (added)
• uvmat.m (modified) (1 diff)

trunk/src/geometry_calib.m

@@ -441 +441 @@
 %------------------------------------------------------------------------
 % determine the parameters for a calibration by a linear transform matrix (rescale and rotation)
+
+
 function GeometryCalib=calib_linear(Coord,handles) 
 %------------------------------------------------------------------------
@@ -456 +458 @@
 % R=[a_X1(2),a_X1(3),0;a_Y1(2),a_Y1(3),0;0,0,1];
 R=[a_X1(2),a_X1(3);a_Y1(2),a_Y1(3)];
+epsilon=sign(det(R));
 norm=abs(det(R));
 GeometryCalib.CalibrationType='linear';
 if (a_X1(2)/a_Y1(3))>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 +470 @@
 %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

trunk/src/uvmat.m

@@ -4308 +4308 @@
 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');