Changeset 2df0b74 in sasview for src/sas/plottools/canvas.py

Timestamp:

Mar 5, 2015 11:17:05 AM (10 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

3477478

Parents:

dca6188

Message:

pylint fixes

File:

• src/sas/plottools/canvas.py (modified) (14 diffs)

src/sas/plottools/canvas.py

@@ -5 +5 @@
 import wx
 import sys
+import logging
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg
-from matplotlib.backends.backend_wxagg import _convert_agg_to_wx_bitmap
-from matplotlib.backends.backend_agg import FigureCanvasAgg
 from matplotlib.backend_bases import MouseEvent, RendererBase
 from matplotlib.backends.backend_wx import GraphicsContextWx, PrintoutWx
@@ -48 +47 @@
     dc = self.GetDC()
     try:
-        (ppw, pph) = self.GetPPIPrinter()      # printer's pixels per in
+        (ppw, pph) = self.GetPPIPrinter()  # printer's pixels per in
     except:
         ppw = 1
         pph = 1
-    (pgw, pgh) = self.GetPageSizePixels()  # page size in pixels
-    (dcw, dch) = dc.GetSize()
-    (grw, grh) = self.canvas.GetSizeTuple()
+    (pgw, _) = self.GetPageSizePixels()  # page size in pixels
+    (dcw, _) = dc.GetSize()
+    (grw, _) = self.canvas.GetSizeTuple()
 
     # save current figure dpi resolution and bg color,
@@ -78 +77 @@
     page_scale = 1.0
     if self.IsPreview():
-        page_scale = float(dcw)/pgw
+        page_scale = float(dcw) / pgw
 
     # get margin in pixels = (margin in in) * (pixels/in)
@@ -97 +96 @@
             dc.DrawBitmap(self.canvas.bitmap, (0, 0))
         except:
-            pass
+            logging.error(sys.exc_value)
 
     # restore original figure  resolution
     self.canvas.figure.set_facecolor(bgcolor)
-    ## used to be self.canvas.figure.dpi.set( fig_dpi)
+    # # used to be self.canvas.figure.dpi.set( fig_dpi)
     self.canvas.figure.dpi = fig_dpi
     self.canvas.draw()
@@ -121 +120 @@
         super(FigureCanvas, self).__init__(*args, **kw)
         self._isRendered = False
-        
+
         # Create an timer for handling draw_idle requests
         # If there are events pending when the timer is
@@ -136 +135 @@
         # Support for mouse wheel
         self.Bind(wx.EVT_MOUSEWHEEL, self._onMouseWheel)
-       
+
     def set_panel(self, panel):
         """
@@ -146 +145 @@
         self.xaxis = panel.subplot.xaxis
         self.yaxis = panel.subplot.yaxis
-        
+
     def draw_idle(self, *args, **kwargs):
         """
@@ -165 +164 @@
             self.draw(*args, **kwargs)
             self.resizing = False
-            
+
     def _get_axes_switch(self):
         """
@@ -184 +183 @@
         # set the resizing back to default= False
         self.set_resizing(False)
-        
+
     def set_resizing(self, resizing=False):
         """
@@ -191 +190 @@
         self.resizing = resizing
         self.panel.set_resizing(False)
-             
+
     def draw(self, drawDC=None):
         """
@@ -203 +202 @@
             self._isRendered = True
             self._get_axes_switch()
-            #import time
-            #st = time.time()
+            # import time
+            # st = time.time()
             try:
                 fig.draw(self)
             except ValueError:
-                pass
-            #self.bitmap = _convert_agg_to_wx_bitmap(self.get_renderer(), None)
-            #self.gui_repaint(drawDC=drawDC)
-            #print "time", time.time() - st
+                logging.error(sys.exc_value)
         else:
             self._isRendered = False
         if self.ndraw <= 1:
             self.ndraw += 1
-        
+
     def _onMouseWheel(self, evt):
         """Translate mouse wheel events into matplotlib events"""
         # Determine mouse location
-        w, h = self.figure.canvas.get_width_height()
+        _, h = self.figure.canvas.get_width_height()
         x = evt.GetX()
         y = h - evt.GetY()
@@ -228 +224 @@
         rotation = evt.GetWheelRotation()
         rate = evt.GetLinesPerAction()
-        #print "delta,rotation,rate",delta,rotation,rate
+        # print "delta,rotation,rate",delta,rotation,rate
         step = rate * float(rotation) / delta
 
@@ -249 +245 @@
         if step != 0:
             self.panel.is_zoomed = True
-               
+
     def _onRightButtonDown(self, evt):
         """
         Overload the right button down call back to avoid a problem
         with the context menu over matplotlib plots on linux.
-        
+
         :TODO: Investigate what the root cause of the problem is.
-        
+
         """
         if sys.platform == 'linux2' or self.panel.dimension == 3:
@@ -271 +267 @@
     def _onLeave(self, evt):
         if self.HasCapture(): self.ReleaseMouse()
-        super(FigureCanvas,self)._onLeave(evt)
+        super(FigureCanvas, self)._onLeave(evt)