Changeset 332 for trunk/src/geometry_calib.m

Timestamp:

Dec 13, 2011, 11:20:07 AM (12 years ago)

Author:

sommeria

Message:

NomType? changed from _i1-i2 ... to _1-2 ... (bugs to be expected!)
bug corrected in geometry_calib
series changed by introducing a from FileIndices?, introduction of find_file_series to detect the file series corresponding to an input file

File:

• trunk/src/geometry_calib.m (modified) (6 diffs)

trunk/src/geometry_calib.m

@@ -275 +275 @@
         delete(hhh);
     end
-    set(hhuvmat.FixLimits,'Value',0)% put FixedLimits option to 'off'
-    set(hhuvmat.FixLimits,'BackgroundColor',[0.7 0.7 0.7])
+    set(hhuvmat.CheckFixLimits,'Value',0)% put FixedLimits option to 'off'
+    set(hhuvmat.CheckFixLimits,'BackgroundColor',[0.7 0.7 0.7])
     UserData=get(handles.geometry_calib,'UserData');
     UserData.XmlInputFile=outputfile;%save the current xml file name
@@ -499 +499 @@
     huvmat=findobj(allchild(0),'Tag','uvmat');
     hhuvmat=guidata(huvmat);
-    Calib.Cx=str2num(get(hhuvmat.npx,'String'))/2;
-    Calib.Cx=str2num(get(hhuvmat.npy,'String'))/2;
+    Calib.Cx=str2num(get(hhuvmat.num_Npx,'String'))/2;
+    Calib.Cx=str2num(get(hhuvmat.num_Npy,'String'))/2;
 end   
 %tsai parameters
@@ -557 +557 @@
 %retrieve the calibration points stored in the files listed in the popup list coord_files
 x_1=Coord(:,4:5)';%px coordinates of the ref points
-nx=str2num(get(hhuvmat.npx,'String'));
-ny=str2num(get(hhuvmat.npy,'String'));
+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
@@ -629 +629 @@
 %retrieve the calibration points stored in the files listed in the popup list coord_files
 x_1=Coord(:,4:5)';%px coordinates of the ref points
-nx=str2num(get(hhuvmat.npx,'String'));
-ny=str2num(get(hhuvmat.npy,'String'));
+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
@@ -693 +693 @@
 huvmat=findobj(allchild(0),'Tag','uvmat');
 hhuvmat=guidata(huvmat);
-ny=str2double(get(hhuvmat.npy,'String'));
+ny=str2double(get(hhuvmat.num_Npy,'String'));
 x_1(2,:)=ny-x_1(2,:);%reverse the y image coordinates
 n_ima=1;
@@ -1596 +1596 @@
 %     f2=1000;
 %     hhuvmat=guidata(findobj(allchild(0),'Name','uvmat'));
-%     Cx=str2num(get(hhuvmat.npx,'String'))/2;
-%     Cy=str2num(get(hhuvmat.npy,'String'))/2;
+%     Cx=str2num(get(hhuvmat.num_Npx,'String'))/2;
+%     Cy=str2num(get(hhuvmat.num_Npy,'String'))/2;
 Tabchar={};%default
 val_cal=1;%default