Changeset 966


Ignore:
Timestamp:
Jul 9, 2016, 10:02:57 PM (8 years ago)
Author:
sommeria
Message:

3D projection improved

Location:
trunk/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/mouse_down.m

    r955 r966  
    436436        Delta_x=(xy(1,1)-ObjectData.Coord(1,1));%displacement along x
    437437        Delta_y=(xy(1,2)-ObjectData.Coord(1,2));%displacement along y
    438         Delta_mod=sqrt(Delta_x*Delta_x+Delta_y*Delta_y);%modulus of displacement
    439         ObjectData.Angle(1)=90*Delta_x/Delta_mod;
    440         ObjectData.Angle(2)=90*Delta_y/Delta_mod;
    441         ObjectData.Angle(3)=0;% plane rotated by 90 ° along the axis of mouse displacement since the origin
     438        ObjectData.Angle(1)=(180/pi)*angle(Delta_x+i*Delta_y);
     439        ObjectData.Angle(2)=90;       
    442440        set(hh_set_object.num_Angle_1,'String',num2str(ObjectData.Angle(1)))
    443441        set(hh_set_object.num_Angle_2,'String',num2str(ObjectData.Angle(2)))
    444         set(hh_set_object.num_Angle_3,'String',num2str(ObjectData.Angle(3)))
    445442        drawing_status='off';
    446443    else

  • trunk/src/mouse_motion.m

    r954 r966  
    377377        return
    378378    end
     379    if numel(UvData.ProjObject)<PlotData.IndexObj
     380        return
     381    end
    379382    ObjectData=UvData.ProjObject{PlotData.IndexObj};
    380383    if isequal(hObject,huvmat)% if the mouse ifs over the GUI uvmat
     384        if numel(UvData.ProjObject)<get(hhuvmat.ListObject_1,'Value')
     385            return
     386        end
    381387        ProjObject=UvData.ProjObject{get(hhuvmat.ListObject_1,'Value')};
    382388    else
     389        if numel(UvData.ProjObject)<get(hhuvmat.ListObject,'Value')
     390            return
     391        end
    383392        ProjObject=UvData.ProjObject{get(hhuvmat.ListObject,'Value')};
    384393    end

  • trunk/src/plot_object.m

    r955 r966  
    152152        case {'plane','plane_z','volume'}
    153153            if ~isfield(ObjectData,'Angle')
    154                 ObjectData.Angle=[0 0 0];
    155             end
    156             if strcmp(ObjectData.Type,'plane_z')
    157                 Angle_1=ObjectData.Angle(1);
    158                 Angle_2=ObjectData.Angle(2);
    159                 norm_angle=sqrt(Angle_1*Angle_1+Angle_2*Angle_2);
    160                 cosphi=Angle_1/norm_angle;%angle in radians
    161                 sinphi=Angle_2/norm_angle;%angle in radians
    162             else
    163                 cosphi=cos(ObjectData.Angle(3)*pi/180);%angle in radians
    164                 sinphi=sin(ObjectData.Angle(3)*pi/180);%angle in radians
    165             end
     154                ObjectData.Angle=[0 0];
     155            end
     156            cosphi=cos(ObjectData.Angle(1)*pi/180);%angle in radians
     157            sinphi=sin(ObjectData.Angle(1)*pi/180);%angle in radians
    166158            x0=xline(1); y0=yline(1);
    167159            xlim=get(haxes,'XLim');

  • trunk/src/proj_field.m

    r965 r966  
    552552    return
    553553end
    554 CellInfo=CellInfo(NbDim==2); %keep only the 2D cells
     554CellInfo=CellInfo(NbDim>=2); %keep only the 2D cells
    555555%%%%%% TODO: treat 1D fields: project as identity so that P o P=P for projection operation
    556556cell_select=true(size(CellInfo));
    … …  
    676676    VarIndex=find(check_proj);% indices of the variables to be projected
    677677   
    678     %% identify vector components
    679     %testU=isfield(CellInfo{icell},'VarIndex_vector_x') &&isfield(CellInfo{icell},'VarIndex_vector_y') ;% test for vectors
    680     %     if testU
    681     %         UName=FieldData.ListVarName{CellInfo{icell}.VarIndex_vector_x};
    682     %         VName=FieldData.ListVarName{CellInfo{icell}.VarIndex_vector_y};
    683     %         vector_x=FieldData.(UName);
    684     %         vector_y=FieldData.(VName);
    685     %     end
    686678    %identify error flag
    687679    errorflag=0; %default, no error flag
    … …  
    701693        %case of unstructured coordinates
    702694        case 'scattered'
    703 %             XName= FieldData.ListVarName{CellInfo{icell}.CoordIndex(end)};
    704 %             YName= FieldData.ListVarName{CellInfo{icell}.CoordIndex(end-1)};
     695            %             XName= FieldData.ListVarName{CellInfo{icell}.CoordIndex(end)};
     696            %             YName= FieldData.ListVarName{CellInfo{icell}.CoordIndex(end-1)};
    705697            coord_x=FieldData.(FieldData.ListVarName{CellInfo{icell}.CoordIndex(end)});
    706698            coord_y=FieldData.(FieldData.ListVarName{CellInfo{icell}.CoordIndex(end-1)});
    … …  
    813805        case 'grid'   %case of structured coordinates
    814806            if ~isequal(ObjectData.Type,'line')% exclude polyline
    815                 errormsg=['no  projection available on ' ObjectData.Type 'for structured coordinates']; %
     807                errormsg=['no  projection available on ' ObjectData.Type 'for structured coordinates'];
     808                return
     809            end%
     810            test_interp2=0;%default
     811            AYName=FieldData.ListVarName{CellInfo{icell}.CoordIndex(end-1)};
     812            AXName=FieldData.ListVarName{CellInfo{icell}.CoordIndex(end)};
     813            AX=FieldData.(AXName);% set of x positions
     814            AY=FieldData.(AYName);% set of y positions
     815            AName=FieldData.ListVarName{VarIndex(1)};
     816            npxy=size(FieldData.(AName));
     817            if max(NbDim)==3 % 3D case
     818               
    816819            else
    817                 test_Amat=1;%image or 2D matrix
    818                 test_interp2=0;%default
    819                 AYName=FieldData.ListVarName{CellInfo{icell}.CoordIndex(end-1)};
    820                 AXName=FieldData.ListVarName{CellInfo{icell}.CoordIndex(end)};
    821                 eval(['AX=FieldData.' AXName ';']);% set of x positions
    822                 eval(['AY=FieldData.' AYName ';']);% set of y positions
    823                 AName=FieldData.ListVarName{VarIndex(1)};
    824                 eval(['A=FieldData.' AName ';']);% scalar
    825                 npxy=size(A);
    826820                npx=npxy(2);
    827821                npy=npxy(1);
    … …  
    921915            end
    922916    end
    923     if ~isempty(ivar_U) && ~isempty(ivar_V)
    924         vector_x =ProjData.(ProjData.ListVarName{ivar_U});
    925         ProjData.(ProjData.ListVarName{ivar_U}) =cos(theta)*vector_x+sin(theta)*ProjData.(ProjData.ListVarName{ivar_V});
    926         ProjData.(ProjData.ListVarName{ivar_V}) =-sin(theta)*vector_x+cos(theta)*ProjData.(ProjData.ListVarName{ivar_V});
    927     end
     917end
     918if ~isempty(ivar_U) && ~isempty(ivar_V)
     919    vector_x =ProjData.(ProjData.ListVarName{ivar_U});
     920    ProjData.(ProjData.ListVarName{ivar_U}) =cos(theta)*vector_x+sin(theta)*ProjData.(ProjData.ListVarName{ivar_V});
     921    ProjData.(ProjData.ListVarName{ivar_V}) =-sin(theta)*vector_x+cos(theta)*ProjData.(ProjData.ListVarName{ivar_V});
     922end
    928923end
    929924
    … …  
    961956%     ObjectData.Angle=[0 0 0];
    962957%     ObjectData.Angle(1)=90*Delta_x/Delta_mod;
    963 %     ObjectData.Angle(2)=90*Delta_y/Delta_mod;
     958%     ObjectData.0(2)=90*Delta_y/Delta_mod;
    964959% end   
    965960if isfield(ObjectData,'Angle')&& isequal(size(ObjectData.Angle),[1 2])&& ~isequal(ObjectData.Angle,[0 0])
    966961    test90y=0;%isequal(ObjectData.Angle,[0 90 0]);
    967962    PlaneAngle=(pi/180)*ObjectData.Angle;
    968 %     om=norm(PlaneAngle);%norm of rotation angle in radians
    969 %     OmAxis=PlaneAngle/om; %unit vector marking the rotation axis
    970 %     cos_om=cos(om);
    971 %     sin_om=sin(om);
    972 %     coeff=OmAxis(3)*(1-cos_om);
    973 %     %components of the unity vector norm_plane normal to the projection plane
    974 %     norm_plane(1)=OmAxis(1)*coeff+OmAxis(2)*sin_om;
    975 %     norm_plane(2)=OmAxis(2)*coeff-OmAxis(1)*sin_om;
    976 %     norm_plane(3)=OmAxis(3)*coeff+cos_om;
     963    %     om=norm(PlaneAngle);%norm of rotation angle in radians
     964    %     OmAxis=PlaneAngle/om; %unit vector marking the rotation axis
     965    %     cos_om=cos(om);
     966    %     sin_om=sin(om);
     967    %     coeff=OmAxis(3)*(1-cos_om);
     968    %     %components of the unity vector norm_plane normal to the projection plane
     969    %     norm_plane(1)=OmAxis(1)*coeff+OmAxis(2)*sin_om;
     970    %     norm_plane(2)=OmAxis(2)*coeff-OmAxis(1)*sin_om;
     971    %     norm_plane(3)=OmAxis(3)*coeff+cos_om;
    977972   
    978 M2=[cos(PlaneAngle(2)) sin(PlaneAngle(2)) 0;-sin(PlaneAngle(2)) cos(PlaneAngle(2)) 0;0 0 1];
    979 M1=[1 0 0;0 cos(PlaneAngle(1)) sin(PlaneAngle(1));0 -sin(PlaneAngle(1)) cos(PlaneAngle(1))];
    980 M=M1*M2;
    981 norm_plane=M*[0 0 1]';
     973    M1=[cos(PlaneAngle(1)) sin(PlaneAngle(1)) 0;-sin(PlaneAngle(1)) cos(PlaneAngle(1)) 0;0 0 1];
     974    M2=[1 0 0;0 cos(PlaneAngle(2)) sin(PlaneAngle(2));0 -sin(PlaneAngle(2)) cos(PlaneAngle(2))];
     975    M=M2*M1;% first rotate in the x,y plane with angle PlaneAngle(1), then slant around the new x axis0 with angle PlaneAngle(2)
     976    norm_plane=M*[0 0 1]';
    982977   
    983978end
    … …  
    16481643                    % determine the boundaries of the projected field,
    16491644                    % first find the 8 summits of the initial volume in the
    1650                     Angle=ObjectData.Angle*pi/180;
     1645                    PlaneAngle=ObjectData.Angle*pi/180;
    16511646                    % new coordinates
    16521647                    Coord{1}=FieldData.(FieldData.ListVarName{CellInfo{icell}.CoordIndex(1)});%initial z coordinates
    … …  
    16601655                    %Mrot_inv=rodrigues(-PlaneAngle);
    16611656                    newsummit=zeros(3,8);% initialize the rotated summit coordinates
    1662                     ObjectData.Coord=ObjectData.Coord';
    1663                     if size(ObjectData.Coord,2)<3
     1657                    ObjectData.Coord=ObjectData.Coord';% set ObjectData.Coord as a vertical vector
     1658                    if size(ObjectData.Coord,1)<3
    16641659                    ObjectData.Coord=[ObjectData.Coord; 0];%add z origin at z=0 by default
    16651660                    end
    1666                     M2=[cos(Angle(2)) sin(Angle(2)) 0;-sin(Angle(2)) cos(Angle(2)) 0;0 0 1];
    1667                     M1=[1 0 0;0 cos(Angle(1)) sin(Angle(1));0 -sin(Angle(1)) cos(Angle(1))];
    1668                     M=M1*M2;
     1661               
     1662                    M1=[cos(PlaneAngle(1)) sin(PlaneAngle(1)) 0;-sin(PlaneAngle(1)) cos(PlaneAngle(1)) 0;0 0 1];
     1663                    M2=[1 0 0;0 cos(PlaneAngle(2)) sin(PlaneAngle(2));0 -sin(PlaneAngle(2)) cos(PlaneAngle(2))];
     1664                    M=M2*M1;
    16691665                    M_inv=inv(M);
    16701666                   

  • trunk/src/set_object.m

    r965 r966  
    3838function varargout = set_object(varargin)
    3939
    40 % Last Modified by GUIDE v2.5 16-Jun-2015 00:33:59
     40% Last Modified by GUIDE v2.5 09-Jul-2016 20:25:37
    4141
    4242% Begin initialization code - DO NOT REFRESH
    … …  
    818818
    819819function num_RangeInterp_Callback(hObject, eventdata, handles)
     820
     821
     822% --- Executes on key press with focus on num_Angle_1 and none of its controls.
     823function num_Angle_1_KeyPressFcn(hObject, eventdata, handles)
     824% hObject    handle to num_Angle_1 (see GCBO)
     825% eventdata  structure with the following fields (see MATLAB.UI.CONTROL.UICONTROL)
     826%       Key: name of the key that was pressed, in lower case
     827%       Character: character interpretation of the key(s) that was pressed
     828%       Modifier: name(s) of the modifier key(s) (i.e., control, shift) pressed
     829% handles    structure with handles and user data (see GUIDATA)
     830
     831
     832% --- Executes on key press with focus on num_Angle_2 and none of its controls.
     833function num_Angle_2_KeyPressFcn(hObject, eventdata, handles)
     834% hObject    handle to num_Angle_2 (see GCBO)
     835% eventdata  structure with the following fields (see MATLAB.UI.CONTROL.UICONTROL)
     836%       Key: name of the key that was pressed, in lower case
     837%       Character: character interpretation of the key(s) that was pressed
     838%       Modifier: name(s) of the modifier key(s) (i.e., control, shift) pressed
     839% handles    structure with handles and user data (see GUIDATA)

  • trunk/src/uvmat.m

    r965 r966  
    991991                data.RangeY=UvData.Field.CoordMesh;
    992992            case 'plane_z'
    993                 data.Angle=[90 0];
     993                data.Angle=[0 90];
    994994                data.DX=UvData.Field.CoordMesh;
    995995                data.DY=UvData.Field.CoordMesh;
Note: See TracChangeset for help on using the changeset viewer.