Changeset 74


Ignore:
Timestamp:
Mar 31, 2010, 12:39:26 PM (11 years ago)
Author:
sommeria
Message:

rotate_points: used for geometry_calib was forgotten. It is now added
plot_field now does not consider black the vectors with either vec_F=0 or vec_F=1 (vec_F=0 in the 3D3C software instead of vec_F=1)
set_object and uvmat: improvements for projection plane in volume vel data

Location:
trunk/src
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/plot_field.m

    r73 r74  
    998998       colorlist(nbcolor,:)=[0 0 0]; %add black to the list of colors
    999999       if ~isempty(ivar_FF)
    1000             ind_flag=find(vec_F~=1 & vec_FF==0);  %flag warning but not false
     1000            ind_flag=find(vec_F~=1 & vec_F~=0 & vec_FF==0);  %flag warning but not false
    10011001       else
    1002             ind_flag=find(vec_F~=1);
     1002            ind_flag=find(vec_F~=1 & vec_F~=0);
    10031003       end
    10041004       col_vec(ind_flag)=nbcolor;   
  • trunk/src/set_object.m

    r72 r74  
    202202        end
    203203        set(handles.ZMax,'String',num2str(max(data.RangeZ),3))
    204         set(handles.ZMin,'String',num2str(min(data.RangeZ),3))
     204        if numel(data.RangeZ)>=2
     205            set(handles.ZMin,'String',num2str(min(data.RangeZ),3))
     206        end
    205207    end 
    206208    if isfield(data,'Phi')
     
    407409        set(handles.XObject,'TooltipString',['XObject:  x coordinate of the ' ObjectStyle ' centre'])
    408410        set(handles.YObject,'TooltipString',['YObject:  y coordinate of the ' ObjectStyle ' centre'])
    409     case {'plane','volume'} 
     411    case {'plane'} 
     412        set(handles.Phi,'Visible','on')
     413        set(handles.XMin,'Visible','on')
     414        set(handles.XMax,'Visible','on')
     415        set(handles.YMin,'Visible','on')
     416        set(handles.YMax,'Visible','on')
     417        set(handles.XObject,'TooltipString',['XObject:  x coordinate of the axis origin for the ' ObjectStyle])
     418        set(handles.YObject,'TooltipString',['YObject:  y coordinate of the axis origin for the ' ObjectStyle])
     419        set(handles.ZMax,'TooltipString',['ZMax: range of projection normal to the plane'])
     420        if test3D
     421            set(handles.Theta,'Visible','on')
     422            set(handles.Psi,'Visible','on')
     423            set(handles.ZMax,'Visible','on')
     424        end
     425        if isequal(ProjMode,'interp')|| isequal(ProjMode,'filter')
     426            set(handles.DX,'Visible','on')
     427            set(handles.DY,'Visible','on')
     428        else
     429            set(handles.DX,'Visible','off')
     430            set(handles.DY,'Visible','off')
     431        end
     432        if isequal(ObjectStyle,'volume') && isequal(ProjMode,'interp')
     433            set(handles.DZ,'Visible','on') 
     434        end
     435     case {'volume'} 
    410436        set(handles.Phi,'Visible','on')
    411437        set(handles.XMin,'Visible','on')
  • trunk/src/uvmat.m

    r73 r74  
    23362336end
    23372337
    2338 UvData.NewSeries=0;% put to 0 the test for a new field series (set by RootPath_callback)
    23392338% test 3D , default projection menuplane and typical mesh (needed to menuopen set_object)
    23402339test_x=0;
     
    24802479
    24812480%3D case (menuvolume)
    2482 if NbDim==3
     2481if NbDim==3 && UvData.NewSeries
    24832482    UvData.Object{1}.NbDim=UvData.NbDim;%test for 3D objects
    24842483    UvData.Object{1}.RangeZ=UvData.Mesh;%main plotting plane
     
    26142613%display the updated plotting parameters for the base menuplane
    26152614write_plot_param(handles,UvData.Object{1}.PlotParam);% update the display of the plotting parameters
     2615UvData.NewSeries=0;% put to 0 the test for a new field series (set by RootPath_callback)
    26162616set(handles.uvmat,'UserData',UvData)
    26172617
Note: See TracChangeset for help on using the changeset viewer.