Changeset 760

Timestamp:

May 1, 2014, 8:26:46 AM (11 years ago)

Author:

sommeria

Message:

various improvements

Location:

trunk/src

Files:

• plot_field.m (modified) (4 diffs)
• series.m (modified) (1 diff)
• uvmat.m (modified) (2 diffs)

trunk/src/plot_field.m

@@ -167 +167 @@
     set(haxes,'YLimMode', 'auto')
 end
+
+if isfield(PlotParamOut.Axes,'CheckFixAspectRatio') && isequal(PlotParamOut.Axes.CheckFixAspectRatio,1)&&isfield(PlotParamOut.Axes,'AspectRatio')
+    set(haxes,'DataAspectRatioMode','manual')
+    set(haxes,'DataAspectRatio',[PlotParamOut.Axes.AspectRatio 1 1])
+else
+    set(haxes,'DataAspectRatioMode','auto')%automatic aspect ratio
+end
+
 errormsg='';
 AxeData=get(haxes,'UserData');
@@ -201 +209 @@
 end
 
+%% aspect ratio
+AspectRatio=get(haxes,'DataAspectRatio');
+PlotParamOut.Axes.AspectRatio=AspectRatio(1)/AspectRatio(2);
+
 %% text display
-
 htext=findobj(hfig,'Tag','TableDisplay');
 hchecktable=findobj(hfig,'Tag','CheckTable');
@@ -552 +563 @@
 
 %% determine plot aspect ratio
-if isfield(Coordinates,'CheckFixAspectRatio') && isequal(Coordinates.CheckFixAspectRatio,1)&&isfield(Coordinates,'AspectRatio')
-    set(haxes,'DataAspectRatioMode','manual')
-    set(haxes,'DataAspectRatio',[Coordinates.AspectRatio 1 1])
-else
-    set(haxes,'DataAspectRatioMode','auto')%automatic aspect ratio
-    AspectRatio=get(haxes,'DataAspectRatio');
-    CoordinatesOut.AspectRatio=AspectRatio(1)/AspectRatio(2);
-end
+% if isfield(Coordinates,'CheckFixAspectRatio') && isequal(Coordinates.CheckFixAspectRatio,1)&&isfield(Coordinates,'AspectRatio')
+%     set(haxes,'DataAspectRatioMode','manual')
+%     set(haxes,'DataAspectRatio',[Coordinates.AspectRatio 1 1])
+% else
+%     set(haxes,'DataAspectRatioMode','auto')%automatic aspect ratio
+%     AspectRatio=get(haxes,'DataAspectRatio');
+%     CoordinatesOut.AspectRatio=AspectRatio(1)/AspectRatio(2);
+% end
 
 %-------------------------------------------------------------------
@@ -1210 +1221 @@
     PlotParamOut.Axes.y_units=y_units;
 end
-if isfield(PlotParam,'Axes') && isfield(PlotParam.Axes,'CheckFixAspectRatio') && isequal(PlotParam.Axes.CheckFixAspectRatio,1)
-    set(haxes,'DataAspectRatioMode','manual')
-    if isfield(PlotParam.Axes,'AspectRatio')
-        set(haxes,'DataAspectRatio',[PlotParam.Axes.AspectRatio 1 1])
-    end
-else
-    set(haxes,'DataAspectRatioMode','auto')
-end
+% if isfield(PlotParam,'Axes') && isfield(PlotParam.Axes,'CheckFixAspectRatio') && isequal(PlotParam.Axes.CheckFixAspectRatio,1)
+%     set(haxes,'DataAspectRatioMode','manual')
+%     if isfield(PlotParam.Axes,'AspectRatio')
+%         set(haxes,'DataAspectRatio',[PlotParam.Axes.AspectRatio 1 1])
+%     end
+% else
+%     set(haxes,'DataAspectRatioMode','auto')
+% end
+
 %-------------------------------------------------------------------
 % --- function for plotting vectors

trunk/src/series.m

@@ -1050 +1050 @@
             end
         end
-                FieldName_Callback([], [], handles)
-       % 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);
-%         hget_field=get_field(FileName);
-%         hhget_field=guidata(hget_field);
-%         get_field('RUN_Callback',hhget_field.RUN,[],hhget_field);
+       % FieldName_Callback([], [], handles)
     otherwise
         set(handles.FieldName,'Value',1) % set menu to 'image'

trunk/src/uvmat.m

@@ -4016 +4016 @@
 %-------------------------------------------------------------------
 set(handles.CheckFixVectors,'Value',1);
-set(handles.CheckFixVectors,'BackgroundColor',[1 1 0])
+%set(handles.CheckFixVectors,'BackgroundColor',[1 1 0])
 update_plot(handles);
 
@@ -4600 +4600 @@
 Data_uvmat=get(handles.uvmat,'UserData');
 evalin('base','global Data_uvmat')%make CurData global in the workspace
-display('current field :')
-evalin('base','Data_uvmat') %display CurData in the workspace
+disp('Data_uvmat.Field=')
+evalin('base','Data_uvmat.Field') %display CurData in the workspace
 commandwindow; %brings the Matlab command window to the front