update UnfoldVectorImage.m

Author: dlegland

ImageM/+imagem/+actions/+file/OpenDemoImage.m

@@ -42,9 +42,9 @@ function run(obj, frame) %#ok<INUSD>
         img = Image.read(obj.ImageName);
 
         % add image to application, and create new display
-        doc = addImageDocument(frame, img);
+        frame = createImageFrame(frame, img);
 
-        tag = doc.Tag;
+        tag = frame.Doc.Tag;
 
         % history
         string = sprintf('%s = Image.read(''%s'');\n', tag, obj.ImageName);

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

@@ -44,45 +44,35 @@ function run(obj, frame) %#ok<INUSL>
             return;
         end
 
-        % size of the table
-        nr = elementNumber(img);
-        nc = channelNumber(img);
+        % unfold the table
+        [data, colNames, coords] = unfold(img);
+        tab = Table(data, colNames);
 
-        % create sampling grid (iterating over x first)
-        lx = 1:size(img, 1);
-        ly = 1:size(img, 2);
-        [y, x] = meshgrid(ly, lx);
-        coords = [reshape(x, [numel(x) 1]), reshape(y, [numel(x) 1])];
-                
-        rowNames = cell(nr, 1);
-        for i = 1:nr
-            rowNames{i} = sprintf('x%03d-y%03d', coords(i,:));
-        end
+        % create table viewer
+        [newFrame, newDoc] = createTableFrame(frame.Gui, tab, frame); %#ok<ASGLU>
+        newDoc.ImageSize = size(img, 1:ndims(img));
+
+        % add to history
+        string = sprintf('[tab, names, coords] = unfold(%s);\n', doc.Tag);
+        addToHistory(frame, string);
+        string = sprintf('%s = Table(tab, names});\n', newDoc.Tag);
+        addToHistory(frame, string);
 
-        colNames = cell(1, nc);
-        for i = 1:nc
-            colNames{i} = sprintf('Ch%02d', i);
+        % also create a table for coordinates
+        if ndims(img) == 2 %#ok<ISMAT>
+            coordNames = {'x', 'y'};
+            coordStr = '{''x'', ''y''}';
+        elseif ndims(img) == 3
+            coordNames = {'x', 'y', 'z'};
+            coordStr = '{''x'', ''y'', ''z''}';
         end
+        coordsTable = Table(coords, coordNames);
+        [coordsFrame, coordsDoc] = createTableFrame(frame.Gui, coordsTable); %#ok<ASGLU>
 
-        data = reshape(img.Data, [nr nc]);
-        tab = Table(data, colNames, rowNames);
-        
-        coordsTable = Table(coords, {'x', 'y'}, rowNames);
-        createTableFrame(frame.Gui, coordsTable);
-        
-
-%         show(tab);
-         [newFrame, newDoc] = createTableFrame(frame.Gui, tab, frame); %#ok<ASGLU>
-         newDoc.ImageSize = [size(img, 1) size(img, 2)];
-        
-%         % create a new doc
-%         newDoc = addImageDocument(frame, res);
-%         
-%         % add history
-%         string = sprintf('%s = squeeze(slice(%s, 3, %d));\n', ...
-%             newDoc.Tag, doc.Tag, sliceIndex);
-        string = sprintf('%% %s <- unfold vector image %s\n', newDoc.Tag, doc.Tag);
+        % add to history
+        string = sprintf('%s = Table(coords, %s});\n', coordsDoc.Tag, coordStr);
         addToHistory(frame, string);
+        
     end
 
 end % end methods

ImageM/+imagem/+gui/ImagemFrame.m

@@ -45,12 +45,18 @@
 
 %% Methods
 methods
-        
+    function [frame, doc] = createImageFrame(obj, image, varargin)
+        % Create a new frame for the image based on the current frame.
+        [frame, doc] = createImageFrame(obj.Gui, image, varargin{:});
+        if isa(obj, 'imagem.gui.ImageViewer') && ~isempty(obj.Doc)
+            doc.ChannelDisplayType = obj.Doc.ChannelDisplayType;
+        end
+    end
+    
     function [doc, viewer] = addImageDocument(obj, image, varargin)
         % Create a new frame for the image based on the current frame.
         [viewer, doc] = createImageFrame(obj.Gui, image, varargin{:});
-%         [doc, viewer] = addImageDocument(obj.Gui, image, varargin{:});
-        if isa(obj, 'imagem.gui.ImageViewer')
+        if isa(obj, 'imagem.gui.ImageViewer') && ~isempty(obj.Doc)
             doc.ChannelDisplayType = obj.Doc.ChannelDisplayType;
         end
     end