WIP

tacaswell · tacaswell · commit 722816395885 · 2015-08-15T08:11:47.000-04:00
This will be force-pushed out of existence, dumping so I can get
to it else where
diff --git a/lib/matplotlib/backends/backend_nbagg.py b/lib/matplotlib/backends/backend_nbagg.py
@@ -165,11 +165,17 @@ def destroy(self):
 
     def clearup_closed(self):
         """Clear up any closed Comms."""
+        for sock in self.web_sockets:
+            cb_print('\t' + repr(sock) + repr(sock.is_open()))
         self.web_sockets = set([socket for socket in self.web_sockets
                                 if socket.is_open()])
 
         if len(self.web_sockets) == 0:
-            self.manager.canvas.close_event()
+            self.canvas.close_event()
+
+    def remove_comm(self, comm_id):
+        self.web_sockets = set([socket for socket in self.web_sockets
+                                if not socket.comm.comm_id == comm_id])
 
 
 class TimerTornado(TimerBase):
@@ -219,13 +225,21 @@ def new_figure_manager(num, *args, **kwargs):
     return new_figure_manager_given_figure(num, thisFig)
 
 
+def cb_print(inval):
+    with open('/home/tcaswell/nbagg_dbg.txt', 'a') as fout:
+        fout.write(repr(inval))
+        fout.write('\n')
+
+
 def new_figure_manager_given_figure(num, figure):
     """
     Create a new figure manager instance for the given figure.
     """
     from .._pylab_helpers import Gcf
+    cb_print('created')
 
     def closer(event):
+        cb_print('hit closer' + str(num))
         Gcf.destroy(num)
 
     canvas = FigureCanvasNbAgg(figure)
@@ -267,15 +281,29 @@ def __init__(self, manager):
         self.comm.on_msg(self.on_message)
 
         manager = self.manager
-        self.comm.on_close(lambda close_message: manager.clearup_closed())
+        self._ext_close = False
+
+        def _on_close(close_message):
+            cb_print('comm close cb' + repr(close_message))
+            self._ext_close = True
+            manager.remove_comm(close_message['content']['comm_id'])
+            manager.clearup_closed()
+            cb_print('comm close cb done')
+
+        self.comm.on_close(_on_close)
 
     def is_open(self):
-        return not self.comm._closed
+        return not (self._ext_close and self.comm._closed)
 
     def on_close(self):
         # When the socket is closed, deregister the websocket with
         # the FigureManager.
-        self.comm.close()
+        cb_print('TAC: in comm on close comm state: ' + repr(self.is_open()))
+        try:
+            self.comm.close()
+        except Exception as e:
+            cb_print('EXCPT: ' + str(e))
+        cb_print('TAC: comm is closed: ' + repr(not self.is_open()))
 
     def send_json(self, content):
         self.comm.send({'data': json.dumps(content)})
@@ -296,8 +324,11 @@ def on_message(self, message):
 
         # Every message has a "type" and a "figure_id".
         message = json.loads(message['content']['data'])
+        cb_print(message['type'])
         if message['type'] == 'closing':
-            self.on_close()
+            cb_print(message)
+
+            # self.on_close()
         elif message['type'] == 'supports_binary':
             self.supports_binary = message['value']
         else:
diff --git a/lib/matplotlib/backends/web_backend/nbagg_mpl.js b/lib/matplotlib/backends/web_backend/nbagg_mpl.js
@@ -126,6 +126,14 @@ mpl.figure.prototype._init_toolbar = function() {
     titlebar.prepend(buttongrp);
 }
 
+mpl.figure.prototype._root_extra_style = function(el){
+    var fig = this
+    el.on("remove", function(){
+	fig.send_message('closing', {});
+	console.log('I HAVE BEEN CALLED')
+    });
+    console.log(this)
+}
 
 mpl.figure.prototype._canvas_extra_style = function(el){
     // this is important to make the div 'focusable
