update brush tool

Author: dlegland

ImageM/+imagem/+actions/+image/SetBrushValue.m

@@ -0,0 +1,56 @@
+classdef SetBrushValue < imagem.gui.Action
+% Change the value of the brush.
+%
+%   Class SetBrushValue
+%
+%   Example
+%   SetBrushValue
+%
+%   See also
+%
+
+% ------
+% Author: David Legland
+% e-mail: [email protected]
+% Created: 2020-01-30,    using Matlab 7.9.0.529 (R2009b)
+% Copyright 2011 INRA - Cepia Software Platform.
+
+
+%% Properties
+properties
+end % end properties
+
+
+%% Constructor
+methods
+    function obj = SetBrushValue()
+    end
+
+end % end constructors
+
+
+methods
+    function run(obj, frame) %#ok<INUSL,INUSD>
+        disp('set brush value');
+
+        answer = inputdlg(...
+            'Enter the brush value:', ...
+            'Input Brush size', ...
+            1, {num2str(frame.Gui.App.BrushValue)});
+        
+        if isempty(answer)
+            return;
+        end
+        
+        size = str2double(answer{1});
+        if isnan(size)
+            errordlg('Could not understand brush value');
+        end
+        
+        frame.Gui.App.BrushValue = size;
+    end
+    
+end
+
+end % end classdef
+

ImageM/+imagem/+app/ImagemApp.m

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

ImageM/+imagem/+gui/FrameMenuBuilder.m

@@ -151,8 +151,9 @@ function buildImageFrameMenu(obj, hf)
 
 
         settingsMenu = addMenu(obj, imageMenu, 'Settings', 'Separator', 'on');
-        addMenuItem(obj, settingsMenu, SetDefaultConnectivity(), 'Set Connectivity');
         addMenuItem(obj, settingsMenu, SetBrushSize(),           'Set Brush Size');
+        addMenuItem(obj, settingsMenu, SetBrushValue(),           'Set Brush Value');
+        addMenuItem(obj, settingsMenu, SetDefaultConnectivity(), 'Set Connectivity', 'Separator', 'on');
 
 
         % View Menu Definition

ImageM/+imagem/+tools/Brush.m

@@ -11,16 +11,16 @@
 
 % ------
 % Author: David Legland
-% e-mail: david.legland@inra.fr
+% e-mail: david.legland@inrae.fr
 % Created: 2011-11-21,    using Matlab 7.9.0.529 (R2009b)
 % Copyright 2011 INRA - Cepia Software Platform.
 
 %% Properties
 properties
     ButtonPressed = false;
 
-    % the current drawing 'color', initialized to white
-    Color = 255;
+%     % The current drawing 'value', initialized to white
+%     Value = 255;
 
     PreviousPoint;
 end
@@ -56,11 +56,7 @@ function onMouseMoved(obj, hObject, eventdata) %#ok<INUSD>
    function processCurrentPosition(obj)
         doc = obj.Viewer.Doc;
         img = doc.Image;
-        
-        if ~isGrayscaleImage(img)
-            return;
-        end
-        
+                
         point = get(obj.Viewer.Handles.ImageAxis, 'CurrentPoint');
         coord = round(pointToIndex(obj, point(1, 1:2)));
 
@@ -69,13 +65,21 @@ function processCurrentPosition(obj)
         if any(coord < 1) || any(coord > dim([1 2]))
             return;
         end
+        
+        % indices of Z, C and T dimensions
+        iz = 1;
+        if isa(obj.Viewer, 'imagem.gui.Image3DSliceViewer')
+            iz = obj.Viewer.SliceIndex;
+        end
+        ic = 1:channelNumber(img);
+        it = 1; % not managed for the moment
 
         if ~isempty(obj.PreviousPoint)
             % mouse moved from a previous position
-            drawBrushLine(obj, coord, obj.PreviousPoint);
+            drawBrushLine(obj, coord, obj.PreviousPoint, iz, ic, it);
         else
             % respond to mouse button pressed, mouse hasn't moved yet
-            drawBrush(obj, coord);
+            drawBrush(obj, coord, iz, ic, it);
         end
 
         obj.PreviousPoint = coord;
@@ -96,16 +100,16 @@ function processCurrentPosition(obj)
        index   = (point - origin) ./ spacing + 1;
    end
 
-   function drawBrushLine(obj, coord1, coord2)
+   function drawBrushLine(obj, coord1, coord2, iz, ic, it)
        [x, y] = imagem.tools.Brush.intline(coord1(1), coord1(2), coord2(1), coord2(2));
 
        % iterate on current line
        for i = 1 : length(x)
-           drawBrush(obj, [x(i) y(i)]);
+           drawBrush(obj, [x(i) y(i)], iz, ic, it);
        end
    end
 
-   function drawBrush(obj, coord)
+   function drawBrush(obj, coord, iz, ic, it)
        doc  = obj.Viewer.Doc;
 
        % brush size in each direction
@@ -119,25 +123,26 @@ function drawBrush(obj, coord)
        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 i = x1:x2
-           for j = y1:y2
-               doc.Image(i, j) = obj.Color;
+       for ix = x1:x2
+           for iy = y1:y2
+               doc.Image.Data(ix, iy, iz, ic, it) = obj.Viewer.Gui.App.BrushValue;
            end
        end
    end
 end % methods
 
 methods (Static, Access = private)
     function [x, y] = intline(x1, y1, x2, y2)
-        %INTLINE Integer-coordinate line drawing algorithm.
-        %   [X, Y] = INTLINE(X1, X2, Y1, Y2) computes an
+        % Integer-coordinate line drawing algorithm.
+        %
+        %   [X, Y] = intline(X1, X2, Y1, Y2) computes an
         %   approximation to the line segment joining (X1, Y1) and
         %   (X2, Y2) with integer coordinates.  X1, X2, Y1, and Y2
-        %   should be integers.  INTLINE is reversible; that is,
-        %   INTLINE(X1, X2, Y1, Y2) produces the same results as
-        %   FLIPUD(INTLINE(X2, X1, Y2, Y1)).
+        %   should be integers.  intline is reversible; that is,
+        %   intline(X1, X2, Y1, Y2) produces the same results as
+        %   FLIPUD(intline(X2, X1, Y2, Y1)).
         %
         %   Function adapted from the 'strel' function of matlab.
         %
@@ -190,7 +195,7 @@ function drawBrush(obj, coord)
 methods
     function b = isActivable(obj)
         doc = obj.Viewer.Doc;
-        b = ~isempty(doc) && ~isempty(doc.Image) && isScalarImage(doc.Image);
+        b = ~isempty(doc) && ~isempty(doc.Image);
     end
 end