Update Image math operations

Author: dlegland

ImageM/+imagem/+actions/+analyze/AverageValueByRegion.m

@@ -100,7 +100,9 @@ function run(obj, frame) %#ok<INUSL>
         end
 
         % create first axis
-        res.Axes{1} = table.axis.NumericalAxis('Label', labels(:)');
+        if isprop(res, 'Axes')
+            res.Axes{1} = table.axis.NumericalAxis('Label', labels(:)');
+        end
         res.Name = [intensityImage.Name '-AverageValues'];
 
         % display in a new table

ImageM/+imagem/+actions/+process/ImageMathematic.m

@@ -21,7 +21,7 @@
     Handles;
     Viewer;
 
-    OpList = {@plus, @minus, @times, @rdivide, @power, @min, @max};
+    OpList = {@plus, @minus, @mtimes, @mrdivide, @mpower, @min, @max};
     OpNames = {'Plus', 'Minus', 'Times', 'Divides', 'power', 'min', 'max'};
 
 end % end properties

ImageM/+imagem/+actions/+process/ImageValuesTransform.m

@@ -21,8 +21,11 @@
     Handles;
     Viewer;
 
-    OpList = {@log, @exp, @sqrt, @sin, @cos, @tan};
-    OpNames = {'log', 'exp', 'sqrt', 'sin', 'cos', 'tan'};
+    % the list of math operation to apply, as function handles
+    OpList = {@log, @exp, @sqrt, @sin, @cos, @tan, @round, @floor, @ceil};
+    
+    % the list of math operation names, to populate widgets
+    OpNames = {'log', 'exp', 'sqrt', 'sin', 'cos', 'tan', 'round', 'floor', 'ceil'};
 
 end % end properties
 
@@ -103,15 +106,18 @@ function onButtonOK(obj, varargin)
         op = obj.OpList{opIndex};
         opName = char(op);
 
+        % compute result data
+        data2 = op(doc.Image.Data);
+        
         % compute result image
-        res = op(doc.Image);
+        res = Image('Data', data2, 'Parent', doc.Image);
 
         % add image to application, and create new display
         newDoc = addImageDocument(obj.Viewer, res);
 
         % add history
-        string = sprintf('%s = %s(%s));\n', ...
-            newDoc.Tag, opName, doc.Tag);
+        string = sprintf('%s = Image(''Data'', %s(%s.Data), ''Parent'', %s);\n', ...
+            newDoc.Tag, opName, doc.Tag, doc.Tag);
         addToHistory(obj.Viewer, string);
 
         closeFigure(obj);

ImageM/+imagem/+gui/FrameMenuBuilder.m

@@ -287,9 +287,9 @@ function buildImageFrameMenu(obj, hf)
         addMenuItem(obj, processMenu, imagem.actions.process.ImageWatershed(),      'Watershed...');
         addMenuItem(obj, processMenu, imagem.actions.process.ImageExtendedMinWatershed(),  'Extended Min Watershed...');
 
-        addMenuItem(obj, processMenu, imagem.actions.process.ImageArithmetic(),     'Image Arithmetic...', true);
-        addMenuItem(obj, processMenu, imagem.actions.process.ImageValuesTransform(), 'Image Maths 1...');
-        addMenuItem(obj, processMenu, imagem.actions.process.ImageMathematic(),     'Image Maths 2...');
+        addMenuItem(obj, processMenu, imagem.actions.process.ImageValuesTransform(), 'Image Values Transform...', true);
+        addMenuItem(obj, processMenu, imagem.actions.process.ImageMathematic(),     'Image Maths (Image+Value)...');
+        addMenuItem(obj, processMenu, imagem.actions.process.ImageArithmetic(),     'Image Maths (Image+Image)...');
 
         binaryMenu = addMenu(obj, processMenu, 'Binary / Label Images', 'Separator', 'On');
         addMenuItem(obj, binaryMenu, imagem.actions.process.binary.ConnectedComponentsLabeling(),  'Connected Components Labeling');