Changeset 5251ec6 in sasview for src/sas/sasgui/plottools/PlotPanel.py

Timestamp:

Oct 11, 2018 2:20:56 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249

Children:

98b9f32

Parents:

67ed543

Message:

improved support for py37 in sasgui

File:

• src/sas/sasgui/plottools/PlotPanel.py (modified) (11 diffs)

src/sas/sasgui/plottools/PlotPanel.py

@@ -6 +6 @@
 import logging
 import traceback
+import math
+import os
+import operator
+import copy
+
 import wx
+import numpy as np
+
 # Try a normal import first
 # If it fails, try specifying a version
@@ -15 +22 @@
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg
 from matplotlib.figure import Figure
-import os
-import transform
-#TODO: make the plottables interactive
-from binder import BindArtist
 from matplotlib.font_manager import FontProperties
-DEBUG = False
-
-from plottables import Graph
-from TextDialog import TextDialog
-from LabelDialog import LabelDialog
-import operator
-
-import math
 import pylab
 DEFAULT_CMAP = pylab.cm.jet
-import copy
-import numpy as np
 
 from sas.sasgui.guiframe.events import StatusEvent
+
+#TODO: make the plottables interactive
+from . import transform
+from .TextDialog import TextDialog
+from .LabelDialog import LabelDialog
+from .binder import BindArtist
+from .convert_units import convert_unit
+from .plottables import Graph
 from .toolbar import NavigationToolBar, PlotPrintout, bind
 
+DEBUG = False
 logger = logging.getLogger(__name__)
 
@@ -44 +46 @@
         for a in obj.get_children(): show_tree(a, d + 1)
 
-from convert_units import convert_unit
 
 
@@ -116 +117 @@
         self.figure = Figure(None, dpi, linewidth=2.0)
         self.color = '#b3b3b3'
-        from canvas import FigureCanvas
+        from .canvas import FigureCanvas
         self.canvas = FigureCanvas(self, -1, self.figure)
         self.SetColor(color)
@@ -657 +658 @@
         else:
             plot_dict = plotlist
-        from fitDialog import LinearFit
+        from .fitDialog import LinearFit
 
         if len(plot_dict.keys()) > 0:
-            first_item = plot_dict.keys()[0]
+            first_item = list(plot_dict.keys())[0]
             dlg = LinearFit(parent=None, plottable=first_item,
                             push_data=self.onFitDisplay,
@@ -703 +704 @@
 
         """
-        from fitDialog import LinearFit
+        from .fitDialog import LinearFit
         if self._fit_dialog is not None:
             return
@@ -736 +737 @@
             first_item = plot_list.keys()[0]
             if first_item.x != []:
-                from PropertyDialog import Properties
+                from .PropertyDialog import Properties
                 dial = Properties(self, -1, 'Properties')
                 dial.setValues(self.prevXtrans, self.prevYtrans, self.viewModel)
@@ -1001 +1002 @@
         Remove legend for ax or the current axes.
         """
-        from pylab import gca
         if ax is None:
-            ax = gca()
+            ax = pylab.gca()
         ax.legend_ = None
 
@@ -1327 +1327 @@
         if id is None:
             id = name
-        from plottable_interactor import PointInteractor
+        from .plottable_interactor import PointInteractor
         p = PointInteractor(self, self.subplot, zorder=zorder, id=id)
         if p.markersize is not None:
@@ -1344 +1344 @@
         if id is None:
             id = name
-        from plottable_interactor import PointInteractor
+        from .plottable_interactor import PointInteractor
         p = PointInteractor(self, self.subplot, zorder=zorder, id=id)
         p.curve(x, y, dy=dy, color=color, symbol=symbol, zorder=zorder,
@@ -1754 +1754 @@
             self.graph.delete(self.fit_result)
             if hasattr(self, 'plots'):
-                if 'fit' in self.plots.keys():
+                if 'fit' in self.plots:
                     del self.plots['fit']
         self.ly = None