Fix: afigure with new figure as a parameter.

aplot and abar set the style of an already existing figure.

Author: Dorian Galvez-Lopez

abar.m

@@ -6,13 +6,8 @@
 %
 %    See also afigure, aconfig, aplot
 function handles = abar(varargin)
-  if isempty(findobj('type', 'figure'))
-    afigure;
-  end
-  
+  afigure(gcf);
   hnds = bar(varargin{:});
-  
   if nargout > 0
     handles = hnds;
   end
-  

afigure.m

@@ -20,65 +20,45 @@
 function handle = afigure(h, config)
   if nargin == 0
     h = figure;
-    config = aconfig;
+    config = [];
   elseif nargin == 1
-    if ishandle(h)
-      h = figure(h);
-      config = aconfig;
-    else
+    if isstruct(h)
       config = h;
       h = figure;
+    else
+      figure(h);
+      config = [];
     end
   else
-    if ishandle(h)
-      figure(h);
-    else
+    if isstruct(h)
       h2 = config;
       config = h;
       h = figure(h2);
+    else
+      figure(h);
     end
   end
 
   if nargout > 1
     handle = h;
   end
 
-  apply_config(h, config);
+  if ~isempty(config)
+    colors = getColors(config.Colormap);
+    guidata(h, config);
+    apply_config_fig(h, config, colors);
+  elseif isempty(guidata(h))
+    config = aconfig;
+    colors = getColors(config.Colormap);
+    guidata(h, config);
+    apply_config_fig(h, config, colors);
+  end
 
 
-function apply_config(h, config)
-  
-  % Original authors of colormaps:
-  % http://www.mathworks.com/matlabcentral/fileexchange/2662
-  % http://www.mathworks.com/matlabcentral/fileexchange/41583
-  colors = [];
-  if ischar(config.Colormap)
-    while isempty(colors)
-      switch config.Colormap
-        case 'thermal' 
-          colors = [ 0 0 0; 0.3 0 0.7; 1 0.2 0; 0.9 0.9 0 ];
-        case 'cmr'
-          colors = [ 0 0 0; 1 0.25 0.15; 0.9 0.5 0; 0.9 0.75 0.1; ...
-                     0.85 0.85 0.5 ];
-        case 'dusk'
-          colors = [ 0 0 0; 0 0 0.5; 0 0.5 0.5; 0.5 0.5 0.5; 1 0.5 0.5; ...
-                     1 1 0.5 ];
-        case 'hsv2'
-          colors = [ 0 0 0; 0.5 0 0.5; 0 0 0.9; 0 1 1; 0 1 0; 1 1 0; 1 0 0 ];
-        case 'gray'
-          colors = [ 0 0 0; 0.4 0.4 0.4; 0.65 0.65 0.65; 0.8 0.8 0.8 ];
-        otherwise
-          warning('AcademicFigures:colormap', ...
-            'Unknown colormap: %s', config.Colormap);
-          config.Colormap = 'cmr';
-      end
-    end
-  else
-    colors = config.Colormap;
-  end
+function apply_config_fig(h, config, colors)
 
   set(h, 'Color', config.BackgroundColor);
-  set(h, 'Colormap', colors);
+  set(h, 'Colormap', getColors(config.Colormap));
   set(h, 'DefaultAxesColorOrder', colors);
   set(h, 'DefaultAxesLineStyleOrder', config.LineStyles);
   set(h, 'DefaultAxesFontSize', config.FontSize);
@@ -115,3 +95,64 @@ function apply_config(h, config)
   elseif ~isempty(config.SizeRatio)
     set(h, 'Position', [p(1:3), p(3) / config.SizeRatio]);
   end
+  
+  ha = get(h, 'CurrentAxes');
+  if ~isempty(ha)
+    apply_config_axis(ha, config, colors);
+  end
+  
+function apply_config_axis(h, config, colors)
+  
+  hh = [h; get(h, 'XLabel'); get(h, 'YLabel'); get(h, 'ZLabel'); ...
+    get(h, 'Title')];
+  set(hh, 'FontSize', config.FontSize);
+  
+  set(h, 'ColorOrder', getColors(config.Colormap));
+  set(h, 'LineStyleOrder', config.LineStyles);
+  set(h, 'FontSize', config.FontSize);
+
+  if config.DrawBox
+    set(h, 'Box', 'on');
+  else
+    set(h, 'Box', 'off');
+  end
+  
+  if config.Grid
+    set(h, 'XGrid', 'on', 'YGrid', 'on', 'ZGrid', 'on');
+  else
+    set(h, 'XGrid', 'off', 'YGrid', 'off', 'ZGrid', 'off');
+  end
+  
+  if config.RemoveMargins
+    set(h, 'LooseInset', [0 0 0 0]);
+  end
+
+function colors = getColors(colormap)
+  % Original authors of colormaps:
+  % http://www.mathworks.com/matlabcentral/fileexchange/2662
+  % http://www.mathworks.com/matlabcentral/fileexchange/41583
+  colors = [];
+  if ischar(colormap)
+    while isempty(colors)
+      switch colormap
+        case 'thermal' 
+          colors = [ 0 0 0; 0.3 0 0.7; 1 0.2 0; 0.9 0.9 0 ];
+        case 'cmr'
+          colors = [ 0 0 0; 1 0.25 0.15; 0.9 0.5 0; 0.9 0.75 0.1; ...
+                     0.85 0.85 0.5 ];
+        case 'dusk'
+          colors = [ 0 0 0; 0 0 0.5; 0 0.5 0.5; 0.5 0.5 0.5; 1 0.5 0.5; ...
+                     1 1 0.5 ];
+        case 'hsv2'
+          colors = [ 0 0 0; 0.5 0 0.5; 0 0 0.9; 0 1 1; 0 1 0; 1 1 0; 1 0 0 ];
+        case 'gray'
+          colors = [ 0 0 0; 0.4 0.4 0.4; 0.65 0.65 0.65; 0.8 0.8 0.8 ];
+        otherwise
+          warning('AcademicFigures:colormap', ...
+            'Unknown colormap: %s', colormap);
+          colormap = 'cmr';
+      end
+    end
+  else
+    colors = colormap;
+  end

aplot.m

@@ -6,12 +6,8 @@
 %
 %    See also afigure, aconfig, abar
 function handles = aplot(varargin)
-  if isempty(findobj('type', 'figure'))
-    afigure;
-  end
-  
+  afigure(gcf);
   hnds = plot(varargin{:});
-  
   if nargout > 0
     handles = hnds;
   end