factorize management of closing image frames

Author: dlegland

ImageM/+imagem/+gui/Image3DSliceViewer.m

@@ -387,19 +387,6 @@ function onKeyReleased(obj, hObject, eventdata) %#ok<INUSD>
 
 %% Figure management
 methods
-    function close(obj, varargin)
-%         disp('Close image viewer');
-        if ~isempty(obj.Doc)
-            try
-                removeView(obj.Doc, obj);
-            catch ME %#ok<NASGU>
-                warning('PlanarImageViewer:close', ...
-                    'Current view is not referenced in document...');
-            end
-        end
-        delete(obj.Handles.Figure);
-    end
-    
     function onScrollPanelResized(obj, varargin)
         % function called when the Scroll panel has been resized
 

ImageM/+imagem/+gui/Image5DSliceViewer.m

@@ -536,19 +536,6 @@ function onKeyReleased(obj, hObject, eventdata) %#ok<INUSD>
 
 %% Figure management
 methods
-    function close(obj, varargin)
-%         disp('Close image viewer');
-        if ~isempty(obj.Doc)
-            try
-                removeView(obj.Doc, obj);
-            catch ME %#ok<NASGU>
-                warning('PlanarImageViewer:close', ...
-                    'Current view is not referenced in document...');
-            end
-        end
-        delete(obj.Handles.Figure);
-    end
-    
     function onScrollPanelResized(obj, varargin)
         % function called when the Scroll panel has been resized
 

ImageM/+imagem/+gui/ImageViewer.m

@@ -185,6 +185,35 @@ function clearPreviewImage(obj)
 end
 
 
+%% Figure management
+methods
+    function close(obj, varargin)
+        % Default implementation for closing frame.
+        %
+        % Actions:
+        % * remove the view from the doc
+        % * if this view was the last one attached to the doc, remove the
+        %   doc from the app
+        % * close the Figure widget
+        
+        if ~isempty(obj.Doc)
+            try
+                removeView(obj.Doc, obj);
+                
+                if isempty(obj.Doc.Views)
+                    obj.Gui.App.removeDocument(obj.Doc);
+                end
+                
+            catch ME %#ok<NASGU>
+                warning([mfilename ':close'], ...
+                    'Current view is not referenced in document...');
+            end
+        end
+        delete(obj.Handles.Figure);
+    end
+end    
+
+
 %% Image display listeners management
 methods
     function addImageDisplayListener(obj, listener)

ImageM/+imagem/+gui/PlanarImageViewer.m

@@ -329,20 +329,6 @@ function onKeyReleased(obj, hObject, eventdata) %#ok<INUSD>
 
 %% Figure management
 methods
-    function close(obj, varargin)
-%         disp('Close image viewer');
-        if ~isempty(obj.Doc)
-            try
-                removeView(obj.Doc, obj);
-            catch ME %#ok<NASGU>
-                name = obj.Doc.Image.Name;
-                warning('PlanarImageViewer:close', ...
-                    'Current view is not referenced in document ''%s''...', name);
-            end
-        end
-        delete(obj.Handles.Figure);
-    end
-    
     function onScrollPanelResized(obj, varargin)
         % function called when the Scroll panel has been resized