Changeset 235f514 in sasview for src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py
- Timestamp:
- Apr 9, 2017 5:46:10 AM (7 years ago)
- 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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- ac07a3a
- Parents:
- 5b2b04d
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py
r959eb01 r235f514 487 487 path = None 488 488 filename = '' 489 if location ==None:489 if location is None: 490 490 location = os.getcwd() 491 491 … … 864 864 return 865 865 self.sld_data = self.parent.get_sld_from_omf() 866 if self.sld_data ==None:866 if self.sld_data is None: 867 867 if self.parent.parent != None: 868 868 infor = 'Error' … … 880 880 self.model.set_sld_data(self.sld_data) 881 881 self.set_input_params() 882 if self.is_avg or self.is_avg ==None:882 if self.is_avg or self.is_avg is None: 883 883 self._create_default_1d_data() 884 884 i_out = np.zeros(len(self.data.y)) … … 979 979 Update the progress bar 980 980 """ 981 if self.parent.parent ==None:981 if self.parent.parent is None: 982 982 return 983 983 type = "progress" … … 1010 1010 out = np.append(out, outi) 1011 1011 #print time.time() - s 1012 if self.is_avg or self.is_avg ==None:1012 if self.is_avg or self.is_avg is None: 1013 1013 self._draw1D(out) 1014 1014 else: … … 1287 1287 key_low = key.lower() 1288 1288 if key_low.count('mx') > 0: 1289 if sld_sets[key] ==None:1289 if sld_sets[key] is None: 1290 1290 sld_sets[key] = self.sld_data.sld_mx 1291 1291 mx = sld_sets[key] 1292 1292 elif key_low.count('my') > 0: 1293 if sld_sets[key] ==None:1293 if sld_sets[key] is None: 1294 1294 sld_sets[key] = self.sld_data.sld_my 1295 1295 my = sld_sets[key] 1296 1296 elif key_low.count('mz') > 0: 1297 if sld_sets[key] ==None:1297 if sld_sets[key] is None: 1298 1298 sld_sets[key] = self.sld_data.sld_mz 1299 1299 mz = sld_sets[key] … … 1368 1368 """ 1369 1369 1370 if omfdata ==None:1370 if omfdata is None: 1371 1371 self._set_none_text() 1372 1372 return … … 1437 1437 self.slds = [] 1438 1438 omfdata = self.sld_data 1439 if omfdata ==None:1439 if omfdata is None: 1440 1440 raise 1441 1441 sld_key_list = self._get_slds_key_list(omfdata) … … 1477 1477 self.nodes = [] 1478 1478 omfdata = self.sld_data 1479 if omfdata ==None:1479 if omfdata is None: 1480 1480 raise 1481 1481 key_list = self._get_nodes_key_list(omfdata) … … 1512 1512 self.stepsize = [] 1513 1513 omfdata = self.sld_data 1514 if omfdata ==None:1514 if omfdata is None: 1515 1515 raise 1516 1516 key_list = self._get_step_key_list(omfdata) … … 1631 1631 Set sld textctrls 1632 1632 """ 1633 if sld_data ==None:1633 if sld_data is None: 1634 1634 for ctr_list in self.slds: 1635 1635 ctr_list[1].Enable(False) … … 1739 1739 if npts > 0: 1740 1740 nop = self.set_npts_from_slddata() 1741 if nop ==None:1741 if nop is None: 1742 1742 nop = npts 1743 1743 self.display_npts(nop) … … 1911 1911 Set omfdata 1912 1912 """ 1913 if data ==None:1913 if data is None: 1914 1914 return 1915 1915 self.sld_data = data 1916 enable = (not data ==None)1916 enable = (not data is None) 1917 1917 self._set_omfpanel_sld_data(self.sld_data) 1918 1918 self.omfpanel.bt_save.Enable(enable)
Note: See TracChangeset
for help on using the changeset viewer.
