Changeset 4752c31 in sasview


Ignore:
Timestamp:
Jun 4, 2012 5:34:07 PM (13 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:
6 edited

Legend:

Unmodified
Added
Removed
  • calculatorview/src/sans/perspectives/calculator/sld_panel.py

    r7d45a56 r4752c31  
    6060        self.compound_ctl = None 
    6161        self.density_ctl = None 
     62        self.compound = "" 
     63        self.density = "" 
    6264        self.wavelength_ctl = None 
    6365        self.neutron_sld_real_ctl = None 
     
    305307        energy = xray_energy(element.K_alpha) 
    306308         
    307         self.sld_formula = formula(str(user_formula), density=self.density) 
     309        self.sld_formula = formula(str(self.compound), density=self.density) 
    308310        atom = self.sld_formula.atoms 
    309311        return xray_sld_from_atoms(atom, density=self.density, energy= energy) 
     
    320322     
    321323        self.wavelength = self.wavelength_ctl.GetValue() 
    322         if self.wavelength.lstrip().rstrip() == "": 
     324        if str(self.wavelength).lstrip().rstrip() == "": 
    323325            self.wavelength = WAVELENGTH 
    324326            self.wavelength_ctl.SetValue(str(WAVELENGTH)) 
  • sansguiframe/src/sans/guiframe/data_manager.py

    rb5b2e5b r4752c31  
    275275            for id, data_state in self.stored_data.iteritems(): 
    276276                if data_state.data.name == selected_name: 
    277                     del self._selected_data[id] 
    278                     del self.stored_data[data.id] 
     277                    del self.stored_data[id] 
    279278 
    280279    def get_data_state(self, data_id): 
  • sansguiframe/src/sans/guiframe/local_perspectives/plotting/BaseInteractor.py

    r8c347a6 r4752c31  
    135135            self.move(ev.xdata, ev.ydata, ev) 
    136136        else: 
    137             self.restore() 
     137            self.restore(ev) 
    138138        self.base.update() 
    139139        return True 
     
    147147        """ 
    148148        if ev.key == 'escape': 
    149             self.restore() 
     149            self.restore(ev) 
    150150        elif ev.key in ['up', 'down', 'right', 'left']: 
    151151            dx, dy = self.dpixel(self.clickx, self.clicky, nudge=ev.control) 
  • sansguiframe/src/sans/guiframe/local_perspectives/plotting/SectorSlicer.py

    r940aca7 r4752c31  
    495495        """ 
    496496        x = params["radius"]  
    497         self.set_cursor(x, self._inner_mouse_y) 
     497        self.set_cursor(x, None) 
    498498         
    499499 
     
    624624        """ 
    625625        x = params["radius"]  
    626         self.set_cursor(x, self._inner_mouse_y) 
    627          
     626        self.set_cursor(x, None) 
     627         
  • sansguiframe/src/sans/guiframe/local_perspectives/plotting/masking.py

    rbf7ad65 r4752c31  
    2121import sys 
    2222import time 
    23 import pylab 
     23import matplotlib.cm as cm 
    2424import math 
    2525import copy 
     
    3434(InternalEvent, EVT_INTERNAL) = wx.lib.newevent.NewEvent() 
    3535 
    36 DEFAULT_CMAP = pylab.cm.jet 
     36DEFAULT_CMAP = cm.jet 
    3737_BOX_WIDTH = 76 
    3838_SCALE = 1e-6 
     
    647647        try: 
    648648            self.plotpanel.subplot.figure.clf() 
    649             self.plotpanel.close() 
     649            self.plotpanel.Close() 
    650650        except: 
    651651            # when called by data panel 
  • sansguiframe/src/sans/guiframe/local_perspectives/plotting/plotting.py

    r940aca7 r4752c31  
    2626IS_WIN = True     
    2727if sys.platform.count("win32")==0: 
    28     if int(wx.__version__.split('.')[0]) == 2: 
    29         if int(wx.__version__.split('.')[1]) < 9: 
     28    if int(str(wx.__version__).split('.')[0]) == 2: 
     29        if int(str(wx.__version__).split('.')[1]) < 9: 
    3030            IS_WIN = False 
    3131 
Note: See TracChangeset for help on using the changeset viewer.