Changeset 13975 for issm/trunk/src/m/plot/applyoptions.m

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/plot/applyoptions.m (modified) (8 diffs)

issm/trunk/src/m/plot/applyoptions.m

@@ -6 +6 @@
 %
 %   See also: PLOTMODEL, PARSE_OPTIONS
-                
 
 %some defaults
@@ -147 +146 @@
         end
         if exist(options,'log'),
-                nlab=5;
+                nlab=length(get(c,'YTick'));
                 logvalue=getfieldvalue(options,'log');
 
@@ -176 +175 @@
         if exist(options,'colorbarYLabel'),
                 set(get(c,'Ylabel'),'FontSize',getfieldvalue(options,'colorbarfontsize',fontsize),'String',getfieldvalue(options,'colorbarYLabel'),...
-                        'Color',getfieldvalue(options,'FontColor','k'),'Interpreter',getfieldvalue(options,'Interpreter','none'));
+                        'Color',getfieldvalue(options,'FontColor','k'));
         end
         if exist(options,'colorbarwidth'),
@@ -215 +214 @@
                         end
                 end
-                labels = cell(1,size(tick_vals,1));
-                for i = 1:size(tick_vals,1)
-                        labels{i} = sprintf('%-3.4g',round_ice(tick_vals(i),2));
+                labels = cell(1,numel(tick_vals));
+                for i = 1:numel(tick_vals)
+                        labels{i} = num2str(tick_vals(i));
                 end
                 set(c,'YTickLabel',labels);
@@ -226 +225 @@
 else
         %do nothing
-        
-end
-
+
+end
 
 %area
@@ -269 +267 @@
 end
 
+%curved arrow
+if exist(options,'curvedarrow'),
+        curvedoptions=getfieldvalue(options,'curvedarrow');
+        curvedarrow(curvedoptions{:});
+end
+
 %Scale ruler
 if exist(options,'scaleruler'),
@@ -320 +324 @@
 end
 
-
 %position of figure
 if exist(options,'figposition'),
-        
+
         figposition=getfieldvalue(options,'figposition');
         if ischar(figposition),
@@ -430 +433 @@
         data=getfieldvalue(options,'scatter');
         hold on
-        plot_scatter(data(:,1),data(:,2),getfieldvalue(options,'scattersize',3),data(:,3),options);
+        plot_scatter(data(:,1),data(:,2),data(:,3),options);
 end