Changeset 213 for trunk

Timestamp:

Mar 4, 2011, 12:07:38 AM (13 years ago)

Author:

sommeria

Message:

bug corrected for 3D geometry calib: tilt angles

Location:

trunk/src

Files:

• geometry_calib.m (modified) (2 diffs)
• get_field.m (modified) (3 diffs)
• mouse_motion.m (modified) (1 diff)
• proj_field.m (modified) (5 diffs)
• set_object.m (modified) (1 diff)

trunk/src/geometry_calib.m

@@ -242 +242 @@
 if strcmp(answer,'Yes')
     if strcmp(calib_cell{val}(1:2),'3D')%set the plane position for 3D (projection) calibration
-       input_key={'Z (first position)','Z (last position)','Z (water surface)', 'refractive index','NbSlice','volume scan (y/n)','tilt angle'};
-       input_val=[{num2str(ZEnd)} {num2str(ZStart)} {num2str(ZStart)} {'1.33'} num2str(NbSlice_j) {volume_scan} {'0'}];
-        answer=inputdlg(input_key,'slice position(s)',ones(1,7), input_val,'on');
+       input_key={'Z (first position)','Z (last position)','Z (water surface)', 'refractive index','NbSlice','volume scan (y/n)','tilt angle y axis','tilt angle x axis'};
+       input_val=[{num2str(ZEnd)} {num2str(ZStart)} {num2str(ZStart)} {'1.333'} num2str(NbSlice_j) {volume_scan} {'0'} {'0'}];
+        answer=inputdlg(input_key,'slice position(s)',ones(1,8), input_val,'on');
         %answer_1=msgbox_uvmat('INPUT_TXT',' Z= ',num2str(Z_plane)); 
         GeometryCalib.NbSlice=str2double(answer{5});
@@ -254 +254 @@
         end     
         GeometryCalib.SliceCoord=Z_plane'*[0 0 1];
-        GeometryCalib.SliceAngle=answer{7}*ones(GeometryCalib.NbSlice,1)*[0 1 0];%rotation around y axis (to generalise)
+        GeometryCalib.SliceAngle(:,3)=0;
+        GeometryCalib.SliceAngle(:,2)=str2double(answer{7})*ones(GeometryCalib.NbSlice,1);%rotation around y axis (to generalise)
+        GeometryCalib.SliceAngle(:,1)=str2double(answer{8})*ones(GeometryCalib.NbSlice,1);%rotation around x axis (to generalise)
         GeometryCalib.InterfaceCoord=[0 0 str2double(answer{3})];
         GeometryCalib.RefractionIndex=str2double(answer{4});     

trunk/src/get_field.m

@@ -63 +63 @@
 %% prepare the list of RUN fcts and set their paths
 % functions included by default in 'get_field.m
-menu_str={'PLOT';'FFT';'filter_band';'histogram'}; 
+menu_str={'PLOT';'FFT';'filter_band'}; 
 nb_builtin=numel(menu_str);
 path_uvmat=fileparts(which('uvmat'));%path of the function 'uvmat'
@@ -627 +627 @@
         return
     else
-        perm_ind=[1:nbdim];
+        perm_ind=1:nbdim;
     end
     if nbdim==3
@@ -836 +836 @@
 function plot_get_field(SubField,handles)
 %------------------------------------------------------------------------
-list_fig=get(handles.list_fig,'String')
+list_fig=get(handles.list_fig,'String');
 val=get(handles.list_fig,'Value');
 if strcmp(list_fig{val},'uvmat')

trunk/src/mouse_motion.m

@@ -175 +175 @@
                             if size(Field.PlaneCoord)>=[ZIndex 3]
                             z=Field.PlaneCoord(ZIndex,3);
-                            if isfield(Field,'PlaneAngle')
+                            if isfield(Field,'PlaneAngle')&&~isequal(Field.PlaneAngle,[0 0 0])
                                 om=norm(Field.PlaneAngle(ZIndex,:));%norm of rotation angle in radians
                                 OmAxis=Field.PlaneAngle(ZIndex,:)/om; %unit vector marking the rotation axis

trunk/src/proj_field.m

@@ -208 +208 @@
       
     else
-        if length(ivar_X)>1 | length(ivar_Y)>1 | length(ivar_Z)>1
+        if length(ivar_X)>1 || length(ivar_Y)>1 || length(ivar_Z)>1
                  errormsg='multiple coordinate input in proj_field.m';
                     return
@@ -238 +238 @@
             test3D=1;
         end
-        if length(ivar_F)>1 | length(ivar_FF)>1 
+        if length(ivar_F)>1 || length(ivar_FF)>1 
                  msgbox_uvmat('ERROR','multiple flag input in proj_field.m')
                     return
@@ -748 +748 @@
             elseif isequal(ProjMode,'filter') %filtering
                 npoint=floor(linelength/DX)+1;% nbre of points in the profile (interval DX)
-                Xproj=[linelength/(2*npoint):linelength/npoint:linelength-linelength/(2*npoint)];
+                Xproj=linelength/(2*npoint):linelength/npoint:linelength-linelength/(2*npoint);
                 siz=size(X_sel);
                 xregij=cos(theta(ip))*Xproj'*ones(1,siz(2))+ObjectData.Coord(ip,1);
@@ -887 +887 @@
                     eval(['ProjData.' VarName{ivar} '=((sum(A_out,1)/npY))'';']);
                 elseif nbcolor==3
-                    vec_B(ind_in,[1:3])=vec_A(ICOMB,:);
+                    vec_B(ind_in,1:3)=vec_A(ICOMB,:);
                     vec_B(ind_out,1)=zeros(size(ind_out));
                     vec_B(ind_out,2)=zeros(size(ind_out));
@@ -1328 +1328 @@
         end
         npX=1+round(abs(Coord{NbDim}(end)-Coord{NbDim}(1))/DX);%nbre of points after interpol 
-        for idim=[1:NbDim]
+        for idim=1:NbDim
             if test_interp(idim)
                 DimValue(idim)=1+round(abs(Coord{idim}(end)-Coord{idim}(1))/abs(DCoord_min(idim)));%nbre of points after possible interpolation on a regular gri

trunk/src/set_object.m

@@ -767 +767 @@
 %% plot the field projected on the object and store in the corresponding figue
 'TESTproj'
+UvData.Field
+ObjectData
 ProjData= proj_field(UvData.Field,ObjectData)%project the current interface field on ObjectData
 PlotParam=read_plot_param(PlotHandles);