Changeset 4752c31 in sasview

Timestamp:

Jun 4, 2012 3:34:07 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

3f68e93

Parents:

da7cacb

Message:

fixing pylint warnings

Files:

• calculatorview/src/sans/perspectives/calculator/sld_panel.py (modified) (3 diffs)
• sansguiframe/src/sans/guiframe/data_manager.py (modified) (1 diff)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/BaseInteractor.py (modified) (2 diffs)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) (2 diffs)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/masking.py (modified) (3 diffs)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/plotting.py (modified) (1 diff)

calculatorview/src/sans/perspectives/calculator/sld_panel.py

@@ -60 +60 @@
         self.compound_ctl = None
         self.density_ctl = None
+        self.compound = ""
+        self.density = ""
         self.wavelength_ctl = None
         self.neutron_sld_real_ctl = None
@@ -305 +307 @@
         energy = xray_energy(element.K_alpha)
         
-        self.sld_formula = formula(str(user_formula), density=self.density)
+        self.sld_formula = formula(str(self.compound), density=self.density)
         atom = self.sld_formula.atoms
         return xray_sld_from_atoms(atom, density=self.density, energy= energy)
@@ -320 +322 @@
     
         self.wavelength = self.wavelength_ctl.GetValue()
-        if self.wavelength.lstrip().rstrip() == "":
+        if str(self.wavelength).lstrip().rstrip() == "":
             self.wavelength = WAVELENGTH
             self.wavelength_ctl.SetValue(str(WAVELENGTH))

sansguiframe/src/sans/guiframe/data_manager.py

@@ -275 +275 @@
             for id, data_state in self.stored_data.iteritems():
                 if data_state.data.name == selected_name:
-                    del self._selected_data[id]
-                    del self.stored_data[data.id]
+                    del self.stored_data[id]
 
     def get_data_state(self, data_id):

sansguiframe/src/sans/guiframe/local_perspectives/plotting/BaseInteractor.py

@@ -135 +135 @@
             self.move(ev.xdata, ev.ydata, ev)
         else:
-            self.restore()
+            self.restore(ev)
         self.base.update()
         return True
@@ -147 +147 @@
         """
         if ev.key == 'escape':
-            self.restore()
+            self.restore(ev)
         elif ev.key in ['up', 'down', 'right', 'left']:
             dx, dy = self.dpixel(self.clickx, self.clicky, nudge=ev.control)

sansguiframe/src/sans/guiframe/local_perspectives/plotting/SectorSlicer.py

@@ -495 +495 @@
         """
         x = params["radius"] 
-        self.set_cursor(x, self._inner_mouse_y)
+        self.set_cursor(x, None)
         
 
@@ -624 +624 @@
         """
         x = params["radius"] 
-        self.set_cursor(x, self._inner_mouse_y)
-        
+        self.set_cursor(x, None)
+        

sansguiframe/src/sans/guiframe/local_perspectives/plotting/masking.py

@@ -21 +21 @@
 import sys
 import time
-import pylab
+import matplotlib.cm as cm
 import math
 import copy
@@ -34 +34 @@
 (InternalEvent, EVT_INTERNAL) = wx.lib.newevent.NewEvent()
 
-DEFAULT_CMAP = pylab.cm.jet
+DEFAULT_CMAP = cm.jet
 _BOX_WIDTH = 76
 _SCALE = 1e-6
@@ -647 +647 @@
         try:
             self.plotpanel.subplot.figure.clf()
-            self.plotpanel.close()
+            self.plotpanel.Close()
         except:
             # when called by data panel

sansguiframe/src/sans/guiframe/local_perspectives/plotting/plotting.py

@@ -26 +26 @@
 IS_WIN = True    
 if sys.platform.count("win32")==0:
-    if int(wx.__version__.split('.')[0]) == 2:
-        if int(wx.__version__.split('.')[1]) < 9:
+    if int(str(wx.__version__).split('.')[0]) == 2:
+        if int(str(wx.__version__).split('.')[1]) < 9:
             IS_WIN = False