Changeset 5251ec6 in sasview for src/sas/sasgui/perspectives/invariant/invariant_panel.py
- Timestamp:
- Oct 11, 2018 2:20:56 PM (6 years ago)
- Branches:
- master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249
- Children:
- 98b9f32
- Parents:
- 67ed543
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/perspectives/invariant/invariant_panel.py
r44e8f48 r5251ec6 319 319 background = self.background_tcl.GetValue().lstrip().rstrip() 320 320 if background == "": 321 raise ValueError , "Need a background"321 raise ValueError("Need a background") 322 322 if check_float(self.background_tcl): 323 323 return float(background) 324 324 else: 325 325 msg = "Receive invalid value for background : %s" % (background) 326 raise ValueError , msg326 raise ValueError(msg) 327 327 328 328 def get_scale(self): … … 332 332 scale = self.scale_tcl.GetValue().lstrip().rstrip() 333 333 if scale == "": 334 raise ValueError , "Need a background"334 raise ValueError("Need a background") 335 335 if check_float(self.scale_tcl): 336 336 if float(scale) <= 0.0: … … 338 338 self.scale_tcl.Refresh() 339 339 msg = "Receive invalid value for scale: %s" % (scale) 340 raise ValueError , msg340 raise ValueError(msg) 341 341 return float(scale) 342 342 else: 343 raise ValueError , "Receive invalid value for scale : %s" % (scale)343 raise ValueError("Receive invalid value for scale : %s" % (scale)) 344 344 345 345 def get_contrast(self): … … 386 386 self.volume_tcl.SetValue(format_number(v)) 387 387 self.volume_err_tcl.SetValue(format_number(dv)) 388 except :388 except Exception as exc: 389 389 self.volume_tcl.SetValue(format_number(None)) 390 390 self.volume_err_tcl.SetValue(format_number(None)) 391 391 msg = "Error occurred computing volume " 392 msg += " fraction: %s" % sys.exc_value392 msg += " fraction: %s" % exc 393 393 wx.PostEvent(self.parent, StatusEvent(status=msg, 394 394 info="error", … … 406 406 self.surface_tcl.SetValue(format_number(s)) 407 407 self.surface_err_tcl.SetValue(format_number(ds)) 408 except :408 except Exception as exc: 409 409 self.surface_tcl.SetValue(format_number(None)) 410 410 self.surface_err_tcl.SetValue(format_number(None)) 411 411 msg = "Error occurred computing " 412 msg += "specific surface: %s" % sys.exc_value412 msg += "specific surface: %s" % exc 413 413 wx.PostEvent(self.parent, StatusEvent(status=msg, info="error", 414 414 type="stop")) … … 426 426 self.inv_container.qstar_total = qstar_total 427 427 self.inv_container.qstar_total_err = qstar_total_err 428 except :428 except Exception as exc: 429 429 self.inv_container.qstar_total = "Error" 430 430 self.inv_container.qstar_total_err = "Error" … … 432 432 self.invariant_total_err_tcl.SetValue(format_number(None)) 433 433 msg = "Error occurred computing invariant using" 434 msg += " extrapolation: %s" % sys.exc_value434 msg += " extrapolation: %s" % exc 435 435 wx.PostEvent(self.parent, StatusEvent(status=msg, type="stop")) 436 436 … … 450 450 self._manager.plot_theory(data=extrapolated_data, 451 451 name="Low-Q extrapolation") 452 except :452 except Exception as exc: 453 453 self.inv_container.qstar_low = "ERROR" 454 454 self.inv_container.qstar_low_err = "ERROR" 455 455 self._manager.plot_theory(name="Low-Q extrapolation") 456 456 msg = "Error occurred computing low-Q " 457 msg += "invariant: %s" % sys.exc_value457 msg += "invariant: %s" % exc 458 458 wx.PostEvent(self.parent, 459 459 StatusEvent(status=msg, type="stop")) … … 462 462 try: 463 463 self._manager.plot_theory(name="Low-Q extrapolation") 464 except :465 logger.error( sys.exc_value)464 except Exception as exc: 465 logger.error(exc) 466 466 467 467 def get_high_qstar(self, inv, high_q=False): … … 483 483 self._manager.plot_theory(data=high_out_data, 484 484 name="High-Q extrapolation") 485 except :485 except Exception as exc: 486 486 #raise 487 487 self.inv_container.qstar_high = "ERROR" … … 489 489 self._manager.plot_theory(name="High-Q extrapolation") 490 490 msg = "Error occurred computing high-Q " 491 msg += "invariant: %s" % sys.exc_value491 msg += "invariant: %s" % exc 492 492 wx.PostEvent(self.parent, StatusEvent(status=msg, 493 493 type="stop")) … … 496 496 try: 497 497 self._manager.plot_theory(name="High-Q extrapolation") 498 except :499 logger.error( sys.exc_value)498 except Exception as exc: 499 logger.error(exc) 500 500 501 501 def get_qstar(self, inv): … … 625 625 background = self.get_background() 626 626 scale = self.get_scale() 627 except :628 msg = "Invariant Error: %s" % (sys.exc_value)627 except Exception as exc: 628 msg = "Invariant Error: %s" % exc 629 629 wx.PostEvent(self.parent, StatusEvent(status=msg, type="stop")) 630 630 return … … 641 641 inv, npts_low = self.set_extrapolation_low(inv=inv, low_q=low_q) 642 642 inv, npts_high = self.set_extrapolation_high(inv=inv, high_q=high_q) 643 except :644 msg = "Error occurred computing invariant: %s" % sys.exc_value643 except Exception as exc: 644 msg = "Error occurred computing invariant: %s" % exc 645 645 wx.PostEvent(self.parent, StatusEvent(status=msg, 646 646 info="warning", type="stop")) … … 652 652 try: 653 653 self.get_qstar(inv=inv) 654 except :655 msg = "Error occurred computing invariant: %s" % sys.exc_value654 except Exception as exc: 655 msg = "Error occurred computing invariant: %s" % exc 656 656 wx.PostEvent(self.parent, StatusEvent(status=msg, 657 657 info="warning", … … 674 674 porod_const = self.get_porod_const() 675 675 contrast = self.get_contrast() 676 except: 677 msg = r_msg + "Error occurred computing invariant: %s" % \ 678 sys.exc_value 676 except Exception as exc: 677 msg = r_msg + "Error occurred computing invariant: %s" % exc 679 678 wx.PostEvent(self.parent, StatusEvent(status=msg, 680 679 info="error", … … 685 684 extrapolation=extrapolation) 686 685 #compute surface and set value to txtcrtl 687 except :688 msg = "Error occurred computing invariant: %s" % sys.exc_value686 except Exception as exc: 687 msg = "Error occurred computing invariant: %s" % exc 689 688 wx.PostEvent(self.parent, StatusEvent(status=msg, 690 689 info="warning", … … 695 694 extrapolation=extrapolation) 696 695 697 except :698 msg = "Error occurred computing invariant: %s" % sys.exc_value696 except Exception as exc: 697 msg = "Error occurred computing invariant: %s" % exc 699 698 wx.PostEvent(self.parent, StatusEvent(status=msg, 700 699 info="warning", … … 845 844 if attr.__class__.__name__ == "StaticText": 846 845 return 847 if value in ["True", "False", True, False]: 848 value = bool(value) 846 if value in ["True", True]: 847 value = 1 848 elif value in ["False", False]: 849 value = 0 849 850 else: 850 851 value = str(value) 851 852 attr.SetValue(value) 852 except :853 logger.error("Invariant state: %s", sys.exc_value)853 except Exception as exc: 854 logger.error("Invariant state: %s", exc) 854 855 855 856 def get_bookmark_by_num(self, num=None): … … 867 868 try: 868 869 _, _, current_state, comp_state = self.state.bookmark_list[int(num)] 869 except :870 logger.error( sys.exc_value)871 raise ValueError , "No such bookmark exists"870 except Exception as exc: 871 logger.error(exc) 872 raise ValueError("No such bookmark exists") 872 873 873 874 # set the parameters … … 962 963 self.state.state_list[str(self.state.state_num)] = \ 963 964 self.state.clone_state() 964 except :965 logger.error( sys.exc_value)965 except Exception as exc: 966 logger.error(exc) 966 967 967 968 self._set_undo_flag(True) … … 1006 1007 try: 1007 1008 del self.state.state_list[str(i)] 1008 except :1009 logger.error( sys.exc_value)1009 except Exception as exc: 1010 logger.error(exc) 1010 1011 # Enable the undo button if it was not 1011 1012 self._set_undo_flag(True) … … 1071 1072 try: 1072 1073 del self.state.state_list[str(i)] 1073 except :1074 logger.error( sys.exc_value)1074 except Exception as exc: 1075 logger.error(exc) 1075 1076 1076 1077 # try to add new state of the text changes in the state_list … … 1086 1087 self.state.state_num = self.state.saved_state['state_num'] 1087 1088 self.state.state_list[str(self.state.state_num)] = self.state.clone_state() 1088 except :1089 logger.error( sys.exc_value)1089 except Exception as exc: 1090 logger.error(exc) 1090 1091 1091 1092 self._set_undo_flag(True) … … 1108 1109 self.state.saved_state[name] = str(value) 1109 1110 self.state.state_list[str(self.state.state_num)] = self.state.clone_state() 1110 except :1111 logger.error( sys.exc_value)1111 except Exception as exc: 1112 logger.error(exc) 1112 1113 1113 1114 def _get_input_list(self): … … 1118 1119 compute_num = self.state.saved_state['compute_num'] 1119 1120 # find values and put into the input list 1120 for key1, value1 in self.state.state_list[str(compute_num)].ite ritems():1121 for key, _ in self.state.input_list.ite ritems():1121 for key1, value1 in self.state.state_list[str(compute_num)].items(): 1122 for key, _ in self.state.input_list.items(): 1122 1123 if key == key1: 1123 1124 self.state.input_list[key] = value1
Note: See TracChangeset
for help on using the changeset viewer.