Figures from pictures: added cmap and possibility to have colorbar without borders

Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

zUtil_Imaging/gtMakeFigureFromPicture.m

@@ -8,6 +8,7 @@ function [f, ax] = gtMakeFigureFromPicture(img, mask, varargin)
         'flip_lr', false, ...
         'label', [], ...
         'clims', [], ...
+        'cmap', jet, ...
         'pixel_to_cm', 0.05, ...
         'borders', true, ...
         'colorbar', true, ...
@@ -70,7 +71,7 @@ function [f, ax] = gtMakeFigureFromPicture(img, mask, varargin)
         imagesc(permute(img, [2 1 3]), 'parent', ax, ...
             clims_img );
     end
-    colormap(ax, jet)
+    colormap(ax, conf.cmap)
 
     if (~isempty(conf.extras))
         if (isempty(conf.pixel_size))
@@ -90,12 +91,23 @@ function set_size(f, ax, conf, img)
     set(f, 'Units', 'centimeters')
     img_size = size(img) * conf.pixel_to_cm;
     if (~conf.borders)
-        figure_position = [0, 0, img_size];
+        if (~conf.colorbar)
+            figure_position = [0, 0, img_size];
+        else
+            figure_position = [0, 0, img_size] + [0, 0, 2, 0];
+        end
         set(f, 'Position', figure_position)
         set(f, 'Paperposition', figure_position)
 
-        set(ax, 'Units', 'normalized')
-        set(ax, 'Position', [0, 0, 1, 1])
+        if (conf.colorbar)
+            cb = colorbar('peer', ax, 'location', 'EastOutside');
+            set(cb, 'Units', 'centimeters')
+            position = [img_size(1)+0.35, 0, 0.65, img_size(2)];
+            set(cb, 'Position', position)
+        end
+
+        set(ax, 'Units', 'centimeters')
+        set(ax, 'Position', [0, 0, img_size])
         fprintf('Axes size: [%g, %g] cm\n', figure_position(3:4))
     else
         if (~isempty(conf.label))