Updates to make behaviour more consistent with other backends. Removed the throttling.

pelson · pelson · commit 5b11ec3e8de8 · 2014-05-19T15:52:47.000+01:00
diff --git a/lib/matplotlib/backends/backend_nbagg.py b/lib/matplotlib/backends/backend_nbagg.py
@@ -16,34 +16,41 @@
 
 
 class Show(ShowBase):
-    def __call__(self, block=None):
-        import matplotlib._pylab_helpers as pylab_helpers
-
+    def display_js(self):
         # XXX How to do this just once? It has to deal with multiple
         # browser instances using the same kernel.
         display(Javascript(FigureManagerNbAgg.get_javascript()))
 
+    def __call__(self, block=None):
+        from matplotlib import is_interactive
+        import matplotlib._pylab_helpers as pylab_helpers
+
         queue = pylab_helpers.Gcf._activeQue
         for manager in queue[:]:
-            manager.show()
-            # If we are not interactive, disable the figure from the active queue,
-            # but don't destroy it.
-            queue.remove(manager)
+            if not manager.shown:
+                self.display_js()
+
+                manager.show()
+                # If we are not interactive, disable the figure from
+                # the active queue, but don't destroy it.
+                if not is_interactive():
+                    queue.remove(manager)
+                manager.canvas.draw_idle()
+
 
 show = Show()
 
 
 def draw_if_interactive():
-    # TODO: Sort out the expected interactive interface & make it easy for
-    # somebody to "re-show" a specific figure.
-    pass
-#    from matplotlib import is_interactive
-#    import matplotlib._pylab_helpers as pylab_helpers
-#
-#    if is_interactive():
-#        figManager = pylab_helpers.Gcf.get_active()
-#        if figManager is not None:
-#            figManager.show()
+    from matplotlib import is_interactive
+    import matplotlib._pylab_helpers as pylab_helpers
+
+    if is_interactive():
+        manager = pylab_helpers.Gcf.get_active()
+        if manager is not None:
+            if not manager.shown:
+                manager.show()
+            manager.canvas.draw_idle()
 
 
 def connection_info():
@@ -54,13 +61,13 @@ def connection_info():
     """
     # TODO: Make this useful!
     import matplotlib._pylab_helpers as pylab_helpers
+    result = []
     for manager in pylab_helpers.Gcf.get_all_fig_managers():
         fig = manager.canvas.figure
-        print fig.get_label() or "Figure {0}".format(manager.num),
-        print [socket.supports_binary for socket in manager.web_sockets],
-        print manager.web_sockets
-
-    print 'Figures pending show: ', len(pylab_helpers.Gcf._activeQue)
+        result.append('{} - {}'.format(fig.get_label() or "Figure {0}".format(manager.num), 
+                                       manager.web_sockets))
+    result.append('Figures pending show: ' + str(len(pylab_helpers.Gcf._activeQue)))
+    return '\n'.join(result)
 
 
 class NavigationIPy(NavigationToolbar2WebAgg):
@@ -86,13 +93,17 @@ class FigureManagerNbAgg(FigureManagerWebAgg):
     ToolbarCls = NavigationIPy
 
     def __init__(self, canvas, num):
-        self._shown = False
+        self.shown = False
         FigureManagerWebAgg.__init__(self, canvas, num)
 
     def show(self):
-        if not self._shown:
+        if not self.shown:
             self._create_comm()
-        self._shown = True
+        self.shown = True
+
+    def reshow(self):
+        self.shown = False
+        self.show()
 
     @property
     def connected(self):
diff --git a/lib/matplotlib/backends/backend_webagg.py b/lib/matplotlib/backends/backend_webagg.py
@@ -230,15 +230,13 @@ class WebSocket(tornado.websocket.WebSocketHandler):
 
         def open(self, fignum):
             self.fignum = int(fignum)
-            manager = Gcf.get_fig_manager(self.fignum)
-            manager.add_web_socket(self)
+            self.manager = Gcf.get_fig_manager(self.fignum)
+            self.manager.add_web_socket(self)
             if hasattr(self, 'set_nodelay'):
                 self.set_nodelay(True)
 
         def on_close(self):
-            manager = Gcf.get_fig_manager(self.fignum)
-            if manager is not None:
-                manager.remove_web_socket(self)
+            self.manager.remove_web_socket(self)
 
         def on_message(self, message):
             message = json.loads(message)
diff --git a/lib/matplotlib/backends/web_backend/mpl.js b/lib/matplotlib/backends/web_backend/mpl.js
@@ -8,7 +8,7 @@ mpl.get_websocket_type = function() {
         return MozWebSocket;
     } else {
         alert('Your browser does not have WebSocket support.' +
-              'Please try Chrome, Safari or Firefox ��� 6. ' +
+              'Please try Chrome, Safari or Firefox ≥ 6. ' +
               'Firefox 4 and 5 are also supported but you ' +
               'have to enable WebSockets in about:config.');
     };
@@ -115,7 +115,7 @@ mpl.figure.prototype._init_canvas = function() {
     rubberband.mousedown('button_press', mouse_event_fn);
     rubberband.mouseup('button_release', mouse_event_fn);
     // Throttle sequential mouse events to 1 every 20ms.
-    rubberband.mousemove('motion_notify', mpl.debounce_event(mouse_event_fn, 20));
+    rubberband.mousemove('motion_notify', mouse_event_fn);
 
     canvas_div.append(canvas);
     canvas_div.append(rubberband);
@@ -272,7 +272,6 @@ mpl.figure.prototype.handle_figure_label = function(fig, msg) {
     fig.header.textContent = msg['label'];
 }
 
-
 mpl.figure.prototype.handle_cursor = function(fig, msg) {
     var cursor = msg['cursor'];
     switch(cursor)
diff --git a/lib/matplotlib/backends/web_backend/nbagg_mpl.js b/lib/matplotlib/backends/web_backend/nbagg_mpl.js
@@ -21,6 +21,9 @@ var comm_websocket_adapter = function(comm) {
 }
 
 mpl.mpl_figure_comm = function(comm, msg) {
+    // This is the function which gets called when the mpl process
+    // starts-up an IPython Comm through the "matplotlib" channel.
+
     var id = msg.content.data.id;
     var element = $("#" + id);
     var ws_proxy = comm_websocket_adapter(comm)
@@ -49,8 +52,8 @@ mpl.mpl_figure_comm = function(comm, msg) {
 mpl.figure.prototype.handle_close = function(fig, msg) {
     // Update the output cell to use the data from the current canvas.
     fig.push_to_output();
-    var dataURL = this.canvas.toDataURL();
-    $(this.parent_element).html('<img src="' + dataURL + '">');
+    var dataURL = fig.canvas.toDataURL();
+    $(fig.parent_element).html('<img src="' + dataURL + '">');
     fig.send_message('closing', {});
     fig.ws.close()
 }
