Changeset 3477478 in sasview for src/sas/plottools/toolbar.py

Timestamp:

Mar 5, 2015 12:38:29 PM (9 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:

b9dbd6b

Parents:

2df0b74

Message:

pylint fixes

File:

• src/sas/plottools/toolbar.py (modified) (6 diffs)

src/sas/plottools/toolbar.py

@@ -9 +9 @@
 # Event binding code changed after version 2.5
 if wx.VERSION_STRING >= '2.5':
-    def bind(actor,event,action,**kw):
-        actor.Bind(event,action,**kw)
+    def bind(actor, event, action, **kw):
+        actor.Bind(event, action, **kw)
 else:
-    def bind(actor,event,action,id=None):
+    def bind(actor, event, action, id=None):
         if id is not None:
             event(actor, id, action)
         else:
-            event(actor,action)
+            event(actor, action)
 
 class NavigationToolBar(NavigationToolbar2WxAgg):
@@ -28 +28 @@
     try: save_figure = NavigationToolbar2WxAgg.save
     except AttributeError: pass
+    
     def _init_toolbar(self):
         self._parent = self.canvas.GetParent()
-        _NTB2_HOME         = wx.NewId()
-        self._NTB2_BACK    = wx.NewId()
+        _NTB2_HOME = wx.NewId()
+        self._NTB2_BACK = wx.NewId()
         self._NTB2_FORWARD = wx.NewId()
-        self._NTB2_PAN     = wx.NewId()
-        self._NTB2_ZOOM    = wx.NewId()
-        _NTB2_SAVE         = wx.NewId()
-        _NTB2_PRINT        = wx.NewId()
-        _NTB2_RESET        = wx.NewId()
+        self._NTB2_PAN = wx.NewId()
+        self._NTB2_ZOOM = wx.NewId()
+        _NTB2_SAVE = wx.NewId()
+        _NTB2_PRINT = wx.NewId()
+        _NTB2_RESET = wx.NewId()
 
         # for mpl 1.2+ compatibility
@@ -46 +47 @@
         self.wx_ids['Zoom'] = self._NTB2_ZOOM
 
-        self.SetToolBitmapSize(wx.Size(24,24))
+        self.SetToolBitmapSize(wx.Size(24, 24))
 
         context_tip = 'Graph Menu: \n'
@@ -55 +56 @@
 
         self.InsertSeparator(1)
-        
+
         self.AddSimpleTool(self._NTB2_BACK, _load_bitmap('back.png'),
                            'Back', 'Back navigation view')
@@ -62 +63 @@
         # todo: get new bitmap
         self.AddCheckTool(self._NTB2_PAN, _load_bitmap('move.png'),
-                           shortHelp='Pan',
-                           longHelp='Pan with left, zoom with right')
+                          shortHelp='Pan',
+                          longHelp='Pan with left, zoom with right')
         self.AddCheckTool(self._NTB2_ZOOM, _load_bitmap('zoom_to_rect.png'),
-                           shortHelp='Zoom', longHelp='Zoom to rectangle')
+                          shortHelp='Zoom', longHelp='Zoom to rectangle')
 
         self.AddSeparator()
         self.AddSimpleTool(_NTB2_SAVE, _load_bitmap('filesave.png'),
                            'Save', 'Save plot contents to file')
-        
+
         print_bmp = wx.ArtProvider.GetBitmap(wx.ART_PRINT, wx.ART_TOOLBAR)
         self.AddSimpleTool(_NTB2_PRINT, print_bmp, 'Print', 'Print plot')
-        
+
         reset_bmp = wx.ArtProvider.GetBitmap(wx.ART_GO_HOME, wx.ART_TOOLBAR)
         self.AddSimpleTool(_NTB2_RESET, reset_bmp, 'Reset', 'Reset graph range')
@@ -114 +115 @@
         except:
             logging.error("Plot toolbar could not print")
-