Changeset 206 for trunk/src/set_object.m


Ignore:
Timestamp:
Feb 27, 2011, 10:40:29 PM (10 years ago)
Author:
sommeria
Message:

bug fixes to deal with volumes, storage of ACTION menu in series fixed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/set_object.m

    r204 r206  
    8080
    8181%default
    82 if ~exist('ZBound','var')
    83     ZBound=0; %default
     82if ~exist('ZBounds','var')
     83    ZBounds=0; %default
    8484end
    8585set(hObject,'KeyPressFcn',{'keyboard_callback',handles})%set keyboard action function (allow action on uvmat when set_object is in front)
     
    177177        set(handles.ZMax,'String',num2str(max(data.RangeZ),3))
    178178        DZ=max(data.RangeZ);%slider step
    179         if ZBounds(2)~=ZBounds(1)
     179        if ~isnan(ZBounds(1)) && ZBounds(2)~=ZBounds(1)
    180180            rel_step(1)=min(DZ/(ZBounds(2)-ZBounds(1)),0.2);%must be smaller than 1
    181181            rel_step(2)=0.1;
     
    422422            set(handles.DY,'Visible','off')
    423423        end
    424         if isequal(ObjectStyle,'volume') && isequal(ProjMode,'interp')
     424        if isequal(ProjMode,'interp')
    425425            set(handles.DZ,'Visible','on') 
    426426        end
     
    433433        set(handles.XObject,'TooltipString',['XObject:  x coordinate of the axis origin for the ' ObjectStyle])
    434434        set(handles.YObject,'TooltipString',['YObject:  y coordinate of the axis origin for the ' ObjectStyle])
    435         if test3D
     435%         if test3D
    436436            set(handles.Theta,'Visible','on')
    437437            set(handles.Psi,'Visible','on')
    438438            set(handles.ZMin,'Visible','on')
    439439            set(handles.ZMax,'Visible','on')
    440         end
     440%         end
    441441        if isequal(ProjMode,'interp')|| isequal(ProjMode,'filter')
    442442            set(handles.DX,'Visible','on')
    443443            set(handles.DY,'Visible','on')
     444            set(handles.DZ,'Visible','on')
    444445        else
    445446            set(handles.DX,'Visible','off')
    446447            set(handles.DY,'Visible','off')
    447         end
    448         if isequal(ObjectStyle,'volume') && isequal(ProjMode,'interp')
    449             set(handles.DZ,'Visible','on') 
     448            set(handles.DZ,'Visible','off')
    450449        end
    451450end
     
    775774
    776775%% plot the field projected on the object and store in the corresponding figue
    777 ProjData= proj_field(UvData.Field,ObjectData);%project the current interface field on ObjectData
     776'TESTproj'
     777ProjData= proj_field(UvData.Field,ObjectData)%project the current interface field on ObjectData
    778778PlotParam=read_plot_param(PlotHandles);
    779779[PlotType,Object_out{IndexObj}.PlotParam,plotaxes]=plot_field(ProjData,plotaxes,PlotParam);%update an existing field plot
Note: See TracChangeset for help on using the changeset viewer.