update conversion between vector images and 3D images

Author: dlegland

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

@@ -7,11 +7,11 @@
 %   ConvertImage3DToVectorImage
 %
 %   See also
-%
+%     ConvertVectorImageToImage3D
 
 % ------
 % Author: David Legland
-% e-mail: david.legland@inra.fr
+% e-mail: david.legland@inrae.fr
 % Created: 2019-11-15,    using Matlab 9.7.0.1190202 (R2019b)
 % Copyright 2019 INRA - BIA-BIBS.
 
@@ -24,7 +24,7 @@
 %% Constructor
 methods
     function obj = ConvertImage3DToVectorImage(varargin)
-    % Constructor for ConvertImage3DToVectorImage class
+    % Constructor for ConvertImage3DToVectorImage class.
 
     end
 
@@ -39,13 +39,13 @@ function run(obj, frame) %#ok<INUSL,INUSD>
         doc = currentDoc(frame);
 
         % apply the conversion operation
-        res = Image('Data', doc.Image.Data, 'vector', true);
+        res = permute(doc.Image, [1 2 4 3 5]);
 
         % create a new doc
         newDoc = addImageDocument(frame, res);
 
         % add history
-        string = sprintf('%s = Image(''Data'', %s.Data, ''vector'', true);\n', ...
+        string = sprintf('%s = permute(%s, [1 2 4 3 5]);\n', ...
             newDoc.Tag, doc.Tag);
         addToHistory(frame, string);
     end

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

@@ -7,11 +7,11 @@
 %   ConvertVectorImageToImage3D
 %
 %   See also
-%
+%     ConvertImage3DToVectorImage
 
 % ------
 % Author: David Legland
-% e-mail: david.legland@inra.fr
+% e-mail: david.legland@inrae.fr
 % Created: 2019-11-15,    using Matlab 9.7.0.1190202 (R2019b)
 % Copyright 2019 INRA - BIA-BIBS.
 
@@ -39,13 +39,13 @@ function run(obj, frame) %#ok<INUSL,INUSD>
         doc = currentDoc(frame);
 
         % apply the conversion operation
-        res = Image('Data', permute(doc.Image.Data, [1 2 4 3 5]));
+        res = permute(doc.Image, [1 2 4 3 5]);
 
         % create a new doc
         newDoc = addImageDocument(frame, res);
 
         % add history
-        string = sprintf('%s = Image(permute(%s.Data, [1 2 4 3 5]);\n', ...
+        string = sprintf('%s = permute(%s, [1 2 4 3 5]);\n', ...
             newDoc.Tag, doc.Tag);
         addToHistory(frame, string);
     end

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

@@ -68,10 +68,18 @@ function run(obj, frame) %#ok<INUSL,INUSD>
 
         if ~isempty(img.ChannelNames)
             fprintf('  Channel Names: {''%s''', img.ChannelNames{1});
-            for i = 2:channelNumber(img)
-                fprintf(',''%s''', img.ChannelNames{i});
+            nc = channelCount(img);
+            if nc > 10
+                for i = 2:10
+                    fprintf(', ''%s''', img.ChannelNames{i});
+                end
+                fprintf('... (%d more)}\n', nc-10);
+            else
+                for i = 2:nc
+                    fprintf(', ''%s''', img.ChannelNames{i});
+                end
+                fprintf('}\n');
             end
-            fprintf('}\n');
         else
             fprintf('  Channel Names: {}\n');
         end

ImageM/+imagem/+gui/Image3DSliceViewer.m

@@ -248,7 +248,7 @@ function updateDisplay(obj)
         sliceImage = updateSliceImage(obj);
 
         % compute display data
-        cdata = imagem.gui.ImageUtils.computeDisplayImage(sliceImage, obj.Doc.ColorMap, obj.Doc.BackgroundColor);
+        cdata = imagem.gui.ImageUtils.computeDisplayImage(sliceImage, obj.Doc.ColorMap, obj.DisplayRange, obj.Doc.BackgroundColor);
 
         % changes current display data
         api = iptgetapi(obj.Handles.ScrollPanel);