add PickValueOrColor tool

Author: dlegland

ImageM/+imagem/+app/ImagemApp.m

@@ -28,10 +28,13 @@
 
     % The size (diameter) of the brush (in pixels).
     BrushSize = 3;
-
+    
     % The value used to draw the brush
     BrushValue = 255;
-
+    
+    % The color used to draw the brush in color images
+    BrushColor = [255 255 255];
+    
     % History of user commands, as a cell array of strings.
     History = cell(0, 1);
 end 

ImageM/+imagem/+gui/FrameMenuBuilder.m

@@ -298,7 +298,8 @@ function buildImageFrameMenu(obj, hf)
 
         addMenuItem(obj, toolsMenu, SelectTool(@Brush),            'Brush');
         addMenuItem(obj, toolsMenu, SelectTool(@FloodFillTool),    'Flood Fill');
-        addMenuItem(obj, toolsMenu, PlotLabelMapCurvesFromTable(), 'Plot Curves From Labels...');
+        addMenuItem(obj, toolsMenu, SelectTool(@PickValueOrColor), 'Pick Current Value/Color');
+        addMenuItem(obj, toolsMenu, PlotLabelMapCurvesFromTable(), 'Plot Curves From Labels...', true);
         action = SelectTool(@PlotImage3DZProfile);
         addMenuItem(obj, toolsMenu, action,  'Plot Image3D Z-Profile');
         action = SelectTool(@PlotVectorImageChannels);

ImageM/+imagem/+tools/Brush.m

@@ -73,10 +73,18 @@ function processCurrentPosition(obj)
 
         if ~isempty(obj.PreviousPoint)
             % mouse moved from a previous position
-            drawBrushLine(obj, coord, obj.PreviousPoint, iz, ic, it);
+            if isScalarImage(img)
+                drawBrushLine(obj, coord, obj.PreviousPoint, iz, ic, it);
+            else
+                drawColorBrushLine(obj, coord, obj.PreviousPoint, iz, it);
+            end
         else
             % respond to mouse button pressed, mouse hasn't moved yet
-            drawBrush(obj, coord, iz, ic, it);
+            if isScalarImage(img)
+                drawBrush(obj, coord, iz, ic, it);
+            else
+                drawColorBrush(obj, coord, iz, it);
+            end
         end
 
         obj.PreviousPoint = coord;
@@ -106,6 +114,15 @@ function drawBrushLine(obj, coord1, coord2, iz, ic, it)
        end
    end
 
+   function drawColorBrushLine(obj, coord1, coord2, iz, it)
+       [x, y] = imagem.tools.Brush.intline(coord1(1), coord1(2), coord2(1), coord2(2));
+       
+       % iterate on current line
+       for i = 1 : length(x)
+           drawColorBrush(obj, [x(i) y(i)], iz, it);
+       end
+   end
+   
    function drawBrush(obj, coord, iz, ic, it)
        doc  = obj.Viewer.Doc;
 
@@ -120,14 +137,37 @@ function drawBrush(obj, coord, iz, ic, it)
        y1 = max(coord(2)-bs1, 1);
        x2 = min(coord(1)+bs2, dim(1));
        y2 = min(coord(2)+bs2, dim(2));
-
+       
        % iterate on brush pixels
        for ix = x1:x2
            for iy = y1:y2
                doc.Image.Data(ix, iy, iz, ic, it) = obj.Viewer.Gui.App.BrushValue;
            end
        end
    end
+   
+   function drawColorBrush(obj, coord, iz, it)
+       doc  = obj.Viewer.Doc;
+       
+       % brush size in each direction
+       bs = obj.Viewer.Gui.App.BrushSize;
+       bs1 = floor((bs-1) / 2);
+       bs2 = ceil((bs-1) / 2);
+       
+       % compute bounds
+       dim = size(doc.Image);
+       x1 = max(coord(1)-bs1, 1);
+       y1 = max(coord(2)-bs1, 1);
+       x2 = min(coord(1)+bs2, dim(1));
+       y2 = min(coord(2)+bs2, dim(2));
+       
+       % iterate on brush pixels
+       for ix = x1:x2
+           for iy = y1:y2
+               doc.Image.Data(ix, iy, iz, :, it) = obj.Viewer.Gui.App.BrushColor;
+           end
+       end
+   end
 end % methods
 
 methods (Static, Access = private)

ImageM/+imagem/+tools/FloodFillTool.m

@@ -67,6 +67,7 @@ function processCurrentPosition(obj)
         res = floodFill(img, coord, obj.Viewer.Gui.App.BrushValue);
         img.Data = res.Data;
 
+        doc.Modified = true;
         updateDisplay(obj.Viewer);
    end
 

ImageM/+imagem/+tools/PickValueOrColor.m

@@ -0,0 +1,75 @@
+classdef PickValueOrColor < imagem.gui.Tool
+% Pick the new value or color for brush or flood-fill.
+%
+%   Class PickValueOrColor
+%
+%   Example
+%   PickValueOrColor
+%
+%   See also
+%
+
+% ------
+% Author: David Legland
+% e-mail: [email protected]
+% Created: 2020-02-11,    using Matlab 9.7.0.1247435 (R2019b) Update 2
+% Copyright 2020 INRAE - BIA-BIBS.
+
+
+%% Properties
+properties
+end % end properties
+
+
+%% Constructor
+methods
+    function obj = PickValueOrColor(parent, varargin)
+        % Constructor for PickValueOrColor class
+        obj = [email protected](parent, 'pickValueOrColor');
+    end
+
+end % end constructors
+
+
+%% Methods
+methods
+    function onMouseButtonPressed(obj, hObject, eventdata) %#ok<INUSD>
+        doc = currentDoc(obj);
+        img = doc.Image;
+        
+        if ~isScalarImage(img)
+            return;
+        end
+        
+        point = get(obj.Viewer.Handles.ImageAxis, 'CurrentPoint');
+        coord = round(pointToIndex(obj, point(1, 1:2)));
+        
+        pos = [num2cell(coord), {1, ':'}];
+        if isa(obj.Viewer, 'Image3DSliceViewer')
+            pos{3} = obj.Viewer.SliceIndex;
+        end
+        
+        if isScalarImage(img)
+            obj.Viewer.Gui.App.BrushValue = img.Data(pos{:});
+        else
+            values = img.Data(pos{:});
+            obj.Viewer.Gui.App.BrushColor = values(:)';
+        end
+        
+    end
+    
+    function index = pointToIndex(obj, point)
+       % Converts coordinates of a point in physical dimension to image index
+       % First element is column index, second element is row index, both are
+       % given in floating point and no rounding is performed.
+       doc = currentDoc(obj);
+       img = doc.Image;
+       spacing = img.Spacing(1:2);
+       origin  = img.Origin(1:2);
+       index   = (point - origin) ./ spacing + 1;
+   end
+
+end % end methods
+
+end % end classdef
+