Changeset 1cf490b6 in sasview

Timestamp:

Apr 21, 2018 8:46:16 PM (7 years ago)

Author:

Stuart Prescott <stuart@…>

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

Parents:

1176137

Message:

Fix imports for matplotlib 2.2.2

The wx backend no longer eposes both NavigationToolbar2WxAgg and
NavigationToolbar2Wx. Since the resolution calculator still used the Wx
name not the WxAgg? name, it could not be imported, and neither could any
of sas.sasgui.perspectives.fitting. The ImportError? in the SasView? constructor
(sas/sasview/sasview.py:67, import sas.sasgui.perspectives.fitting fails)
leaves the GUI pretty messy and fitting is not possible.

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.