Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 78cac75

Browse filesBrowse files
committed
mpl_interface.js template does not need to be parameterized on the figure number
1 parent ce9377f commit 78cac75
Copy full SHA for 78cac75

File tree

Expand file treeCollapse file tree

3 files changed

+32
-31
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+32
-31
lines changed

‎lib/matplotlib/backends/backend_webagg.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_webagg.py
+6-5Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -428,18 +428,19 @@ def get(self):
428428

429429

430430
class MPLInterfaceJS(tornado.web.RequestHandler):
431-
def get(self, fignum):
431+
def get(self):
432432
with open(os.path.join(WebAggApplication._mpl_dirs['web_backend'],
433433
'mpl_interface.js')) as fd:
434434
tpl = fd.read()
435435

436-
fignum = int(fignum)
437-
manager = Gcf.get_fig_manager(fignum)
436+
manager = Gcf.get_fig_manager(1)
437+
canvas = manager.canvas
438438

439439
t = tornado.template.Template(tpl)
440440
self.write(t.generate(
441441
toolitems=NavigationToolbar2WebAgg.toolitems,
442-
canvas=manager.canvas))
442+
canvas=canvas))
443+
443444

444445
class Download(tornado.web.RequestHandler):
445446
def get(self, fignum, fmt):
@@ -553,7 +554,7 @@ def __init__(self, url_prefix=''):
553554
(url_prefix + r'/([0-9]+)', self.SingleFigurePage,
554555
{'url_prefix': url_prefix}),
555556

556-
(url_prefix + r'/([0-9]+)/mpl_interface.js', self.MPLInterfaceJS),
557+
(url_prefix + r'/mpl_interface.js', self.MPLInterfaceJS),
557558

558559
# Sends images and events to the browser, and receives
559560
# events from the browser

‎lib/matplotlib/backends/web_backend/all_figures.html

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/web_backend/all_figures.html
+15-15Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,61 +7,61 @@
77
<script src="{{ prefix }}/_static/jquery/js/jquery-1.7.1.min.js"></script>
88
<script src="{{ prefix }}/_static/jquery/js/jquery-ui.min.js"></script>
99
<script src="{{ prefix }}/_static/mpl.js"></script>
10-
<script src="{{ prefix }}/{{ str(figures[0][0]) }}/mpl_interface.js"></script>
11-
10+
<script src="{{ prefix }}/mpl_interface.js"></script>
11+
1212
<script>
1313
var websocket_url_prefix = "{{ ws_uri }}";
1414
var figures = new Array();
15-
15+
1616
{% for (fig_id, _) in figures %}
1717
$(document).ready(
1818
function() {
1919
fig = new figure({{ repr(str(fig_id)) }}, websocket_url_prefix);
2020
figures.push(fig);
21-
21+
2222
fig.focus_on_mouseover = true;
23-
23+
2424
var toolbar_prefix = '{{ str(fig_id).replace(' ', '') }}-toolbar';
2525
init_mpl_toolbar(fig, toolbar_prefix);
26-
26+
2727
var statusbar_prefix = '{{ str(fig_id).replace(' ', '') }}-statusbar';
2828
var status_id = init_mpl_statusbar(toolbar_prefix, statusbar_prefix);
29-
29+
3030
var canvas_prefix = '{{ str(fig_id).replace(' ', '') }}-canvas';
3131
init_mpl_canvas(fig, '{{ str(fig_id).replace(' ', '') }}-canvas-div', canvas_prefix);
32-
32+
3333
fig.finalize(canvas_prefix, toolbar_prefix, statusbar_prefix);
34-
34+
3535
$(fig.canvas).attr('tabindex', {{ fig_id }});
3636
}
3737
);
3838

3939
{% end %}
4040
</script>
41-
42-
<title>MPL | WebAgg current figures</title>
41+
42+
<title>MPL | WebAgg current figures</title>
4343

4444
</head>
4545
<body>
4646
<div id="mpl-warnings" class="mpl-warnings"></div>
4747
{% for (fig_id, fig_manager) in figures %}
4848
{% set fig_label='Figure: {}'.format(fig_manager.canvas.figure.get_label()) %}
49-
49+
5050
{% if fig_label == 'Figure: ' %}
5151
{% set fig_label="Figure {}".format(fig_id) %}
5252
{% end %}
53-
53+
5454
<div style="margin: 25px 100px;">
5555
<h2>
5656
<a href="{{ prefix }}/{{ str(fig_id) }}">
5757
{{ fig_label }}
58-
58+
5959
</a>
6060
</h2>
6161
<div id="{{ str(fig_id).replace(' ', '') }}-canvas-div"></div>
6262
<div id="{{ str(fig_id).replace(' ', '') }}-toolbar" style="width: 700px;"></div>
6363
</div>
6464
{% end %}
65-
65+
6666
</body>
6767
</html>

‎lib/matplotlib/backends/web_backend/single_figure.html

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/web_backend/single_figure.html
+11-11Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@
77
<script src="{{ prefix }}/_static/jquery/js/jquery-1.7.1.min.js"></script>
88
<script src="{{ prefix }}/_static/jquery/js/jquery-ui.min.js"></script>
99
<script src="{{ prefix }}/_static/mpl.js"></script>
10-
<script src="{{ prefix }}/1/mpl_interface.js"></script>
11-
10+
<script src="{{ prefix }}/mpl_interface.js"></script>
11+
1212
<script>
1313
var websocket_url_prefix = "{{ ws_uri }}";
1414
var fig = new figure({{ repr(str(fig_id)) }}, websocket_url_prefix);
15-
15+
1616
$(document).ready(
1717
function() {
1818
var toolbar_prefix = 'fig-toolbar';
1919
init_mpl_toolbar(fig, toolbar_prefix);
20-
20+
2121
var statusbar_prefix = 'statusbar';
2222
var status_id = init_mpl_statusbar(toolbar_prefix, statusbar_prefix);
23-
23+
2424
var canvas_prefix = 'figure';
2525
init_mpl_canvas(fig, 'fig-canvas-div', canvas_prefix);
26-
26+
2727
fig.finalize(canvas_prefix, toolbar_prefix, statusbar_prefix);
2828
// fig.canvas.focus();
2929
// Let the top level document handle key events.
@@ -32,14 +32,14 @@
3232
}
3333
);
3434
</script>
35-
35+
3636
{% set fig_label='Figure: {}'.format(canvas.figure.get_label()) %}
37-
37+
3838
{% if fig_label == 'Figure: ' %}
3939
{% set fig_label="Figure {}".format(fig_id) %}
40-
{% end %}
40+
{% end %}
4141

42-
<title>MPL | {{ fig_label }}</title>
42+
<title>MPL | {{ fig_label }}</title>
4343

4444

4545
</head>
@@ -52,6 +52,6 @@ <h1>
5252
<div id="fig-canvas-div"></div>
5353
<div id="fig-toolbar" style="width: 600px;"></div>
5454
</div>
55-
55+
5656
</body>
5757
</html>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.