Changeset fa81e94 in sasview for src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py
- Timestamp:
- Nov 15, 2017 4:33:09 AM (6 years ago)
- Branches:
- 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
- Children:
- d4881f6a
- Parents:
- 7c487846
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py
- Property mode changed from 100644 to 100755
r7432acb rfa81e94 17 17 from sas.sasgui.guiframe.events import StatusEvent 18 18 from sas.sascalc.calculator.slit_length_calculator import SlitlengthCalculator 19 from calculator_widgets import OutputTextCtrl20 from calculator_widgets import InterActiveOutputTextCtrl19 from .calculator_widgets import OutputTextCtrl 20 from .calculator_widgets import InterActiveOutputTextCtrl 21 21 from sas.sasgui.perspectives.calculator import calculator_widgets as widget 22 22 from sas.sasgui.guiframe.documentation_window import DocumentationWindow … … 210 210 try: 211 211 #Load data 212 from load_thread import DataReader212 from .load_thread import DataReader 213 213 ## If a thread is already started, stop it 214 214 if self.reader is not None and self.reader.isrunning(): … … 226 226 if self.parent.parent is None: 227 227 return 228 msg = "Slit Length Calculator: %s" % (sys.exc_ value)228 msg = "Slit Length Calculator: %s" % (sys.exc_info()[1]) 229 229 wx.PostEvent(self.parent.parent, 230 230 StatusEvent(status=msg, type='stop')) … … 262 262 if x == [] or x is None or y == [] or y is None: 263 263 msg = "The current data is empty please check x and y" 264 raise ValueError , msg264 raise ValueError(msg) 265 265 slit_length_calculator = SlitlengthCalculator() 266 266 slit_length_calculator.set_data(x=x, y=y) … … 269 269 if self.parent.parent is None: 270 270 return 271 msg = "Slit Size Calculator: %s" % (sys.exc_ value)271 msg = "Slit Size Calculator: %s" % (sys.exc_info()[1]) 272 272 wx.PostEvent(self.parent.parent, 273 273 StatusEvent(status=msg, type='stop'))
Note: See TracChangeset
for help on using the changeset viewer.