Changeset 5251ec6 in sasview for src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.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/guiframe/local_perspectives/plotting/plotting.py (modified) (17 diffs)

src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py

@@ -12 +12 @@
 ################################################################################
 
-import wx
 import sys
 from copy import deepcopy
+
+import wx
+
 from sas.sasgui.guiframe.events import EVT_NEW_PLOT
 from sas.sasgui.guiframe.events import EVT_PLOT_QRANGE
@@ -23 +25 @@
 from sas.sasgui.guiframe.dataFitting import Data2D
 from sas.sasgui.guiframe.gui_manager import MDIFrame
+
 DEFAULT_MENU_ITEM_LABEL = "No graph available"
 DEFAULT_MENU_ITEM_ID = wx.NewId()
@@ -91 +94 @@
         if event is None:
             return
-        if event.id in self.plot_panels.keys():
+        if event.id in self.plot_panels:
             panel = self.plot_panels[event.id]
-        elif event.group_id in self.plot_panels.keys():
+        elif event.group_id in self.plot_panels:
             panel = self.plot_panels[event.group_id]
         else:
@@ -102 +105 @@
         if event is None:
             return
-        if event.id in self.plot_panels.keys():
+        if event.id in self.plot_panels:
             panel = self.plot_panels[event.id]
-        elif event.group_id in self.plot_panels.keys():
+        elif event.group_id in self.plot_panels:
             panel = self.plot_panels[event.group_id]
         else:
@@ -123 +126 @@
         """
 
-        if group_id in self.plot_panels.keys():
+        if group_id in self.plot_panels:
             panel = self.plot_panels[group_id]
             panel.remove_data_by_id(id=id)
@@ -134 +137 @@
         Clear and Hide all plot panels, and remove them from menu
         """
-        for group_id in self.plot_panels.keys():
+        for group_id in self.plot_panels:
             self.clear_panel_by_id(group_id)
         self.plot_panels = {}
@@ -142 +145 @@
         clear the graph
         """
-        if group_id in self.plot_panels.keys():
+        if group_id in self.plot_panels:
             panel = self.plot_panels[group_id]
             for plottable in panel.graph.plottables.keys():
@@ -184 +187 @@
         # Create a new plot panel if none was available
         if issubclass(data.__class__, Data1D):
-            from Plotter1D import ModelPanel1D
+            from .Plotter1D import ModelPanel1D
             ## get the data representation label of the data to plot
             ## when even the user select "change scale"
@@ -200 +203 @@
 
         msg = "1D Panel of group ID %s could not be created" % str(group_id)
-        raise ValueError, msg
+        raise ValueError(msg)
 
     def create_2d_panel(self, data, group_id):
@@ -207 +210 @@
         if issubclass(data.__class__, Data2D):
             ##Create a new plotpanel for 2D data
-            from Plotter2D import ModelPanel2D
+            from .Plotter2D import ModelPanel2D
             scale = data.scale
             win = MDIFrame(self.parent, None, 'None', (200, 150))
@@ -218 +221 @@
             return new_panel
         msg = "2D Panel of group ID %s could not be created" % str(group_id)
-        raise ValueError, msg
+        raise ValueError(msg)
 
     def update_panel(self, data, panel):
@@ -238 +241 @@
             msg += " to panel %s\n" % str(panel.window_caption)
             msg += "Please edit %s's units, labels" % str(data.name)
-            raise ValueError, msg
+            raise ValueError(msg)
         else:
             if panel.group_id not in data.list_group_id:
@@ -247 +250 @@
         """
         """
-        if group_id in self.plot_panels.keys():
+        if group_id in self.plot_panels:
             panel = self.plot_panels[group_id]
             uid = panel.uid
@@ -254 +257 @@
                                               caption=panel.window_caption))
             del self.plot_panels[group_id]
-            if uid in self.parent.plot_panels.keys():
+            if uid in self.parent.plot_panels:
                 del self.parent.plot_panels[uid]
                 panel.frame.Destroy()
@@ -280 +283 @@
                     for data in event.plots:
                         for panel in self.plot_panels.values():
-                            if data.id in panel.plots.keys():
+                            if data.id in panel.plots:
                                 plot_exists = True
                                 # Pass each panel it's own copy of the data
@@ -310 +313 @@
         data = event.plot
         group_id = data.group_id
-        if group_id in self.plot_panels.keys():
+        if group_id in self.plot_panels:
             if action_check:
                 # Check if the plot already exist. if it does, do nothing.
-                if data.id in self.plot_panels[group_id].plots.keys():
+                if data.id in self.plot_panels[group_id].plots:
                     return
             #update a panel graph
@@ -327 +330 @@
                     for p_group_id in self.plot_panels.keys():
                         p_plot = self.plot_panels[p_group_id]
-                        if data.id in p_plot.plots.keys():
+                        if data.id in p_plot.plots:
                             p_plot.plots[data.id] = data
                             self.plot_panels[group_id] = p_plot