Changeset 760 for trunk


Ignore:
Timestamp:
May 1, 2014, 8:26:46 AM (7 years ago)
Author:
sommeria
Message:

various improvements

Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/plot_field.m

    r749 r760  
    167167    set(haxes,'YLimMode', 'auto')
    168168end
     169
     170if isfield(PlotParamOut.Axes,'CheckFixAspectRatio') && isequal(PlotParamOut.Axes.CheckFixAspectRatio,1)&&isfield(PlotParamOut.Axes,'AspectRatio')
     171    set(haxes,'DataAspectRatioMode','manual')
     172    set(haxes,'DataAspectRatio',[PlotParamOut.Axes.AspectRatio 1 1])
     173else
     174    set(haxes,'DataAspectRatioMode','auto')%automatic aspect ratio
     175end
     176
    169177errormsg='';
    170178AxeData=get(haxes,'UserData');
     
    201209end
    202210
     211%% aspect ratio
     212AspectRatio=get(haxes,'DataAspectRatio');
     213PlotParamOut.Axes.AspectRatio=AspectRatio(1)/AspectRatio(2);
     214
    203215%% text display
    204 
    205216htext=findobj(hfig,'Tag','TableDisplay');
    206217hchecktable=findobj(hfig,'Tag','CheckTable');
     
    552563
    553564%% determine plot aspect ratio
    554 if isfield(Coordinates,'CheckFixAspectRatio') && isequal(Coordinates.CheckFixAspectRatio,1)&&isfield(Coordinates,'AspectRatio')
    555     set(haxes,'DataAspectRatioMode','manual')
    556     set(haxes,'DataAspectRatio',[Coordinates.AspectRatio 1 1])
    557 else
    558     set(haxes,'DataAspectRatioMode','auto')%automatic aspect ratio
    559     AspectRatio=get(haxes,'DataAspectRatio');
    560     CoordinatesOut.AspectRatio=AspectRatio(1)/AspectRatio(2);
    561 end
     565% if isfield(Coordinates,'CheckFixAspectRatio') && isequal(Coordinates.CheckFixAspectRatio,1)&&isfield(Coordinates,'AspectRatio')
     566%     set(haxes,'DataAspectRatioMode','manual')
     567%     set(haxes,'DataAspectRatio',[Coordinates.AspectRatio 1 1])
     568% else
     569%     set(haxes,'DataAspectRatioMode','auto')%automatic aspect ratio
     570%     AspectRatio=get(haxes,'DataAspectRatio');
     571%     CoordinatesOut.AspectRatio=AspectRatio(1)/AspectRatio(2);
     572% end
    562573
    563574%-------------------------------------------------------------------
     
    12101221    PlotParamOut.Axes.y_units=y_units;
    12111222end
    1212 if isfield(PlotParam,'Axes') && isfield(PlotParam.Axes,'CheckFixAspectRatio') && isequal(PlotParam.Axes.CheckFixAspectRatio,1)
    1213     set(haxes,'DataAspectRatioMode','manual')
    1214     if isfield(PlotParam.Axes,'AspectRatio')
    1215         set(haxes,'DataAspectRatio',[PlotParam.Axes.AspectRatio 1 1])
    1216     end
    1217 else
    1218     set(haxes,'DataAspectRatioMode','auto')
    1219 end
     1223% if isfield(PlotParam,'Axes') && isfield(PlotParam.Axes,'CheckFixAspectRatio') && isequal(PlotParam.Axes.CheckFixAspectRatio,1)
     1224%     set(haxes,'DataAspectRatioMode','manual')
     1225%     if isfield(PlotParam.Axes,'AspectRatio')
     1226%         set(haxes,'DataAspectRatio',[PlotParam.Axes.AspectRatio 1 1])
     1227%     end
     1228% else
     1229%     set(haxes,'DataAspectRatioMode','auto')
     1230% end
     1231
    12201232%-------------------------------------------------------------------
    12211233% --- function for plotting vectors
  • trunk/src/series.m

    r757 r760  
    10501050            end
    10511051        end
    1052                 FieldName_Callback([], [], handles)
    1053        % FileName=fullfile_uvmat(InputTable{iview,1},InputTable{iview,2},InputTable{iview,3},InputTable{iview,5},InputTable{iview,4},i1_series(1,ref_j+1,ref_i+1),i2,j1,j2);
    1054 %         hget_field=get_field(FileName);
    1055 %         hhget_field=guidata(hget_field);
    1056 %         get_field('RUN_Callback',hhget_field.RUN,[],hhget_field);
     1052       % FieldName_Callback([], [], handles)
    10571053    otherwise
    10581054        set(handles.FieldName,'Value',1) % set menu to 'image'
  • trunk/src/uvmat.m

    r752 r760  
    40164016%-------------------------------------------------------------------
    40174017set(handles.CheckFixVectors,'Value',1);
    4018 set(handles.CheckFixVectors,'BackgroundColor',[1 1 0])
     4018%set(handles.CheckFixVectors,'BackgroundColor',[1 1 0])
    40194019update_plot(handles);
    40204020
     
    46004600Data_uvmat=get(handles.uvmat,'UserData');
    46014601evalin('base','global Data_uvmat')%make CurData global in the workspace
    4602 display('current field :')
    4603 evalin('base','Data_uvmat') %display CurData in the workspace
     4602disp('Data_uvmat.Field=')
     4603evalin('base','Data_uvmat.Field') %display CurData in the workspace
    46044604commandwindow; %brings the Matlab command window to the front
    46054605
Note: See TracChangeset for help on using the changeset viewer.