Changeset 7432acb in sasview for src/sas/sasgui/perspectives/calculator
- Timestamp:
- Apr 9, 2017 6:11:31 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:
- 45dffa69
- Parents:
- ac07a3a
- Location:
- src/sas/sasgui/perspectives/calculator
- Files:
-
- 10 edited
-
data_operator.py (modified) (10 diffs)
-
density_panel.py (modified) (1 diff)
-
gen_scatter_panel.py (modified) (20 diffs)
-
image_viewer.py (modified) (2 diffs)
-
kiessig_calculator_panel.py (modified) (2 diffs)
-
model_editor.py (modified) (5 diffs)
-
pyconsole.py (modified) (5 diffs)
-
resolution_calculator_panel.py (modified) (13 diffs)
-
sld_panel.py (modified) (1 diff)
-
slit_length_calculator_panel.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/perspectives/calculator/data_operator.py
r235f514 r7432acb 182 182 On data name typing 183 183 """ 184 if event !=None:184 if event is not None: 185 185 event.Skip() 186 186 item = event.GetEventObject() … … 264 264 self.put_text_pic(self.data2_pic, content=str(val)) 265 265 self.check_data_inputs() 266 if self.output !=None:266 if self.output is not None: 267 267 self.output.name = str(self.data_namectr.GetValue()) 268 268 self.draw_output(self.output) … … 284 284 self.data1_pic.add_image(data) 285 285 self.check_data_inputs() 286 if self.output !=None:286 if self.output is not None: 287 287 self.output.name = str(self.data_namectr.GetValue()) 288 288 self.draw_output(self.output) … … 297 297 self.put_text_pic(self.operator_pic, content=text) 298 298 self.check_data_inputs() 299 if self.output !=None:299 if self.output is not None: 300 300 self.output.name = str(self.data_namectr.GetValue()) 301 301 self.draw_output(self.output) … … 329 329 data = None 330 330 item.SetClientData(pos, data) 331 if data !=None:331 if data is not None: 332 332 self.check_data_inputs() 333 333 334 334 self.put_text_pic(self.data2_pic, content) 335 335 336 if self.output !=None:336 if self.output is not None: 337 337 self.output.name = str(self.data_namectr.GetValue()) 338 338 self.draw_output(self.output) … … 472 472 On Focus at this window 473 473 """ 474 if event !=None:474 if event is not None: 475 475 event.Skip() 476 476 self._data = self.get_datalist() … … 534 534 ids = self._data.keys() 535 535 for id in ids: 536 if id !=None:537 if self._data[id].data !=None:536 if id is not None: 537 if self._data[id].data is not None: 538 538 dnames.append(self._data[id].data.name) 539 539 else: … … 546 546 for datastate in val_list: 547 547 data = datastate.data 548 if data !=None:548 if data is not None: 549 549 name = data.name 550 550 pos1 = self.data1_cbox.Append(str(name)) … … 577 577 """ 578 578 data_manager = self.parent.parent.get_data_manager() 579 if data_manager !=None:579 if data_manager is not None: 580 580 return data_manager.get_all_data() 581 581 else: … … 983 983 On close event 984 984 """ 985 if self.manager !=None:985 if self.manager is not None: 986 986 self.manager.data_operator_frame = None 987 987 self.panel.disconnect_panels() -
src/sas/sasgui/perspectives/calculator/density_panel.py
r235f514 r7432acb 438 438 On close event 439 439 """ 440 if self.manager !=None:440 if self.manager is not None: 441 441 self.manager.cal_md_frame = None 442 442 self.Destroy() -
src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py
rac07a3a r7432acb 61 61 Add icon in the frame 62 62 """ 63 if parent !=None:63 if parent is not None: 64 64 if hasattr(frame, "IsIconized"): 65 65 if not frame.IsIconized(): … … 74 74 Set_error dialog 75 75 """ 76 if item !=None:76 if item is not None: 77 77 item.SetBackgroundColour("pink") 78 78 item.Refresh() 79 79 if show_msg: 80 80 msg = "Error: wrong (or out of range) value entered." 81 if panel.parent.parent !=None:81 if panel.parent.parent is not None: 82 82 wx.PostEvent(panel.parent.parent, 83 83 StatusEvent(status=msg, info='Error')) … … 425 425 """ 426 426 unit = 'sec' 427 if self.time_text !=None:427 if self.time_text is not None: 428 428 self.time_text.SetForegroundColour('black') 429 429 etime = self.estimate_ctime() … … 633 633 self.model.set_sld_data(self.sld_data) 634 634 635 self.draw_button.Enable(self.sld_data !=None)635 self.draw_button.Enable(self.sld_data is not None) 636 636 wx.CallAfter(self.parent.set_sld_data, self.sld_data) 637 637 self._update_model_params() … … 855 855 """ 856 856 flag = self.parent.check_omfpanel_inputs() 857 if not flag and self.parent.parent !=None:857 if not flag and self.parent.parent is not None: 858 858 infor = 'Error' 859 859 msg = 'Error: Wrong inputs in the SLD info panel.' … … 865 865 self.sld_data = self.parent.get_sld_from_omf() 866 866 if self.sld_data is None: 867 if self.parent.parent !=None:867 if self.parent.parent is not None: 868 868 infor = 'Error' 869 869 msg = 'Error: No data has been selected.' … … 971 971 self.bt_compute.SetLabel(label) 972 972 self.bt_compute.SetToolTipString(label) 973 if self.parent.parent !=None:973 if self.parent.parent is not None: 974 974 wx.PostEvent(self.parent.parent, 975 975 StatusEvent(status=msg, type=type)) … … 995 995 for ind in range(len(input[0])): 996 996 if self.is_avg: 997 if ind % 1 == 0 and update !=None:997 if ind % 1 == 0 and update is not None: 998 998 update() 999 999 time.sleep(0.1) … … 1002 1002 out = np.append(out, outi) 1003 1003 else: 1004 if ind % 50 == 0 and update !=None:1004 if ind % 50 == 0 and update is not None: 1005 1005 update() 1006 1006 time.sleep(0.001) … … 1151 1151 new_plot.label = new_plot.id 1152 1152 #theory_data = deepcopy(new_plot) 1153 if self.parent.parent !=None:1153 if self.parent.parent is not None: 1154 1154 self.parent.parent.update_theory(data_id=new_plot.id, 1155 1155 theory=new_plot, … … 1210 1210 new_plot.label = new_plot.id 1211 1211 #theory_data = deepcopy(new_plot) 1212 if self.parent.parent !=None:1212 if self.parent.parent is not None: 1213 1213 self.parent.parent.update_theory(data_id=data.id, 1214 1214 theory=new_plot, … … 1299 1299 mz = sld_sets[key] 1300 1300 else: 1301 if sld_sets[key] !=None:1301 if sld_sets[key] is not None: 1302 1302 self.sld_data.set_sldn(sld_sets[key]) 1303 1303 self.sld_data.set_sldms(mx, my, mz) … … 1347 1347 infor = 'Error' 1348 1348 #logger.error(msg) 1349 if self.parent.parent !=None:1349 if self.parent.parent is not None: 1350 1350 # inform msg to wx 1351 1351 wx.PostEvent(self.parent.parent, … … 1690 1690 data = self.parent.get_sld_data() 1691 1691 fName = os.path.splitext(path)[0] + '.' + extension.split('.')[-1] 1692 if data !=None:1692 if data is not None: 1693 1693 try: 1694 1694 reader.write(fName, data) … … 1699 1699 infor = 'Error' 1700 1700 #logger.error(msg) 1701 if self.parent.parent !=None:1701 if self.parent.parent is not None: 1702 1702 # inform msg to wx 1703 1703 wx.PostEvent(self.parent.parent, … … 1708 1708 msg = "Error occurred while saving. " 1709 1709 infor = 'Error' 1710 if self.parent.parent !=None:1710 if self.parent.parent is not None: 1711 1711 # inform msg to wx 1712 1712 wx.PostEvent(self.parent.parent, … … 1718 1718 """ 1719 1719 flag = True 1720 if event !=None:1720 if event is not None: 1721 1721 event.Skip() 1722 1722 ctl = event.GetEventObject() … … 1758 1758 """ 1759 1759 flag = True 1760 if event !=None:1760 if event is not None: 1761 1761 event.Skip() 1762 1762 ctl = event.GetEventObject() … … 1974 1974 Send full draw to gui frame 1975 1975 """ 1976 if self.parent !=None:1976 if self.parent is not None: 1977 1977 self.parent.set_schedule_full_draw(panel, func) 1978 1978 … … 2050 2050 Close 2051 2051 """ 2052 if self.base !=None:2052 if self.base is not None: 2053 2053 self.base.gen_frame = None 2054 2054 self.Destroy() -
src/sas/sasgui/perspectives/calculator/image_viewer.py
r235f514 r7432acb 70 70 plot_frame.SetTitle('Picture -- %s --' % basename) 71 71 plot_frame.Show(True) 72 if parent !=None:72 if parent is not None: 73 73 parent.put_icon(plot_frame) 74 74 except: … … 403 403 output.is_data = True 404 404 output = reader2D_converter(output) 405 if self.base !=None:405 if self.base is not None: 406 406 data = self.base.create_gui_data(output, self.title) 407 407 self.base.add_data({data.id:data}) -
src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py
r959eb01 r7432acb 190 190 """ 191 191 # skip for another event 192 if event !=None:192 if event is not None: 193 193 event.Skip() 194 194 dq = self.dq_name_tcl.GetValue() … … 237 237 Close event 238 238 """ 239 if self.manager !=None:239 if self.manager is not None: 240 240 self.manager.kiessig_frame = None 241 241 self.Destroy() -
src/sas/sasgui/perspectives/calculator/model_editor.py
r235f514 r7432acb 387 387 self._msg_box.SetLabel(msg) 388 388 self._msg_box.SetForegroundColour(color) 389 if self.parent.parent !=None:389 if self.parent.parent is not None: 390 390 from sas.sasgui.guiframe.events import StatusEvent 391 391 wx.PostEvent(self.parent.parent, StatusEvent(status=msg, … … 478 478 """ 479 479 # For Mac 480 if event !=None:480 if event is not None: 481 481 event.Skip() 482 482 item = event.GetEventObject() … … 979 979 980 980 # Prepare the messagebox 981 if self.base !=None and not msg:981 if self.base is not None and not msg: 982 982 self.base.update_custom_combo() 983 983 # Passed exception in import test as it will fail for sasmodels.sasview_model class … … 1002 1002 self._msg_box.SetForegroundColour(color) 1003 1003 # Send msg to the top window 1004 if self.base !=None:1004 if self.base is not None: 1005 1005 from sas.sasgui.guiframe.events import StatusEvent 1006 1006 wx.PostEvent(self.base.parent, … … 1190 1190 """ 1191 1191 self.Show(False) 1192 #if self.parent !=None:1192 #if self.parent is not None: 1193 1193 # self.parent.new_model_frame = None 1194 1194 #self.Destroy() -
src/sas/sasgui/perspectives/calculator/pyconsole.py
rddbac66 r7432acb 118 118 self.panel = panel 119 119 self._add_menu() 120 if filename !=None:120 if filename is not None: 121 121 dataDir = os.path.dirname(filename) 122 elif self.parent !=None:122 elif self.parent is not None: 123 123 dataDir = self.parent._default_save_location 124 124 else: … … 128 128 129 129 # See if there is a corresponding C file 130 if filename !=None:130 if filename is not None: 131 131 c_filename = os.path.splitext(filename)[0] + ".c" 132 132 if os.path.isfile(c_filename): … … 244 244 245 245 # See if there is a corresponding C file 246 if result.path !=None:246 if result.path is not None: 247 247 c_filename = os.path.splitext(result.path)[0] + ".c" 248 248 if os.path.isfile(c_filename): … … 303 303 304 304 # Update plugin model list in fitpage combobox 305 if success and self._manager != None and self.panel !=None:305 if success and self._manager is not None and self.panel is not None: 306 306 self._manager.set_edit_menu_helper(self.parent) 307 307 wx.CallAfter(self._manager.update_custom_combo) … … 337 337 Close event 338 338 """ 339 if self.base !=None:339 if self.base is not None: 340 340 self.base.py_frame = None 341 341 self.Destroy() -
src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py
r235f514 r7432acb 656 656 event.Skip() 657 657 # Clear the plot 658 if self.image !=None:658 if self.image is not None: 659 659 self.image.clf() 660 660 # reset image … … 674 674 """ 675 675 # Skip event for next event 676 if event !=None:676 if event is not None: 677 677 event.Skip() 678 678 msg = "Please Check your input values " … … 708 708 # Validate the wave inputs 709 709 wave_input = self._validate_q_input(wavelength, wavelength_spread) 710 if wave_input !=None:710 if wave_input is not None: 711 711 wavelength, wavelength_spread = wave_input 712 712 … … 757 757 # Validate the q inputs 758 758 q_input = self._validate_q_input(self.qx, self.qy) 759 if q_input !=None:759 if q_input is not None: 760 760 self.qx, self.qy = q_input 761 761 … … 769 769 770 770 # Compute the resolution 771 if self.image !=None:771 if self.image is not None: 772 772 #_pylab_helpers.Gcf.set_active(self.fm) 773 773 _pylab_helpers.Gcf.figs = {} … … 982 982 """ 983 983 # skip for another event 984 if event !=None:984 if event is not None: 985 985 event.Skip() 986 986 # init resolution_calculator … … 1148 1148 Set the detector coordinate for sigmas to x-y coordinate 1149 1149 """ 1150 if event !=None:1150 if event is not None: 1151 1151 event.Skip() 1152 1152 # Set the coordinate in Cartesian … … 1160 1160 Set the detector coordinate for sigmas to polar coordinate 1161 1161 """ 1162 if event !=None:1162 if event is not None: 1163 1163 event.Skip() 1164 1164 # Set the coordinate in polar … … 1181 1181 self.compute_button.SetLabel(label) 1182 1182 self.compute_button.SetToolTipString(label) 1183 if self.parent.parent !=None:1183 if self.parent.parent is not None: 1184 1184 wx.PostEvent(self.parent.parent, 1185 1185 StatusEvent(status=msg, type=type)) … … 1196 1196 On source combobox selection 1197 1197 """ 1198 if event !=None:1198 if event is not None: 1199 1199 combo = event.GetEventObject() 1200 1200 event.Skip() … … 1215 1215 On source color combobox selection 1216 1216 """ 1217 if event !=None:1217 if event is not None: 1218 1218 #combo = event.GetEventObject() 1219 1219 event.Skip() … … 1253 1253 On spectrum ComboBox event 1254 1254 """ 1255 if event !=None:1255 if event is not None: 1256 1256 #combo = event.GetEventObject() 1257 1257 event.Skip() … … 1348 1348 """ 1349 1349 _pylab_helpers.Gcf.figs = {} 1350 if self.manager !=None:1350 if self.manager is not None: 1351 1351 self.manager.cal_res_frame = None 1352 1352 self.Destroy() -
src/sas/sasgui/perspectives/calculator/sld_panel.py
r959eb01 r7432acb 504 504 On close event 505 505 """ 506 if self.manager !=None:506 if self.manager is not None: 507 507 self.manager.sld_frame = None 508 508 self.Destroy() -
src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py
r235f514 r7432acb 303 303 Close event 304 304 """ 305 if self.manager !=None:305 if self.manager is not None: 306 306 self.manager.cal_slit_frame = None 307 307 self.Destroy()
Note: See TracChangeset
for help on using the changeset viewer.
