Changeset 965


Ignore:
Timestamp:
Jul 1, 2016, 7:47:18 PM (5 years ago)
Author:
sommeria
Message:

various

Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/proj_field.m

    r964 r965  
    949949
    950950%% rotation angles
    951 PlaneAngle=[0 0 0];
     951PlaneAngle=[0 0];
    952952norm_plane=[0 0 1];
    953953%cos_om=1;
     
    963963%     ObjectData.Angle(2)=90*Delta_y/Delta_mod;
    964964% end   
    965 if isfield(ObjectData,'Angle')&& isequal(size(ObjectData.Angle),[1 3])&& ~isequal(ObjectData.Angle,[0 0 0])
     965if isfield(ObjectData,'Angle')&& isequal(size(ObjectData.Angle),[1 2])&& ~isequal(ObjectData.Angle,[0 0])
    966966    test90y=0;%isequal(ObjectData.Angle,[0 90 0]);
    967967    PlaneAngle=(pi/180)*ObjectData.Angle;
  • trunk/src/set_object.m

    r964 r965  
    158158    end 
    159159    if ~isfield(data,'Angle')
    160         data.Angle=[0 0 0];
     160        data.Angle=[0 0];
    161161    end
    162162%     if isfield(data,'Angle') && isequal(numel(data.Angle),3)
     
    362362        set(handles.num_Angle_1,'Visible','on')
    363363        set(handles.num_Angle_2,'Visible','on')
    364         set(handles.num_Angle_3,'Visible','on')
     364        %set(handles.num_Angle_3,'Visible','on')
    365365        set(handles.num_RangeZ_1,'Visible','on')
    366366        set(handles.num_RangeZ_2,'Visible','on')
     
    412412PlaneAngle(1)=str2num(get(handles.num_Angle_1,'String'));%first  angle in degrees
    413413PlaneAngle(2)=str2num(get(handles.num_Angle_2,'String'));%second  angle in degrees
    414 PlaneAngle(3)=str2num(get(handles.num_Angle_3,'String'));%second  angle in degrees
     414%PlaneAngle(3)=str2num(get(handles.num_Angle_3,'String'));%second  angle in degrees
    415415om=norm(PlaneAngle);%norm of rotation angle in radians
    416416OmAxis=PlaneAngle/om; %unit vector marking the rotation axis
     
    714714Z_value=get(handles.z_slider,'Value');
    715715%rotation angles
    716 PlaneAngle=[0 0 0];
     716PlaneAngle=[0 0];
    717717norm_plane=[0 0 1];
    718718cos_om=1;
     
    764764
    765765
    766 function num_Angle_3_Callback(hObject, eventdata, handles)
    767 
    768 %------------------------------------------------------------------------
    769 % --- Executes on key press with selection of a uicontrol
    770 %------------------------------------------------------------------------
    771 function KeyPressFcn(hObject, eventdata, handles)
    772 set(handles.REFRESH,'BackgroundColor',[1 0 1])% se REFRESH to magenta color, indicates that refresh needs to be done
    773 if strcmp(get(hObject,'Tag'),'num_Angle_3')
    774     set(handles.num_RangeX_1,'String','')
    775     set(handles.num_RangeX_2,'String','')
    776         set(handles.num_RangeY_1,'String','')
    777     set(handles.num_RangeY_2,'String','')
    778 end
     766% function num_Angle_3_Callback(hObject, eventdata, handles)
     767%
     768% %------------------------------------------------------------------------
     769% % --- Executes on key press with selection of a uicontrol
     770% %------------------------------------------------------------------------
     771% function KeyPressFcn(hObject, eventdata, handles)
     772% set(handles.REFRESH,'BackgroundColor',[1 0 1])% se REFRESH to magenta color, indicates that refresh needs to be done
     773% if strcmp(get(hObject,'Tag'),'num_Angle_3')
     774%     set(handles.num_RangeX_1,'String','')
     775%     set(handles.num_RangeX_2,'String','')
     776%         set(handles.num_RangeY_1,'String','')
     777%     set(handles.num_RangeY_2,'String','')
     778% end
    779779
    780780%------------------------------------------------------------------------
  • trunk/src/uvmat.m

    r962 r965  
    37493749            UvData.ProjObject{1}.RangeZ=UvData.Field.CoordMesh;%main plotting plane
    37503750            UvData.ProjObject{1}.Coord(1,3)=(UvData.Field.ZMin+UvData.Field.ZMax)/2;%section at a middle plane chosen
    3751             UvData.ProjObject{1}.Angle=[0 0 0];
     3751            UvData.ProjObject{1}.Angle=[0 0];
    37523752        elseif isfield(UvData,'Z')
    37533753            %multilevel case (single menuplane in a 3D space)
     
    56615661    end
    56625662    ZBounds=0; % default
     5663    if  ~isfield(UvData,'Field')
     5664        disp('an input field needs to be introduced')
     5665        return
     5666    end
    56635667    if isfield(UvData.Field,'ZMin') && isfield(UvData.Field,'ZMax')
    56645668        ZBounds(1)=UvData.Field.ZMin; %minimum for the Z slider
Note: See TracChangeset for help on using the changeset viewer.