Changeset 7d5e7da in sasview for src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py

Timestamp:

Apr 30, 2018 3:12:46 PM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

0863065, de43192, 6ef75fa6

Parents:

cd10013 (diff), 1cf490b6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Kienzle <pkienzle@…> (04/30/18 15:12:46)

git-committer:

GitHub <noreply@…> (04/30/18 15:12:46)

Message:

Merge pull request #152 from llimeht/tmp/matplotlibwx

Fix imports for matplotlib 2.2.2

File:

• src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) (1 diff)

src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py

@@ -18 +18 @@
 matplotlib.use('WXAgg')
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
-from matplotlib.backends.backend_wxagg import NavigationToolbar2Wx as Toolbar
+from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg as Toolbar
 from matplotlib.backend_bases import FigureManagerBase
 # Wx-Pylab magic for displaying plots within an application's window.