Index: /trunk/src/proj_field.m =================================================================== --- /trunk/src/proj_field.m (revision 211) +++ /trunk/src/proj_field.m (revision 212) @@ -949,9 +949,9 @@ sin_om=0; if isfield(ObjectData,'Angle')&& isequal(size(ObjectData.Angle),[1 3])&& ~isequal(ObjectData.Angle,[0 0 0]) - PlaneAngle=ObjectData.Angle; + PlaneAngle=(pi/180)*ObjectData.Angle; om=norm(PlaneAngle);%norm of rotation angle in radians OmAxis=PlaneAngle/om; %unit vector marking the rotation axis - cos_om=cos(pi*om/180); - sin_om=sin(pi*om/180); + cos_om=cos(om); + sin_om=sin(om); coeff=OmAxis(3)*(1-cos_om); %components of the unity vector norm_plane normal to the projection plane @@ -1449,6 +1449,6 @@ if NbDim==2 %2D case [X,Y]=meshgrid(coord_x_proj,coord_y_proj);%grid in the new coordinates - XIMA=ObjectData.Coord(1,1)+(X)*cos(Phi)-Y*sin(Phi);%corresponding coordinates in the original image - YIMA=ObjectData.Coord(1,2)+(X)*sin(Phi)+Y*cos(Phi); + XIMA=ObjectData.Coord(1,1)+(X)*cos(PlaneAngle(3))-Y*sin(PlaneAngle(3));%corresponding coordinates in the original image + YIMA=ObjectData.Coord(1,2)+(X)*sin(PlaneAngle(3))+Y*cos(PlaneAngle(3)); XIMA=(XIMA-minAX)/DXinit+1;% image index along x YIMA=(-YIMA+maxAY)/DYinit+1;% image index along y @@ -1536,6 +1536,6 @@ UName=FieldData.ListVarName{ivar_U}; VName=FieldData.ListVarName{ivar_V}; - eval(['ProjData.' UName '=cos(Phi)*ProjData.' UName '+ sin(Phi)*ProjData.' VName ';']) - eval(['ProjData.' VName '=cos(Theta)*(-sin(Phi)*ProjData.' UName '+ cos(Phi)*ProjData.' VName ');']) + eval(['ProjData.' UName '=cos(PlaneAngle(3))*ProjData.' UName '+ sin(PlaneAngle(3))*ProjData.' VName ';']) + eval(['ProjData.' VName '=cos(Theta)*(-sin(PlaneAngle(3))*ProjData.' UName '+ cos(PlaneAngle(3))*ProjData.' VName ');']) if ~isempty(ivar_W) WName=FieldData.ListVarName{ivar_W}; Index: /trunk/src/set_object.m =================================================================== --- /trunk/src/set_object.m (revision 211) +++ /trunk/src/set_object.m (revision 212) @@ -210,22 +210,9 @@ end end - if isfield(data,'Phi') - if ~ischar(handles.Phi) - data.DY=num2str(data.Phi,3); - end - set(handles.Phi,'String',data.Phi) - end - if isfield(data,'Theta') - if ~ischar(handles.Theta) - data.DY=num2str(data.Theta,3); - end - set(handles.Theta,'String',data.Theta) - end - if isfield(data,'Psi') - if ~ischar(handles.Psi) - data.DY=num2str(data.Psi,3); - end - set(handles.Psi,'String',data.Psi) - end + if isfield(data,'Angle') && isequal(numel(data.Angle),3) + set(handles.Phi,'String',num2str(data.Angle(1))) + set(handles.Theta,'String',num2str(data.Angle(2))) + set(handles.Psi,'String',num2str(data.Angle(3))) + end if isfield(data,'DZ') if ~ischar(handles.DZ) @@ -402,5 +389,5 @@ set(handles.YObject,'TooltipString',['YObject: y coordinate of the ' ObjectStyle ' centre']) case {'plane'} - set(handles.Phi,'Visible','on') + set(handles.Psi,'Visible','on') set(handles.XMin,'Visible','on') set(handles.XMax,'Visible','on') @@ -412,5 +399,5 @@ if test3D set(handles.Theta,'Visible','on') - set(handles.Psi,'Visible','on') + set(handles.Phi,'Visible','on') set(handles.ZMax,'Visible','on') end @@ -426,5 +413,4 @@ end case {'volume'} - set(handles.Phi,'Visible','on') set(handles.XMin,'Visible','on') set(handles.XMax,'Visible','on') @@ -433,10 +419,9 @@ set(handles.XObject,'TooltipString',['XObject: x coordinate of the axis origin for the ' ObjectStyle]) set(handles.YObject,'TooltipString',['YObject: y coordinate of the axis origin for the ' ObjectStyle]) -% if test3D - set(handles.Theta,'Visible','on') - set(handles.Psi,'Visible','on') - set(handles.ZMin,'Visible','on') - set(handles.ZMax,'Visible','on') -% end + set(handles.Phi,'Visible','on') + set(handles.Theta,'Visible','on') + set(handles.Psi,'Visible','on') + set(handles.ZMin,'Visible','on') + set(handles.ZMax,'Visible','on') if isequal(ProjMode,'interp')|| isequal(ProjMode,'filter') set(handles.DX,'Visible','on') @@ -461,15 +446,20 @@ function update_slider(hObject, eventdata,handles) %rotation angles -Phi=(pi/180)*str2num(get(handles.Phi,'String'));%first Euler angle in radian -Theta=(pi/180)*str2num(get(handles.Theta,'String'));%second Euler angle in radian - -%components of the unitiy vector normal to the projection plane -NormVec_X=-sin(Phi)*sin(Theta); -NormVec_Y=cos(Phi)*sin(Theta); -NormVec_Z=cos(Theta); +PlaneAngle(1)=str2num(get(handles.Phi,'String'));%first angle in degrees +PlaneAngle(2)=str2num(get(handles.Theta,'String'));%second angle in degrees +PlaneAngle(3)=str2num(get(handles.Psi,'String'));%second angle in degrees +om=norm(PlaneAngle);%norm of rotation angle in radians +OmAxis=PlaneAngle/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); +%components of the unity vector norm_plane normal to the projection plane +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; huvmat=findobj('Tag','uvmat');%find the current uvmat interface handle UvData=get(huvmat,'UserData');%Data associated to the current uvmat interface if isfield(UvData,'X') & isfield(UvData,'Y') & isfield(UvData,'Z') - Z=NormVec_X *(UvData.X)+NormVec_Y *(UvData.Y)+NormVec_Z *(UvData.Z); + Z=norm_plane(1)*(UvData.X)+norm_plane(2)*(UvData.Y)+norm_plane(3)*(UvData.Z); set(handles.z_slider,'Min',min(Z)) set(handles.z_slider,'Max',max(Z)) @@ -620,12 +610,14 @@ end if isfield(s,'Phi') - set(handles.Phi,'String',s.Phi) -end -if isfield(s,'Theta') - set(handles.Theta,'String',s.Theta) -end -if isfield(s,'Psi') - set(handles.Psi,'String',s.Psi) -end + set(handles.Psi,'String',s.Phi)%old definition +end +if isfield(s,'Angle')&& isequal(numel(s.Angle),3) + set(handles.Phi,'String',s.Angle(1)) + set(handles.Theta,'String',s.Angle(2)) + set(handles.Psi,'String',s.Angle(3)) +end +% if isfield(s,'Psi') +% set(handles.Psi,'String',s.Psi) +% end if isfield(s,'DX') @@ -860,20 +852,23 @@ function z_slider_Callback(hObject, eventdata, handles) %--------------------------------------------------------- -%A ADAPTER Z_value=get(handles.z_slider,'Value'); - %rotation angles -Phi=(pi/180)*str2num(get(handles.Phi,'String'));%first Euler angle in radian -Theta=(pi/180)*str2num(get(handles.Theta,'String'));%second Euler angle in radian - -%components of the unity vector normal to the projection plane -NormVec_X=-sin(Phi)*sin(Theta); -NormVec_Y=cos(Phi)*sin(Theta); -NormVec_Z=cos(Theta); +PlaneAngle(1)=str2num(get(handles.Phi,'String'));%first angle in degrees +PlaneAngle(2)=str2num(get(handles.Theta,'String'));%second angle in degrees +PlaneAngle(3)=str2num(get(handles.Psi,'String'));%second angle in degrees +om=norm(PlaneAngle);%norm of rotation angle in radians +OmAxis=PlaneAngle/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); +%components of the unity vector norm_plane normal to the projection plane +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; %set new plane position and update graph -set(handles.XObject,'String',num2str(NormVec_X*Z_value,4)) -set(handles.YObject,'String',num2str(NormVec_Y*Z_value,4)) -set(handles.ZObject,'String',num2str(NormVec_Z*Z_value,4)) +set(handles.XObject,'String',num2str(norm_plane(1)*Z_value,4)) +set(handles.YObject,'String',num2str(norm_plane(2)*Z_value,4)) +set(handles.ZObject,'String',num2str(norm_plane(3)*Z_value,4)) PLOT_Callback(hObject, eventdata, handles) %------------------------------------------------------------------------