Skip to content
Snippets Groups Projects
Commit dd3f2e73 authored by Nicola Vigano's avatar Nicola Vigano
Browse files

Small GUI/figures improvements

parent 07c4cf21
No related branches found
No related tags found
No related merge requests found
...@@ -161,7 +161,7 @@ classdef GtBaseGuiElem < handle ...@@ -161,7 +161,7 @@ classdef GtBaseGuiElem < handle
end end
function delUICallbacks(obj) function delUICallbacks(obj)
for n = 1:length(obj.ui_callbacks) for n = 1:numel(obj.ui_callbacks)
cb = obj.ui_callbacks{n}; cb = obj.ui_callbacks{n};
set(cb{1}, cb{2}, ''); set(cb{1}, cb{2}, '');
end end
......
...@@ -17,7 +17,7 @@ classdef GtPixelInfoVal < handle ...@@ -17,7 +17,7 @@ classdef GtPixelInfoVal < handle
end end
methods (Access = public) methods (Access = public)
function obj = GtPixelInfoVal(parent, image_handler, pointCbk, pattern) function obj = GtPixelInfoVal(parent, image_handler, pointCbk, pattern, empty_pattern)
obj.parent = parent; obj.parent = parent;
obj.img_h = image_handler; obj.img_h = image_handler;
obj.frame_h = gtGetParentFigure(parent); obj.frame_h = gtGetParentFigure(parent);
...@@ -25,9 +25,12 @@ classdef GtPixelInfoVal < handle ...@@ -25,9 +25,12 @@ classdef GtPixelInfoVal < handle
obj.pointerCbk = pointCbk; obj.pointerCbk = pointCbk;
if (exist('pattern', 'var')) if (exist('pattern', 'var') && ~isempty(pattern))
obj.string_pattern = pattern; obj.string_pattern = pattern;
end end
if (exist('empty_pattern', 'var') && ~isempty(empty_pattern))
obj.string_empty = empty_pattern;
end
obj.conf = []; obj.conf = [];
obj.conf.box_h = uicontrol('parent', obj.parent, ... obj.conf.box_h = uicontrol('parent', obj.parent, ...
...@@ -74,12 +77,16 @@ classdef GtPixelInfoVal < handle ...@@ -74,12 +77,16 @@ classdef GtPixelInfoVal < handle
function clipString = getString(obj) function clipString = getString(obj)
clipString = get(obj.conf.box_h, 'String'); clipString = get(obj.conf.box_h, 'String');
end end
function pattern = getPattern(obj)
pattern = obj.string_pattern;
end
end end
methods (Access = protected) methods (Access = protected)
function displayString(obj, point, value) function displayString(obj, point, value)
set(obj.conf.box_h, 'String', sprintf(obj.string_pattern, point, value)); set(obj.conf.box_h, 'String', sprintf(obj.string_pattern, [point, value]));
end end
function displayDefaultString(obj) function displayDefaultString(obj)
......
function gtFigureAddExtras(ax, im_props, extras) function gtFigureAddExtras(ax, im_props, extras)
% function gtFigureAddExtras(ax, im_props, extras)
num_extras = numel(extras); num_extras = numel(extras);
for ii_ex = 1:num_extras for ii_ex = 1:num_extras
......
function gtMakeFigureFromPicture(img, mask, varargin) function [f, ax] = gtMakeFigureFromPicture(img, mask, varargin)
conf = struct( ... conf = struct( ...
'filename', '', ... 'filename', '', ...
...@@ -13,9 +13,13 @@ function gtMakeFigureFromPicture(img, mask, varargin) ...@@ -13,9 +13,13 @@ function gtMakeFigureFromPicture(img, mask, varargin)
'colorbar', true, ... 'colorbar', true, ...
'pixel_size', [], ... 'pixel_size', [], ...
'extras', [] ); 'extras', [] );
conf = parse_pv_pairs(conf, varargin); [conf, rej_conf] = parse_pv_pairs(conf, varargin);
if (~isempty(rej_conf))
disp('Unknown parameters:')
disp(rej_conf{:})
end
use_mask = ~isempty(mask); use_mask = exist('mask', 'var') && ~isempty(mask);
if (~use_mask) if (~use_mask)
mask = true(size(img, 1), size(img, 2)); mask = true(size(img, 1), size(img, 2));
end end
...@@ -129,5 +133,6 @@ function set_size(f, ax, conf, img) ...@@ -129,5 +133,6 @@ function set_size(f, ax, conf, img)
fprintf('Axes size: [%g, %g] cm\n', axes_position(3:4)) fprintf('Axes size: [%g, %g] cm\n', axes_position(3:4))
end end
box(ax, 'Off') box(ax, 'Off')
% set(ax, 'FontSize', 16)
fprintf('Figure size: [%g, %g] cm\n', figure_position(3:4)) fprintf('Figure size: [%g, %g] cm\n', figure_position(3:4))
end end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment