Changeset 235f514 in sasview for src/sas/sasgui/guiframe/data_processor.py
- Timestamp:
- Apr 9, 2017 5:46:10 AM (8 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/guiframe/data_processor.py
re645bbb r235f514 315 315 if row > self.max_row_touse: 316 316 self.max_row_touse = row 317 if self.data ==None:317 if self.data is None: 318 318 self.data = {} 319 319 event.Skip() … … 814 814 """ 815 815 816 if self.data ==None:816 if self.data is None: 817 817 self.data = {} 818 if self.file_name ==None:818 if self.file_name is None: 819 819 self.file_name = 'copied_data' 820 820 self.Paste() … … 1017 1017 if index - 1 >= 0: 1018 1018 new_row, _ = temp_list[index - 1] 1019 if not new_row ==None and new_row != ' ':1019 if not new_row is None and new_row != ' ': 1020 1020 label += create_label(col_name, None, 1021 1021 int(new_row) + 1) … … 1025 1025 if index + 1 < len(temp_list): 1026 1026 new_row, _ = temp_list[index + 1] 1027 if not new_row ==None:1027 if not new_row is None: 1028 1028 label += create_label(col_name, 1029 1029 int(new_row) + 1, None) … … 1085 1085 1086 1086 # Let's re-order the data from the keys in 'Data' name. 1087 if outputs ==None:1087 if outputs is None: 1088 1088 return 1089 1089 try: … … 1380 1380 wx.PostEvent(self.parent.parent, StatusEvent(status=msg, info="error")) 1381 1381 return 1382 if dy ==None:1382 if dy is None: 1383 1383 dy = np.zeros(len(y)) 1384 1384 #plotting … … 1441 1441 col = column_names[col_name] 1442 1442 axis = self.get_plot_axis(col, list) 1443 if axis ==None:1443 if axis is None: 1444 1444 return None 1445 1445 sentence = sentence.replace(tok, "numpy.array(%s)" % str(axis))
Note: See TracChangeset
for help on using the changeset viewer.