Changeset 5251ec6 in sasview for src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py

Timestamp:

Oct 11, 2018 12: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/Plotter1D.py (modified) (15 diffs)

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

@@ -11 +11 @@
 
 
-import wx
 import sys
 import math
+import logging
+
+import wx
 import numpy as np
-import logging
+
 from sas.sasgui.plottools.PlotPanel import PlotPanel
 from sas.sasgui.guiframe.events import StatusEvent
@@ -22 +24 @@
 from sas.sasgui.guiframe.panel_base import PanelBase
 from sas.sasgui.guiframe.gui_style import GUIFRAME_ICON
-from appearanceDialog import appearanceDialog
-from graphAppearance import graphAppearance
+
+from .appearanceDialog import appearanceDialog
+from .graphAppearance import graphAppearance
 
 logger = logging.getLogger(__name__)
@@ -36 +39 @@
 def find_key(dic, val):
     """return the key of dictionary dic given the value"""
-    return [k for k, v in dic.iteritems() if v == val][0]
+    return [k for k, v in dic.items() if v == val][0]
 
 class ModelPanel1D(PlotPanel, PanelBase):
@@ -220 +223 @@
         if hasattr(event, 'is_corfunc'):
             self.is_corfunc = event.is_corfunc
-        if event.id in self.plots.keys():
+        if event.id in self.plots:
             ctrl = event.ctrl
             self.cursor_id = event.id
@@ -243 +246 @@
                 if position is not None and not self.is_corfunc:
                     wx.PostEvent(self.parent, StatusEvent(status=position))
-            except:
-                logger.error(sys.exc_value)
+            except Exception as exc:
+                logger.error(exc)
             if not event.leftdown:
                 # text event
@@ -256 +259 @@
                     if is_moved:
                         self.canvas.draw()
-                except:
-                    logger.error(sys.exc_value)
+                except Exception as exc:
+                    logger.error(exc)
                 event.Skip()
                 return
@@ -410 +413 @@
             self.canvas.draw()
             self.q_ctrl[vl_ind].SetValue(str(pos_x))
-        except:
-            logger.error(sys.exc_value)
+        except Exception as exc:
+            logger.error(exc)
 
     def set_resizing(self, resizing=False):
@@ -431 +434 @@
             Remove data from plot
         """
-        if id in self.plots.keys():
+        if id in self.plots:
             data = self.plots[id]
             self.graph.delete(data)
@@ -437 +440 @@
             data_list, theory_list = data_manager.get_by_id(id_list=[id])
 
-            if id in data_list.keys():
+            if id in data_list:
                 data = data_list[id]
-            if id in theory_list.keys():
+            if id in theory_list:
                 data = theory_list[id]
 
@@ -457 +460 @@
         if data.__class__.__name__ == 'Data2D':
             return
-        plot_keys = self.plots.keys()
+        plot_keys = list(self.plots.keys())
         if data.id in plot_keys:
             # Recover panel prop.s
@@ -476 +479 @@
             try:
                 self._onEVT_FUNC_PROPERTY()
-            except Exception, exc:
+            except Exception as exc:
                 wx.PostEvent(self.parent,
                              StatusEvent(status="Plotting Error: %s" % str(exc), info="error"))
@@ -493 +496 @@
                     # MAC: forcing to plot 2D avg
                     self.canvas._onDrawIdle()
-            except Exception, exc:
+            except Exception as exc:
                 wx.PostEvent(self.parent, StatusEvent(status=\
                     "Plotting Error: %s" % str(exc), info="error"))
@@ -567 +570 @@
         self.set_selected_from_menu(menu, event_id)
         ## Check if there is a selected graph to remove
-        if self.graph.selected_plottable in self.plots.keys():
+        if self.graph.selected_plottable in self.plots:
             graph_id = self.graph.selected_plottable
             self.remove_data_by_id(graph_id)
@@ -603 +606 @@
             plot_menu = wx.Menu()
             if self.graph.selected_plottable:
-                if not self.graph.selected_plottable in self.plots.keys():
+                if not self.graph.selected_plottable in self.plots:
                     continue
                 if plot != self.plots[self.graph.selected_plottable]:
@@ -623 +626 @@
                         plot_menu.Append(wx_id, item[0], name)
                         wx.EVT_MENU(self, wx_id, item[2])
-                    except:
+                    except Exception as exc:
                         msg = "ModelPanel1D.onContextMenu: "
-                        msg += "bad menu item  %s" % sys.exc_value
+                        msg += "bad menu item  %s" % exc
                         wx.PostEvent(self.parent, StatusEvent(status=msg))
                 plot_menu.AppendSeparator()