Changeset 1008 for trunk/src

Timestamp:

Jul 13, 2017, 3:49:43 PM (7 years ago)

Author:

campagne8a

Message:

Calib.f1 to Calib.fx

Location:

trunk/src

Files:

• geometry_calib.m (modified) (7 diffs)
• series.m (modified) (1 diff)

trunk/src/geometry_calib.m

@@ -206 +206 @@
 Intrinsic.Npy=str2num(get(hhuvmat.num_Npy,'String'));
 Intrinsic.coord_files=get(handles.ListCoordFiles,'String');
-Intrinsic.f1=str2num(get(handles.fx,'String'));
-Intrinsic.f2=str2num(get(handles.fy,'String'));
-Intrinsic.k=str2num(get(handles.kc,'String'));
+Intrinsic.fx=str2num(get(handles.fx,'String'));
+Intrinsic.fy=str2num(get(handles.fy,'String'));
+Intrinsic.kc=str2num(get(handles.kc,'String'));
 Intrinsic.Cx=str2num(get(handles.Cx,'String'));
 Intrinsic.Cy=str2num(get(handles.Cy,'String'));
-if isempty(Intrinsic.k)
-    Intrinsic.k=0;
+if isempty(Intrinsic.kc)
+    Intrinsic.kc=0;
 end
 if isempty(Intrinsic.Cx)||isempty(Intrinsic.Cy)
@@ -307 +307 @@
 Intrinsic.Npy=str2num(get(hhuvmat.num_Npy,'String'));
 Intrinsic.coord_files=get(handles.ListCoordFiles,'String');
-Intrinsic.f1=str2num(get(handles.fx,'String'));
-Intrinsic.f2=str2num(get(handles.fy,'String'));
-Intrinsic.k=str2num(get(handles.kc,'String'));
+Intrinsic.fx=str2num(get(handles.fx,'String'));
+Intrinsic.fy=str2num(get(handles.fy,'String'));
+Intrinsic.kc=str2num(get(handles.kc,'String'));
 Intrinsic.Cx=str2num(get(handles.Cx,'String'));
 Intrinsic.Cy=str2num(get(handles.Cy,'String'));
-if isempty(Intrinsic.k)
-    Intrinsic.k=0;
+if isempty(Intrinsic.kc)
+    Intrinsic.kc=0;
 end
 if isempty(Intrinsic.Cx)||isempty(Intrinsic.Cy)
@@ -486 +486 @@
 function GeometryCalib=calib_normal(Coord,Intrinsic)
 %------------------------------------------------------------------------
-Calib.f1=str2num(get(handles.fx,'String'));
-Calib.f2=str2num(get(handles.fy,'String'));
-Calib.k=str2num(get(handles.kc,'String'));
+Calib.fx=str2num(get(handles.fx,'String'));
+Calib.fy=str2num(get(handles.fy,'String'));
+Calib.kc=str2num(get(handles.kc,'String'));
 Calib.Cx=str2num(get(handles.Cx,'String'));
 Calib.Cy=str2num(get(handles.Cy,'String'));
 %default
-if isempty(Calib.f1)
-    Calib.f1=25/0.012;
-end
-if isempty(Calib.f2)
-    Calib.f2=25/0.012;
-end
-if isempty(Calib.k)
-    Calib.k=0;
+if isempty(Calib.fx)
+    Calib.fx=25/0.012;
+end
+if isempty(Calib.fy)
+    Calib.fy=25/0.012;
+end
+if isempty(Calib.kc)
+    Calib.kc=0;
 end
 if isempty(Calib.Cx)||isempty(Calib.Cy)
@@ -510 +510 @@
 Calib.dpx=0.012;%arbitrary
 Calib.dpy=0.012;
-Calib.sx=Calib.f1*Calib.dpx/(Calib.f2*Calib.dpy);
-Calib.f=Calib.f2*Calib.dpy;
-Calib.kappa1=Calib.k/(Calib.f*Calib.f);
+Calib.sx=Calib.fx*Calib.dpx/(Calib.fy*Calib.dpy);
+Calib.f=Calib.fy*Calib.dpy;
+Calib.kappa1=Calib.kc/(Calib.f*Calib.f);
 
 %initial guess
@@ -693 +693 @@
 
 %------------------------------------------------------------------------
-function GeometryCalib=calib_3D_extrinsic(Coord,Intrinsic)
+function GeometryCalib=calib_3D_extrinsic(Coord, Intrinsic)
 %------------------------------------------------------------------
 path_uvmat=which('geometry_calib');% check the path detected for source file uvmat
@@ -709 +709 @@
 n_ima=1;
 GeometryCalib.CalibrationType='3D_extrinsic';
-fx=str2num(get(Intrinsic.fx,'String'));
-fy=str2num(get(Intrinsic.fy,'String'));
-Cx=str2num(get(Intrinsic.Cx,'String'));
-Cy=str2num(get(Intrinsic.Cy,'String'));
+fx=Intrinsic.fx;
+fy=Intrinsic.fy;
+Cx=Intrinsic.Cx;
+Cy=Intrinsic.Cy;
+kc=Intrinsic.kc;
 errormsg='';
 if isempty(fx)
@@ -728 +729 @@
     return
 end
-GeometryCalib.fx_fy(1)=str2num(get(Intrinsic.fx,'String'));
-GeometryCalib.fx_fy(2)=str2num(get(Intrinsic.fy,'String'));
-GeometryCalib.Cx_Cy(1)=str2num(get(Intrinsic.Cx,'String'));
-GeometryCalib.Cx_Cy(2)=str2num(get(Intrinsic.Cy,'String'));
-GeometryCalib.kc=str2num(get(Intrinsic.kc,'String'));
+GeometryCalib.fx_fy(1)=fx;
+GeometryCalib.fx_fy(2)=fy;
+GeometryCalib.Cx_Cy(1)=Cx;
+GeometryCalib.Cx_Cy(2)=Cy;
+GeometryCalib.kc=kc;
 fct_path=fullfile(path_UVMAT,'toolbox_calib');
 addpath(fct_path)

trunk/src/series.m

@@ -2489 +2489 @@
 %% Check whether alphabetical sorting of input Subdir is allowed by the Action fct  (for multiples series entries)
 if isfield(ParamOut,'AllowInputSort')&&isequal(ParamOut.AllowInputSort,'on')&& size(Param.InputTable,1)>1
-    [tild,iview]=sort(InputTable(:,2)); % subdirectories sorted in alphabetical order
-    set(handles.InputTable,'Data',InputTable(iview,:));
+    [tild,iview]=sort(Param.InputTable(:,2)); % subdirectories sorted in alphabetical order
+    set(handles.InputTable,'Data',Param.InputTable(iview,:));
     MinIndex_i=get(handles.MinIndex_i,'Data');
     MinIndex_j=get(handles.MinIndex_j,'Data');